From 5fb0af7e0030aa2ab711460a6726b53011f254bd Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 27 Nov 2021 18:12:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/GeneralBigPopup_WishTailsmanSoulChip.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 From 9a61491b9021d9be1a31fc1d12fcb8e9508bf78b Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 27 Nov 2021 18:28:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9D=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 ++- .../~Lua/Modules/DynamicActivity/QianKunBoxBuyOnePanel.lua | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f30a93833b..9b3f3ce31c 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