【鸿蒙阵问题修改】
parent
08236ad6a9
commit
f0eb57d0a4
|
@ -203,12 +203,13 @@ function HongMengEnvoyPanel:RunTimerFun()
|
|||
end
|
||||
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)
|
||||
elseif HarmonyManager.hongmengGuards[key].time == 0 then
|
||||
else
|
||||
-- body
|
||||
value.timer_text.text = ""
|
||||
|
||||
if not value.AddImage.activeSelf then
|
||||
-- body
|
||||
value.AddImage:SetActive(true)
|
||||
value.timer_text.text = ""
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -57,6 +57,8 @@ function HongMengUnLoadPanel:RemoveListener()
|
|||
|
||||
end
|
||||
local dataAdditon = nil
|
||||
local LingDegree = -1
|
||||
local HunDegree = -1
|
||||
|
||||
function HongMengUnLoadPanel:OnOpen(equipSId)
|
||||
LogGreen("打开面板")
|
||||
|
@ -65,6 +67,28 @@ function HongMengUnLoadPanel:OnOpen(equipSId)
|
|||
local temp_hero = HeroManager.GetSingleHeroData(data)
|
||||
dataAdditon = HarmonyManager:GetAdditions()
|
||||
--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.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)
|
||||
end
|
||||
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[2]).oriLv > 0 then
|
||||
if HunDegree > 0 then
|
||||
-- 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
|
||||
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]) and EquipTreasureManager.GetSingleTreasureByIdDyn(data.jewels[1]).oriLv > 0 then
|
||||
if LingDegree > 0 then
|
||||
-- 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
|
||||
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
|
@ -184,9 +208,9 @@ function HongMengUnLoadPanel:SetText(go,_data)
|
|||
|
||||
-- body
|
||||
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
|
||||
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)
|
||||
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) then
|
||||
-- -- body
|
||||
|
@ -196,11 +220,11 @@ function HongMengUnLoadPanel:SetText(go,_data)
|
|||
-- end
|
||||
|
||||
else
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]) and EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[2]).lv > 0 then
|
||||
if HunDegree > 0 then
|
||||
-- body
|
||||
|
||||
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)
|
||||
--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",HunDegree)
|
||||
else
|
||||
Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
|
@ -209,8 +233,8 @@ function HongMengUnLoadPanel:SetText(go,_data)
|
|||
-- Util.GetGameObject(go.transform,"TextHun"):GetComponent("Text").text = string.format("%d",data[i].value)
|
||||
-- body
|
||||
elseif dataAdditon[i].additionType == 4 then
|
||||
if dataAdditon[i].value > 0 and EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then
|
||||
local grade = dataAdditon[i].value > EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv and dataAdditon[i].value or EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv
|
||||
if dataAdditon[i].value > 0 and LingDegree ~= -1 then
|
||||
local grade = dataAdditon[i].value > LingDegree and dataAdditon[i].value or LingDegree
|
||||
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",grade)
|
||||
-- if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) then
|
||||
-- -- body
|
||||
|
@ -220,10 +244,10 @@ function HongMengUnLoadPanel:SetText(go,_data)
|
|||
-- end
|
||||
-- Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("%d",data[i].value)
|
||||
else
|
||||
if EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]) and EquipTreasureManager.GetSingleTreasureByIdDyn(_data.jewels[1]).lv > 0 then
|
||||
if LingDegree > 0 then
|
||||
-- body
|
||||
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)
|
||||
--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",LingDegree)
|
||||
else
|
||||
Util.GetGameObject(go.transform,"TextLing"):GetComponent("Text").text = string.format("无")
|
||||
end
|
||||
|
|
|
@ -64,9 +64,11 @@ function RoleUpStarListPanel:OnOpen(heroData,HeroRankupGroupData,RankupConsumeMa
|
|||
|
||||
openThisPanel= _openThisPanel
|
||||
curSelectHeroList={}
|
||||
print(#_curSelectHeroList)
|
||||
for i = 1, #_curSelectHeroList do
|
||||
curSelectHeroList[_curSelectHeroList[i]]=_curSelectHeroList[i]
|
||||
end
|
||||
|
||||
curHeroData = _curHeroData
|
||||
heroDataList = heroData
|
||||
this.HeroSortData(heroDataList)
|
||||
|
@ -115,7 +117,7 @@ function RoleUpStarListPanel:OnOpen(heroData,HeroRankupGroupData,RankupConsumeMa
|
|||
end
|
||||
end
|
||||
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
|
||||
function this.OnClickEnterHero(go,heroData,type)
|
||||
|
||||
|
|
Loading…
Reference in New Issue