Merge branch 'onepiece_demo' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo

onepiece_demo_new
PC-202302260912\Administrator 2024-05-24 14:31:32 +08:00
commit b19faeda39
1 changed files with 6 additions and 6 deletions

View File

@ -179,7 +179,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,color = "AD4152"})
table.insert(_upRateList,{id = m.Reward[1],tag="圣器UP!",name = readingName,value = m.WeightShow,color = "5B3B0B"})
break
end
end
@ -190,7 +190,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,color = "AD4152"})
table.insert(_upRateList,{id = m.Reward[1],tag="5星UP!",name = readingName,value = m.WeightShow,color = "5B3B0B"})
break
end
end
@ -198,7 +198,7 @@ function this:BuildRateData(actType,UpItem,upItemList)
elseif actType == ActivityTypeDef.LimitUpHero then
for n,m in ipairs(upItemList) do
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(rateList,{id = m.Reward[1],tag = "心愿UP英雄/道具", name=itemConfig.Name,value = m.Weight,color = "AD4152"})
table.insert(rateList,{id = m.Reward[1],tag = "心愿UP英雄/道具", name=itemConfig.Name,value = m.Weight,color = "5B3B0B"})
table.insert(_upRateList,{id = m.Reward[1],tag = "5星英雄UP!", name=itemConfig.Name,value = m.Weight})
LogGreen("name:"..tostring(itemConfig.Name).." weight:"..tostring(m.Weight))
end
@ -210,13 +210,13 @@ function this:BuildRateData(actType,UpItem,upItemList)
elseif actType == ActivityTypeDef.tiandihonglu then
for n,m in ipairs(upItemList) do
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(_upRateList,{id = m.Reward[1],tag = "生命卡碎片UP!", name=itemConfig.Name,value = m.WeightShow,color = "AD4152"})
table.insert(_upRateList,{id = m.Reward[1],tag = "生命卡碎片UP!", name=itemConfig.Name,value = m.WeightShow,color = "5B3B0B"})
end
rateList = this:RefreshSoulRate(UpItem,_upRateList,ItemType.talismanSoulChip)
elseif actType == ActivityTypeDef.Incarnation then
for n,m in ipairs(upItemList) do
local itemConfig=ConfigManager.TryGetConfigData(ConfigName.ItemConfig, m.Reward[1])
table.insert(_upRateList,{id = m.Reward[1],tag = "终极大奖!", name=itemConfig.Name,value = m.WeightShow,color = "AD4152"})
table.insert(_upRateList,{id = m.Reward[1],tag = "终极大奖!", name=itemConfig.Name,value = m.WeightShow,color = "5B3B0B"})
end
rateList = this:RefreshIncarnationRate(UpItem,_upRateList,ItemType.Incarnation)
end
@ -272,7 +272,7 @@ function this:ReculateUpHeroRate(itemList,UpItemList,_tag,config)
if v.Reward[1] == m.Reward[1] then
local _config = ConfigManager.GetConfigData(config,v.Reward[1])
local readingName = _config.ReadingName or _config.Name
table.insert(rateList,{id = m.Reward[1],tag=_tag,name = readingName,value = m.WeightShow,color = "AD4152"})
table.insert(rateList,{id = m.Reward[1],tag=_tag,name = readingName,value = m.WeightShow,color = "5B3B0B"})
break
end
end