From c4773e0eeeedf3c1d97c12b635b0ca36ae67831c Mon Sep 17 00:00:00 2001 From: wangzhixun <3077614386@qq.com> Date: Tue, 4 Nov 2025 23:12:52 +0800 Subject: [PATCH] 4.0002 --- .../ZCalendar/Scripts/ZCalendarModel.cs | 6 ++-- .../Framework/Manager/TutorialGuideManager.cs | 28 +++++++++---------- .../Utility/TimedObjectDestructor.cs | 9 +----- .../Runtime/Internal/ContinuationQueue.cs | 2 +- .../Runtime/UniTaskSynchronizationContext.cs | 4 +-- 5 files changed, 21 insertions(+), 28 deletions(-) diff --git a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs index 2d0ac3c..bf321cd 100644 --- a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs +++ b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs @@ -58,13 +58,13 @@ namespace ZTools AddCloseBtn(); - if (isStaticCalendar) - { + + btnLastYear.gameObject.SetActive(false); btnNextYear.gameObject.SetActive(false); btnLastMonth.gameObject.SetActive(false); btnNextMonth.gameObject.SetActive(false); - } + } /// /// 生成一个日期对象 diff --git a/3d/Assets/Framework/Manager/TutorialGuideManager.cs b/3d/Assets/Framework/Manager/TutorialGuideManager.cs index 6dee8b1..371b47f 100644 --- a/3d/Assets/Framework/Manager/TutorialGuideManager.cs +++ b/3d/Assets/Framework/Manager/TutorialGuideManager.cs @@ -400,14 +400,14 @@ namespace Framework.Manager if (currentIndex < orderedSteps.Count) { var currentStep = orderedSteps[currentIndex]; - if (currentStep.isOpenUI) - { - // UIButton.SetActive(true); - } - else - { + + + + + + UIButton.SetActive(false); - } + if (uiObjects.TryGetValue(currentStep.uiObjectName, out GameObject uiObject)) { @@ -504,14 +504,14 @@ namespace Framework.Manager } } - if (currentStep.isOpenUI) - { - // UIButton.SetActive(true); - } - else - { + + + + + + UIButton.SetActive(false); - } + return true; } else diff --git a/3d/Assets/Plugins/Standard Assets/Utility/TimedObjectDestructor.cs b/3d/Assets/Plugins/Standard Assets/Utility/TimedObjectDestructor.cs index fdf5e07..d3612dd 100644 --- a/3d/Assets/Plugins/Standard Assets/Utility/TimedObjectDestructor.cs +++ b/3d/Assets/Plugins/Standard Assets/Utility/TimedObjectDestructor.cs @@ -15,13 +15,6 @@ namespace UnityStandardAssets.Utility } - private void DestroyNow() - { - if (m_DetachChildren) - { - transform.DetachChildren(); - } - DestroyObject(gameObject); - } + } } diff --git a/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs b/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs index a33e6fe..a84cc4e 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs @@ -216,7 +216,7 @@ namespace Cysharp.Threading.Tasks.Internal } finally { - if (lockTaken) gate.Exit(false); + gate.Exit(false); } } } diff --git a/3d/Assets/Plugins/UniTask/Runtime/UniTaskSynchronizationContext.cs b/3d/Assets/Plugins/UniTask/Runtime/UniTaskSynchronizationContext.cs index 450e019..a6ccb59 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/UniTaskSynchronizationContext.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/UniTaskSynchronizationContext.cs @@ -97,7 +97,7 @@ namespace Cysharp.Threading.Tasks } finally { - if (lockTaken) gate.Exit(false); + gate.Exit(false); } } @@ -125,7 +125,7 @@ namespace Cysharp.Threading.Tasks } finally { - if (lockTaken) gate.Exit(false); + gate.Exit(false); } } }