From f67574de55ddd0eb6a28bc43ae1ff58529e6d144 Mon Sep 17 00:00:00 2001 From: xiejun <467745540@qq.com> Date: Sat, 13 Jan 2024 15:45:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=99=E4=BC=B4=E5=8D=87=E6=98=9F=EF=BC=8C?= =?UTF-8?q?=E7=AB=8B=E7=BB=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/CompoundHero/CompoundHeroPanel.prefab | 384 +++++++++--------- .../view/CompoundHero_Compound.lua | 2 +- .../view/CompoundHero_Replace.lua | 6 +- 3 files changed, 196 insertions(+), 196 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab index 27c4690119..8afe1427ab 100644 --- a/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab @@ -1499,7 +1499,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -54.00003, y: 74.10002} - m_SizeDelta: {x: 74, y: 74} + m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6842134320877758975 CanvasRenderer: @@ -2173,7 +2173,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -2221,10 +2221,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 625.8, y: -4} - m_SizeDelta: {x: 60, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4713829247308178245 CanvasRenderer: @@ -2572,10 +2572,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 792.4, y: -4} - m_SizeDelta: {x: 60, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3043128608018388249 CanvasRenderer: @@ -4418,10 +4418,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 126, y: -4} - m_SizeDelta: {x: 60, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2026494486082166274 CanvasRenderer: @@ -5556,7 +5556,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1441774295091081370 RectTransform: m_ObjectHideFlags: 0 @@ -7402,7 +7402,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -7746,10 +7746,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 459.2, y: -4} - m_SizeDelta: {x: 60, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3428141315978654585 CanvasRenderer: @@ -8807,7 +8807,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.00006106496, y: 0} + m_AnchoredPosition: {x: 0.000000104953294, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6856743343572947494 @@ -9801,7 +9801,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &291490665649152714 RectTransform: m_ObjectHideFlags: 0 @@ -12740,7 +12740,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -54.00003, y: 74.10002} - m_SizeDelta: {x: 74, y: 74} + m_SizeDelta: {x: 35, y: 35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4091921074101965046 CanvasRenderer: @@ -15034,10 +15034,10 @@ RectTransform: m_Father: {fileID: 959130899583045509} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 292.6, y: -4} - m_SizeDelta: {x: 60, y: 88} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5713593700809359769 CanvasRenderer: @@ -16363,61 +16363,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 6447125663100292221} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 3613232194504526807} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 2935823801474064421} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 3359955998269420578} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 6588252493083957537} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 148095486663120072} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 1680770620804836921} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 2352033357466444646} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 9219937486075496732} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 7126708398865004788} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 6447125663100292221} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -16473,6 +16418,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 4437600977647621456} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 6447125663100292221} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 3613232194504526807} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 2935823801474064421} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 3359955998269420578} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 6588252493083957537} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 148095486663120072} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 1680770620804836921} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2352033357466444646} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 9219937486075496732} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 7126708398865004788} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 6447125663100292221} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &8523301263739179630 stripped @@ -16723,61 +16723,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: -1 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 7308227165633779873} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1022322383968624395} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 1489257105556534521} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 1347760937533792510} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 7456536014493453821} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 4475143494716293140} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 3118611600830888677} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 2067392625425250234} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4892896049322352064} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 6842063791756667944} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 7308227165633779873} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -16833,6 +16778,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 108444629137817996} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 7308227165633779873} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1022322383968624395} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 1489257105556534521} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 1347760937533792510} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 7456536014493453821} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 4475143494716293140} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3118611600830888677} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2067392625425250234} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4892896049322352064} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 6842063791756667944} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 7308227165633779873} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &4892896049322352064 stripped @@ -17078,61 +17078,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 8799269859400054897} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1243350260009418715} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 854461004083172393} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 992328886815031342} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8650200251655482669} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 2408203142309503172} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 3762414482627664437} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 270666847548512106} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 6671607564786220304} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 4720516192376622328} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 8799269859400054897} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -17188,6 +17133,61 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 2229287739125031260} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8799269859400054897} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1243350260009418715} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 854461004083172393} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 992328886815031342} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8650200251655482669} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2408203142309503172} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 3762414482627664437} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 270666847548512106} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 6671607564786220304} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 4720516192376622328} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8799269859400054897} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &270666847548512106 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua index 93ab6a1ae3..368e7af3c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua @@ -164,7 +164,7 @@ function this.ShowTitleData(curHeroCompoundData) roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, curSelectHero.skinId) end else - liveName = GetResourcePath(heroConfig.Live) + liveName = GetResourcePath(heroConfig.Painting) roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroConfig.Id) end local scale = roleConfig.play_liveScale diff --git a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua index f2fad271f6..75ff90aef8 100644 --- a/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua +++ b/Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Replace.lua @@ -115,7 +115,7 @@ function this.RebuildData(id,curHero) local herodata = {} herodata.id = HeroConfig[id].Id herodata.name = GetLanguageStrById(HeroConfig[id].ReadingName) - herodata.live = GetResourcePath(HeroConfig[id].Live) + herodata.live = GetResourcePath(HeroConfig[id].Painting) herodata.star = HeroConfig[id].Star herodata.lv = curHero.lv herodata.quality = HeroConfig[id].Quality @@ -395,9 +395,9 @@ function this.SetHero(go,heroData) local scale = roleConfig.play_liveScale local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0) if go == this.needHero then - herolive.texture = CardRendererManager.GetSpineTexture(1, heroData.live, Vector3.one * scale, livePos, true) + herolive.texture = CardRendererManager.GetSpineTexture(1, heroData.painting, Vector3.one * scale, livePos, true) else - herolive.texture = CardRendererManager.GetSpineTexture(2, heroData.live, Vector3.one * scale, livePos, true) + herolive.texture = CardRendererManager.GetSpineTexture(2, heroData.painting, Vector3.one * scale, livePos, true) end herolive.transform.localScale = Vector3.one