diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab
index 8187bdce8b..f25c2ff05c 100644
--- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab
@@ -1074,14 +1074,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_Color: {r: 0.1882353, g: 0.1882353, b: 0.22352941, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 21300000, guid: 74567a63d04541c4eba827a8145fb496, type: 3}
+ m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
index 2a292a40f3..93ea1da253 100644
--- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
@@ -4554,7 +4554,7 @@ ParticleSystem:
--- !u!199 &199787422305027156
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -9203,7 +9203,7 @@ ParticleSystem:
--- !u!199 &199651780022285358
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 2
+ m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -15846,7 +15846,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 157}
+ m_AnchoredPosition: {x: 0, y: 138.09}
m_SizeDelta: {x: 600, y: 73.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6735249265126055928
@@ -15879,7 +15879,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
- m_FontSize: 30
+ m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
@@ -20778,30 +20778,20 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
+ value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@@ -20813,10 +20803,20 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16.999998
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
@@ -20943,30 +20943,20 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
+ value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@@ -20978,10 +20968,20 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16.999998
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
@@ -21108,30 +21108,20 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
+ value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@@ -21143,10 +21133,20 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16.999998
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
@@ -21273,30 +21273,20 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
+ value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@@ -21308,10 +21298,20 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16.999998
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
@@ -21438,30 +21438,20 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
+ value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@@ -21473,10 +21463,20 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16.999998
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
@@ -21603,30 +21603,20 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
- propertyPath: m_IsActive
- value: 0
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
objectReference: {fileID: 0}
- target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 3.2600002
objectReference: {fileID: 0}
- - target: {fileID: 2320031818794305969, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
- objectReference: {fileID: 0}
- - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 3.2600002
+ value: -16.999998
objectReference: {fileID: 0}
- target: {fileID: 2320031819916146513, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
@@ -21638,10 +21628,20 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -16.999998
objectReference: {fileID: 0}
- - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
+ - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -16.999998
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 3.2600002
+ objectReference: {fileID: 0}
+ - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
index eaeba1af5e..bb62644993 100644
--- a/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
@@ -70,7 +70,7 @@ function this.RefreshFormation(curFormation)
if index >= tonumber(data.teamRules[1][2]) then
this.root.tip:GetComponent("Text").text = string.format("%s", data.condition)
else
- this.root.tip:GetComponent("Text").text = string.format("%s", data.condition)
+ this.root.tip:GetComponent("Text").text = string.format("%s", data.condition)
end
end
-- 开始战斗