【神将置换】在大闹天宫编队中不需要提示已上阵,可以直接操作置换
parent
ff4d3e35c1
commit
3961935716
|
@ -202,6 +202,7 @@ function this.GetHeroDataByPosition(_position)
|
||||||
end
|
end
|
||||||
return heros
|
return heros
|
||||||
end
|
end
|
||||||
|
|
||||||
local oldChoose
|
local oldChoose
|
||||||
--数据显示
|
--数据显示
|
||||||
function this.SingleHeroDataShow(_go,_heroData)
|
function this.SingleHeroDataShow(_go,_heroData)
|
||||||
|
@ -216,7 +217,8 @@ function this.SingleHeroDataShow(_go,_heroData)
|
||||||
|
|
||||||
local formationMask = Util.GetGameObject(go.transform, "formationMask")
|
local formationMask = Util.GetGameObject(go.transform, "formationMask")
|
||||||
local formationImage = Util.GetGameObject(go.transform, "formationMask/formationImage/upImage"):GetComponent("Image")
|
local formationImage = Util.GetGameObject(go.transform, "formationMask/formationImage/upImage"):GetComponent("Image")
|
||||||
if LengthOfTable(heroData.formationList) ~= 0 then
|
if LengthOfTable(heroData.isFormations) ~= 0 then
|
||||||
|
--if LengthOfTable(heroData.formationList) ~= 0 then
|
||||||
formationMask:SetActive(true)
|
formationMask:SetActive(true)
|
||||||
formationImage.sprite = Util.LoadSprite("t_tongyong-yishangzheng")
|
formationImage.sprite = Util.LoadSprite("t_tongyong-yishangzheng")
|
||||||
elseif heroData.lockState == 1 then
|
elseif heroData.lockState == 1 then
|
||||||
|
|
|
@ -2959,6 +2959,25 @@ function this.ByReplaceHeroGetAllHeros()
|
||||||
table.insert(sortHeroList,v)
|
table.insert(sortHeroList,v)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
for k,v in ipairs(sortHeroList) do
|
||||||
|
local isFormations = {}
|
||||||
|
for n, w in ipairs(v.formationList) do
|
||||||
|
if w ~= 1301 then
|
||||||
|
local isFormationStr = HeroManager.GetHeroFormationStr(w)
|
||||||
|
if isFormationStr and isFormationStr ~= "" then
|
||||||
|
table.insert(isFormations, w)
|
||||||
|
if v.isFormation and v.isFormation ~= "" then
|
||||||
|
v.isFormation = v.isFormation .. "、".. isFormationStr
|
||||||
|
else
|
||||||
|
v.isFormation = isFormationStr
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
v.isFormations = isFormations
|
||||||
|
end
|
||||||
|
|
||||||
table.sort(sortHeroList, function(a,b)
|
table.sort(sortHeroList, function(a,b)
|
||||||
if a.star == b.star then
|
if a.star == b.star then
|
||||||
if a.lv == b.lv then
|
if a.lv == b.lv then
|
||||||
|
|
Loading…
Reference in New Issue