From 16d6e211a3430d9e1ba99197cb7ea0c75d4573f3 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 27 Apr 2022 17:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A5=9E=E5=8D=B0=E5=9B=9B=E7=81=B5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=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 | 10 ++++++++++ .../~Lua/Modules/GodPrint/GodPrintPopUp.lua | 6 ++++-- .../~Lua/Modules/Map/EndLessMapManager.lua | 10 ++++++++++ .../~Lua/Modules/MonsterCamp/MonsterCampManager.lua | 11 +++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua index b958a97d71..3ae8776dca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionManager.lua @@ -522,6 +522,7 @@ end function this.UpdateHeroDatas(_msgHeroData) local heroData = {} heroData.soulPrintList={} + heroData.godPrintList={} heroData.heroBackData=_msgHeroData heroData.dynamicId = _msgHeroData.id local _id = _msgHeroData.heroId @@ -573,6 +574,15 @@ function this.UpdateHeroDatas(_msgHeroData) end heroData.soulPrintList= soulPrintList end + if(#_msgHeroData.godSeals>=1) then + local godPrintList = {} + for i,v in ipairs(_msgHeroData.godSeals) do + local godPrint = { equipId = v.equipId, position = v.position} + -- SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId) + table.insert(godPrintList, godPrint) + end + heroData.godPrintList= godPrintList + end heroData.skillIdList={}--主动技 HeroManager.UpdateSkillIdList(heroData) heroData.passiveSkillList = {}--被动技 diff --git a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua index 57821792d2..780b778992 100644 --- a/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua +++ b/Assets/ManagedResources/~Lua/Modules/GodPrint/GodPrintPopUp.lua @@ -310,8 +310,8 @@ function GodPrintPopUp:RefreshShow(type) self.trialScopeText.text = "以下神将可装备:"..equipConfig[soulId].Describe end - --获取途径 - self.howGet:SetActive(type==Type.Access) + + --获取途径 if self.jumpViewList and #self.jumpViewList > 0 then for i = 1,#self.jumpViewList do @@ -319,8 +319,10 @@ function GodPrintPopUp:RefreshShow(type) end end local curitemData = itemConfig[soulId] + self.howGet:SetActive(false) if curitemData and curitemData.Jump then if curitemData.Jump and #curitemData.Jump>0 then + self.howGet:SetActive(true) self.canGetScrollView:SetData(curitemData.Jump,function (index, item) local tempView = SubUIManager.Open(SubUIConfig.JumpView, item.transform, curitemData.Jump[index],true) table.insert(self.jumpViewList,tempView) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index a0a6f9a955..78a6b48b79 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -308,6 +308,16 @@ function this.InitSingleEndlessHero(_msgHeroData) end heroData.soulPrintList = soulPrintList end + heroData.godPrintList={} + if (#_msgHeroData.godSeals >= 1) then + local godPrintList = {} + for i, v in ipairs(_msgHeroData.godSeals) do + local soulPrint = { equipId = v.equipId, position = v.position } + table.insert(godPrintList, soulPrint) + heroData.actionPower = heroData.actionPower + equipConfig[v.equipId].Score + end + heroData.godPrintList = godPrintList + end --乘减属性集合 heroData.MLSproList={} heroData.formationList = {}--所在编队list diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua index fa88c0c056..b053e4b420 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampManager.lua @@ -337,6 +337,7 @@ function this.UpdateHeroDatas(_msgHeroData,_msgPlayerData) heroData.createTime=_msgHeroData.createTimelocal heroData.lockState = _msgHeroData.lockState heroData.createtype = _msgHeroData.createtype + heroData.godPrintList={} local _configData = heroViewConfig[_id] heroData.changeProId = _msgHeroData.propertyId heroData.skinId = _msgHeroData.skinId or 0 @@ -371,6 +372,7 @@ function this.UpdateHeroDatas(_msgHeroData,_msgPlayerData) this.SetEquipTreasureUpHeroDid(heroData.jewels[i],heroData.dynamicId) end heroData.talismanList = _msgHeroData.especialEquipLevel --法宝等级 + if(#_msgHeroData.soulPos>=1) then local soulPrintList = {} for i,v in ipairs(_msgHeroData.soulPos) do @@ -380,6 +382,15 @@ function this.UpdateHeroDatas(_msgHeroData,_msgPlayerData) end heroData.soulPrintList= soulPrintList end + if(#_msgHeroData.godSeals>=1) then + local godPrintList = {} + for i,v in ipairs(_msgHeroData.godSeals) do + local godPrint = { equipId = v.equipId, position = v.position} + -- SoulPrintManager.AddSoulPrintUpHeroDynamicId(v.equipId,heroData.dynamicId) + table.insert(godPrintList, godPrint) + end + heroData.godPrintList= godPrintList + end heroData.heroConfig = heroViewConfig[_id] heroData.skillIdList={}--主动技 HeroManager.UpdateSkillIdList(heroData)