From d7964113c35a5248f8d2ab87ed56814d73c45e4c Mon Sep 17 00:00:00 2001 From: puxuan <413323644@qq.com> Date: Tue, 4 Nov 2025 10:42:32 +0800 Subject: [PATCH] fix bug --- .../app/module/login/test_login_ui.lua.bytes | Bin 8016 -> 8014 bytes .../app/ui/battle/battle_base_ui.lua.bytes | Bin 99887 -> 99887 bytes .../main_city/component/main_comp.lua.bytes | Bin 15821 -> 15873 bytes Assets/prefabs/ui/login/test_login_ui.prefab | 6 +- Assets/prefabs/ui/main_city/main_comp.prefab | 597 +++++++++++++++--- 5 files changed, 504 insertions(+), 99 deletions(-) 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 2f5263d7f70aadd1b410613356676d93ca3c498f..310a5cba867fe70248c10caafbf48024fef3813c 100644 GIT binary patch delta 5881 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 delta 5846 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 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 3d531c2869607bd4d84feea95f1f3fb173ee8658..e75800b4bcc5ead75b01910b3c52bfa24769a0e8 100644 GIT binary patch literal 15873 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 literal 15821 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 VzOrHb>mnuh2g;}3qx#Q({|);iJ4XNj 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}