神将排序界面修改提交

dev_chengFeng
jiaoyangna 2021-11-08 15:04:53 +08:00
parent b6277b6378
commit e457260b42
5 changed files with 72 additions and 36 deletions

View File

@ -686,22 +686,28 @@ function this.NaturalSort(isNature,a,b)
if isNature then
if a.heroConfig.Natural == b.heroConfig.Natural then
if a.heroConfig.Quality == b.heroConfig.Quality then
if a.star == b.star then
if a.lv == b.lv then
if a.warPower == b.warPower then
if a.id == b.id then
return a.sortId > b.sortId
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
if aGodLv == bGodLv then
if a.star == b.star then
if a.lv == b.lv then
if a.warPower == b.warPower then
if a.id == b.id then
return a.sortId > b.sortId
else
return a.id > b.id
end
else
return a.id > b.id
return a.warPower > b.warPower
end
else
return a.warPower > b.warPower
return a.lv > b.lv
end
else
return a.lv > b.lv
return a.star > b.star
end
else
return a.star > b.star
return aGodLv > bGodLv
end
else
return a.heroConfig.Quality > b.heroConfig.Quality
@ -712,22 +718,28 @@ function this.NaturalSort(isNature,a,b)
else
if a.lv == b.lv then
if a.heroConfig.Quality == b.heroConfig.Quality then
if a.star == b.star then
if a.heroConfig.Natural == b.heroConfig.Natural then
if a.warPower == b.warPower then
if a.id == b.id then
return a.sortId > b.sortId
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
if aGodLv == bGodLv then
if a.star == b.star then
if a.heroConfig.Natural == b.heroConfig.Natural then
if a.warPower == b.warPower then
if a.id == b.id then
return a.sortId > b.sortId
else
return a.id > b.id
end
else
return a.id > b.id
return a.warPower > b.warPower
end
else
return a.warPower > b.warPower
return a.heroConfig.Natural > b.heroConfig.Natural
end
else
return a.heroConfig.Natural > b.heroConfig.Natural
return a.star > b.star
end
else
return a.star > b.star
return aGodLv > bGodLv
end
else
return a.heroConfig.Quality > b.heroConfig.Quality

View File

@ -77,10 +77,16 @@ function this.SortHeroDatas(data)
end
table.sort(data,function(a,b)
if a.fourElementSortId == b.fourElementSortId then
if a.star == b.star then
return a.warPower > b.warPower
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
if aGodLv == bGodLv then
if a.star == b.star then
return a.warPower > b.warPower
else
return a.star > b.star
end
else
return a.star > b.star
return aGodLv > bGodLv
end
else
return a.fourElementSortId > b.fourElementSortId

View File

@ -3611,14 +3611,20 @@ function this.SortHeroDatas(_heroDatas)
(not teamHero[a.dynamicId] and not teamHero[b.dynamicId])
then
if a.heroConfig.Natural ==b.heroConfig.Natural then
if a.star == b.star then
if a.lv == b.lv then
return a.heroConfig.Id < b.heroConfig.Id
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
if aGodLv == bGodLv then
if a.star == b.star then
if a.lv == b.lv then
return a.heroConfig.Id < b.heroConfig.Id
else
return a.lv > b.lv
end
else
return a.lv > b.lv
return a.star > b.star
end
else
return a.star > b.star
return aGodLv > bGodLv
end
else
return a.heroConfig.Natural > b.heroConfig.Natural

View File

@ -218,14 +218,20 @@ function this.SortHeroDatas(_heroDatas)
if a.lockState == b.lockState then
if a.isHarmonyGongMing == b.isHarmonyGongMing then
if a.heroConfig.Natural ==b.heroConfig.Natural then
if a.star == b.star then
if a.lv == b.lv then
return a.heroConfig.Id > b.heroConfig.Id
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
if aGodLv == bGodLv then
if a.star == b.star then
if a.lv == b.lv then
return a.heroConfig.Id > b.heroConfig.Id
else
return a.lv < b.lv
end
else
return a.lv < b.lv
return a.star < b.star
end
else
return a.star < b.star
return aGodLv > bGodLv
end
else
return a.heroConfig.Natural < b.heroConfig.Natural

View File

@ -291,14 +291,20 @@ function this.SortHeroDatas(_heroDatas)
if a.lockState == b.lockState then
if a.isHarmonyGongMing == b.isHarmonyGongMing then
if a.heroConfig.Natural ==b.heroConfig.Natural then
if a.star == b.star then
if a.lv == b.lv then
return a.heroConfig.Id > b.heroConfig.Id
local aGodLv = GodSoulManager.GetGodSoulLv(a.dynamicId)
local bGodLv = GodSoulManager.GetGodSoulLv(b.dynamicId)
if aGodLv == bGodLv then
if a.star == b.star then
if a.lv == b.lv then
return a.heroConfig.Id > b.heroConfig.Id
else
return a.lv < b.lv
end
else
return a.lv < b.lv
return a.star < b.star
end
else
return a.star < b.star
return aGodLv > bGodLv
end
else
return a.heroConfig.Natural < b.heroConfig.Natural