diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorWindow.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorWindow.cs index 8bd2f8a1..98a5b154 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorWindow.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorWindow.cs @@ -48,7 +48,7 @@ namespace GAS.Editor /// /// 这个方法被反射引用到, 重构请小心!! /// - public static void ShowWindow(TimelineAbilityAssetBase asset) + public static void ShowWindow(TimelineAbilityAsset asset) { var wnd = GetWindow(); wnd.titleContent = new GUIContent("AbilityTimelineEditorWindow"); @@ -63,7 +63,7 @@ namespace GAS.Editor AbilityAsset.Save(); } - private void InitAbility(TimelineAbilityAssetBase asset) + private void InitAbility(TimelineAbilityAsset asset) { _abilityAsset.value = asset; MaxFrame.value = AbilityAsset.FrameCount; @@ -84,7 +84,7 @@ namespace GAS.Editor private ObjectField _abilityAsset; private Button _btnShowAbilityAssetDetail; - public TimelineAbilityAssetBase AbilityAsset => _abilityAsset.value as TimelineAbilityAssetBase; + public TimelineAbilityAsset AbilityAsset => _abilityAsset.value as TimelineAbilityAsset; // private TimelineAbilityEditorWindow AbilityAssetEditor => AbilityAsset != null // ? UnityEditor.Editor.CreateEditor(AbilityAsset) as TimelineAbilityEditorWindow @@ -208,7 +208,7 @@ namespace GAS.Editor if (_currentMaxFrame == value) return; _currentMaxFrame = value; - AbilityAsset.FrameCount = _currentMaxFrame; + AbilityAsset.frameCount = _currentMaxFrame; SaveAsset(); MaxFrame.value = _currentMaxFrame; TrackView.UpdateContentSize(); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/TimelineTrackView.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/TimelineTrackView.cs index 4f69a171..c4b3fee8 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/TimelineTrackView.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/TimelineTrackView.cs @@ -34,7 +34,7 @@ namespace GAS.Editor public List TrackList { get; } = new(); private static AbilityTimelineEditorConfig Config => AbilityTimelineEditorWindow.Instance.Config; - private static TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private static TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private void InitTracks() { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClip.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClip.cs index ce0647e4..cb93451d 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClip.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClip.cs @@ -8,7 +8,7 @@ namespace GAS.Editor public class TaskClip : TrackClip { - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public TaskClipEvent TaskClipData => clipData as TaskClipEvent; public TaskClipEvent ClipDataForSave diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEditor.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEditor.cs index fa417c32..0f46b8af 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEditor.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEditor.cs @@ -42,7 +42,7 @@ namespace GAS.Editor private const string GRP_BOX = "GRP_BOX"; private const string GRP_BOX_TASK = "GRP_BOX/Task"; - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private TaskClip _clip; public static TaskClipEditor Create(TaskClip clip) diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEventTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEventTrack.cs index 38c0a483..0e2eaee1 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEventTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClipEventTrack.cs @@ -13,7 +13,7 @@ namespace GAS.Editor protected override Color TrackColor => new Color(0.7f, 0.3f, 0.7f, 0.2f); protected override Color MenuColor => new Color(0.5f, 0.3f, 0.5f, 1); - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public TaskClipEventTrackData TaskClipTrackDataForSave { get diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClip.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClip.cs index 14a9480d..41d6f1b7 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClip.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClip.cs @@ -7,7 +7,7 @@ namespace GAS.Editor public class PassiveTaskClip : TrackClip { - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public PassiveTaskClipEvent TaskClipData => clipData as PassiveTaskClipEvent; public PassiveTaskClipEvent ClipDataForSave diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEditor.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEditor.cs index 0f3df0f0..d77afd1c 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEditor.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEditor.cs @@ -42,7 +42,7 @@ namespace GAS.Editor private const string GRP_BOX = "GRP_BOX"; private const string GRP_BOX_TASK = "GRP_BOX/Task"; - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private PassiveTaskClip _clip; public static PassiveTaskClipEditor Create(PassiveTaskClip clip) diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEventTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEventTrack.cs index cecbd851..29ec8466 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEventTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrackPassive/PassiveTaskClipEventTrack.cs @@ -13,7 +13,7 @@ namespace GAS.Editor protected override Color TrackColor => new Color(0.7f, 0.3f, 0.7f, 0.2f); protected override Color MenuColor => new Color(0.5f, 0.3f, 0.5f, 1); - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public PassiveTaskClipEventTrackData TaskClipTrackDataForSave { get diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskMarkTrack/TaskMarkEventTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskMarkTrack/TaskMarkEventTrack.cs index 53905b7d..366f80d2 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskMarkTrack/TaskMarkEventTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskMarkTrack/TaskMarkEventTrack.cs @@ -11,7 +11,7 @@ namespace GAS.Editor public class TaskMarkEventTrack : TrackBase { private TaskMarkEventTrackData _instantTasksTrackData; - private static TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private static TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public TaskMarkEventTrackData InstantTaskEventTrackData { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectClipEditor.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectClipEditor.cs index 40d77811..e33e3e1d 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectClipEditor.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectClipEditor.cs @@ -10,7 +10,7 @@ namespace GAS.Editor public class BuffGameplayEffectClipEditor : OdinEditorWindow { - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private BuffGameplayEffectClip _clip; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectTrack.cs index ae0c2e24..b8d5b4eb 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/BuffGameplayEffectTrack/BuffGameplayEffectTrack.cs @@ -13,7 +13,7 @@ namespace GAS.Editor protected override Color TrackColor => new(0.9f, 0.6f, 0.6f, 0.2f); protected override Color MenuColor => new(0.9f, 0.6f, 0.6f, 1); - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public BuffGameplayEffectTrackData BuffTrackDataForSave { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClip.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClip.cs index 4cb0e63d..a8cdb316 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClip.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClip.cs @@ -8,7 +8,7 @@ namespace GAS.Editor public class DurationalCueClip : TrackClip { - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public DurationalCueClipEvent DurationalCueClipData => clipData as DurationalCueClipEvent; private DurationalCueClipEvent ClipDataForSave diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClipEditor.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClipEditor.cs index ff0f8a79..24bf774c 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClipEditor.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueClipEditor.cs @@ -10,7 +10,7 @@ namespace GAS.Editor public class DurationalCueClipEditor : OdinEditorWindow { - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private DurationalCueClip _clip; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueTrack.cs index 82b12e66..73bc3108 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/DurationalCueTrack/DurationalCueTrack.cs @@ -13,7 +13,7 @@ namespace GAS.Editor protected override Color TrackColor => new(0.1f, 0.6f, 0.1f, 0.2f); protected override Color MenuColor => new(0.1f, 0.6f, 0.1f, 1); - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public DurationalCueTrackData CueTrackDataForSave { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/InstantCueTrack/InstantCueTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/InstantCueTrack/InstantCueTrack.cs index 4f6d0043..de89a8ae 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/InstantCueTrack/InstantCueTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/InstantCueTrack/InstantCueTrack.cs @@ -12,7 +12,7 @@ namespace GAS.Editor public class InstantCueTrack : TrackBase { private InstantCueTrackData _instantCuesTrackData; - private static TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private static TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public InstantCueTrackData InstantCueTrackData { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/MenuTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/MenuTrack.cs index 5cf6c478..140e7779 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/MenuTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/MenuTrack.cs @@ -13,7 +13,7 @@ namespace GAS.Editor private Color _trackColor; private Type _trackDataType; private Type _trackType; - private static TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private static TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private static AbilityTimelineEditorConfig Config => AbilityTimelineEditorWindow.Instance.Config; private static TimelineTrackView TrackView => AbilityTimelineEditorWindow.Instance.TrackView; public override Type TrackDataType { get; } diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectClipEditor.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectClipEditor.cs index bfc819b4..ea6bf314 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectClipEditor.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectClipEditor.cs @@ -10,7 +10,7 @@ namespace GAS.Editor public class PassiveGameplayEffectClipEditor : OdinEditorWindow { - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private PassiveGameplayEffectClip _clip; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectTrack.cs index 6c46cc42..32045ec7 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/PassiveGameplayEffectTrack/PassiveGameplayEffectTrack.cs @@ -9,7 +9,7 @@ namespace GAS.Editor public class PassiveGameplayEffectTrack : TrackBase { private PassiveGameplayEffectTrackData _PassiveGameplayEffectTrackData; - private TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public override Type TrackDataType => typeof(PassiveGameplayEffectTrackData); protected override Color TrackColor => new(0.9f, 0.6f, 0.6f, 0.2f); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/ReleaseGameplayEffectTrack/ReleaseGameplayEffectTrack.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/ReleaseGameplayEffectTrack/ReleaseGameplayEffectTrack.cs index 958be07a..cca029d1 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/ReleaseGameplayEffectTrack/ReleaseGameplayEffectTrack.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/ReleaseGameplayEffectTrack/ReleaseGameplayEffectTrack.cs @@ -9,7 +9,7 @@ namespace GAS.Editor public class ReleaseGameplayEffectTrack : TrackBase { - private static TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + private static TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; public ReleaseGameplayEffectTrackData ReleaseGameplayEffectTrackData { get { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/TrackMarkBase.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/TrackMarkBase.cs index c388b594..fece3dd1 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/TrackMarkBase.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/TrackMarkBase.cs @@ -8,7 +8,7 @@ namespace GAS.Editor using UnityEngine.UIElements; public abstract class TrackMarkBase:TrackItemBase { - protected static TimelineAbilityAssetBase AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; + protected static TimelineAbilityAsset AbilityAsset => AbilityTimelineEditorWindow.Instance.AbilityAsset; private static string MarkAssetGuid => "5a3b3360bcba29b4cac2875f518af19d"; public float FrameUnitWidth { get;protected set; } public int StartFrameIndex=>markData.startFrame; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/AbstractAbility.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/AbstractAbility.cs index 67d3578f..d720fe89 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/AbstractAbility.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/AbstractAbility.cs @@ -6,7 +6,7 @@ namespace GAS.Runtime public abstract class AbstractAbility { public readonly string Name; - public readonly AbilityAsset DataReference; + public readonly IAbilityAsset DataReference; // TODO : AbilityTask // public List OngoingAbilityTasks=new List(); @@ -20,7 +20,7 @@ namespace GAS.Runtime public GameplayEffect Cost { get; protected set; } - public AbstractAbility(AbilityAsset abilityAsset) + public AbstractAbility(IAbilityAsset abilityAsset) { DataReference = abilityAsset; @@ -64,13 +64,4 @@ namespace GAS.Runtime #endif } } - - public abstract class AbstractAbility : AbstractAbility where T : AbilityAsset - { - public T AbilityAsset => DataReference as T; - - protected AbstractAbility(T abilityAsset) : base(abilityAsset) - { - } - } } \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/TimelineAbility/TimelineAbility.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/TimelineAbility/TimelineAbility.cs index 73814997..2fa0a2f6 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/TimelineAbility/TimelineAbility.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/TimelineAbility/TimelineAbility.cs @@ -3,16 +3,21 @@ using UnityEngine.Profiling; namespace GAS.Runtime { - public abstract class TimelineAbilityT : AbstractAbility where T : TimelineAbilityAssetBase + public class TimelineAbility : AbstractAbility { - protected TimelineAbilityT(T abilityAsset) : base(abilityAsset) + public TimelineAbility(IAbilityAsset abilityAsset) : base(abilityAsset) { } + + public override AbilitySpec CreateSpec(AbilitySystemComponent owner) + { + return new TimelineAbilitySpec(this, owner); + } } - public abstract class TimelineAbilitySpecT : AbilitySpec where AbilityT : TimelineAbilityT where AssetT : TimelineAbilityAssetBase + public class TimelineAbilitySpec : AbilitySpec { - protected TimelineAbilityPlayer _player; + private TimelineAbilityPlayer _player; public int FrameCount => _player.FrameCount; public int FrameRate => _player.FrameRate; @@ -27,7 +32,7 @@ namespace GAS.Runtime /// public AbilitySystemComponent Target { get; private set; } - protected TimelineAbilitySpecT(AbilityT ability, AbilitySystemComponent owner) : base(ability, owner) + public TimelineAbilitySpec(TimelineAbility ability, AbilitySystemComponent owner) : base(ability, owner) { _player = new(this); } @@ -42,9 +47,9 @@ namespace GAS.Runtime _player.Play(); } - public virtual LFloat GetPlaySpeed() + public LFloat GetPlaySpeed() { - return Data.AbilityAsset.Speed; + return _player.AbilityAsset.Speed; } public override void CancelAbility() @@ -64,29 +69,5 @@ namespace GAS.Runtime Profiler.EndSample(); } } - - /// - /// 这是一个最朴素的TimelineAbility实现, 如果要实现更复杂的TimelineAbility, 请用TimelineAbilityT和TimelineAbilitySpecT为基类 - /// - public sealed class TimelineAbility : TimelineAbilityT - { - public TimelineAbility(TimelineAbilityAsset abilityAsset) : base(abilityAsset) - { - } - - public override AbilitySpec CreateSpec(AbilitySystemComponent owner) - { - return new TimelineAbilitySpec(this, owner); - } - } - - /// - /// 这是一个最朴素的TimelineAbilitySpec实现, 如果要实现更复杂的TimelineAbility, 请用TimelineAbilityT和TimelineAbilitySpecT为基类 - /// - public sealed class TimelineAbilitySpec : TimelineAbilitySpecT, TimelineAbilityAsset> - { - public TimelineAbilitySpec(TimelineAbilityT ability, AbilitySystemComponent owner) : base(ability, owner) - { - } - } + } \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityAsset.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityAsset.cs index 4b620fa7..f6df005c 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityAsset.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityAsset.cs @@ -10,8 +10,9 @@ using UnityEngine.Serialization; namespace GAS.Runtime { - public abstract class TimelineAbilityAssetBase : AbilityAsset + public abstract class TimelineAbilityAsset : AbilityAsset { + [TitleGroup("Data")] [HorizontalGroup("Data/H1", 1 / 3f)] [TabGroup("Data/H1/V1", "Timeline", SdfIconType.ClockHistory, TextColor = "#00FF00")] @@ -32,6 +33,28 @@ namespace GAS.Runtime $"调用\"GAS.Editor.AbilityTimelineEditorWindow\"类的静态方法ShowWindow(TimelineAbilityAsset asset)失败, 代码可能被重构了: {e}"); } } + + + public LFloat Speed => speed; + public bool ManualEndAbility => manualEndAbility; + + public int FrameCount => frameCount;// 能力结束时间 + + public List DurationalCues => durationalCues; + + public List InstantCues => instantCues; + + public List ReleaseGameplayEffect => releaseGameplayEffect; + + public List BuffGameplayEffects => buffGameplayEffects; + + public List InstantTasks => instantTasks; + + public List OngoingTasks => ongoingTasks; + + public List PassiveGameplayEffects => passiveGameplayEffects; + + public List PassiveTasks => passiveTasks; /// /// 播放速率, 常用于加速或减速播放(例如基于攻击速度的技能, 播放速率随攻击速度变化) @@ -40,40 +63,40 @@ namespace GAS.Runtime [LabelText(GASTextDefine.ABILITY_PLAY_RATE)] [LabelWidth(100)] [MinValue(0)] - public LFloat Speed = 1; + public LFloat speed = 1; [TabGroup("Data/H1/V1", "Timeline")] [LabelText(GASTextDefine.ABILITY_MANUAL_ENDABILITY)] [LabelWidth(100)] [FormerlySerializedAs("manualEndAbility")] - public bool ManualEndAbility; + public bool manualEndAbility; [HideInInspector] - public int FrameCount; // 能力结束时间 + public int frameCount; // 能力结束时间 [HideInInspector] - public List DurationalCues = new List(); + public List durationalCues = new List(); [HideInInspector] - public List InstantCues = new List(); + public List instantCues = new List(); [HideInInspector] - public List ReleaseGameplayEffect = new List(); + public List releaseGameplayEffect = new List(); [HideInInspector] - public List BuffGameplayEffects = new List(); + public List buffGameplayEffects = new List(); [HideInInspector] - public List InstantTasks = new List(); + public List instantTasks = new List(); [HideInInspector] - public List OngoingTasks = new List(); + public List ongoingTasks = new List(); [HideInInspector] - public List PassiveGameplayEffects = new List(); + public List passiveGameplayEffects = new List(); [HideInInspector] - public List PassiveTasks = new List(); + public List passiveTasks = new List(); #if UNITY_EDITOR public void Save() @@ -83,19 +106,5 @@ namespace GAS.Runtime } #endif } - - public abstract class TimelineAbilityAssetT : TimelineAbilityAssetBase where T : class - { - public sealed override Type AbilityType() - { - return typeof(T); - } - } - - /// - /// 这是一个最朴素的TimelineAbilityAsset实现, 如果要实现更复杂的TimelineAbilityAsset, 请用TimelineAbilityAssetBase或TimelineAbilityAssetT为基类 - /// - public sealed class TimelineAbilityAsset : TimelineAbilityAssetT - { - } + } \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityPlayer.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityPlayer.cs index dfebce58..0dc8c953 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityPlayer.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TimelineAbilityPlayer.cs @@ -36,9 +36,9 @@ namespace GAS.Runtime public InstantAbilityTask task; } - public class TimelineAbilityPlayer where AssetT : TimelineAbilityAssetBase where AbilityT : TimelineAbilityT + public class TimelineAbilityPlayer { - private readonly TimelineAbilitySpecT _abilitySpec; + private readonly TimelineAbilitySpec _abilitySpec; private readonly List _cacheBuffGameplayEffectTrack = new(); private readonly List _cacheDurationalCueTrack = new(); @@ -57,7 +57,7 @@ namespace GAS.Runtime private int _currentFrame; private LFloat _playTotalTime; - public TimelineAbilityPlayer(TimelineAbilitySpecT abilitySpec) + public TimelineAbilityPlayer(TimelineAbilitySpec abilitySpec) { _abilitySpec = abilitySpec; Cache(); @@ -65,7 +65,7 @@ namespace GAS.Runtime public bool IsPlaying { get; private set; } - public AssetT AbilityAsset => _abilitySpec.Data.AbilityAsset; + public TimelineAbilityAsset AbilityAsset => _abilitySpec.Ability.DataReference as TimelineAbilityAsset; public int FrameCount => AbilityAsset.FrameCount; public int FrameRate => JexGasManager.FrameRate; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/BuffGameplayEffectTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/BuffGameplayEffectTrackData.cs index 10be6ec1..e2b6bd37 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/BuffGameplayEffectTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/BuffGameplayEffectTrackData.cs @@ -10,7 +10,7 @@ namespace GAS.Runtime { public List clipEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.BuffGameplayEffects.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/DurationalCueTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/DurationalCueTrackData.cs index 8d2c3968..0bb122b8 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/DurationalCueTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/DurationalCueTrackData.cs @@ -9,7 +9,7 @@ namespace GAS.Runtime { public List clipEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.DurationalCues.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/InstantCueTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/InstantCueTrackData.cs index d21af0dc..b049b62c 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/InstantCueTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/InstantCueTrackData.cs @@ -8,7 +8,7 @@ namespace GAS.Runtime { public List markEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.InstantCues.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveGameplayEffectTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveGameplayEffectTrackData.cs index 34ea3bc3..9fed0a81 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveGameplayEffectTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveGameplayEffectTrackData.cs @@ -9,7 +9,7 @@ namespace GAS.Runtime { public List clipEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.PassiveGameplayEffects.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveTaskClipEventTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveTaskClipEventTrackData.cs index 00850e33..50dbed84 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveTaskClipEventTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/PassiveTaskClipEventTrackData.cs @@ -8,7 +8,7 @@ namespace GAS.Runtime { public List clipEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.PassiveTasks.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/ReleaseGameplayEffectTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/ReleaseGameplayEffectTrackData.cs index 716ee6c7..7560dbfc 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/ReleaseGameplayEffectTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/ReleaseGameplayEffectTrackData.cs @@ -10,7 +10,7 @@ namespace GAS.Runtime { public List markEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.ReleaseGameplayEffect.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskClipEventTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskClipEventTrackData.cs index 4da5c1a6..5d0aaea6 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskClipEventTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskClipEventTrackData.cs @@ -10,7 +10,7 @@ namespace GAS.Runtime { public List clipEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.OngoingTasks.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskMarkEventTrackData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskMarkEventTrackData.cs index 2f99dbed..bef4eff0 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskMarkEventTrackData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TaskMarkEventTrackData.cs @@ -9,7 +9,7 @@ namespace GAS.Runtime { public List markEvents = new List(); - public override void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public override void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { base.AddToAbilityAsset(abilityAsset); abilityAsset.InstantTasks.Add(this); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TrackDataBase.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TrackDataBase.cs index a8006980..13b4abd3 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TrackDataBase.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/ScriptableAsset/Ability/TimelineAbility/TrackItem/TrackDataBase.cs @@ -7,7 +7,7 @@ namespace GAS.Runtime { public string trackName; - public virtual void AddToAbilityAsset(TimelineAbilityAssetBase abilityAsset) + public virtual void AddToAbilityAsset(TimelineAbilityAsset abilityAsset) { } diff --git a/JNFrame2/JNGame.Runtime.csproj b/JNFrame2/JNGame.Runtime.csproj index 647d6d8a..ae0a91a2 100644 --- a/JNFrame2/JNGame.Runtime.csproj +++ b/JNFrame2/JNGame.Runtime.csproj @@ -74,48 +74,14 @@ - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - @@ -133,6 +99,7 @@ + @@ -148,20 +115,25 @@ + + + + + @@ -175,6 +147,7 @@ + @@ -208,6 +181,7 @@ + @@ -217,25 +191,33 @@ + + + + + + + + @@ -247,6 +229,7 @@ + @@ -280,23 +263,32 @@ + + + + + + + + + @@ -305,7 +297,9 @@ + + @@ -313,11 +307,13 @@ + + @@ -326,11 +322,13 @@ + + @@ -344,6 +342,8 @@ + + @@ -1138,9 +1138,6 @@ JNGame.Root - - -