From d0b8f8db8e3bb539042093abf4569df2a1621737 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 May 2021 20:24:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Common/SpriteLoader.lua | 2 +- .../Modules/NewActivity/CommonActPage.lua | 20 ++++++++----------- .../~Lua/View/SingleFightPlayerView.lua | 4 +++- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua b/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua index 23d8d6e7c7..ed2fd8890c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua +++ b/Assets/ManagedResources/~Lua/Modules/Common/SpriteLoader.lua @@ -39,7 +39,7 @@ function SpriteLoader:UnLoadSprite() end SpriteLoaderPool[self.id] = SpriteLoaderPool[self.id] + 1 if SpriteLoaderPool[self.id] > 1 then - LogError("SpriteLoader Repeat UnLoad : ".. self.id..", count : "..SpriteLoaderPool[self.id]) + --LogError("SpriteLoader Repeat UnLoad : ".. self.id..", count : "..SpriteLoaderPool[self.id]) end for name, count in pairs(self.SpriteList) do -- if name == "shadow_4" then diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index d2c2980c65..d7e7cecece 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -12,22 +12,18 @@ end --添加事件监听(用于子类重写) function CommonActPage:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, function() - self:RefreshData(true,false,false) - end,self) - Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, function() - self:RefreshData(true,false,false) - end,self) + Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, self.EventRefreshData, self) + Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, self.EventRefreshData, self) end --移除事件监听(用于子类重写) function CommonActPage:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, function() - self:RefreshData(true,false,false) - end,self) - Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, function() - self:RefreshData(true,false,false) - end,self) + Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold, self.EventRefreshData, self) + Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, self.EventRefreshData,self) +end + +function CommonActPage:EventRefreshData() + self:RefreshData(true,false,false) end function CommonActPage:InitComponent() diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua index bbd529b23e..418be3b14f 100644 --- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua @@ -568,7 +568,9 @@ function SingleFightPlayerView:SetIconShow(_eventpoint) self.eventPointPos:ShowDialogue(false) self.eventPointPos:SetDialogueStr(strList1[num]) Timer.New(function() - self.dialogueRoot.gameObject:SetActive(false) + if self.dialogueRoot then + self.dialogueRoot.gameObject:SetActive(false) + end if self.state == 1 then self.eventPointPos:ShowDialogue(true) self:NotBattleShow() From 0b2ef3393842ec5bc714da3f6cbe9fa42836d84a Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Thu, 27 May 2021 20:29:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=B1=B1=E6=B2=B3=E7=A4=BE?= =?UTF-8?q?=E7=A8=B7=E5=9B=BE=E3=80=91=E7=89=B9=E6=95=88=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua index ebc277669b..43d5de0d6f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua @@ -228,8 +228,6 @@ end function this.InitGrid() this.dropGrid:SetActive(#itemDataList <= 25 ) this.dropGridArena:SetActive(#itemDataList > 25 ) - -- LogYellow("itemListPrefab "..#itemListPrefab) - -- LogYellow("itemDataList "..#itemDataList) for i = 1, #itemListPrefab do itemListPrefab[i].gameObject:SetActive(false) end @@ -326,9 +324,6 @@ function this.FightLevelShow() Util.AddParticleSortLayer(starListEffect[i], this.sortingOrder - (sortingOrder - 1)) end end - for j = 1, 3 do - Util.AddParticleSortLayer(Util.GetGameObject(this.isFirstEffect, "Fx_star_looping ("..j..")"),this.sortingOrder - (sortingOrder - 1)) - end for i = 1, math.max(#condition, #conditionGo) do local go = conditionGo[i] if not go then From f5071a9845894f8f17a44e68d76dfddbf661b43c Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 27 May 2021 20:45:20 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90bug=E3=80=91=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=88=98=E6=96=97=E7=BB=93=E7=AE=97=E6=8A=A5=E9=94=99=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=82=E6=9C=BA=E5=A5=96=E5=8A=B1=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E7=99=BD=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Fight/FightPointPassMainPanel.lua | 1 + .../~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index a48271f5a9..1081686ffc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -9,6 +9,7 @@ local invadeMonster = require("Modules/Fight/View/InvadeMonsterView") local fightMap = require("Modules/Fight/View/FightPointMapView") local fightLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig) local fightLevelSetConfig = ConfigManager.GetConfig(ConfigName.MainLevelSettingConfig) +local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local points = {} local isCounting = false local orginLayer=0 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua index 453e5d3546..24cd1787d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_Onhook.lua @@ -63,7 +63,7 @@ function this:OnShow(_parent,...) itemList[i].icon.gameObject:SetActive(false) else itemList[i].icon.gameObject:SetActive(true) - itemList[i].icon.sprite = SetIcon(data.itemList[i].icon) + itemList[i].icon.sprite = SetIcon(self.spLoader, data.itemList[i].icon) end itemList[i].proName.text = data.itemList[i].proName if not data.itemList[i].proValue and not data.itemList[i].proValue1 then