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

dev_chengFeng
jiaoyangna 2021-05-25 10:07:42 +08:00
commit 5f9b35a66c
3 changed files with 20 additions and 12 deletions

View File

@ -2237,7 +2237,7 @@ Language = {
[12236] = GetLanguageStrById("是否前往坐骑界面?"),
[12237] = GetLanguageStrById("30级或充值任意金额后解锁"),
[12238] = GetLanguageStrById("<color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>"),
[12239] = GetLanguageStrById("%s 发送了%s请迅速前往抢夺红包"),
[12239] = GetLanguageStrById("%s发送了%s请迅速前往抢夺红包"),
[12240] = GetLanguageStrById("无可合成宝物!"),
[12241] = GetLanguageStrById("<color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>"),
[12242] = GetLanguageStrById("极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>"),

View File

@ -7,8 +7,9 @@ local sortingOrder=0
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
local specialConfig=ConfigManager.GetConfig(ConfigName.SpecialConfig)
local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
local s --s1 消耗道具 s2消耗数量
local b --充值数
local _CostItem --s1 消耗道具 s2消耗数量
local _Con_Recharge --充值数
local _Con_Star --充值数
function this:InitComponent(gameObject)
this.spLoader = SpriteLoader.New()
@ -22,7 +23,7 @@ end
function this:BindEvent()
Util.AddClick(this.okBtn,function()
if BagManager.GetItemCountById(94)< tonumber(s) then
if BagManager.GetItemCountById(94)< tonumber(_CostItem) then
PopupTipPanel.ShowTip(Language[11585])
return
end
@ -45,16 +46,23 @@ function this:OnShow(_parent,...)
parent=_parent
sortingOrder =_parent.sortingOrder
local args = {...}
s=lotterySetting[RecruitType.RecruitBox].CostItem[1][2]
b=tonumber(specialConfig[49].Value)
_CostItem=lotterySetting[RecruitType.RecruitBox]._CostItem[1][2]
local con = string.split(specialConfig[49].Value, "#")
_Con_Recharge = tonumber(con[1])
_Con_Star = tonumber(con[2])
this.titleText.text=Language[11587]
this.text1.text=string.format(Language[11588],s)
this.text1.text=string.format(Language[11588],_CostItem)
this.text2.text=Language[11589] --后续改成读表
this.text3.text=Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),b)..Language[11591]
this.text3.text= string.format("充值%s元或山河社稷图累计星数到达%s开启", string.format(MoneyUtil.GetMoneyUnitName(), _Con_Recharge), _Con_Star)
--Language[11590]..string.format(MoneyUtil.GetMoneyUnitName(),_Con_Recharge)..Language[11591]
local isUnlock = VipManager.GetChargedNum() >= _Con_Recharge or FightLevelManager.GetAllChapterStars() >= _Con_Star
this.curNum.text=string.format(Language[11586],BagManager.GetItemCountById(94))
Util.SetGray(this.okBtn,VipManager.GetChargedNum()<b)
this.okBtn:GetComponent("Button").interactable=VipManager.GetChargedNum()>=b
this.text3.gameObject:SetActive(VipManager.GetChargedNum()>=0 and VipManager.GetChargedNum()<b)
Util.SetGray(this.okBtn, not isUnlock)
this.okBtn:GetComponent("Button").interactable = isUnlock
this.text3.gameObject:SetActive(not isUnlock)
end
function this:OnClose()

View File

@ -2236,7 +2236,7 @@
12236,是否前往坐骑界面?
12237,30级或充值任意金额后解锁
12238,<color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>
12239,%s 发送了%s请迅速前往抢夺红包
12239,%s发送了%s请迅速前往抢夺红包
12240,无可合成宝物!
12241,<color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>
12242,极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>

1 10001
2236 12236 是否前往坐骑界面?
2237 12237 30级或充值任意金额后解锁
2238 12238 <color=#028DEA>%s</color> 级公会 <color=#028DEA>%s</color> 发布招募信息,诚邀各位冒险者加入!(申请等级不低于 <color=#FE4100>%s</color> 级)<color=#66FE00>【马上加入】</color>
2239 12239 %s 发送了%s,请迅速前往抢夺红包! %s发送了%s,请迅速前往抢夺红包!
2240 12240 无可合成宝物!
2241 12241 <color=#FFA278>极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color></color>
2242 12242 极速探索特权:每天增加免费<color=#F1C213>2次</color>,增加购买<color=#FFEBBD>8次</color>