diff --git a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua index 121471bbb8..f1ea0710ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Equip/EquipManager.lua @@ -153,7 +153,6 @@ end function this.GetSingleHeroSingleEquipData(_equipid, _heroDid) _equipid = tonumber(_equipid) 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] diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua index 80b4ced01a..fb95bcda45 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Manager/HarmonyManager.lua @@ -116,10 +116,11 @@ end function this.UpdateHongMengDataAdditions(hongmengAdditions) this.hongmengAdditions = hongmengAdditions - -- for i = 1, #this.hongmengAdditions do - -- print(this.hongmengAdditions[i].heroTid) - -- print(this.hongmengAdditions[i].value) - -- end + for i = 1, #this.hongmengAdditions do + -- LogGreen("this.hongmengAdditions[i].heroTid:"..this.hongmengAdditions[i].heroTid) + -- LogGreen("this.hongmengAdditions[i].value:"..this.hongmengAdditions[i].value) + -- LogGreen("this.hongmengAdditions[i].additionType:"..this.hongmengAdditions[i].additionType) + end --LogGreen("hongmengAdditions "..#this.hongmengAdditions) for i = 1, #this.hongmengAdditions do @@ -416,9 +417,8 @@ function this.GetSingleAdditions(type) if this.hongmengAdditions then -- body for i = 1, #this.hongmengAdditions do - if this.hongmengAdditions[i].additionType == type then - - + if this.hongmengAdditions[i].additionType == type then + --LogGreen("this.hongmengAdditions[i].additionType:"..this.hongmengAdditions[i].additionType.." this.hongmengAdditions[i].value :"..this.hongmengAdditions[i].value ) return this.hongmengAdditions[i].value end end diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index af5e4e8039..aa82ebcc7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3098,8 +3098,6 @@ function this.GetHeroIsUpEquip(heroDid) 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 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua index 89dc556cbb..0509243457 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua @@ -608,9 +608,9 @@ function this.ShowHeroEquip() Util.GetGameObject(go.transform, "proIcon"):GetComponent("Image").sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(curEquipTreasureDatas[i].itemConfig.PropertyName)) --鸿蒙阵 共享数据判断 - if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 then + if HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.HunSoulPrint) ~= -1 and curEquipTreasureDatas[i].equipType == 1 then Util.GetGameObject(go.transform, "HongMenging"):SetActive(true) - elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 then + elseif HarmonyManager.IsInfo(curEquipTreasureDatas[i].upHeroDid) and HarmonyManager.GetSingleAdditions(HarmonyAddType.LingSoulPrint) ~= -1 and curEquipTreasureDatas[i].equipType == 2 then Util.GetGameObject(go.transform, "HongMenging"):SetActive(true) else Util.GetGameObject(go.transform, "HongMenging"):SetActive(false)