diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab index 4938ee2543..8fe2e57ed2 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab @@ -11857,7 +11857,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b582673e3da23f44fbae9ec0521af1f1, type: 3} + m_Sprite: {fileID: 21300000, guid: e5f390065e8d312419f17562e8250e91, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -29912,7 +29912,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b582673e3da23f44fbae9ec0521af1f1, type: 3} + m_Sprite: {fileID: 21300000, guid: 29430791031a92643b0afc46b730abe5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -44141,7 +44141,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b582673e3da23f44fbae9ec0521af1f1, type: 3} + m_Sprite: {fileID: 21300000, guid: f088797d2a26ab24abe877e97eba98bd, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -44846,7 +44846,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b582673e3da23f44fbae9ec0521af1f1, type: 3} + m_Sprite: {fileID: 21300000, guid: af35ae40293e26b41b46837f7ad59918, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -66626,7 +66626,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: b582673e3da23f44fbae9ec0521af1f1, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e6dd4cae84f4dd46958013a6f282fc7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -73401,151 +73401,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -46.7 - objectReference: {fileID: 0} - - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -131.5 - objectReference: {fileID: 0} - - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 162.252 - objectReference: {fileID: 0} - - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 121.688995 - objectReference: {fileID: 0} - - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 217.458 - objectReference: {fileID: 0} - - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 40.563 - objectReference: {fileID: 0} - - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 81.126 - objectReference: {fileID: 0} - - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818921221046, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 181.215 - objectReference: {fileID: 0} - - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -28.5385 - objectReference: {fileID: 0} - - target: {fileID: 7377032655362792110, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Spacing - value: 8.07 - objectReference: {fileID: 0} - - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 5707498222100529429} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2623652777543239359} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4536239678933937485} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4101978716594682186} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 5558565065193804873} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1460280952473835936} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 80671426211750737} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3956913812832267790} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 7619560116283147380} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8406802421178185116} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 5707498222100529429} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -73601,6 +73456,141 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 3159371167769352248} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 5707498222100529429} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2623652777543239359} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4536239678933937485} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4101978716594682186} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 5558565065193804873} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1460280952473835936} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 80671426211750737} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3956913812832267790} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 7619560116283147380} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8406802421178185116} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 5707498222100529429} + - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -46.7 + objectReference: {fileID: 0} + - target: {fileID: 2320031820122894204, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -131.5 + objectReference: {fileID: 0} + - target: {fileID: 2320031818921221046, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 40.563 + objectReference: {fileID: 0} + - target: {fileID: 2320031818097329349, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 81.126 + objectReference: {fileID: 0} + - target: {fileID: 2320031818590170638, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 121.688995 + objectReference: {fileID: 0} + - target: {fileID: 2320031820211446154, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 162.252 + objectReference: {fileID: 0} + - target: {fileID: 2320031819291926005, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 181.215 + objectReference: {fileID: 0} + - target: {fileID: 2320031818902343618, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 217.458 + objectReference: {fileID: 0} + - target: {fileID: 2320031818242639343, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -28.5385 + objectReference: {fileID: 0} + - target: {fileID: 7377032655362792110, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Spacing + value: 8.07 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2623652777543239359 stripped @@ -73846,79 +73836,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 5229400858541971329} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 2580172773348544555} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 4131066187123407833} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 4560647597910077406} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 5369546683958444765} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 1433410156867440436} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 484437158612809157} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 3552850954473289882} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 7933537924303753952} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 8290420450635653896} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 5229400858541971329} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -73974,6 +73891,69 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 3206523824405040812} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 5229400858541971329} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 2580172773348544555} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 4131066187123407833} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 4560647597910077406} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 5369546683958444765} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 1433410156867440436} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 484437158612809157} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 3552850954473289882} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 7933537924303753952} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 8290420450635653896} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 5229400858541971329} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &2773016355873739458 stripped @@ -74231,79 +74211,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 6684151013664846304} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 4007872468761458250} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 3243772050058583480} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 3106044905892350399} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 6833150252970894524} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 555122806808799573} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 1362724499779654564} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 2674589176917303035} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 8811812758291756161} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 7448165196365727081} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 6684151013664846304} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74359,6 +74266,69 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 4048617167266408653} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 6684151013664846304} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 4007872468761458250} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 3243772050058583480} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 3106044905892350399} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 6833150252970894524} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 555122806808799573} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 1362724499779654564} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 2674589176917303035} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 8811812758291756161} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 7448165196365727081} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 6684151013664846304} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!224 &8605789712567816354 stripped @@ -74616,79 +74586,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 8249087443526701538} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 1812321147767494216} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 269173380942478778} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 406056101254277565} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 8100923833482429630} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 2957822608102017367} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 4346294747905831846} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 839488201579478777} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 6120853385806091395} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 5324741803793622379} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 8249087443526701538} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -74744,6 +74641,69 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 1628026394018728143} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 8249087443526701538} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 1812321147767494216} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 269173380942478778} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 406056101254277565} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 8100923833482429630} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 2957822608102017367} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 4346294747905831846} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 839488201579478777} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 6120853385806091395} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 5324741803793622379} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 8249087443526701538} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &3228834877490035988 stripped @@ -75001,79 +74961,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 561092459036176361} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 7824278358062475331} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 8507167818622043057} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 8075334640236173238} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 423198191144172213} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 6683210115052566364} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 5324072550342954413} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 9085367793675501810} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 2396584007018162824} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 4347816113137097568} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 561092459036176361} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75129,6 +75016,69 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 7143881828749375172} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 561092459036176361} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 7824278358062475331} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 8507167818622043057} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 8075334640236173238} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 423198191144172213} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 6683210115052566364} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5324072550342954413} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 9085367793675501810} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 2396584007018162824} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 4347816113137097568} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 561092459036176361} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &561092459036176361 stripped @@ -75386,79 +75336,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3142226984798320877, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5832018477182110415, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[0] - value: - objectReference: {fileID: 2285417794909024055} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[1] - value: - objectReference: {fileID: 8424935591115745437} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[2] - value: - objectReference: {fileID: 7958284887393485679} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[3] - value: - objectReference: {fileID: 7525325776884324200} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[4] - value: - objectReference: {fileID: 2135138870114957931} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[5] - value: - objectReference: {fileID: 4954383789345847170} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[6] - value: - objectReference: {fileID: 5880837140248612211} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[7] - value: - objectReference: {fileID: 7380199266111012908} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[8] - value: - objectReference: {fileID: 4124287403334298198} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Bones.Array.data[9] - value: - objectReference: {fileID: 2605475622862543806} - - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_RootBone - value: - objectReference: {fileID: 2285417794909024055} - target: {fileID: 6631019625758049817, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_Bones.Array.data[0] @@ -75514,6 +75391,69 @@ PrefabInstance: propertyPath: m_RootBone value: objectReference: {fileID: 8888455649798764058} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[0] + value: + objectReference: {fileID: 2285417794909024055} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[1] + value: + objectReference: {fileID: 8424935591115745437} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[2] + value: + objectReference: {fileID: 7958284887393485679} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[3] + value: + objectReference: {fileID: 7525325776884324200} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[4] + value: + objectReference: {fileID: 2135138870114957931} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[5] + value: + objectReference: {fileID: 4954383789345847170} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[6] + value: + objectReference: {fileID: 5880837140248612211} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[7] + value: + objectReference: {fileID: 7380199266111012908} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[8] + value: + objectReference: {fileID: 4124287403334298198} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Bones.Array.data[9] + value: + objectReference: {fileID: 2605475622862543806} + - target: {fileID: 3480185252870287422, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_RootBone + value: + objectReference: {fileID: 2285417794909024055} + - target: {fileID: 2133462044, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1921790226, guid: e356d5948e4971f499cfe38db3551f59, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3} --- !u!4 &2135138870114957931 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 27e2bbe71f..a388037a3a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -653,7 +653,7 @@ function this.OnClickTabBtn(_proId, isTop,isAni) this.SetRoleList(heros, isTop,isAni) if this.opView.SetCampIconByCurType then - this.opView.SetCampIconByCurType(tabs,this.selectBtn) + this.opView.SetCampIconByCurType(tabs,this.selectBtn,this.selectTxt) else for i = 0 , #tabs do Util.SetGray(tabs[i],false) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua index d7d342df10..c63ffe1bb2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua @@ -37,7 +37,7 @@ function this.GetFormationIndex() end --- 设置阵营 -function this.SetCampIconByCurType(tabs,selectBtn) +function this.SetCampIconByCurType(tabs,selectBtn,selectTxt) for i = 0 , #tabs do tabs[i]:GetComponent("Button").enabled = false if i == curType then @@ -45,6 +45,7 @@ function this.SetCampIconByCurType(tabs,selectBtn) selectBtn.transform:SetParent(tabs[i].transform) selectBtn.transform:DOAnchorPos(Vector3.zero,0) selectBtn.transform:DOScale(Vector3.one,0) + selectTxt.text=PropertyType[curType] Util.SetGray(tabs[i],false) else Util.SetGray(tabs[i],true) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua index 9901f617fc..7764dbffbd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua @@ -77,7 +77,7 @@ function this:OnShow(_parent,...) end --返还比 -- local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/100 - this.bodyText.text = string.format("%s的法宝会重置为1阶\n返还进阶消耗的材料,",heroReadingName) + this.bodyText.text = string.format("%s的生命卡会重置为1阶\n返还进阶消耗的材料,",heroReadingName) local _data={} for i=1,#dropList do