Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
gaoxin 2021-07-06 15:27:44 +08:00
commit 441952c2fb
1 changed files with 8 additions and 8 deletions

View File

@ -142,7 +142,7 @@ function this:BuildRateData(actType,UpItem,upItemList)
if m and m.Reward[1] == showData.monsterId then
local _config = ConfigManager.GetConfigData(ConfigName.SpiritAnimal,m.Reward[1])
local readingName = _config.ReadingName or _config.Name
table.insert(_upRateList,{id = m.Reward[1],tag="灵兽UP!",name = readingName,value = m.WeightShow})
table.insert(_upRateList,{id = m.Reward[1],tag="灵兽UP!",name = readingName,value = m.WeightShow,color = "AD4152"})
break
end
end
@ -153,7 +153,7 @@ function this:BuildRateData(actType,UpItem,upItemList)
if m and m.Reward[1] == showData.monsterId then
local _config = ConfigManager.GetConfigData(ConfigName.HeroConfig,m.Reward[1])
local readingName = _config.ReadingName or _config.Name
table.insert(_upRateList,{id = m.Reward[1],tag="5星UP!",name = readingName,value = m.WeightShow})
table.insert(_upRateList,{id = m.Reward[1],tag="5星UP!",name = readingName,value = m.WeightShow,color = "AD4152"})
break
end
end
@ -238,7 +238,7 @@ function this:RefreshHeroRate(hero,_rateList)
valueList5 = valueList5 - _rateList[i].value
table.insert(rateList,_rateList[i])
end
table.insert(rateList,{tag="5星",name="其他5星",value = valueList5,color = "BDB69C"})
table.insert(rateList,{tag="5星",name="其他5星",value = valueList5,color = "AD4152"})
table.insert(rateList,{tag="4星",name="4星神将",value = this:ReculateRate(list4),color = "BDB69C"})
table.insert(rateList,{tag="3星",name="3星神将",value = this:ReculateRate(list3),color = "BDB69C"})
table.insert(rateList,{tag="2星",name="2星神将",value = this:ReculateRate(list2),color = "BDB69C"})
@ -268,8 +268,8 @@ function this:RefreshSoulRate(soul,_rateList)
valueList6 = valueList6 - _rateList[i].value
table.insert(rateList,_rateList[i])
end
table.insert(rateList,{tag="红色",name="其他".."红色",value = valueList6,color = "BDB69C"})
table.insert(rateList,{tag="金色",name="金色",value=this:ReculateRate(list5),color = "BDB69C"})
table.insert(rateList,{tag="红色",name="其他".."红色",value = valueList6,color = "AD4152"})
table.insert(rateList,{tag="金色",name="金色",value=this:ReculateRate(list5),color = "AD4152"})
table.insert(rateList,{tag="紫色",name="紫色",value=this:ReculateRate(list4),color = "BDB69C"})
table.insert(rateList,{tag="其他",name="其他",value=this:ReculateRate(list7),color = "BDB69C"})
return rateList
@ -296,8 +296,8 @@ function this:RefreshMonsterRate(UpMonster,_rateList)
valueList1 = valueList1 - _rateList[i].value
table.insert(rateList,_rateList[i])
end
table.insert(rateList,{tag="金色",name="金色灵兽或碎片",value=valueList1,color = "BDB69C"})
table.insert(rateList,{tag="紫色",name="紫色灵兽或碎片",value=this:ReculateRate(list2),color = "BDB69C"})
table.insert(rateList,{tag="金色",name="金色灵兽或碎片",value=valueList1,color = "AD4152"})
table.insert(rateList,{tag="紫色",name="紫色灵兽或碎片",value=this:ReculateRate(list2),color = "AD4152"})
table.insert(rateList,{tag="蓝色",name="蓝色灵兽或碎片",value=this:ReculateRate(list3),color = "BDB69C"})
table.insert(rateList,{tag="其他",name="其他奖励",value=this:ReculateRate(list4),color = "BDB69C"})
return rateList
@ -322,7 +322,7 @@ function this:RefreshNewHeroRate(UpMonster,_rateList)
for i = 1 , #_rateList do
valueList1 = valueList1 - _rateList[i].value
end
table.insert(_rateList,{tag="五星",name="其他五星英雄",value=valueList1,color = "BDB69C"})
table.insert(_rateList,{tag="五星",name="其他五星英雄",value=valueList1,color = "AD4152"})
table.insert(_rateList,{tag="四星",name="四星英雄",value=this:ReculateRate(list2),color = "BDB69C"})
table.insert(_rateList,{tag="三星",name="三星英雄",value=this:ReculateRate(list3),color = "BDB69C"})
for i = 1 , #_rateList do