【大闹天宫】招募节点修改

dev_chengFeng
ZhangBiao 2021-03-05 13:54:19 +08:00
parent 9ef30f18bb
commit 005e54b036
4 changed files with 11 additions and 19 deletions

View File

@ -361,25 +361,25 @@ function this.GetBattleServerData(msg, isFightPlayer)
for j = 1, #data2.fightUnitList do
local skills, propertys, role
if not isFightPlayer then
local monsterConfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, tonumber(data2.fightUnitList[j].unitId))
local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, tonumber(data2.fightUnitList[j].unitId))
local position = tonumber(data2.fightUnitList[j].position)
local star = tonumber(data2.fightUnitList[j].star)
local skin=tonumber(data2.fightUnitList[j].skinId)
skills = string.split(data2.fightUnitList[j].unitSkillIds, "#")
propertys = string.split(data2.fightUnitList[j].property, "#")
role = {
roleId = monsterConfig.MonsterId,
roleId = heroConfig.Id,
monsterId = tonumber(data2.fightUnitList[j].unitId), --非战斗数据,仅用于显示怪物名称
position = position,
star = star,
skinId=skin,
job=HeroConfig[monsterConfig.MonsterId].Job,
job=heroConfig.Job,
camp = 1,
type = monsterConfig.Type,
quality = monsterConfig.Quality,
element = monsterConfig.PropertyName,
ai = monsterConfig.MonsterAi,
professionId = monsterConfig.Profession,
-- type = monsterConfig.Type,
quality = heroConfig.Quality,
element = heroConfig.PropertyName,
-- ai = monsterConfig.MonsterAi,
professionId = heroConfig.Profession,
passivity = { },
property = { },
}

View File

@ -558,7 +558,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 data.BossPreview and data.BossPreview > 0 and key == 0 then
if this.battleType == BATTLE_TYPE.STORY_FIGHT and data.BossPreview and data.BossPreview > 0 and key == 0 then
UIManager.OpenPanel(UIName.BattleBossInfoPanel,function ()
func()
end)

View File

@ -61,11 +61,7 @@ function this:FormationAdapter()
this.power.text = monsterData.bossTeaminfo.totalForce
local monsterCongig = {}
if monsterData.bossTeaminfo.teamInfo and monsterData.bossTeaminfo.teamInfo > 0 then
LogGreen("monsterData.bossTeaminfo.teamInfo "..monsterData.bossTeaminfo.teamInfo)
local monsterGroup = ConfigManager.TryGetConfigDataByKey(ConfigName.ExpeditionRecruitConfig,"HeroId",monsterData.bossTeaminfo.teamInfo)--ConfigManager.TryGetConfigData(ConfigName.MonsterGroup,monsterData.bossTeaminfo.teamInfo)
if monsterGroup and monsterGroup.getHero then
monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterGroup.getHero)
end
monsterCongig = ConfigManager.TryGetConfigData(ConfigName.HeroConfig,monsterData.bossTeaminfo.teamInfo)--monsterGroup.getHero)
if not monsterCongig then return end
local heroConfig = monsterCongig
this.LiveName = GetResourcePath(heroConfig.Live)

View File

@ -83,11 +83,7 @@ function this:GetElementalType(curFormation, type)
end
if (type == 2) then
for i, v in ipairs(curFormation) do
if(v.monsterId~=nil)then
self.heroPropertyType = monsterConfig[v.monsterId].PropertyName
else
self.heroPropertyType =heroConfig[v.roleId].PropertyName
end
self.heroPropertyType =heroConfig[v.roleId].PropertyName
table.insert(elementPropertyList, self.heroPropertyType)
end
self.dataTable.title = Language[12075]