From 9f2d86c2a10d2c9d1347568b31719733fc3c43a2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 17 Mar 2021 14:29:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A9=E4=B9=A6=E7=A7=98=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Logic/Network.lua | 10 +++++----- .../ManagedResources/~Lua/Modules/Bag/BagManager.lua | 6 +++++- .../~Lua/Modules/Player/PlayerManager.lua | 6 +++++- .../~Lua/Modules/Pokemon/PokemonManager.lua | 1 + .../Modules/TianShuMiJuan/TianShuMiJuanManger.lua | 12 +++++++----- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Logic/Network.lua b/Assets/ManagedResources/~Lua/Logic/Network.lua index bdc9e86e65..afb361ec0b 100644 --- a/Assets/ManagedResources/~Lua/Logic/Network.lua +++ b/Assets/ManagedResources/~Lua/Logic/Network.lua @@ -51,7 +51,7 @@ end --异常断线-- function Network:OnException() - SysPanel.ShowOne(Language[12110], function() + MsgPanel.ShowOne(Language[12110], function() Game.Logout() end) self.bIsStartListenHeartBeat = false @@ -116,14 +116,14 @@ end function Network:OnConnectFail() RequestPanel.Hide() - SysPanel.ShowOne(Language[12113]) + MsgPanel.ShowOne(Language[12113]) end --重连3次失败 function Network:OnReconnectFail() -- 重连时间超过2分钟强制回到登录界面 if Time.time - self.ReconnectTime > 120 then - SysPanel.ShowTwo(Language[12235], function() + MsgPanel.ShowTwo(Language[12235], function() Game.Logout() end, Language[12117]) end @@ -131,7 +131,7 @@ function Network:OnReconnectFail() self.re_resendTimes = self.re_resendTimes + 1 if self.re_resendTimes > self.re_maxResendTimes then RequestPanel.Hide() - SysPanel.ShowTwo(Language[12114], function() + MsgPanel.ShowTwo(Language[12114], function() Game.Logout() end, function() if self.isConnected then @@ -318,7 +318,7 @@ function Network:Update() MyPCall(self.sendFunc) elseif self.resendTimes == self.maxResendTimes then RequestPanel.Hide() - SysPanel.ShowTwo(Language[12121], function() + MsgPanel.ShowTwo(Language[12121], function() Game.Logout() end, function() -- if self:IsSending() then diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua index 963e67ac5b..0a91ca82cf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua @@ -68,6 +68,10 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent) this.bagDatas[itemdata.id].endingTime = itemdata.endingTime this.bagDatas[itemdata.id].nextFlushTime = itemdata.nextFlushTime end + + if itemdata.type == ItemBaseType.SoulPrint then + SoulPrintManager.UpdateAllHavedSoulPrint({itemdata.id}) + end end -- 货币数据 @@ -77,7 +81,7 @@ function this.UpdateBagData(_itemData, isNoSendNewItemEvent) diamond_amount = BagManager.GetItemCountById(16), }) end - + -- end ---英雄副本独用刷新 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 3fbb7ac598..38056d27b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -276,7 +276,9 @@ function this.InitHandBookData(heroHandBook,talismanHandBook) end function this.SetHeroHandBookListData(heroSId,heroStar) + local isCheck = false if this.heroHandBook[heroSId] == nil then + isCheck = true this.heroHandBook[heroSId]={maxStar=0} this.heroHandBook[heroSId].maxStar=heroStar else @@ -284,7 +286,9 @@ function this.SetHeroHandBookListData(heroSId,heroStar) this.heroHandBook[heroSId].maxStar=heroStar end end - + if isCheck then + TianShuMiJuanManger.CheckFetterStatus(1) + end end function this.SetEquipHandBookListData(equipSId) if this.equipHandBook[equipSId] == nil then diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua index db031fa7b1..0bed7c16b1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua @@ -270,6 +270,7 @@ function this.InitPokemonsGetrData(_msgPokemonGetList) for i = 1, #_msgPokemonGetList do pokemonGet[_msgPokemonGetList[i]] = _msgPokemonGetList[i] end + TianShuMiJuanManger.CheckFetterStatus(3) end function this.GetAllPokemonGetDatas() diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua index 6cff4f510c..c4e5cdbc14 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanManger.lua @@ -1,12 +1,14 @@ -MonsterCampManager = {} +TianShuMiJuanManger = {} local this = TianShuMiJuanManger -this.fetterData = {} --读表 function this.Initialize() this.fetterData = {} for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.SpiritAnimalBook)) do local configData = this.CreatSingleConfigData(v) - this.fetterData[configData.id] = configData + if not this.fetterData[v.Id] then + this.fetterData[v.Id] = {} + end + this.fetterData[v.Id] = configData end end @@ -55,7 +57,7 @@ end function this.GetAllPokemonFetterDatas(fetterType,curPokemonSidList) local SpiritAnimalBookList = {} for k,v in pairs(this.fetterData) do - if v.FetterType == fetterType and v.enabled == -1 then + if v.fetterType == fetterType and v.enabled == -1 then if this.IsCompound(v.teamers,curPokemonSidList) then v.enabled = 0 end @@ -65,7 +67,7 @@ end function this.CheckRedPoint(fetterType) for k,v in pairs(this.fetterData) do - if v.FetterType == fetterType and v.enabled == 0 then + if v.fetterType == fetterType and v.enabled == 0 then return true end end