Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
064ad3b8b7
|
@ -68,6 +68,7 @@ function this:OnShow(_parent,...)
|
|||
end
|
||||
end
|
||||
this.bodyText.text=string.format(Language[12234],num)
|
||||
this.BodyText2:GetComponent("Text").text="(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>装备!)"
|
||||
this.BodyText2.gameObject:SetActive(isShow)
|
||||
local data={}
|
||||
local index = 1
|
||||
|
|
|
@ -84,16 +84,19 @@ function this:OnShow(_parent,...)
|
|||
end
|
||||
end
|
||||
this.bodyText.text="宝物将分解为宝魂,若宝物已强化或精炼,分解后将清空强化和精炼等级,并100%返还养成材料。"
|
||||
this.bodyText2:GetComponent("Text").text="(注意:本次出售包含<color=#FFD700>金色</color>或<color=#FF0000>红色</color>宝器!)"
|
||||
this.bodyText2.gameObject:SetActive(isEquipShowSure)
|
||||
this.tipText.text = "分解后获得:"
|
||||
|
||||
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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue