diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua index 186b2e1bd0..6479839b49 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua @@ -109,6 +109,7 @@ end function this:OnShow() this.RefreshItemNum() + this.privilege:SetActive(false) --(24暂时关闭)删除这里就行 end -- diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua index 0059f20146..93af71c649 100644 --- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua @@ -228,15 +228,6 @@ function this.LuckyTurnOnShow(treasureType) end --初始化幸运探宝 this.SwitchTreasureType(treasureType) - - --活动倒计时 - --local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.LuckyTurnTable_One) - --if activityInfo then - -- if activityInfo.endTime ~= 0 then - -- this.LuckyTurnActivitCountDown(activityInfo.endTime - GetTimeStamp()) - -- end - --end - this.SetTableTurnEffect(TableTurnType.Normal) end @@ -405,13 +396,14 @@ function this.SwitchTreasureType(treasureType) this.RrFreshInfo() end) else - --PopupTipPanel.ShowTip("高级探宝券不足!") - if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then - PopupTipPanel.ShowTip("不可超出最大探宝次数!") - return - else - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil) - end + --(24暂时关闭)注释和tip反转注释 + PopupTipPanel.ShowTip("高级探宝券不足!") + -- if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then + -- PopupTipPanel.ShowTip("不可超出最大探宝次数!") + -- return + -- else + -- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil) + -- end end end) --探宝10次按钮 @@ -427,13 +419,14 @@ function this.SwitchTreasureType(treasureType) this.RrFreshInfo() end) else - --PopupTipPanel.ShowTip("高级探宝券不足!") - if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then - PopupTipPanel.ShowTip("不可超出最大探宝次数!") - return - else - UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil) - end + --(24暂时关闭)注释和tip反转注释 + PopupTipPanel.ShowTip("高级探宝券不足!") + -- if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then + -- PopupTipPanel.ShowTip("不可超出最大探宝次数!") + -- return + -- else + -- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil) + -- end end end) --刷新按钮 @@ -492,27 +485,6 @@ function this.ClearDefault() end ----活动时间倒计时 ---function this.LuckyTurnActivitCountDown(timeDown) --- if this.timer then --- this.timer:Stop() --- this.timer = nil --- end --- this.activityCountDownText.text = "剩余时间:"..TimeToDHMS(timeDown) --- this.timer = Timer.New(function() --- if timeDown < 1 then --- --Log("==YSP== 活动时间到 关闭面板!") --- this.timer:Stop() --- this.timer = nil --- return --- --this:ClosePanel() --- end --- timeDown = timeDown - 1 --- this.activityCountDownText.text = "剩余时间:"..TimeToDHMS(timeDown)--DateUtils.GetTimeFormatV2 --- end, 1, -1, true) --- this.timer:Start() ---end - ---设置转盘滚动 1旋转类型 2探宝类型 3服务器给的探宝后位置 function this.SetTableTurnEffect(turnType,treasureType,pos) if turnType==TableTurnType.Normal then --默认旋转 @@ -630,8 +602,6 @@ end ---打开、切换活动界面,刷新倒计时 function this.RefreshBtnCountDown() if LuckyTurnTableManager.curTreasureType==TreasureType.Lucky then - --Log(TimeToHMS(BagManager.GetNextRefreshTime(62)-GetTimeStamp())) - --Log("幸运刷新券 "..BagManager.GetItemCountById(62)) if this.refreshTimer then this.refreshTimer:Stop() end @@ -662,8 +632,6 @@ function this.RefreshBtnCountDown() this.refreshTimer:Start() end elseif LuckyTurnTableManager.curTreasureType==TreasureType.Advanced then - --Log(TimeToHMS(BagManager.GetNextRefreshTime(63)-GetTimeStamp())) - --Log("高级刷新券 "..BagManager.GetItemCountById(63)) this.refreshTimer:Stop() if BagManager.GetItemCountById(63)>0 then --显示免费刷新 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua index 8ed6fd8e8f..e49b22d3bb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingPanel.lua @@ -251,6 +251,7 @@ function OperatingPanel:RefreshTabStatus() end + --(24暂时关闭)删除这里就行 --活动暂时关闭,开启时删掉就好了========================================================================================================================== self.operateTabs[1]:SetActive(false) self.operateTabs[2]:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 2209158fc2..46bab1ca87 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -388,8 +388,10 @@ function this.RegisterRedCheckFunc() --天宫秘宝 RPData:AddCheckFunc(RedPointType.Expedition_Treasure,TreasureOfHeavenManger.RedPoint) --限时招募 + --(24暂时关闭)放开这里就行 -- RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) -- RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) + end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index b181b52918..8ae7debc42 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -68,8 +68,6 @@ function RewardItemSingleShowPopup:BindEvent() elseif itemConfigData.ItemType == ItemType.Box then local _itemData = BagManager.bagDatas[itemSid] if itemConfig[itemSid].UseType ~= 2 then - -- UIManager.OpenPanel(UIName.RewardBoxPanel,_itemData) - -- else UIManager.OpenPanel(UIName.BagResolveAnCompoundPanel, 4, _itemData, function() func() end) @@ -95,10 +93,6 @@ function this.DeleteActiveLanTuData() if lanTuData and lanTuData[1] == false and lanTuData[2] > 0 then WorkShopManager.UpdataWorkShopLanTuActiveState(2, lanTuData[2], itemConfigData.Id)-- end - --改为后端刷新了 - --if itemConfigData then - -- BagManager.UpdateItemsNum(itemConfigData.Id, 1) - --end if func then func() end @@ -167,7 +161,6 @@ function RewardItemSingleShowPopup:OnShow() this.icon.sprite = Util.LoadSprite(GetResourcePath(itemConfigData.ResourceID)) end this.armorType.text = this.getType()--道具类型显示 - --itemNu=BagManager.GetItemCountById(curWorkShopData.workShopData.OpenRules[2]) this.armorLanTuNum:SetActive(true) this.armorLanTuNum:GetComponent("Text").text = Language[11595] .. BagManager.GetItemCountById(itemSid) this.armorInfo.text = string.gsub(itemConfigData.ItemDescribe, "\\n", "") @@ -205,16 +198,9 @@ function RewardItemSingleShowPopup:OnShow() LogGreen("itemConfigData.Jump[i] "..itemConfigData.Jump[i]) if jumpData.data.Type == JumpType.Level then--关卡按钮特殊处理 isLevel = true - --local state = FightPointPassManager.IsFightPointPass(jumpData.data.Skipfactor[1]) - --if state then - -- jumpData.state = 2 - --else - -- jumpData.state = 1 - --end end table.insert(jumpSortData,jumpData) end - --if isLevel then this.JumpSort(jumpSortData) end for i = 1, #jumpSortData do if jumpSortData[i].id > 0 then if(this.isRewardItemPop==true) then @@ -260,8 +246,6 @@ end --道具 和 装备分解 发送请求后 回调 function this.SendBackResolveReCallBack(drop, curResolveAllItemList) UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1) - --改为后端刷新了 - --BagManager.UpdateItemsNum(itemConfigData.Id, 1) if func then func() end @@ -269,10 +253,6 @@ function this.SendBackResolveReCallBack(drop, curResolveAllItemList) end --界面关闭时调用(用于子类重写) function RewardItemSingleShowPopup:OnClose() - - --if func then - -- func() - --end end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index fc9804af6a..7012af173a 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -285,15 +285,17 @@ end function UpView:OnClick(index) local panelShowItemList={} local reChargeType = self.itemList[index] + + Log("reChargeType:"..reChargeType) + + --(24暂时关闭)删除这里就行 + if (reChargeType==16 or reChargeType==20 or reChargeType==19) then + return + end if(reChargeType==20) then --UIManager.OpenPanel(UIName.OperatingPanel,{tabIndex =1,extraParam =2}) UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, 20)--元素神符 end - - --充值入口暂时关闭 - if (reChargeType==16) then - return - end self:RechargeType(reChargeType) end