diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua index 1bf0bf3b6c..bc44e29bce 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/SoundManager.lua @@ -44,6 +44,7 @@ local _amb_enabled = true local _backgroundSound = {} local _backgroundRes +local _backgroundResOld local _AmbientChannel = {} local _AmbientRes @@ -425,7 +426,7 @@ function SoundManager.PlayMusic(resName, isFade, callback) if not _backgroundSound then return end local audioUnit = _backgroundSound[1] if not audioUnit then return end - + _backgroundResOld = _backgroundRes _backgroundRes = resName local function _SetTimer() @@ -462,6 +463,9 @@ function SoundManager.StopMusic() _backgroundRes = nil end +function SoundManager.PlayOldMusic() + SoundManager.PlayMusic(_backgroundResOld) +end ---=============================环境音效============================================ function SoundManager.PlayAmbient(resName) if not resName then return end diff --git a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua index 638746d1ff..e7e294b55d 100644 --- a/Assets/ManagedResources/~Lua/Logic/GameEvent.lua +++ b/Assets/ManagedResources/~Lua/Logic/GameEvent.lua @@ -362,6 +362,7 @@ GameEvent = { OnGuessDataUpdate = "TopMatch.OnGuessDataUpdate", OnGuessRateUpdate = "TopMatch.OnGuessRateUpdate", OnGuessDataUpdateShowTip = "TopMatch.OnGuessDataUpdateShowTip", + CommonInfoRefreshTitle = "TopMatch.CommonInfoRefreshTitle", }, FindFairy={ RefreshRedPoint="FindFairy.RefreshRedPoint", diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua index a7d1473afd..6f501de9db 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchManager.lua @@ -3,6 +3,7 @@ local this = ArenaTopMatchManager this.CurTabIndex = 0 this.curIsShowDoGuessPopup = false local isChange = false +this.panelType = 1 local stageNameTable = { [1] = 32 .. Language[10097],--强 [2] = 16 .. Language[10097],--强 @@ -212,13 +213,13 @@ end -- 获取巅峰战基础信息 function this.GetBaseData() - this.ChangeData(this.CurTabIndex) + -- this.ChangeData(this.CurTabIndex) return this.baseInfo end -- 获取对战信息 function this.GetBattleInfo() - this.ChangeData(this.CurTabIndex) + -- this.ChangeData(this.CurTabIndex) return this.myBattleInfo end @@ -363,7 +364,7 @@ end --- 获取竞猜战斗信息 function this.GetBetBattleInfo() - this.ChangeData(this.CurTabIndex) + -- this.ChangeData(this.CurTabIndex) return this.betBattleInfo end --- 获取赔率信息 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua index 91ddbe6225..fd35f9ac29 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/ArenaTopMatchPanel.lua @@ -162,10 +162,10 @@ end -- function this.OpenView(index) + ArenaTopMatchManager.panelType = index this._CurLogicIndex = index ArenaTopMatchManager.SetCurTabIndex(index) this._CurTabIndex = index - local logic = this.ViewLogicList[index] if not logic then this.ViewLogicList[index] = reimport(_ViewData[index].script) diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index a0921565dd..11eea18523 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -134,6 +134,7 @@ function this.SetInfoData(panelType, blueData, redData, textType, showScore,batt elseif this.panelType == 2 then this.awaitText.transform.localPosition = Vector3.New(0,515,0) end + Game.GlobalEvent:DispatchEvent(GameEvent.TopMatch.CommonInfoRefreshTitle) end -- 设置显隐 @@ -196,9 +197,13 @@ function this.RefreshData(showScore, textType) this.myScore.gameObject:SetActive(false) end -- this.textImg.sprite = Util.LoadSprite(imgRes[textType].resPath) - this.textImg.sprite = Util.LoadSprite(imgRes[textType].resPath) - this.textImg.gameObject.transform.localPosition = imgRes[textType].pos - this.textImg.gameObject.transform.sizeDelta = imgRes[textType].size + local imageTextType = textType + if ArenaTopMatchManager.GetIsBattleEndState(this.panelType) then + imageTextType = 1 + 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() -- 设置编队按钮状态 diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua index 3417d8c6b7..45bac285ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_Title.lua @@ -8,6 +8,8 @@ function ATM_Title:InitComponent(root) this.matchName = Util.GetGameObject(this.stagePanel, "name"):GetComponent("Text") this.freshTime = Util.GetGameObject(this.stagePanel, "time"):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.score = Util.GetGameObject(this.integralPanel, "integral"):GetComponent("Text") @@ -37,11 +39,13 @@ end --添加事件监听(用于子类重写) function ATM_Title:AddListener() Game.GlobalEvent:AddEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow) + Game.GlobalEvent:AddEvent(GameEvent.TopMatch.CommonInfoRefreshTitle, this.RefreshBaseShow) end --移除事件监听(用于子类重写) function ATM_Title:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.OnTopMatchDataUpdate, this.RefreshBaseShow) + Game.GlobalEvent:RemoveEvent(GameEvent.TopMatch.CommonInfoRefreshTitle, this.RefreshBaseShow) end @@ -90,7 +94,12 @@ function this.RefreshBaseShow() local tmData = ArenaTopMatchManager.GetBaseData() local isJoin = tmData.joinState == 1 local titleName, stageName, stateName = ArenaTopMatchManager.GetCurTopMatchName() - + -- this.freshTimeGo:SetActive(true) + -- this.timeTypeGO:SetActive(true) + -- if ArenaTopMatchManager.panelType <= 2 then + -- this.freshTimeGo:SetActive(not ArenaTopMatchManager.GetIsBattleEndState(ArenaTopMatchManager.panelType)) + -- this.timeTypeGO:SetActive(not ArenaTopMatchManager.GetIsBattleEndState(ArenaTopMatchManager.panelType)) + -- end if not isOpen then if tmData.progress == -2 then this.matchName.text = " "..titleName diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua index 3297e098d9..c00e4c1768 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/CarDelay/GuildCarDelayLootPopup.lua @@ -75,8 +75,15 @@ function GuildCarDelayLootPopup:OnShow() this.myScore.text = CarChallenegList.myScore > 0 and CarChallenegList.myScore or Language[10148] end this.emptyObj:SetActive(not CarChallenegList.carChallengeItem or #CarChallenegList.carChallengeItem <= 0) - this.ScrollView:SetData(CarChallenegList.carChallengeItem, function (index, go) - this.SingleInfoDataShow(go, CarChallenegList.carChallengeItem[index]) + local carChallengeItem = {} + if CarChallenegList.carChallengeItem and #CarChallenegList.carChallengeItem > 0 then + for i = 1, #CarChallenegList.carChallengeItem do + table.insert(carChallengeItem,CarChallenegList.carChallengeItem[i]) + end + table.sort(carChallengeItem, function(a,b) return a.rank < b.rank end) + end + this.ScrollView:SetData(carChallengeItem, function (index, go) + this.SingleInfoDataShow(go, carChallengeItem[index]) end) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index d4dd642a2c..6b606bbbea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -77,6 +77,7 @@ end --界面关闭时调用(用于子类重写) function RankingSingleListPanel:OnClose() + SoundManager.PlayOldMusic() RankingManager.isRequest=0 this.noneImage:SetActive(false) -- if this.liveNode then