Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
aea5077487
|
|
@ -326,9 +326,9 @@ function this.SingleHeroDataShow(_go,_heroData)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddOnceClick(formationMask, function()
|
Util.AddOnceClick(formationMask, function()
|
||||||
if LengthOfTable(heroData.formationList) ~= 0 then
|
if LengthOfTable(hheroData.isFormations) ~= 0 then
|
||||||
local text = ""
|
local text = ""
|
||||||
for key, value in pairs(heroData.formationList) do
|
for key, value in pairs(heroData.isFormations) do
|
||||||
text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318]
|
text = Language[12317]..HeroManager.GetHeroFormationStr2(key)..Language[12318]
|
||||||
end
|
end
|
||||||
PopupTipPanel.ShowTip(text)
|
PopupTipPanel.ShowTip(text)
|
||||||
|
|
|
||||||
|
|
@ -2963,16 +2963,9 @@ function this.ByReplaceHeroGetAllHeros()
|
||||||
for k,v in ipairs(sortHeroList) do
|
for k,v in ipairs(sortHeroList) do
|
||||||
local isFormations = {}
|
local isFormations = {}
|
||||||
for n, w in ipairs(v.formationList) do
|
for n, w in ipairs(v.formationList) do
|
||||||
if w ~= 1301 and w ~= 401 then
|
|
||||||
local isFormationStr = HeroManager.GetHeroFormationStr(w)
|
local isFormationStr = HeroManager.GetHeroFormationStr(w)
|
||||||
if isFormationStr and isFormationStr ~= "" then
|
if isFormationStr and isFormationStr ~= "" then
|
||||||
table.insert(isFormations, w)
|
table.insert(isFormations, w)
|
||||||
if v.isFormation and v.isFormation ~= "" then
|
|
||||||
v.isFormation = v.isFormation .. "、".. isFormationStr
|
|
||||||
else
|
|
||||||
v.isFormation = isFormationStr
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
v.isFormations = isFormations
|
v.isFormations = isFormations
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue