root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
jiaoyangna 2021-06-17 18:17:42 +08:00
parent c102ce2478 c9bf69310c
commit 208c11555c
3 changed files with 655 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1298
Assets/ManagedResources/Prefabs/UI/SurpriseBox/SurpriseBoxPanel.prefab
View File

File diff suppressed because it is too large Load Diff

6
Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua
View File

@ -279,7 +279,11 @@ function this.GetExpertData(indexType,actType)
else
curData.rewards[i].otherData.state = 3
end
curData.rewards[i].otherData.info = string.format("剩余：%s",curData.rewards[i].progress)
if PlayerManager.level >= curData.rewards[i].otherData.Values then
curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values)
else
curData.rewards[i].otherData.info = string.format("%s/%s",PlayerManager.level,curData.rewards[i].otherData.Values)
end
end
else --日累计充值 达人
if actType == ActivityTypeDef.AccumulativeRechargeExper or actType == ActivityTypeDef.DynamicAct_recharge then

2
Assets/ManagedResources/~Lua/Modules/SurpriseBox/SurpriseBoxPanel.lua
View File

@ -182,7 +182,7 @@ function SurpriseBox:SetViewList()
end
self.itemViewList[i]:OnOpen(false, reward[i], 0,false,false,false,self.sortingOrder)
icon.sprite = SetIcon(self.spLoader,reward[i][1])
name.text = string.format("%s×%s",itemConfig[reward[i][1]].Name,reward[i][2])
name.text = string.format("%s\n×%s",itemConfig[reward[i][1]].Name,reward[i][2])
Util.AddOnceClick(icon.gameObject,function ()
self.itemViewList[i]:OnBtnCkickEvent(reward[i][1])