From af58044b17c1d14c640e632b3073f2bc485c5f7e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 24 Aug 2020 14:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=AE=9D=E7=89=A9=E3=80=91=E5=AE=9D?= =?UTF-8?q?=E7=89=A9=E5=90=88=E6=88=90=EF=BC=8C=E5=90=88=E6=88=90=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=92=8C=E6=81=AD=E5=96=9C=E8=8E=B7=E5=BE=97=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua | 8 +++++--- Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua | 6 +++--- .../~Lua/Modules/RoleInfo/EquipTreasureManager.lua | 6 +++++- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua index 5e5e53e37a..47410df2d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_Treasure.lua @@ -114,7 +114,8 @@ function this.ShowTitleData(_data) this.progressImage.fillAmount = #allCanCompoundEquips/curSelectEquip.quaUpCount compoundNum = math.floor(#allCanCompoundEquips/curSelectEquip.quaUpCount) compoundMaxNum = math.floor(#allCanCompoundEquips/curSelectEquip.quaUpCount) - this.ShowGoldNum(curSelectEquip.costCoin,compoundNum) + local costCoin = jewelConfig[curSelectEquip.Id-1].RankupResources + this.ShowGoldNum(costCoin,compoundNum) end --显示金币数量 function this.ShowGoldNum(_costData,_num) @@ -125,7 +126,7 @@ function this.ShowGoldNum(_costData,_num) this.needGoldText.text = string.format("%s", needGoldNum) else materidaIsCan = true - this.needGoldText.text =string.format("%s", needGoldNum) + this.needGoldText.text = string.format("%s", needGoldNum) end this.numText.text = compoundNum Util.SetGray(this.addBtn,false) @@ -199,7 +200,8 @@ function this.CompoundNumChange(type) compoundNum = compoundNum - 1 end --LogError("compoundNum "..compoundNum) - this.ShowGoldNum(curSelectEquip.costCoin,compoundNum) + local costCoin = jewelConfig[curSelectEquip.Id-1].RankupResources + this.ShowGoldNum(costCoin,compoundNum) end function this.Compound() --LogError(" `````````````````` "..curIndex.." "..curSelectEquip.Star.." "..compoundNum) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua index 0baec2c4fc..1f75a9963c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua @@ -203,12 +203,12 @@ function GMPanel:BindEvent() Util.AddClick(this.btnGenRole, function() if not this.strMsg.text or this.strMsg.text == "" then for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) do - local str=chooseID.."#"..v.Id.."#"..1 + local str=chooseID.."#"..v.Id.."#"..5 LogBlue(str) NetManager.GMEvent(str) end for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig)) do - local str=chooseID.."#"..v.Id.."#"..1 + local str=chooseID.."#"..v.Id.."#"..5 LogBlue(str) NetManager.GMEvent(str) end @@ -222,7 +222,7 @@ function GMPanel:BindEvent() Util.AddClick(this.GenerateHero, function() if not this.strInputFieldHeroMsg.text or this.strInputFieldHeroMsg.text == "" then for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do - local str= 4 .. "#" .. v.Id .. "#" ..10 + local str= 4 .. "#" .. v.Id .. "#" ..v.MaxRank LogBlue(str) NetManager.GMEvent(str) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua index ef4db96613..aff9258c12 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua @@ -224,7 +224,11 @@ function this.GetAllTabletTreasuresByRaceAndType(_index, _Location) table.sort( list, function(a, b) - return a.race < b.race + if a.race == b.race then + return a.Id < b.Id + else + return a.race < b.race + end end ) return list