From 12c8efa516cf8cb341f50394a1e6e1e56939edfa Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 29 Jul 2021 10:23:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E7=BA=A2=E7=82=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Equip/EquipManager.lua | 7 ++++--- Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index 6d3d297776..121471bbb8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -152,10 +152,11 @@ end --获取单个英雄装备数据 function this.GetSingleHeroSingleEquipData(_equipid, _heroDid) _equipid = tonumber(_equipid) - if this.equipDatas[_equipid] and this.equipDatas[_equipid].upHeroDidList and this.equipDatas[_equipid].upHeroDidList[_heroDid] then - return this.equipDatas[_equipid] - elseif HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) > 0 and HarmonyManager.IsInfo(_heroDid) then + if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddEquip) > 0 and HarmonyManager.IsInfo(_heroDid) then + LogGreen("正在共鸣中") return HarmonyManager.equipDatas[_equipid]--.upHeroDidList[_heroDid] + elseif this.equipDatas[_equipid] and this.equipDatas[_equipid].upHeroDidList and this.equipDatas[_equipid].upHeroDidList[_heroDid] then + return this.equipDatas[_equipid] else return nil end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 2241f674f1..af5e4e8039 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3074,11 +3074,11 @@ function this.GetHeroIsUpEquip(heroDid) equipIdAndWarPower.warPower = 0 lackEquips[i] = equipIdAndWarPower end - -- 有装备的位置赋值装备id及战力 - if heroData.equipIdList and #heroData.equipIdList > 1 then + if heroData.equipIdList and #heroData.equipIdList > 0 then for i = 1, #heroData.equipIdList do if not heroData.equipIdList[i] then + else local curEquipConFigData = EquipManager.GetSingleHeroSingleEquipData(heroData.equipIdList[i], heroDid) @@ -3093,13 +3093,13 @@ function this.GetHeroIsUpEquip(heroDid) end end - --有同系 且未在英雄身上的装备 local equips = BagManager.GetEquipDataByEquipPosition(heroData.heroConfig.Profession) for _, v in ipairs(equips) do if EquipManager.GetSingleHeroSingleEquipData(v.id, heroDid) then --英雄已经装备了这个装备 + LogGreen("英雄已经装备了这个装备v.id:"..v.id) else local equipConfigData = equipConfig[v.id] local pos = equipConfigData.Position @@ -3109,7 +3109,7 @@ function this.GetHeroIsUpEquip(heroDid) lackEquips[pos].id = v.id lackEquips[pos].warPower = EquipManager.CalculateWarForce(v.id) else - local nextEquipWarPower = EquipManager.CalculateWarForce(v.id) + local nextEquipWarPower = EquipManager.CalculateWarForce(v.id) if nextEquipWarPower > lackEquips[pos].warPower then lackEquips[pos].id = v.id lackEquips[pos].warPower = EquipManager.CalculateWarForce(v.id)