Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev

dev_chengFeng
DESKTOP-98AVA47\Administrator 2021-01-29 12:29:49 +08:00
commit 839dd3b343
3 changed files with 11 additions and 10 deletions

View File

@ -530,14 +530,14 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40 m_FontSize: 40
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 1
m_MinSize: 0 m_MinSize: 20
m_MaxSize: 40 m_MaxSize: 40
m_Alignment: 3 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0
m_VerticalOverflow: 1 m_VerticalOverflow: 0
m_LineSpacing: 1 m_LineSpacing: 1
m_Text: "\u8FDB\u884C" m_Text: "\u8FDB\u884C"
LanguageIndex: 0 LanguageIndex: 0

View File

@ -4195,7 +4195,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: 371.48, y: -169.7} m_AnchoredPosition: {x: 371.48, y: -188}
m_SizeDelta: {x: 742.96, y: 5} m_SizeDelta: {x: 742.96, y: 5}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &222050996512149782 --- !u!222 &222050996512149782
@ -7972,8 +7972,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 294, y: 15.65} m_AnchoredPosition: {x: 402.8, y: 15.65}
m_SizeDelta: {x: 160, y: 31.3} m_SizeDelta: {x: 377.5, y: 31.3}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5279542354912768318 --- !u!222 &5279542354912768318
CanvasRenderer: CanvasRenderer:
@ -8008,9 +8008,9 @@ MonoBehaviour:
m_FontSize: 32 m_FontSize: 32
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 1 m_BestFit: 1
m_MinSize: 26 m_MinSize: 20
m_MaxSize: 32 m_MaxSize: 32
m_Alignment: 5 m_Alignment: 3
m_AlignByGeometry: 0 m_AlignByGeometry: 0
m_RichText: 1 m_RichText: 1
m_HorizontalOverflow: 0 m_HorizontalOverflow: 0

View File

@ -257,10 +257,11 @@ function this.ShowCurEquipData(index)
local proVa = endProList[i][2][3] local proVa = endProList[i][2][3]
local suitNum = endProList[i][2][1] local suitNum = endProList[i][2][1]
local Star = endProList[i][1] local Star = endProList[i][1]
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#B9AC97>" .. propertyConfig[proId].Info .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "</color>"
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#B9AC97>" .. GetLanguageStrById(propertyConfig[proId].Info) .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#B9AC97>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>" Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#B9AC97>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>"
if type == 2 and #equipSuit > 0 then--激活的要变颜色 if type == 2 and #equipSuit > 0 then--激活的要变颜色
Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#66FF00>" .. propertyConfig[proId].Info .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "</color>" Util.GetGameObject(go.transform, "curProName"):GetComponent("Text").text = "<color=#66FF00>" .. GetLanguageStrById(propertyConfig[proId].Info) .."+ "..GetPropertyFormatStr(propertyConfig[proId].Style,proVa) .. "</color>"
Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#66FF00>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>" Util.GetGameObject(go.transform, "curProVale"):GetComponent("Text").text = "<color=#66FF00>(" .. GetEquipSuitStr(Star,suitNum) .. ")</color>"
end end
end end