diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index c7ac53b309..f123e3537f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -208,7 +208,7 @@ end --界面打开时调用(用于子类重写) function this:OnOpen(_fightData, _fightType, _endFunc) - BattleView:OnOpen(_fightData) + BattleView:OnOpen(_fightData,_fightType) endFunc = _endFunc fightType = _fightType --判定战斗类型 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua index 77741ceb8d..aae1daee38 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleView.lua @@ -167,11 +167,12 @@ function this:BindEvent() end -- 正常接口 -function this:OnOpen(data) +function this:OnOpen(data,_fightType) this.ElementalResonanceView:OnOpen({sortOrder = BattleManager.GetBattleSorting()}) this.ElementalResonanceView2:OnOpen({sortOrder = BattleManager.GetBattleSorting()}) this:Init() this:SetData(data.fightData, data.fightSeed, data.fightType, data.maxRound, data.fightId) + this.fightType = _fightType end function this:OnSortingOrderChange(battleSorting) @@ -558,7 +559,7 @@ function this.BattleOrderChange(order) local data = ConfigManager.GetConfigData(ConfigName.MainLevelConfig,FightPointPassManager.curOpenFight) local key = PlayerPrefs.GetInt(PlayerManager.uid.."BattleBossShow"..FightPointPassManager.curOpenFight) Timer.New(function () - if this.battleType == BATTLE_TYPE.STORY_FIGHT and data.BossPreview and data.BossPreview > 0 and key == 0 then + if this.fightType == BATTLE_TYPE.STORY_FIGHT and data.BossPreview and data.BossPreview > 0 and key == 0 then UIManager.OpenPanel(UIName.BattleBossInfoPanel,function () func() end)