From 67e00f2348d166653419e0edddda6dedf65cc88e Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Thu, 10 Aug 2023 13:50:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=85=B5=E4=B8=8A=E9=98=B5=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/GodWeapon/GodWeaponListPanel_UpWar.lua | 4 ++++ .../~Lua/Modules/GodWeapon/GodWeaponManager.lua | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua index 8347264b69..f86d514d31 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua @@ -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) diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua index b9c26c4cd6..aa948cc0a1 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua @@ -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