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()