From a3efb9f0afbd5204c5b7271003706b5304367bb3 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Wed, 13 Aug 2025 18:43:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E6=84=BF=E9=99=90=E5=88=B6=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BB=8E5=E7=BA=A7=E6=94=B9=E6=88=90=E6=8A=BD?= =?UTF-8?q?=E5=8D=A1100=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Recruit/RecruitEquipPanelNew.lua | 14 ++++++++++---- .../~Lua/Modules/Recruit/RecruitPanelNew.lua | 12 ++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua index cb6226ba6f..c3fef28b24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua @@ -236,8 +236,11 @@ function RecruitEquipPanelNew:UpdataWishPanel() self.wishNoOpen.gameObject:SetActive(true) self.wishOpen.gameObject:SetActive(false) Util.SetGray(self.wishBtn,true) - self.wishText.text = string.format("%s/%s",wishLv,data) - self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿意念~" + local wishData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig,"Level",data,"LotteryType",1) + self.wishText.text = string.format("%s/%s",RecruitManager.drawTimes[1] or 0,wishData.DrawCardNumber) + --self.wishText.text = string.format("%s/%s",wishLv,data) + --self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿意念~" + self.wishTipIma.text = "召唤次数达到"..wishData.DrawCardNumber.."次后开启心愿功能,\n将有更高概率获得心愿意念~" else self.wishNoOpen.gameObject:SetActive(false) self.wishOpen.gameObject:SetActive(true) @@ -276,8 +279,11 @@ function RecruitEquipPanelNew:UpdataWishPanel() self.wishNoOpen.gameObject:SetActive(true) self.wishOpen.gameObject:SetActive(false) Util.SetGray(self.wishBtn,true) - self.wishText.text = string.format("%s/%s",0,data) - self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿意念~" + --self.wishText.text = string.format("%s/%s",0,data) + --self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿意念~" + local wishData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig,"Level",data,"LotteryType",1) + self.wishText.text = string.format("%s/%s",RecruitManager.drawTimes[1] or 0,wishData.DrawCardNumber) + self.wishTipIma.text = "召唤次数达到"..wishData.DrawCardNumber.."次后开启心愿功能,\n将有更高概率获得心愿意念~" end --self:CheckNewWishHero() end) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index a32cfd89fd..be0af82849 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -227,8 +227,9 @@ function RecruitPanelNew:UpdataWishPanel() self.wishNoOpen.gameObject:SetActive(true) self.wishOpen.gameObject:SetActive(false) Util.SetGray(self.wishBtn,true) - self.wishText.text = string.format("%s/%s",wishLv,data) - self.wishTipIma.text = "宝箱等级"..data.."级后开启心愿功能,\n将有更高概率获得心愿英雄~" + local wishData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig,"Level",data,"LotteryType",1) + self.wishText.text = string.format("%s/%s",RecruitManager.drawTimes[1] or 0,wishData.DrawCardNumber) + self.wishTipIma.text = "召唤次数达到"..wishData.DrawCardNumber.."次后开启心愿功能,\n将有更高概率获得心愿英雄~" else self.wishNoOpen.gameObject:SetActive(false) self.wishOpen.gameObject:SetActive(true) @@ -267,8 +268,11 @@ function RecruitPanelNew:UpdataWishPanel() self.wishNoOpen.gameObject:SetActive(true) self.wishOpen.gameObject:SetActive(false) Util.SetGray(self.wishBtn,true) - self.wishText.text = string.format("%s/%s",0,data) - self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿英雄~" + --self.wishText.text = string.format("%s/%s",0,data) + --self.wishTipIma.text = "开启心愿功能,将有更高概率获得心愿英雄~" + local wishData=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.WishConfig,"Level",data,"LotteryType",1) + self.wishText.text = string.format("%s/%s",RecruitManager.drawTimes[1] or 0,wishData.DrawCardNumber) + self.wishTipIma.text = "召唤次数达到"..wishData.DrawCardNumber.."次后开启心愿功能,\n将有更高概率获得心愿英雄~" end self:CheckNewWishHero() end)