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

gaoxin 2021-12-02 01:44:34 +08:00
commit 0efa821585
3 changed files with 12 additions and 3 deletions

View File

@ -480,7 +480,8 @@ PanelType = {
WorldArena = { 107,16,23}, --玉虚论道
Compound_equip = { 14, 16,1258 }, --装备合成
YuJianXing = {14,16,1010},--御剑行
LingMai = {14,16,1273}--御剑行
LingMai = {14,16,1273},--御剑行
tiandihonglu = {16,1287,1289}
}

View File

@ -160,7 +160,11 @@ function QianKunBoxBuyOnePanel:OnOpen(...)
end
else
isLimitUpHero = false
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })
if lotterySetting[this.recruitType] and lotterySetting[this.recruitType].LotteryType == 13 then
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.tiandihonglu })
else
this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.QianKunBox })
end
d = RecruitManager.GetExpendData(this.recruitType)
end

View File

@ -98,7 +98,11 @@ function this:RefreshData()
end
itemList[i].items[j].go.gameObject:SetActive(true)
itemList[i].items[j].item:OnOpen(false,{self.curData[i].trumpChipList[j],0}, 1.1, true, false, false, sortingOrder + 1)
itemList[i].items[j].lv.text = TailsManSoulManager.GetTailsmanLvById(self.curData[i].trumpList[j].id)..""
local color = "FFFFFF"
if self.curData[i].trumpList[j].lv == self.curData[i].trumpList[j].config.LvMax then
color = "00FF00"
end
itemList[i].items[j].lv.text = string.format("<color=#%s>%s星</color>",color,self.curData[i].trumpList[j].lv)
itemList[i].items[j].select.gameObject:SetActive(this:CheckIsSelect(self.curData[i].trumpChipList[j]))
Util.AddOnceClick(itemList[i].items[j].pos,function()
if this:CheckIsSelect(self.curData[i].trumpChipList[j]) then