From 4e5ccff82002ca176dc091ca1f758efe2fb489d3 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 25 Apr 2022 14:42:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E5=A4=96=E5=8C=96=E8=BA=AB=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/TianShuMiJuan/IncarnationPanel.prefab | 821 ++++++++++-------- .../TianShuMiJuan/IncarnationUpPopup.prefab | 521 ++++++++++- .../~Lua/Common/GlobalDefine.lua | 1 + .../Incarnation/IncarnationForcePanel.lua | 1 + .../Incarnation/IncarnationManager.lua | 10 + .../Modules/Incarnation/IncarnationPanel.lua | 5 +- .../Incarnation/IncarnationUpPopup.lua | 21 +- .../~Lua/Modules/Player/RedpotManager.lua | 2 + 8 files changed, 997 insertions(+), 385 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index e90dd5819b..1d0b2b425f 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -1097,6 +1097,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &690097008634447975 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4399893624326727770} + - component: {fileID: 1998244871395157631} + - component: {fileID: 6120474599009053444} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4399893624326727770 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690097008634447975} + 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: 5034057634545036541} + 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: 33, y: 36} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1998244871395157631 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690097008634447975} + m_CullTransparentMesh: 0 +--- !u!114 &6120474599009053444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 690097008634447975} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &709629512769647371 GameObject: m_ObjectHideFlags: 0 @@ -18681,7 +18755,8 @@ RectTransform: 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_Children: + - {fileID: 4399893624326727770} m_Father: {fileID: 6861030463589856289} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27509,78 +27584,12 @@ PrefabInstance: objectReference: {fileID: 3725140534225795546} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} ---- !u!4 &2153739859858927707 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8838826844710760576 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8678159752464498404 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8358003466797426258 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8202199843685639574 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1834256969512190643 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &876505418813667394 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4324329265115015005 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7836538779477677182 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3351739044862824428 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} --- !u!4 &6295776807766909175 stripped Transform: m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} ---- !u!4 &3725140534225795546 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 2315202944304188113} - m_PrefabAsset: {fileID: 0} --- !u!4 &714544860256979969 stripped Transform: m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, @@ -27599,9 +27608,39 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} ---- !u!4 &2781528259337948335 stripped +--- !u!4 &9125283564855765219 stripped Transform: - m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3725140534225795546 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8202199843685639574 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2153739859858927707 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1834256969512190643 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &876505418813667394 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} @@ -27617,21 +27656,57 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} +--- !u!4 &8838826844710760576 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3351739044862824428 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} --- !u!4 &4487533983396361074 stripped Transform: m_CorrespondingSourceObject: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} +--- !u!4 &8678159752464498404 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2781528259337948335 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4324329265115015005 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8358003466797426258 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 2315202944304188113} + m_PrefabAsset: {fileID: 0} --- !u!4 &4611028898147459592 stripped Transform: m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} ---- !u!4 &9125283564855765219 stripped +--- !u!4 &7836538779477677182 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 2315202944304188113} m_PrefabAsset: {fileID: 0} @@ -28325,12 +28400,72 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} +--- !u!4 &6933497387350454366 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} --- !u!4 &2406774280416967349 stripped Transform: m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} +--- !u!4 &430621551313268376 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7883175047091650287 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7349314633059198581 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1689321469925758140 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5315419128087558218 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8240396197470686403 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2492782666566270944 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3465795657564182353 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} +--- !u!4 &250126608500975846 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} --- !u!4 &7220092645757200445 stripped Transform: m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, @@ -28367,84 +28502,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} ---- !u!4 &4036007123638014994 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3465795657564182353 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2492782666566270944 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &8240396197470686403 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5315419128087558218 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1689321469925758140 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7349314633059198581 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &430621551313268376 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7883175047091650287 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} --- !u!4 &7418618800910870105 stripped Transform: m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} ---- !u!4 &250126608500975846 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6933497387350454366 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 4520064681454326380} - m_PrefabAsset: {fileID: 0} --- !u!4 &3254244058998022503 stripped Transform: m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 4520064681454326380} m_PrefabAsset: {fileID: 0} +--- !u!4 &4036007123638014994 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 484341440126387838, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 4520064681454326380} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4597560680341265650 PrefabInstance: m_ObjectHideFlags: 0 @@ -29105,105 +29180,15 @@ PrefabInstance: objectReference: {fileID: 674796108277879238} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} ---- !u!4 &7062020611193656940 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &674796108277879238 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6334557078981197104 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2695246376783269881 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4999157146657883924 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} --- !u!4 &7061616178414555961 stripped Transform: m_CorrespondingSourceObject: {fileID: 2694787034888130259, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} ---- !u!4 &3314608663550711651 stripped +--- !u!4 &2695246376783269881 stripped Transform: - m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!224 &7472721432205563013 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7903842969898256619 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2351382408409831890 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4891421737810608490 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2642380382217241009 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &2768949106265165781 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3447045466679366823 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3657686346232358223 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5149543074701112194 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - m_PrefabInstance: {fileID: 4943307555168902634} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5921026051235449203 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + m_CorrespondingSourceObject: {fileID: 7060896871795626515, guid: e356d5948e4971f499cfe38db3551f59, type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} @@ -29219,6 +29204,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} +--- !u!224 &7472721432205563013 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} --- !u!4 &8690739934298013086 stripped Transform: m_CorrespondingSourceObject: {fileID: 4323910751547465844, guid: e356d5948e4971f499cfe38db3551f59, @@ -29231,6 +29222,90 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4943307555168902634} m_PrefabAsset: {fileID: 0} +--- !u!4 &7062020611193656940 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2781956092999469958, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3447045466679366823 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7731683927786752333, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5149543074701112194 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 282867109870513768, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5921026051235449203 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1635261678954337433, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3657686346232358223 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8527740019373324453, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6334557078981197104 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1401453043568140506, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7903842969898256619 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2966252891034735873, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2351382408409831890 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7222614712918606904, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &674796108277879238 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5604575237176871980, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2642380382217241009 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6931522456072871003, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2768949106265165781 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7131274695571853887, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3314608663550711651 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7594743541931674249, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4891421737810608490 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 539299596846472320, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4999157146657883924 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 142631912391760638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + m_PrefabInstance: {fileID: 4943307555168902634} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5109917368622536691 PrefabInstance: m_ObjectHideFlags: 0 @@ -29540,75 +29615,21 @@ PrefabInstance: objectReference: {fileID: 4763841263892746646} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} ---- !u!4 &2120686865988467762 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7695549904735428201 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5643962156759173700 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &167578942871604766 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} --- !u!4 &1084609921346109615 stripped Transform: m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &703071333314975400 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4763841263892746646 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5848452834717774052 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5757895649623694142 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} --- !u!4 &34580444119207386 stripped Transform: m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &8666149664182101069 stripped +--- !u!4 &7555453618687322879 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5597360233258323729 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} @@ -29624,21 +29645,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &777987356899579524 stripped +--- !u!4 &5848452834717774052 stripped Transform: - m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &794632277214157004 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 5877069112491090589} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7803987231298721815 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} @@ -29654,9 +29663,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} ---- !u!4 &7555453618687322879 stripped +--- !u!4 &5597360233258323729 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} @@ -29666,6 +29675,72 @@ Transform: type: 3} m_PrefabInstance: {fileID: 5877069112491090589} m_PrefabAsset: {fileID: 0} +--- !u!4 &8666149664182101069 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &777987356899579524 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6576518078866994201, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7695549904735428201 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5643962156759173700 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2120686865988467762 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &703071333314975400 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &794632277214157004 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7803987231298721815 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4763841263892746646 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1410501190229127947, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5757895649623694142 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2190909609007774115, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} +--- !u!4 &167578942871604766 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 5877069112491090589} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6372924337174286158 PrefabInstance: m_ObjectHideFlags: 0 @@ -30225,30 +30300,30 @@ PrefabInstance: objectReference: {fileID: 8166285465235942453} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} ---- !u!4 &7810902215159585283 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &7088958161159490887 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9143776497150767794 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} --- !u!4 &3325583184555016593 stripped Transform: m_CorrespondingSourceObject: {fileID: 5539913868285288111, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} +--- !u!4 &1565341096835020056 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5678999280286363053 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &3689067693553004665 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} --- !u!4 &5407890813093927406 stripped Transform: m_CorrespondingSourceObject: {fileID: 3011731725035390672, guid: b3059016602827b498a9d22dcc4876c0, @@ -30261,45 +30336,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} ---- !u!4 &6450558618364666826 stripped +--- !u!4 &1706815271493689412 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &9014949244760422375 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3538621045786063805 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4217944966938356491 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6847085743169381812 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &3689067693553004665 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5905716110750461767, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &6598534555583518556 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 8460207014433947514, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} @@ -30309,21 +30348,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} ---- !u!4 &1706815271493689412 stripped +--- !u!4 &7088958161159490887 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8460207014433947514, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &4057726660170409327 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - m_PrefabInstance: {fileID: 7117765517733895998} - m_PrefabAsset: {fileID: 0} ---- !u!4 &5678999280286363053 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3172990203478897299, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 46843480118989433, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} @@ -30333,15 +30360,33 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} +--- !u!4 &7810902215159585283 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1054550572690801981, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} --- !u!4 &4343061878152183052 stripped Transform: m_CorrespondingSourceObject: {fileID: 6810223025091289650, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} ---- !u!4 &1565341096835020056 stripped +--- !u!4 &6847085743169381812 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8610415649319447078, guid: b3059016602827b498a9d22dcc4876c0, + m_CorrespondingSourceObject: {fileID: 4450363689791208074, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4057726660170409327 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6523625554507954769, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4217944966938356491 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6363098774613292085, guid: b3059016602827b498a9d22dcc4876c0, type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} @@ -30351,6 +30396,36 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7117765517733895998} m_PrefabAsset: {fileID: 0} +--- !u!4 &3538621045786063805 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6042941269712383107, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9143776497150767794 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2027282020126764428, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9014949244760422375 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2295967839834826969, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6450558618364666826 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4270431581643504884, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6598534555583518556 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4131443740747204706, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + m_PrefabInstance: {fileID: 7117765517733895998} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7183467851596501408 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab index 22720fe01f..f328dab617 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationUpPopup.prefab @@ -1242,6 +1242,77 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 2 LanguageIndex: 11153 +--- !u!1 &1905023786419678797 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1599235319721044276} + - component: {fileID: 4816911412816564728} + - component: {fileID: 3485281825267243244} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1599235319721044276 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1905023786419678797} + 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: 8639712862066127290} + - {fileID: 4349435057242980958} + m_Father: {fileID: 7137997478059132504} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 36, y: -50} + m_SizeDelta: {x: 800, y: 103.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4816911412816564728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1905023786419678797} + m_CullTransparentMesh: 0 +--- !u!114 &3485281825267243244 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1905023786419678797} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 160, y: 30} + m_Spacing: {x: 220, y: 0} + m_Constraint: 0 + m_ConstraintCount: 2 --- !u!1 &2049734638794833043 GameObject: m_ObjectHideFlags: 0 @@ -1424,7 +1495,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 616} + m_AnchoredPosition: {x: 0, y: 701} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7281633677771163569 @@ -1808,6 +1879,87 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2912238614490091422} m_CullTransparentMesh: 0 +--- !u!1 &3102104419359442846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4349435057242980958} + - component: {fileID: 2649783881678316887} + - component: {fileID: 7502604450506714640} + m_Layer: 5 + m_Name: nextDrop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4349435057242980958 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3102104419359442846} + 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: 306798219641298668} + m_Father: {fileID: 1599235319721044276} + m_RootOrder: 1 + 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 &2649783881678316887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3102104419359442846} + m_CullTransparentMesh: 0 +--- !u!114 &7502604450506714640 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3102104419359442846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 1, b: 0, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +1000 + LanguageIndex: 11153 --- !u!1 &3128700092930898251 GameObject: m_ObjectHideFlags: 0 @@ -2077,7 +2229,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 416.99994, y: 616} + m_AnchoredPosition: {x: 416.99994, y: 701} m_SizeDelta: {x: 142, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2870669693644151399 @@ -2209,7 +2361,7 @@ RectTransform: - {fileID: 309928333} - {fileID: 13993384408737725} m_Father: {fileID: 3747604606915676520} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2304,6 +2456,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u751F\u547D\uFF1A5000" LanguageIndex: 11153 +--- !u!1 &3753220948812162509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8376817592732234540} + - component: {fileID: 7487897706678609143} + - component: {fileID: 6828757992982401681} + m_Layer: 5 + m_Name: forceUp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8376817592732234540 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753220948812162509} + 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: 7621935699000233553} + m_Father: {fileID: 7137997478059132504} + 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: -9.5, y: 20.999817} + m_SizeDelta: {x: 580, y: 56} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7487897706678609143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753220948812162509} + m_CullTransparentMesh: 0 +--- !u!114 &6828757992982401681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3753220948812162509} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: e5d62ef53f4e50b4c82c34fb24fff4bd, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4161217518857284297 GameObject: m_ObjectHideFlags: 0 @@ -2384,6 +2611,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 1000 LanguageIndex: 11153 +--- !u!1 &4298008520304065127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8639712862066127290} + - component: {fileID: 4602249034998197443} + - component: {fileID: 6213240644364036334} + m_Layer: 5 + m_Name: curDrop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8639712862066127290 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4298008520304065127} + 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: 1599235319721044276} + m_RootOrder: 0 + 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 &4602249034998197443 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4298008520304065127} + m_CullTransparentMesh: 0 +--- !u!114 &6213240644364036334 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4298008520304065127} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9622642, g: 0.88404447, b: 0.7307761, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 42 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 50 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 500 + LanguageIndex: 11153 --- !u!1 &4459238910408490673 GameObject: m_ObjectHideFlags: 0 @@ -2770,6 +3077,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5168\u4F53\u5C5E\u6027\u63D0\u5347" +--- !u!1 &4727334835831721925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 306798219641298668} + - component: {fileID: 7211186884679260515} + - component: {fileID: 6175454158939651314} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &306798219641298668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727334835831721925} + 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: 4349435057242980958} + 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: -223, y: 0} + m_SizeDelta: {x: 122, y: 110.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7211186884679260515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727334835831721925} + m_CullTransparentMesh: 0 +--- !u!114 &6175454158939651314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727334835831721925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f9398964d6d4cdf4db9b39ec0fc5f348, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &4955656821216266653 GameObject: m_ObjectHideFlags: 0 @@ -4060,7 +4441,7 @@ RectTransform: 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: 920, y: 1336} + m_SizeDelta: {x: 920, y: 1500.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7368232595790026856 CanvasRenderer: @@ -4091,7 +4472,7 @@ MonoBehaviour: m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} - m_Type: 0 + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -4185,6 +4566,52 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 +--- !u!1 &7503000983572886954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7137997478059132504} + - component: {fileID: 6884981510677940618} + m_Layer: 5 + m_Name: forceLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7137997478059132504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7503000983572886954} + 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: 8376817592732234540} + - {fileID: 1599235319721044276} + m_Father: {fileID: 3747604606915676520} + m_RootOrder: 2 + 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: 800.6, y: 163.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6884981510677940618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7503000983572886954} + m_CullTransparentMesh: 0 --- !u!1 &7516005029441787767 GameObject: m_ObjectHideFlags: 0 @@ -4217,7 +4644,7 @@ RectTransform: - {fileID: 1811486981567623331} - {fileID: 4095452165657825508} m_Father: {fileID: 3747604606915676520} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4232,6 +4659,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7516005029441787767} m_CullTransparentMesh: 0 +--- !u!1 &7590379886607437387 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7621935699000233553} + - component: {fileID: 8492097581692081895} + - component: {fileID: 4026185140055955233} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7621935699000233553 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590379886607437387} + 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: 8376817592732234540} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8492097581692081895 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590379886607437387} + m_CullTransparentMesh: 0 +--- !u!114 &4026185140055955233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7590379886607437387} + 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.21176472, g: 0.16078432, b: 0.10980393, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5316\u8EAB\u4E4B\u529B" --- !u!1 &7713263097649598547 GameObject: m_ObjectHideFlags: 0 @@ -4425,6 +4931,7 @@ RectTransform: m_Children: - {fileID: 1116588779719440858} - {fileID: 6304393456673193057} + - {fileID: 7137997478059132504} - {fileID: 6431628141810528646} - {fileID: 7641017260553095228} m_Father: {fileID: 2745314713354444472} @@ -4432,7 +4939,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -62.5} + m_AnchoredPosition: {x: 0, y: 36} m_SizeDelta: {x: 900, y: 1211} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7744938814033924867 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 8b0707792f..8da828cbbe 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1037,6 +1037,7 @@ RedPointType = { incarnation_demon = 43804, incarnation_taoist = 43805, tiandihonglu = 43806, + incarnation_force = 43807,--化身之力红点 recruitTreasure = 7010, recruitTreasure_one = 7011, diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua index 9e1576c697..58ce991add 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationForcePanel.lua @@ -49,6 +49,7 @@ function IncarnationForcePanel:BindEvent() end NetManager.SendTransformationForceUpRequest(IncarnationManager.incarnationForceLv,function () self:OnShow() + CheckRedPointStatus(RedPointType.incarnation_force) end) end) BindRedPointObject(RedPointType.Practice_Cultivation,self.btnRed) diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua index caa26e1ea6..bb3dd42959 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationManager.lua @@ -294,6 +294,16 @@ function this.CheckRedData(red) return false end +---检测化身之力红点 +function this.CheckPowerBtnRedData(red) + this.configData = ConfigManager.GetConfigData(ConfigName.ChangingForce,this.incarnationForceLv) + local curHaveItemNum=BagManager.GetItemCountById(this.configData.ExpCost[1]) + local curCostItemNum=this.configData.ExpCost[2] + if curHaveItemNum >=curCostItemNum then + return true + end + return false +end function this.GetChangeCardProperty(cardId,isNextLv,isNextStar) local changeCardInfo=this.itemDataList[cardId] diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index 52c05b1867..f1a0ccfca6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -18,6 +18,7 @@ function IncarnationPanel:InitComponent() self.selectBtn = Util.GetGameObject(self.gameObject,"bg/Tabs/selectBtn") self.btnBack = Util.GetGameObject(self.gameObject,"bg/btnBack") self.incarnationPowerBtn = Util.GetGameObject(self.gameObject,"bg/incarnationPowerBtn") + self.powerBtnRedPoint = Util.GetGameObject(self.gameObject,"bg/incarnationPowerBtn/redPoint") self.addBtn = Util.GetGameObject(self.gameObject,"bg/addBtn") self.helpBtn = Util.GetGameObject(self.gameObject,"bg/helpBtn") self.helpPos = self.helpBtn:GetComponent("RectTransform").localPosition @@ -108,6 +109,7 @@ function IncarnationPanel:BindEvent() BindRedPointObject(RedPointType.incarnation_buddish,tabsRedpoints[2].gameObject) BindRedPointObject(RedPointType.incarnation_demon,tabsRedpoints[3].gameObject) BindRedPointObject(RedPointType.incarnation_taoist,tabsRedpoints[4].gameObject) + BindRedPointObject(RedPointType.incarnation_force,self.powerBtnRedPoint.gameObject) end function IncarnationPanel:FindDatasIndexById(id) @@ -352,7 +354,7 @@ function IncarnationPanel:SetSingleData(go,data,index) self.itemPreList[go].upLvBtn.gameObject:SetActive(true) self.itemPreList[go].upStarBtn.gameObject:SetActive(true) elseif data.state == 2 then - self.itemPreList[go].incarnationningBtn.gameObject:SetActive(true) + -- self.itemPreList[go].incarnationningBtn.gameObject:SetActive(true) self.itemPreList[go].upLvBtn.gameObject:SetActive(true) self.itemPreList[go].upStarBtn.gameObject:SetActive(true) end @@ -390,6 +392,7 @@ function IncarnationPanel:OnDestroy() ClearRedPointObject(RedPointType.incarnation_buddish,tabsRedpoints[2].gameObject) ClearRedPointObject(RedPointType.incarnation_demon,tabsRedpoints[3].gameObject) ClearRedPointObject(RedPointType.incarnation_taoist,tabsRedpoints[4].gameObject) + ClearRedPointObject(RedPointType.incarnation_force,self.powerBtnRedPoint.gameObject) SubUIManager.Close(self.UpView) end diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua index 93642c0e56..23a3ab6fa7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationUpPopup.lua @@ -17,6 +17,7 @@ function this:InitComponent() this.prefab=Util.GetGameObject(self.gameObject, "root/prefab") this.itemView= SubUIManager.Open(SubUIConfig.ItemView, this.prefab.transform) + this.lvLayout=Util.GetGameObject(self.gameObject, "root/verLayout/lvLayout") this.curLvText=Util.GetGameObject(this.lvLayout, "grid/curLv"):GetComponent("Text") this.nextLvText=Util.GetGameObject(this.lvLayout, "grid/nextLv"):GetComponent("Text") @@ -25,6 +26,10 @@ function this:InitComponent() this.curProp=Util.GetGameObject(this.proyLayout, "grid/curProp") this.nextProp=Util.GetGameObject(this.proyLayout, "grid/nextProp") + this.forceLayout=Util.GetGameObject(self.gameObject, "root/verLayout/forceLayout") + this.curDrop=Util.GetGameObject(this.forceLayout, "grid/curDrop"):GetComponent("Text") + this.nextDrop=Util.GetGameObject(this.forceLayout, "grid/nextDrop"):GetComponent("Text") + this.skillLayout=Util.GetGameObject(self.gameObject, "root/verLayout/skillLayout") this.curSkillDes=Util.GetGameObject(this.skillLayout, "grid/curSkillDes/text"):GetComponent("Text") this.nextSkillDes=Util.GetGameObject(this.skillLayout, "grid/nextSkillDes/text"):GetComponent("Text") @@ -120,17 +125,22 @@ function this.UpdateWin() this.upLvBtn.gameObject:SetActive(true) this.upStarBtn.gameObject:SetActive(false) this.skillLayout.gameObject:SetActive(false) + local cardLvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"Level",curLevel,"PoolId",this.cardConfig.LevelUpPool) + this.SetCostItem(cardLvConfig.Exp) + this.curDrop.text=cardLvConfig.ChangingForceExp[2] this.SetPropInfo(this.curProp,propData) if this.CheckLevelLimit() then this.nextProp.gameObject:SetActive(false) this.costGrid.gameObject:SetActive(false) + this.nextDrop.gameObject:SetActive(false) else this.nextProp.gameObject:SetActive(true) this.costGrid.gameObject:SetActive(true) + this.nextDrop.gameObject:SetActive(true) local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,true,false) this.SetPropInfo(this.nextProp,nextPropData) - local cardLvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"Level",curLevel,"PoolId",this.cardConfig.LevelUpPool) - this.SetCostItem(cardLvConfig.Exp) + local nextCardLvConfig=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ChangingCardLevel,"Level",curLevel+1,"PoolId",this.cardConfig.LevelUpPool) + this.nextDrop.text="+"..nextCardLvConfig.ChangingForceExp[2] end else @@ -138,8 +148,7 @@ function this.UpdateWin() Util.GetGameObject(this.curLvText.gameObject, "starImg"):SetActive(true) Util.GetGameObject(this.nextLvText.gameObject, "starImg"):SetActive(true) this.curLvText.text=curStar - this.nextLvText.text=curStar+1 - + this.curDrop.text=curStar>0 and this.cardConfig.StarUpExp[curStar][2] or 0 this.upLvBtn.gameObject:SetActive(false) this.upStarBtn.gameObject:SetActive(true) this.skillLayout.gameObject:SetActive(true) @@ -151,14 +160,18 @@ function this.UpdateWin() this.nextProp.gameObject:SetActive(false) this.costGrid.gameObject:SetActive(false) this.nextSkillDes.transform.parent.gameObject:SetActive(false) + this.nextDrop.gameObject:SetActive(false) else this.nextSkillDes.gameObject:SetActive(true) this.nextSkillDes.text=IncarnationManager.GetSkillDesStr(curCardId,curStar+1) this.nextProp.gameObject:SetActive(true) this.costGrid.gameObject:SetActive(true) + this.nextDrop.gameObject:SetActive(true) local nextPropData=IncarnationManager.GetChangeCardProperty(curCardId,false,true) + this.nextLvText.text=curStar+1 this.SetPropInfo(this.nextProp,nextPropData) this.SetCostItem(this.cardConfig.StarUpCost[curStar+1]) + this.nextDrop.text="+"..this.cardConfig.StarUpExp[curStar+1][2] end end diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 601b0dedda..594feef509 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -339,6 +339,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.incarnation_buddish,RedPointType.incarnation) RPData:SetParent(RedPointType.incarnation_demon,RedPointType.incarnation) RPData:SetParent(RedPointType.incarnation_taoist,RedPointType.incarnation) + RPData:SetParent(RedPointType.incarnation_force,RedPointType.incarnation) RPData:SetParent(RedPointType.incarnation,RedPointType.Practice) --命格 @@ -651,6 +652,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.incarnation_buddish,IncarnationManager.CheckRedData) RPData:AddCheckFunc(RedPointType.incarnation_demon,IncarnationManager.CheckRedData) RPData:AddCheckFunc(RedPointType.incarnation_taoist,IncarnationManager.CheckRedData) + RPData:AddCheckFunc(RedPointType.incarnation_force,IncarnationManager.CheckPowerBtnRedData) RPData:AddCheckFunc(RedPointType.tiandihonglu,OperatingManager.GetTianDiHongLuRedPointStatus) RPData:AddCheckFunc(RedPointType.recruitTreasure_one,RecruitTreasureManager.GetRedPointStatus)