From b4e7faa04cd17a2c863f6368255037811d5aad6a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 13 Dec 2021 17:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eralPopup_HeavenUnlockExtraRewardPanel.lua | 21 ++++--------------- .../TreasureOfHeaven/RecruitTreasurePanel.lua | 2 +- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index dec4ee00af..09987ed639 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -38,6 +38,7 @@ function this:InitComponent(gameObject) this.box1 = Util.GetGameObject(this.Content, "scroll/box") this.box2 = Util.GetGameObject(this.Content, "scroll2/box") this.tip = Util.GetGameObject(this.Content, "Text"):GetComponent("Text") + this.tip3 = Util.GetGameObject(this.Content, "tip3"):GetComponent("Text") this.taskList = {} end @@ -77,6 +78,7 @@ function this:OnShow(_parent,...) local temp = {...} curType = temp[1] local extraType = temp[2] + this.tip3.text = "解锁秘宝" if curType == 1 then rewardStateData = TreasureOfHeavenManger.rewardStateData rewardData = TreasureOfHeavenManger.GetAllRewardData() @@ -107,23 +109,8 @@ function this:OnShow(_parent,...) this.dealBtnText.gameObject:SetActive(true) local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id) this.dealBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Price) - elseif curType == 5 then -- - rewardData,rewardData1 = RecruitTreasureManager.GetAllRewardData(extraType,type[curType].id) - this:showRewardWuJin(rewardData,rewardData1) - this.tip.text = "·激活进阶专属奖励" - this.dealBtnIma.gameObject:SetActive(false) - this.dealBtnText.gameObject:SetActive(true) - local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id) - this.dealBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Price) - elseif curType == 6 then -- - rewardData,rewardData1 = RecruitTreasureManager.GetAllRewardData(extraType,type[curType].id) - this:showRewardWuJin(rewardData,rewardData1) - this.tip.text = "·激活进阶专属奖励" - this.dealBtnIma.gameObject:SetActive(false) - this.dealBtnText.gameObject:SetActive(true) - local config = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,type[curType].id) - this.dealBtnText.text = MoneyUtil.GetMoneyUnitNameWithMoney(config.Price) - elseif curType == 7 then -- + elseif curType == 5 or curType == 6 or curType == 7 then -- + this.tip3.text = "解锁基金" rewardData,rewardData1 = RecruitTreasureManager.GetAllRewardData(extraType,type[curType].id) this:showRewardWuJin(rewardData,rewardData1) this.tip.text = "·激活进阶专属奖励" diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua index 6df5959a47..392eb1220d 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/RecruitTreasurePanel.lua @@ -166,7 +166,7 @@ end function RecruitTreasurePanel:topBar() --设置礼包购买按钮状态 this.buyBtn:GetComponent("Button").interactable = not this.isBuy - this.Text1.text = not this.isBuy and "激活秘宝" or "已激活" + this.Text1.text = not this.isBuy and "激活基金" or "已激活" Util.AddOnceClick(this.buyBtn,function() UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.HeavenUnlockExtraRewardPanel,configs[curPage].ShopData[1][2],configs[curPage].ActId) end)