diff --git a/Assets/ManagedResources/SplashPanel/SplashPanel.prefab b/Assets/ManagedResources/SplashPanel/SplashPanel.prefab index 57bb1e225a..f5085e3399 100644 --- a/Assets/ManagedResources/SplashPanel/SplashPanel.prefab +++ b/Assets/ManagedResources/SplashPanel/SplashPanel.prefab @@ -91,7 +91,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8670530557904193430 RectTransform: m_ObjectHideFlags: 0 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/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua index 71026c76ec..110cd2e35e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua @@ -2840,10 +2840,12 @@ function this.GetFormationHeroRedPoint() end --化虚坛红点判断 function this.GetAllHeroCompoundRedPoint() - for i, v in pairs(heroDatas) do - if v.star == 4 or v.star == 5 then - if this.IsShowUpStarRedPoint(v,true) then - return true + if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.COMPOUND_HERO) then + for i, v in pairs(heroDatas) do + if v.star == 4 or v.star == 5 then + if this.IsShowUpStarRedPoint(v,true) then + return true + end end end end 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 de2824b7a0..75023fdf50 100644 --- a/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua +++ b/Assets/ManagedResources/~Lua/View/SingleFightPlayerView.lua @@ -717,7 +717,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) diff --git a/Assets/Scripts/GameInit/GameStart.cs b/Assets/Scripts/GameInit/GameStart.cs index a75dce283d..d91f99ac99 100644 --- a/Assets/Scripts/GameInit/GameStart.cs +++ b/Assets/Scripts/GameInit/GameStart.cs @@ -61,10 +61,10 @@ public class GameStart : MonoBehaviour GameObject gameObj = bundle.LoadAsset("SplashPanel"); GameObject gameObj2 = Instantiate(gameObj, Vector3.zero, Quaternion.identity); Image image = gameObj2.transform.Find("Canvas/image").GetComponent(); - Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent(); - - image2.DOFade(1, 0).OnComplete(() => { - image2.DOFade(0, 0).SetDelay(0).OnComplete(() => { + //Image image2 = gameObj2.transform.Find("Canvas/image2").GetComponent(); + //image2.gameObject.SetActive(false); + //image2.DOFade(1, 0).OnComplete(() => { + // image2.DOFade(0, 0).SetDelay(0).OnComplete(() => { image.color = new Color(image.color.r, image.color.g, image.color.b, 0); image.DOFade(1, 1).OnComplete(() => { image.DOFade(0, 1).SetDelay(2).OnComplete(() => { @@ -75,8 +75,8 @@ public class GameStart : MonoBehaviour //StartCoroutine(playMovice()); }); }); - }); - }); + // }); + //}); } else {