From acf33d10a38b02424f31f1ebbd8b3df27ee0e886 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 28 Oct 2021 17:59:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1018914=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E5=BF=83=E9=AD=94=E8=AF=95=E7=82=BC=E3=80=91=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E6=9C=80=E9=AB=98=E5=B1=82=E5=90=8E=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=8C=91=E6=88=98=E6=8A=A5=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E5=BC=80=E5=B0=8F=E5=B7=AE=E9=94=99=E8=AF=AF=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MonsterCamp/MonsterCampNewPanel.lua | 40 +++-------------- .../ManagedResources/~Lua/View/ShopView.lua | 44 +++++++++++-------- 2 files changed, 31 insertions(+), 53 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index 49d1b226e1..a0f7ad04a3 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -96,41 +96,11 @@ function MonsterCampNewPanel:BindEvent() end,2) end) Util.AddClick(this.moppingUpBtn, function () - -- if MonsterCampManager.monsterWave - 1 <= 0 then - -- PopupTipPanel.ShowTip("无法扫荡,请先挑战心魔试炼!") - -- return - -- end - -- if freeTimes <= 0 and buyTimes <= 0 then - -- PopupTipPanel.ShowTip("今日已无扫荡次数!") - -- return - -- end - -- local _storeDataId,_itemId,_costNum,moppingUpNum = MonsterCampManager.MonsterCampGetYJGMCost() - -- MsgPanel.ShowTwo(string.format("是否花费%s%s进行一键扫荡?",_costNum,itemConfig[itemId].Name),function() end,function() - -- if BagManager.GetItemCountById(_itemId) < _costNum then - -- PopupTipPanel.ShowTip(string.format(Language[10298], itemConfig[itemId].Name)) - -- else - -- if moppingUpNum > 0 then - -- ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,storeDataId,moppingUpNum,function() - -- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, moppingUpNum) - -- NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg) - -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function() - -- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() ) - -- this.UpdatePrivilage() - -- end) - -- end) - -- end) - -- else - -- NetManager.SweepDemonRequest(MonsterCampManager.monsterWave - 1,true,function(msg) - -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.Drop,1,function() - -- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, MonsterCampManager.GetCanBattleCount() ) - -- this.UpdatePrivilage() - -- end) - -- end) - -- end - - -- end - -- end,"取消","确定") - + local waveConfig = ConfigManager.GetConfigData(ConfigName.FloodConfig,MonsterCampManager.monsterWave) + if not waveConfig then + PopupTipPanel.ShowTip("已通过最高层,无法快速挑战!") + return + end if FormationManager.CheckFormationValid(FormationTypeDef.MONSTER_CAMP_ATTACK) then this.QuickStartMonsterFightRequest() else diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 5b81606f8a..8976c726b6 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -107,29 +107,37 @@ function this:BindEvent() local currentTime = os.date("%Y%m%d", PlayerManager.serverTime) local shopType = localSelf.ShopType local isAutoRecover = ShopManager.IsAutoRecoverCount(shopType) - if shopType == SHOP_TYPE.SOUL_PRINT_SHOP then - local itemlist = ShopManager.CheckShopItemList(self.ShopData.storeItem) - local isShow = false - for k,v in pairs(itemlist) do - local goods = ShopManager.GetShopItemGoodsInfo(v.id) - local con = ConfigManager.GetConfigData(ConfigName.ItemConfig,goods[1][1]) - if con.Quantity >= 6 then - isShow = true - end - end - if isShow then - MsgPanel.ShowTwo("当前商店存在红色魂印,刷新后将会消失,是否确认刷新?", function() - end, function() + local leftCount = this.GetShopLeftRefreshCount(shopType) + if leftCount == -2 then + PopupTipPanel.ShowTip(Language[11896]) + elseif leftCount == 0 then + PopupTipPanel.ShowTip(Language[11897]) + else + if shopType == SHOP_TYPE.SOUL_PRINT_SHOP then + local itemlist = ShopManager.CheckShopItemList(self.ShopData.storeItem) + local isShow = false + for k,v in pairs(itemlist) do + local goods = ShopManager.GetShopItemGoodsInfo(v.id) + local itemInfo = ShopManager.GetShopItemInfo(v.id) + local maxLimitCount = ShopManager.GetShopItemLimitBuyCount(v.id) + local curBuyCount = itemInfo.buyNum + local con = ConfigManager.GetConfigData(ConfigName.ItemConfig,goods[1][1]) + if con.Quantity >= 6 and curBuyCount < maxLimitCount then + isShow = true + end + end + if isShow then + MsgPanel.ShowTwo("当前商店存在红色魂印,刷新后将会消失,是否确认刷新?", function() + end, function() + RefreshShop(isPopUp,currentTime,isAutoRecover,shopType) + end, Language[10731], Language[10732],nil,false) + else RefreshShop(isPopUp,currentTime,isAutoRecover,shopType) - end, Language[10731], Language[10732],nil,false) + end else RefreshShop(isPopUp,currentTime,isAutoRecover,shopType) end - else - RefreshShop(isPopUp,currentTime,isAutoRecover,shopType) end - - -- 重置商店刷新按钮点击状态 ShopManager.SetShopRefreshBtnClickStatus(localSelf.ShopType, true) end)