破阵诛仙 珍奇宝阁

dev_chengFeng
ZhangBiao 2020-08-20 18:32:14 +08:00
parent f2ab07cb43
commit aa551923b1
7 changed files with 44 additions and 43 deletions

View File

@ -608,6 +608,7 @@ RedPointType = {
GrowthPackage = 2015,--成长礼包!礼包!!礼包!!(重要的说三遍 和礼金区分)
QianKunBox = 2016,--乾坤包囊
PoZhenZhuXian = 2017,--破阵诛仙
PoZhenZhuXianTask = 20171,--破阵诛仙任务
---聊天相关-----
Chat = 207,
@ -789,8 +790,6 @@ RedPointType = {
QinglongSerectTreasure = 10007,
QinglongSerectTreasureTrail = 10008,
pozhenzhuxianTask = 10009,
}
RedPointStatus = {

View File

@ -4,6 +4,7 @@ local this = DynamicActivityPanel
-- Tab管理器
local TabBox = require("Modules/Common/TabBox")
this._CurPageIndex =1
local orginLayer
local _PageInfo = {--后期可以做成tableInserticon名字都去读表
[1] = { --限时召唤
default = "x_xianshizaohuan_02", lock = "x_xianshizaohuan_02", select = "x_xianshizaohuan_01",
@ -15,23 +16,23 @@ local _PageInfo = {--后期可以做成tableInserticon名字都去读表
},
[3] = { --破阵诛仙
default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01",
rpType = RedPointType.pozhenzhuxianTask,panelType = PanelType.QianKunBox,
rpType = RedPointType.PoZhenZhuXianTask,panelType = PanelType.QianKunBox,
},
[4] = { --珍奇礼包
default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
},
[5] = { --累计充值
default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
}
-- [5] = { --累计充值
-- default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu",
-- rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox,
-- }
}
local TimeLimitedCall = require("Modules/Operating/TimeLimitedCall")
local QianKunBox = require("Modules/Operating/QianKunBox")
local PoZhenZhuXianPage=require("Modules/Operating/PoZhenZhuXianPage")
local ZhenQiYiBaoPage=require("Modules/Operating/ZhenQiYiBaoPage")
local LeiJiChongZhiPage=require("Modules/Operating/LeiJiChongZhiPage")
-- local LeiJiChongZhiPage=require("Modules/Operating/LeiJiChongZhiPage")
--初始化组件(用于子类重写)
function DynamicActivityPanel:InitComponent()
orginLayer = 0
@ -44,6 +45,7 @@ function DynamicActivityPanel:InitComponent()
[2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")),
[3] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")),
[4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")),
-- [5] = LeiJiChongZhiPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_5")),
}
-- 上部货币显示

View File

@ -67,18 +67,18 @@ function this.UpdateTreasureState()
end
end
local TreasureRewardState = ActivityGiftManager.GetActivityTypeInfo(8)
if TreasureRewardState then
--state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝可以再次领取
if TreasureRewardState.mission then
for k,v in ipairs(TreasureRewardState.mission) do
if level >= v.missionId then
rewardData[v.missionId].state = v.state
else
rewardData[v.missionId].state = -2
end
end
end
end
-- if TreasureRewardState then
-- --state -2 未达成 -1 普通和额外全部领取 0未领取 1激活秘宝可以再次领取
-- if TreasureRewardState.mission then
-- for k,v in ipairs(TreasureRewardState.mission) do
-- if level >= v.missionId then
-- rewardData[v.missionId].state = v.state
-- else
-- rewardData[v.missionId].state = -2
-- end
-- end
-- end
-- end
end
function this.UpdateTrailWeekTime(msg)

View File

@ -1,18 +1,18 @@
local PoZhenZhuXianPage = quick_class("PoZhenZhuXianPage")
local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage")
local allData={}
local itemsGrid = {}--item重复利用
local singleTaskPre = {}
local this=PoZhenZhuXianPage
local this=LeiJiChongZhiPage
local parent
local endtime = 0
function PoZhenZhuXianPage:ctor(mainPanel, gameObject)
function LeiJiChongZhiPage:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
self.gameObject = gameObject
self:InitComponent(gameObject)
self:BindEvent()
end
function PoZhenZhuXianPage:InitComponent(gameObject)
function LeiJiChongZhiPage:InitComponent(gameObject)
this.time = Util.GetGameObject(gameObject, "content/tiao/time")
this.itemPre = Util.GetGameObject(gameObject, "content/ItemPre")
this.scrollItem = Util.GetGameObject(gameObject, "content/grid")
@ -25,24 +25,24 @@ function PoZhenZhuXianPage:InitComponent(gameObject)
end
--绑定事件(用于子类重写)
function PoZhenZhuXianPage:BindEvent()
function LeiJiChongZhiPage:BindEvent()
end
--添加事件监听(用于子类重写)
function PoZhenZhuXianPage:AddListener()
function LeiJiChongZhiPage:AddListener()
end
--移除事件监听(用于子类重写)
function PoZhenZhuXianPage:RemoveListener()
function LeiJiChongZhiPage:RemoveListener()
end
local sortingOrder = 0
--界面打开时调用(用于子类重写)
function PoZhenZhuXianPage:OnOpen()
function LeiJiChongZhiPage:OnOpen()
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function PoZhenZhuXianPage:OnShow(_sortingOrder,_parent)
function LeiJiChongZhiPage:OnShow(_sortingOrder,_parent)
sortingOrder = _sortingOrder
parent = _parent
this:OnShowData()
@ -53,7 +53,7 @@ function this.Refresh()
this:SetTime()
end
function PoZhenZhuXianPage:SetTime()
function LeiJiChongZhiPage:SetTime()
if self.timer then
self.timer:Stop()
self.timer = nil
@ -79,7 +79,7 @@ function PoZhenZhuXianPage:SetTime()
self.timer:Start()
end
function PoZhenZhuXianPage:OnShowData()
function LeiJiChongZhiPage:OnShowData()
allData = OperatingManager:InitPoZhenZhuXianData()
if allData then
endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_task)
@ -96,7 +96,7 @@ function PoZhenZhuXianPage:OnShowData()
end
end
function PoZhenZhuXianPage:SortData()
function LeiJiChongZhiPage:SortData()
if allData==nil then
return
end
@ -165,7 +165,7 @@ function this.SingleDataShow(pre,value)
end
--界面打开时调用(用于子类重写)
function PoZhenZhuXianPage:OnOpen()
function LeiJiChongZhiPage:OnOpen()
end
@ -175,20 +175,20 @@ function this.RechargeSuccessFunc(id)
this.OnShowData()
end
function PoZhenZhuXianPage:OnClose()
function LeiJiChongZhiPage:OnClose()
end
--界面销毁时调用(用于子类重写)
function PoZhenZhuXianPage:OnDestroy()
function LeiJiChongZhiPage:OnDestroy()
sortingOrder = 0
end
function PoZhenZhuXianPage:OnHide()
function LeiJiChongZhiPage:OnHide()
sortingOrder = 0
end
--- 将一段时间转换为天时分秒
function PoZhenZhuXian:TimeToDHMS(second)
function LeiJiChongZhiPage:TimeToDHMS(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
local sec = second % 60
@ -200,4 +200,4 @@ function PoZhenZhuXian:TimeToDHMS(second)
end
end
return PoZhenZhuXianPage
return LeiJiChongZhiPage

View File

@ -17,7 +17,7 @@ end
function PoZhenZhuXianPage:InitComponent(gameObject)
this.time = Util.GetGameObject(gameObject, "content/tiao/time")
this.itemPre = Util.GetGameObject(gameObject, "content/ItemPre")
this.itemPre = Util.GetGameObject(gameObject, "content/itempre")
this.scrollItem = Util.GetGameObject(gameObject, "content/grid")
local rootHight = this.scrollItem.transform.rect.height
local width = this.scrollItem.transform.rect.width
@ -191,7 +191,7 @@ function PoZhenZhuXianPage:OnHide()
sortingOrder = 0
end
--- 将一段时间转换为天时分秒
function PoZhenZhuXian:TimeToDHMS(second)
function PoZhenZhuXianPage:TimeToDHMS(second)
local day = math.floor(second / (24 * 3600))
local minute = math.floor(second / 60) % 60
local sec = second % 60

View File

@ -52,7 +52,7 @@ function ZhenQiYiBaoPage:OnShowData()
this.ScrollView:SetData(allData, function (index, go)
this.SingleDataShow(go, allData[index])
end)
LogError(#allData)
LogError(#allData)
end
end

View File

@ -181,7 +181,7 @@ function this.InitRedPointAllRelate()
--24暂时关闭放开这里就行
RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.pozhenzhuxianTask, RedPointType.DynamicActivity)
RPData:SetParent(RedPointType.PoZhenZhuXianTask, RedPointType.DynamicActivity)
-- 好友红点
RPData:SetParent(RedPointType.Friend_Reward, RedPointType.Friend)
@ -386,7 +386,7 @@ function this.RegisterRedCheckFunc()
--限时招募
RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus)
RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus)
RPData:SetParent(RedPointType.pozhenzhuxianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
RPData:SetParent(RedPointType.PoZhenZhuXianTask, OperatingManager.CheckPoZhenZhuXianTaskRed)
RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION)
RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN)