神将排序界面修改提交

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,6 +686,9 @@ 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
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
@ -703,6 +706,9 @@ function this.NaturalSort(isNature,a,b)
else
return a.star > b.star
end
else
return aGodLv > bGodLv
end
else
return a.heroConfig.Quality > b.heroConfig.Quality
end
@ -712,6 +718,9 @@ function this.NaturalSort(isNature,a,b)
else
if a.lv == b.lv then
if a.heroConfig.Quality == b.heroConfig.Quality then
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
@ -729,6 +738,9 @@ function this.NaturalSort(isNature,a,b)
else
return a.star > b.star
end
else
return aGodLv > bGodLv
end
else
return a.heroConfig.Quality > b.heroConfig.Quality
end

View File

@ -77,11 +77,17 @@ function this.SortHeroDatas(data)
end
table.sort(data,function(a,b)
if a.fourElementSortId == b.fourElementSortId then
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 aGodLv > bGodLv
end
else
return a.fourElementSortId > b.fourElementSortId
end

View File

@ -3611,6 +3611,9 @@ function this.SortHeroDatas(_heroDatas)
(not teamHero[a.dynamicId] and not teamHero[b.dynamicId])
then
if a.heroConfig.Natural ==b.heroConfig.Natural then
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
@ -3620,6 +3623,9 @@ function this.SortHeroDatas(_heroDatas)
else
return a.star > b.star
end
else
return aGodLv > bGodLv
end
else
return a.heroConfig.Natural > b.heroConfig.Natural
end

View File

@ -218,6 +218,9 @@ function this.SortHeroDatas(_heroDatas)
if a.lockState == b.lockState then
if a.isHarmonyGongMing == b.isHarmonyGongMing then
if a.heroConfig.Natural ==b.heroConfig.Natural then
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
@ -227,6 +230,9 @@ function this.SortHeroDatas(_heroDatas)
else
return a.star < b.star
end
else
return aGodLv > bGodLv
end
else
return a.heroConfig.Natural < b.heroConfig.Natural
end

View File

@ -291,6 +291,9 @@ function this.SortHeroDatas(_heroDatas)
if a.lockState == b.lockState then
if a.isHarmonyGongMing == b.isHarmonyGongMing then
if a.heroConfig.Natural ==b.heroConfig.Natural then
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
@ -300,6 +303,9 @@ function this.SortHeroDatas(_heroDatas)
else
return a.star < b.star
end
else
return aGodLv > bGodLv
end
else
return a.heroConfig.Natural < b.heroConfig.Natural
end