From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Component/UI/Common/CyclicScroll.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Main/Component/UI/Common/CyclicScroll.cs b/Main/Component/UI/Common/CyclicScroll.cs
index 1ae202f..699ebb5 100644
--- a/Main/Component/UI/Common/CyclicScroll.cs
+++ b/Main/Component/UI/Common/CyclicScroll.cs
@@ -3,6 +3,8 @@
using UnityEngine;
using UnityEngine.EventSystems;
using System;
+using Cysharp.Threading.Tasks;
+using System.Diagnostics;
[DisallowMultipleComponent]
@@ -195,7 +197,8 @@
if (_stepByStep)
{
- StartCoroutine("Co_StepByStepAppear");
+ Co_StepByStepAppear();
+ // StartCoroutine("Co_StepByStepAppear");
}
}
@@ -222,7 +225,7 @@
}
}
- IEnumerator Co_StepByStepAppear()
+ private async UniTask Co_StepByStepAppear()
{
for (int i = 0; i < infiniteItems.Count; i++)
{
@@ -231,7 +234,7 @@
{
infiniteItem.SetActive(true);
infiniteItem.OpeningShow();
- yield return WaitingForSecondConst.WaitMS100;
+ await UniTask.Delay(1000);
}
}
}
@@ -284,10 +287,10 @@
public void OnDrag(PointerEventData eventData)
{
- if (vnxbqy.UI.NewBieCenter.Instance.inGuiding)
- {
- return;
- }
+ // if (NewBieCenter.Instance.inGuiding)
+ // {
+ // return;
+ // }
if (autoLerp || eventData.button != PointerEventData.InputButton.Left)
{
@@ -638,7 +641,7 @@
{
if (content == null)
{
- DebugEx.Log("Content 涓嶈兘涓虹┖锛�");
+ UnityEngine.Debug.Log("Content 涓嶈兘涓虹┖锛�");
return;
}
--
Gitblit v1.8.0