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

dev_chengFeng
gaoxin 2021-05-31 17:31:46 +08:00
commit 60e474f248
2 changed files with 3 additions and 3 deletions

View File

@ -225,9 +225,9 @@ function TimeLimitedCall:Recruit(recrutType,recrutId,bType)
PrivilegeManager.RefreshPrivilegeUsedTimes(self.maxtimesId,recrutType)--记录抽卡次数
if bType == 1 then
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.itemlist[1],recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero[1],recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
else
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.itemlist,recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
UIManager.OpenPanel(UIName.SingleRecruitPanel, msg.drop.Hero,recrutId,bType,{RecruitType.TimeLimitSingle,RecruitType.TimeLimitTen})
end
CheckRedPointStatus(RedPointType.TimeLimited)
end,self.freeTimesId)

View File

@ -75,7 +75,7 @@ function this:OnShow(_parent,...)
elseif curType == 3 then
rewardData,rewardData1 = EndLessMapManager.GetAllRewardData()
this:showRewardWuJin(rewardData,rewardData1)
this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+2000积分<color=#CC4325>可获取980妖晶</color></color>"
this.tip.text = "<color=#60A22C>解锁秘宝,激活进阶</color><color=#95523B>专属奖励+2000积分<color=#CC4325>可获取1280妖晶</color></color>"
this.dealBtnIma.gameObject:SetActive(false)
this.dealBtnText.gameObject:SetActive(true)
local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id)