diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 5258c678d..3dc93e038 100644 Binary files a/Assets/lua/app/config/strings/cn/global.lua.bytes and b/Assets/lua/app/config/strings/cn/global.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes b/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes index 287b734f9..ef1a32652 100644 Binary files a/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes and b/Assets/lua/app/ui/main_city/chapter_box_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes index 20ffd4a56..30cd897a0 100644 Binary files a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes index 08671443a..d2898abd7 100644 Binary files a/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_info_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index e8077d132..f57cb3920 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -2156,8 +2156,8 @@ MonoBehaviour: boneName: diban followBoneRotation: 1 followSkeletonFlip: 1 - followLocalScale: 0 - followParentWorldScale: 0 + followLocalScale: 1 + followParentWorldScale: 1 followXYPosition: 1 followZPosition: 1 maintainedAxisOrientation: 1 @@ -4824,6 +4824,7 @@ GameObject: - component: {fileID: 6911264791947976490} - component: {fileID: 8701922404334855556} - component: {fileID: 9217287939990123027} + - component: {fileID: 9017788278560139462} m_Layer: 5 m_Name: bg m_TagString: Untagged @@ -4838,7 +4839,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7921166426620139622} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: 8.428379e-12, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4848,7 +4849,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 128} + m_AnchoredPosition: {x: 0, y: 133.41003} m_SizeDelta: {x: 598, y: 492} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8701922404334855556 @@ -4889,6 +4890,28 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &9017788278560139462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7921166426620139622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b42a195b47491d34b9bcbc40898bcb29, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonGraphic: {fileID: 7054426090379659655} + initializeOnAwake: 1 + boneName: diban + followBoneRotation: 1 + followSkeletonFlip: 1 + followLocalScale: 1 + followParentWorldScale: 1 + followXYPosition: 1 + followZPosition: 1 + maintainedAxisOrientation: 1 --- !u!1 &7936986928946906401 GameObject: m_ObjectHideFlags: 0 @@ -6484,6 +6507,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 4837857829111055852} m_PrefabAsset: {fileID: 0} +--- !u!114 &7054426090379659655 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 4837857829111055852} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6379174579643197588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!224 &7770004333418327666 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} diff --git a/Assets/prefabs/ui/chapter/chapter_1_1.prefab b/Assets/prefabs/ui/chapter/chapter_1_1.prefab index 9ae069ce8..21339d90c 100644 --- a/Assets/prefabs/ui/chapter/chapter_1_1.prefab +++ b/Assets/prefabs/ui/chapter/chapter_1_1.prefab @@ -1229,8 +1229,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: -75 - endX: -1800 - resetX: 1800 + endX: -1732 + resetX: 1732 type: 1 canMove: 0 --- !u!1 &5574386308499448284 diff --git a/Assets/prefabs/ui/main_city/chapter_box_ui.prefab b/Assets/prefabs/ui/main_city/chapter_box_ui.prefab index b199e012e..e34fa05d2 100644 --- a/Assets/prefabs/ui/main_city/chapter_box_ui.prefab +++ b/Assets/prefabs/ui/main_city/chapter_box_ui.prefab @@ -199,7 +199,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.972549} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1622,6 +1622,10 @@ MonoBehaviour: hashName: 3933325847 objectType: 0 gameObject: {fileID: 3667392929336993867} + - name: chapter_box_ui.mask + hashName: 1689331360 + objectType: 0 + gameObject: {fileID: 655792883980138453} --- !u!1 &6004071191184161953 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/talent/talent_info_ui.prefab b/Assets/prefabs/ui/talent/talent_info_ui.prefab index 4261a9591..1282b4ef3 100644 --- a/Assets/prefabs/ui/talent/talent_info_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_info_ui.prefab @@ -9,6 +9,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2780316087535550777} + - component: {fileID: 3879747934089267835} + - component: {fileID: 2828580426486619974} + - component: {fileID: 5004634597769085665} m_Layer: 5 m_Name: node m_TagString: Untagged @@ -35,8 +38,59 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 98} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 720, y: 500} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3879747934089267835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274827387045759549} + m_CullTransparentMesh: 1 +--- !u!114 &2828580426486619974 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274827387045759549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5004634597769085665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1274827387045759549} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &5312408455988329922 GameObject: m_ObjectHideFlags: 0 @@ -371,7 +425,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: