From 7713a6582647c2c4d4d4d5c6b515bda8f98cea64 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 31 Aug 2021 11:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=AE=9D=E5=99=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expedition/ExpeditionManager.lua | 1 - .../~Lua/Modules/GoodFriend/GoodFriendManager.lua | 1 + Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua | 2 +- .../~Lua/Modules/MonsterCamp/MonsterCampManager.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index 2c997d4114..0cd6a9281f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -768,7 +768,6 @@ function this.InitSingleTreasureData(_singleData) single.maxTreeLv = currJewel.GodHoodMaxlv single.treeLv = single.maxTreeLv or 0 single.fourTotal = 0 - LogGreen("_treeLevel:"..single.treeLv.." single.fourTotal:"..single.fourTotal) single.upHeroDid="" local quantity=currJewel.Level single.quantity=quantity diff --git a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua index 557e677e28..30cc99322d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua @@ -615,6 +615,7 @@ function this.InitSingleTreasureData(_singleData) single.lv=_singleData.exp single.refineLv=_singleData.rebuildLevel single.treeLv = _singleData.treeLv or 0 + single.fourTotal = 0 single.maxLv=currJewel.Max[1] single.maxRefineLv=currJewel.Max[2] single.maxTreeLv = currJewel.GodHoodMaxlv diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index c5fcd43e0f..948a78858a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -3738,7 +3738,7 @@ function this.CheckIsUpTreasure(Did,index) if not Did then return false end - local curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(Did) or MonsterCampManager.GetSingleTreasureByIdDyn(Did) + local curEquipData = EquipTreasureManager.GetSingleEquipTreasreData(Did) or MonsterCampManager.GetSingleTreasureByIdDyn(Did) or ExpeditionManager.GetSingleTreasureByIdDyn(Did) or GoodFriendManager.GetSingleTreasureByIdDyn(Did) local isMax,isMatEnough,items local indexType = curEquipData.equipType == 1 and HarmonyAddType.HunSoulPrint or HarmonyAddType.LingSoulPrint if index == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index e67c51b5ad..5dbcd57323 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -16,6 +16,8 @@ this.fourMonsterData = {} this.CurOffsetIndex = -1 function this.Initialize() + this.allTreasures = {} + this.friendHelpHeros = {} this.isMaxMonsterWave = false this.monsterWave = 0 -- 当前妖兽波次 this.m_Jump = false -- 跳过战斗设置 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua index 9d59a4a53d..0ab5d6fc57 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua @@ -374,7 +374,7 @@ function this.EquipInfo() data = ExpeditionManager.GetSingleTreasureByIdDyn(did) end if not data then - GoodFriendManager.GetSingleTreasureByIdDyn(did) + data = GoodFriendManager.GetSingleTreasureByIdDyn(did) end local pos = Util.GetGameObject(this.babyGrid,"Pre"..n.."/pos") local btn = Util.GetGameObject(pos,"mask")