From 8af6417b72d676e027aabfe44f3a705aa70e2d18 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Thu, 6 Apr 2023 13:40:13 +0800 Subject: [PATCH] =?UTF-8?q?=20=E7=A5=9E=E5=85=B5bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua | 2 +- .../~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua | 6 +++++- .../~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua | 10 ++++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua index 17e3414eae..d9db4e032a 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponMainPanel.lua @@ -81,7 +81,7 @@ function GodWeaponMainPanel:BindEvent() UIManager.OpenPanel(UIName.HelpPopup, HELP_TYPE.Pokemon, pos.x, pos.y) end) Util.AddClick(this.btnShop, function() - JumpManager.GoJump(3002) + JumpManager.GoJump(3007) end) Util.AddClick(this.btnFen, function() UIManager.OpenPanel(UIName.ResolvePanel,4) diff --git a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua index f2602d0398..ca59118312 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponUpPanel.lua @@ -206,6 +206,7 @@ function this:OnShow() end function this.UpdateWinInfo() + costItems={} CheckRedPointStatus(RedPointType.GodWeapon) local upLvRed = GodWeaponManager.CheckUpLvRedPoint(godWeaponData) this.upLvTabRedPoint:SetActive(upLvRed) @@ -226,7 +227,10 @@ function this.UpdateWinInfo() curPropDic=GodWeaponManager.GetSinglePokemonAddProData(godWeaponData.Did,godWeaponData.star,godWeaponData.lv) if not isLimit then nextPropDic=GodWeaponManager.GetSinglePokemonAddProData(godWeaponData.Did,godWeaponData.star,godWeaponData.lv+1) - costItems=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ShenBingLevel,"Level",godWeaponData.lv,"Quality",godWeaponData.config.Quality).Consume + local upLvCosts=ConfigManager.GetConfigDataByDoubleKey(ConfigName.ShenBingLevel,"Level",godWeaponData.lv,"Quality",godWeaponData.config.Quality).Consume + for i = 1, #upLvCosts do + costItems[i]=upLvCosts[i] + end end this.limitText.text="等级已满" else diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua index 58ee3968fd..2a13e1955f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_GodWeapon.lua @@ -101,9 +101,9 @@ function this:BindEvent() return end --奖励物品 - --所有材料 - local allMaterials={} - local pokemonIds={} + --所有材料 + local allMaterials={} + local pokemonIds={} --灵兽 if isPokemon then local allCoin=0 @@ -125,7 +125,9 @@ function this:BindEvent() end end else - table.insert(allMaterials,{mat[1],mat[2]}) + if mat[2]>0 then + table.insert(allMaterials,{mat[1],mat[2]}) + end end end