From 5a4e34c8a85737c0fa5b5775122da31155cbaef3 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 09 二月 2026 14:46:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/Component/UI/Effect/EffectPlayer.cs |   49 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/Main/Component/UI/Effect/EffectPlayer.cs b/Main/Component/UI/Effect/EffectPlayer.cs
index b187168..e12dbe3 100644
--- a/Main/Component/UI/Effect/EffectPlayer.cs
+++ b/Main/Component/UI/Effect/EffectPlayer.cs
@@ -24,6 +24,7 @@
         {
             if (value != m_EffectID)
             {
+                Stop();
                 isInit = false;
                 m_EffectID = value;
             }
@@ -34,7 +35,7 @@
 
     public EffectConfig effectConfig;
 
-    public float speedRate = 1f;
+    public float speedRate = 1f;    //鍒濆鍖栫殑鏃跺�欑敤 淇敼浣跨敤SetSpeed
 
     [Header("鏄惁寰幆鎾斁spine鐗规晥")]
     public bool isPlaySpineLoop = false;
@@ -60,7 +61,11 @@
     protected EffectPenetrationBlocker blocker = null;
 
     protected bool isInit = false;
-    protected bool isPlaying = false;
+    public bool isPlaying
+    {
+        get;
+        protected set;
+    }
 
     protected List<ParticleSystem> particleList = new List<ParticleSystem>();
 
@@ -77,8 +82,12 @@
 
     protected virtual void OnEnable()
     {
-        
-        if (isPlayOnEnable)
+
+        if (isPlayOnEnable && playDelayTime != 0)
+        {
+            PlayAsync(false).Forget();
+        }
+        else if (isPlayOnEnable)
         {
             Play(false);
         }
@@ -220,7 +229,7 @@
             PlayerEffect();
         }
     
-        SoundPlayer.Instance.PlayUIAudio(effectConfig.audio);
+        
 
     }
 
@@ -240,7 +249,17 @@
     //     return;
     // }
 
-
+	//瓒婂ぇ瓒婂揩
+	public void SetSpeed(float speed)
+    {
+        speedRate = speed;
+        if (spineAnimationState == null)
+        {
+            Debug.LogError("spineAnimationState is null 鍙互鍏堣皟鐢╬lay");
+            return;
+        }
+		spineAnimationState.TimeScale = speed;
+	}
 
     protected void PlaySpineEffect(bool closePMA = false)
     {
@@ -255,10 +274,10 @@
         {
             //LoadAsset 宸茬粡鏈夌紦瀛楽keletonDataAsset
             spineComp.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("UIEffect/" + effectConfig.packageName, effectConfig.fxName);
-            spineComp.MeshGenerator.settings.pmaVertexColors = !closePMA;   //涓簍rue鏃朵細鏈夐儴鍒嗙壒鏁堜笉鏄剧ず 濡備富鐣岄潰瑁呭鐗规晥
+            //涓簍rue鏃朵細鏈夐儴鍒嗙壒鏁堜笉鏄剧ず 濡傛弧绾х粡楠屾潯锛涙敼鎴愪冀椹悗閮ㄥ垎鐗规晥姝ｅ父锛岃繕鏈夐儴鍒嗕緷鐒惰鏀规璁剧疆
+            spineComp.MeshGenerator.settings.pmaVertexColors = !closePMA;   
             spineComp.raycastTarget = false;
             spineComp.Initialize(true);
-            spineComp.timeScale = speedRate;
             // 妫�鏌ュ姩鐢绘槸鍚︽湁鐩稿姞妯″紡
             // bool hasAdditiveBlend = CheckForAdditiveBlend(spineComp.Skeleton);
             // if (hasAdditiveBlend)
@@ -272,6 +291,7 @@
             spineComp.material = ResManager.Instance.LoadAsset<Material>("Materials", "SkeletonGraphicDefault-Straight");
 
             spineAnimationState = spineComp.AnimationState;
+            spineAnimationState.TimeScale = speedRate;
             spineAnimationState.Data.DefaultMix = 0f;
             spineAnimationState.Complete -= OnSpineAnimationComplete;
             spineAnimationState.Complete += OnSpineAnimationComplete;
@@ -279,6 +299,7 @@
 
         spineComp.enabled = true;
         PlayerTheSpineAnim();
+        SoundPlayer.Instance.PlayUIAudioDelay(effectConfig.audio).Forget();
     }
 
         // 鎾斁鎸囧畾鍔ㄧ敾
@@ -341,7 +362,7 @@
         }
 
         // 浠庣壒鏁堥鍒朵綋姹犺幏鍙栫壒鏁�
-        pool = GameObjectPoolManager.Instance.RequestPool(effectPrefab);
+        pool = GameObjectPoolManager.Instance.GetPool(effectPrefab);
         effectTarget = pool.Request();
         // 璁剧疆鐖惰妭鐐瑰拰浣嶇疆
         effectTarget.transform.SetParent(transform);
@@ -369,6 +390,7 @@
         {
             blocker.SetParentCanvas(canvas);
         }
+        SoundPlayer.Instance.PlayUIAudioDelay(effectConfig.audio).Forget();
     }
 
     public async UniTask PlayAsync(bool showLog = true, bool closePMA = false)
@@ -410,10 +432,11 @@
             spineComp.enabled = false;
             isPlaying = false;
             onComplete?.Invoke();
-            if (isReleaseImmediately)
-            {
-                Release();
-            }
+            // TODO 浼氭姤閿欐殏鏃舵敞閲�
+            // if (isReleaseImmediately)
+            // {
+            //     Release();
+            // }
 
         }
     }

--
Gitblit v1.8.0