From 33eae40f5cdd822521cb21139c15ba3d6a00ffac Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Mon, 29 Apr 2024 16:49:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=85=B5=E6=8A=BD=E5=8D=A1=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightPointPassMainPanel.prefab | 56 +-- .../Prefabs/UI/Gem/GemPanel.prefab | 24 +- .../Prefabs/UI/Guide/GuideEffect.prefab | 10 +- .../UI/LingMaiMiJin/LingMaiMiJingPanel.prefab | 332 +++++++++++++++--- .../Prefabs/UI/RoleGift/RoleGiftPanel.prefab | 6 +- .../Prefabs/UI/RoleInfo/RoleInfoLayout.prefab | 20 +- .../TailsmanSoulView/TailsManSouPanel.prefab | 238 ++++++++++--- .../UI/TianShuMiJuan/IncarnationPanel.prefab | 34 +- .../Modules/Fight/FightPointPassMainPanel.lua | 7 +- .../Modules/Gem/SmallSoldierInfoPanel.lua | 69 ++-- 10 files changed, 582 insertions(+), 214 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 5479a35ea4..c30bf72311 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -21138,7 +21138,7 @@ RectTransform: - {fileID: 2047898567573916233} - {fileID: 8635743836815067626} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 5 + 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} @@ -31011,7 +31011,7 @@ RectTransform: - {fileID: 3475851123723171453} - {fileID: 2039013483296328481} m_Father: {fileID: 6702188124227719623} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -43329,7 +43329,7 @@ RectTransform: m_Children: - {fileID: 5374976552370438436} m_Father: {fileID: 3829532297210306968} - m_RootOrder: 6 + 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} @@ -58758,7 +58758,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6702188124227719623} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -70111,7 +70111,7 @@ RectTransform: - {fileID: 1472731821018359422} - {fileID: 5414118336734917796} m_Father: {fileID: 6702188124227719623} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -143406,7 +143406,6 @@ GameObject: m_Component: - component: {fileID: 3273070043154839095} - component: {fileID: 4350527450915963311} - - component: {fileID: 7958811591381693902} m_Layer: 5 m_Name: bossObj m_TagString: Untagged @@ -143444,35 +143443,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4851515959431831585} m_CullTransparentMesh: 0 ---- !u!114 &7958811591381693902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4851515959431831585} - m_Enabled: 0 - 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: 0 - 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: c7346d74dac4dff4ca09cbceb7cfdf5b, 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 &4883008712944302606 GameObject: m_ObjectHideFlags: 0 @@ -173622,6 +173592,7 @@ RectTransform: - {fileID: 8995352209643364119} - {fileID: 1462606925921962467} - {fileID: 8056442998148811723} + - {fileID: 7759392491232237277} - {fileID: 7731683230667820962} - {fileID: 9211529717236588707} - {fileID: 7200053648704114213} @@ -179779,7 +179750,7 @@ RectTransform: - {fileID: 9190110693106794230} - {fileID: 3564145235611155220} m_Father: {fileID: 6702188124227719623} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -222082,7 +222053,6 @@ RectTransform: - {fileID: 7828900952075963866} - {fileID: 5204423984622933357} - {fileID: 6591256859250515825} - - {fileID: 7759392491232237277} - {fileID: 2039730614} - {fileID: 2835335463341580670} m_Father: {fileID: 7718967529276036518} @@ -257957,7 +257927,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 3829532297210306968} + m_TransformParent: {fileID: 6702188124227719623} m_Modifications: - target: {fileID: 4044842431821162333, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} @@ -257982,17 +257952,17 @@ PrefabInstance: - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} @@ -258002,7 +257972,7 @@ PrefabInstance: - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} propertyPath: m_RootOrder - value: 4 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} @@ -258027,7 +257997,7 @@ PrefabInstance: - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} propertyPath: m_AnchoredPosition.y - value: -15 + value: 28 objectReference: {fileID: 0} - target: {fileID: 7844176110645609456, guid: 53b44f029897fbe44b680b2fd498f643, type: 3} diff --git a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab index 79aaef7f19..dc2e583b68 100644 --- a/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Gem/GemPanel.prefab @@ -1656,9 +1656,9 @@ RectTransform: m_Father: {fileID: 3070440297335827591} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 944, y: -135} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -142, y: -135} m_SizeDelta: {x: 132, y: 132} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6976425111254519243 @@ -7344,9 +7344,9 @@ RectTransform: m_Father: {fileID: 3070440297335827591} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 941, y: 223} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -145, y: 223} m_SizeDelta: {x: 132, y: 132} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4894940418700518333 @@ -11985,9 +11985,9 @@ RectTransform: m_Father: {fileID: 3070440297335827591} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 943, y: 43.000004} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -143, y: 43.000004} m_SizeDelta: {x: 132, y: 132} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5048347530619209236 @@ -24736,9 +24736,9 @@ RectTransform: m_Father: {fileID: 3070440297335827591} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 943, y: -317} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -143, y: -317} m_SizeDelta: {x: 132, y: 132} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2706816071366681652 diff --git a/Assets/ManagedResources/Prefabs/UI/Guide/GuideEffect.prefab b/Assets/ManagedResources/Prefabs/UI/Guide/GuideEffect.prefab index 78f49df6ae..3a4cf36892 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guide/GuideEffect.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guide/GuideEffect.prefab @@ -4495,7 +4495,7 @@ ParticleSystem: --- !u!199 &2044798311872068618 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9049,7 +9049,7 @@ ParticleSystem: --- !u!199 &7774433628521273595 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9227,7 +9227,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -9338,7 +9338,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -14021,7 +14021,7 @@ ParticleSystem: --- !u!199 &7079945586544786151 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/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index 8db5123065..966cbb01da 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -64,6 +64,8 @@ MonoBehaviour: 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: 2887ec8dbdcb57242a540f77f7cb5a72, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -113,6 +115,8 @@ MonoBehaviour: 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 &267862563827430822 GameObject: m_ObjectHideFlags: 0 @@ -177,6 +181,8 @@ MonoBehaviour: 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: 5acca8aa6e5dedf4199460017d5c2865, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -257,6 +263,8 @@ MonoBehaviour: 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: 4c6fe8d96a97af042b05c0ad043f8b03, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -306,6 +314,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &6348981682961857989 Animator: serializedVersion: 3 @@ -388,6 +398,8 @@ MonoBehaviour: 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: 70dfa10e08ead89418aaf9cd1a064279, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -460,6 +472,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -537,6 +551,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 28 @@ -696,6 +712,8 @@ MonoBehaviour: 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: 461e6af409ec67d45ba908596f22e977, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -805,6 +823,8 @@ MonoBehaviour: 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: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -940,6 +960,8 @@ MonoBehaviour: 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: d849200ce560759448cc0e59b87e1322, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1017,6 +1039,8 @@ MonoBehaviour: 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: 461e6af409ec67d45ba908596f22e977, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1126,6 +1150,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -1264,6 +1290,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -1364,6 +1392,8 @@ MonoBehaviour: 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: 4c6fe8d96a97af042b05c0ad043f8b03, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1413,6 +1443,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &500237834955102065 Animator: serializedVersion: 3 @@ -1564,6 +1596,8 @@ MonoBehaviour: 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: 077dcb9d692767b4dbbc78782f96ad54, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1613,6 +1647,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &6773357150390381268 Animator: serializedVersion: 3 @@ -1670,7 +1706,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 597.27246, y: 0} m_SizeDelta: {x: 0, y: 41} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2560100016647889387 @@ -1722,6 +1758,8 @@ MonoBehaviour: 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: 7bf6edc2886a4d24397aba0732d95d9f, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -1808,6 +1846,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -1965,6 +2005,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &2004447905712542450 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1983,6 +2025,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!95 &2004447905712542449 Animator: serializedVersion: 3 @@ -2141,6 +2185,8 @@ MonoBehaviour: 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: fff313fcc18fbaf499cf109a1ff8ea77, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2185,7 +2231,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 742.92993, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7472609110656960119 @@ -2348,6 +2394,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -2426,6 +2474,8 @@ MonoBehaviour: 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: 3a96a1633bd58984f8751098d7d459de, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2518,6 +2568,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -2641,6 +2693,8 @@ MonoBehaviour: 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: 461e6af409ec67d45ba908596f22e977, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2751,6 +2805,8 @@ MonoBehaviour: 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: e8315e89accf5944880a68f62f4a528b, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -2884,6 +2940,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -2961,6 +3019,8 @@ MonoBehaviour: 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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3093,6 +3153,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -3172,6 +3234,8 @@ MonoBehaviour: 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: 0ae4375e796ee934997142d1bb379d5d, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3221,6 +3285,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &1508759146784801316 Animator: serializedVersion: 3 @@ -3311,6 +3377,8 @@ MonoBehaviour: 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: 077dcb9d692767b4dbbc78782f96ad54, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3360,6 +3428,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &6979089799516653475 Animator: serializedVersion: 3 @@ -3442,6 +3512,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -3519,6 +3591,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -3597,6 +3671,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 @@ -3689,6 +3765,8 @@ MonoBehaviour: 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: b8257606d986cc642bb1cb088c0ce073, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -3761,6 +3839,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 @@ -3838,6 +3918,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 36 @@ -3990,6 +4072,8 @@ MonoBehaviour: 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: 5acca8aa6e5dedf4199460017d5c2865, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4034,7 +4118,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 93.00714, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &950733798129608270 @@ -4063,6 +4147,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -4154,6 +4240,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -4306,6 +4394,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -4383,6 +4473,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -4521,6 +4613,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -4614,6 +4708,8 @@ MonoBehaviour: 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: 60d33d082cec7074180e3742c2428e67, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -4663,6 +4759,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &8137244929828027612 Animator: serializedVersion: 3 @@ -4771,6 +4869,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &1763458908617052448 Animator: serializedVersion: 3 @@ -4853,6 +4953,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -4933,6 +5035,8 @@ MonoBehaviour: 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: 5acca8aa6e5dedf4199460017d5c2865, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5005,6 +5109,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -5054,7 +5160,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 93.00714, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5181275318856399589 @@ -5083,6 +5189,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -5177,6 +5285,8 @@ MonoBehaviour: 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: 5acca8aa6e5dedf4199460017d5c2865, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5249,6 +5359,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -5327,6 +5439,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -5495,6 +5609,8 @@ MonoBehaviour: 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: 8ee2611cbdfb6cc49bde7884f0481d83, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5536,10 +5652,10 @@ RectTransform: m_Father: {fileID: 1454780772259464311} 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_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1082, y: 1920} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &719078331411497301 CanvasRenderer: @@ -5567,6 +5683,8 @@ MonoBehaviour: 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: cac8341c350d75a488404cfc7c83b38c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -5666,6 +5784,8 @@ MonoBehaviour: 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: 7bf6edc2886a4d24397aba0732d95d9f, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -5752,6 +5872,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 38 @@ -5936,9 +6058,9 @@ RectTransform: m_Father: {fileID: 5241985572569021291} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 93.5, y: -20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 93.00714, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6029438456723130591 @@ -5967,6 +6089,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -6059,6 +6183,8 @@ MonoBehaviour: 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: e39b139a7013bcb408bf919d90c873a1, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6131,6 +6257,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -6208,6 +6336,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -6286,6 +6416,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -6348,9 +6480,9 @@ RectTransform: m_Father: {fileID: 6694787932538412361} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 93.5, y: -20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 93.00714, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3527678746426474027 @@ -6379,6 +6511,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -6470,6 +6604,8 @@ MonoBehaviour: 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: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6544,6 +6680,8 @@ MonoBehaviour: 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: 56e562f2e809ff74f93897fff77286b0, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6593,6 +6731,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &1919397646172675715 Animator: serializedVersion: 3 @@ -6736,6 +6876,8 @@ MonoBehaviour: 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: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6816,6 +6958,8 @@ MonoBehaviour: 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: 4c6fe8d96a97af042b05c0ad043f8b03, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -6865,6 +7009,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &3479332559324865200 Animator: serializedVersion: 3 @@ -6947,6 +7093,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -7029,6 +7177,8 @@ MonoBehaviour: 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: 461e6af409ec67d45ba908596f22e977, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -7267,6 +7417,8 @@ MonoBehaviour: 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: b349fa878373e2a4c9c27a44c6aa6776, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -7316,6 +7468,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &8588655870212005410 Animator: serializedVersion: 3 @@ -7474,6 +7628,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -7628,6 +7784,8 @@ MonoBehaviour: 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: e8315e89accf5944880a68f62f4a528b, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -7701,6 +7859,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -7794,6 +7954,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -7871,6 +8033,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -7918,9 +8082,9 @@ RectTransform: m_Father: {fileID: 1506017774449603927} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 93.5, y: -20} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 93.00714, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7262669673688354068 @@ -7949,6 +8113,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -8041,6 +8207,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 40 @@ -8133,6 +8301,8 @@ MonoBehaviour: 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: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -8265,6 +8435,8 @@ MonoBehaviour: 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: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -8337,6 +8509,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -8414,6 +8588,8 @@ MonoBehaviour: 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: 915769be866a5a740b0c4aa2e5ffa1be, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -8486,6 +8662,8 @@ MonoBehaviour: 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: 5b66d1c9ba827e84594d3e818587992c, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -8559,6 +8737,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -8653,6 +8833,8 @@ MonoBehaviour: 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: 28c56caed9622f240b05f3a97f09d127, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -8702,6 +8884,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &6265598979716233913 Animator: serializedVersion: 3 @@ -8787,6 +8971,8 @@ MonoBehaviour: 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: 5acca8aa6e5dedf4199460017d5c2865, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -8859,6 +9045,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -9012,6 +9200,8 @@ MonoBehaviour: 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: 5a675573dd165c346889aaaa419187c8, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -9087,6 +9277,8 @@ MonoBehaviour: 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: 5acca8aa6e5dedf4199460017d5c2865, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -9162,6 +9354,8 @@ MonoBehaviour: 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: b381da94d8e170349ba91c1b9416bff3, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -9236,6 +9430,8 @@ MonoBehaviour: 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: 10911, guid: 0000000000000000f000000000000000, type: 0} m_Type: 1 m_PreserveAspect: 0 @@ -9295,9 +9491,13 @@ MonoBehaviour: m_OnEndEdit: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.InputField+SubmitEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null m_OnValueChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.InputField+OnChangeEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} @@ -9467,6 +9667,8 @@ MonoBehaviour: 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: 461e6af409ec67d45ba908596f22e977, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -9577,6 +9779,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 32 @@ -9695,6 +9899,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &549937263057614649 Animator: serializedVersion: 3 @@ -9782,6 +9988,8 @@ MonoBehaviour: 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: 461e6af409ec67d45ba908596f22e977, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -9968,6 +10176,8 @@ MonoBehaviour: 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: e8315e89accf5944880a68f62f4a528b, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -10040,6 +10250,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 36 @@ -10121,6 +10333,8 @@ MonoBehaviour: 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: 077dcb9d692767b4dbbc78782f96ad54, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -10170,6 +10384,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &1882581966889543038 Animator: serializedVersion: 3 @@ -10253,6 +10469,8 @@ MonoBehaviour: 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: 3a96a1633bd58984f8751098d7d459de, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -10345,6 +10563,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -10616,9 +10836,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 9143289298767781204} m_Modifications: - - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} @@ -10725,11 +10946,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977969371176339, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: InitialModule.startSize.scalar @@ -10740,6 +10956,10 @@ PrefabInstance: propertyPath: InitialModule.startSizeY.scalar value: 60 objectReference: {fileID: 0} + - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &304627812812909889 stripped @@ -11130,9 +11350,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7298873033979436326} m_Modifications: - - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} @@ -11239,11 +11460,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977969371176339, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: InitialModule.startSize.scalar @@ -11254,6 +11470,10 @@ PrefabInstance: propertyPath: InitialModule.startSizeY.scalar value: 60 objectReference: {fileID: 0} + - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &3404451102410739546 stripped @@ -11394,9 +11614,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7617545728117047983} m_Modifications: - - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} @@ -11503,11 +11724,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977969371176339, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: InitialModule.startSize.scalar @@ -11518,6 +11734,10 @@ PrefabInstance: propertyPath: InitialModule.startSizeY.scalar value: 60 objectReference: {fileID: 0} + - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &4317175664783536647 stripped @@ -11783,9 +12003,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3320490869107019492} m_Modifications: - - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} @@ -11892,11 +12113,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977969371176339, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: InitialModule.startSize.scalar @@ -11907,6 +12123,10 @@ PrefabInstance: propertyPath: InitialModule.startSizeY.scalar value: 60 objectReference: {fileID: 0} + - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &5016312001044444435 stripped @@ -13422,9 +13642,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2246142217520512508} m_Modifications: - - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, + type: 3} + propertyPath: m_Name + value: saoguang-lingmai objectReference: {fileID: 0} - target: {fileID: 590977968937641174, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} @@ -13531,11 +13752,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 590977968937641177, guid: 1d457c772e4a1b24eaa011cd8aaffef9, - type: 3} - propertyPath: m_Name - value: saoguang-lingmai - objectReference: {fileID: 0} - target: {fileID: 590977969371176339, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} propertyPath: InitialModule.startSize.scalar @@ -13546,6 +13762,10 @@ PrefabInstance: propertyPath: InitialModule.startSizeY.scalar value: 60 objectReference: {fileID: 0} + - target: {fileID: 983171016, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1d457c772e4a1b24eaa011cd8aaffef9, type: 3} --- !u!224 &8629093158379211539 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab index ddf9778e2b..9fdede3896 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleGift/RoleGiftPanel.prefab @@ -7409,9 +7409,9 @@ RectTransform: m_Father: {fileID: 4072935318317542415} m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -1148} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -188} m_SizeDelta: {x: 800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8975846006324172966 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab index 0dd9ba8673..eb02d4d201 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoLayout.prefab @@ -4956,10 +4956,10 @@ RectTransform: m_Father: {fileID: 8121472570754725105} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 131.2} - m_SizeDelta: {x: 0, y: 562.3} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -955.8} + m_SizeDelta: {x: 954, y: 562.30005} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2781343876037430039 GameObject: @@ -6301,7 +6301,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -89.899994, y: 203} + m_AnchoredPosition: {x: -36, y: 203} m_SizeDelta: {x: 0, y: 142.4} m_Pivot: {x: 1, y: 0.5} --- !u!222 &650529087623267775 @@ -6709,7 +6709,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 70, y: 0} m_SizeDelta: {x: 0, y: 85} m_Pivot: {x: 0, y: 0.5} --- !u!222 &35534546367631598 @@ -8018,9 +8018,9 @@ RectTransform: m_Father: {fileID: 7662967509015272728} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -28, y: 200} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -495, y: 200} m_SizeDelta: {x: 0, y: 142.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6322685824361616870 @@ -9207,7 +9207,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 58 + m_Left: 0 m_Right: 0 m_Top: 0 m_Bottom: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab index 437ba2f5c6..5a67e83676 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/TailsManSouPanel.prefab @@ -4644,7 +4644,7 @@ ParticleSystem: --- !u!199 &113973470620193848 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9348,7 +9348,7 @@ ParticleSystem: --- !u!199 &113973472453912439 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9472,6 +9472,8 @@ MonoBehaviour: 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: 0} m_Type: 0 m_PreserveAspect: 0 @@ -9548,6 +9550,8 @@ MonoBehaviour: 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: 6253e3364aa642840b7b6ca6ac30239b, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -9597,6 +9601,8 @@ MonoBehaviour: 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 &543233348100079303 GameObject: m_ObjectHideFlags: 0 @@ -9660,6 +9666,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 34 @@ -9737,6 +9745,8 @@ MonoBehaviour: 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: 6de4a61556e867b44ac95c6ccf1f3023, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -14385,7 +14395,7 @@ ParticleSystem: --- !u!199 &5895179406456311943 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14507,6 +14517,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 51 @@ -14553,11 +14565,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6861030463589856289} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -94.70001, y: 389.7} + m_AnchoredPosition: {x: -94.70001, y: 460} m_SizeDelta: {x: 128, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2819655145672981250 @@ -14586,6 +14598,8 @@ MonoBehaviour: 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: 8b501b5b3437afb4ea4844a016be4ccd, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -14635,6 +14649,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &5027829511954224221 Animator: serializedVersion: 3 @@ -19371,7 +19387,7 @@ ParticleSystem: --- !u!199 &1473333197030483480 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24002,7 +24018,7 @@ ParticleSystem: --- !u!199 &1473333198317851991 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24093,11 +24109,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6861030463589856289} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -94.70001, y: 225.29999} + m_AnchoredPosition: {x: -94.70001, y: 295.59998} m_SizeDelta: {x: 132, y: 127} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7347005916441351479 @@ -24148,6 +24164,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &5049435112191561763 Animator: serializedVersion: 3 @@ -24185,6 +24203,8 @@ MonoBehaviour: 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: b349fa878373e2a4c9c27a44c6aa6776, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -24294,6 +24314,8 @@ MonoBehaviour: 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: 88785b6606f773e43bfb8d365c2689ab, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -28951,7 +28973,7 @@ ParticleSystem: --- !u!199 &3356294132469197459 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -29132,6 +29154,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 35 @@ -33795,7 +33819,7 @@ ParticleSystem: --- !u!199 &2293482653840398753 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38571,7 +38595,7 @@ ParticleSystem: --- !u!199 &2293482655806728942 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38693,6 +38717,8 @@ MonoBehaviour: 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: aaa147a6d3c344c4bb17609275e43321, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -38765,6 +38791,8 @@ MonoBehaviour: 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: d2e10eea9ef0bd94b85a43b960880622, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -38837,6 +38865,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -43557,7 +43587,7 @@ ParticleSystem: --- !u!199 &5371262584886917729 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43682,6 +43712,8 @@ MonoBehaviour: 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: 01c6ddd0f24206e438d1dbb35b7663d2, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -43722,7 +43754,7 @@ RectTransform: m_Children: - {fileID: 6081459106550561746} m_Father: {fileID: 6861030463589856289} - m_RootOrder: 10 + 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} @@ -43755,6 +43787,8 @@ MonoBehaviour: 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: e1eb5a78b93294840889587d72740102, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -43831,6 +43865,8 @@ MonoBehaviour: 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: 6253e3364aa642840b7b6ca6ac30239b, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -43880,6 +43916,8 @@ MonoBehaviour: 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 &3143221817415761140 GameObject: m_ObjectHideFlags: 0 @@ -43943,6 +43981,8 @@ MonoBehaviour: 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: dcab34f84847d94448b245ab7e62e44e, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -44015,6 +44055,8 @@ MonoBehaviour: 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: 0} m_Type: 0 m_PreserveAspect: 0 @@ -48596,7 +48638,7 @@ ParticleSystem: --- !u!199 &3353024422617661760 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53372,7 +53414,7 @@ ParticleSystem: --- !u!199 &3353024424543105551 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -53494,6 +53536,8 @@ MonoBehaviour: 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: b1894c27fafe6d54fa31df687a95eca9, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -53676,6 +53720,8 @@ MonoBehaviour: 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: 346a591cedc635a478e92019a2a01dda, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -58257,7 +58303,7 @@ ParticleSystem: --- !u!199 &3938352066829317725 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -63033,7 +63079,7 @@ ParticleSystem: --- !u!199 &3938352067546252562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -67731,7 +67777,7 @@ ParticleSystem: --- !u!199 &9096367848078383988 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -67853,6 +67899,8 @@ MonoBehaviour: 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: 0e97e3866623faa4fa4a58ebb054267c, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -67925,6 +67973,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -67997,6 +68047,8 @@ MonoBehaviour: 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: b720e002b50145541bcfc7ec60f2aadd, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -68105,6 +68157,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 34 @@ -72767,7 +72821,7 @@ ParticleSystem: --- !u!199 &4660511217513329257 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -72889,6 +72943,8 @@ MonoBehaviour: 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: 3ed380fd0652f5349b99c5307cc92ed3, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -72961,6 +73017,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -77614,7 +77672,7 @@ ParticleSystem: --- !u!199 &4562925506027272261 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -82318,7 +82376,7 @@ ParticleSystem: --- !u!199 &4562925507953249034 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -82440,6 +82498,8 @@ MonoBehaviour: 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: b1894c27fafe6d54fa31df687a95eca9, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -82512,6 +82572,8 @@ MonoBehaviour: 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: ef2bf2c9913a2b84c87ea015efe0f3aa, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -82552,11 +82614,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6861030463589856289} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -94.70001, y: 170} + m_AnchoredPosition: {x: -94.70001, y: 240.30005} m_SizeDelta: {x: 58.210022, y: 33.21997} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7420153130386468149 @@ -82585,6 +82647,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 @@ -87254,7 +87318,7 @@ ParticleSystem: --- !u!199 &332716889937777075 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -87376,6 +87440,8 @@ MonoBehaviour: 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: d2e10eea9ef0bd94b85a43b960880622, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -87472,6 +87538,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &671000956049144762 MonoBehaviour: m_ObjectHideFlags: 0 @@ -87490,6 +87558,8 @@ MonoBehaviour: 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 &5178940593276585168 GameObject: m_ObjectHideFlags: 0 @@ -92138,7 +92208,7 @@ ParticleSystem: --- !u!199 &4183756238370535598 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -92372,6 +92442,8 @@ MonoBehaviour: 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: 0} m_Type: 0 m_PreserveAspect: 0 @@ -92444,6 +92516,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 34 @@ -92525,6 +92599,8 @@ MonoBehaviour: 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: 6253e3364aa642840b7b6ca6ac30239b, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -92574,6 +92650,8 @@ MonoBehaviour: 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 &6062664151650407386 GameObject: m_ObjectHideFlags: 0 @@ -92640,6 +92718,8 @@ MonoBehaviour: 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: 01c6ddd0f24206e438d1dbb35b7663d2, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -92712,6 +92792,8 @@ MonoBehaviour: 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: 8f20c7f83b837d64aa1eb6fd54fce9f1, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -92784,6 +92866,8 @@ MonoBehaviour: 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: cdeeae8fc5671fb4583798af4523ecc6, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -97510,7 +97594,7 @@ ParticleSystem: --- !u!199 &6150952553846453489 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -102141,7 +102225,7 @@ ParticleSystem: --- !u!199 &6150952554193799102 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -102263,6 +102347,8 @@ MonoBehaviour: 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: 0} m_Type: 0 m_PreserveAspect: 0 @@ -102408,6 +102494,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Slider+SliderEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &6416203889657148279 GameObject: m_ObjectHideFlags: 0 @@ -102471,6 +102559,8 @@ MonoBehaviour: 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: 0} m_Type: 0 m_PreserveAspect: 0 @@ -107191,7 +107281,7 @@ ParticleSystem: --- !u!199 &3470103500329545894 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -107390,7 +107480,6 @@ RectTransform: - {fileID: 8463856118875763708} - {fileID: 6567555574747465628} - {fileID: 7644560317432511499} - - {fileID: 2710642247076312422} - {fileID: 5043312723253918730} - {fileID: 385151108045845297} - {fileID: 7253583515716596315} @@ -107399,6 +107488,7 @@ RectTransform: - {fileID: 6156001182195207221} - {fileID: 2870334973276214084} - {fileID: 8630144768478503526} + - {fileID: 2710642247076312422} m_Father: {fileID: 6860202946281388347} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -107433,6 +107523,8 @@ MonoBehaviour: 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: aaa147a6d3c344c4bb17609275e43321, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -107505,6 +107597,8 @@ MonoBehaviour: 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: 2609ccd74e672d84c8e128abd8dc9428, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -107552,7 +107646,7 @@ RectTransform: 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: 29, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1080, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6917992973938610401 @@ -107646,6 +107740,8 @@ MonoBehaviour: 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: 6253e3364aa642840b7b6ca6ac30239b, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -107695,6 +107791,8 @@ MonoBehaviour: 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 &7038986176317638297 GameObject: m_ObjectHideFlags: 0 @@ -107727,11 +107825,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6861030463589856289} - m_RootOrder: 4 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 58.6, y: 90} + m_AnchoredPosition: {x: 58.600006, y: 61} m_SizeDelta: {x: 116, y: 121} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4851780475586518862 @@ -107760,6 +107858,8 @@ MonoBehaviour: 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: 2887ec8dbdcb57242a540f77f7cb5a72, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -107809,6 +107909,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &1645882415491024726 Animator: serializedVersion: 3 @@ -107858,7 +107960,7 @@ RectTransform: - {fileID: 5262080095135170176} - {fileID: 2069632876066427504} m_Father: {fileID: 6861030463589856289} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -107928,6 +108030,8 @@ MonoBehaviour: 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: 10913, guid: 0000000000000000f000000000000000, type: 0} m_Type: 0 m_PreserveAspect: 0 @@ -108000,6 +108104,8 @@ MonoBehaviour: 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: 3ed380fd0652f5349b99c5307cc92ed3, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -108073,6 +108179,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 26 @@ -108165,6 +108273,8 @@ MonoBehaviour: 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: f3efca0b27d32994690f0ed37669a3c6, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -108237,6 +108347,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 34 @@ -108350,6 +108462,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -108422,6 +108536,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -108498,6 +108614,8 @@ MonoBehaviour: 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: 6253e3364aa642840b7b6ca6ac30239b, type: 3} m_Type: 1 m_PreserveAspect: 0 @@ -108547,6 +108665,8 @@ MonoBehaviour: 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 &7552524817855075317 GameObject: m_ObjectHideFlags: 0 @@ -108637,6 +108757,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!114 &712352259616840284 MonoBehaviour: m_ObjectHideFlags: 0 @@ -108655,6 +108777,8 @@ MonoBehaviour: 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 &7561560179694739197 GameObject: m_ObjectHideFlags: 0 @@ -113227,7 +113351,7 @@ ParticleSystem: --- !u!199 &7561560179694739199 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -118003,7 +118127,7 @@ ParticleSystem: --- !u!199 &7561560180580543920 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -118125,6 +118249,8 @@ MonoBehaviour: 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: 2aa716d9a6ab8cf43b74fe84233fea55, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -122782,7 +122908,7 @@ ParticleSystem: --- !u!199 &6066689377003724884 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -122907,6 +123033,8 @@ MonoBehaviour: 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: 01c6ddd0f24206e438d1dbb35b7663d2, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -122946,11 +123074,11 @@ RectTransform: - {fileID: 754028559476738425} - {fileID: 3718786456459952421} m_Father: {fileID: 6861030463589856289} - m_RootOrder: 12 + m_RootOrder: 11 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, y: 90.00005} + m_AnchoredPosition: {x: 0, y: 162} m_SizeDelta: {x: 701.1, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8057529749393225965 @@ -123021,6 +123149,8 @@ MonoBehaviour: 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: 498f4323e8aa6184f801f709352d27cc, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -123113,6 +123243,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -123185,6 +123317,8 @@ MonoBehaviour: 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: 6ce1fb06fd978e5428792df8f0258903, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -123294,6 +123428,8 @@ MonoBehaviour: 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: 01c6ddd0f24206e438d1dbb35b7663d2, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -123366,6 +123502,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 34 @@ -123414,7 +123552,7 @@ RectTransform: - {fileID: 1994294546225590454} - {fileID: 8458557718928898840} m_Father: {fileID: 6861030463589856289} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -123451,6 +123589,8 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!222 &4755473649158108574 CanvasRenderer: m_ObjectHideFlags: 0 @@ -123503,11 +123643,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 6861030463589856289} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -94.70001, y: 225.3} + m_AnchoredPosition: {x: -94.70001, y: 295.59998} m_SizeDelta: {x: 127, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2652837820029163841 @@ -123536,6 +123676,8 @@ MonoBehaviour: 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: b9d4e48a299be4c4a8bb7a59cc0f11c9, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -123585,6 +123727,8 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!95 &8237498878782629236 Animator: serializedVersion: 3 @@ -128243,7 +128387,7 @@ ParticleSystem: --- !u!199 &3129196954085120576 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 0 + m_ObjectHideFlags: 2 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -128464,6 +128608,8 @@ MonoBehaviour: 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: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -128536,6 +128682,8 @@ MonoBehaviour: 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: 8f797b996c03faa4abffb3134701a8bc, type: 3} m_Type: 0 m_PreserveAspect: 0 @@ -128662,7 +128810,7 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6267664519421573204, guid: be5fe01ae64af2e44a81c16cd8af411b, + - target: {fileID: 6403475617433798101, guid: be5fe01ae64af2e44a81c16cd8af411b, type: 3} propertyPath: m_MaskInteraction value: 1 @@ -128672,7 +128820,7 @@ PrefabInstance: propertyPath: m_MaskInteraction value: 1 objectReference: {fileID: 0} - - target: {fileID: 6403475617433798101, guid: be5fe01ae64af2e44a81c16cd8af411b, + - target: {fileID: 6267664519421573204, guid: be5fe01ae64af2e44a81c16cd8af411b, type: 3} propertyPath: m_MaskInteraction value: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index f8b4a26d1b..3a5a7be8d9 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -4417,7 +4417,7 @@ RectTransform: 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.2, y: -284.7} + m_AnchoredPosition: {x: 0, y: -284.7} m_SizeDelta: {x: 987, y: 991.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5227949850250081911 @@ -13872,10 +13872,10 @@ RectTransform: m_Father: {fileID: 6861030463589856289} 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: -10.1, y: 507.3} - m_SizeDelta: {x: 1021.3, y: 485.4} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -10.1, y: -452.7} + m_SizeDelta: {x: 1021.3, y: 485.40002} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6715912321429851566 MonoBehaviour: @@ -18393,10 +18393,10 @@ RectTransform: m_Father: {fileID: 6861030463589856289} 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: 429, y: -706} - m_SizeDelta: {x: 58.21, y: 33.22} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -111, y: 254} + m_SizeDelta: {x: 58.210022, y: 33.21997} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7729620357626657529 CanvasRenderer: @@ -19804,7 +19804,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 120, y: 120} - m_Spacing: {x: 55, y: 0} + m_Spacing: {x: 30, y: 0} m_Constraint: 2 m_ConstraintCount: 1 --- !u!1 &4528813492065711633 @@ -23073,14 +23073,14 @@ RectTransform: m_GameObject: {fileID: 5594573773259045021} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 100} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.95, y: 0.95, z: 1} m_Children: [] m_Father: {fileID: 6861030463589856289} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 2, y: -1219.9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -259.90002} m_SizeDelta: {x: 1028.2, y: 1020.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5601877114156118362 @@ -32024,12 +32024,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 0 + m_Left: 35 m_Right: 0 m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 33 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -34118,7 +34118,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.0000076293945} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1537562228229781123 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 4b65753bfd..46e9cf3361 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -114,7 +114,6 @@ function FightPointPassMainPanel:InitComponent() this.btnFight = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnFight") this.fightText = Util.GetGameObject(this.btnFight, "Text"):GetComponent("Text") this.fightSaoGuang = Util.GetGameObject(this.btnFight, "saoguang") - this.fightGuideEffect = Util.GetGameObject(this.btnFight, "GuideEffect") LanguageFontSizeFilter(this.fightText, 50) -- 你要变强 this.btnGetForce = Util.GetGameObject(self.gameObject, "Bg/btnDown/btnIWantMilk") @@ -235,6 +234,7 @@ function FightPointPassMainPanel:InitComponent() this.btn_draw=Util.GetGameObject(self.gameObject, "soldierObj/btn_draw") this.btn_change=Util.GetGameObject(self.gameObject, "soldierObj/btn_change") this.chouRed=Util.GetGameObject(self.gameObject, "soldierObj/chouRed") + this.fightGuideEffect = Util.GetGameObject(self.gameObject, "soldierObj/GuideEffect") this.changeBtnImg=Util.GetGameObject(self.gameObject, "soldierObj/btn_change"):GetComponent("Image") this.costImg=Util.GetGameObject(self.gameObject, "soldierObj/costImg"):GetComponent("Image") this.costTxt=Util.GetGameObject(self.gameObject, "soldierObj/Text"):GetComponent("Text") @@ -515,14 +515,14 @@ function this.RefreshBossInfo() this.bossNum.text=#levelList this.fightLock:SetActive(false) this.fightSaoGuang:SetActive(true) - this.fightGuideEffect:SetActive(true) + --this.fightGuideEffect:SetActive(true) this.fightRP:SetActive(true) else this.bossObj:SetActive(false) this.fightLock:SetActive(true) this.fightRP:SetActive(false) this.fightSaoGuang:SetActive(false) - this.fightGuideEffect:SetActive(false) + --this.fightGuideEffect:SetActive(false) this.lockText.text=string.format("%s层后开启",nextBossLv- FightPointPassManager.soldierLayerId) end this.openFun:SetActive(true) @@ -546,6 +546,7 @@ function this.RefreshSoliderInfo() local haveNum=BagManager.GetItemCountById(tonumber(cost[1])) this.costTxt.text=haveNum this.chouRed:SetActive(haveNum>0) + this.fightGuideEffect:SetActive(haveNum>0) local openList=lotteryConfig.SoldierType local dataList=SmallSoldierManager.soldierList LogError("dataList=========================================================="..#dataList) diff --git a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua index 7b8fd74098..0419182d4c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Gem/SmallSoldierInfoPanel.lua @@ -65,32 +65,61 @@ function SmallSoldierInfoPanel:BindEvent() --替换按钮 Util.AddClick(self.btn_change,function() - NetManager.ReplaceSoldierRequest(1,state,function () - HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Solider) - NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) - local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) - if oldWarPower ~= tempPower then - LogError("tempPower-old=================="..tempPower-oldWarPower) - UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower}) - isUp= tempPower- oldWarPower>0 - oldWarPower=tempPower - - end - Game.GlobalEvent:DispatchEvent(GameEvent.Solider.ShowSoliderChangeInfo,newData.type,isUp) - if state==1 then - self:ClosePanel() - + local sureFunc=function () + NetManager.ReplaceSoldierRequest(1,state,function () + HeroPropManager.SetFuncPropDirty(Func_Prop_Type.Solider) + NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL) + local tempPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL) + if oldWarPower ~= tempPower then + LogError("tempPower-old=================="..tempPower-oldWarPower) + UIManager.OpenPanel(UIName.WarPowerChangeNotifyPanelV2,{oldValue = oldWarPower,newValue = tempPower}) + isUp= tempPower- oldWarPower>0 + oldWarPower=tempPower + + end + Game.GlobalEvent:DispatchEvent(GameEvent.Solider.ShowSoliderChangeInfo,newData.type,isUp) + if state==1 then + self:ClosePanel() + + else + self:OnShow() + end + end) + end + if state==1 then + if isNewUp==false then + local args={} + args[1]="将要替换的神兵战力小于当前神兵,是否仍要替换,替换后会被直接遣散" + args[2]="确定" + args[3]="取消" + args[4]=sureFunc + UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args) else - self:OnShow() + sureFunc() end - end) + end + end) --遣散按钮 Util.AddClick(self.btn_remove,function() - NetManager.ReplaceSoldierRequest(2,0,function () - self:ClosePanel() - end) + local sureFunc=function() + NetManager.ReplaceSoldierRequest(2,0,function () + self:ClosePanel() + end) + end + if isNewUp then + + local args={} + args[1]="将要遣散的神兵战力大于当前神兵,是否仍要遣散" + args[2]="确定" + args[3]="取消" + args[4]=sureFunc + UIManager.OpenPanel(UIName.GMCommonConfirmPanel,args) + else + sureFunc() + end + end) end