【鸿蒙阵问题修改】

dev_chengFeng
guowei 2021-01-26 14:47:01 +08:00
parent c5a35fa707
commit 08236ad6a9
5 changed files with 16 additions and 8 deletions

View File

@ -62,7 +62,12 @@ function CompoundHeroUpStarListPanel:OnOpen(heroData,HeroRankupGroupData,RankupC
openThisPanel= _openThisPanel
curSelectHeroList={}
for i = 1, #_curSelectHeroList do
curSelectHeroList[_curSelectHeroList[i]]=_curSelectHeroList[i]
print(_curSelectHeroList[i].." _curSelectHeroList[i]")
if (not HarmonyManager.IsChangeColor(_curSelectHeroList[i])) and ( not HarmonyManager:IsEnvoy(_curSelectHeroList[i])) then
-- body
curSelectHeroList[_curSelectHeroList[i]]=_curSelectHeroList[i]
end
end
curHeroData = _curHeroData
heroDataList = heroData
@ -243,7 +248,7 @@ function CompoundHeroUpStarListPanel:AutoSelectHero()
LogGreen("sssssssssssssssssssss")
curSelectHeroList = {}
for i = 1, #heroDataList do
if LengthOfTable(curSelectHeroList) < curNeedRoleNum and LengthOfTable(heroDataList[i].formationList) == 0 and heroDataList[i].lockState == 0 then--
if LengthOfTable(curSelectHeroList) < curNeedRoleNum and LengthOfTable(heroDataList[i].formationList) == 0 and heroDataList[i].lockState == 0 and (not HarmonyManager:IsEnvoy(heroDataList[i].dynamicId)) and (not HarmonyManager.IsChangeColor(heroDataList[i].dynamicId)) then--
LogGreen("heroDataList[i].dynamicId "..heroDataList[i].dynamicId)
curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i]
end

View File

@ -309,7 +309,7 @@ function this.AutoSelectUpStarHeroList(_curUpStarData)
for j = 1, LengthOfTable(upStarHeroListData) do
if #curSelectHeroList < _curUpStarData.upStarData[i][4] then
if upStarHeroListData[j] and upStarHeroListData[j].dynamicId and upStarHeroListData[j].lockState == 0 and (curSelectHero.heroConfig and upStarHeroListData[j].dynamicId ~= curSelectHero.dynamicId) and upStarHeroListData[j].isFormation == ""
and not HarmonyManager.IsChangeColor(upStarHeroListData[j].dynamicId) and not HarmonyManager.IsEnvoy(upStarHeroListData[j].dynamicId) then
and not HarmonyManager.IsChangeColor(upStarHeroListData[j].dynamicId) and not HarmonyManager:IsEnvoy(upStarHeroListData[j].dynamicId) then
table.insert(curSelectHeroList,upStarHeroListData[j])
end
end
@ -377,7 +377,7 @@ function this.UpdateUpStarPosHeroData2(curSelectHeroList)
this.UpdateFirstHeroUpStarData(curSelectHeroConfig)
end
end
--更新英雄进阶数据
--更新英雄进阶数据 ((not HarmonyManager:IsEnvoy(curSelectHero.dynamicId) )and (not HarmonyManager.IsInfo(curSelectHero.dynamicId)) )
function this.UpdateFirstHeroUpStarData(curHeroCompoundData)
local go = needHeros[1]
local proImage = Util.GetGameObject(go.transform, "iconbg/proImage")
@ -398,7 +398,7 @@ function this.UpdateFirstHeroUpStarData(curHeroCompoundData)
frame:GetComponent("Image").sprite=Util.LoadSprite(GetHeroQuantityImageByquality(heroConfig.Quality, heroConfig.Star))
proImage:GetComponent("Image").sprite=Util.LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName))
SetHeroStars(starGrid, heroConfig.Star,1,nil,-15.3)
if curSelectHero and curSelectHero.heroConfig then
if curSelectHero and curSelectHero.heroConfig then
num:GetComponent("Text").text=string.format("<color=#00FF06>%s/%s</color>",1,1)
LogGreen("curSelectHero.icon:"..curSelectHero.icon)
icon:GetComponent("Image").sprite=Util.LoadSprite(curSelectHero.icon)

View File

@ -316,7 +316,10 @@ end
--初始化鸿蒙使者的数据
--是否是鸿蒙使者
function this:IsEnvoy(did)
if this:HongMengTowerUpLimit() == 0 then
-- body
return false
end
-- body
for i = 1, #this.hongmengGuards do
-- body

View File

@ -286,7 +286,7 @@ function this:AutoSelectUpStarHeroList(_curUpStarData)
if LengthOfTable(upStarHeroListData.heroList) >= curUpStarData[i].upStarData[4] then
for i = 1, curUpStarData[i].upStarData[4] do
if upStarHeroListData.heroList[i].lockState == 0 and upStarHeroListData.heroList[i].isFormation == ""
and not HarmonyManager.IsChangeColor(upStarHeroListData.heroList[i].dynamicId) and not HarmonyManager.IsEnvoy(upStarHeroListData.heroList[i].dynamicId) then
and (not HarmonyManager.IsChangeColor(upStarHeroListData.heroList[i].dynamicId)) and (not HarmonyManager:IsEnvoy(upStarHeroListData.heroList[i].dynamicId)) then
table.insert(curSelectHeroList,upStarHeroListData.heroList[i])
end
end

View File

@ -237,7 +237,7 @@ end
function RoleUpStarListPanel:AutoSelectHero()
curSelectHeroList = {}
for i = 1, #heroDataList do
if LengthOfTable(curSelectHeroList) < curNeedRoleNum and heroDataList[i].isFormation == "" and heroDataList[i].lockState == 0 and (not HarmonyManager.IsChangeColor(heroDataList[i].dynamicId)) then
if LengthOfTable(curSelectHeroList) < curNeedRoleNum and heroDataList[i].isFormation == "" and heroDataList[i].lockState == 0 and (not HarmonyManager.IsChangeColor(heroDataList[i].dynamicId) and(not HarmonyManager:IsEnvoy(heroDataList[i].dynamicId))) then
curSelectHeroList[heroDataList[i].dynamicId]=heroDataList[i]
end
end