From feaeb268f598538227bcda62060ceb5f285cecb5 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Mon, 3 Apr 2023 11:18:04 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=85=B5=E8=AF=A6=E6=83=85=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/GodWeapon/GodWeaponInfoPanel.lua | 2 ++ .../GodWeapon/GodWeaponListPanel_UpWar.lua | 2 +- .../~Lua/Modules/GodWeapon/GodWeaponManager.lua | 17 ++++++++++++----- .../~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua | 2 ++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua index 56d2273a2a..5ad8f03ac0 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponInfoPanel.lua @@ -54,6 +54,8 @@ end --界面打开时调用(用于子类重写) function this:OnOpen(_data) + this.unloadBtn.gameObject:SetActive(true) + this.changeBtn.gameObject:SetActive(true) this.UpdateWin(_data) end diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua index c1f47c6cc0..140465710d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponListPanel_UpWar.lua @@ -43,7 +43,7 @@ function this:OnShow(_parent,_curUpZhenPokemonData,_upZhenIndex) curUpZhenPokemonData = _curUpZhenPokemonData upZhenIndex = _upZhenIndex if curUpZhenPokemonData then - polemonList = GodWeaponManager.GetCanUpZhenWeapons() + polemonList = GodWeaponManager.GetCanUpZhenWeapons(curUpZhenPokemonData) else polemonList = GodWeaponManager.GetCanUpZhenWeapons() end diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua index 73e43dcd36..6f4d2ee782 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua @@ -108,13 +108,20 @@ end --获取当前可上阵的所有灵兽数据 curUpZhenPokemonData 如果不为空就时替换上阵操作 -function this.GetCanUpZhenWeapons() +function this.GetCanUpZhenWeapons(_curUpZhenGodWeapon) local upZhenSidList = this.GetAllTeamWeaponId() local curAllPokemonList = {} for key, value in pairs(allGodWeapons) do - if not CheckListIsContainValue1(upZhenSidList,value.staticId) then - table.insert(curAllPokemonList,value) + if _curUpZhenGodWeapon then + if value.Did~=_curUpZhenGodWeapon.Did then + table.insert(curAllPokemonList,value) + end + else + if not CheckListIsContainValue1(upZhenSidList,value.staticId) then + table.insert(curAllPokemonList,value) + end end + end return curAllPokemonList end @@ -156,8 +163,8 @@ end --设置神兵上阵下阵 function this.SetWeaponUpZhen(id,pos) if allGodWeapons[id] then + local point1=allGodWeapons[id].point if pos~=0 then - local point1=allGodWeapons[id].point if point1~=0 then godWeaponTeamInfo[point1]=nil end @@ -165,7 +172,7 @@ function this.SetWeaponUpZhen(id,pos) godWeaponTeamInfo[pos]=allGodWeapons[id] else allGodWeapons[id].point=pos - godWeaponTeamInfo[pos]=nil + godWeaponTeamInfo[point1]=nil end end end diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua index 384086d000..50a76b5517 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua @@ -66,6 +66,8 @@ function this:BindEvent() NetManager.RequestMagicSoldierStrong(godWeaponData.Did,2,0,costList,function(msg) this.UpdateWinInfo() end) + else + PopupTipPanel.ShowTip("道具不足") end end) Util.AddClick(this.upLvBtn, function()