Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
00407220d8
|
|
@ -46263,7 +46263,7 @@ MonoBehaviour:
|
||||||
m_Alignment: 3
|
m_Alignment: 3
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "\xD79999\n(+100%)"
|
m_Text: "\xD79999\n(+100%)"
|
||||||
|
|
@ -61979,7 +61979,7 @@ MonoBehaviour:
|
||||||
m_Top: 134
|
m_Top: 134
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
m_ChildAlignment: 4
|
m_ChildAlignment: 4
|
||||||
m_Spacing: 62.91
|
m_Spacing: 150
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
m_ChildControlWidth: 0
|
m_ChildControlWidth: 0
|
||||||
|
|
@ -68498,10 +68498,10 @@ MonoBehaviour:
|
||||||
m_Alignment: 5
|
m_Alignment: 5
|
||||||
m_AlignByGeometry: 0
|
m_AlignByGeometry: 0
|
||||||
m_RichText: 1
|
m_RichText: 1
|
||||||
m_HorizontalOverflow: 0
|
m_HorizontalOverflow: 1
|
||||||
m_VerticalOverflow: 1
|
m_VerticalOverflow: 1
|
||||||
m_LineSpacing: 1
|
m_LineSpacing: 1
|
||||||
m_Text: "/\u5206\u949F"
|
m_Text: "/30\u5206\u949F"
|
||||||
LanguageIndex: 10525
|
LanguageIndex: 10525
|
||||||
--- !u!114 &414612287
|
--- !u!114 &414612287
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
|
||||||
|
|
@ -294,6 +294,7 @@ function this.IntiReward()
|
||||||
go.item = newObjToParent(this.rewardItemPre, this.rewardGrid)
|
go.item = newObjToParent(this.rewardItemPre, this.rewardGrid)
|
||||||
go.icon = Util.GetGameObject(go.item, "iconBg/icon"):GetComponent("Image")
|
go.icon = Util.GetGameObject(go.item, "iconBg/icon"):GetComponent("Image")
|
||||||
go.text = Util.GetGameObject(go.item, "rewardbg/context"):GetComponent("Text")
|
go.text = Util.GetGameObject(go.item, "rewardbg/context"):GetComponent("Text")
|
||||||
|
Util.GetGameObject(go.item, "rewardbg/rate"):SetActive(false)
|
||||||
this.rewardList[i] = go
|
this.rewardList[i] = go
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -302,10 +303,10 @@ function this.IntiReward()
|
||||||
local addValue = FightPointPassManager.GetItemVipValue(rewardData[i][1])
|
local addValue = FightPointPassManager.GetItemVipValue(rewardData[i][1])
|
||||||
local baseValue = rewardData[i][2]
|
local baseValue = rewardData[i][2]
|
||||||
if addValue - 1 <= 0 then
|
if addValue - 1 <= 0 then
|
||||||
this.rewardList[i].text.text = "+" .. rewardData[i][2]
|
this.rewardList[i].text.text = "+" .. rewardData[i][2] .."/30分钟"
|
||||||
else
|
else
|
||||||
local valueShow = math.round((addValue - 1) * baseValue)
|
local valueShow = math.round((addValue - 1) * baseValue)
|
||||||
this.rewardList[i].text.text = string.format("+%s\n<color=#00FF00>(+%s)</color>", baseValue, valueShow)
|
this.rewardList[i].text.text = string.format("+%s\n<color=#00FF00>(+%s)</color>", baseValue, valueShow).."/30分钟"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue