diff --git a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarController.cs b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarController.cs index bb74115..fbba6d6 100644 --- a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarController.cs +++ b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarController.cs @@ -60,13 +60,13 @@ namespace ZTools zCalendarModel.Init(); if (zCalendarModel.isStaticCalendar) return; // ��̬�������ɹر� - if (zCalendarModel.isPopupCalendar) - { + + zCalendarModel.btnClose.onClick.AddListener(() => { Hide(); }); - } + zCalendarModel.btnLastYear.onClick.AddListener(LastYear); zCalendarModel.btnNextYear.onClick.AddListener(NextYear); zCalendarModel.btnLastMonth.onClick.AddListener(LastMonth); diff --git a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs index a2b9043..2d0ac3c 100644 --- a/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs +++ b/3d/Assets/3rdParty/ZCalendar/Scripts/ZCalendarModel.cs @@ -54,10 +54,10 @@ namespace ZTools SetItemSize(); - if (isPopupCalendar) - { + + AddCloseBtn(); - } + if (isStaticCalendar) { btnLastYear.gameObject.SetActive(false); diff --git a/3d/Assets/Framework/Manager/TutorialGuideManager.cs b/3d/Assets/Framework/Manager/TutorialGuideManager.cs index e8390b8..6dee8b1 100644 --- a/3d/Assets/Framework/Manager/TutorialGuideManager.cs +++ b/3d/Assets/Framework/Manager/TutorialGuideManager.cs @@ -588,19 +588,19 @@ namespace Framework.Manager { Debug.LogWarning($"多次尝试({maxAttempts}次)后仍未找到UI对象: {step.uiObjectName}"); - // 判断是否自动跳过 - //bool autoSkipMissingUI = false; // 可以添加配置选项控制此行为 - //if (autoSkipMissingUI) - //{ - // Debug.Log($"自动跳过未找到的UI对象: {step.uiObjectName}"); - // TriggerNextGuide(); // 跳过当前步骤,继续下一个 - // return true; // 虽然UI对象未找到,但已自动跳过,视为成功 - //} - //else - //{ + + + + + + + + + + Debug.Log($"等待UI对象: {step.uiObjectName} 注册后继续引导"); return false; // 延迟查找失败 - //} + } return false; // 默认返回失败 diff --git a/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs b/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs index a311126..a33e6fe 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/Internal/ContinuationQueue.cs @@ -66,7 +66,7 @@ namespace Cysharp.Threading.Tasks.Internal } finally { - if (lockTaken) gate.Exit(false); + } } diff --git a/3d/Assets/Plugins/UniTask/Runtime/Internal/MinimumQueue.cs b/3d/Assets/Plugins/UniTask/Runtime/Internal/MinimumQueue.cs index a6b567a..b6f8f58 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/Internal/MinimumQueue.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/Internal/MinimumQueue.cs @@ -18,7 +18,7 @@ namespace Cysharp.Threading.Tasks.Internal public MinimumQueue(int capacity) { - if (capacity < 0) throw new ArgumentOutOfRangeException("capacity"); + if (capacity < 0)throw new ArgumentOutOfRangeException("capacity"); array = new T[capacity]; head = tail = size = 0; } diff --git a/3d/Assets/Plugins/UniTask/Runtime/Linq/Range.cs b/3d/Assets/Plugins/UniTask/Runtime/Linq/Range.cs index 24a795d..5caf128 100644 --- a/3d/Assets/Plugins/UniTask/Runtime/Linq/Range.cs +++ b/3d/Assets/Plugins/UniTask/Runtime/Linq/Range.cs @@ -10,7 +10,7 @@ namespace Cysharp.Threading.Tasks.Linq if (count < 0) throw Error.ArgumentOutOfRange(nameof(count)); var end = (long)start + count - 1L; - if (end > int.MaxValue) throw Error.ArgumentOutOfRange(nameof(count)); + throw Error.ArgumentOutOfRange(nameof(count)); if (count == 0) UniTaskAsyncEnumerable.Empty();