diff --git a/Assets/lua/app/config/localization/localization_global_const.lua.bytes b/Assets/lua/app/config/localization/localization_global_const.lua.bytes index b68c72930..f9f5d4f6d 100644 Binary files a/Assets/lua/app/config/localization/localization_global_const.lua.bytes and b/Assets/lua/app/config/localization/localization_global_const.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/global.lua.bytes b/Assets/lua/app/config/strings/cn/global.lua.bytes index 77d67aa57..7ce4e1e46 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/module/maincity/maincity_const.lua.bytes b/Assets/lua/app/module/maincity/maincity_const.lua.bytes index 9d07a9c50..a0fe882ea 100644 Binary files a/Assets/lua/app/module/maincity/maincity_const.lua.bytes and b/Assets/lua/app/module/maincity/maincity_const.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 a0777d8b4..a975d9f98 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 24b7a498f..334669a8e 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/prefabs/ui/main_city/chapter_box_ui.prefab b/Assets/prefabs/ui/main_city/chapter_box_ui.prefab index 11cd92695..39e8b97f9 100644 --- a/Assets/prefabs/ui/main_city/chapter_box_ui.prefab +++ b/Assets/prefabs/ui/main_city/chapter_box_ui.prefab @@ -77,6 +77,67 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &597390422963878472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4768655945697206997} + - component: {fileID: 8289661381465126572} + m_Layer: 5 + m_Name: tx_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4768655945697206997 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597390422963878472} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 643515399985173069} + - {fileID: 7847096563907948890} + - {fileID: 8828393728752368384} + - {fileID: 6299547798094272100} + - {fileID: 8714613858248395280} + m_Father: {fileID: 8247273820963310082} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8289661381465126572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 597390422963878472} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cd9c9c2795741588033c81cd008e7e, type: 3} + m_Name: + m_EditorClassIdentifier: + left: 0 + right: 0 + top: 0 + bottom: 0 + childAlignment: 1 + spacing: 0 + verticalOrHorizontal: 0 --- !u!1 &655792883980138453 GameObject: m_ObjectHideFlags: 0 @@ -244,17 +305,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1597101411851074082} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 5 + m_Father: {fileID: 8247273820963310082} + m_RootOrder: 0 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: 280} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 59, y: 0} m_SizeDelta: {x: 118, y: 66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1756124331371790725 @@ -326,7 +387,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6532261956592226185} - m_RootOrder: 11 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -545,18 +606,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2833638441871059875} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 10 + m_Father: {fileID: 4768655945697206997} + m_RootOrder: 4 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: 236, y: 280} - m_SizeDelta: {x: 100, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 118, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8080076684881190907 CanvasRenderer: @@ -955,7 +1016,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5931538206044019069} + - {fileID: 4768655945697206997} m_Father: {fileID: 6532261956592226185} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1173,12 +1236,6 @@ RectTransform: - {fileID: 3981847042030421787} - {fileID: 1226788473560635264} - {fileID: 6857839536960056059} - - {fileID: 5931538206044019069} - - {fileID: 643515399985173069} - - {fileID: 7847096563907948890} - - {fileID: 8828393728752368384} - - {fileID: 6299547798094272100} - - {fileID: 8714613858248395280} - {fileID: 8161593957811750866} m_Father: {fileID: 8461932745927490369} m_RootOrder: 1 @@ -1311,7 +1368,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 64, y: -40} + m_AnchoredPosition: {x: 43, y: -40} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4518825068284042692 @@ -1369,8 +1426,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 35 - m_fontSizeBase: 35 + m_fontSize: 36 + m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -1524,34 +1581,42 @@ MonoBehaviour: hashName: 2639495750 objectType: 0 gameObject: {fileID: 6315299199971833514} - - name: chapter_box_ui.bg.chapter_tx_1 - hashName: 732835005 + - name: chapter_box_ui.bg.bg1.tx_node.chapter_tx_1 + hashName: 175862992 objectType: 0 gameObject: {fileID: 8999265704713066873} - - name: chapter_box_ui.bg.chapter_tx_2 - hashName: 732835006 + - name: chapter_box_ui.bg.bg1.tx_node.chapter_tx_2 + hashName: 175862993 objectType: 0 gameObject: {fileID: 6022469002469569889} - - name: chapter_box_ui.bg.chapter_tx_3 - hashName: 732835007 + - name: chapter_box_ui.bg.bg1.tx_node.chapter_tx_3 + hashName: 175862994 objectType: 0 gameObject: {fileID: 7738640250545000165} - - name: chapter_box_ui.bg.sel_img - hashName: 3977074281 + - name: chapter_box_ui.bg.bg1.sel_img + hashName: 1535678855 objectType: 0 gameObject: {fileID: 1597101411851074082} - - name: chapter_box_ui.bg.chapter_tx_4 - hashName: 732835008 + - name: chapter_box_ui.bg.bg1.tx_node.chapter_tx_4 + hashName: 175862995 objectType: 0 gameObject: {fileID: 8154804223516783729} - - name: chapter_box_ui.bg.chapter_tx_5 - hashName: 732835009 + - name: chapter_box_ui.bg.bg1.tx_node.chapter_tx_5 + hashName: 175862996 objectType: 0 gameObject: {fileID: 2833638441871059875} - name: chapter_box_ui.bg.max_wave_tx hashName: 3591179322 objectType: 0 gameObject: {fileID: 2677081081567752973} + - name: chapter_box_ui.bg.bg1.tx_node + hashName: 2955582982 + objectType: 0 + gameObject: {fileID: 597390422963878472} + - name: chapter_box_ui.bg.bg1 + hashName: 3933325847 + objectType: 0 + gameObject: {fileID: 3667392929336993867} --- !u!1 &6004071191184161953 GameObject: m_ObjectHideFlags: 0 @@ -1712,18 +1777,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6022469002469569889} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 7 + m_Father: {fileID: 4768655945697206997} + m_RootOrder: 1 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: -118, y: 280} - m_SizeDelta: {x: 100, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 118, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4202292669231146044 CanvasRenderer: @@ -2059,18 +2124,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7738640250545000165} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 8 + m_Father: {fileID: 4768655945697206997} + m_RootOrder: 2 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: 280} - m_SizeDelta: {x: 100, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 118, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &709151330347663321 CanvasRenderer: @@ -2194,18 +2259,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8154804223516783729} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 9 + m_Father: {fileID: 4768655945697206997} + m_RootOrder: 3 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: 118, y: 280} - m_SizeDelta: {x: 100, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 118, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2557722393017697237 CanvasRenderer: @@ -2405,18 +2470,18 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8999265704713066873} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 6 + m_Father: {fileID: 4768655945697206997} + m_RootOrder: 0 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: -236, y: 280} - m_SizeDelta: {x: 100, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 118, y: 56} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2674692620585448399 CanvasRenderer: @@ -2560,15 +2625,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x @@ -2683,15 +2748,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.x - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.y - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalScale.z - value: 0.6 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab index 15f7b24b4..5c4788ffc 100644 --- a/Assets/prefabs/ui/setting/select_other_btn_ui.prefab +++ b/Assets/prefabs/ui/setting/select_other_btn_ui.prefab @@ -1094,6 +1094,7 @@ GameObject: - component: {fileID: 1225774943438592279} - component: {fileID: 838584963112415459} - component: {fileID: 3797682614555109514} + - component: {fileID: 8112009748854682721} m_Layer: 5 m_Name: select_other_btn_ui m_TagString: Untagged @@ -1240,7 +1241,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5997397792976241942} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -1253,7 +1254,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: a70289eca986ce142b027934f6cdd63c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1263,6 +1264,19 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8112009748854682721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5997397792976241942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 0 --- !u!1 &8025481195902169917 GameObject: m_ObjectHideFlags: 0