From d19325ce7b18b3b2603f6340331ce76856ab387c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 3 Jun 2021 17:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=AC=E4=BC=9A=E7=BA=A2=E7=82=B9?= =?UTF-8?q?=E3=80=91=E6=8A=A5=E9=94=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RedPacketView/GuildRedPacketManager.lua | 31 ------------------- .../~Lua/Modules/Player/RedpotManager.lua | 2 +- .../~Lua/View/SingleFightPlayerView.lua | 5 ++- 3 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua index 5631673e34..06587c2b0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/GuildRedPacketManager.lua @@ -10,54 +10,25 @@ end -- 检查公会红包红点 function this.CheckGuildRedPacketRedPoint() - -- Log(""..tostring(this.isCheck).."") - -- if this.isCheck then - -- return this.isCheck - -- else - -- return false - -- end local list=MyGuildManager.GetMyGuidRedPackage() - LogError("检测发红包红点111") if list and LengthOfTable(list)>0 then - LogError("检测发红包红点") for key, value in pairs(list) do if value and value.num and value.num>0 then - LogError("444444444444") return true end end end - LogError("5555555555") return false end function this.CheckIsCanGetPackage() - - -- NetManager.GetAllRedPacketResponse(function(msg) - - -- -- local data={} - -- -- for i,v in ipairs(msg.info) do - -- -- table.insert(data,v) - -- -- end - - -- local dataLength=#msg.info - -- LogError("+++++++++++++++ "..dataLength ) - -- if dataLength>0 then - -- return true - -- end - - -- return false - -- end) - LogError("现在红包得数量:"..MyGuildManager.GetRedPackageNum()) if MyGuildManager.GetRedPackageNum()>0 then --Game.GlobalEvent:DispatchEvent(GameEvent.Chat.OnRedPackageNumChanged,true) local aaa=Util.GetGameObject(UIManager.uiNode,"GuildMainCityPanel/ChatTipView/Image") local bbb=Util.GetGameObject(UIManager.uiNode,"MainPanel/ChatTipView/Image") if aaa then - LogError("显示红包") aaa.gameObject:SetActive(true) end if bbb then - LogError("显示红包") bbb.gameObject:SetActive(true) end return true @@ -66,11 +37,9 @@ function this.CheckIsCanGetPackage() local aaa=Util.GetGameObject(UIManager.uiNode,"GuildMainCityPanel/ChatTipView/Image") local bbb=Util.GetGameObject(UIManager.uiNode,"MainPanel/ChatTipView/Image") if aaa then - LogError("不显示红包") aaa.gameObject:SetActive(false) end if bbb then - LogError("bu显示红包") bbb.gameObject:SetActive(false) end return false diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index cc8e02c863..3ffe919951 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -455,7 +455,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Guild_Skill, GuildSkillManager.RefreshAllGuildSkillRedPoint) -- 公会红包 --RPData:AddCheckFunc(RedPointType.Guild_RedPacket,GuildRedPacketManager.CheckGuildRedPacketRedPoint) - RPData:AddCheckFunc(RedPointType.Guid_SendPackage,GuildRedPacketManager.CheckGuildRedPacketRedPoint) + RPData:AddCheckFunc(RedPointType.Guid_SendPackage,GuildRedPacketManager.CheckGuildRedPacketRedPoint,FUNCTION_OPEN_TYPE.GUILD) RPData:AddCheckFunc(RedPointType.Guid_GetPackage,GuildRedPacketManager.CheckIsCanGetPackage) --公会祭祀 RPData:AddCheckFunc(RedPointType.Guild_Fete,MyGuildManager.CheckGuildFeteRedPoint) diff --git a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua index b9003b3c8a..0630877dfe 100644 --- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua @@ -716,7 +716,10 @@ function SingleFightPlayerView:private_BloodBlood(objPos, index, iconType, isMon Util.GetGameObject(go, "anim/anim"):GetComponent("Text").text = iconAction.DecodeHurt(hurtNum, isCritical, showType) go:SetActive(true) - self.hurtNumTimer = nil + if self.hurtNumTimer then + self.hurtNumTimer:Stop() + self.hurtNumTimer = nil + end self.hurtNumTimer = Timer.New(function() if go then go:SetActive(false)