From ba01ce2df7fde29b64f05917270e060efe3b0d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A3=AE2003?= <2384017988@qq.com> Date: Tue, 30 Jun 2026 23:57:40 +0800 Subject: [PATCH] 1 --- Assets/MyGame/Scenes/UIScene.unity | 448 +++++- Assets/MyGame/Scripts/Manager/GameManager.cs | 31 +- Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab | 40 + .../MyGame/aa/UI/Home/Sub/TurretPanel.prefab | 207 ++- .../UI/Home/Sub/UIHome_BY_ItemListPanels.cs | 6 +- Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab | 1304 ++++++++++++++++- Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs | 158 +- Assets/UIResources/Home/个人信息/08 1.png | Bin 4162 -> 0 bytes .../个人信息/BY_PlaneInfoPanel_001 (1).png | Bin 0 -> 243 bytes ...ng.meta => BY_PlaneInfoPanel_001 (1).png.meta} | 2 +- .../Home/个人信息/BY_PlaneInfoPanel_015.png | Bin 0 -> 3964 bytes .../个人信息/BY_PlaneInfoPanel_015.png.meta | 127 ++ .../Home/个人信息/BY_beibao_001 (1).png | Bin 0 -> 9957 bytes .../Home/个人信息/BY_beibao_001 (1).png.meta | 127 ++ .../Home/个人信息/BY_beibao_001 (2).png | Bin 0 -> 1918 bytes .../Home/个人信息/BY_beibao_001 (2).png.meta | 127 ++ .../Home/个人信息/BY_beibao_001 (6).png | Bin 0 -> 141735 bytes .../Home/个人信息/BY_beibao_001 (6).png.meta | 127 ++ .../Home/个人信息/tyzr_xllb_btn1.png | Bin 0 -> 22257 bytes .../Home/个人信息/tyzr_xllb_btn1.png.meta | 127 ++ Assets/UIResources/Home/个人信息/使用.png | Bin 0 -> 730 bytes .../UIResources/Home/个人信息/使用.png.meta | 127 ++ Assets/UIResources/Home/个人信息/默认头像.png | Bin 0 -> 2539 bytes .../Home/个人信息/默认头像.png.meta | 127 ++ .../Home/{个人信息.psb => 个人信息TX.psb} | Bin 3086419 -> 3051920 bytes ...{个人信息.psb.meta => 个人信息TX.psb.meta} | 1301 +++++++--------- Assets/UIResources/Home/炮台.psb | Bin 12343316 -> 12205873 bytes Assets/UIResources/Home/炮台.psb.meta | 188 +-- Assets/UIResources/Home/炮台/LCSGSL_btn01.png | Bin 0 -> 20334 bytes .../Home/炮台/LCSGSL_btn01.png.meta | 127 ++ Assets/UIResources/Home/炮台/出战.png | Bin 0 -> 5055 bytes Assets/UIResources/Home/炮台/出战.png.meta | 127 ++ 32 files changed, 3806 insertions(+), 1022 deletions(-) delete mode 100644 Assets/UIResources/Home/个人信息/08 1.png create mode 100644 Assets/UIResources/Home/个人信息/BY_PlaneInfoPanel_001 (1).png rename Assets/UIResources/Home/个人信息/{08 1.png.meta => BY_PlaneInfoPanel_001 (1).png.meta} (98%) create mode 100644 Assets/UIResources/Home/个人信息/BY_PlaneInfoPanel_015.png create mode 100644 Assets/UIResources/Home/个人信息/BY_PlaneInfoPanel_015.png.meta create mode 100644 Assets/UIResources/Home/个人信息/BY_beibao_001 (1).png create mode 100644 Assets/UIResources/Home/个人信息/BY_beibao_001 (1).png.meta create mode 100644 Assets/UIResources/Home/个人信息/BY_beibao_001 (2).png create mode 100644 Assets/UIResources/Home/个人信息/BY_beibao_001 (2).png.meta create mode 100644 Assets/UIResources/Home/个人信息/BY_beibao_001 (6).png create mode 100644 Assets/UIResources/Home/个人信息/BY_beibao_001 (6).png.meta create mode 100644 Assets/UIResources/Home/个人信息/tyzr_xllb_btn1.png create mode 100644 Assets/UIResources/Home/个人信息/tyzr_xllb_btn1.png.meta create mode 100644 Assets/UIResources/Home/个人信息/使用.png create mode 100644 Assets/UIResources/Home/个人信息/使用.png.meta create mode 100644 Assets/UIResources/Home/个人信息/默认头像.png create mode 100644 Assets/UIResources/Home/个人信息/默认头像.png.meta rename Assets/UIResources/Home/{个人信息.psb => 个人信息TX.psb} (79%) rename Assets/UIResources/Home/{个人信息.psb.meta => 个人信息TX.psb.meta} (70%) create mode 100644 Assets/UIResources/Home/炮台/LCSGSL_btn01.png create mode 100644 Assets/UIResources/Home/炮台/LCSGSL_btn01.png.meta create mode 100644 Assets/UIResources/Home/炮台/出战.png create mode 100644 Assets/UIResources/Home/炮台/出战.png.meta diff --git a/Assets/MyGame/Scenes/UIScene.unity b/Assets/MyGame/Scenes/UIScene.unity index ba78cd288..1267b16fe 100644 --- a/Assets/MyGame/Scenes/UIScene.unity +++ b/Assets/MyGame/Scenes/UIScene.unity @@ -202,6 +202,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 17528174} m_CullTransparentMesh: 1 +--- !u!1 &25931754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 25931755} + - component: {fileID: 25931757} + - component: {fileID: 25931756} + m_Layer: 0 + m_Name: "\u51FA\u6218" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &25931755 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 25931754} + 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: 1612247293} + 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: 4.500019, y: 1} + m_SizeDelta: {x: 92, y: 49} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &25931756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 25931754} + 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: df4357fbdb1734e4b9e12320d738f59e, 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!222 &25931757 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 25931754} + m_CullTransparentMesh: 1 --- !u!1 &35591157 GameObject: m_ObjectHideFlags: 0 @@ -2566,41 +2641,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 800598166} m_CullTransparentMesh: 1 ---- !u!1 &804343880 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 804343881} - m_Layer: 0 - m_Name: PSB_UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &804343881 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 804343880} - 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: 1096182889} - 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: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &840582229 GameObject: m_ObjectHideFlags: 0 @@ -2967,6 +3007,18 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 112.25, y: 11.973297} m_EdgeRadius: 0 +--- !u!224 &1067655147 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3014377986955302398, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + m_PrefabInstance: {fileID: 4082309184501553354} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1068890324 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + m_PrefabInstance: {fileID: 4082309184501553354} + m_PrefabAsset: {fileID: 0} --- !u!1 &1096182885 GameObject: m_ObjectHideFlags: 0 @@ -3062,7 +3114,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1819495571} - - {fileID: 804343881} + - {fileID: 2002180826} + - {fileID: 1068890324} - {fileID: 1804551267} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4318,6 +4371,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1592942946} m_CullTransparentMesh: 1 +--- !u!1 &1612247292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1612247293} + - component: {fileID: 1612247295} + - component: {fileID: 1612247294} + - component: {fileID: 1612247296} + m_Layer: 0 + m_Name: LCSGSL_btn01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1612247293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612247292} + 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: 25931755} + m_Father: {fileID: 1067655147} + 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.000011444, y: -309.5} + m_SizeDelta: {x: 227, y: 77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1612247294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612247292} + 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: 1471f0a0cf72dd444a5dfde4db5f6ff3, 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!222 &1612247295 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612247292} + m_CullTransparentMesh: 1 +--- !u!114 &1612247296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1612247292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1612247294} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1663842062 GameObject: m_ObjectHideFlags: 0 @@ -5000,6 +5174,41 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1969162102} m_CullTransparentMesh: 1 +--- !u!1 &2002180825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2002180826} + m_Layer: 0 + m_Name: PSB_UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2002180826 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2002180825} + 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: 1096182889} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2016282716 GameObject: m_ObjectHideFlags: 0 @@ -5572,6 +5781,173 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioMixer: {fileID: 24100000, guid: ca43f9a7549657a49a2978e97c7a621a, type: 2} +--- !u!1001 &4082309184501553354 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1096182889} + m_Modifications: + - target: {fileID: 701210061533139629, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_TargetGraphic + value: + objectReference: {fileID: 0} + - target: {fileID: 1297648713920603089, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3229796975909133108, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3229796975909133108, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3239626154716872945, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3964641041604178113, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: btn_Get + value: + objectReference: {fileID: 1612247296} + - target: {fileID: 4870890971057883554, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5615636425683840664, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_Name + value: TurretPanel + objectReference: {fileID: 0} + - target: {fileID: 5615636425683840664, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7093098185327927338, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8904622048228621647, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3014377986955302398, guid: aab7adfb6126f094f8860d975314558b, + type: 3} + insertIndex: 0 + addedObject: {fileID: 1612247293} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aab7adfb6126f094f8860d975314558b, type: 3} --- !u!1001 &8406649690848505089 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/Scripts/Manager/GameManager.cs b/Assets/MyGame/Scripts/Manager/GameManager.cs index 1d5cc8b15..4be4da016 100644 --- a/Assets/MyGame/Scripts/Manager/GameManager.cs +++ b/Assets/MyGame/Scripts/Manager/GameManager.cs @@ -19,7 +19,7 @@ public class GameManager : MonoSingleton public bool enableBot = true; // 人机开关 public GameConfig gameConfig; - public Dictionary dic_fishTypeConfigs=new Dictionary(); + public Dictionary dic_fishTypeConfigs = new Dictionary(); public UserData user; public GameData gameData = new GameData(); public Scene scene; @@ -116,8 +116,8 @@ public class GameManager : MonoSingleton public void UpdataUserData(UserData user) { - this.user = user; - OnUserDataChanged?.Invoke(); + this.user = user; + OnUserDataChanged?.Invoke(); } protected override void Awake() { @@ -133,26 +133,27 @@ public class GameManager : MonoSingleton 2 => -1, _ => 60 }; - - AudioResourcesData audioResourcesData=new AudioResourcesData(); + + AudioResourcesData audioResourcesData = new AudioResourcesData(); InItLoad(); //TurretResourcesData turretResourcesData = new TurretResourcesData(); Application.runInBackground = true; base.Awake(); - cameraShake = Camera.main.GetComponent(); + cameraShake = Camera.main.GetComponent(); gameData.currUser = "123"; //string json = Resources.Load("Config/GameConfig").text; //gameConfig = JsonConvert.DeserializeObject>(json).data; - APIManager.Response(APIType.GameConfig_Get, - res => { - gameConfig = res; - var v = CreateFishManager.Instance.CreateDic; - foreach (var item in gameConfig.fishTypeConfigs) + APIManager.Response(APIType.GameConfig_Get, + res => { - dic_fishTypeConfigs[item.fishNumber]=item; - } - }); + gameConfig = res; + var v = CreateFishManager.Instance.CreateDic; + foreach (var item in gameConfig.fishTypeConfigs) + { + dic_fishTypeConfigs[item.fishNumber] = item; + } + }); } public async Task InItLoad() @@ -215,7 +216,7 @@ public class GameManager : MonoSingleton }, 28); btn_Skip.onClick.AddListener(() => { - UIManager.Instance.StopShowPanel(); + UIManager.Instance.StopShowPanel(); UIManager.Instance.ShowAsync(UIPanel.LoginPanel, null, null, 0); v.LoadBar(100); }); diff --git a/Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab index bee8c9399..182b29272 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/JJJPanel.prefab @@ -3060,6 +3060,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3774117742396719510} + - component: {fileID: 7247793815140248773} + - component: {fileID: 1611456700496682584} m_Layer: 0 m_Name: ch0 m_TagString: Untagged @@ -3090,6 +3092,44 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7247793815140248773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939452874933891810} + m_CullTransparentMesh: 1 +--- !u!114 &1611456700496682584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939452874933891810} + 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: 0, g: 0, b: 0, a: 0.2784314} + 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: 0} + 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 &6244345632787409169 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab index 9b534f177..8d406bf4f 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/TurretPanel.prefab @@ -1,5 +1,80 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &231472262106054148 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1502376362666838762} + - component: {fileID: 3918897850985263043} + - component: {fileID: 6277831306284282460} + m_Layer: 0 + m_Name: "\u51FA\u6218" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1502376362666838762 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231472262106054148} + 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: 2173153052804533598} + 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: 4.500019, y: 1} + m_SizeDelta: {x: 92, y: 49} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3918897850985263043 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231472262106054148} + m_CullTransparentMesh: 1 +--- !u!114 &6277831306284282460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 231472262106054148} + 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: df4357fbdb1734e4b9e12320d738f59e, 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 &365645189080748317 GameObject: m_ObjectHideFlags: 0 @@ -474,7 +549,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7047705136109306664 RectTransform: m_ObjectHideFlags: 0 @@ -2240,6 +2315,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 2173153052804533598} - {fileID: 4670066188549950499} - {fileID: 7047705136109306664} - {fileID: 9210332093848116924} @@ -2367,6 +2443,127 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5282586523906308169 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2173153052804533598} + - component: {fileID: 4584950642129191644} + - component: {fileID: 8792364452421754945} + - component: {fileID: 426427820301455892} + m_Layer: 0 + m_Name: LCSGSL_btn01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2173153052804533598 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5282586523906308169} + 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: 1502376362666838762} + m_Father: {fileID: 3014377986955302398} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0.000011444, y: 65.5} + m_SizeDelta: {x: 227, y: 77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4584950642129191644 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5282586523906308169} + m_CullTransparentMesh: 1 +--- !u!114 &8792364452421754945 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5282586523906308169} + 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: 1471f0a0cf72dd444a5dfde4db5f6ff3, 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 &426427820301455892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5282586523906308169} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8792364452421754945} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &5291076554686105756 GameObject: m_ObjectHideFlags: 0 @@ -2988,7 +3185,7 @@ MonoBehaviour: m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_DisabledColor: {r: 0.6509434, g: 0.6509434, b: 0.6509434, a: 1} m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: @@ -3065,7 +3262,7 @@ MonoBehaviour: btn_Turret: {fileID: 8357955158698256104} btn_Wing: {fileID: 7767001353994184739} btn_ZS: {fileID: 6358180352555696406} - btn_Get: {fileID: 5034870180401538498} + btn_Get: {fileID: 426427820301455892} btn_DuiHuan: {fileID: 4336991627547622938} propIcon: {fileID: 1249392386408153250} slider: {fileID: 701210061533139629} @@ -4346,7 +4543,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5965340176431784292 RectTransform: m_ObjectHideFlags: 0 @@ -5548,7 +5745,7 @@ RectTransform: m_Father: {fileID: 4426108099970246621} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {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} diff --git a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs index 2fb0a3894..4fc9a9003 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UIHome_BY_ItemListPanels.cs @@ -625,9 +625,9 @@ public class UIHome_BY_ItemListPanels : SubUIBase if (!hasFragment) return; - // 设置图标 - if (propIcon != null && info.config.sprite_Icon != null) - propIcon.sprite = info.config.sprite_Icon; + // 设置图标（异步加载网络图片） + if (propIcon != null) + info.config.GetSprite(sprite => propIcon.sprite = sprite); // 进度条 if (slider != null) diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab index 5a142fe0a..21bca942c 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab +++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfo.prefab @@ -229,6 +229,7 @@ RectTransform: m_Children: - {fileID: 7021892489003784022} - {fileID: 1582884650947970008} + - {fileID: 4165895844145755112} m_Father: {fileID: 6531766827173197559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -251,7 +252,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 53482567441278788} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -830,6 +831,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &422950330589313753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 591286262369880382} + - component: {fileID: 9004694258279156429} + - component: {fileID: 2485566846365468008} + m_Layer: 0 + m_Name: BY_beibao_001 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &591286262369880382 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 422950330589313753} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 8260521118857325403} + 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 &9004694258279156429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 422950330589313753} + m_CullTransparentMesh: 1 +--- !u!114 &2485566846365468008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 422950330589313753} + 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: 321c3de7a6c3f1547a67ccee72a881f6, 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 &641722683714142170 GameObject: m_ObjectHideFlags: 0 @@ -1055,6 +1131,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &963519937502347482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8289694004422076145} + - component: {fileID: 5407671254579438257} + - component: {fileID: 8909506851481417773} + m_Layer: 0 + m_Name: BY_beibao_001 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8289694004422076145 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963519937502347482} + 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: 8260521118857325403} + 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: -1.5000954, y: 1} + m_SizeDelta: {x: 149, y: 151} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5407671254579438257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963519937502347482} + m_CullTransparentMesh: 1 +--- !u!114 &8909506851481417773 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963519937502347482} + 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: 321c3de7a6c3f1547a67ccee72a881f6, 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 &989108622245272261 GameObject: m_ObjectHideFlags: 0 @@ -1358,6 +1509,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1507523199676569785} + - {fileID: 8260521118857325403} m_Father: {fileID: 1144534507188599549} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1523,6 +1675,7 @@ RectTransform: m_Children: - {fileID: 3586536291115628539} - {fileID: 5546569630660081985} + - {fileID: 8394314153517109561} m_Father: {fileID: 6531766827173197559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1545,7 +1698,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1869557784549864228} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -2036,7 +2189,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7179182235882371546} - {fileID: 5500094996109262235} - {fileID: 6531766827173197559} - {fileID: 4830950742719941258} @@ -2432,6 +2584,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2649575959700075319 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1280436008884507918} + - component: {fileID: 1593401703581610071} + - component: {fileID: 552035622999874279} + m_Layer: 0 + m_Name: "\u4F7F\u7528" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1280436008884507918 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649575959700075319} + 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: 7205644592027971919} + 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: 1.5, y: -0.5000305} + m_SizeDelta: {x: 34, y: 18} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1593401703581610071 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649575959700075319} + m_CullTransparentMesh: 1 +--- !u!114 &552035622999874279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649575959700075319} + 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: ccd289bb581cef442ab0540da6b6ebe6, 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 &2656544184483991162 GameObject: m_ObjectHideFlags: 0 @@ -2552,6 +2779,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &2773789150393443165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4617571692212046382} + - component: {fileID: 7083410644374196524} + - component: {fileID: 9156189494281738147} + m_Layer: 0 + m_Name: BY_beibao_001 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4617571692212046382 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2773789150393443165} + 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: 4480698485449847675} + 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: 23.318237, y: -139.6539} + m_SizeDelta: {x: 296, y: 210.98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7083410644374196524 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2773789150393443165} + m_CullTransparentMesh: 1 +--- !u!114 &9156189494281738147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2773789150393443165} + 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: 07c23ab8338f76e4fb91ca27fb6aa65f, type: 3} + m_Type: 1 + 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 &2900965390516453086 GameObject: m_ObjectHideFlags: 0 @@ -2594,11 +2896,11 @@ RectTransform: - {fileID: 2105177354812291146} - {fileID: 8335951666877626290} - {fileID: 4773980727363045215} - m_Father: {fileID: 1898386671018826277} + m_Father: {fileID: 4830950742719941258} 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: 0} + m_AnchoredPosition: {x: -73.50006, y: 54.5} m_SizeDelta: {x: 1090, y: 672} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6416915315631352330 @@ -2910,6 +3212,83 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3563144062429173584 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1290345300647658929} + - component: {fileID: 5026847032656426433} + - component: {fileID: 8745923730644143772} + m_Layer: 0 + m_Name: tyzr_xllb_btn1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1290345300647658929 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3563144062429173584} + 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: 4787857100516410518} + - {fileID: 9025505265212631120} + m_Father: {fileID: 4480698485449847675} + 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: 31.318298, y: 80.336} + m_SizeDelta: {x: 242, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5026847032656426433 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3563144062429173584} + m_CullTransparentMesh: 1 +--- !u!114 &8745923730644143772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3563144062429173584} + 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: 325ec429832de114b8a0257d72a573fc, 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 &3670351685464943905 GameObject: m_ObjectHideFlags: 0 @@ -3523,6 +3902,7 @@ RectTransform: m_Children: - {fileID: 6040220677578757485} - {fileID: 7988396597179035806} + - {fileID: 4407753267381258669} m_Father: {fileID: 6531766827173197559} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -3545,7 +3925,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4293892815080003756} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -3703,6 +4083,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4414265151069598922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4165895844145755112} + - component: {fileID: 6955915865266179487} + - component: {fileID: 2645956690273398491} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4165895844145755112 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4414265151069598922} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7125, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7810589117462327535} + 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: -42.799988} + m_SizeDelta: {x: 234, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6955915865266179487 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4414265151069598922} + m_CullTransparentMesh: 1 +--- !u!114 &2645956690273398491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4414265151069598922} + 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: 5299d6dfa1119cb4f957c3a5273b2aa9, 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 &4466607103834716643 GameObject: m_ObjectHideFlags: 0 @@ -4066,7 +4521,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5976482026915993404 RectTransform: m_ObjectHideFlags: 0 @@ -4080,13 +4535,14 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1144534507188599549} + - {fileID: 4480698485449847675} m_Father: {fileID: 1898386671018826277} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 75.002, y: -46.837} - m_SizeDelta: {x: -224, y: -145.21} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 187, y: -46.836} + m_SizeDelta: {x: 545.5314, y: 526.79} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &1555784747236350688 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4102,7 +4558,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4627798557576630350} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -4485,6 +4941,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4830991441159006917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4407753267381258669} + - component: {fileID: 6181773882831827174} + - component: {fileID: 7590315432647132557} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4407753267381258669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4830991441159006917} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7125, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6411616201880635070} + 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: -42.799988} + m_SizeDelta: {x: 234, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6181773882831827174 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4830991441159006917} + m_CullTransparentMesh: 1 +--- !u!114 &7590315432647132557 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4830991441159006917} + 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: 5299d6dfa1119cb4f957c3a5273b2aa9, 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 &4975976654024076485 GameObject: m_ObjectHideFlags: 0 @@ -4695,7 +5226,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4830950742719941258 RectTransform: m_ObjectHideFlags: 0 @@ -4710,6 +5241,7 @@ RectTransform: m_Children: - {fileID: 4070896026580936839} - {fileID: 256497439741522925} + - {fileID: 7179182235882371546} m_Father: {fileID: 1898386671018826277} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -4717,6 +5249,133 @@ RectTransform: m_AnchoredPosition: {x: 73.50006, y: -54.5} m_SizeDelta: {x: 885, y: 563} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5182946925655888282 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8260521118857325403} + - component: {fileID: 3344510525958726156} + - component: {fileID: 2249937358188151316} + - component: {fileID: 4003580760331289794} + m_Layer: 0 + m_Name: Toggle_01 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8260521118857325403 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5182946925655888282} + 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: 591286262369880382} + - {fileID: 8289694004422076145} + - {fileID: 3053341442591032491} + m_Father: {fileID: 7630535268217692554} + 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: 72.234314, y: 60.336} + m_SizeDelta: {x: 130, y: 129} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3344510525958726156 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5182946925655888282} + m_CullTransparentMesh: 1 +--- !u!114 &2249937358188151316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5182946925655888282} + 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: e32e6202b66d8bf46bee8efac00974ea, 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 &4003580760331289794 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5182946925655888282} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2249937358188151316} + toggleTransition: 1 + graphic: {fileID: 8909506851481417773} + m_Group: {fileID: 0} + onValueChanged: + m_PersistentCalls: + m_Calls: [] + m_IsOn: 0 --- !u!1 &5278873699181793228 GameObject: m_ObjectHideFlags: 0 @@ -4868,6 +5527,81 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &5343541305128368287 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3053341442591032491} + - component: {fileID: 6172369947763341993} + - component: {fileID: 1809567366645300026} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_015 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3053341442591032491 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5343541305128368287} + 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: 8260521118857325403} + 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: 38.49996, y: -37} + m_SizeDelta: {x: 55, y: 45} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6172369947763341993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5343541305128368287} + m_CullTransparentMesh: 1 +--- !u!114 &1809567366645300026 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5343541305128368287} + 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: a52487c0501db6b4b8e684ded0e25eff, 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 &5591369288884661773 GameObject: m_ObjectHideFlags: 0 @@ -5371,6 +6105,81 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &6248109817381615949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1387974777497448688} + - component: {fileID: 3086979524044865667} + - component: {fileID: 886150808575030398} + m_Layer: 0 + m_Name: BY_beibao_001 (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1387974777497448688 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6248109817381615949} + 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: 4480698485449847675} + 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: 28.818207, y: 119.836} + m_SizeDelta: {x: 307, y: 308} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3086979524044865667 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6248109817381615949} + m_CullTransparentMesh: 1 +--- !u!114 &886150808575030398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6248109817381615949} + 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: 79403aa6eb57b434fa357d7acf510354, 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 &6269226836672990510 GameObject: m_ObjectHideFlags: 0 @@ -5716,7 +6525,9 @@ MonoBehaviour: tMPText_IP: {fileID: 8286863895223483902} tMPText_VIPLeave: {fileID: 4098653053053118094} tMPText_PhoneNumber: {fileID: 7174896096397030657} - prefab_AvatarItem: {fileID: 69633272714753474} + img_ShowAvatar: {fileID: 4391038728486854828} + prefab_AvatarItem: {fileID: 4003580760331289794} + btn_UseAvatar: {fileID: 6393497893616614145} parent_AvatarList: {fileID: 2321029881299356511} --- !u!1 &6364279370851380438 GameObject: @@ -6019,6 +6830,81 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6895374513747473628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4787857100516410518} + - component: {fileID: 4191960691183554628} + - component: {fileID: 3155997016136192779} + m_Layer: 0 + m_Name: "\u9ED8\u8BA4\u5934\u50CF" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4787857100516410518 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6895374513747473628} + 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: 1290345300647658929} + 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: 2, y: 0} + m_SizeDelta: {x: 96, y: 23} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4191960691183554628 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6895374513747473628} + m_CullTransparentMesh: 1 +--- !u!114 &3155997016136192779 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6895374513747473628} + 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: 269a6e243e5cd4a4bb5904ca1d5bb822, 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 &6903987442548994572 GameObject: m_ObjectHideFlags: 0 @@ -6354,6 +7240,45 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7061896683569550325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4480698485449847675} + m_Layer: 0 + m_Name: rightZhanShi + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4480698485449847675 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7061896683569550325} + 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: 4617571692212046382} + - {fileID: 1387974777497448688} + - {fileID: 1290345300647658929} + - {fileID: 7205644592027971919} + m_Father: {fileID: 5976482026915993404} + 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: 429.91608, y: -0.000015259} + m_SizeDelta: {x: 314.2921, y: 526.79} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7097820593893495468 GameObject: m_ObjectHideFlags: 0 @@ -7112,6 +8037,82 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &7738578246888054953 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7382550712069811745} + - component: {fileID: 6128613283402666479} + - component: {fileID: 4391038728486854828} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_019 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7382550712069811745 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7738578246888054953} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.95, y: 0.95, z: 0.95} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 9025505265212631120} + 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.000030517578, y: 0} + m_SizeDelta: {x: 99, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6128613283402666479 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7738578246888054953} + m_CullTransparentMesh: 1 +--- !u!114 &4391038728486854828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7738578246888054953} + 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: -3973978390330965178, guid: 030564ed70b8a6144a8ba557c55d544c, + 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 &7884373584477514449 GameObject: m_ObjectHideFlags: 0 @@ -7732,6 +8733,127 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &8684516353278155249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7205644592027971919} + - component: {fileID: 1808063427005706841} + - component: {fileID: 7336515233496194183} + - component: {fileID: 6393497893616614145} + m_Layer: 0 + m_Name: 08 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7205644592027971919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8684516353278155249} + 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: 1280436008884507918} + m_Father: {fileID: 4480698485449847675} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 28.818207, y: 276.731} + m_SizeDelta: {x: 103, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1808063427005706841 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8684516353278155249} + m_CullTransparentMesh: 1 +--- !u!114 &7336515233496194183 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8684516353278155249} + 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: 0f832abd606184344a931a581214e7e4, 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 &6393497893616614145 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8684516353278155249} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7336515233496194183} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &8804307917458477250 GameObject: m_ObjectHideFlags: 0 @@ -7960,3 +9082,155 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &9096573895796903408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9025505265212631120} + - component: {fileID: 2408054037810648819} + - component: {fileID: 7411734724522400213} + m_Layer: 0 + m_Name: BY_PlaneInfoPanel_019 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9025505265212631120 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096573895796903408} + 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: 7382550712069811745} + m_Father: {fileID: 1290345300647658929} + 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: -4.4999695, y: 97.5} + m_SizeDelta: {x: 99, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2408054037810648819 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096573895796903408} + m_CullTransparentMesh: 1 +--- !u!114 &7411734724522400213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9096573895796903408} + 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: -3973978390330965178, guid: 030564ed70b8a6144a8ba557c55d544c, + 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 &9219929080764941511 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8394314153517109561} + - component: {fileID: 314407302481083510} + - component: {fileID: 1951096904595687438} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8394314153517109561 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219929080764941511} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7125, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7180028641107395} + 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: -42.8} + m_SizeDelta: {x: 234, y: 3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &314407302481083510 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219929080764941511} + m_CullTransparentMesh: 1 +--- !u!114 &1951096904595687438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9219929080764941511} + 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: 5299d6dfa1119cb4f957c3a5273b2aa9, 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 diff --git a/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs b/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs index 7923c7aec..4c7027bce 100644 --- a/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs +++ b/Assets/MyGame/aa/UI/Home/Sub/UserInfoPanel.cs @@ -11,7 +11,7 @@ using UnityEngine.UI; public class UserInfoPanel : SubUIBase { [Header("基础信息")] - public Image sprite_Avatar; + public Image sprite_Avatar; // 显示已保存的用户头像（点使用后更新） public Button btn_ChangeUser; public TextMeshProUGUI tMPText_Name; public TextMeshProUGUI tMPText_ID; @@ -22,30 +22,23 @@ public class UserInfoPanel : SubUIBase public TextMeshProUGUI tMPText_PhoneNumber; [Header("头像选择")] - public GameObject prefab_AvatarItem; // 头像选项预制体（含 Image + Button） + public Image img_ShowAvatar; // 预览头像（选中即更新） + public Toggle prefab_AvatarItem; // 头像选项预制体（child0=Image, child2=选中对号） + public Button btn_UseAvatar; // 确认使用按钮 public Transform parent_AvatarList; GameManager gameManager => GameManager.Instance; + private List _avatarToggles = new List(); + private string _pendingAvatarName; // 选中的待确认头像名 public override void Awake() { base.Awake(); btn_ChangeUser.onClick.AddListener(() => { - // 退出登录 → 返回登录界面 - gameManager.Logout( - // () => - //{ - // UIManager.Instance.Show(null, () => - // { - // SceneMgr.Instance.LoadScene("Login", () => - // { - // UIManager.Instance.ShowUI(); - // }); - // }); - //} - ); + gameManager.Logout(); }); + btn_UseAvatar.onClick.AddListener(OnClickUseAvatar); } protected override void OnShow(object args = null) @@ -53,7 +46,16 @@ public class UserInfoPanel : SubUIBase base.OnShow(args); InitInformation(); BuildAvatarList(); + // 监听头像变更 + gameManager.OnAvatarChanged += OnAvatarChanged; + } + protected override void OnHide() + { + base.OnHide(); + gameManager.OnAvatarChanged -= OnAvatarChanged; + // 清理 toggle 列表 + _avatarToggles.Clear(); } // ==================== 基础信息 ==================== @@ -62,8 +64,9 @@ public class UserInfoPanel : SubUIBase { tMPText_Name.color = gameManager.user.BaseInfo.isRedName ? Color.red : Color.white; - // 加载当前用户头像 + // 初始化两个头像（正式头像 和 预览头像）都为当前已保存的头像 LoadAvatarImage(sprite_Avatar, gameManager.user.BaseInfo.avatarUrl); + LoadAvatarImage(img_ShowAvatar, gameManager.user.BaseInfo.avatarUrl); tMPText_Name.text = gameManager.user.BaseInfo.userName; tMPText_ID.text = gameManager.user.BaseInfo.number; @@ -76,9 +79,6 @@ public class UserInfoPanel : SubUIBase // ==================== 头像加载 ==================== - /// - /// 加载头像图片：判断 avatarUrl 是本地ID还是网络URL - /// private void LoadAvatarImage(Image target, string avatarUrl) { if (target == null) return; @@ -107,41 +107,121 @@ public class UserInfoPanel : SubUIBase // 清空旧列表 for (int i = parent_AvatarList.childCount - 1; i >= 0; i--) Destroy(parent_AvatarList.GetChild(i).gameObject); + _avatarToggles.Clear(); - // 从 GameManager 获取所有头像缓存 + // 获取所有头像 gameManager.InitAvatarCache(); var allSprites = Resources.LoadAll("Avatar"); + string currentAvatar = gameManager.user.BaseInfo.avatarUrl; foreach (var sprite in allSprites) { var obj = Instantiate(prefab_AvatarItem, parent_AvatarList); - // 设置头像图片 - var img = obj.GetComponentInChildren(); - if (img != null) - img.sprite = sprite; - - // 点击按钮 → 应用头像 - var btn = obj.GetComponent