对金手指特效问题

2025-06-26 05:49:23 +08:00 · 2025-06-26 05:49:23 +08:00 · 7acb2ca6a7
commit 7acb2ca6a7
parent 9df40f971d
8 changed files with 149 additions and 33 deletions
--- a/UnityProject/Assets/AssetRaw/Effects/NewLiwu/JSZ.prefab
+++ b/UnityProject/Assets/AssetRaw/Effects/NewLiwu/JSZ.prefab
@ -174,6 +174,8 @@ PlayableDirector:
  m_SceneBindings:
  - key: {fileID: -8294013845605418285, guid: 6dee109802ca3bc4fa462c67ea1dce37, type: 2}
    value: {fileID: 7033517264646932218}
+  - key: {fileID: 8684741608394832626, guid: 6dee109802ca3bc4fa462c67ea1dce37, type: 2}
+    value: {fileID: 6961345102584529736}
  m_ExposedReferences:
    m_References:
    - 0e4db673bae85a1489fa3fb438b61f64: {fileID: 8553756560031397296}
@ -186,6 +188,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 2013647948217718534}
+  - component: {fileID: 6961345102584529736}
  m_Layer: 5
  m_Name: JSZ
  m_TagString: Untagged
@ -215,6 +218,24 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 100, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6961345102584529736
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8315684443450598820}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e52de21a22b6dd44c9cc19f810c65059, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Events:
+    m_Signals:
+    - {fileID: 11400000, guid: 2bf98db6fffb22f45ac338558bbd86ed, type: 2}
+    m_Events:
+    - m_PersistentCalls:
+        m_Calls: []
 --- !u!1001 &1179405051364562075
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -223,6 +244,14 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 2013647948217718534}
    m_Modifications:
+    - target: {fileID: 5532892190477770169, guid: ffd87c5aa6d26c84bbc7456758846809, type: 3}
+      propertyPath: randomSeed
+      value: 4908
+      objectReference: {fileID: 0}
+    - target: {fileID: 5532892190477770169, guid: ffd87c5aa6d26c84bbc7456758846809, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 7416050763911422251, guid: ffd87c5aa6d26c84bbc7456758846809, type: 3}
      propertyPath: m_Name
      value: JSZ_Boom
--- a/UnityProject/Assets/AssetRaw/TimeLine.meta
+++ b/UnityProject/Assets/AssetRaw/TimeLine.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b11f6d3e8909cde49822793aa64fd46d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal
+++ b/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal
@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d6fa2d92fc1b3f34da284357edf89c3b, type: 3}
+  m_Name: JszSignal
+  m_EditorClassIdentifier: 
--- a/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal.meta
+++ b/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2bf98db6fffb22f45ac338558bbd86ed
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
@ -300,6 +300,31 @@ namespace GameLogic
                // 龙卷风特效特殊处理


+                for (int j = 0; j < 5; j++)
+                {
+                    // 生成特效
+                    var eGo = GameModule.Resource.LoadGameObject(giftConfig.EffectName);
+                    eGo.transform.SetParent(GetRect().transform);
+                    eGo.transform.localPosition = new Vector3(1500, 0, 0);
+                    eGo.transform.localScale = Vector3.one;
+
+                    // 动画异步执行，不阻塞主流程
+                    eGo.transform.DOLocalMoveX(0, 5f).OnComplete(() =>
+                    {
+                        GameObject.Destroy(eGo);
+
+                    });
+
+                    GameModule.Timer.AddTimer((e) =>
+                    {
+                        SetCurrenFill();
+                    }, 4f);
+
+                    // 严格每500ms生成一个特效
+                    await UniTask.Delay(500);
+                }
+
+
                await UniTask.Delay(6000);

                // 直接扣
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
@ -10,6 +10,8 @@ using DG.Tweening;
 using Coffee.UIExtensions;
 using Cysharp.Threading.Tasks;
 using System.Threading.Tasks;
+using UnityEngine.Timeline;
+using UnityEngine.Events;

 namespace GameLogic
 {
@ -789,36 +791,15 @@ namespace GameLogic

            for (int i = 0; i < 3; i++)
            {
-
                // 添加减速Buff
                Buff m_Buff1 = new Buff();
                m_Buff1.OnInit(giftConfig.Id, giftConfig.AddPower * num, giftConfig.TimerLen, giftConfig.AddGiftScore, num);
                m_TempList[i].AddBuff(m_Buff1, unitPlayerData, giftConfig);

-
-                for (int j = 0; j < 5; j++)
-                {
-                    // 添加减速Buff给到
-                    var eGo = GameModule.Resource.LoadGameObject(giftConfig.EffectName);
-                    eGo.transform.SetParent(m_TempList[i].GetRect().transform);
-                    //eGo.transform.position = actor.GetRect().transform.position;
-                    eGo.transform.localPosition = new Vector3(1500, 0, 0);
-                    eGo.transform.localScale = Vector3.one;
-                    m_Buff1.m_EffectGo = eGo;
-
-                    // 移动特效
-                    eGo.transform.DOLocalMoveX(0, 5f).OnComplete(() =>
-                    {
-                        Log.Debug("?");
-                        GameObject.Destroy(eGo);
-                        m_TempList[i].SetCurrenFill();
-                    });
-
-                    await UniTask.Delay(500); // 延时1秒
-                }
            }


+
        }

        /// <summary>
@ -908,8 +889,6 @@ namespace GameLogic
            if (DataGameSceneManager.Instance.m_TeamSortList[0] == actor)
            {
                // 自己是第一名,则给第二名生成一个特效
-
-                Log.Debug("?!!!");
                // 添加减速Buff给到
                var eGo = GameModule.Resource.LoadGameObject("JSZ");
                eGo.transform.SetParent(DataGameSceneManager.Instance.m_TeamSortList[1].GetRect().transform);
@ -922,16 +901,14 @@ namespace GameLogic
                    GameObject.Destroy(eGo);
                });

-                for (int i = 0; i < 45; i++)
+                var JszSignal = GameModule.Resource.LoadAsset<SignalAsset>("JszSignal");
+                eGo.GetComponent<SignalReceiver>().GetReaction(JszSignal).AddListener(() =>
                {
                    DataGameSceneManager.Instance.m_TeamSortList[1].SetCurrenFill();
-                    await UniTask.Delay(600);
-                }
-
+                });
            }
            else
            {
-                Log.Debug("?!!!312321321");
                // 给第一名生成一个特效
                // 添加减速Buff给到
                var eGo = GameModule.Resource.LoadGameObject("JSZ");
@ -945,11 +922,12 @@ namespace GameLogic
                    GameObject.Destroy(eGo);
                });

-                for (int i = 0; i < 45; i++)
+        
+                var JszSignal = GameModule.Resource.LoadAsset<SignalAsset>("JszSignal");
+                eGo.GetComponent<SignalReceiver>().GetReaction(JszSignal).AddListener(() =>
                {
-                    DataGameSceneManager.Instance.m_TeamSortList[0].SetCurrenFill();
-                    await UniTask.Delay(600);
-                }
+                    DataGameSceneManager.Instance.m_TeamSortList[1].SetCurrenFill();
+                });
            }


--- a/UnityProject/Assets/TEngine/AssetSetting/AssetBundleCollectorSetting.asset
+++ b/UnityProject/Assets/TEngine/AssetSetting/AssetBundleCollectorSetting.asset
@ -188,3 +188,16 @@ MonoBehaviour:
        FilterRuleName: CollectAll
        AssetTags: 
        UserData: 
+    - GroupName: TimeLine
+      GroupDesc: 
+      AssetTags: 
+      ActiveRuleName: EnableGroup
+      Collectors:
+      - CollectPath: Assets/AssetRaw/TimeLine
+        CollectorGUID: b11f6d3e8909cde49822793aa64fd46d
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
--- a/UnityProject/Assets/Timeline/JSZ_Timeline.playable
+++ b/UnityProject/Assets/Timeline/JSZ_Timeline.playable
@ -477,6 +477,22 @@ AnimationClip:
  m_HasGenericRootTransform: 1
  m_HasMotionFloatCurves: 0
  m_Events: []
+--- !u!114 &-3551482802284226922
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 15c38f6fa1940124db1ab7f6fe7268d1, type: 3}
+  m_Name: Signal Emitter
+  m_EditorClassIdentifier: 
+  m_Time: 0.3333333333333333
+  m_Retroactive: 0
+  m_EmitOnce: 0
+  m_Asset: {fileID: 11400000, guid: 2bf98db6fffb22f45ac338558bbd86ed, type: 2}
 --- !u!114 &11400000
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -493,6 +509,7 @@ MonoBehaviour:
  m_Tracks:
  - {fileID: -8294013845605418285}
  - {fileID: 1194525926190364986}
+  - {fileID: 8684741608394832626}
  m_FixedDuration: 0
  m_EditorSettings:
    m_Framerate: 30
@ -591,6 +608,30 @@ MonoBehaviour:
    m_DisplayName: JSZ_Boom
  m_Markers:
    m_Objects: []
+--- !u!114 &8684741608394832626
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b46e36075dd1c124a8422c228e75e1fb, type: 3}
+  m_Name: Signal Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children: []
+  m_Clips: []
+  m_Markers:
+    m_Objects:
+    - {fileID: -3551482802284226922}
 --- !u!114 &8923842764252959784
 MonoBehaviour:
  m_ObjectHideFlags: 1