diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab index 59f9db2749..102574c996 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorPanelList.prefab @@ -737,8 +737,8 @@ 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: 241.6, y: -102.100006} - m_SizeDelta: {x: 530.8, y: 148} + m_AnchoredPosition: {x: 241.6, y: -64.9} + m_SizeDelta: {x: 530.8, y: 73.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4472731735553598297 CanvasRenderer: @@ -772,14 +772,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 85 + m_MaxSize: 30 m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 1.3 m_Text: "\u5996\u7CFB\u795E\u5C06\u989D\u5916\u9020\u621050%\u4F24\u5BB3\n\u975E\u5996\u7CFB\u795E\u5C06\u964D\u4F4E50%\u653B\u51FB\u529B" LanguageIndex: 0 @@ -2012,8 +2012,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 218.9, y: -143.68} - m_SizeDelta: {x: 250, y: 59.86} + m_AnchoredPosition: {x: 218.9, y: -141.53} + m_SizeDelta: {x: 250, y: 47.452} m_Pivot: {x: 0.36038244, y: 0.5} --- !u!222 &5939520279966165509 CanvasRenderer: @@ -2047,14 +2047,14 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 28 m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 105 + m_BestFit: 1 + m_MinSize: 10 + m_MaxSize: 28 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 1 + m_VerticalOverflow: 0 m_LineSpacing: 0.8 m_Text: "\u9700\u8981\u4E0A\u9635\u4E24\u540D\u6C34\u7CFB\u795E\u5C06" LanguageIndex: 0 @@ -2827,7 +2827,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: 1ff24d263ef390d41a920e0165bd0211, type: 3} + m_Sprite: {fileID: 21300000, guid: 308ecb04fa1442e4b85a8a872dfe1243, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2952,6 +2952,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (3) + objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3072,10 +3076,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (3) - objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3122,6 +3122,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView + objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3242,10 +3246,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView - objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3278,6 +3278,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (5) + objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3398,10 +3402,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (5) - objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3434,6 +3434,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (4) + objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3554,10 +3558,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (4) - objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3590,6 +3590,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3395763085718138868} m_Modifications: + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView + objectReference: {fileID: 0} + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3695,10 +3703,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView - objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3731,6 +3735,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (2) + objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -3851,10 +3859,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (2) - objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x @@ -3887,6 +3891,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6403195048930280866} m_Modifications: + - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} + propertyPath: m_Name + value: ItemView (1) + objectReference: {fileID: 0} - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_LocalPosition.x @@ -4007,10 +4015,6 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 0.78 objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView (1) - objectReference: {fileID: 0} - target: {fileID: 8728450457573958900, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} propertyPath: m_AnchoredPosition.x diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab index e3053c004e..9a575350d6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainRechargePanel.prefab @@ -8014,7 +8014,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.000027624856, y: 0} + m_AnchoredPosition: {x: -0.0000020769992, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &6954504526559241720 @@ -9683,8 +9683,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 13, y: 3.7299995} - m_SizeDelta: {x: 4.6, y: -7.5} + m_AnchoredPosition: {x: -8.5, y: 3.73} + m_SizeDelta: {x: -38.4, y: -22.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8932691367077004962 CanvasRenderer: @@ -15625,8 +15625,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.04499817, y: 3.7299995} - m_SizeDelta: {x: -24.09, y: -7.46} + m_AnchoredPosition: {x: -8.2, y: 4.1} + m_SizeDelta: {x: -40.4, y: -23.17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4619395257736567026 CanvasRenderer: @@ -15900,186 +15900,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 53820364} m_Modifications: - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 82 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 166 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 145 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 187 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - target: {fileID: 4066533111738427026, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} propertyPath: m_Name value: NumTextPre objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 19 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 103 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, - type: 3} - propertyPath: m_SizeDelta.x - value: 46 - objectReference: {fileID: 0} - target: {fileID: 5986877063528201156, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} propertyPath: m_LocalPosition.x @@ -16185,6 +16010,181 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 166 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 256774881259618482, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 82 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 153608685421150090, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 145 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 524268788072612413, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 730693154722722739, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 187 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 1075896065980774447, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4381843785078956127, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 103 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 4707470063994619095, guid: f668b18eb108cc14485203ad2dcd9229, + type: 3} + propertyPath: m_SizeDelta.x + value: 46 + objectReference: {fileID: 0} - target: {fileID: 8296019811080805730, guid: f668b18eb108cc14485203ad2dcd9229, type: 3} propertyPath: m_AnchorMin.y diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab index f30946d48e..b1304a864d 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipChangePopup.prefab @@ -1872,8 +1872,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.48, y: -346} - m_SizeDelta: {x: 742.96, y: 5} + m_AnchoredPosition: {x: 411, y: -346} + m_SizeDelta: {x: 740, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222780683089733432 CanvasRenderer: @@ -2014,7 +2014,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 398, y: -1950.205} + m_AnchoredPosition: {x: 398, y: -473.785} m_SizeDelta: {x: 796, y: 947.57} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222743137822192776 @@ -4195,7 +4195,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.48, y: -188} + m_AnchoredPosition: {x: 411, y: -189.9} m_SizeDelta: {x: 742.96, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222050996512149782 @@ -4525,8 +4525,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 411.48, y: -2.5} - m_SizeDelta: {x: 742.96, y: 5} + m_AnchoredPosition: {x: 410, y: -2.5} + m_SizeDelta: {x: 740, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5927330914771990928 CanvasRenderer: @@ -4686,7 +4686,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 398, y: -1084.1849} + m_AnchoredPosition: {x: 398, y: -361.395} m_SizeDelta: {x: 796, y: 722.79} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &880997212094141995 @@ -6435,8 +6435,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.48, y: -169.7} - m_SizeDelta: {x: 742.96, y: 5} + m_AnchoredPosition: {x: 411, y: -189} + m_SizeDelta: {x: 740, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2191374148232004079 CanvasRenderer: @@ -6672,8 +6672,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.48, y: -346} - m_SizeDelta: {x: 742.96, y: 5} + m_AnchoredPosition: {x: 411, y: -342} + m_SizeDelta: {x: 740, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1624413405098125066 CanvasRenderer: @@ -6927,7 +6927,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: 54.160004, y: -14.4} + m_AnchoredPosition: {x: 198, y: -14.4} m_SizeDelta: {x: 706.42, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5279617541827938102 @@ -9327,7 +9327,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 14.4, y: -0.000019352092} + m_AnchoredPosition: {x: 14.4, y: 0.0000111031895} m_SizeDelta: {x: 780.4, y: 107.7} m_Pivot: {x: 0.5, y: 1} --- !u!114 &5460138985887611912 @@ -11255,8 +11255,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 411.48, y: -55.09} - m_SizeDelta: {x: 742.96, y: 5} + m_AnchoredPosition: {x: 410, y: -55.09} + m_SizeDelta: {x: 740, y: 5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3413381989438560798 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua index 46df3c5227..efccec7054 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TalismanResolve.lua @@ -63,7 +63,7 @@ function this:OnShow(_parent,...) this.titleText.text=Language[11612] local heroReadingName = ReadingName for key, value in pairs(selectHeroData) do - heroReadingName = value.heroConfig.ReadingName + heroReadingName = GetLanguageStrById(value.heroConfig.ReadingName) end --返还比 -- local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/100 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua index 43d85e654a..13ef93c9ee 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua @@ -299,7 +299,7 @@ function this.NextCurEquipData() local go = nextSuitProGo[i] go.gameObject:SetActive(true) --type=data[2]--1 穿戴 2 卸下 3 替换 - Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "" .. propertyConfig[curSuitConFig.SuiteValue[i][2]].Info .."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]).. "" + Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "" .. GetLanguageStrById(propertyConfig[curSuitConFig.SuiteValue[i][2]].Info) .."+ "..GetPropertyFormatStr(propertyConfig[curSuitConFig.SuiteValue[i][2]].Style,curSuitConFig.SuiteValue[i][3]).. "" Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "(+" .. GetEquipSuitStr(equipConfigData.Star,curSuitConFig.SuiteValue[i][1]) .. ")" end end