|
|
@@ -557,15 +557,17 @@ function update(human,combatType,jibanListStr, heroIdStr, extraArgs)
|
|
|
local heroId = jibanHeroIdArr[k] or 0
|
|
|
if uuid ~= "" and uuid ~= "0" and heroId ~= 0 then
|
|
|
--检测有没有再阵容上
|
|
|
- for _, combatUuid in ipairs(combatHeroDB.list) do
|
|
|
- if uuid == combatUuid then return end
|
|
|
- end
|
|
|
+ -- 允许共鸣英雄同时上阵(包含援军/助战位置),因此不再阻止uuid出现在combatHeroDB.list中的情况
|
|
|
+ -- 原逻辑:
|
|
|
+ -- for _, combatUuid in ipairs(combatHeroDB.list) do
|
|
|
+ -- if uuid == combatUuid then return end
|
|
|
+ -- end
|
|
|
|
|
|
if not posList[k] then return end
|
|
|
-- local heroGrid = HeroLogic.getHeroGridByUuid(human, uuid)
|
|
|
-- if not heroGrid then return end
|
|
|
|
|
|
- -- setDB_JibanHeroID(human, k, heroGrid.id)
|
|
|
+ -- setDB_JibanHeroID(human, k, heroGrid.id)
|
|
|
|
|
|
local res = HeroBook.isGetHero(human, heroId)
|
|
|
if not res or res == HeroBook.LIEZHUAN_REWARD_NO then
|