From 7faa067c5242c7f6c4877d784a99af00e80c4bdc Mon Sep 17 00:00:00 2001 From: jiaoyangna <17610272109@lianjingshidai.com> Date: Fri, 17 Jul 2020 14:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9D=E7=89=A9=E5=88=86=E8=A7=A3=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua | 4 +++- .../~Lua/Modules/RoleInfo/EquipTreasureManager.lua | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua index 4ad59c0605..51f13792c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua @@ -90,10 +90,12 @@ function this:OnShow(_parent,...) local data={} local index = 1 for i, v in pairs(dropList) do + LogBlue(v.id.." "..v.num) data[index]={v.id,v.num} index = index + 1 end - FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,#data,1,sortingOrder,false,data) + LogBlue(#data) + FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,60,1,sortingOrder,false,data) end function this:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index 4797d0b98d..24e3ab269b 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -556,13 +556,14 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData) local allRewardData = {} local specificValue = 1--tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/10000 ShowItemlist = {} + LogBlue(LengthOfTable(selectEquipTreasureData)) for i, v in pairs(selectEquipTreasureData) do local curEquipTreasureData = allTreasures[i] if not curEquipTreasureData then return end --先把精炼的材料放进去 因为有宝器 放前边 if curEquipTreasureData.refineLv > 0 then for i=0,curEquipTreasureData.refineLv-1 do - local refineJewelRankupConfig =ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",2,"Level",i,"PoolID",curEquipTreasureData.quantity) + local refineJewelRankupConfig =ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",2,"Level",i,"PoolID",curEquipTreasureData.refinePool) if refineJewelRankupConfig then --精炼消耗的法宝 if refineJewelRankupConfig.JewelExpend then @@ -585,7 +586,7 @@ function this.GetEquipTreasureResolveItems(selectEquipTreasureData) end if curEquipTreasureData.lv > 0 then for i=0,curEquipTreasureData.lv - 1 do - local lvJewelRankupConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",1,"Level",i,"PoolID",curEquipTreasureData.quantity) + local lvJewelRankupConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.JewelRankupConfig,"Type",1,"Level",i,"PoolID",curEquipTreasureData.LevelupPool) if lvJewelRankupConfig then --强化消耗的材料 if lvJewelRankupConfig.UpExpend then