【巅峰赛】回滚提交1

dev_chengFeng
zhangqiang 2021-01-25 11:26:42 +08:00
parent dd70f63590
commit 82bb3d164e
5 changed files with 4 additions and 15 deletions

View File

@ -362,7 +362,6 @@ GameEvent = {
OnGuessDataUpdate = "TopMatch.OnGuessDataUpdate", OnGuessDataUpdate = "TopMatch.OnGuessDataUpdate",
OnGuessRateUpdate = "TopMatch.OnGuessRateUpdate", OnGuessRateUpdate = "TopMatch.OnGuessRateUpdate",
OnGuessDataUpdateShowTip = "TopMatch.OnGuessDataUpdateShowTip", OnGuessDataUpdateShowTip = "TopMatch.OnGuessDataUpdateShowTip",
CommonInfoRefreshTitle = "TopMatch.CommonInfoRefreshTitle",
}, },
FindFairy={ FindFairy={
RefreshRedPoint="FindFairy.RefreshRedPoint", RefreshRedPoint="FindFairy.RefreshRedPoint",

View File

@ -3,7 +3,6 @@ local this = ArenaTopMatchManager
this.CurTabIndex = 0 this.CurTabIndex = 0
this.curIsShowDoGuessPopup = false this.curIsShowDoGuessPopup = false
local isChange = false local isChange = false
this.panelType = 1
local stageNameTable = { local stageNameTable = {
[1] = 32 .. Language[10097],--强 [1] = 32 .. Language[10097],--强
[2] = 16 .. Language[10097],--强 [2] = 16 .. Language[10097],--强

View File

@ -162,10 +162,10 @@ end
-- --
function this.OpenView(index) function this.OpenView(index)
ArenaTopMatchManager.panelType = index
this._CurLogicIndex = index this._CurLogicIndex = index
ArenaTopMatchManager.SetCurTabIndex(index) ArenaTopMatchManager.SetCurTabIndex(index)
this._CurTabIndex = index this._CurTabIndex = index
local logic = this.ViewLogicList[index] local logic = this.ViewLogicList[index]
if not logic then if not logic then
this.ViewLogicList[index] = reimport(_ViewData[index].script) this.ViewLogicList[index] = reimport(_ViewData[index].script)

View File

@ -134,7 +134,6 @@ function this.SetInfoData(panelType, blueData, redData, textType, showScore,batt
elseif this.panelType == 2 then elseif this.panelType == 2 then
this.awaitText.transform.localPosition = Vector3.New(0,515,0) this.awaitText.transform.localPosition = Vector3.New(0,515,0)
end end
Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.CommonInfoRefreshTitle)
end end
-- 设置显隐 -- 设置显隐
@ -197,13 +196,9 @@ function this.RefreshData(showScore, textType)
this.myScore.gameObject:SetActive(false) this.myScore.gameObject:SetActive(false)
end end
-- this.textImg.sprite = Util.LoadSprite(imgRes[textType].resPath) -- this.textImg.sprite = Util.LoadSprite(imgRes[textType].resPath)
local imageTextType = textType this.textImg.sprite = Util.LoadSprite(imgRes[textType].resPath)
if ArenaTopMatchManager.GetIsBattleEndState(this.panelType) then this.textImg.gameObject.transform.localPosition = imgRes[textType].pos
imageTextType = 1 this.textImg.gameObject.transform.sizeDelta = imgRes[textType].size
end
this.textImg.sprite = Util.LoadSprite(imgRes[imageTextType].resPath)
this.textImg.gameObject.transform.localPosition = imgRes[imageTextType].pos
this.textImg.gameObject.transform.sizeDelta = imgRes[imageTextType].size
-- this.textImg:SetNativeSize() -- this.textImg:SetNativeSize()
-- 设置编队按钮状态 -- 设置编队按钮状态

View File

@ -8,8 +8,6 @@ function ATM_Title:InitComponent(root)
this.matchName = Util.GetGameObject(this.stagePanel, "name"):GetComponent("Text") this.matchName = Util.GetGameObject(this.stagePanel, "name"):GetComponent("Text")
this.freshTime = Util.GetGameObject(this.stagePanel, "time"):GetComponent("Text") this.freshTime = Util.GetGameObject(this.stagePanel, "time"):GetComponent("Text")
this.timeType = Util.GetGameObject(this.stagePanel, "timelab"):GetComponent("Text") this.timeType = Util.GetGameObject(this.stagePanel, "timelab"):GetComponent("Text")
this.freshTimeGo = Util.GetGameObject(this.stagePanel, "time")
this.timeTypeGO = Util.GetGameObject(this.stagePanel, "timelab")
this.integralPanel = Util.GetGameObject(root.transform, "ImgIntegral") this.integralPanel = Util.GetGameObject(root.transform, "ImgIntegral")
this.score = Util.GetGameObject(this.integralPanel, "integral"):GetComponent("Text") this.score = Util.GetGameObject(this.integralPanel, "integral"):GetComponent("Text")
@ -39,13 +37,11 @@ end
--添加事件监听(用于子类重写) --添加事件监听(用于子类重写)
function ATM_Title:AddListener() function ATM_Title:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow) Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow)
Game.GlobalEvent:AddEvent(GameEvent.TopMatch.CommonInfoRefreshTitle, this.RefreshBaseShow)
end end
--移除事件监听(用于子类重写) --移除事件监听(用于子类重写)
function ATM_Title:RemoveListener() function ATM_Title:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow) Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow)
Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.CommonInfoRefreshTitle, this.RefreshBaseShow)
end end