diff --git a/Assets/lua/app/module/login/test_login_ui.lua.bytes b/Assets/lua/app/module/login/test_login_ui.lua.bytes index 2f5263d7f..310a5cba8 100644 Binary files a/Assets/lua/app/module/login/test_login_ui.lua.bytes and b/Assets/lua/app/module/login/test_login_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes index fe7ac9a79..545ea7e61 100644 Binary files a/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_base_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes index 3d531c286..e75800b4b 100644 Binary files a/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes and b/Assets/lua/app/ui/main_city/component/main_comp.lua.bytes differ diff --git a/Assets/prefabs/ui/login/test_login_ui.prefab b/Assets/prefabs/ui/login/test_login_ui.prefab index 2e50b0a54..797a4d810 100644 --- a/Assets/prefabs/ui/login/test_login_ui.prefab +++ b/Assets/prefabs/ui/login/test_login_ui.prefab @@ -573,7 +573,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -597,8 +597,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 30 + m_fontSizeBase: 30 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index e366d7226..0aeada9ff 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -165,7 +165,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 491824512184469338} + m_Father: {fileID: 6528903368654596444} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -541,12 +541,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 692272256868286215} - 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: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 742222916471441732} + m_Father: {fileID: 2669867809258595962} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -623,10 +623,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6599543968420475722} - - {fileID: 719930937743154658} - - {fileID: 7197197130458852682} - - {fileID: 2503260650987993070} + - {fileID: 8879154711404639526} m_Father: {fileID: 246586037452834948} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -685,7 +682,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} m_Name: m_EditorClassIdentifier: - IsShowClickAnimation: 1 + IsShowClickAnimation: 0 --- !u!1 &970566127061901792 GameObject: m_ObjectHideFlags: 0 @@ -711,12 +708,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970566127061901792} - 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: 742222916471441732} + m_Father: {fileID: 2669867809258595962} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -956,6 +953,86 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1129413538407586086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2669867809258595962} + - component: {fileID: 7820206818746127412} + - component: {fileID: 5909894223795273072} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2669867809258595962 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129413538407586086} + 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: 4513226752272431684} + - {fileID: 1103476499142944985} + - {fileID: 1128624627394102920} + - {fileID: 5668579441301209955} + m_Father: {fileID: 742222916471441732} + m_RootOrder: 0 + 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!222 &7820206818746127412 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129413538407586086} + m_CullTransparentMesh: 1 +--- !u!114 &5909894223795273072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129413538407586086} + 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: 8a9700718a817d044a55010e6b9bbebe, 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!1 &1377810856322863750 GameObject: m_ObjectHideFlags: 0 @@ -1017,12 +1094,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1408721686828695313} - 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: 315758856384517121} + m_Father: {fileID: 935346910422066063} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1403,7 +1480,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3715253095108676673} + m_Father: {fileID: 8437291222151530482} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1449,6 +1526,86 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1962345145414571235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8437291222151530482} + - component: {fileID: 3788838543850205225} + - component: {fileID: 1304581681208011014} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8437291222151530482 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962345145414571235} + 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: 359824526960739438} + - {fileID: 1043029739703044088} + - {fileID: 4994747441926046215} + - {fileID: 9177838452626718128} + m_Father: {fileID: 3715253095108676673} + m_RootOrder: 0 + 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!222 &3788838543850205225 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962345145414571235} + m_CullTransparentMesh: 1 +--- !u!114 &1304581681208011014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962345145414571235} + 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: 8a9700718a817d044a55010e6b9bbebe, 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!1 &2580655513728869588 GameObject: m_ObjectHideFlags: 0 @@ -1559,7 +1716,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 742222916471441732} + m_Father: {fileID: 2669867809258595962} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1630,12 +1787,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2945926953598747340} - 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: 7417658934042246492} + m_Father: {fileID: 8879154711404639526} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1867,80 +2024,80 @@ MonoBehaviour: hashName: 2791471026 objectType: 0 gameObject: {fileID: 5568517213547618116} - - name: main_comp.middle_bg.page_node.page_btn_1.check_img - hashName: 1727478992 + - name: main_comp.middle_bg.page_node.page_btn_1.bg.check_img + hashName: 542554719 objectType: 0 gameObject: {fileID: 7453364899677791863} - - name: main_comp.middle_bg.page_node.page_btn_1.desc_tx - hashName: 315774134 + - name: main_comp.middle_bg.page_node.page_btn_1.bg.desc_tx + hashName: 3384928773 objectType: 0 gameObject: {fileID: 6840772915563254291} - name: main_comp.middle_bg.page_node.page_btn_2 hashName: 2791471027 objectType: 0 gameObject: {fileID: 6625935839475877952} - - name: main_comp.middle_bg.page_node.page_btn_2.check_img - hashName: 4225494929 + - name: main_comp.middle_bg.page_node.page_btn_2.bg.check_img + hashName: 36996094 objectType: 0 gameObject: {fileID: 9153139342430293660} - - name: main_comp.middle_bg.page_node.page_btn_2.desc_tx - hashName: 2803286967 + - name: main_comp.middle_bg.page_node.page_btn_2.bg.desc_tx + hashName: 3514011492 objectType: 0 gameObject: {fileID: 1408721686828695313} - name: main_comp.middle_bg.page_node.page_btn_3 hashName: 2791471028 objectType: 0 gameObject: {fileID: 808248189612869731} - - name: main_comp.middle_bg.page_node.page_btn_3.check_img - hashName: 2428543570 + - name: main_comp.middle_bg.page_node.page_btn_3.bg.check_img + hashName: 3826404765 objectType: 0 gameObject: {fileID: 7731926545539472411} - - name: main_comp.middle_bg.page_node.page_btn_3.desc_tx - hashName: 995832504 + - name: main_comp.middle_bg.page_node.page_btn_3.bg.desc_tx + hashName: 3643094211 objectType: 0 gameObject: {fileID: 2945926953598747340} - name: main_comp.middle_bg.page_node.page_btn_4 hashName: 2791471029 objectType: 0 gameObject: {fileID: 6975515112004601766} - - name: main_comp.middle_bg.page_node.page_btn_4.check_img - hashName: 631592211 + - name: main_comp.middle_bg.page_node.page_btn_4.bg.check_img + hashName: 3320846140 objectType: 0 gameObject: {fileID: 692272256868286215} - - name: main_comp.middle_bg.page_node.page_btn_4.desc_tx - hashName: 3483345337 + - name: main_comp.middle_bg.page_node.page_btn_4.bg.desc_tx + hashName: 3772176930 objectType: 0 gameObject: {fileID: 970566127061901792} - name: main_comp.middle_bg.page_node.page_btn_5 hashName: 2791471030 objectType: 0 gameObject: {fileID: 6149032898719208942} - - name: main_comp.middle_bg.page_node.page_btn_5.check_img - hashName: 3129608148 + - name: main_comp.middle_bg.page_node.page_btn_5.bg.check_img + hashName: 2815287515 objectType: 0 gameObject: {fileID: 3527937743732191498} - - name: main_comp.middle_bg.page_node.page_btn_5.desc_tx - hashName: 1675890874 + - name: main_comp.middle_bg.page_node.page_btn_5.bg.desc_tx + hashName: 3901259649 objectType: 0 gameObject: {fileID: 6009229460759267496} - - name: main_comp.middle_bg.page_node.page_btn_1.mask_img - hashName: 456817324 + - name: main_comp.middle_bg.page_node.page_btn_1.bg.mask_img + hashName: 1111330621 objectType: 0 gameObject: {fileID: 4226871551547528126} - - name: main_comp.middle_bg.page_node.page_btn_2.mask_img - hashName: 260303819 + - name: main_comp.middle_bg.page_node.page_btn_2.bg.mask_img + hashName: 817927614 objectType: 0 gameObject: {fileID: 4990301656747842757} - - name: main_comp.middle_bg.page_node.page_btn_3.mask_img - hashName: 63790314 + - name: main_comp.middle_bg.page_node.page_btn_3.bg.mask_img + hashName: 524524607 objectType: 0 gameObject: {fileID: 4402495589589348180} - - name: main_comp.middle_bg.page_node.page_btn_4.mask_img - hashName: 4162244105 + - name: main_comp.middle_bg.page_node.page_btn_4.bg.mask_img + hashName: 231121600 objectType: 0 gameObject: {fileID: 6157704554730542984} - - name: main_comp.middle_bg.page_node.page_btn_5.mask_img - hashName: 3965730600 + - name: main_comp.middle_bg.page_node.page_btn_5.bg.mask_img + hashName: 4232685889 objectType: 0 gameObject: {fileID: 4525143254153236469} - name: main_comp.left_btn @@ -1975,24 +2132,24 @@ MonoBehaviour: hashName: 2266870810 objectType: 0 gameObject: {fileID: 5642350375326419391} - - name: main_comp.middle_bg.page_node.page_btn_1.select_img - hashName: 875258300 + - name: main_comp.middle_bg.page_node.page_btn_1.bg.select_img + hashName: 2797311501 objectType: 0 gameObject: {fileID: 263032304933808618} - - name: main_comp.middle_bg.page_node.page_btn_2.select_img - hashName: 1004341019 + - name: main_comp.middle_bg.page_node.page_btn_2.bg.select_img + hashName: 9896014 objectType: 0 gameObject: {fileID: 5930561707168188416} - - name: main_comp.middle_bg.page_node.page_btn_3.select_img - hashName: 1133423738 + - name: main_comp.middle_bg.page_node.page_btn_3.bg.select_img + hashName: 1517447823 objectType: 0 gameObject: {fileID: 5169438475982369217} - - name: main_comp.middle_bg.page_node.page_btn_4.select_img - hashName: 1262506457 + - name: main_comp.middle_bg.page_node.page_btn_4.bg.select_img + hashName: 3024999632 objectType: 0 gameObject: {fileID: 2658200718793269410} - - name: main_comp.middle_bg.page_node.page_btn_5.select_img - hashName: 1391589176 + - name: main_comp.middle_bg.page_node.page_btn_5.bg.select_img + hashName: 237584145 objectType: 0 gameObject: {fileID: 1958952317761683943} - name: main_comp.formation.hero_1 @@ -2015,6 +2172,26 @@ MonoBehaviour: hashName: 428377094 objectType: 0 gameObject: {fileID: 7989783026923556121} + - name: main_comp.middle_bg.page_node.page_btn_1.bg + hashName: 1556597761 + objectType: 0 + gameObject: {fileID: 4692838975479324092} + - name: main_comp.middle_bg.page_node.page_btn_2.bg + hashName: 1556627552 + objectType: 0 + gameObject: {fileID: 5291390669356707366} + - name: main_comp.middle_bg.page_node.page_btn_3.bg + hashName: 1556657343 + objectType: 0 + gameObject: {fileID: 5404460432093440780} + - name: main_comp.middle_bg.page_node.page_btn_4.bg + hashName: 1556687134 + objectType: 0 + gameObject: {fileID: 1129413538407586086} + - name: main_comp.middle_bg.page_node.page_btn_5.bg + hashName: 1556716925 + objectType: 0 + gameObject: {fileID: 1962345145414571235} --- !u!1 &3527937743732191498 GameObject: m_ObjectHideFlags: 0 @@ -2040,12 +2217,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3527937743732191498} - 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: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 3715253095108676673} + m_Father: {fileID: 8437291222151530482} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2251,12 +2428,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4226871551547528126} - 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: 491824512184469338} + m_Father: {fileID: 6528903368654596444} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2373,7 +2550,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7417658934042246492} + m_Father: {fileID: 8879154711404639526} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2449,7 +2626,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3715253095108676673} + m_Father: {fileID: 8437291222151530482} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2585,6 +2762,86 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: IsShowClickAnimation: 1 +--- !u!1 &4692838975479324092 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6528903368654596444} + - component: {fileID: 7989585760881059318} + - component: {fileID: 4311874428446366749} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6528903368654596444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692838975479324092} + 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: 1731900772122172695} + - {fileID: 4333712746107940683} + - {fileID: 6520474330320379501} + - {fileID: 7415683848325953722} + m_Father: {fileID: 491824512184469338} + m_RootOrder: 0 + 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!222 &7989585760881059318 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692838975479324092} + m_CullTransparentMesh: 1 +--- !u!114 &4311874428446366749 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4692838975479324092} + 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: 8a9700718a817d044a55010e6b9bbebe, 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!1 &4990301656747842757 GameObject: m_ObjectHideFlags: 0 @@ -2615,7 +2872,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 315758856384517121} + m_Father: {fileID: 935346910422066063} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2847,7 +3104,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7417658934042246492} + m_Father: {fileID: 8879154711404639526} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2930,6 +3187,166 @@ RectTransform: m_AnchoredPosition: {x: 260, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5291390669356707366 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 935346910422066063} + - component: {fileID: 1078795270802672370} + - component: {fileID: 1267530413848809108} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &935346910422066063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5291390669356707366} + 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: 5696695492300257348} + - {fileID: 7157643590136661859} + - {fileID: 3733097390205661258} + - {fileID: 8732201164070290982} + m_Father: {fileID: 315758856384517121} + m_RootOrder: 0 + 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!222 &1078795270802672370 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5291390669356707366} + m_CullTransparentMesh: 1 +--- !u!114 &1267530413848809108 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5291390669356707366} + 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: 8a9700718a817d044a55010e6b9bbebe, 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!1 &5404460432093440780 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8879154711404639526} + - component: {fileID: 4633339179435766625} + - component: {fileID: 6476332698776857369} + m_Layer: 0 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8879154711404639526 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404460432093440780} + 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: 6599543968420475722} + - {fileID: 719930937743154658} + - {fileID: 7197197130458852682} + - {fileID: 2503260650987993070} + m_Father: {fileID: 7417658934042246492} + m_RootOrder: 0 + 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!222 &4633339179435766625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404460432093440780} + m_CullTransparentMesh: 1 +--- !u!114 &6476332698776857369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5404460432093440780} + 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: 8a9700718a817d044a55010e6b9bbebe, 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!1 &5568517213547618116 GameObject: m_ObjectHideFlags: 0 @@ -2961,10 +3378,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1731900772122172695} - - {fileID: 4333712746107940683} - - {fileID: 6520474330320379501} - - {fileID: 7415683848325953722} + - {fileID: 6528903368654596444} m_Father: {fileID: 246586037452834948} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3023,7 +3437,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} m_Name: m_EditorClassIdentifier: - IsShowClickAnimation: 1 + IsShowClickAnimation: 0 --- !u!1 &5588020658924719300 GameObject: m_ObjectHideFlags: 0 @@ -3668,7 +4082,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 315758856384517121} + m_Father: {fileID: 935346910422066063} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3739,12 +4153,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6009229460759267496} - 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: 3715253095108676673} + m_Father: {fileID: 8437291222151530482} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3924,10 +4338,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 359824526960739438} - - {fileID: 1043029739703044088} - - {fileID: 4994747441926046215} - - {fileID: 9177838452626718128} + - {fileID: 8437291222151530482} m_Father: {fileID: 246586037452834948} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3986,7 +4397,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} m_Name: m_EditorClassIdentifier: - IsShowClickAnimation: 1 + IsShowClickAnimation: 0 --- !u!1 &6157704554730542984 GameObject: m_ObjectHideFlags: 0 @@ -4017,7 +4428,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 742222916471441732} + m_Father: {fileID: 2669867809258595962} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4487,10 +4898,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5696695492300257348} - - {fileID: 7157643590136661859} - - {fileID: 3733097390205661258} - - {fileID: 8732201164070290982} + - {fileID: 935346910422066063} m_Father: {fileID: 246586037452834948} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4549,7 +4957,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} m_Name: m_EditorClassIdentifier: - IsShowClickAnimation: 1 + IsShowClickAnimation: 0 --- !u!1 &6690042956776367497 GameObject: m_ObjectHideFlags: 0 @@ -4710,12 +5118,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6840772915563254291} - 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: 491824512184469338} + m_Father: {fileID: 6528903368654596444} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4851,10 +5259,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4513226752272431684} - - {fileID: 1103476499142944985} - - {fileID: 1128624627394102920} - - {fileID: 5668579441301209955} + - {fileID: 2669867809258595962} m_Father: {fileID: 246586037452834948} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4913,7 +5318,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} m_Name: m_EditorClassIdentifier: - IsShowClickAnimation: 1 + IsShowClickAnimation: 0 --- !u!1 &7435358911713614768 GameObject: m_ObjectHideFlags: 0 @@ -5019,12 +5424,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7453364899677791863} - 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: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 491824512184469338} + m_Father: {fileID: 6528903368654596444} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5095,12 +5500,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7731926545539472411} - 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: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 7417658934042246492} + m_Father: {fileID: 8879154711404639526} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -5415,12 +5820,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9153139342430293660} - 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: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 315758856384517121} + m_Father: {fileID: 935346910422066063} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5}