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