From 7acb2ca6a720f57f675bd8cbdd6b21bc76e2a320 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Thu, 26 Jun 2025 05:49:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E9=87=91=E6=89=8B=E6=8C=87=E7=89=B9?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetRaw/Effects/NewLiwu/JSZ.prefab | 29 ++++++++++++ UnityProject/Assets/AssetRaw/TimeLine.meta | 8 ++++ .../Assets/AssetRaw/TimeLine/JszSignal.signal | 14 ++++++ .../AssetRaw/TimeLine/JszSignal.signal.meta | 8 ++++ .../HotFix/GameLogic/Actor/ActorHItem.cs | 25 +++++++++++ .../GameLogic/Manager/DataGameSceneManager.cs | 44 +++++-------------- .../AssetBundleCollectorSetting.asset | 13 ++++++ .../Assets/Timeline/JSZ_Timeline.playable | 41 +++++++++++++++++ 8 files changed, 149 insertions(+), 33 deletions(-) create mode 100644 UnityProject/Assets/AssetRaw/TimeLine.meta create mode 100644 UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal create mode 100644 UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal.meta diff --git a/UnityProject/Assets/AssetRaw/Effects/NewLiwu/JSZ.prefab b/UnityProject/Assets/AssetRaw/Effects/NewLiwu/JSZ.prefab index 42882ff1..79bc1f1d 100644 --- 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 diff --git a/UnityProject/Assets/AssetRaw/TimeLine.meta b/UnityProject/Assets/AssetRaw/TimeLine.meta new file mode 100644 index 00000000..d7323eda --- /dev/null +++ b/UnityProject/Assets/AssetRaw/TimeLine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b11f6d3e8909cde49822793aa64fd46d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal b/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal new file mode 100644 index 00000000..af92a411 --- /dev/null +++ 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: diff --git a/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal.meta b/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal.meta new file mode 100644 index 00000000..06546f6f --- /dev/null +++ b/UnityProject/Assets/AssetRaw/TimeLine/JszSignal.signal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2bf98db6fffb22f45ac338558bbd86ed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 709063f8..ddf1124c 100644 --- 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); // 直接扣 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 7efd9bf2..07474275 100644 --- 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秒 - } } + } /// @@ -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("JszSignal"); + eGo.GetComponent().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("JszSignal"); + eGo.GetComponent().GetReaction(JszSignal).AddListener(() => { - DataGameSceneManager.Instance.m_TeamSortList[0].SetCurrenFill(); - await UniTask.Delay(600); - } + DataGameSceneManager.Instance.m_TeamSortList[1].SetCurrenFill(); + }); } diff --git a/UnityProject/Assets/TEngine/AssetSetting/AssetBundleCollectorSetting.asset b/UnityProject/Assets/TEngine/AssetSetting/AssetBundleCollectorSetting.asset index ccf7bc25..dc072907 100644 --- 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: diff --git a/UnityProject/Assets/Timeline/JSZ_Timeline.playable b/UnityProject/Assets/Timeline/JSZ_Timeline.playable index 6687626a..05788457 100644 --- 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