From 3c1986c71cf597244ac6d76a83dbc01d4ef1cb1c Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 1 Apr 2022 18:41:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=A5=9E=E9=AD=82=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=E7=A5=9E=E9=AD=82=E5=8D=87=E7=BA=A7=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E7=A5=9E=E7=B3=BB=E8=BD=AC=E6=8D=A2=E8=81=8C=E4=B8=9A=E7=9A=84?= =?UTF-8?q?=E8=8B=B1=E9=9B=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/GodSoul/GodSoulManager.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua index ffbf528c4c..5c204ac795 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodSoul/GodSoulManager.lua @@ -306,18 +306,18 @@ function this.GetGodSoulData(curHeroData,lv,conditionIndex) index = 0 break elseif (v.star >= godData[j].star) and godData[j].id < 1 then - if (godData[j].property > 0 and v.property == godData[j].property) + if (godData[j].property > 0 and v.heroConfig.PropertyName == godData[j].property) or (godData[j].profession > 0 and v.profession == godData[j].profession) or (godData[j].property == 0 and godData[j].profession == 0) then if index == -1 then index = 0 end end - if (godData[j].property > 0 and v.property == godData[j].property) then + if (godData[j].property > 0 and v.heroConfig.PropertyName == godData[j].property) then index = index + 1 elseif (godData[j].profession > 0 and v.profession == godData[j].profession) then index = index + 1 - elseif godData[j].property == 0 and godData[j].profession == 0 then + elseif godData[j].property== 0 and godData[j].profession == 0 then index = index + 1 end else From 4bb0977391ac6e99065aefb3d07a2c1ab154b44a Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 2 Apr 2022 14:33:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[bug]=3D=3D=3D=3D=3D=3D=3Dbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A2=84=E8=AE=BE=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/CompoundHero/CompoundHeroPanel.prefab | 992 ++++++++++++++++-- .../UI/GeneralPanel/GeneralBigPopup.prefab | 175 ++- 2 files changed, 1058 insertions(+), 109 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab index 3e3f35bca8..c4a62d2c4c 100644 --- a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab @@ -1269,10 +1269,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 608, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4713829247308178245 CanvasRenderer: @@ -1462,10 +1462,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 776, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3043128608018388249 CanvasRenderer: @@ -3060,10 +3060,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 104, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2026494486082166274 CanvasRenderer: @@ -4050,6 +4050,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2837658714337311523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6255977595113107178} + - component: {fileID: 852715698941825747} + - component: {fileID: 5929749710590567660} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6255977595113107178 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2837658714337311523} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4608755924365892055} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 164, y: 164} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &852715698941825747 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2837658714337311523} + m_CullTransparentMesh: 0 +--- !u!114 &5929749710590567660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2837658714337311523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 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: 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 &2861445511054396458 GameObject: m_ObjectHideFlags: 0 @@ -4383,7 +4457,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1441774295091081370 RectTransform: m_ObjectHideFlags: 0 @@ -6773,10 +6847,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 440, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3428141315978654585 CanvasRenderer: @@ -6992,7 +7066,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 88, y: 88} + m_CellSize: {x: 60, y: 88} m_Spacing: {x: 80, y: 0} m_Constraint: 0 m_ConstraintCount: 2 @@ -10095,6 +10169,7 @@ RectTransform: - {fileID: 7739968125459159374} - {fileID: 2311633585308984105} - {fileID: 8548560177064455277} + - {fileID: 4608755924365892055} m_Father: {fileID: 3777836183973900430} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10123,7 +10198,7 @@ MonoBehaviour: m_ChildAlignment: 4 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 88, y: 88} + m_CellSize: {x: 60, y: 88} m_Spacing: {x: 80, y: 0} m_Constraint: 0 m_ConstraintCount: 2 @@ -10617,6 +10692,124 @@ MonoBehaviour: m_LineSpacing: 0.8 m_Text: "\u795E\u5C06\u7F6E\u6362" LanguageIndex: 10337 +--- !u!1 &6843214715953696209 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4608755924365892055} + - component: {fileID: 3532145455492184999} + - component: {fileID: 8268958405132239541} + - component: {fileID: 4967447307243336248} + m_Layer: 5 + m_Name: Btn6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4608755924365892055 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6843214715953696209} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6255977595113107178} + m_Father: {fileID: 959130899583045509} + m_RootOrder: 5 + 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_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3532145455492184999 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6843214715953696209} + m_CullTransparentMesh: 0 +--- !u!114 &8268958405132239541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6843214715953696209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0} + 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: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4967447307243336248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6843214715953696209} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8268958405132239541} + 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 &6912065233863296175 GameObject: m_ObjectHideFlags: 0 @@ -13155,10 +13348,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} 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: 272, y: -50} - m_SizeDelta: {x: 88, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5713593700809359769 CanvasRenderer: @@ -14499,49 +14692,244 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 6447125663100292221} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3613232194504526807} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 2935823801474064421} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 3359955998269420578} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 6588252493083957537} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 148095486663120072} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 1680770620804836921} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2352033357466444646} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 9219937486075496732} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 7126708398865004788} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 6447125663100292221} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 4437600977647621456} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1424338125224582353} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 8523301263739179630} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 9068643097587649240} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 3592314898061774466} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1532634743424408239} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 8449563865205609026} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 8398667022943706122} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 562193232071614603} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8107702030262535273} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 4437600977647621456} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} +--- !u!4 &1424338125224582353 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8107702030262535273 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4437600977647621456 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} --- !u!224 &4004229281899235646 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 1495117948262875217} m_PrefabAsset: {fileID: 0} +--- !u!4 &6447125663100292221 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2352033357466444646 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &562193232071614603 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8449563865205609026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1532634743424408239 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3592314898061774466 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9068643097587649240 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8523301263739179630 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9219937486075496732 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2935823801474064421 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3359955998269420578 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3613232194504526807 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1680770620804836921 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &148095486663120072 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6588252493083957537 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7126708398865004788 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8398667022943706122 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 1495117948262875217} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2930570780378322061 PrefabInstance: m_ObjectHideFlags: 0 @@ -14664,49 +15052,244 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 7308227165633779873} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1022322383968624395} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 1489257105556534521} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 1347760937533792510} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 7456536014493453821} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 4475143494716293140} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3118611600830888677} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2067392625425250234} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4892896049322352064} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 6842063791756667944} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 7308227165633779873} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 108444629137817996} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3445395248339830797} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 5358186331490748082} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4741878753537383940} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 994930611963763294} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2977372411208928883} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5284449500228568734} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 5231718680891164886} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4312632630686397527} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5517080283118096565} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 108444629137817996} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} +--- !u!4 &5517080283118096565 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3445395248339830797 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5231718680891164886 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5358186331490748082 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4741878753537383940 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4892896049322352064 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &994930611963763294 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4475143494716293140 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3118611600830888677 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5284449500228568734 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4312632630686397527 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7308227165633779873 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6842063791756667944 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2977372411208928883 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1022322383968624395 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2067392625425250234 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1489257105556534521 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1347760937533792510 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7456536014493453821 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} --- !u!224 &830107167574040034 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 2930570780378322061} m_PrefabAsset: {fileID: 0} +--- !u!4 &108444629137817996 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 2930570780378322061} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4024593173043459165 PrefabInstance: m_ObjectHideFlags: 0 @@ -14829,46 +15412,241 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59, + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8799269859400054897} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1243350260009418715} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 854461004083172393} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 992328886815031342} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: -16.999998 - objectReference: {fileID: 0} - - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8650200251655482669} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} - - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59, + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2408203142309503172} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_AnchoredPosition.y - value: 3.2600002 - objectReference: {fileID: 0} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3762414482627664437} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 270666847548512106} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 6671607564786220304} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 4720516192376622328} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8799269859400054897} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 2229287739125031260} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3504293137159563485} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 6137661543132522082} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 6827396740961812180} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 1351067438097267342} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 3900258964432580259} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 6208038782315013710} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 6335312160677849094} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 2641585708450665607} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 6044354044207673445} + - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 2229287739125031260} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} +--- !u!4 &6208038782315013710 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2641585708450665607 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8799269859400054897 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4720516192376622328 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &270666847548512106 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3754770888401953591, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &854461004083172393 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2229287739125031260 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &992328886815031342 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4188154102939628659, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} --- !u!224 &1509940222427725106 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 4024593173043459165} m_PrefabAsset: {fileID: 0} +--- !u!4 &2408203142309503172 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3762414482627664437 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6671607564786220304 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1243350260009418715 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6044354044207673445 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3504293137159563485 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6335312160677849094 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6137661543132522082 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6827396740961812180 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1351067438097267342 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3900258964432580259 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8650200251655482669 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5751542467658570096, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4024593173043459165} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 9146e7c849..c0960057d1 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -3204,7 +3204,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8741988890369470575} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7476,6 +7476,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8BBE \u7F6E" LanguageIndex: 11266 +--- !u!1 &1174590958480754055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7375564250524783672} + - component: {fileID: 3873340698256599125} + - component: {fileID: 7054344450374394038} + m_Layer: 5 + m_Name: chipFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7375564250524783672 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174590958480754055} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8741988890369470575} + 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: -0.35936, y: 0.7} + m_SizeDelta: {x: 134.28, y: 133.6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3873340698256599125 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174590958480754055} + m_CullTransparentMesh: 0 +--- !u!114 &7054344450374394038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1174590958480754055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 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: 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 &1187675107308878070 GameObject: m_ObjectHideFlags: 0 @@ -12142,6 +12216,101 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &1936097808245004067 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4660631609061640560} + - component: {fileID: 3896070897084523576} + - component: {fileID: 2263527328673101960} + - component: {fileID: 7360891629549145911} + m_Layer: 5 + m_Name: numTxt + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4660631609061640560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936097808245004067} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8741988890369470575} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 29.4, y: -51.1} + m_SizeDelta: {x: 68.81, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3896070897084523576 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936097808245004067} + m_CullTransparentMesh: 0 +--- !u!114 &2263527328673101960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936097808245004067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9811321, g: 0.9741901, b: 0.96724814, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 11 +--- !u!114 &7360891629549145911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936097808245004067} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1946653119693603910 GameObject: m_ObjectHideFlags: 0 @@ -39496,13 +39665,15 @@ RectTransform: - {fileID: 986730965637877389} - {fileID: 4573891418480574583} - {fileID: 4182582917172664206} + - {fileID: 7375564250524783672} - {fileID: 4277764752728120099} + - {fileID: 4660631609061640560} m_Father: {fileID: 3828362588263756447} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -759.9, y: 83.3} + m_AnchoredPosition: {x: -928.8, y: 83.3} m_SizeDelta: {x: 140, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2424672015970933077