From f3d4eed21c4d14e0fb0a200bae0690b9eae439aa Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 25 Oct 2022 10:23:48 +0800 Subject: [PATCH] =?UTF-8?q?[gm]=3D=3D=3D=3D=3D=3D=3D=E5=90=8D=E6=9C=9B?= =?UTF-8?q?=E7=89=B9=E6=9D=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Carbon/XuanYuanMirrorPanelList.lua | 27 ++++++++++--------- .../Modules/NewShenZun/GMMingWangPanel.lua | 6 ++--- .../GeneralPopup_BuyXuanYuanMirrorTims.lua | 10 +++---- .../Modules/Recharge/View/EveryDayGiftNew.lua | 6 ++--- .../Modules/Recharge/View/RechargeViewNew.lua | 6 ++--- 5 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua index b40343cedd..25a9f9703a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua @@ -71,6 +71,7 @@ function this:InitComponent() this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) this.remainTimesTip = Util.GetGameObject(self.gameObject, "Panel/tip/remainTimesTip"):GetComponent("Text") this.vipTips = Util.GetGameObject(self.gameObject, "Panel/tip/vipTips"):GetComponent("Text") + this.vipTips.gameObject:SetActive(false) this.btnBack = Util.GetGameObject(self.gameObject, "Panel/BackBtn") this.levelPre = Util.GetGameObject(self.gameObject, "Panel/Pre") @@ -346,19 +347,19 @@ end --界面打开时调用（用于子类重写） function this:RefreshTimes() this.remainTimesTip.text = XuanYuanMirrorManager.GetTimeTip() - if XuanYuanMirrorManager.GetBuyTimesTip() then - this.vipTips.gameObject:SetActive(false) - else - this.vipTips.gameObject:SetActive(true) - this.vipTips.text = Language[10349] - Util.AddOnceClick( - Util.GetGameObject(this.vipTips.gameObject, "GameObject"), - function() - DynamicActivityManager.SetSelectIndex(DataType.Direct,{4003}) - JumpManager.GoJump(36006) - end - ) - end + -- if XuanYuanMirrorManager.GetBuyTimesTip() then + -- this.vipTips.gameObject:SetActive(false) + -- else + -- this.vipTips.gameObject:SetActive(true) + -- this.vipTips.text = Language[10349] + -- Util.AddOnceClick( + -- Util.GetGameObject(this.vipTips.gameObject, "GameObject"), + -- function() + -- DynamicActivityManager.SetSelectIndex(DataType.Direct,{4003}) + -- JumpManager.GoJump(36006) + -- end + -- ) + -- end end function this:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua b/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua index 86a61650aa..597ae5dff1 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua @@ -221,7 +221,7 @@ function this.RefreshReward(Data) this.value.text = string.format("%s/%s",rechargeNum,num) this.price.text = Data.data.price this.btnRed:SetActive(false) - local needNum=DynamicActivityManager.GetMingWangLv(Data.data.shopItemData.BuyRule[2]) + local needNum=DynamicActivityManager.GetMingWangLv(Data.data.shopItemData.BuyRule[2]-1) if Data.data.limitNum - Data.data.boughtNum > 0 then this.btnText:SetActive(false) this.cost:SetActive(true) @@ -286,7 +286,7 @@ function this.RefreshReward(Data) local curData = growData[i] if curData.data.limitNum - curData.data.boughtNum > 0 and BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and - rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]) then + rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then this.leftRed:SetActive(true) break else @@ -299,7 +299,7 @@ function this.RefreshReward(Data) local curData = growData[i] if curData and curData.data.limitNum - curData.data.boughtNum > 0 and BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and - rechargeNum >= DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]) then + rechargeNum >= DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then this.rightRed:SetActive(true) break else diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua index 36efa52413..f943c731c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_BuyXuanYuanMirrorTims.lua @@ -45,11 +45,11 @@ function this:OnShow(_parent,...) local args = {...} this.bodyText.text =string.format(Language[11537],args[1],args[3]) func = args[2] - if XuanYuanMirrorManager.GetBuyTimesTip() then - this.root:SetActive(false) - else - this.root:SetActive(true) - end + -- if XuanYuanMirrorManager.GetBuyTimesTip() then + -- this.root:SetActive(false) + -- else + -- this.root:SetActive(true) + -- end end function this:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index a51cea900c..05fbd4ddf0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -265,7 +265,7 @@ function EveryDayGiftNew:RefreshReward(Data) self.value.text = string.format("%s/%s",rechargeNum,num) self.price.text = Data.data.price self.btnRed:SetActive(false) - local needNum=DynamicActivityManager.GetMingWangLv(Data.data.shopItemData.BuyRule[2]) + local needNum=DynamicActivityManager.GetMingWangLv(Data.data.shopItemData.BuyRule[2]-1) if Data.data.limitNum - Data.data.boughtNum > 0 then self.btnText:SetActive(false) self.cost:SetActive(true) @@ -329,7 +329,7 @@ function EveryDayGiftNew:RefreshReward(Data) local curData = growData[i] if curData.data.limitNum - curData.data.boughtNum > 0 and BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and - rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]) then + rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then self.leftRed:SetActive(true) break else @@ -342,7 +342,7 @@ function EveryDayGiftNew:RefreshReward(Data) local curData = growData[i] if curData and curData.data.limitNum - curData.data.boughtNum > 0 and BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and - rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]) then + rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then self.rightRed:SetActive(true) break else diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 8de7bbe157..0538116b3f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -155,7 +155,7 @@ function RechargeViewNew:RefreshReward(Data) self.value.text = string.format("%s/%s",rechargeNum,num) self.price.text = Data.data.price self.btnRed:SetActive(false) - local needNum=DynamicActivityManager.GetMingWangLv(Data.data.shopItemData.BuyRule[2]) + local needNum=DynamicActivityManager.GetMingWangLv(Data.data.shopItemData.BuyRule[2]-1) if Data.data.limitNum - Data.data.boughtNum > 0 then self.btnText:SetActive(false) self.cost:SetActive(true) @@ -219,7 +219,7 @@ function RechargeViewNew:RefreshReward(Data) local curData = growData[i] if curData.data.limitNum - curData.data.boughtNum > 0 and BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and - rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]) then + rechargeNum >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then self.leftRed:SetActive(true) break else @@ -232,7 +232,7 @@ function RechargeViewNew:RefreshReward(Data) local curData = growData[i] if curData and curData.data.limitNum - curData.data.boughtNum > 0 and BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and - rechargeNum >= DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]) then + rechargeNum >= DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then self.rightRed:SetActive(true) break else