From e4596beb99c12c81386496df91a06119cbd01cb7 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 24 Dec 2020 19:57:19 +0900 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=9D=E7=89=A9=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E5=AE=9D=E7=89=A9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8A=A0=E5=8F=B7=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/RoleInfo/RoleEquipPanel.prefab | 599 +++++++++++++++--- .../~Lua/Modules/RoleInfo/RoleEquipPanel.lua | 58 +- 2 files changed, 575 insertions(+), 82 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab index 7bc09409d2..7f69429fe9 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab @@ -108,7 +108,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 1.8, y: -2.1} + m_AnchoredPosition: {x: 1.8000488, y: -2.0996094} m_SizeDelta: {x: 87.6, y: 180.8} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222210643621885542 @@ -4707,7 +4707,7 @@ ParticleSystem: --- !u!199 &199913150007694034 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -4796,6 +4796,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8520525050194759326} + - {fileID: 9103179403459364806} - {fileID: 8520111332518550340} - {fileID: 8430748572476862550} - {fileID: 224113881136025372} @@ -5522,6 +5523,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224353427390833726} + - component: {fileID: 6485253085604717195} m_Layer: 5 m_Name: equipInfo m_TagString: Untagged @@ -5554,6 +5556,48 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 508} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6485253085604717195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1406983756428474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 1.3, y: 1.3, z: 1.3} + initFloat: 0 + isInit: 1 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 0 + duration: 0.8 + delay: 0 + curveType: 1 + changeType: 4 + sequeueType: 1 + loop: 999999999 + loopType: 1 + targetObj: {fileID: 7042194726523352613} + - initV3: {x: 1.3, y: 1.3, z: 1.3} + initFloat: 0 + isInit: 1 + changeV3: {x: 1, y: 1, z: 1} + changeFloat: 0 + duration: 0.8 + delay: 0 + curveType: 1 + changeType: 4 + sequeueType: 1 + loop: 999999999 + loopType: 1 + targetObj: {fileID: 9103179403459364806} + isPlayAudio: 0 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 --- !u!1 &1436945794551186 GameObject: m_ObjectHideFlags: 0 @@ -5871,6 +5915,7 @@ RectTransform: - {fileID: 8252778861248733457} - {fileID: 1708598082656106510} - {fileID: 7685616055290300879} + - {fileID: 2926523445335401132} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6133,12 +6178,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.0000012715682, y: -84.1} + m_AnchoredPosition: {x: 0, y: -95.13} m_SizeDelta: {x: 64.4, y: 37.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222830642419362928 @@ -6268,6 +6313,7 @@ GameObject: m_Component: - component: {fileID: 224330976962607446} - component: {fileID: 222047524846003820} + - component: {fileID: 2786487644631584447} m_Layer: 5 m_Name: equipPre m_TagString: Untagged @@ -6286,16 +6332,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 8519913330498722392} - - {fileID: 8520086518225616578} - - {fileID: 8519510706871402366} - - {fileID: 224079165133665220} - - {fileID: 3023044278107649644} - - {fileID: 68852558248628701} - - {fileID: 1798466573971669330} - - {fileID: 547633604264550929} - - {fileID: 1479702943450310725} - - {fileID: 9114126172663038642} + - {fileID: 6416047725703560400} m_Father: {fileID: 224444569024407278} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6312,6 +6349,61 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1560910637748888} m_CullTransparentMesh: 0 +--- !u!114 &2786487644631584447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1560910637748888} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: -20, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 0 + duration: 0.3 + delay: 0 + curveType: 0 + changeType: 0 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 6416047725703560400} + - initV3: {x: 0, y: 0, z: 0} + initFloat: 0 + isInit: 1 + changeV3: {x: 1.15, y: 1.15, z: 1.15} + changeFloat: 1 + duration: 0.3 + delay: 0 + curveType: 0 + changeType: 8 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 6416047725703560400} + - initV3: {x: 1.15, y: 1.15, z: 1.15} + initFloat: 0 + isInit: 1 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 0 + duration: 0.3 + delay: 0 + curveType: 1 + changeType: 0 + sequeueType: 0 + loop: 0 + loopType: 0 + targetObj: {fileID: 6416047725703560400} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 0 --- !u!1 &1568014611191522 GameObject: m_ObjectHideFlags: 0 @@ -6493,6 +6585,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8520742174415633032} + - {fileID: 7042194726523352613} - {fileID: 8519697061298595646} - {fileID: 8844391819624193938} - {fileID: 8315436002651274950} @@ -12210,7 +12303,7 @@ ParticleSystem: --- !u!199 &199808684316966162 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -12376,7 +12469,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224461338842806296} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -17788,7 +17881,7 @@ ParticleSystem: --- !u!199 &3852268799559907720 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -22566,7 +22659,7 @@ ParticleSystem: --- !u!199 &5271325450925093107 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -27264,7 +27357,7 @@ ParticleSystem: --- !u!199 &3183714690231709786 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -32368,7 +32461,7 @@ ParticleSystem: --- !u!199 &1743651251639927205 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -37124,7 +37217,7 @@ ParticleSystem: --- !u!199 &7475280723313167660 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -41880,7 +41973,7 @@ ParticleSystem: --- !u!199 &9150494766190968901 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -46614,7 +46707,7 @@ ParticleSystem: --- !u!199 &7199790129551958231 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -51370,7 +51463,7 @@ ParticleSystem: --- !u!199 &5940030307403993872 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -56362,7 +56455,7 @@ ParticleSystem: --- !u!199 &8744724081048752083 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61352,7 +61445,7 @@ ParticleSystem: --- !u!199 &4790988713032616438 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -61445,7 +61538,7 @@ RectTransform: - {fileID: 3737616370418767340} - {fileID: 417503009686570305} m_Father: {fileID: 224461338842806296} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -61618,12 +61711,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 36.5, y: -42} + m_AnchoredPosition: {x: 37.09497, y: -50.539978} m_SizeDelta: {x: 64.4, y: 37.51} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3026324966979602442 @@ -61793,12 +61886,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 9 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: -50.2, y: 64.5} + m_AnchoredPosition: {x: -38.205017, y: 52} m_SizeDelta: {x: 74, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5308303422839236163 @@ -66573,7 +66666,7 @@ ParticleSystem: --- !u!199 &7601660874278259845 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -71438,7 +71531,7 @@ ParticleSystem: --- !u!199 &3734719174028801100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -76172,7 +76265,7 @@ ParticleSystem: --- !u!199 &7852783147755868435 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -76231,6 +76324,51 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &4031645213677639230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6416047725703560400} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6416047725703560400 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4031645213677639230} + 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_Children: + - {fileID: 8519913330498722392} + - {fileID: 8520086518225616578} + - {fileID: 8519510706871402366} + - {fileID: 224079165133665220} + - {fileID: 3023044278107649644} + - {fileID: 68852558248628701} + - {fileID: 1798466573971669330} + - {fileID: 547633604264550929} + - {fileID: 1479702943450310725} + - {fileID: 9114126172663038642} + m_Father: {fileID: 224330976962607446} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150.41, y: 179.24} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4080019795352935060 GameObject: m_ObjectHideFlags: 0 @@ -76265,7 +76403,7 @@ RectTransform: - {fileID: 5805220613189928480} - {fileID: 29708931449523993} m_Father: {fileID: 224737750581944100} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -81186,7 +81324,7 @@ ParticleSystem: --- !u!199 &5795776126709631377 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -85942,7 +86080,7 @@ ParticleSystem: --- !u!199 &645669681233002935 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90698,7 +90836,7 @@ ParticleSystem: --- !u!199 &3025146004537813439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -90757,6 +90895,71 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &4952913595944623042 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2926523445335401132} + - component: {fileID: 3384906617467824093} + - component: {fileID: 713547358494534050} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2926523445335401132 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4952913595944623042} + 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_Children: [] + m_Father: {fileID: 224444569024407278} + m_RootOrder: 20 + 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 &3384906617467824093 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4952913595944623042} + m_CullTransparentMesh: 0 +--- !u!114 &713547358494534050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4952913595944623042} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &4973035429888691632 GameObject: m_ObjectHideFlags: 0 @@ -95454,7 +95657,7 @@ ParticleSystem: --- !u!199 &5065274489376317798 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -100402,7 +100605,7 @@ ParticleSystem: --- !u!199 &1063978642119183846 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -105193,7 +105396,7 @@ ParticleSystem: --- !u!199 &4577166716739436122 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -110095,7 +110298,7 @@ ParticleSystem: --- !u!199 &521858604409485964 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -110614,7 +110817,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 224737750581944100} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -115434,7 +115637,7 @@ ParticleSystem: --- !u!199 &3013826695847252014 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -120190,7 +120393,7 @@ ParticleSystem: --- !u!199 &413717427226994198 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -125021,7 +125224,7 @@ ParticleSystem: --- !u!199 &388545298818640071 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -129777,7 +129980,7 @@ ParticleSystem: --- !u!199 &4120970463321800302 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -134511,7 +134714,7 @@ ParticleSystem: --- !u!199 &7717983067442452609 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -139566,7 +139769,7 @@ ParticleSystem: --- !u!199 &2287083752582572032 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -144418,7 +144621,7 @@ ParticleSystem: --- !u!199 &1755222855953066752 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -149116,7 +149319,7 @@ ParticleSystem: --- !u!199 &8370477990178466979 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -153968,7 +154171,7 @@ ParticleSystem: --- !u!199 &6004082643824602778 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -154087,16 +154290,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7333865684040614673} - 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_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 8 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.0015742, y: -45} + m_AnchoredPosition: {x: 0, y: -57.87} m_SizeDelta: {x: 150.41, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &280877753077012660 @@ -158838,7 +159041,7 @@ ParticleSystem: --- !u!199 &2598195503796815680 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -163673,7 +163876,7 @@ ParticleSystem: --- !u!199 &8828901401956282593 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -168407,7 +168610,7 @@ ParticleSystem: --- !u!199 &5648459871644747481 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -168562,6 +168765,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6218\u9774" LanguageIndex: 11545 +--- !u!1 &7951106513833101093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7042194726523352613} + - component: {fileID: 5184210322330901542} + - component: {fileID: 1857844473677005366} + m_Layer: 5 + m_Name: add + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7042194726523352613 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7951106513833101093} + 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_Children: [] + m_Father: {fileID: 224737750581944100} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 48, y: 44} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5184210322330901542 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7951106513833101093} + m_CullTransparentMesh: 0 +--- !u!114 &1857844473677005366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7951106513833101093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 4080a1963cb778b47b33972e55bd5d9d, 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 --- !u!1 &7968629032518983180 GameObject: m_ObjectHideFlags: 0 @@ -173201,7 +173478,7 @@ ParticleSystem: --- !u!199 &7148827205064525326 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -177957,7 +178234,7 @@ ParticleSystem: --- !u!199 &3981746168289052076 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -178041,16 +178318,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7988108263598189947} - 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_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 58.3, y: 72.8} + m_AnchoredPosition: {x: 62.205017, y: 61.974976} m_SizeDelta: {x: 26, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4726073875329451098 @@ -182825,7 +183102,7 @@ ParticleSystem: --- !u!199 &4752419209397002737 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -182909,16 +183186,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8215104791689758812} - 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_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 7 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: -8.2, y: 71.5} + m_AnchoredPosition: {x: 0, y: 54.61} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1124538542318748953 @@ -187756,7 +188033,7 @@ ParticleSystem: --- !u!199 &3843098992673722736 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -187850,7 +188127,7 @@ RectTransform: - {fileID: 4494805040267940149} - {fileID: 7892719658203971873} m_Father: {fileID: 224461338842806296} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -188073,12 +188350,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8520263029519379614} - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -1.0499864, y: 23.339981} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 131.89, y: 131.89} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8518388233919444098 @@ -188312,7 +188589,7 @@ RectTransform: - {fileID: 5954589829577688489} - {fileID: 6879932971547156798} m_Father: {fileID: 224737750581944100} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -189145,6 +189422,7 @@ GameObject: - component: {fileID: 8520525050194759326} - component: {fileID: 8518431040902365198} - component: {fileID: 8409820734941124992} + - component: {fileID: 8595067566727940986} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -189208,6 +189486,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &8595067566727940986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8441163502689370088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8409820734941124992} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &8441201170308035516 GameObject: m_ObjectHideFlags: 0 @@ -189391,12 +189711,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.0012325998, y: 14.4} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150.41, y: 149.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8518017555763564686 @@ -189728,12 +190048,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0.16, y: 14.799999} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 138.59, y: 138.59} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8518349096164050258 @@ -190251,6 +190571,7 @@ GameObject: - component: {fileID: 8520742174415633032} - component: {fileID: 8517867666750190570} - component: {fileID: 8410142406309447154} + - component: {fileID: 7143604143629004554} m_Layer: 5 m_Name: mask m_TagString: Untagged @@ -190314,6 +190635,48 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7143604143629004554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8441620365666448506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8410142406309447154} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &8441628680010100752 GameObject: m_ObjectHideFlags: 0 @@ -195224,7 +195587,7 @@ ParticleSystem: --- !u!199 &4527856640657632424 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -195310,12 +195673,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224330976962607446} + m_Father: {fileID: 6416047725703560400} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0.000045776367, y: 33.91004} + m_AnchoredPosition: {x: 0, y: 15.139999} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} --- !u!1 &8826535731029481720 @@ -200015,7 +200378,7 @@ ParticleSystem: --- !u!199 &4712161909095197685 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -200074,6 +200437,80 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 +--- !u!1 &8974925896736560983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9103179403459364806} + - component: {fileID: 6628754186758369672} + - component: {fileID: 3781782068612645055} + m_Layer: 5 + m_Name: add + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9103179403459364806 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974925896736560983} + 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_Children: [] + m_Father: {fileID: 224461338842806296} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 48, y: 44} + m_SizeDelta: {x: 40, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6628754186758369672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974925896736560983} + m_CullTransparentMesh: 0 +--- !u!114 &3781782068612645055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8974925896736560983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 4080a1963cb778b47b33972e55bd5d9d, 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 --- !u!1 &9153525102942892953 GameObject: m_ObjectHideFlags: 0 @@ -204771,7 +205208,7 @@ ParticleSystem: --- !u!199 &1704248638401735114 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 91bc008b0f..96082ba0f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -45,6 +45,8 @@ local jewerConfigs = ConfigManager.GetConfig(ConfigName.JewelConfig) local currPageIndex = 0 local curEquipTreasureDatas = {} local isCanUpEquipTreasure = false +local isPlayAnim = true +local isFristOpenTime --初始化组件(用于子类重写)RoleEquipChangePopup function RoleEquipPanel:InitComponent() orginLayer = 10 @@ -121,6 +123,11 @@ function RoleEquipPanel:InitComponent() this.treasurePage2 = Util.GetGameObject(self.transform, "Tabs/Btn6") this.emptyObj = Util.GetGameObject(self.transform, "emptyObj") this.emptyObj.gameObject:SetActive(false) + this.mask = Util.GetGameObject(self.gameObject, "mask") + this.equipBtn5 = Util.GetGameObject(self.gameObject,"bg/equipInfo/equip5/mask") + this.equipBtn6 = Util.GetGameObject(self.gameObject,"bg/equipInfo/equip6/mask") + this.equipBTn5Add = Util.GetGameObject(self.gameObject,"bg/equipInfo/equip5/add") + this.equipBtn6Add = Util.GetGameObject(self.gameObject,"bg/equipInfo/equip6/add") end --绑定事件(用于子类重写) @@ -138,6 +145,7 @@ function RoleEquipPanel:BindEvent() Util.AddClick( this.leftBtn, function() + isPlayAnim = true this:LeftBtnOnClick() end ) @@ -145,6 +153,7 @@ function RoleEquipPanel:BindEvent() Util.AddClick( this.rightBtn, function() + isPlayAnim = true this:RightBtnOnClick() end ) @@ -163,8 +172,9 @@ function RoleEquipPanel:BindEvent() ) for i = 0, 6 do Util.AddClick( - tabs[i], + tabs[i], function() + isPlayAnim = true if i == indexBtnNum then indexBtnNum = PosIdConst.All this:OnClickAllBtn() @@ -185,6 +195,20 @@ function RoleEquipPanel:BindEvent() UIManager.OpenPanel(UIName.EquipTreasureResonancePanel, curHeroData) end ) + + Util.AddClick( + this.equipBtn5, + function() + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,9999,nil) + end + ) + + Util.AddClick( + this.equipBtn6, + function() + UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,9998,nil) + end + ) end --添加事件监听(用于子类重写) @@ -225,6 +249,7 @@ function RoleEquipPanel:OnOpen(...) isUpZhen = data[4] end function RoleEquipPanel:OnShow() + isPlayAnim = true for i = 1, #heroListData do if curHeroData == heroListData[i] then index = i @@ -587,6 +612,11 @@ function this.ShowHeroEquip() else refineObj:SetActive(false) end + if i==5 then + this.equipBTn5Add:SetActive(false) + elseif i==6 then + this.equipBtn6Add:SetActive(false) + end else Util.GetGameObject(go.transform, "frame"):SetActive(false) Util.GetGameObject(go.transform, "mask"):SetActive(true) @@ -599,6 +629,11 @@ function this.ShowHeroEquip() if refineObj then refineObj:SetActive(false) end + if i==5 then + this.equipBTn5Add:SetActive(true) + elseif i==6 then + this.equipBtn6Add:SetActive(true) + end end local iconBtn = Util.GetGameObject(go.transform, "icon") Util.AddOnceClick( @@ -741,11 +776,28 @@ function this:SetItemData(_itemDatas) this.SingleItemDataShow(go, _itemDatas[index]) end ) + if isPlayAnim then + if isFristOpenTime then + isFristOpenTime:Stop() + isFristOpenTime = nil + end + isFristOpenTime = Timer.New(function() + this.mask:SetActive(false) + end, 1):Start() + this.mask:SetActive(true) + SecTorPlayAnimByScroll(this.ScrollView) + isPlayAnim = false + end end function this.SingleItemDataShow(_go, _itemData) if not itemConfig[_itemData.id] then return end + if isPlayAnim then + _go.gameObject:SetActive(false) + else + _go.gameObject:SetActive(true) + end local frame = Util.GetGameObject(_go.transform, "frame"):GetComponent("Image") local icon = Util.GetGameObject(_go.transform, "icon"):GetComponent("Image") local name = Util.GetGameObject(_go.transform, "name"):GetComponent("Text") @@ -1035,6 +1087,10 @@ function this.SelectImageSetParent(_objPoint) end --界面关闭时调用(用于子类重写) function RoleEquipPanel:OnClose() + if isFristOpenTime then + isFristOpenTime:Stop() + isFristOpenTime = nil + end end function this:AddRedPointVale(_equipDatas) for j = 1, #_equipDatas do