充值入口恢复

dev_chengFeng
ZhangBiao 2020-07-31 10:33:05 +08:00
parent bff0e3a1ee
commit 44ace7a129
11 changed files with 61 additions and 95 deletions

View File

@ -231,7 +231,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &7925824165351202300
RectTransform:
m_ObjectHideFlags: 0
@ -59392,7 +59392,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5768136157523812773
RectTransform:
m_ObjectHideFlags: 0

View File

@ -1,4 +1,4 @@
require("Base/BasePanel")--(24暂时关闭)prefab中的天宫秘宝入口被关闭记得开启按钮底下还有个底儿
require("Base/BasePanel")
ExpeditionMainPanel = Inherit(BasePanel)
local this = ExpeditionMainPanel
local nodeGrid = {}

View File

@ -109,7 +109,6 @@ end
function this:OnShow()
this.RefreshItemNum()
this.privilege:SetActive(false) --24暂时关闭删除这里就行
end
--

View File

@ -304,9 +304,6 @@ function GuildMainCityPanel:OnShow()
end
this.FreshPlayerInfo()
this.SetPlayerHead()
--24暂时关闭删除这里就行
this.btnRedPacket:SetActive(false)
end

View File

@ -396,14 +396,12 @@ function this.SwitchTreasureType(treasureType)
this.RrFreshInfo()
end)
else
--24暂时关闭注释和tip反转注释
PopupTipPanel.ShowTip(Language[12262])
-- if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then
-- PopupTipPanel.ShowTip("不可超出最大探宝次数!")
-- return
-- else
-- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil)
-- end
if LuckyTurnTableManager.advanceTimes + 1 > maxTimesCount then
PopupTipPanel.ShowTip("不可超出最大探宝次数!")
return
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil)
end
end
end)
--探宝10次按钮
@ -419,14 +417,12 @@ function this.SwitchTreasureType(treasureType)
this.RrFreshInfo()
end)
else
--24暂时关闭注释和tip反转注释
PopupTipPanel.ShowTip(Language[12262])
-- if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then
-- PopupTipPanel.ShowTip("不可超出最大探宝次数!")
-- return
-- else
-- UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil)
-- end
if LuckyTurnTableManager.advanceTimes + 10 > maxTimesCount then
PopupTipPanel.ShowTip("不可超出最大探宝次数!")
return
else
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61,nil)
end
end
end)
--刷新按钮

View File

@ -236,15 +236,7 @@ function OperatingPanel:RefreshTabStatus()
end
--24暂时关闭删除这里就行
--==========================================================================================================================
self.operateTabs[1]:SetActive(false)
self.operateTabs[2]:SetActive(false)
self.operateTabs[9]:SetActive(false)
self.operateTabs[3]:SetActive(false)
self.operateTabs[7]:SetActive(false)--, SALARY_TYPE.BASE_128
self.operateTabs[8]:SetActive(false)--, SALARY_TYPE.BASE_328
--==========================================================================================================================
end
function OperatingPanel:GetPriorityIndex()

View File

@ -86,11 +86,10 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
-- 充值
--24暂时关闭放开这里就行
-- RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge)
RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge)
RPData:SetParent(RedPointType.VIP_SHOP_DETAIL, RedPointType.Shop_Page_Recharge)
-- RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge)
-- RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包
RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge)
RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包
-- 主界面商店
RPData:SetParent(RedPointType.Shop_Page_General, RedPointType.Shop)
RPData:SetParent(RedPointType.Shop_Page_Coin, RedPointType.Shop)
@ -153,7 +152,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.CumulativeSignIn, RedPointType.Operating)
RPData:SetParent(RedPointType.GiftPage, RedPointType.Operating)
RPData:SetParent(RedPointType.MonthCard, RedPointType.Operating)
--24暂时关闭放开这里就行
RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity)
@ -292,8 +291,7 @@ function this.RegisterRedCheckFunc()
--累计签到
RPData:AddCheckFunc(RedPointType.CumulativeSignIn,OperatingManager.GetSignInRedPointStatus)
--月卡
--24暂时关闭放开这里就行
-- RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint)
RPData:AddCheckFunc(RedPointType.MonthCard,OperatingManager.AllRefreshMonthCardRedPoint)
--连续充值
RPData:AddCheckFunc(RedPointType.ContinuityRecharge,ActivityGiftManager.GetContinuityRechargeRedPoint)
-- 头像红点

View File

@ -203,7 +203,7 @@ function RewardItemSingleShowPopup:OnShow()
end
for i = 1, #jumpSortData do
if jumpSortData[i].id > 0 then
if this.isRewardItemPop == true or itemConfigData.Id == 61 or itemConfigData.Id == 19 then--24暂时关闭
if this.isRewardItemPop == true then
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,false)
else
SubUIManager.Open(SubUIConfig.JumpView, this.equipProGrid.transform, jumpSortData[i].id,true)

View File

@ -9,31 +9,25 @@ local oldAccumRecharge = 0
-- Tab管理器
local TabBox = require("Modules/Common/TabBox")
local _PageInfo = {
-- [1] = { -- 充值
-- default = "r_shop_chongzhi_01", lock = "r_shop_chongzhi_01", select = "r_shop_chongzhi_02",
-- rpType = RedPointType.Shop_Page_Recharge,
-- },
-- [2] = { -- 充值
-- default = "l_mrlb_icon2", lock = "l_mrlb_icon2", select = "l_mrlb_icon1",
-- rpType = RedPointType.DailyGift,
-- params = {DirectBuyType.DAILY_GIFT}, -- 每日礼包
-- },
-- [3] = { -- 充值
-- default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1",
-- -- rpType = RedPointType.Shop_Page_Recharge,
-- params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包
-- },
-- [4] = { -- 成长礼包
-- default = "c_czlb_icon2", lock = "c_czlb_icon2", select = "c_czlb_icon1",
-- rpType = RedPointType.GrowthPackage,
-- params = {SHOP_TYPE.VIP_GIFT},-- 成长礼包
-- },
--24暂时关闭删除这里就行
[1] = { -- 充值
default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1",
params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包
},
default = "r_shop_chongzhi_01", lock = "r_shop_chongzhi_01", select = "r_shop_chongzhi_02",
rpType = RedPointType.Shop_Page_Recharge,
},
[2] = { -- 充值
default = "l_mrlb_icon2", lock = "l_mrlb_icon2", select = "l_mrlb_icon1",
rpType = RedPointType.DailyGift,
params = {DirectBuyType.DAILY_GIFT}, -- 每日礼包
},
[3] = { -- 充值
default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1",
-- rpType = RedPointType.Shop_Page_Recharge,
params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包
},
[4] = { -- 成长礼包
default = "c_czlb_icon2", lock = "c_czlb_icon2", select = "c_czlb_icon1",
rpType = RedPointType.GrowthPackage,
params = {SHOP_TYPE.VIP_GIFT},-- 成长礼包
},
}
local GiftView = require("Modules/Recharge/View/GiftView")
local RechargeView = require("Modules/Recharge/View/RechargeView")
@ -54,12 +48,10 @@ function MainShopPanel:InitComponent()
local giftView = GiftView.new(self, Util.GetGameObject(self.transform, "content/page_1"))
self.PageList = {
--24暂时关闭删除这里就行
-- [1] = RechargeView.new(self, Util.GetGameObject(self.transform, "content/ShopView")),
-- [2] = giftView,
-- [3] = giftView,
-- [4] = giftView,
[1] = giftView,
[1] = RechargeView.new(self, Util.GetGameObject(self.transform, "content/ShopView")),
[2] = giftView,
[3] = giftView,
[4] = giftView,
}
-- 上部货币显示
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft})

View File

@ -117,9 +117,8 @@ function GiftView:RefreshGiftData()
self.scrollView.gameObject:SetActive(true)
elseif self.buyType == DirectBuyType.FINDTREASURE_GIFT then--特权礼包界面
--两部分组成 寻宝特权在商品里 极速探索礼包在直购里
--24暂时关闭
local topspeedData = self:ResetShopData(ShopManager.GetShopDataByType(SHOP_TYPE.FINDTREASURE_GIFT).storeItem, self.buyType, DataType.Shop)
-- shopData = self:ResetShopData(OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift), self.buyType, DataType.Direct)
shopData = self:ResetShopData(OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift), self.buyType, DataType.Direct)
for i = 1, #topspeedData do
table.insert(shopData,topspeedData[i])
end
@ -689,24 +688,23 @@ function GiftView:TimeCountDown()
self.localTimerV2:Stop()
self.localTimerV2 = nil
end
--24暂时关闭恢复释放就可以了
-- self.localTimerV2 = Timer.New(function()
-- local t1,t2=timerList[1].freshTime,timerList[2].freshTime
-- t1=t1-1
-- t2=t2-1
-- if t1 < 0 then
-- -- body刷新
-- self:RefreshGiftData()
-- end
-- if t2 < 0 then
-- -- body刷新
-- self:RefreshGiftData()
-- end
-- timerList[1].pre.text=Language[10561]..self:SpecialTime(t1-GetTimeStamp())--self:SpecialTime
-- timerList[2].pre.text=Language[10561]..self:SpecialTime(t2-GetTimeStamp())
self.localTimerV2 = Timer.New(function()
local t1,t2=timerList[1].freshTime,timerList[2].freshTime
t1=t1-1
t2=t2-1
if t1 < 0 then
-- body刷新
self:RefreshGiftData()
end
if t2 < 0 then
-- body刷新
self:RefreshGiftData()
end
timerList[1].pre.text=Language[10561]..self:SpecialTime(t1-GetTimeStamp())--self:SpecialTime
timerList[2].pre.text=Language[10561]..self:SpecialTime(t2-GetTimeStamp())
-- end,1,-1,true)
-- self.localTimerV2:Start()
end,1,-1,true)
self.localTimerV2:Start()
end
------------------------------
return GiftView

View File

@ -285,13 +285,7 @@ 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 or reChargeType==61) then
return
end
if(reChargeType==20) then
--UIManager.OpenPanel(UIName.OperatingPanel,{tabIndex =1,extraParam =2})
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, 20)--元素神符