diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua index 10bdaa0dd8..3f25e3c05f 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelManager.lua @@ -134,7 +134,7 @@ end function this.HardStageReportRequset(_fightLevelData, callBack) NetManager.HardStageReportRequset( _fightLevelData.nodeId,function (msg)--FIGHT_LEVEL _fightLevelData.config.Chapter, if msg.player and #msg.player > 0 then - UIManager.OpenPanel(UIName.FightLevelSingleLevelInfoPopup,FIGHTLEVEL_POPUP_TYPE.BackBattle,msg.player) + UIManager.OpenPanel(UIName.FightLevelSingleLevelInfoPopup,FIGHTLEVEL_POPUP_TYPE.BackBattle,msg.player,_fightLevelData) else PopupTipPanel.ShowTip("尚无符合条件的回放!") end diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua index d5c7f9a4bb..66b93ec82f 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleChapterPanel.lua @@ -200,6 +200,8 @@ function this.SetlevelBox(_rewardBoxDatas) end) else Util.GetGameObject(boxList[i], "redPoint"):SetActive(false) + Util.AddOnceClick(boxList[i], function() + end) end elseif _rewardBoxDatas[i].state == 1 then Util.GetGameObject(boxList[i], "getFinish"):SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua index b3fc0b6157..c5b8c78ae6 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_AssistantLevel.lua @@ -113,7 +113,7 @@ function this:ShoeReward() local itemParent = Util.GetGameObject(_go, "parent") if fightLevelData.state == 0 then--副关卡未通过 Util.GetGameObject(_go, "getImage"):SetActive(false) - elseif fightLevelData.state == 0 then--副关卡已通过 + elseif fightLevelData.state == 1 then--副关卡已通过 Util.GetGameObject(_go, "getImage"):SetActive(true) end if not this.NoviceItemList[_go] then diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua index b8ca8bb965..d833e98de7 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/View/FightLevelInfoPopup_MainLevelBackBattle.lua @@ -8,6 +8,7 @@ local fun local data = {} local prbGoGrid = {} local backFun +local fightLevelData = {} this.playerScrollHead = {}--背景前三头像 function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") @@ -39,7 +40,8 @@ function this:OnShow(_parent,...) --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 local args = {...} data = args[1] - backFun = args[2] + fightLevelData = args[2] + backFun = args[3] this.titleText.text="战斗回放" for i = 1, 2 do prbGoGrid[i]:SetActive(false) @@ -68,9 +70,17 @@ function this.SetInfo(root,data,index) Util.GetGameObject(root,"name"):GetComponent("Text").text = data.userName Util.GetGameObject(root,"warPower/Text"):GetComponent("Text").text = data.power if data.type == 1 then - Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "首次三星通关" + if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then + Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "首次三星通关" + elseif fightLevelData.config.StageType == 3 then + Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "首次通关" + end elseif data.type == 2 then - Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "最低战力三星通关" + if fightLevelData.config.StageType == FIGHTLEVEL_STAGETYPE.MainLevel then + Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "最低战力三星通关" + elseif fightLevelData.config.StageType == 3 then + Util.GetGameObject(root,"ClickBtn/tip"):GetComponent("Text").text = "最低战力通关" + end end Util.AddOnceClick(Util.GetGameObject(root,"ClickBtn"), function() local _fightData = BattleManager.GetBattleServerData(data,0)