Test_Project_Cocos/JisolGame
1
0
Fork 0
mirror of https://gitee.com/jisol/jisol-game/ synced 2025-09-26 18:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

提交GAS

Browse Source
This commit is contained in:
PC-20230316NUNE\Administrator
2024-10-23 20:13:31 +08:00
parent 1953e7c25f
commit 9303606b31
28 changed files with 4203 additions and 3300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/Track/AbilityTaskClipTrack/TaskClip.cs
View File

@@ -61,7 +61,7 @@ namespace GAS.Editor
{
if (frameIndex < startFrame || frameIndex > endFrame) return;
var ongoingAbilityTask = TaskClipData.Load();
ongoingAbilityTask.OnEditorPreview( frameIndex, startFrame, endFrame);
ongoingAbilityTask.OnEditorPreview( AbilityTimelineEditorWindow.Instance.PreviewObject,frameIndex, startFrame, endFrame);
}
public override UnityEngine.Object DataInspector => TaskClipEditor.Create(this);

6
JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/PureGenUtils/PureGASEditorTools.cs
View File

@@ -174,14 +174,16 @@ namespace GAS.Editor
var assembly = assemblies[i];
if (assembly == null) { continue; }
var assName = assembly.GetName().Name;
if (!"GAS.UnityExt.Runtime".Equals(assName)) { continue; }
if ("JNGame.Runtime".Equals(assName)) { continue; }
if ("JNGame.Root".Equals(assName)) { continue; }
if ("JNGame.Editor".Equals(assName)) { continue; }
// 筛选非抽象的ModifierMagnitudeCalculation派生类
var lst = assembly.GetTypes().Where(
clsType => !clsType.IsAbstract && clsType.IsSubclassOf(typeof(ModifierMagnitudeCalculation)) && outFilter.IndexOf(clsType.Name) < 0
);
subTypeFromScriptableMMC.AddRange(lst);
}
var dir = "Assets/GameScript/HotFix/GAS.UnityExt/Runtime/CodeGen";// gasSetting.LogicCodeGeneratePath;
var dir = gasSetting.LogicCodeGeneratePath;// gasSetting.LogicCodeGeneratePath;
CodeGenScriptableMMCInjecter.GenCode(new CodeGenInfo()
{
codeGenNameSpace = "JNGame.GAS",

4
JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/TimelineAbility/AbilityTask/OngoingAbilityTask.cs
View File

@@ -1,5 +1,6 @@

using JNGame.Serialization;
using UnityEngine;
namespace GAS.Runtime
{
@@ -13,10 +14,11 @@ namespace GAS.Runtime
/// 编辑器预览用
/// 【注意】 覆写时，记得用UNITY_EDITOR宏包裹，这是预览表现用的函数，不该被编译。
/// </summary>
/// <param name="preview"></param>
/// <param name="frame"></param>
/// <param name="startFrame"></param>
/// <param name="endFrame"></param>
public virtual void OnEditorPreview(int frame, int startFrame, int endFrame)
public virtual void OnEditorPreview(GameObject preview,int frame, int startFrame, int endFrame)
{
}
#endif

2
JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JexGasManager.cs
View File

@@ -18,7 +18,7 @@ namespace JNGame.Runtime.GAS.Runtime
#endif
//---------------- 全局信息 ------------------------------------------------------------------------------------------
private static int _TimeLineAbilityTickTime = 20;
private static int _TimeLineAbilityTickTime = 100;
public static int TimeLineAbilityTickTime => _TimeLineAbilityTickTime;
public static int FrameRateValue => 1000 / _TimeLineAbilityTickTime;