From d0232e9a98a97705875a670ca65df641a16a5100 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 15 Jan 2024 15:26:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E8=BA=AB=E5=8D=A1=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/TianShuMiJuan/IncarnationPanel.prefab | 748 +++++++++--------- .../View/GeneralBigPopup_RecrutDetail.lua | 2 +- .../Modules/Incarnation/IncarnationPanel.lua | 3 +- .../Popup/RewardItemSingleShowPopup.lua | 2 +- 4 files changed, 378 insertions(+), 377 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index f86e8e99e6..5d97a4c1c0 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -8867,7 +8867,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: 166, y: -235} + m_AnchoredPosition: {x: 166, y: -370} m_SizeDelta: {x: 354, y: 470} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7593118564683499939 @@ -12370,7 +12370,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u65E0\u7B26\u5408\u8981\u6C42\u7684\u53D8\u8EAB\u5361\uFF01" + m_Text: "\u65E0\u7B26\u5408\u8981\u6C42\u7684\u5965\u4E49\u5361\uFF01" LanguageIndex: 10146 --- !u!1 &3639115404165338874 GameObject: @@ -33162,7 +33162,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0.0000076293945} + m_AnchoredPosition: {x: 0, y: -0.000015258789} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1537562228229781123 @@ -36587,61 +36587,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 8898600331684733590} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1162527879836902716} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 772582060209966798} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 911435038784133833} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8748466333999560650} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 2308309714028263971} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 3843167533433880786} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 189994078139583885} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 6770365101448800247} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 4675230079561504287} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 8898600331684733590} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -36697,6 +36642,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 2275269889650654139} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8898600331684733590} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1162527879836902716} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 772582060209966798} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 911435038784133833} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8748466333999560650} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2308309714028263971} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3843167533433880786} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 189994078139583885} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 6770365101448800247} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 4675230079561504287} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8898600331684733590} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &4675230079561504287 stripped @@ -37272,61 +37272,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 6295776807766909175} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 4324329265115015005} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 2781528259337948335} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 2343889590839515304} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 6145708952717555115} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 876505418813667394} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 1834256969512190643} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3351739044862824428} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 8202199843685639574} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 7836538779477677182} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 6295776807766909175} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -37382,6 +37327,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 3725140534225795546} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 6295776807766909175} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 4324329265115015005} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 2781528259337948335} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 2343889590839515304} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 6145708952717555115} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 876505418813667394} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 1834256969512190643} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3351739044862824428} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 8202199843685639574} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 7836538779477677182} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 6295776807766909175} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &8891579658483384008 stripped @@ -38207,61 +38207,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 5283620925358590066} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2454246380697718744} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4077410969046459434} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4506710904858914861} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 5423977865126206766} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1307697087123607751} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 538374101115873846} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3499264464255723369} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 8059252926790667539} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8272228622493826299} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 5283620925358590066} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -38317,6 +38262,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 3296209480175898975} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 5283620925358590066} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2454246380697718744} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4077410969046459434} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4506710904858914861} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 5423977865126206766} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1307697087123607751} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 538374101115873846} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3499264464255723369} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 8059252926790667539} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8272228622493826299} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 5283620925358590066} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &538374101115873846 stripped @@ -38812,102 +38812,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -39.497 - objectReference: {fileID: 0} - - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.x - value: 268 - objectReference: {fileID: 0} - - target: {fileID: 4914193227855868971, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.00000026822 - objectReference: {fileID: 0} - - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.x - value: 511.3 - objectReference: {fileID: 0} - - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_SizeDelta.y - value: 766.8 - objectReference: {fileID: 0} - - target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1, - type: 3} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 674796108277879238} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 7062020611193656940} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 8690739934298013086} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 9116807302699510169} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 813952383691523226} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 5921026051235449203} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 5149543074701112194} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 8106910601453108957} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 3447045466679366823} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 3657686346232358223} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 674796108277879238} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -38963,6 +38867,102 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7903842969898256619} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 674796108277879238} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 7062020611193656940} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 8690739934298013086} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 9116807302699510169} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 813952383691523226} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 5921026051235449203} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5149543074701112194} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 8106910601453108957} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 3447045466679366823} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 3657686346232358223} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 674796108277879238} + - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -39.497 + objectReference: {fileID: 0} + - target: {fileID: 4346577556544649856, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 268 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -0.00000026822 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -25 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.x + value: 511.3 + objectReference: {fileID: 0} + - target: {fileID: 462259304019684273, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_SizeDelta.y + value: 766.8 + objectReference: {fileID: 0} + - target: {fileID: 4914193227855868971, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 440662846547803826, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 914783a550a50444099c0977255adae1, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &8690739934298013086 stripped @@ -39163,61 +39163,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 4359316202405326591} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 6278980868407961941} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 5600657616723444391} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 5451425316026586784} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 4497267402807278499} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 7424615354719565386} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 8238464318138518715} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 5018054229201551844} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 1942282994497235870} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 567607326647294582} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 4359316202405326591} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -39273,6 +39218,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 6382210692480530386} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 4359316202405326591} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 6278980868407961941} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 5600657616723444391} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 5451425316026586784} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 4497267402807278499} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 7424615354719565386} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 8238464318138518715} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 5018054229201551844} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 1942282994497235870} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 567607326647294582} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 4359316202405326591} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &4497267402807278499 stripped @@ -39598,61 +39598,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 3449996008585745825} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 4953067057640083979} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 6784170945043937785} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 6357083328636235262} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 3311903888561979645} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 8400963426511605012} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 7046823142217299941} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 6213852950625335994} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 678882449924001984} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 1476956588781936936} - - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 3449996008585745825} - target: {fileID: 7403699146335805459, guid: b3059016602827b498a9d22dcc4876c0, type: 3} propertyPath: m_Bones.Array.data[0] @@ -39708,6 +39653,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 5408142715646758028} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 3449996008585745825} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 4953067057640083979} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 6784170945043937785} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 6357083328636235262} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 3311903888561979645} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 8400963426511605012} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 7046823142217299941} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 6213852950625335994} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 678882449924001984} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 1476956588781936936} + - target: {fileID: 789605609705330228, guid: b3059016602827b498a9d22dcc4876c0, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 3449996008585745825} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3059016602827b498a9d22dcc4876c0, type: 3} --- !u!4 &5408142715646758028 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 89bf1bc2b9..1af67a3348 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -127,7 +127,7 @@ function this:OnShow(_parent,_Data) end UpItemList = newList elseif activityType == ActivityTypeDef.Incarnation then - this.secondTitle.text="变身卡自选箱" + this.secondTitle.text="奥义卡自选箱" local newList = {} itemList = RecruitManager.GetRewardPreviewData(poolType) table.insert(newList,{Reward = {itemList[1].Reward[1],1},WeightShow = itemList[1].WeightShow}) diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index 8378570607..decfe7be3d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -138,7 +138,7 @@ function IncarnationPanel:BindEvent() Util.AddClick(self.addBtn, function() local data = {} local singData = {} - singData.title = "当前化身总加成" + singData.title = "当前奥义卡总加成" singData.pro = IncarnationManager.GetproDesLst(IncarnationManager.GetIncarnationTotalPro(),"9E6828") singData.tip ="" --"总加成包括化身之力提供的属性" table.insert(data,singData) @@ -165,6 +165,7 @@ end function IncarnationPanel:SetSelectBtn() self.selectBtn.transform:SetParent(tabs[proId].transform) self.selectBtn:GetComponent("RectTransform").localPosition = Vector3.zero + self.selectBtn.transform:SetSiblingIndex(1) end function IncarnationPanel:RefreshUpLimitLevel() curLevel =PracticeManager.PracticeLevel --ConfigManager.GetConfigData(ConfigName.ChangingForce,IncarnationManager.incarnationForceLv).Level diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 1d833003ca..cff48886aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -410,7 +410,7 @@ function RewardItemSingleShowPopup:OnShow() end if skillId~=0 then this.infoBar:SetActive(true) - this.infoBarTxt.text="变身卡技能:"..IncarnationManager.GetSkillDesStr(skillId,5) + this.infoBarTxt.text="奥义卡技能:"..IncarnationManager.GetSkillDesStr(skillId,5) else this.infoBar:SetActive(false) end