【bug】修复老包中文字重叠
parent
d2940b5a18
commit
13fbabf125
|
@ -2206,7 +2206,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 336.37863, y: -700.5827}
|
m_AnchoredPosition: {x: 336.37863, y: -742.9927}
|
||||||
m_SizeDelta: {x: 796, y: 127}
|
m_SizeDelta: {x: 796, y: 127}
|
||||||
m_Pivot: {x: 0.4225862, y: 0.17486048}
|
m_Pivot: {x: 0.4225862, y: 0.17486048}
|
||||||
--- !u!1 &1345398917211744
|
--- !u!1 &1345398917211744
|
||||||
|
@ -2963,7 +2963,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 398, y: -402.88998}
|
m_AnchoredPosition: {x: 398, y: -445.3}
|
||||||
m_SizeDelta: {x: 796, y: 192.9}
|
m_SizeDelta: {x: 796, y: 192.9}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &222173511112664680
|
--- !u!222 &222173511112664680
|
||||||
|
@ -4083,8 +4083,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 398, y: -361.395}
|
m_AnchoredPosition: {x: 398, y: -382.59998}
|
||||||
m_SizeDelta: {x: 796, y: 722.79}
|
m_SizeDelta: {x: 796, y: 765.19995}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &222214354735553476
|
--- !u!222 &222214354735553476
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -4686,8 +4686,8 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 398, y: -361.395}
|
m_AnchoredPosition: {x: 398, y: -382.59998}
|
||||||
m_SizeDelta: {x: 796, y: 722.79}
|
m_SizeDelta: {x: 796, y: 765.19995}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &880997212094141995
|
--- !u!222 &880997212094141995
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -5540,7 +5540,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 398, y: -345.29996}
|
m_AnchoredPosition: {x: 398, y: -345.29996}
|
||||||
m_SizeDelta: {x: 796, y: 57.59}
|
m_SizeDelta: {x: 796, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &4965034400312963828
|
--- !u!114 &4965034400312963828
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -5572,7 +5572,7 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 2825084008740337357}
|
m_GameObject: {fileID: 2825084008740337357}
|
||||||
m_Enabled: 1
|
m_Enabled: 0
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -6207,7 +6207,7 @@ RectTransform:
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 398, y: -345.29996}
|
m_AnchoredPosition: {x: 398, y: -345.29996}
|
||||||
m_SizeDelta: {x: 796, y: 57.59}
|
m_SizeDelta: {x: 796, y: 100}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &3452469365111386092
|
--- !u!114 &3452469365111386092
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
@ -6239,7 +6239,7 @@ MonoBehaviour:
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 4547918145694625311}
|
m_GameObject: {fileID: 4547918145694625311}
|
||||||
m_Enabled: 1
|
m_Enabled: 0
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
@ -6844,7 +6844,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 398, y: -368.99997}
|
m_AnchoredPosition: {x: 398, y: -369}
|
||||||
m_SizeDelta: {x: 796, y: 51.57}
|
m_SizeDelta: {x: 796, y: 51.57}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!1 &5355357851419272022
|
--- !u!1 &5355357851419272022
|
||||||
|
@ -6910,7 +6910,7 @@ GameObject:
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
m_IsActive: 1
|
m_IsActive: 0
|
||||||
--- !u!224 &5281886784147818100
|
--- !u!224 &5281886784147818100
|
||||||
RectTransform:
|
RectTransform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -7573,7 +7573,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 257.28998, y: -22.253326}
|
m_AnchoredPosition: {x: 257.28998, y: -22.253325}
|
||||||
m_SizeDelta: {x: 540, y: 30}
|
m_SizeDelta: {x: 540, y: 30}
|
||||||
m_Pivot: {x: 0.44683328, y: 0.35822254}
|
m_Pivot: {x: 0.44683328, y: 0.35822254}
|
||||||
--- !u!222 &5279464545680109242
|
--- !u!222 &5279464545680109242
|
||||||
|
@ -9327,7 +9327,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 1}
|
m_AnchorMin: {x: 0.5, y: 1}
|
||||||
m_AnchorMax: {x: 0.5, y: 1}
|
m_AnchorMax: {x: 0.5, y: 1}
|
||||||
m_AnchoredPosition: {x: 14.4, y: 0.0000111031895}
|
m_AnchoredPosition: {x: 14.4, y: -0.0000041351045}
|
||||||
m_SizeDelta: {x: 780.4, y: 107.7}
|
m_SizeDelta: {x: 780.4, y: 107.7}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!114 &5460138985887611912
|
--- !u!114 &5460138985887611912
|
||||||
|
@ -11786,7 +11786,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 336.37863, y: -700.5827}
|
m_AnchoredPosition: {x: 336.37863, y: -742.9927}
|
||||||
m_SizeDelta: {x: 796, y: 127}
|
m_SizeDelta: {x: 796, y: 127}
|
||||||
m_Pivot: {x: 0.4225862, y: 0.17486048}
|
m_Pivot: {x: 0.4225862, y: 0.17486048}
|
||||||
--- !u!1 &8982998037421818740
|
--- !u!1 &8982998037421818740
|
||||||
|
@ -12041,7 +12041,7 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 1}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 1}
|
||||||
m_AnchoredPosition: {x: 398, y: -402.88998}
|
m_AnchoredPosition: {x: 398, y: -445.3}
|
||||||
m_SizeDelta: {x: 796, y: 192.9}
|
m_SizeDelta: {x: 796, y: 192.9}
|
||||||
m_Pivot: {x: 0.5, y: 1}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &8333415249294270727
|
--- !u!222 &8333415249294270727
|
||||||
|
|
|
@ -163,9 +163,9 @@ function RoleEquipChangePopup:OnShow()
|
||||||
this.NextCurEquipData()
|
this.NextCurEquipData()
|
||||||
end
|
end
|
||||||
for i = 1,#this.equipPanel do
|
for i = 1,#this.equipPanel do
|
||||||
LayoutRebuilder.ForceRebuildLayoutImmediate(this.equipPanel[i].bg.transform)
|
ForceRebuildLayout(this.equipPanel[i].bg.transform)
|
||||||
end
|
end
|
||||||
LayoutRebuilder.ForceRebuildLayoutImmediate(this.go.transform)
|
ForceRebuildLayout(this.go.transform)
|
||||||
end
|
end
|
||||||
function this.SetEquipData(index,data,equipConfigData,itemConfigData)
|
function this.SetEquipData(index,data,equipConfigData,itemConfigData)
|
||||||
this.equipPanel[index].powerNum1.text=EquipManager.CalculateWarForce(data.id)
|
this.equipPanel[index].powerNum1.text=EquipManager.CalculateWarForce(data.id)
|
||||||
|
|
Loading…
Reference in New Issue