【鸿蒙阵修改】

dev_chengFeng
guowei 2021-01-08 17:29:54 +08:00
parent f28818d4aa
commit 3ded7b31fc
12 changed files with 67 additions and 27 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -76,7 +76,7 @@ function EnvoyItem:OnOpen()
end
self.timer_text.text = ""
self.data.time = 0
self.AddImage:SetActive(true)
end,"取消","确认")
end)
-- body
@ -124,9 +124,11 @@ function EnvoyItem:SetItem(go,data)
self.Empty:SetActive(true)
if self.data.time-GetTimeStamp() > 0 then
-- body
print("进错了....."..self.data.time-GetTimeStamp())
self.AddImage:SetActive(false)
self.RedPoint:SetActive(false)
else
print("进错了")
self.AddImage:SetActive(true)
self.RedPoint:SetActive(true)
end

View File

@ -206,9 +206,10 @@ function this:SetInitList()
local list = {}
local count = 0;
--LogBlue("this.GuardList长度"..LengthOfTable(this.GuardList))
for key, value in pairs(this.GuardList) do
for key, value in pairs(this.hongmengGuards) do
if value.heroId ~= "" then
table.insert(list,value)
local singleHero = HeroManager.GetSingleHeroData(value.heroId)
table.insert(list,singleHero)
end
end
@ -255,10 +256,9 @@ function this:SetTowerInit()
for key, value in pairs(this.hongmengGuards) do
if value.heroId ~= "" then
local data = HeroManager.GetSingleHeroData(value.heroId)
table.insert(list,data)
local singleHero = HeroManager.GetSingleHeroData(value.heroId)
table.insert(list,singleHero)
end
end
--LogBlue("#this.hongmengHeroInfos"..#this.hongmengHeroInfos)
@ -397,10 +397,11 @@ function this:GetAdditions()
end
function this.GetSingleAdditions(type)
if this.hongmengAdditions then
if this.hongmengAdditions then
-- body
for i = 1, #this.hongmengAdditions do
if this.hongmengAdditions[i].additionType == type then
--print("!!!!!!!"..this.hongmengAdditions[i].value.."####"..type)
return this.hongmengAdditions[i].value
end
end
@ -487,7 +488,6 @@ function this:IsShowGongMingEqiup(id)
if id == this.hongmengHeroInfos[i].heroId then
return true
else
end
end

View File

@ -164,19 +164,23 @@ function GongMingResultTips:OnOpen(flag)
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]) then
-- body
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv then
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv > 0 then
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv)
HunDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[2]).lv
else
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = ""
end
else
Util.GetGameObject(this.TextOneAll,"textHun"):GetComponent("Text").text = ""
end
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]) then
-- body
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv then
if EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv > 0 then
-- bodyLingDegree
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = string.format("%d",EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv)
LingDegree = EquipTreasureManager.GetSingleTreasureByIdDyn(herodata.jewels[1]).lv
else
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = ""
end
else
Util.GetGameObject(this.TextOneAll,"textLing"):GetComponent("Text").text = ""

View File

@ -80,7 +80,7 @@ function GongMingResultTips:OnOpen(skinId)
elseif data[i].additionType == 2 then
if data[i].value == -1 then
-- body
self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format("\t\t\t\t\t\t\t<color=red>无</color>")
self.upStarSkillTextPreEquip:GetComponent("Text").text = string.format("\t\t\t\t\t\t<color=red>无</color>")
else
local equip = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig,data[i].value)
@ -101,7 +101,7 @@ function GongMingResultTips:OnOpen(skinId)
self.upStarSkillTextPreHun:GetComponent("Text").text = ""
else
self.upStarSkillTextPreHun:SetActive(true)
self.upStarSkillTextPreHun:GetComponent("Text").text = string.format("\t\t\t\t\t\t\t<color=red>无</color>")
self.upStarSkillTextPreHun:GetComponent("Text").text = string.format("\t\t\t\t\t\t<color=red>无</color>")
end
end
@ -122,7 +122,7 @@ function GongMingResultTips:OnOpen(skinId)
self.upStarSkillTextPreSoul:GetComponent("Text").text =""
else
self.upStarSkillTextPreSoul:SetActive(true)
self.upStarSkillTextPreSoul:GetComponent("Text").text = string.format("\t\t\t\t\t\t\t<color=red>无</color>")
self.upStarSkillTextPreSoul:GetComponent("Text").text = string.format("\t\t\t\t\t\t<color=red>无</color>")
end
@ -135,7 +135,7 @@ function GongMingResultTips:OnOpen(skinId)
print(data[i].heroTid )
self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t<color=green>%d</color>(%s)",data[i].value,ConfigManager.TryGetConfigData(ConfigName.HeroConfig, data[i].heroTid).ReadingName)
else
self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t\t<color=red>无</color>")
self.upStarSkillTextPreFa:GetComponent("Text").text =string.format("\t\t\t\t\t\t<color=red>无</color>")
end
end

View File

@ -288,10 +288,36 @@ function HongMengEnvoyPanel:OnOpen(equipSId)
self.GradeText.text = string.format("%d/%d", HarmonyManager.hongmengAdditions[1].value, sum)
self:IsUpBtnGray()
self:InitTextMum()
self:CheckEvoyEquip()
self:RunTimerFun()
-- self.timerEffect:Start()
end
--检测鸿蒙守卫装备是否够24件
function HongMengEnvoyPanel:CheckEvoyEquip()
-- body
local list= {}
HarmonyManager.equipCount = 0
for i = 1, #HarmonyManager.hongmengGuards do
-- body
if HarmonyManager.hongmengGuards[i].heroId ~= "" then
-- body
local singleHero = HeroManager.GetSingleHeroData(HarmonyManager.hongmengGuards[i].heroId)
table.insert(list,singleHero)
end
end
for i = 1, #list do
-- body
if list[i].equipIdList then
-- body
for i = 1, #list[i].equipIdList do
-- body
HarmonyManager.equipCount = HarmonyManager.equipCount + 1
end
end
end
print(HarmonyManager.equipCount)
end
function HongMengEnvoyPanel:InitTextMum()
local HeroCount = 0
local Box = #HarmonyManager.hongmengHeroInfos + #HarmonyManager.hongmengGuards

View File

@ -64,7 +64,7 @@ end
--装备
HeroData.__get__.equipIdList = function(self)
local equipStar = HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip)
--LogPink("self._equipIdList "..equipStar )
--LogPink("self._equipIdList "..equipStar.." @@@@@@"..#self._equipIdList )
if #self._equipIdList > 0 then
self.harmonyGongMing = false
return self._equipIdList
@ -76,7 +76,7 @@ HeroData.__get__.equipIdList = function(self)
end
self.harmonyGongMing = true
return curEquipIdList
else
else
self.harmonyGongMing = false
return self._equipIdList
end
@ -92,7 +92,7 @@ HeroData.__get__.talismanList = function(self)
--LogPink("法宝2 `````````` "..self._id)
if heroConfig and not heroConfig.EquipTalismana then
self.harmonyGongMing = false
self.harmonyFaGongMing = false
-- LogPink("法宝3 `````````` "..self._talismanList)
return 0
end
@ -100,11 +100,11 @@ HeroData.__get__.talismanList = function(self)
if Equip > 0 and HarmonyManager.IsInfo(self.dynamicId) then
--print(curlvEen," "..self.heroConfig.ReadingName)
local endLv = Equip > self._talismanList and Equip or self._talismanList
self.harmonyGongMing = true
self.harmonyFaGongMing = true
--LogPink("法宝4 `````````` "..endLv)
return endLv
else
self.harmonyGongMing = false
self.harmonyFaGongMing = false
--LogPink("法宝5 `````````` "..self._talismanList)
return self._talismanList
end

View File

@ -74,13 +74,14 @@ function RoleChooseListPanel:BindEvent()
NetManager.SendGongMingBox(TempData.dynamicId,HarmonyManager.GongMingBox,4,function (msg)
-- body
Game.GlobalEvent:DispatchEvent(GameEvent.HongMeng.UpHongMengEnvoy,data)
UIManager.OpenPanel(UIName.GongMingResultPanel,self.flag)
--UIManager.OpenPanel(UIName.GongMingResultPanel,self.flag)
HarmonyManager.WarPowerChangeNotify(TempData.dynamicId)
end)
else
HarmonyManager:SetGongMingList(TempData.dynamicId)
if HarmonyManager.equipCount == 24 then
LogGreen("脱装备")
for i = 1, #TempData.equipIdList do
HeroManager.SetHeroEquipIdList(TempData.dynamicId, {})
EquipManager.DeleteSingleEquip(TempData.equipIdList[i],TempData.dynamicId)

View File

@ -175,6 +175,8 @@ function RoleEquipPanel:BindEvent()
Util.AddOnceClick(
this.allEquipDown,
function()
--HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId) and
print(tostring(HarmonyManager:IsShowGongMingEqiup(curHeroData.dnyamicId)),tostring(curHeroData.harmonyGongMing))
if HarmonyManager:IsShowGongMingEqiup(curHeroData.dynamicId) and curHeroData.harmonyGongMing then
-- body
PopupTipPanel.ShowTip("共鸣装备,无法一键卸下")
@ -425,7 +427,7 @@ function this:AllEquipUpBtnOnClick()
-- LogYellow("isCanUpEquipTreasure:"..tostring(isCanUpEquipTreasure))
if (allEquipIds and #allEquipIds > 0) or (isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0) then
--isCanUpEquipTreasure
if allEquipIds and #allEquipIds > 0 then
if allEquipIds and #allEquipIds > 0 and not curHeroData.harmonyGongMing then
-- for i = 1, #allEquipIds do
-- LogGreen("一键装备"..allEquipIds[i])
-- end
@ -446,6 +448,9 @@ function this:AllEquipUpBtnOnClick()
end
)
end
if curHeroData.harmonyGongMing then
PopupTipPanel.ShowTip("装备共鸣中,不可一键装备!")
end
--穿戴宝物
if isCanUpEquipTreasure and allTreasureIds and #allTreasureIds > 0 then
-- for i = 1, #allTreasureIds do

View File

@ -501,7 +501,7 @@ function this:UpdateHeroInfoData()
if teamHero[curHeroData.dynamicId] then
isUpZhen = true
this.equipBtnRedPoint:SetActive(#HeroManager.GetHeroIsUpEquip(curHeroData.dynamicId) > 0)
this.talismanBtnRedPoint:SetActive(HeroManager.GetIsShowTalismanRedPoint(curHeroData))
this.talismanBtnRedPoint:SetActive(HeroManager.GetIsShowTalismanRedPoint(curHeroData) and (not HarmonyManager.IsChangeColor(curHeroData.dynamicId)))
this.soulPrintBtnRedPoint:SetActive(HeroManager.GetIsShowSoulPrintRedPoint(curHeroData))
else
isUpZhen = false

View File

@ -78,7 +78,7 @@ function RoleTalismanPanelV2:BindEvent()
end)
--进阶按钮
Util.AddClick(this.advanceBtn, function()
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
PopupTipPanel.ShowTip("无法对共鸣神将进行此操作!")
return
end
@ -152,7 +152,8 @@ end
--刷新界面
function this.OnShowHeroAndTalisman()
this.advanceBtnRedPot:SetActive(teamHero[curHeroData.dynamicId] and HeroManager.GetIsShowTalismanRedPoint(curHeroData))
--print(tostring(curHeroData.harmonyFaGongMing))
this.advanceBtnRedPot:SetActive(teamHero[curHeroData.dynamicId] and HeroManager.GetIsShowTalismanRedPoint(curHeroData) and (not HarmonyManager.IsChangeColor(curHeroData.dynamicId)))
this.content:DOAnchorPosY(0, 0)
local data = ConfigManager.GetConfigData(ConfigName.HeroConfig,curHeroData.id).EquipTalismana--当前法宝数据 data[1]星级 data[2]法宝ID
--获取法宝最大等级
@ -164,7 +165,7 @@ function this.OnShowHeroAndTalisman()
curTalismanConFig= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",curLv)
--判断共鸣状态 置灰按钮
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
if HarmonyManager.IsChangeColor(curHeroData.dynamicId) then
Util.SetGray(this.advanceBtn,true)
else
Util.SetGray(this.advanceBtn,false)

View File

@ -111,7 +111,7 @@ function HarmonyView:OnOpen()
end
end
HarmonyManager.equipCount = 0
for i = 1, #self.HongMengData do
if self.HongMengData[i] then
-- body
@ -125,6 +125,7 @@ function HarmonyView:OnOpen()
end
end
print("装备个数"..HarmonyManager.equipCount)
-- for i = 0, #self.GongMingTable do
-- if i == 5 then
-- self:SetItem(self.HongMengData[i+1],self.GongMingTable[i],1)