【鸿蒙阵问题修改】

dev_chengFeng
guowei 2021-01-26 20:21:01 +08:00
parent 08236ad6a9
commit f0eb57d0a4
3 changed files with 44 additions and 17 deletions

View File

@ -203,12 +203,13 @@ function HongMengEnvoyPanel:RunTimerFun()
end end
local time_content = TimeToFelaxible(HarmonyManager.hongmengGuards[key].time - GetTimeStamp()) local time_content = TimeToFelaxible(HarmonyManager.hongmengGuards[key].time - GetTimeStamp())
value.timer_text.text = string.format("<color=#ffbc22>%s</color>\n<color=#bd922a>后恢复</color>", time_content) value.timer_text.text = string.format("<color=#ffbc22>%s</color>\n<color=#bd922a>后恢复</color>", time_content)
elseif HarmonyManager.hongmengGuards[key].time == 0 then else
-- body -- body
value.timer_text.text = ""
if not value.AddImage.activeSelf then if not value.AddImage.activeSelf then
-- body -- body
value.AddImage:SetActive(true) value.AddImage:SetActive(true)
value.timer_text.text = ""
end end
end end
end end

View File

@ -57,6 +57,8 @@ function HongMengUnLoadPanel:RemoveListener()
end end
local dataAdditon = nil local dataAdditon = nil
local LingDegree = -1
local HunDegree = -1
function HongMengUnLoadPanel:OnOpen(equipSId) function HongMengUnLoadPanel:OnOpen(equipSId)
LogGreen("打开面板") LogGreen("打开面板")
@ -65,6 +67,28 @@ function HongMengUnLoadPanel:OnOpen(equipSId)
local temp_hero = HeroManager.GetSingleHeroData(data) local temp_hero = HeroManager.GetSingleHeroData(data)
dataAdditon = HarmonyManager:GetAdditions() dataAdditon = HarmonyManager:GetAdditions()
--print(data) --print(data)
local dataRockOne = EquipTreasureManager.GetSingleTreasureByIdDyn(temp_hero.jewels[2])
local dataRockTwo = EquipTreasureManager.GetSingleTreasureByIdDyn(temp_hero.jewels[1])
if dataRockOne or dataRockTwo then
-- body
if dataRockOne.type == "魂宝" then
-- body
-- Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",dataRockOne.oriLv)
HunDegree = dataRockOne.oriLv
else
--Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",dataRockOne.oriLv)
LingDegree = dataRockOne.oriLv
end
if dataRockTwo.type == "灵宝" then
-- body
LingDegree = dataRockTwo.oriLv
else
HunDegree = dataRockTwo.oriLv
end
end
this:SetItem(this.ItemOne,HarmonyManager:GetGongMingListSingle(data),0) this:SetItem(this.ItemOne,HarmonyManager:GetGongMingListSingle(data),0)
this:SetItem(this.ItemTwo,temp_hero,1) this:SetItem(this.ItemTwo,temp_hero,1)
@ -110,16 +134,16 @@ function HongMengUnLoadPanel:SetTextTwo(go,data)
Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format("%s%d星",GetQuantityStrByquality(equip.Quality),equip.Stars) Util.GetGameObject(go.transform,"TextRank"):GetComponent("Text").text = string.format("%s%d星",GetQuantityStrByquality(equip.Quality),equip.Stars)
end end
if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).oriLv > 0 then if HunDegree > 0 then
-- body -- body
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).oriLv) Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",HunDegree)
else else
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("") Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("")
end end
if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).oriLv > 0 then if LingDegree > 0 then
-- body -- body
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).oriLv) Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",LingDegree)
else else
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("") Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("")
end end
@ -184,9 +208,9 @@ function HongMengUnLoadPanel:SetText(go,_data)
-- body -- body
elseif dataAdditon[i].additionType == 3 then elseif dataAdditon[i].additionType == 3 then
if dataAdditon[i].value > 0 and EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then if dataAdditon[i].value > 0 and HunDegree ~= -1 then
-- body -- body
local grade = dataAdditon[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv and dataAdditon[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv local grade = dataAdditon[i].value > HunDegree and dataAdditon[i].value or HunDegree
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",grade) Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",grade)
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then -- if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then
-- -- body -- -- body
@ -196,11 +220,11 @@ function HongMengUnLoadPanel:SetText(go,_data)
-- end -- end
else else
if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) and EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv > 0 then if HunDegree > 0 then
-- body -- body
local grade = dataAdditon[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv and dataAdditon[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv --local grade = dataAdditon[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv and dataAdditon[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",grade) Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",HunDegree)
else else
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("") Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("")
end end
@ -209,8 +233,8 @@ function HongMengUnLoadPanel:SetText(go,_data)
-- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",data[i].value) -- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",data[i].value)
-- body -- body
elseif dataAdditon[i].additionType == 4 then elseif dataAdditon[i].additionType == 4 then
if dataAdditon[i].value > 0 and EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then if dataAdditon[i].value > 0 and LingDegree ~= -1 then
local grade = dataAdditon[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv and dataAdditon[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv local grade = dataAdditon[i].value > LingDegree and dataAdditon[i].value or LingDegree
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",grade) Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",grade)
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then -- if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then
-- -- body -- -- body
@ -220,10 +244,10 @@ function HongMengUnLoadPanel:SetText(go,_data)
-- end -- end
-- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",data[i].value) -- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",data[i].value)
else else
if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) and EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv > 0 then if LingDegree > 0 then
-- body -- body
local grade = dataAdditon[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv and dataAdditon[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv --local grade = dataAdditon[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv and dataAdditon[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",grade) Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",LingDegree)
else else
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("") Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("")
end end

View File

@ -64,9 +64,11 @@ function RoleUpStarListPanel:OnOpen(heroData,HeroRankupGroupData,RankupConsumeMa
openThisPanel= _openThisPanel openThisPanel= _openThisPanel
curSelectHeroList={} curSelectHeroList={}
print(#_curSelectHeroList)
for i = 1, #_curSelectHeroList do for i = 1, #_curSelectHeroList do
curSelectHeroList[_curSelectHeroList[i]]=_curSelectHeroList[i] curSelectHeroList[_curSelectHeroList[i]]=_curSelectHeroList[i]
end end
curHeroData = _curHeroData curHeroData = _curHeroData
heroDataList = heroData heroDataList = heroData
this.HeroSortData(heroDataList) this.HeroSortData(heroDataList)
@ -115,7 +117,7 @@ function RoleUpStarListPanel:OnOpen(heroData,HeroRankupGroupData,RankupConsumeMa
end end
end end
this.desText.text=string.format(Language[11872],curNeedRoleNum,str)--HeroRankupGroupData.Name) this.desText.text=string.format(Language[11872],curNeedRoleNum,str)--HeroRankupGroupData.Name)
this.numText.text=string.format("%s/%s",#curSelectHeroList,curNeedRoleNum) this.numText.text=string.format("%s/%s",LengthOfTable(curSelectHeroList),curNeedRoleNum)
end end
function this.OnClickEnterHero(go,heroData,type) function this.OnClickEnterHero(go,heroData,type)