diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 7f42d3a38a..0f5c1f586b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -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} } diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua index e9e8b5b809..32e14c2e40 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua index 742b49800f..16562eceec 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishTailsmanSoulChip.lua @@ -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("%s星",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