From 223fb6020458e947457bcac26eabb2c0572afe57 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Mon, 7 Nov 2022 17:24:41 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E9=AD=82=E7=89=B9=E6=95=88=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=86=B2=E6=A6=9C=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=A5=96=E5=8A=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HandBookHeroAndEquipListPanel.prefab | 1054 ++++++++++------- .../~Lua/Common/functions.lua | 3 + .../Modules/NewShenZun/ActivityChongRank.lua | 4 + .../~Lua/Modules/Operating/GMChangePanel.lua | 3 +- 4 files changed, 605 insertions(+), 459 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab index a15985f81d..6f3435339d 100644 --- a/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab @@ -1617,6 +1617,35 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &8312494724258196229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1120015899340331622} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1151179561758626469 GameObject: m_ObjectHideFlags: 0 @@ -1901,6 +1930,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1457638759342511924} m_CullTransparentMesh: 0 +--- !u!114 &2362869505386284928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1501252773073004814} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1510376232743083144 GameObject: m_ObjectHideFlags: 0 @@ -2571,6 +2629,35 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &6371118209565669510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1962185035514634108} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &1981118236957487448 GameObject: m_ObjectHideFlags: 0 @@ -3210,6 +3297,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2600135572832473652} m_CullTransparentMesh: 0 +--- !u!114 &5704686492501631905 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2637064070132561157} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2666340528419977805 GameObject: m_ObjectHideFlags: 0 @@ -12923,18 +13039,6 @@ PrefabInstance: objectReference: {fileID: 445057004422876109} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} ---- !u!4 &445057004422876139 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149406, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &445057004422876117 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149408, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} --- !u!4 &445057004422876119 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149410, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -12995,6 +13099,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1695781688012861557} m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654754 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654770 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827399, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654764 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} --- !u!4 &445057004422876099 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149430, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -13007,6 +13129,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1695781688012861557} m_PrefabAsset: {fileID: 0} +--- !u!1 &2637064070132561157 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3679471377559848304, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} --- !u!114 &4188697653359244917 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3290334894611432960, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -13031,87 +13159,81 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1695781688012861557} m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654758 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654730 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827455, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654772 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827393, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654774 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} --- !u!4 &550457206298654768 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092670169827397, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 1695781688012861557} m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654770 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827399, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654780 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654782 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827403, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654776 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654778 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654756 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 1695781688012861557} - m_PrefabAsset: {fileID: 0} --- !u!4 &550457206298654752 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092670169827413, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 1695781688012861557} m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654754 stripped +--- !u!4 &550457206298654774 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 1695781688012861557} m_PrefabAsset: {fileID: 0} ---- !u!4 &550457206298654764 stripped +--- !u!4 &550457206298654772 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827393, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654730 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827455, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654776 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654758 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654756 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654778 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654782 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827403, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &550457206298654780 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &445057004422876139 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149406, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 1695781688012861557} + m_PrefabAsset: {fileID: 0} +--- !u!4 &445057004422876117 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149408, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 1695781688012861557} m_PrefabAsset: {fileID: 0} @@ -13424,21 +13546,9 @@ PrefabInstance: objectReference: {fileID: 3918156146158376902} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} ---- !u!4 &3918156146158376922 stripped +--- !u!4 &4030338298157753383 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149412, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376924 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149410, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376926 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149408, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} @@ -13448,69 +13558,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753383 stripped +--- !u!4 &3918156146158376926 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149408, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753385 stripped +--- !u!4 &3918156146158376924 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149410, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!224 &641729436672662630 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753345 stripped +--- !u!4 &3918156146158376922 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827455, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753407 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827393, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753395 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753397 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827403, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753399 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753401 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827399, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753403 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827397, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753405 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149412, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} @@ -13520,27 +13582,63 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753387 stripped +--- !u!4 &3918156146158376918 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827413, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149416, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753389 stripped +--- !u!4 &3918156146158376916 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149418, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &4030338298157753391 stripped +--- !u!4 &3918156146158376914 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149420, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!224 &1714917531631887070 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, +--- !u!4 &3918156146158376912 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149422, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3918156146158376910 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3918156146158376908 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149426, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3918156146158376906 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149428, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3918156146158376904 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149430, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3918156146158376902 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1501252773073004814 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3679471377559848304, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} @@ -13556,63 +13654,93 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &641729436672662630 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753397 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827403, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753345 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827455, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753407 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827393, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1714917531631887070 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753405 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753403 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827397, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753401 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827399, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753399 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4030338298157753395 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2865871321160100990} + m_PrefabAsset: {fileID: 0} --- !u!4 &4030338298157753393 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376902 stripped +--- !u!4 &4030338298157753391 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376904 stripped +--- !u!4 &4030338298157753389 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149430, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376906 stripped +--- !u!4 &4030338298157753387 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149428, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827413, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376908 stripped +--- !u!4 &4030338298157753385 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149426, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376910 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376912 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149422, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376914 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149420, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376916 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149418, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2865871321160100990} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3918156146158376918 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149416, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2865871321160100990} m_PrefabAsset: {fileID: 0} @@ -13925,108 +14053,18 @@ PrefabInstance: objectReference: {fileID: 4147401654849855924} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} ---- !u!4 &4035281073354150485 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4035281073354150465 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!224 &1738967786605761708 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!224 &507059649001875988 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!114 &397039673364503564 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3290334894611432960, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &4147401654849855924 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855930 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149430, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855928 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149428, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855934 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149426, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855932 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855906 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149422, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855904 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149420, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} --- !u!4 &4147401654849855908 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149416, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4035281073354150515 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827455, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} --- !u!4 &4147401654849855914 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149414, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855910 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149418, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} --- !u!4 &4147401654849855912 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149412, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -14039,33 +14077,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4147401654849855890 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149406, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 2894424081611086348} - m_PrefabAsset: {fileID: 0} --- !u!4 &4147401654849855916 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149408, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4035281073354150477 stripped +--- !u!4 &4147401654849855890 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827393, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149406, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4035281073354150479 stripped +--- !u!4 &4147401654849855932 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4035281073354150473 stripped +--- !u!4 &4147401654849855934 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827397, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149426, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4147401654849855930 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149430, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} @@ -14075,9 +14113,87 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4035281073354150469 stripped +--- !u!4 &4147401654849855924 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4147401654849855928 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149428, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1962185035514634108 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3679471377559848304, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!114 &397039673364503564 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3290334894611432960, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &507059649001875988 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1738967786605761708 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4147401654849855910 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149418, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4035281073354150477 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827393, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4035281073354150485 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4035281073354150473 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827397, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4035281073354150515 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827455, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4035281073354150467 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4035281073354150465 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} @@ -14087,9 +14203,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} ---- !u!4 &4035281073354150467 stripped +--- !u!4 &4035281073354150469 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} @@ -14117,6 +14233,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2894424081611086348} m_PrefabAsset: {fileID: 0} +--- !u!4 &4147401654849855906 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149422, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4147401654849855904 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149420, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4035281073354150479 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 2894424081611086348} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4367087835372871446 PrefabInstance: m_ObjectHideFlags: 0 @@ -14426,15 +14560,39 @@ PrefabInstance: objectReference: {fileID: 3260196797244957870} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} ---- !u!4 &3260196797244957872 stripped +--- !u!4 &3220142606955976537 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149414, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} ---- !u!224 &905788259545403830 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, +--- !u!4 &3220142606955976519 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3220142606955976517 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3220142606955976515 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827413, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3220142606955976513 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3220142606955976527 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} @@ -14450,12 +14608,30 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} +--- !u!1 &1120015899340331622 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3679471377559848304, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} --- !u!4 &3260196797244957876 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149410, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} +--- !u!4 &3260196797244957874 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149412, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3260196797244957872 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149414, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} --- !u!4 &3260196797244957886 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149416, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -14474,27 +14650,21 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} ---- !u!4 &3220142606955976527 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 4367087835372871446} - m_PrefabAsset: {fileID: 0} --- !u!4 &3260196797244957880 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149422, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} ---- !u!4 &3260196797244957862 stripped +--- !u!4 &3220142606955976533 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} ---- !u!4 &3260196797244957870 stripped +--- !u!4 &3260196797244957862 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} @@ -14516,6 +14686,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} +--- !u!4 &3260196797244957870 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 4367087835372871446} + m_PrefabAsset: {fileID: 0} --- !u!114 &1239225577160268054 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3290334894611432960, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -14528,21 +14704,9 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &1421303986566688526 stripped +--- !u!224 &905788259545403830 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 4367087835372871446} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3220142606955976513 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 4367087835372871446} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3220142606955976515 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827413, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 3461300678615895712, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} @@ -14558,12 +14722,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} ---- !u!4 &3220142606955976533 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 4367087835372871446} - m_PrefabAsset: {fileID: 0} --- !u!4 &3220142606955976531 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092670169827397, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -14594,27 +14752,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} ---- !u!4 &3220142606955976537 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 4367087835372871446} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3220142606955976519 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 4367087835372871446} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3220142606955976517 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 4367087835372871446} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3260196797244957874 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149412, guid: 5499cdbed3f400441b21a8becb5b5e84, +--- !u!224 &1421303986566688526 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 4367087835372871446} m_PrefabAsset: {fileID: 0} @@ -14932,9 +15072,9 @@ PrefabInstance: objectReference: {fileID: 6775343179424227525} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} ---- !u!4 &6775343179424227545 stripped +--- !u!4 &6775343179424227549 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149412, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149408, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} @@ -14944,57 +15084,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227549 stripped +--- !u!4 &6775343179424227547 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149408, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227555 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149406, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363172 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363178 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363176 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827413, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363186 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363184 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363190 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827403, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363188 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149414, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} @@ -15010,6 +15102,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363198 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} --- !u!4 &6883874815378363196 stripped Transform: m_CorrespondingSourceObject: {fileID: 1165092670169827393, guid: 5499cdbed3f400441b21a8becb5b5e84, @@ -15022,51 +15120,15 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363180 stripped +--- !u!4 &6775343179424227541 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149416, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363198 stripped +--- !u!4 &6775343179424227543 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827395, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!1 &8985606536234327565 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3679471377559848304, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227525 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227531 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149430, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227535 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149426, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227533 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, - type: 3} - m_PrefabInstance: {fileID: 5738520717771725693} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227539 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149422, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149418, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} @@ -15076,21 +15138,51 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363184 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827405, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6775343179424227539 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149422, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6775343179424227533 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149424, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6775343179424227535 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149426, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} --- !u!4 &6775343179424227529 stripped Transform: m_CorrespondingSourceObject: {fileID: 1271572592464149428, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} ---- !u!4 &6883874815378363182 stripped +--- !u!4 &6775343179424227531 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149430, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} ---- !u!224 &6953889317893958501 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, +--- !u!4 &6775343179424227525 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149432, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8985606536234327565 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3679471377559848304, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} @@ -15106,15 +15198,15 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &6775343179424227547 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149414, guid: 5499cdbed3f400441b21a8becb5b5e84, +--- !u!224 &6953889317893958501 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3396417040355110936, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227543 stripped +--- !u!4 &6775343179424227545 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149418, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1271572592464149412, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} @@ -15124,9 +15216,57 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} ---- !u!4 &6775343179424227541 stripped +--- !u!4 &6883874815378363182 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1271572592464149416, guid: 5499cdbed3f400441b21a8becb5b5e84, + m_CorrespondingSourceObject: {fileID: 1165092670169827411, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363180 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827409, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363186 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827407, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363190 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827403, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6775343179424227555 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1271572592464149406, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363178 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827415, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363188 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827401, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363172 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827417, guid: 5499cdbed3f400441b21a8becb5b5e84, + type: 3} + m_PrefabInstance: {fileID: 5738520717771725693} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6883874815378363176 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1165092670169827413, guid: 5499cdbed3f400441b21a8becb5b5e84, type: 3} m_PrefabInstance: {fileID: 5738520717771725693} m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index d416a50af2..b67922f3d5 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -410,6 +410,9 @@ function GuildMap_Pos2UV(pos) end function GetStarOrGodSoulLv(index,data) + if data.star>11 then + return data.star,3 + end if data.godSoulLv and data.godSoulLv > 0 then return data.godSoulLv,3 elseif data.star > 9 then diff --git a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua index 66a17c211c..666d569420 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua @@ -245,11 +245,15 @@ function this.UpdateRewardInfo(go,data) if not this.itemList[go] then this.itemList[go] = {} end + for i = 1, #this.itemList[go] do + this.itemList[go][i].gameObject:SetActive(false) + end for i = 1, #data.RankingReward do if not this.itemList[go][i] then this.itemList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform) end this.itemList[go][i]:OnOpen(false, data.RankingReward[i], 0.8,false,false,false,this.sortingOrder) + this.itemList[go][i].gameObject:SetActive(true) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua index 44a2d3c50a..8407d49e47 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMChangePanel.lua @@ -141,7 +141,6 @@ function this.TabBtnOnClick(btn,config) --this.UpdateLayout(_level) local dataList={} local aa=config.Unlock[1] - LogError("aa[1]==="..aa[1].." aa[2]==="..aa[2]) local isOpen,tip=CheckGMIsOpen(aa[1],aa[2]) if isOpen then this.hint.gameObject:SetActive(false) @@ -170,7 +169,7 @@ function GMChangePanel:SingleTask(go,data) local btnTxt=Util.GetGameObject(go, "btn/Text"):GetComponent("Text") local recharge=rechargeCommodityConfig[data.PackID] name.text=recharge.Name - LogError("type=="..recharge.Type.." id=="..recharge.Id) + --LogError("type=="..recharge.Type.." id=="..recharge.Id) local leftBuyTime=OperatingManager.GetLeftBuyTime(recharge.Type,recharge.Id) if leftBuyTime==-1 then num.text=""