【宝物】宝物合成,合成预览和恭喜获得不一致
parent
264bf8d4f0
commit
af58044b17
|
@ -114,7 +114,8 @@ function this.ShowTitleData(_data)
|
||||||
this.progressImage.fillAmount = #allCanCompoundEquips/curSelectEquip.quaUpCount
|
this.progressImage.fillAmount = #allCanCompoundEquips/curSelectEquip.quaUpCount
|
||||||
compoundNum = math.floor(#allCanCompoundEquips/curSelectEquip.quaUpCount)
|
compoundNum = math.floor(#allCanCompoundEquips/curSelectEquip.quaUpCount)
|
||||||
compoundMaxNum = 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
|
end
|
||||||
--显示金币数量
|
--显示金币数量
|
||||||
function this.ShowGoldNum(_costData,_num)
|
function this.ShowGoldNum(_costData,_num)
|
||||||
|
@ -125,7 +126,7 @@ function this.ShowGoldNum(_costData,_num)
|
||||||
this.needGoldText.text = string.format("<color=#FF0011>%s</color>", needGoldNum)
|
this.needGoldText.text = string.format("<color=#FF0011>%s</color>", needGoldNum)
|
||||||
else
|
else
|
||||||
materidaIsCan = true
|
materidaIsCan = true
|
||||||
this.needGoldText.text =string.format("<color=#FCF5D3FF>%s</color>", needGoldNum)
|
this.needGoldText.text = string.format("<color=#FCF5D3FF>%s</color>", needGoldNum)
|
||||||
end
|
end
|
||||||
this.numText.text = compoundNum
|
this.numText.text = compoundNum
|
||||||
Util.SetGray(this.addBtn,false)
|
Util.SetGray(this.addBtn,false)
|
||||||
|
@ -199,7 +200,8 @@ function this.CompoundNumChange(type)
|
||||||
compoundNum = compoundNum - 1
|
compoundNum = compoundNum - 1
|
||||||
end
|
end
|
||||||
--LogError("compoundNum "..compoundNum)
|
--LogError("compoundNum "..compoundNum)
|
||||||
this.ShowGoldNum(curSelectEquip.costCoin,compoundNum)
|
local costCoin = jewelConfig[curSelectEquip.Id-1].RankupResources
|
||||||
|
this.ShowGoldNum(costCoin,compoundNum)
|
||||||
end
|
end
|
||||||
function this.Compound()
|
function this.Compound()
|
||||||
--LogError(" `````````````````` "..curIndex.." "..curSelectEquip.Star.." "..compoundNum)
|
--LogError(" `````````````````` "..curIndex.." "..curSelectEquip.Star.." "..compoundNum)
|
||||||
|
|
|
@ -203,12 +203,12 @@ function GMPanel:BindEvent()
|
||||||
Util.AddClick(this.btnGenRole, function()
|
Util.AddClick(this.btnGenRole, function()
|
||||||
if not this.strMsg.text or this.strMsg.text == "" then
|
if not this.strMsg.text or this.strMsg.text == "" then
|
||||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) do
|
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.EquipConfig)) do
|
||||||
local str=chooseID.."#"..v.Id.."#"..1
|
local str=chooseID.."#"..v.Id.."#"..5
|
||||||
LogBlue(str)
|
LogBlue(str)
|
||||||
NetManager.GMEvent(str)
|
NetManager.GMEvent(str)
|
||||||
end
|
end
|
||||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig)) do
|
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.JewelConfig)) do
|
||||||
local str=chooseID.."#"..v.Id.."#"..1
|
local str=chooseID.."#"..v.Id.."#"..5
|
||||||
LogBlue(str)
|
LogBlue(str)
|
||||||
NetManager.GMEvent(str)
|
NetManager.GMEvent(str)
|
||||||
end
|
end
|
||||||
|
@ -222,7 +222,7 @@ function GMPanel:BindEvent()
|
||||||
Util.AddClick(this.GenerateHero, function()
|
Util.AddClick(this.GenerateHero, function()
|
||||||
if not this.strInputFieldHeroMsg.text or this.strInputFieldHeroMsg.text == "" then
|
if not this.strInputFieldHeroMsg.text or this.strInputFieldHeroMsg.text == "" then
|
||||||
for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroConfig)) do
|
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)
|
LogBlue(str)
|
||||||
NetManager.GMEvent(str)
|
NetManager.GMEvent(str)
|
||||||
end
|
end
|
||||||
|
|
|
@ -224,7 +224,11 @@ function this.GetAllTabletTreasuresByRaceAndType(_index, _Location)
|
||||||
table.sort(
|
table.sort(
|
||||||
list,
|
list,
|
||||||
function(a, b)
|
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
|
end
|
||||||
)
|
)
|
||||||
return list
|
return list
|
||||||
|
|
Loading…
Reference in New Issue