diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index cab98f7b5f..f2f2f2c690 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -173,6 +173,7 @@ ConfigName = { FreeTravelStore="FreeTravelStore", GodSacrificeConfig = "GodSacrificeConfig", GodSacrificeSetting = "GodSacrificeSetting", + FakeBattleNew = "FakeBattleNew", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 1976052f5f..436bd61c40 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -7,6 +7,7 @@ local MonsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local MonsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) local CombatControl = ConfigManager.GetConfig(ConfigName.CombatControl) local SpiritAnimalSkill = ConfigManager.GetConfig(ConfigName.SpiritAnimalSkill) +local FakeBattleNew = ConfigManager.GetConfig(ConfigName.FakeBattleNew) local FEAConfig = require("Modules/Battle/Config/FightEffectAudioConfig") local function pairsByKeys(t) @@ -558,6 +559,34 @@ function this.GetBattleEnemyData(gId) return enemyData end +function this.GetPlayerDataFromMonsterGroup(gId) + local playerData = { teamSkill = {}, teamPassive = {} } + local Contents = MonsterGroup[gId].Contents + if Contents and Contents[1] then + for j = 1, #Contents[1] do + if Contents[1][j] ~= 0 then + local data = this.GetMonsterData(Contents[1][j]) + data.position = j + table.insert(playerData, data) + end + end + end + return playerData +end + +function this.GetFakeBattleData(fakeId) + local fakeConfig = FakeBattleNew[fakeId] + if not fakeConfig then + LogError("未找到假战斗数据:"..tostring(fakeId)) + return + end + local battleData = {} + battleData.enemyData = this.GetBattleEnemyData(fakeConfig.EnnemiId) + battleData.playerData = this.GetBattleEnemyData(fakeConfig.OwnId) + return battleData +end + + --获取单个英雄装备被动技能list --function this.GetSingHeroAllEquipSkillListData(_heroId) -- local allEquipSkillList = {}