玉虚轮道修改提交
parent
5488167a03
commit
510cbe9070
File diff suppressed because it is too large
Load Diff
|
@ -11,6 +11,18 @@ function ArenaTypePanel:InitComponent()
|
||||||
|
|
||||||
this.btnArena = Util.GetGameObject(self.gameObject, "content/btnArena")
|
this.btnArena = Util.GetGameObject(self.gameObject, "content/btnArena")
|
||||||
this.btnTopMatch = Util.GetGameObject(self.gameObject, "content/btnTopMatch")
|
this.btnTopMatch = Util.GetGameObject(self.gameObject, "content/btnTopMatch")
|
||||||
|
this.btnYXLD = Util.GetGameObject(self.gameObject, "content/btnYXLD")
|
||||||
|
|
||||||
|
this.yxld_Name = Util.GetGameObject(this.btnYXLD, "Name"):GetComponent("Text")
|
||||||
|
this.yxld_normal=Util.GetGameObject(this.btnYXLD, "normal")
|
||||||
|
this.yxld_lock=Util.GetGameObject(this.btnYXLD, "lock")
|
||||||
|
this.yxld_lockTip=Util.GetGameObject(this.yxld_lock, "Tip"):GetComponent("Text")
|
||||||
|
this.yxld_Season = Util.GetGameObject(this.yxld_normal, "Season/Text"):GetComponent("Text")
|
||||||
|
this.yxld_SeasonTime = Util.GetGameObject(this.yxld_normal, "Season/Time"):GetComponent("Text")
|
||||||
|
this.yxld_Score = Util.GetGameObject(this.yxld_normal, "Score/Text"):GetComponent("Text")
|
||||||
|
this.yxld_Rank = Util.GetGameObject(this.yxld_normal, "Rank/Text"):GetComponent("Text")
|
||||||
|
this.yxld_RankNane = Util.GetGameObject(this.yxld_normal, "RankName"):GetComponent("Text")
|
||||||
|
this.yxld_Redpot = Util.GetGameObject(this.btnYXLD, "bg/redpot")
|
||||||
|
|
||||||
this.Arena_Name = Util.GetGameObject(this.btnArena, "Name"):GetComponent("Text")
|
this.Arena_Name = Util.GetGameObject(this.btnArena, "Name"):GetComponent("Text")
|
||||||
this.Arena_Season = Util.GetGameObject(this.btnArena, "Season/Text"):GetComponent("Text")
|
this.Arena_Season = Util.GetGameObject(this.btnArena, "Season/Text"):GetComponent("Text")
|
||||||
|
@ -18,6 +30,7 @@ function ArenaTypePanel:InitComponent()
|
||||||
this.Arena_Score = Util.GetGameObject(this.btnArena, "Score/Text"):GetComponent("Text")
|
this.Arena_Score = Util.GetGameObject(this.btnArena, "Score/Text"):GetComponent("Text")
|
||||||
this.Arena_Rank = Util.GetGameObject(this.btnArena, "Rank/Text"):GetComponent("Text")
|
this.Arena_Rank = Util.GetGameObject(this.btnArena, "Rank/Text"):GetComponent("Text")
|
||||||
this.Arena_RankNane = Util.GetGameObject(this.btnArena, "RankName"):GetComponent("Text")
|
this.Arena_RankNane = Util.GetGameObject(this.btnArena, "RankName"):GetComponent("Text")
|
||||||
|
|
||||||
this.TopMatch_Normal = Util.GetGameObject(this.btnTopMatch, "normal")
|
this.TopMatch_Normal = Util.GetGameObject(this.btnTopMatch, "normal")
|
||||||
this.TopMatch_NormalBG = Util.GetGameObject(this.btnTopMatch, "nBg")
|
this.TopMatch_NormalBG = Util.GetGameObject(this.btnTopMatch, "nBg")
|
||||||
this.TopMatch_Name = Util.GetGameObject(this.btnTopMatch, "Name"):GetComponent("Text")
|
this.TopMatch_Name = Util.GetGameObject(this.btnTopMatch, "Name"):GetComponent("Text")
|
||||||
|
@ -63,6 +76,20 @@ function ArenaTypePanel:BindEvent()
|
||||||
end
|
end
|
||||||
|
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
Util.AddClick(this.btnYXLD,function ()
|
||||||
|
local isOpen = CheckFunctionOpen(FUNCTION_OPEN_TYPE.JumpServer_YuXu)
|
||||||
|
if isOpen then
|
||||||
|
NetManager.CrossYuXuLunDaoGetInfoRequest(1,function(msg)
|
||||||
|
UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
|
||||||
|
end)
|
||||||
|
else
|
||||||
|
local tip=GetFunctionOpenTip(FUNCTION_OPEN_TYPE.JumpServer_YuXu)
|
||||||
|
PopupTipPanel.ShowTip(tip)
|
||||||
|
end
|
||||||
|
|
||||||
|
end)
|
||||||
|
|
||||||
Util.AddClick(this.btnBack, function()
|
Util.AddClick(this.btnBack, function()
|
||||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||||
if PlayerPrefs.HasKey("ArenaTypePanel"..PlayerManager.uid) then
|
if PlayerPrefs.HasKey("ArenaTypePanel"..PlayerManager.uid) then
|
||||||
|
@ -76,7 +103,7 @@ function ArenaTypePanel:BindEvent()
|
||||||
|
|
||||||
BindRedPointObject(RedPointType.Arena_Type_Normal, this.btnArenaRedpot)
|
BindRedPointObject(RedPointType.Arena_Type_Normal, this.btnArenaRedpot)
|
||||||
BindRedPointObject(RedPointType.JumpServer_HightLadder, this.TopMatch_Red)
|
BindRedPointObject(RedPointType.JumpServer_HightLadder, this.TopMatch_Red)
|
||||||
|
bindRedPointObject(RedPointType.WorldArena_reward, this.yxld_Redpot)
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
@ -140,6 +167,21 @@ function ArenaTypePanel:OnShow()
|
||||||
this.RefreshTopMatchShow()
|
this.RefreshTopMatchShow()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
local isOpen=CheckFunctionOpen(FUNCTION_OPEN_TYPE.JumpServer_YuXu)
|
||||||
|
if isOpen then
|
||||||
|
LogError("玉虚论道已开启=======================================")
|
||||||
|
NetManager.CrossYuXuLunDaoGetInfoRequest(1,function(msg)
|
||||||
|
--UIManager.OpenPanel(UIName.WorldArenaMainPanel,msg)
|
||||||
|
this.RefreshYXLDShow(msg)
|
||||||
|
end)
|
||||||
|
else
|
||||||
|
this.RefreshYXLDShow()
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
-- 巅峰战
|
-- 巅峰战
|
||||||
-- ArenaTopMatchManager.RequestTopMatchBaseInfo(function()
|
-- ArenaTopMatchManager.RequestTopMatchBaseInfo(function()
|
||||||
|
@ -170,6 +212,42 @@ function this.RefreshArenaShow()
|
||||||
this.Arena_Season.text = string.format("%s-%s", startDate, endDate)
|
this.Arena_Season.text = string.format("%s-%s", startDate, endDate)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- 刷新竞技场显示
|
||||||
|
function this.RefreshYXLDShow(_msg)
|
||||||
|
this.yxld_Name.text = "玉虚论道"
|
||||||
|
local yxTip=""
|
||||||
|
if not CheckFunctionOpen(FUNCTION_OPEN_TYPE.JumpServer_YuXu) then
|
||||||
|
this.yxld_lock:SetActive(true)
|
||||||
|
this.yxld_normal:SetActive(false)
|
||||||
|
this.yxld_lockTip.text = GetFunctionOpenTip(FUNCTION_OPEN_TYPE.JumpServer_YuXu)
|
||||||
|
else
|
||||||
|
this.yxld_lock:SetActive(false)
|
||||||
|
this.yxld_normal:SetActive(true)
|
||||||
|
local myRank=0
|
||||||
|
if _msg then
|
||||||
|
this.yxld_Score.text=_msg.newMyscore
|
||||||
|
myRank = _msg.myRank
|
||||||
|
else
|
||||||
|
this.yxld_Score.text = WorldArenaManager.GetNewScore()
|
||||||
|
myRank = WorldArenaManager.GetMyRank()
|
||||||
|
end
|
||||||
|
|
||||||
|
if myRank <= 0 then
|
||||||
|
myRank = Language[10036]
|
||||||
|
end
|
||||||
|
this.yxld_Rank.text = myRank
|
||||||
|
--this.yxld_RankNane.text=ConfigManager.GetConfigData(ConfigName.ArenaRoom,baseData.roomId).ArenaRoomName --baseData.rankName
|
||||||
|
local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.JumpServer_YuXu)
|
||||||
|
local startDate = os.date("%m.%d", serData.startTime)
|
||||||
|
local endDate = os.date("%m.%d", serData.endTime)
|
||||||
|
this.yxld_Season.text = string.format("%s-%s", startDate, endDate)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
-- 刷新巅峰战显示
|
-- 刷新巅峰战显示
|
||||||
function this.RefreshTopMatchShow()
|
function this.RefreshTopMatchShow()
|
||||||
-- local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH)
|
-- local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.TOP_MATCH)
|
||||||
|
@ -345,6 +423,14 @@ function this.TimeUpdate()
|
||||||
-- this.TopMatch_Lock_Time.gameObject:SetActive(false)
|
-- this.TopMatch_Lock_Time.gameObject:SetActive(false)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local isOpen = ActTimeCtrlManager.IsSwitchOpen(FUNCTION_OPEN_TYPE.JumpServer_YuXu)
|
||||||
|
if isOpen then
|
||||||
|
local yuxuLeft=WorldArenaManager.GetLeftTime()
|
||||||
|
this.yxld_SeasonTime.text = string.format(Language[10090], TimeToHMS(yuxuLeft))
|
||||||
|
else
|
||||||
|
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面关闭时调用(用于子类重写)
|
--界面关闭时调用(用于子类重写)
|
||||||
|
@ -356,6 +442,8 @@ function ArenaTypePanel:OnDestroy()
|
||||||
this.spLoader:Destroy()
|
this.spLoader:Destroy()
|
||||||
ClearRedPointObject(RedPointType.Arena_Type_Normal, this.btnArenaRedpot)
|
ClearRedPointObject(RedPointType.Arena_Type_Normal, this.btnArenaRedpot)
|
||||||
ClearRedPointObject(RedPointType.JumpServer_HightLadder, this.TopMatch_Red)
|
ClearRedPointObject(RedPointType.JumpServer_HightLadder, this.TopMatch_Red)
|
||||||
|
ClearRedPointObject(RedPointType.WorldArena_reward, this.yxld_Redpot)
|
||||||
|
|
||||||
-- SubUIManager.Close(this.UpView)
|
-- SubUIManager.Close(this.UpView)
|
||||||
if this.TimeCounter then
|
if this.TimeCounter then
|
||||||
this.TimeCounter:Stop()
|
this.TimeCounter:Stop()
|
||||||
|
|
|
@ -206,7 +206,7 @@ function this:InitComponent()
|
||||||
--跨服
|
--跨服
|
||||||
this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")
|
this.btnJumpServer = Util.GetGameObject(this.gameObject, "scene/layer4/btnJumpServer")
|
||||||
--跨服战斗功能屏蔽
|
--跨服战斗功能屏蔽
|
||||||
this.btnJumpServer:SetActive(true)
|
this.btnJumpServer:SetActive(false)
|
||||||
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
|
this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero")
|
||||||
this.btnTianShuMiJuan = Util.GetGameObject(self.gameObject,"RightDown/btnTianShuMiJuan")
|
this.btnTianShuMiJuan = Util.GetGameObject(self.gameObject,"RightDown/btnTianShuMiJuan")
|
||||||
--this.btnTianShuMiJuan:SetActive(false)
|
--this.btnTianShuMiJuan:SetActive(false)
|
||||||
|
|
|
@ -328,6 +328,7 @@ function this.InitRedPointAllRelate()
|
||||||
--RPData:SetParent(RedPointType.LingMaiMiJing, RedPointType.JumpServer_MainCity)
|
--RPData:SetParent(RedPointType.LingMaiMiJing, RedPointType.JumpServer_MainCity)
|
||||||
--玉虚论道
|
--玉虚论道
|
||||||
RPData:SetParent(RedPointType.WorldArena_reward, RedPointType.JumpServer_MainCity)
|
RPData:SetParent(RedPointType.WorldArena_reward, RedPointType.JumpServer_MainCity)
|
||||||
|
RPData:SetParent(RedPointType.WorldArena_reward, RedPointType.Arena)
|
||||||
-- 山河社稷图
|
-- 山河社稷图
|
||||||
RPData:SetParent(RedPointType.FightLevelBoxReward, RedPointType.FightLevel)
|
RPData:SetParent(RedPointType.FightLevelBoxReward, RedPointType.FightLevel)
|
||||||
RPData:SetParent(RedPointType.FightLevelDailyReward, RedPointType.FightLevel)
|
RPData:SetParent(RedPointType.FightLevelDailyReward, RedPointType.FightLevel)
|
||||||
|
|
|
@ -143,5 +143,10 @@ function this.CheckRewardPoint()
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.GetLeftTime()
|
||||||
|
local leftTime = ActTimeCtrlManager.GetActLeftTime(111)
|
||||||
|
leftTime = leftTime < 0 and 0 or leftTime
|
||||||
|
return leftTime
|
||||||
|
end
|
||||||
|
|
||||||
return this
|
return this
|
Loading…
Reference in New Issue