Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
114c910cd8
Binary file not shown.
|
|
@ -262,7 +262,7 @@ function GuildMainCityPanel:RemoveListener()
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuildFight.AttackStageDefendDataUpdate, this.RefreshGetStar)
|
Game.GlobalEvent:RemoveEvent(GameEvent.GuildFight.AttackStageDefendDataUpdate, this.RefreshGetStar)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.GuildRedPacket.OnCloseRedPointClick, this.CloseRedPointClick)
|
Game.GlobalEvent:RemoveEvent(GameEvent.GuildRedPacket.OnCloseRedPointClick, this.CloseRedPointClick)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshDeathPos)
|
Game.GlobalEvent:RemoveEvent(GameEvent.Guild.RefreshDeathPosStatus, this.RefreshDeathPos)
|
||||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnChangeName, this.FreshPlayerInfo)
|
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnChangeName, this.FreshPlayerInfo)
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,11 @@ function this:InitComponent(gameObject)
|
||||||
this.gameObject = gameObject
|
this.gameObject = gameObject
|
||||||
this.jiesuoBtn = Util.GetGameObject(this.gameObject, "topBar/jiesuoBtn")
|
this.jiesuoBtn = Util.GetGameObject(this.gameObject, "topBar/jiesuoBtn")
|
||||||
this.jiesuoBtnText = Util.GetGameObject(this.jiesuoBtn, "Text"):GetComponent("Text")
|
this.jiesuoBtnText = Util.GetGameObject(this.jiesuoBtn, "Text"):GetComponent("Text")
|
||||||
this.select = Util.GetGameObject(this.gameObject, "topBar/select")
|
this.select = Util.GetGameObject(this.gameObject, "topBar/select")
|
||||||
this.weekTrailBtn = Util.GetGameObject(this.gameObject, "topBar/button/weekTrail")
|
this.weekTrailBtn = Util.GetGameObject(this.gameObject, "topBar/button/weekTrail")
|
||||||
this.finalTrailBtn = Util.GetGameObject(this.gameObject, "topBar/button/finalTrail")
|
this.finalTrailBtn = Util.GetGameObject(this.gameObject, "topBar/button/finalTrail")
|
||||||
|
this.weekTrailBtnRed = Util.GetGameObject(this.weekTrailBtn , "redPoint")
|
||||||
|
this.finalTrailBtnRed = Util.GetGameObject(this.finalTrailBtn, "redPoint")
|
||||||
this.remainTime = Util.GetGameObject(this.gameObject, "topBar/remainTime/Text"):GetComponent("Text")
|
this.remainTime = Util.GetGameObject(this.gameObject, "topBar/remainTime/Text"):GetComponent("Text")
|
||||||
|
|
||||||
this.treasureList = Util.GetGameObject(this.gameObject, "itemList")
|
this.treasureList = Util.GetGameObject(this.gameObject, "itemList")
|
||||||
|
|
@ -74,6 +75,7 @@ function this:RemoveListener()
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh,curType)
|
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.RechargeQinglongSerectSuccess, this.refresh,curType)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.TaskRefresh, this.RefreshTime)
|
Game.GlobalEvent:RemoveEvent(GameEvent.TreasureOfHeaven.TaskRefresh, this.RefreshTime)
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClosen,this.CloseFunction)
|
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClosen,this.CloseFunction)
|
||||||
|
|
||||||
Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh,curType)
|
Game.GlobalEvent:RemoveEvent(GameEvent.MoneyPay.OnPayResultSuccess, this.refresh,curType)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -160,9 +162,15 @@ function this.refresh(type)
|
||||||
this:SetSelect()
|
this:SetSelect()
|
||||||
this:ShowTime(type)
|
this:ShowTime(type)
|
||||||
this:showTaskList(type)
|
this:showTaskList(type)
|
||||||
|
this:SetRedPoint()
|
||||||
CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail)
|
CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this:SetRedPoint()
|
||||||
|
this.weekTrailBtnRed:SetActive(QinglongSerectTreasureManager.GetSerectTreasureTrailSingleRedPot(1))
|
||||||
|
this.finalTrailBtnRed:SetActive(QinglongSerectTreasureManager.GetSerectTreasureTrailSingleRedPot(2))
|
||||||
|
end
|
||||||
|
|
||||||
--任务列表
|
--任务列表
|
||||||
function this:showTaskList(type)
|
function this:showTaskList(type)
|
||||||
|
|
|
||||||
|
|
@ -232,4 +232,18 @@ function this.GetSerectTreasureTrailRedPot()
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.GetSerectTreasureTrailSingleRedPot(_type)
|
||||||
|
if not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody) then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
local task = this.GetQinglongTaskData(_type)
|
||||||
|
for i, v in pairs(task) do
|
||||||
|
if v.state == 1 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
return this
|
return this
|
||||||
|
|
@ -294,7 +294,6 @@ function this.GetMianTaskCurActiveTaskData()
|
||||||
return nil
|
return nil
|
||||||
end
|
end
|
||||||
function this.ResetTreasureTaskInfo(taskList)
|
function this.ResetTreasureTaskInfo(taskList)
|
||||||
local refreshTypeList = {}
|
|
||||||
--type,tasks
|
--type,tasks
|
||||||
for i = 1, #taskList do
|
for i = 1, #taskList do
|
||||||
local taskInfoList = TypeTaskData[TaskTypeDef.TreasureOfSomeBody]
|
local taskInfoList = TypeTaskData[TaskTypeDef.TreasureOfSomeBody]
|
||||||
|
|
@ -304,14 +303,9 @@ function this.ResetTreasureTaskInfo(taskList)
|
||||||
table.remove(TypeTaskData[TaskTypeDef.TreasureOfSomeBody], k)
|
table.remove(TypeTaskData[TaskTypeDef.TreasureOfSomeBody], k)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
for j = 1, #taskList[i].tasks do
|
table.insert(TypeTaskData[TaskTypeDef.TreasureOfSomeBody], taskList[i].tasks[i])
|
||||||
table.insert(TypeTaskData[TaskTypeDef.TreasureOfSomeBody], taskList[i].tasks[j])
|
|
||||||
end
|
|
||||||
table.insert(refreshTypeList,taskList[i].type)
|
|
||||||
this.SetSLrefreshTime2(taskList[i].type,taskList[i].refreshTime)
|
|
||||||
end
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.MissionDaily.OnMissionListRestChanged,refreshTypeList)
|
CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail)
|
||||||
CheckRedPointStatus(RedPointType.TreasureOfSl)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--迷宫寻宝前端刷新任务自行赋值
|
--迷宫寻宝前端刷新任务自行赋值
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue