【鸿蒙阵bug修改】
parent
9b9f006d8a
commit
b406886f91
|
|
@ -71,10 +71,23 @@ end
|
|||
function this.UpdateHongMengDataGuards(hongmengGuards)
|
||||
this.hongmengGuards = hongmengGuards
|
||||
|
||||
if this.hongmengTablet < this.TowerStartLimit then
|
||||
-- body
|
||||
this:SetInitList()
|
||||
else
|
||||
this:SetTowerInit()
|
||||
end
|
||||
end
|
||||
|
||||
function this.UpdateHongMengDataHeroInfos(hongmengHeroInfos)
|
||||
this.hongmengHeroInfos = hongmengHeroInfos
|
||||
|
||||
if this.hongmengTablet < this.TowerStartLimit then
|
||||
-- body
|
||||
this:SetInitList()
|
||||
else
|
||||
this:SetTowerInit()
|
||||
end
|
||||
end
|
||||
|
||||
function this.UpdateHongMengDataAdditions(hongmengAdditions)
|
||||
|
|
@ -86,7 +99,12 @@ function this.UpdateHongMengDataAdditions(hongmengAdditions)
|
|||
LogPink("this.hongmengAdditions"..i.." "..this.hongmengAdditions[i].value)
|
||||
end
|
||||
end
|
||||
|
||||
if this.hongmengTablet < this.TowerStartLimit then
|
||||
-- body
|
||||
this:SetInitList()
|
||||
else
|
||||
this:SetTowerInit()
|
||||
end
|
||||
end
|
||||
|
||||
--初始化共鸣列表数据
|
||||
|
|
@ -242,7 +260,7 @@ function this:SetTowerInit()
|
|||
end
|
||||
end
|
||||
this.ChooseDataList = tempTable
|
||||
LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList)
|
||||
--LogBlue("#this.ChooseDataList长度:"..#this.ChooseDataList)
|
||||
end
|
||||
--判断鸿蒙 使者/守卫 是否够6位
|
||||
function this:IsEnvoyCount()
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ end
|
|||
function GongMingResultTips:RemoveListener()
|
||||
|
||||
end
|
||||
local LingDegree = 0
|
||||
local HunDegree = 0
|
||||
local LingDegree = -1
|
||||
local HunDegree = -1
|
||||
function GongMingResultTips:OnOpen(flag)
|
||||
|
||||
--共鸣前
|
||||
|
|
@ -147,7 +147,8 @@ function GongMingResultTips:OnOpen(flag)
|
|||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv)
|
||||
LingDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv
|
||||
end
|
||||
else
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = "无"
|
||||
end
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]) then
|
||||
-- body
|
||||
|
|
@ -156,14 +157,22 @@ function GongMingResultTips:OnOpen(flag)
|
|||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv)
|
||||
HunDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv
|
||||
end
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = "无"
|
||||
end
|
||||
if herodata.talismanList > 0 then
|
||||
if herodata.star >= 6 then
|
||||
-- body
|
||||
Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.talismanList)
|
||||
if herodata.talismanList > 0 then
|
||||
-- body
|
||||
Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("%d",herodata.talismanList)
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
else
|
||||
Util.GetGameObject(this.TextOneAll,"textFa"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
|
||||
|
||||
|
||||
local data = HarmonyManager:GetAdditions()
|
||||
for i = 1, #data do
|
||||
|
|
@ -183,27 +192,46 @@ function GongMingResultTips:OnOpen(flag)
|
|||
end
|
||||
-- body
|
||||
elseif data[i].additionType == 3 then
|
||||
if HunDegree >data[i].value then
|
||||
if HunDegree ~= -1 then
|
||||
-- body
|
||||
Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = string.format("<color=green>%d</color>",HunDegree)
|
||||
if HunDegree >data[i].value then
|
||||
-- body
|
||||
Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = string.format("<color=green>%d</color>",HunDegree)
|
||||
else
|
||||
Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = string.format("<color=green>%d</color>",data[i].value)
|
||||
end
|
||||
else
|
||||
Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = string.format("<color=green>%d</color>",data[i].value)
|
||||
end
|
||||
Util.GetGameObject(this.TextTwoAll,"textHun"):GetComponent("Text").text = "<color=green>无</color>"
|
||||
end
|
||||
|
||||
-- body
|
||||
elseif data[i].additionType == 4 then
|
||||
if LingDegree>data[i].value then
|
||||
Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text =string.format("<color=green>%d</color>",LingDegree)
|
||||
if LingDegree ~= -1 then
|
||||
-- body
|
||||
if LingDegree>data[i].value then
|
||||
Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text =string.format("<color=green>%d</color>",LingDegree)
|
||||
else
|
||||
Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text =string.format("<color=green>%d</color>",data[i].value)
|
||||
end
|
||||
else
|
||||
Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text =string.format("<color=green>%d</color>",data[i].value)
|
||||
Util.GetGameObject(this.TextTwoAll,"textLing"):GetComponent("Text").text = "<color=green>无</color>"
|
||||
end
|
||||
|
||||
-- body
|
||||
else
|
||||
if data[i].value > 0 then
|
||||
if herodata.star >= 6 then
|
||||
-- body
|
||||
Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("<color=green>%d</color>",data[i].value)
|
||||
if data[i].value > 0 then
|
||||
-- body data[i].value > herodata.talismanList or data[i].value and herodata.talismanList
|
||||
|
||||
Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("<color=green>%d</color>",data[i].value)
|
||||
else
|
||||
Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("<color=green>无</color>")
|
||||
end
|
||||
else
|
||||
Util.GetGameObject(this.TextTwoAll,"textFa"):GetComponent("Text").text =string.format("<color=green>无</color>")
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -150,7 +150,7 @@ function GongMingResultTips:OnOpen(skinId)
|
|||
elseif data[i].additionType == 4 then
|
||||
if data[i].heroTid ~= 0 then
|
||||
-- body
|
||||
print(tostring(data[i].value).." "..data[i].heroTid.." ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName ")
|
||||
-- print(tostring(data[i].value).." "..data[i].heroTid.." ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName ")
|
||||
this.contentHunText:SetActive(true)
|
||||
Util.GetGameObject(this.TextAll,"textLing"):GetComponent("Text").text =string.format("<color=green>%d</color>(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
|
||||
|
||||
|
|
|
|||
|
|
@ -109,12 +109,19 @@ function HongMengUnLoadPanel:SetTextTwo(go,data)
|
|||
else
|
||||
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
if data.talismanList > 0 then
|
||||
|
||||
if data.star >= 6 then
|
||||
-- body
|
||||
Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList)
|
||||
if data.talismanList > 0 then
|
||||
-- body
|
||||
Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList)
|
||||
else
|
||||
Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
else
|
||||
Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
|
||||
|
||||
-- Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data.talismanList)
|
||||
end
|
||||
|
|
@ -186,6 +193,7 @@ function HongMengUnLoadPanel:SetText(go,_data)
|
|||
|
||||
-- body
|
||||
else
|
||||
-- print(data[i].value)
|
||||
if data[i].value > 0 then
|
||||
-- body
|
||||
Util.GetGameObject(go.transform,"TextFa"):GetComponent("Text").text = string.format("%d",data[i].value)
|
||||
|
|
|
|||
|
|
@ -299,7 +299,7 @@ function this:OnOpen()
|
|||
this.timerEffect:Start()
|
||||
end
|
||||
function this.SingleItemDataShow(clone,Itemdata)
|
||||
LogGreen(clone.name.."||"..Itemdata.heroConfig.Id)
|
||||
--LogGreen(clone.name.."||"..Itemdata.heroConfig.Id)
|
||||
--Util.GetGameObject(clone.transform, "Box/Empty"):SetActive(false)
|
||||
Util.GetGameObject(clone.transform, "GameObject/frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(Itemdata.heroConfig.Quality,Itemdata.star))
|
||||
Util.GetGameObject(clone.transform, "GameObject/lv/Text"):GetComponent("Text").text = string.format("<color=#0f0>%d</color>",Itemdata.lv)
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ function HarmonyView:OnOpen()
|
|||
-- body
|
||||
|
||||
table.insert(heroDataList,HeroManager.GetSingleHeroData(HarmonyManager.hongmengGuards[i].heroId))
|
||||
LogBlue("刷新IsHaveHero:"..HarmonyManager.hongmengGuards[i].heroId.." ::: "..tostring(HeroManager.IsHaveHero(HarmonyManager.hongmengGuards[i].heroId)))
|
||||
--LogBlue("刷新IsHaveHero:"..HarmonyManager.hongmengGuards[i].heroId.." ::: "..tostring(HeroManager.IsHaveHero(HarmonyManager.hongmengGuards[i].heroId)))
|
||||
if not HeroManager.IsHaveHero(HarmonyManager.hongmengGuards[i].heroId) then
|
||||
for k = 1, #HarmonyManager.hongmengHeroInfos do
|
||||
-- body
|
||||
|
|
@ -75,7 +75,7 @@ function HarmonyView:OnOpen()
|
|||
|
||||
end
|
||||
end
|
||||
LogGreen("heroDataList长度:"..#heroDataList)
|
||||
--LogGreen("heroDataList长度:"..#heroDataList)
|
||||
-- if #heroDataList > 0 then
|
||||
-- table.sort(heroDataList, function(a,b)
|
||||
-- if a.lv==b.lv then
|
||||
|
|
|
|||
Loading…
Reference in New Issue