From dd7394cc293abcf2e74fa01876288fca092b1788 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 18 Feb 2023 15:57:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E7=9B=B8manager=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Popup/RewardTalismanSingleShowPopup2.lua | 7 ++++++- .../~Lua/Modules/RoleInfo/FaXiangManager.lua | 14 +++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua index f0d1cfe678..7e02f58d93 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardTalismanSingleShowPopup2.lua @@ -228,7 +228,12 @@ function RewardTalismanSingleShowPopup2:BindEvent() end) Util.AddClick(self.btnUpstar, function() - UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,self.equipData,2) + if self.position>6 then + UIManager.OpenPanel(UIName.FaXiangStrongPopup,self.equipData,2) + else + UIManager.OpenPanel(UIName.EquipTreasureStrongPopup,self.equipData,2) + end + self:ClosePanel() end) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua index 68ab613e2b..0dcd179cca 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/FaXiangManager.lua @@ -38,15 +38,15 @@ function this.InitSingleTreasureData(_singleData,notAdd) single.maxRefineLv = currJewel.StarMax single.upHeroDid = "" -- single.race = currJewel.Race - - -- single.name = GetLanguageStrById(itemConfig[staticId].Name) single.itemConfig = itemConfig[staticId] + single.quantity = single.itemConfig.Quantity + single.name = GetLanguageStrById(itemConfig[staticId].Name) single.frame = GetQuantityImageByquality(itemConfig[staticId].Quantity) single.levelPool = currJewel.LevelUpPool single.refinePool = currJewel.Star single.equipType = currJewel.Type local quantity = currJewel.Level - single.quantity = single.itemConfig.Quantity + -- if currJewel.Location == 1 then -- single.type = Language[10552] -- else @@ -246,7 +246,7 @@ end --获取法相升级消耗 function this.GetFaXiangLevelCost(_pool,_lv) - local levelConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.FaxiangStarConfig,"PoolId",_pool,"Level",_lv) + local levelConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.FaxiangLevelConfig,"PoolId",_pool,"Level",_lv) if levelConfig then local items={} for i = 1,#levelConfig.PropList do @@ -276,7 +276,7 @@ end --获取法相升级消耗 function this.GetFaXiangStarCost(_poolId,_star,_data) - local config=ConfigManager.GetConfigDataByDoubleKey(ConfigName.FaxiangLevelConfig,"PoolId",_poolId,"Level",_star) + local config=ConfigManager.GetConfigDataByDoubleKey(ConfigName.FaxiangStarConfig,"PoolId",_poolId,"Level",_star) local items={} if config and config.PropList then for i = 1, #config.PropList do @@ -284,7 +284,7 @@ function this.GetFaXiangStarCost(_poolId,_star,_data) local item={} --同类型宝物 local type=id[1] - if type==1 then + if type==0 then item.id=_data.id item.icon=_data.icon item.frame=_data.frame @@ -307,7 +307,7 @@ function this.GetFaXiangStarCost(_poolId,_star,_data) if config then item.icon=GetResourcePath(config.ResourceID) item.frame=GetQuantityImageByquality(config.Quantity) - item.haveNum=BagManager.GetItemById(type) + item.haveNum=BagManager.GetItemCountById(type) item.needNum=id[2] if item.haveNum>=item.needNum then item.isEnough=true