parent
bd11611e2d
commit
67e00f2348
|
@ -95,6 +95,10 @@ function this.SingleItemDataShow(_go,_itemData)
|
|||
end)
|
||||
else
|
||||
--上阵 协议
|
||||
-- local ids=GodWeaponManager.GetAllTeamWeaponId()
|
||||
-- if CheckListIsContainValue1(ids,_itemData.id) then
|
||||
-- return
|
||||
-- end
|
||||
local oldWarPower = FormationManager.GetFormationPower(FormationTypeDef.FORMATION_NORMAL)
|
||||
local curFormation = PokemonManager.GetAllPokemonFormationData()
|
||||
LogPink("#curFormation "..#curFormation)
|
||||
|
|
|
@ -172,8 +172,16 @@ function this.GetCanUpZhenWeapons(_curUpZhenGodWeapon)
|
|||
local curAllPokemonList = {}
|
||||
for key, value in pairs(allGodWeapons) do
|
||||
if _curUpZhenGodWeapon then
|
||||
if value.Did~=_curUpZhenGodWeapon.Did then
|
||||
table.insert(curAllPokemonList,value)
|
||||
if value.Did~=_curUpZhenGodWeapon.Did then
|
||||
--如果跟当前的是同一个神兵 并且
|
||||
if CheckListIsContainValue1(upZhenSidList, value.staticId) then
|
||||
if value.staticId==_curUpZhenGodWeapon.staticId then
|
||||
table.insert(curAllPokemonList,value)
|
||||
end
|
||||
else
|
||||
table.insert(curAllPokemonList,value)
|
||||
end
|
||||
|
||||
end
|
||||
else
|
||||
if not CheckListIsContainValue1(upZhenSidList,value.staticId) then
|
||||
|
|
Loading…
Reference in New Issue