From 1ac0e6fc53932d65ecb7f3e790bbb0004ef076e9 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 6 Nov 2020 11:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E5=81=87=E6=88=98=E6=96=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Data/ConfigData.lua | 1 + .../~Lua/Modules/Battle/BattleManager.lua | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+) 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 = {}