diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorConfig.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorConfig.cs
index 744ffa7f..026e84c7 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorConfig.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/Ability/AbilityTimelineEditor/EditorWindow/AbilityTimelineEditorConfig.cs
@@ -1,3 +1,5 @@
+using JNGame.Runtime.GAS.Runtime;
+
#if UNITY_EDITOR
namespace GAS.Editor
{
@@ -9,8 +11,8 @@ namespace GAS.Editor
public const int StandardFrameUnitWidth = 1;
public const int MaxFrameUnitLevel = 20;
public const float MinTimerShaftFrameDrawStep = 5;
- public int TickTime => GASTimer.TimeLineAbilityTickTime;
- public int FrameRate => GASTimer.FrameRateValue;
+ public int TickTime => JexGasManager.TimeLineAbilityTickTime;
+ public int FrameRate => JexGasManager.FrameRateValue;
}
}
#endif
\ No newline at end of file
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/AttributeSet/AttributeSetClassGen.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/AttributeSet/AttributeSetClassGen.cs
index 4a346c7a..93231508 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/AttributeSet/AttributeSetClassGen.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/GAS/AttributeSet/AttributeSetClassGen.cs
@@ -261,11 +261,11 @@ namespace GAS.Editor
writer.WriteLine("");
- writer.WriteLine(
- "public static void RecycleSetInstance(object obj)");
- writer.WriteLine("{");
- writer.WriteLine(" ObjectPool.Instance.Recycle(obj);");
- writer.WriteLine("}");
+ // writer.WriteLine(
+ // "public static void RecycleSetInstance(object obj)");
+ // writer.WriteLine("{");
+ // writer.WriteLine(" ObjectPool.Instance.Recycle(obj);");
+ // writer.WriteLine("}");
writer.WriteLine("");
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/GASTimer.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/GASTimer.cs
index 19177330..2ddcdb37 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/GASTimer.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/GASTimer.cs
@@ -37,14 +37,5 @@
// private static int _frameRate = 60;
// public static int FrameRate => _frameRate;
-
- ///
- ///
- ///
- private static int _TimeLineAbilityTickTime = 20;
-
- public static int TimeLineAbilityTickTime => _TimeLineAbilityTickTime;
-
- public static int FrameRateValue => 1000 / _TimeLineAbilityTickTime;
}
}
\ No newline at end of file
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/ObjectPool.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/JexGasObjectPool.cs
similarity index 91%
rename from JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/ObjectPool.cs
rename to JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/JexGasObjectPool.cs
index 79542ca0..100afb64 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/ObjectPool.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/JexGasObjectPool.cs
@@ -12,26 +12,13 @@ namespace GAS.General
bool IsFromPool { get; set; }
}
- public class ObjectPool
+ public class JexGasObjectPool
{
- private static ObjectPool _singleton;
- public static ObjectPool Instance => _singleton ??= new ObjectPool();
-
+
private readonly ConcurrentDictionary _objPool = new();
private readonly Func _addPoolFunc = type => new Pool(type, 1024);
- public static void Init()
- {
- _singleton = null;
- _singleton = new ObjectPool();
- }
-
- public static void Destroy()
- {
- _singleton = null;
- }
-
public T Fetch() where T : class
{
var type = typeof(T);
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/ObjectPool.cs.meta b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/JexGasObjectPool.cs.meta
similarity index 100%
rename from JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/ObjectPool.cs.meta
rename to JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/General/Util/Pool/JexGasObjectPool.cs.meta
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/Timeline/TimelinePlayer.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/Timeline/TimelinePlayer.cs
index a35dbcc0..731c8941 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/Timeline/TimelinePlayer.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Ability/Timeline/TimelinePlayer.cs
@@ -1,6 +1,7 @@
using System.Collections.Generic;
using GAS.General;
+using JNGame.Runtime.GAS.Runtime;
using UnityEngine;
namespace GAS.Runtime
@@ -68,7 +69,7 @@ namespace GAS.Runtime
}
WorkingContext.TotalRunTime += deltaTime;
- var targetFrame = WorkingContext.TotalRunTime / GASTimer.TimeLineAbilityTickTime;
+ var targetFrame = WorkingContext.TotalRunTime / JexGasManager.TimeLineAbilityTickTime;
while (WorkingContext.CurrentFrame < targetFrame)
{
++WorkingContext.CurrentFrame;
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Attribute/AttributeAggregator.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Attribute/AttributeAggregator.cs
index a774ded6..ee0face9 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Attribute/AttributeAggregator.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Attribute/AttributeAggregator.cs
@@ -82,7 +82,7 @@ namespace GAS.Runtime
var modifier = geSpec.Modifiers[i];
if (modifier.attributeName == _processedAttribute.Name)
{
- var modifierSpec = ObjectPool.Instance.Fetch();
+ var modifierSpec = _owner.GetManager().ObjectPool.Fetch();
modifierSpec.Init(geSpec, modifier, i);
_modifierCache.Add(modifierSpec);
TryRegisterAttributeChangedListen(geSpec, modifier);
@@ -120,7 +120,7 @@ namespace GAS.Runtime
foreach (var modifierSpec in _cached)
{
modifierSpec.Release();
- ObjectPool.Instance.Recycle(modifierSpec);
+ _owner.GetManager().ObjectPool.Recycle(modifierSpec);
}
_cached.Clear();
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/ASCExtension.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/ASCExtension.cs
index 8eec7ee3..f49bada9 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/ASCExtension.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/ASCExtension.cs
@@ -61,13 +61,6 @@ namespace GAS.Runtime
public static void TickEventAttackAfterRecord(this AbilitySystemComponent asc, AbilitySystemComponent source, AbilitySystemComponent receive, GameplayTag damageType,
DamageOther other, LFloat atkValue,int skillId)
{
-#if UNITY_EDITOR
- asc.DamageList.Enqueue((receive, atkValue, damageType, other, 0, 0, false, 0, skillId,(long)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds));
- if (asc.DamageList.Count > 10)
- {
- asc.DamageList.Dequeue();
- }
-#endif
// asc.TickEventContainer.TickEventAttackAfter(source, receive, damageType, other, atkValue);
}
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/AbilitySystemComponent.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/AbilitySystemComponent.cs
index b4be3eb6..0ce9f987 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/AbilitySystemComponent.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/AbilitySystemComponent.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using GAS.General;
using JNGame.Math;
using JNGame.GAS;
+using JNGame.Runtime.GAS.Runtime;
using UnityEngine;
namespace GAS.Runtime
@@ -34,14 +35,6 @@ namespace GAS.Runtime
///
public IGASResourceService GASResService { get; protected set; }
-#if UNITY_EDITOR
- public Queue<(AbilitySystemComponent asc, int atkValue, GameplayTag damageType, DamageOther other, int missRate, int criRate, bool isDouble, int doubleRate,int skillId, long time)> DamageList
- {
- get;
- private set;
- } = new();
-#endif
-
private bool _ready;
///
@@ -49,12 +42,12 @@ namespace GAS.Runtime
///
public LFloat BoundRadius { get; protected set; } = LFloat.One;
- protected void OnAwake()
+ public void OnAwake()
{
Prepare();
enabled = true;
#if UNITY_EDITOR
- GameplayAbilitySystem.GAS.Register(this);
+ JexGasManager.Editor.Register(this);
#endif
}
@@ -72,9 +65,6 @@ namespace GAS.Runtime
AttributeSetContainer.Awake(this);
GameplayTagAggregator.Awake(this);
TickEventContainer.Awake(this);
-#if UNITY_EDITOR
- DamageList.Clear();
-#endif
}
public void SetPreset(IAbilitySystemComponentPreset ascPreset)
@@ -364,12 +354,20 @@ namespace GAS.Runtime
///
public abstract void OnAbilityEnd(AbilitySpec abilitySpec);
+ public JexGasManager Manager;
+ public JexGasManager GetManager()
+ {
+#if UNITY_EDITOR
+ return JexGasManager.Editor;
+#else
+ return Manager;
+#endif
+ }
public virtual void Release()
{
#if UNITY_EDITOR
- GameplayAbilitySystem.GAS.Unregister(this);
- DamageList.Clear();
+ JexGasManager.Editor.Unregister(this);
#endif
enabled = default;
preset = default;
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/IAbilitySystemComponent.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/IAbilitySystemComponent.cs
index 514c3d93..687dda45 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/IAbilitySystemComponent.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Component/IAbilitySystemComponent.cs
@@ -1,4 +1,5 @@
using System;
+using JNGame.Runtime.GAS.Runtime;
namespace GAS.Runtime
{
@@ -29,5 +30,11 @@ namespace GAS.Runtime
bool TryActivateAbility(string abilityName, params object[] args);
void TryEndAbility(string abilityName);
T AttrSet() where T : AttributeSet;
+
+ ///
+ /// 获取管理器
+ ///
+ ///
+ JexGasManager GetManager();
}
}
\ No newline at end of file
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffect.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffect.cs
index 65019754..aff33c26 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffect.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffect.cs
@@ -91,7 +91,7 @@ namespace GAS.Runtime
public GameplayEffectSpec CreateSpec(int skillID, AbilitySystemComponent creator, AbilitySystemComponent owner,
int level = 1)
{
- var spec = GameplayEffectSpec.GetItem();
+ var spec = owner.GetManager().ObjectPool.Fetch();
spec.Init(this, creator, owner, skillID, level);
return spec;
}
@@ -99,7 +99,7 @@ namespace GAS.Runtime
public GameplayEffectSpec CreateSpec(int skillID, GameplayEffectSpec sourceSpec, AbilitySystemComponent creator,
AbilitySystemComponent owner, int level = 1)
{
- var spec = GameplayEffectSpec.GetItem();
+ var spec = owner.GetManager().ObjectPool.Fetch();
spec.Init(this, creator, owner, skillID, level);
spec.SetSourceGESpec(sourceSpec);
return spec;
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectContainer.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectContainer.cs
index 3d4b6b36..4bab98c0 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectContainer.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectContainer.cs
@@ -19,7 +19,7 @@ namespace GAS.Runtime
public List FetchGameplayEffects()
{
- var list = ObjectPool.Instance.Fetch>();
+ var list = _owner.GetManager().ObjectPool.Fetch>();
list.AddRange(_gameplayEffectSpecs);
return list;
}
@@ -27,7 +27,7 @@ namespace GAS.Runtime
public void ReturnGameplayEffects(List list)
{
list.Clear();
- ObjectPool.Instance.Recycle(list);
+ _owner.GetManager().ObjectPool.Recycle(list);
}
public void Tick(int deltaTime)
@@ -50,7 +50,7 @@ namespace GAS.Runtime
foreach (var spec in _recycleTask)
{
spec.Release();
- GameplayEffectSpec.RecycleItem(spec);
+ _owner.GetManager().ObjectPool.Recycle(spec);
}
_recycleTask.Clear();
@@ -61,7 +61,7 @@ namespace GAS.Runtime
{
if (tags.Empty) return;
- var removeList = ObjectPool.Instance.Fetch>();
+ var removeList = _owner.GetManager().ObjectPool.Fetch>();
foreach (var gameplayEffectSpec in _gameplayEffectSpecs)
{
@@ -85,7 +85,7 @@ namespace GAS.Runtime
}
removeList.Clear();
- ObjectPool.Instance.Recycle(removeList);
+ _owner.GetManager().ObjectPool.Recycle(removeList);
}
///
@@ -334,7 +334,7 @@ namespace GAS.Runtime
foreach (var spec in _recycleTask)
{
spec.Release();
- GameplayEffectSpec.RecycleItem(spec);
+ _owner.GetManager().ObjectPool.Recycle(spec);
}
_recycleTask.Clear();
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectSpec.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectSpec.cs
index 9ad48676..6416e752 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectSpec.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Effects/GameplayEffectSpec.cs
@@ -15,17 +15,6 @@ namespace GAS.Runtime
SelfNumber = GameplayEffectSpec.Count;
}
- public static GameplayEffectSpec GetItem()
- {
- var item = ObjectPool.Instance.Fetch();
- return item;
- }
-
- public static void RecycleItem(GameplayEffectSpec obj)
- {
- ObjectPool.Instance.Recycle(obj);
- }
-
///
/// The execution type of onImmunity is one shot.
///
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JNGasManager.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JNGasManager.cs
deleted file mode 100644
index f32b2869..00000000
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JNGasManager.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace JNGame.Runtime.GAS.Runtime
-{
- ///
- /// GAS 管理器
- ///
- public class JNGasManager
- {
-
- }
-}
\ No newline at end of file
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JexGasManager.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JexGasManager.cs
new file mode 100644
index 00000000..7c12aa8d
--- /dev/null
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JexGasManager.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using GAS.General;
+using GAS.Runtime;
+using JNGame.Runtime.Util;
+
+namespace JNGame.Runtime.GAS.Runtime
+{
+ ///
+ /// GAS 管理器
+ ///
+ public class JexGasManager
+ {
+
+
+#if UNITY_EDITOR
+ //编辑器专用的单例 用于预览GAS
+ public static JexGasManager Editor = new JexGasManager();
+#endif
+
+ //---------------- 全局信息 ------------------------------------------------------------------------------------------
+ private static int _TimeLineAbilityTickTime = 20;
+ public static int TimeLineAbilityTickTime => _TimeLineAbilityTickTime;
+ public static int FrameRateValue => 1000 / _TimeLineAbilityTickTime;
+
+ ///
+ /// GAS 专用对象池 (只限制当前管理器)
+ ///
+ public JexGasObjectPool ObjectPool { get; private set; }
+
+ public List AbilitySystemComponents = new();
+
+ public JexGasManager()
+ {
+ ObjectPool = new JexGasObjectPool();
+#if UNITY_EDITOR
+ Editor = this;
+#endif
+ }
+
+ ///
+ /// 委托 AbilitySystemComponent
+ ///
+ public void Register(AbilitySystemComponent abilitySystemComponent)
+ {
+ if (AbilitySystemComponents.Contains(abilitySystemComponent)) return;
+ AbilitySystemComponents.Add(abilitySystemComponent);
+ abilitySystemComponent.OnAwake();
+ }
+
+ ///
+ /// 取消委托 AbilitySystemComponent
+ ///
+ public bool Unregister(AbilitySystemComponent abilitySystemComponent)
+ {
+ abilitySystemComponent.Release();
+ return AbilitySystemComponents.Remove(abilitySystemComponent);
+ }
+
+ //GAS 更新
+ public void Update(int dt)
+ {
+
+ Profiler.BeginSample($"{nameof(JexGasManager)}::Tick()");
+
+ var abilitySystemComponents = ObjectPool.Fetch>();
+ abilitySystemComponents.AddRange(AbilitySystemComponents);
+
+ foreach (var abilitySystemComponent in abilitySystemComponents)
+ {
+ abilitySystemComponent.Tick(dt);
+ }
+
+ abilitySystemComponents.Clear();
+ ObjectPool.Recycle(abilitySystemComponents);
+
+ Profiler.EndSample();
+
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JNGasManager.cs.meta b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JexGasManager.cs.meta
similarity index 100%
rename from JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JNGasManager.cs.meta
rename to JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/JexGasManager.cs.meta
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Tags/GameplayTagAggregator.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Tags/GameplayTagAggregator.cs
index 0335db18..5762243b 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Tags/GameplayTagAggregator.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/Runtime/Tags/GameplayTagAggregator.cs
@@ -141,7 +141,7 @@ namespace GAS.Runtime
}
else
{
- var list = ObjectPool.Instance.Fetch>();
+ var list = _owner.GetManager().ObjectPool.Fetch>();
list.Add(source);
_dynamicAddedTags.Add(tag, list);
}
@@ -156,7 +156,7 @@ namespace GAS.Runtime
if (_dynamicAddedTags.TryGetValue(tag, out var addedTag))
{
addedTag.Clear();
- ObjectPool.Instance.Recycle(addedTag);
+ _owner.GetManager().ObjectPool.Recycle(addedTag);
dirty = _dynamicAddedTags.Remove(tag);
}
@@ -168,7 +168,7 @@ namespace GAS.Runtime
}
else
{
- var list = ObjectPool.Instance.Fetch>();
+ var list = _owner.GetManager().ObjectPool.Fetch>();
list.Add(source);
_dynamicRemovedTags.Add(tag, list);
}
@@ -190,7 +190,7 @@ namespace GAS.Runtime
dirty = tagList.Count == 0;
if (dirty)
{
- ObjectPool.Instance.Recycle(tagList);
+ _owner.GetManager().ObjectPool.Recycle(tagList);
dynamicTag.Remove(tag);
}
}
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/UnityExt/ScriptableAsset/TimelineAbilityPlayer.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/UnityExt/ScriptableAsset/TimelineAbilityPlayer.cs
index d99199d3..43821ae4 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/UnityExt/ScriptableAsset/TimelineAbilityPlayer.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/GAS/UnityExt/ScriptableAsset/TimelineAbilityPlayer.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using GAS.General;
+using JNGame.Runtime.GAS.Runtime;
namespace GAS.Runtime
{
@@ -308,7 +309,7 @@ namespace GAS.Runtime
return;
}
_playTotalTime += deltaTime;
- var targetFrame = (int)(_playTotalTime / GASTimer.TimeLineAbilityTickTime);
+ var targetFrame = (int)(_playTotalTime / JexGasManager.TimeLineAbilityTickTime);
// 追帧
while (_currentFrame < targetFrame)
diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNGASSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNGASSystem.cs
index 7c727fec..f96eb252 100644
--- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNGASSystem.cs
+++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNGASSystem.cs
@@ -1,4 +1,5 @@
using GAS.Runtime;
+using JNGame.Runtime.GAS.Runtime;
using JNGame.Sync.System;
using UnityEngine;
@@ -9,27 +10,26 @@ namespace JNGame.Runtime.Sync.System.Logic
///
public class JNGASSystem : SLogicSystem
{
- //
- // ///
- // /// GAS 管理器
- // ///
- // private JexGasManager _gas = new();
- // public JexGasManager GAS => _gas;
+
+ ///
+ /// GAS 管理器
+ ///
+ private JexGasManager _gas = new();
+ public JexGasManager GAS => _gas;
public override void OnSyncUpdate(int dt)
{
- // GAS.Update(dt);
+ GAS.Update(dt);
}
public void Register(AbilitySystemComponent abilitySystemComponent)
{
- // GAS.Register(abilitySystemComponent);
+ GAS.Register(abilitySystemComponent);
}
public bool Unregister(AbilitySystemComponent abilitySystemComponent)
{
- // return GAS.Unregister(abilitySystemComponent);
- return false;
+ return GAS.Unregister(abilitySystemComponent);
}
diff --git a/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Components/JNGASComponent.cs b/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Components/JNGASComponent.cs
index 832d405c..1d26ae66 100644
--- a/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Components/JNGASComponent.cs
+++ b/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Components/JNGASComponent.cs
@@ -27,11 +27,12 @@ namespace GASSamples.Scripts.Game.Entity.Nodes.Component.Components
GetSystem().Unregister(ASC);
}
- public void InitWithPreset(AbilitySystemComponentPreset ascPreset,int level)
+ public void InitWithPreset(IAbilitySystemComponentPreset ascPreset,int level)
{
- // ASC.SetPreset(ascPreset);
- // ASC.SetLevel(level);
- // ASC.InitWithPreset(ASC.Level,ASC.Preset);
+ ASC.SetPreset(ascPreset);
+ ASC.SetLevel(level);
+ if (ASC.Preset == null) return;
+ // ASC.Init(asc.PresetBaseTags(), asc.PresetAttributeSetTypes(), asc.Preset.LinkAbilities, entityId, level);
}
///
diff --git a/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Controller/JNGASBoxController.cs b/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Controller/JNGASBoxController.cs
index 0ce8c2bb..4f5ad5f5 100644
--- a/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Controller/JNGASBoxController.cs
+++ b/JNFrame2/Assets/Scripts/GASSamples/Scripts/Game/Logic/Entity/Nodes/Component/Controller/JNGASBoxController.cs
@@ -17,7 +17,7 @@ namespace GASSamples.Scripts.Game.Entity.Nodes.Component.Controller
base.OnSyncStart();
//设置GAS 角色
- GAS.InitWithPreset(GetSystem().Preset,1);
+ // GAS.InitWithPreset(GetSystem().Preset,1);
//附加效果测试
// GAS.ApplyGameplayEffectToSelf(new GameplayEffect(GetSystem().GE_JisolDemo1));
diff --git a/JNFrame2/Assets/Scripts/GASSamples/Scripts/Gen/GAttrSetLib.gen.cs b/JNFrame2/Assets/Scripts/GASSamples/Scripts/Gen/GAttrSetLib.gen.cs
index cf7b0085..d2e21fe7 100644
--- a/JNFrame2/Assets/Scripts/GASSamples/Scripts/Gen/GAttrSetLib.gen.cs
+++ b/JNFrame2/Assets/Scripts/GASSamples/Scripts/Gen/GAttrSetLib.gen.cs
@@ -79,11 +79,6 @@ namespace GAS.Runtime
{ typeof(AS_BaseAttribute), nameof(AS_BaseAttribute) },
};
- public static void RecycleSetInstance(object obj)
- {
- ObjectPool.Instance.Recycle(obj);
- }
-
public static List AttributeFullNames = new List()
{
"AS_BaseAttribute.HP",
diff --git a/JNFrame2/JNGame.Runtime.csproj b/JNFrame2/JNGame.Runtime.csproj
index d97ff43c..0dd60cb4 100644
--- a/JNFrame2/JNGame.Runtime.csproj
+++ b/JNFrame2/JNGame.Runtime.csproj
@@ -74,7 +74,6 @@
-
@@ -110,6 +109,7 @@
+
@@ -119,7 +119,6 @@
-
@@ -183,6 +182,7 @@
+
diff --git a/JNFrame2/Logs/AssetImportWorker0.log b/JNFrame2/Logs/AssetImportWorker0.log
new file mode 100644
index 00000000..f30cd63c
--- /dev/null
+++ b/JNFrame2/Logs/AssetImportWorker0.log
@@ -0,0 +1,274 @@
+Using pre-set license
+Built from '2022.3/staging' branch; Version is '2022.3.1f1 (f18e0c1b5784) revision 15830540'; Using compiler version '192829333'; Build Type 'Release'
+OS: 'Windows 11 (10.0.22631) 64bit Professional' Language: 'zh' Physical Memory: 32651 MB
+BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 1
+
+COMMAND LINE ARGUMENTS:
+D:\Unity\2022.3.1f1\Editor\Unity.exe
+-adb2
+-batchMode
+-noUpm
+-name
+AssetImportWorker0
+-projectPath
+D:/myproject/JisolGame/JNFrame2
+-logFile
+Logs/AssetImportWorker0.log
+-srvPort
+52918
+Successfully changed project path to: D:/myproject/JisolGame/JNFrame2
+D:/myproject/JisolGame/JNFrame2
+[UnityMemory] Configuration Parameters - Can be set up in boot.config
+ "memorysetup-bucket-allocator-granularity=16"
+ "memorysetup-bucket-allocator-bucket-count=8"
+ "memorysetup-bucket-allocator-block-size=33554432"
+ "memorysetup-bucket-allocator-block-count=8"
+ "memorysetup-main-allocator-block-size=16777216"
+ "memorysetup-thread-allocator-block-size=16777216"
+ "memorysetup-gfx-main-allocator-block-size=16777216"
+ "memorysetup-gfx-thread-allocator-block-size=16777216"
+ "memorysetup-cache-allocator-block-size=4194304"
+ "memorysetup-typetree-allocator-block-size=2097152"
+ "memorysetup-profiler-bucket-allocator-granularity=16"
+ "memorysetup-profiler-bucket-allocator-bucket-count=8"
+ "memorysetup-profiler-bucket-allocator-block-size=33554432"
+ "memorysetup-profiler-bucket-allocator-block-count=8"
+ "memorysetup-profiler-allocator-block-size=16777216"
+ "memorysetup-profiler-editor-allocator-block-size=1048576"
+ "memorysetup-temp-allocator-size-main=16777216"
+ "memorysetup-job-temp-allocator-block-size=2097152"
+ "memorysetup-job-temp-allocator-block-size-background=1048576"
+ "memorysetup-job-temp-allocator-reduction-small-platforms=262144"
+ "memorysetup-allocator-temp-initial-block-size-main=262144"
+ "memorysetup-allocator-temp-initial-block-size-worker=262144"
+ "memorysetup-temp-allocator-size-background-worker=32768"
+ "memorysetup-temp-allocator-size-job-worker=262144"
+ "memorysetup-temp-allocator-size-preload-manager=33554432"
+ "memorysetup-temp-allocator-size-nav-mesh-worker=65536"
+ "memorysetup-temp-allocator-size-audio-worker=65536"
+ "memorysetup-temp-allocator-size-cloud-worker=32768"
+ "memorysetup-temp-allocator-size-gi-baking-worker=262144"
+ "memorysetup-temp-allocator-size-gfx=262144"
+Player connection [5988] Host "[IP] 192.168.1.115 [Port] 0 [Flags] 2 [Guid] 10919385 [EditorId] 10919385 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined multi-casting on [225.0.0.222:54997]...
+
+Player connection [5988] Host "[IP] 192.168.1.115 [Port] 0 [Flags] 2 [Guid] 10919385 [EditorId] 10919385 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined alternative multi-casting on [225.0.0.222:34997]...
+
+Refreshing native plugins compatible for Editor in 188.21 ms, found 3 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Initialize engine version: 2022.3.1f1 (f18e0c1b5784)
+[Subsystems] Discovering subsystems at path D:/Unity/2022.3.1f1/Editor/Data/Resources/UnitySubsystems
+[Subsystems] Discovering subsystems at path D:/myproject/JisolGame/JNFrame2/Assets
+GfxDevice: creating device client; threaded=0; jobified=0
+Direct3D:
+ Version: Direct3D 11.0 [level 11.1]
+ Renderer: NVIDIA GeForce GTX 1660 SUPER (ID=0x21c4)
+ Vendor: NVIDIA
+ VRAM: 5966 MB
+ Driver: 32.0.15.6094
+Initialize mono
+Mono path[0] = 'D:/Unity/2022.3.1f1/Editor/Data/Managed'
+Mono path[1] = 'D:/Unity/2022.3.1f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit-win32'
+Mono config path = 'D:/Unity/2022.3.1f1/Editor/Data/MonoBleedingEdge/etc'
+Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56556
+Begin MonoManager ReloadAssembly
+Registering precompiled unity dll's ...
+Register platform support module: D:/Unity/2022.3.1f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
+Registered in 0.005469 seconds.
+- Loaded All Assemblies, in 0.558 seconds
+Native extension for WindowsStandalone target not found
+Mono: successfully reloaded assembly
+- Finished resetting the current domain, in 5.613 seconds
+Domain Reload Profiling: 6170ms
+ BeginReloadAssembly (116ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (0ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (1ms)
+ RebuildCommonClasses (36ms)
+ RebuildNativeTypeToScriptingClass (9ms)
+ initialDomainReloadingComplete (63ms)
+ LoadAllAssembliesAndSetupDomain (332ms)
+ LoadAssemblies (112ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ AnalyzeDomain (325ms)
+ TypeCache.Refresh (324ms)
+ TypeCache.ScanAssembly (300ms)
+ ScanForSourceGeneratedMonoScriptInfo (0ms)
+ ResolveRequiredComponents (1ms)
+ FinalizeReload (5614ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (0ms)
+ SetupLoadedEditorAssemblies (5477ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (30ms)
+ SetLoadedEditorAssemblies (24ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (5ms)
+ ProcessInitializeOnLoadAttributes (4415ms)
+ ProcessInitializeOnLoadMethodAttributes (1003ms)
+ AfterProcessingInitializeOnLoad (0ms)
+ EditorAssembliesLoaded (0ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (0ms)
+========================================================================
+Worker process is ready to serve import requests
+Begin MonoManager ReloadAssembly
+- Loaded All Assemblies, in 2.730 seconds
+Refreshing native plugins compatible for Editor in 49.91 ms, found 3 plugins.
+Native extension for WindowsStandalone target not found
+Package Manager log level set to [2]
+[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument
+[Package Manager] UpmClient::Send -- Unable to send message (not connected to UPM process).
+[Package Manager] Cannot connect to Unity Package Manager local server
+AutoRegister
+UnityEngine.StackTraceUtility:ExtractStackTrace ()
+UnityEngine.DebugLogHandler:LogFormat (UnityEngine.LogType,UnityEngine.Object,string,object[])
+UnityEngine.Logger:Log (UnityEngine.LogType,object)
+UnityEngine.Debug:Log (object)
+JNGame.GAS.GASInjector/AutoInject:.cctor () (at Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs:16)
+System.Runtime.CompilerServices.RuntimeHelpers:RunClassConstructor (System.RuntimeTypeHandle)
+UnityEditor.EditorAssemblies:ProcessInitializeOnLoadAttributes (System.Type[])
+
+(Filename: Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs Line: 16)
+
+Launched and connected shader compiler UnityShaderCompiler.exe after 0.20 seconds
+Mono: successfully reloaded assembly
+- Finished resetting the current domain, in 3.697 seconds
+Domain Reload Profiling: 6389ms
+ BeginReloadAssembly (226ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (6ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (30ms)
+ RebuildCommonClasses (75ms)
+ RebuildNativeTypeToScriptingClass (18ms)
+ initialDomainReloadingComplete (151ms)
+ LoadAllAssembliesAndSetupDomain (2222ms)
+ LoadAssemblies (1448ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ AnalyzeDomain (876ms)
+ TypeCache.Refresh (813ms)
+ TypeCache.ScanAssembly (783ms)
+ ScanForSourceGeneratedMonoScriptInfo (47ms)
+ ResolveRequiredComponents (16ms)
+ FinalizeReload (3698ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (0ms)
+ SetupLoadedEditorAssemblies (3284ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (17ms)
+ SetLoadedEditorAssemblies (19ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (235ms)
+ ProcessInitializeOnLoadAttributes (1298ms)
+ ProcessInitializeOnLoadMethodAttributes (1659ms)
+ AfterProcessingInitializeOnLoad (54ms)
+ EditorAssembliesLoaded (2ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (44ms)
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Refreshing native plugins compatible for Editor in 86.06 ms, found 3 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 5651 Unused Serialized files (Serialized files now loaded: 0)
+Unloading 183 unused Assets / (232.9 KB). Loaded Objects now: 6101.
+Memory consumption went from 197.9 MB to 197.7 MB.
+Total: 39.739800 ms (FindLiveObjects: 0.638300 ms CreateObjectMapping: 0.524300 ms MarkObjects: 38.153800 ms DeleteObjects: 0.421700 ms)
+
+AssetImportParameters requested are different than current active one (requested -> active):
+ custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
+ custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
+ custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
+ custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
+ custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
+ custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
+ custom:AudioImporter_EditorPlatform: d09bf68614088b80899f8185d706f6e7 ->
+ custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
+ custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+ custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+========================================================================
+Received Import Request.
+ Time since last request: 31993.069522 seconds.
+ path: Assets/Scripts/GASSamples/Scripts/App.cs
+ artifactKey: Guid(f3e00a9df020484eb50717285a43b5ef) Importer(815301076,1909f56bfc062723c751e8b465ee728b)
+Start importing Assets/Scripts/GASSamples/Scripts/App.cs using Guid(f3e00a9df020484eb50717285a43b5ef) Importer(815301076,1909f56bfc062723c751e8b465ee728b) -> (artifact id: 'ffb0d4db36034ca8c999158eaedb24b2') in 0.012296 seconds
+Number of updated asset objects reloaded before import = 0
+Number of asset objects unloaded after import = 0
+========================================================================
+Received Prepare
+Begin MonoManager ReloadAssembly
+- Loaded All Assemblies, in 1.693 seconds
+Refreshing native plugins compatible for Editor in 33.03 ms, found 3 plugins.
+Native extension for WindowsStandalone target not found
+[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument
+[Package Manager] UpmClient::Send -- Unable to send message (not connected to UPM process).
+[Package Manager] Cannot connect to Unity Package Manager local server
+AutoRegister
+UnityEngine.StackTraceUtility:ExtractStackTrace ()
+UnityEngine.DebugLogHandler:LogFormat (UnityEngine.LogType,UnityEngine.Object,string,object[])
+UnityEngine.Logger:Log (UnityEngine.LogType,object)
+UnityEngine.Debug:Log (object)
+JNGame.GAS.GASInjector/AutoInject:.cctor () (at Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs:16)
+System.Runtime.CompilerServices.RuntimeHelpers:RunClassConstructor (System.RuntimeTypeHandle)
+UnityEditor.EditorAssemblies:ProcessInitializeOnLoadAttributes (System.Type[])
+
+(Filename: Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs Line: 16)
+
+Mono: successfully reloaded assembly
+- Finished resetting the current domain, in 1.680 seconds
+Domain Reload Profiling: 3367ms
+ BeginReloadAssembly (277ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (7ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (133ms)
+ RebuildCommonClasses (36ms)
+ RebuildNativeTypeToScriptingClass (12ms)
+ initialDomainReloadingComplete (72ms)
+ LoadAllAssembliesAndSetupDomain (1290ms)
+ LoadAssemblies (960ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ AnalyzeDomain (395ms)
+ TypeCache.Refresh (381ms)
+ TypeCache.ScanAssembly (338ms)
+ ScanForSourceGeneratedMonoScriptInfo (7ms)
+ ResolveRequiredComponents (8ms)
+ FinalizeReload (1680ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (0ms)
+ SetupLoadedEditorAssemblies (873ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (7ms)
+ SetLoadedEditorAssemblies (5ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (115ms)
+ ProcessInitializeOnLoadAttributes (396ms)
+ ProcessInitializeOnLoadMethodAttributes (339ms)
+ AfterProcessingInitializeOnLoad (9ms)
+ EditorAssembliesLoaded (1ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (20ms)
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Refreshing native plugins compatible for Editor in 75.42 ms, found 3 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 5635 Unused Serialized files (Serialized files now loaded: 0)
+Unloading 136 unused Assets / (206.1 KB). Loaded Objects now: 6117.
+Memory consumption went from 195.0 MB to 194.8 MB.
+Total: 33.105500 ms (FindLiveObjects: 0.856600 ms CreateObjectMapping: 1.832900 ms MarkObjects: 29.891000 ms DeleteObjects: 0.522700 ms)
+
+Prepare: number of updated asset objects reloaded= 0
+AssetImportParameters requested are different than current active one (requested -> active):
+ custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
+ custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
+ custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
+ custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
+ custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
+ custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
+ custom:AudioImporter_EditorPlatform: d09bf68614088b80899f8185d706f6e7 ->
+ custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
+ custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+ custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
diff --git a/JNFrame2/Logs/AssetImportWorker1.log b/JNFrame2/Logs/AssetImportWorker1.log
new file mode 100644
index 00000000..1737cbab
--- /dev/null
+++ b/JNFrame2/Logs/AssetImportWorker1.log
@@ -0,0 +1,266 @@
+Using pre-set license
+Built from '2022.3/staging' branch; Version is '2022.3.1f1 (f18e0c1b5784) revision 15830540'; Using compiler version '192829333'; Build Type 'Release'
+OS: 'Windows 11 (10.0.22631) 64bit Professional' Language: 'zh' Physical Memory: 32651 MB
+BatchMode: 1, IsHumanControllingUs: 0, StartBugReporterOnCrash: 0, Is64bit: 1, IsPro: 1
+
+COMMAND LINE ARGUMENTS:
+D:\Unity\2022.3.1f1\Editor\Unity.exe
+-adb2
+-batchMode
+-noUpm
+-name
+AssetImportWorker1
+-projectPath
+D:/myproject/JisolGame/JNFrame2
+-logFile
+Logs/AssetImportWorker1.log
+-srvPort
+52918
+Successfully changed project path to: D:/myproject/JisolGame/JNFrame2
+D:/myproject/JisolGame/JNFrame2
+[UnityMemory] Configuration Parameters - Can be set up in boot.config
+ "memorysetup-bucket-allocator-granularity=16"
+ "memorysetup-bucket-allocator-bucket-count=8"
+ "memorysetup-bucket-allocator-block-size=33554432"
+ "memorysetup-bucket-allocator-block-count=8"
+ "memorysetup-main-allocator-block-size=16777216"
+ "memorysetup-thread-allocator-block-size=16777216"
+ "memorysetup-gfx-main-allocator-block-size=16777216"
+ "memorysetup-gfx-thread-allocator-block-size=16777216"
+ "memorysetup-cache-allocator-block-size=4194304"
+ "memorysetup-typetree-allocator-block-size=2097152"
+ "memorysetup-profiler-bucket-allocator-granularity=16"
+ "memorysetup-profiler-bucket-allocator-bucket-count=8"
+ "memorysetup-profiler-bucket-allocator-block-size=33554432"
+ "memorysetup-profiler-bucket-allocator-block-count=8"
+ "memorysetup-profiler-allocator-block-size=16777216"
+ "memorysetup-profiler-editor-allocator-block-size=1048576"
+ "memorysetup-temp-allocator-size-main=16777216"
+ "memorysetup-job-temp-allocator-block-size=2097152"
+ "memorysetup-job-temp-allocator-block-size-background=1048576"
+ "memorysetup-job-temp-allocator-reduction-small-platforms=262144"
+ "memorysetup-allocator-temp-initial-block-size-main=262144"
+ "memorysetup-allocator-temp-initial-block-size-worker=262144"
+ "memorysetup-temp-allocator-size-background-worker=32768"
+ "memorysetup-temp-allocator-size-job-worker=262144"
+ "memorysetup-temp-allocator-size-preload-manager=33554432"
+ "memorysetup-temp-allocator-size-nav-mesh-worker=65536"
+ "memorysetup-temp-allocator-size-audio-worker=65536"
+ "memorysetup-temp-allocator-size-cloud-worker=32768"
+ "memorysetup-temp-allocator-size-gi-baking-worker=262144"
+ "memorysetup-temp-allocator-size-gfx=262144"
+Player connection [36540] Host "[IP] 192.168.1.115 [Port] 0 [Flags] 2 [Guid] 3750933375 [EditorId] 3750933375 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined multi-casting on [225.0.0.222:54997]...
+
+Player connection [36540] Host "[IP] 192.168.1.115 [Port] 0 [Flags] 2 [Guid] 3750933375 [EditorId] 3750933375 [Version] 1048832 [Id] WindowsEditor(7,PC-20230316NUNE) [Debug] 1 [PackageName] WindowsEditor [ProjectName] Editor" joined alternative multi-casting on [225.0.0.222:34997]...
+
+Refreshing native plugins compatible for Editor in 71.37 ms, found 3 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Initialize engine version: 2022.3.1f1 (f18e0c1b5784)
+[Subsystems] Discovering subsystems at path D:/Unity/2022.3.1f1/Editor/Data/Resources/UnitySubsystems
+[Subsystems] Discovering subsystems at path D:/myproject/JisolGame/JNFrame2/Assets
+GfxDevice: creating device client; threaded=0; jobified=0
+Direct3D:
+ Version: Direct3D 11.0 [level 11.1]
+ Renderer: NVIDIA GeForce GTX 1660 SUPER (ID=0x21c4)
+ Vendor: NVIDIA
+ VRAM: 5966 MB
+ Driver: 32.0.15.6094
+Initialize mono
+Mono path[0] = 'D:/Unity/2022.3.1f1/Editor/Data/Managed'
+Mono path[1] = 'D:/Unity/2022.3.1f1/Editor/Data/MonoBleedingEdge/lib/mono/unityjit-win32'
+Mono config path = 'D:/Unity/2022.3.1f1/Editor/Data/MonoBleedingEdge/etc'
+Using monoOptions --debugger-agent=transport=dt_socket,embedding=1,server=y,suspend=n,address=127.0.0.1:56724
+Begin MonoManager ReloadAssembly
+Registering precompiled unity dll's ...
+Register platform support module: D:/Unity/2022.3.1f1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll
+Registered in 0.009169 seconds.
+- Loaded All Assemblies, in 0.653 seconds
+Native extension for WindowsStandalone target not found
+Mono: successfully reloaded assembly
+- Finished resetting the current domain, in 5.839 seconds
+Domain Reload Profiling: 6493ms
+ BeginReloadAssembly (98ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (0ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (1ms)
+ RebuildCommonClasses (37ms)
+ RebuildNativeTypeToScriptingClass (10ms)
+ initialDomainReloadingComplete (79ms)
+ LoadAllAssembliesAndSetupDomain (427ms)
+ LoadAssemblies (96ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ AnalyzeDomain (418ms)
+ TypeCache.Refresh (417ms)
+ TypeCache.ScanAssembly (377ms)
+ ScanForSourceGeneratedMonoScriptInfo (1ms)
+ ResolveRequiredComponents (1ms)
+ FinalizeReload (5843ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (0ms)
+ SetupLoadedEditorAssemblies (5345ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (37ms)
+ SetLoadedEditorAssemblies (61ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (112ms)
+ ProcessInitializeOnLoadAttributes (4820ms)
+ ProcessInitializeOnLoadMethodAttributes (313ms)
+ AfterProcessingInitializeOnLoad (1ms)
+ EditorAssembliesLoaded (1ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (0ms)
+========================================================================
+Worker process is ready to serve import requests
+Begin MonoManager ReloadAssembly
+- Loaded All Assemblies, in 2.697 seconds
+Refreshing native plugins compatible for Editor in 41.20 ms, found 3 plugins.
+Native extension for WindowsStandalone target not found
+Package Manager log level set to [2]
+[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument
+[Package Manager] UpmClient::Send -- Unable to send message (not connected to UPM process).
+[Package Manager] Cannot connect to Unity Package Manager local server
+AutoRegister
+UnityEngine.StackTraceUtility:ExtractStackTrace ()
+UnityEngine.DebugLogHandler:LogFormat (UnityEngine.LogType,UnityEngine.Object,string,object[])
+UnityEngine.Logger:Log (UnityEngine.LogType,object)
+UnityEngine.Debug:Log (object)
+JNGame.GAS.GASInjector/AutoInject:.cctor () (at Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs:16)
+System.Runtime.CompilerServices.RuntimeHelpers:RunClassConstructor (System.RuntimeTypeHandle)
+UnityEditor.EditorAssemblies:ProcessInitializeOnLoadAttributes (System.Type[])
+
+(Filename: Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs Line: 16)
+
+Launched and connected shader compiler UnityShaderCompiler.exe after 0.21 seconds
+Mono: successfully reloaded assembly
+- Finished resetting the current domain, in 3.755 seconds
+Domain Reload Profiling: 6439ms
+ BeginReloadAssembly (282ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (11ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (1ms)
+ CreateAndSetChildDomain (67ms)
+ RebuildCommonClasses (129ms)
+ RebuildNativeTypeToScriptingClass (69ms)
+ initialDomainReloadingComplete (207ms)
+ LoadAllAssembliesAndSetupDomain (1996ms)
+ LoadAssemblies (1315ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ AnalyzeDomain (807ms)
+ TypeCache.Refresh (759ms)
+ TypeCache.ScanAssembly (731ms)
+ ScanForSourceGeneratedMonoScriptInfo (38ms)
+ ResolveRequiredComponents (11ms)
+ FinalizeReload (3756ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (0ms)
+ SetupLoadedEditorAssemblies (3323ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (11ms)
+ SetLoadedEditorAssemblies (10ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (193ms)
+ ProcessInitializeOnLoadAttributes (1284ms)
+ ProcessInitializeOnLoadMethodAttributes (1798ms)
+ AfterProcessingInitializeOnLoad (25ms)
+ EditorAssembliesLoaded (1ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (21ms)
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Refreshing native plugins compatible for Editor in 65.04 ms, found 3 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 5651 Unused Serialized files (Serialized files now loaded: 0)
+Unloading 183 unused Assets / (232.9 KB). Loaded Objects now: 6101.
+Memory consumption went from 197.9 MB to 197.7 MB.
+Total: 27.955700 ms (FindLiveObjects: 0.836400 ms CreateObjectMapping: 0.605300 ms MarkObjects: 26.061200 ms DeleteObjects: 0.450100 ms)
+
+AssetImportParameters requested are different than current active one (requested -> active):
+ custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
+ custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
+ custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
+ custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
+ custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
+ custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
+ custom:AudioImporter_EditorPlatform: d09bf68614088b80899f8185d706f6e7 ->
+ custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
+ custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+ custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+========================================================================
+Received Prepare
+Begin MonoManager ReloadAssembly
+- Loaded All Assemblies, in 1.689 seconds
+Refreshing native plugins compatible for Editor in 32.71 ms, found 3 plugins.
+Native extension for WindowsStandalone target not found
+[Package Manager] Server::EnsureServerProcessIsRunning -- launch failed, reason: Unity was launched with the -noUpm command-line argument
+[Package Manager] UpmClient::Send -- Unable to send message (not connected to UPM process).
+[Package Manager] Cannot connect to Unity Package Manager local server
+AutoRegister
+UnityEngine.StackTraceUtility:ExtractStackTrace ()
+UnityEngine.DebugLogHandler:LogFormat (UnityEngine.LogType,UnityEngine.Object,string,object[])
+UnityEngine.Logger:Log (UnityEngine.LogType,object)
+UnityEngine.Debug:Log (object)
+JNGame.GAS.GASInjector/AutoInject:.cctor () (at Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs:16)
+System.Runtime.CompilerServices.RuntimeHelpers:RunClassConstructor (System.RuntimeTypeHandle)
+UnityEditor.EditorAssemblies:ProcessInitializeOnLoadAttributes (System.Type[])
+
+(Filename: Assets/Scripts/GASSamples/Scripts/GAS/GASInjector.cs Line: 16)
+
+Mono: successfully reloaded assembly
+- Finished resetting the current domain, in 1.686 seconds
+Domain Reload Profiling: 3417ms
+ BeginReloadAssembly (285ms)
+ ExecutionOrderSort (0ms)
+ DisableScriptedObjects (7ms)
+ BackupInstance (0ms)
+ ReleaseScriptingObjects (0ms)
+ CreateAndSetChildDomain (135ms)
+ RebuildCommonClasses (34ms)
+ RebuildNativeTypeToScriptingClass (10ms)
+ initialDomainReloadingComplete (66ms)
+ LoadAllAssembliesAndSetupDomain (1287ms)
+ LoadAssemblies (961ms)
+ RebuildTransferFunctionScriptingTraits (0ms)
+ AnalyzeDomain (394ms)
+ TypeCache.Refresh (380ms)
+ TypeCache.ScanAssembly (335ms)
+ ScanForSourceGeneratedMonoScriptInfo (6ms)
+ ResolveRequiredComponents (8ms)
+ FinalizeReload (1735ms)
+ ReleaseScriptCaches (0ms)
+ RebuildScriptCaches (0ms)
+ SetupLoadedEditorAssemblies (869ms)
+ LogAssemblyErrors (0ms)
+ InitializePlatformSupportModulesInManaged (7ms)
+ SetLoadedEditorAssemblies (5ms)
+ RefreshPlugins (0ms)
+ BeforeProcessingInitializeOnLoad (115ms)
+ ProcessInitializeOnLoadAttributes (394ms)
+ ProcessInitializeOnLoadMethodAttributes (337ms)
+ AfterProcessingInitializeOnLoad (9ms)
+ EditorAssembliesLoaded (2ms)
+ ExecutionOrderSort2 (0ms)
+ AwakeInstancesAfterBackupRestoration (32ms)
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Shader 'FairyGUI/TextMeshPro/Distance Field': fallback shader 'TextMeshPro/Mobile/Distance Field' not found
+Refreshing native plugins compatible for Editor in 75.52 ms, found 3 plugins.
+Preloading 0 native plugins for Editor in 0.00 ms.
+Unloading 5636 Unused Serialized files (Serialized files now loaded: 0)
+Unloading 136 unused Assets / (205.1 KB). Loaded Objects now: 6117.
+Memory consumption went from 195.2 MB to 195.0 MB.
+Total: 32.979700 ms (FindLiveObjects: 1.552000 ms CreateObjectMapping: 0.841400 ms MarkObjects: 29.841900 ms DeleteObjects: 0.739200 ms)
+
+Prepare: number of updated asset objects reloaded= 0
+AssetImportParameters requested are different than current active one (requested -> active):
+ custom:container-demuxer-ogg: 62fdf1f143b41e24485cea50d1cbac27 ->
+ custom:video-decoder-ogg-theora: a1e56fd34408186e4bbccfd4996cb3dc ->
+ custom:framework-win-MediaFoundation: 216162199b28c13a410421893ffa2e32 ->
+ custom:container-demuxer-webm: 4f35f7cbe854078d1ac9338744f61a02 ->
+ custom:container-muxer-webm: aa71ff27fc2769a1b78a27578f13a17b ->
+ custom:video-decoder-webm-vp8: 9c59270c3fd7afecdb556c50c9e8de78 ->
+ custom:AudioImporter_EditorPlatform: d09bf68614088b80899f8185d706f6e7 ->
+ custom:video-encoder-webm-vp8: eb34c28f22e8b96e1ab97ce403110664 ->
+ custom:audio-decoder-ogg-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
+ custom:audio-encoder-webm-vorbis: bf7c407c2cedff20999df2af8eb42d56 ->
diff --git a/JNFrame2/Logs/shadercompiler-AssetImportWorker0.log b/JNFrame2/Logs/shadercompiler-AssetImportWorker0.log
new file mode 100644
index 00000000..c5c74b9f
--- /dev/null
+++ b/JNFrame2/Logs/shadercompiler-AssetImportWorker0.log
@@ -0,0 +1,6 @@
+Base path: 'D:/Unity/2022.3.1f1/Editor/Data', plugins path 'D:/Unity/2022.3.1f1/Editor/Data/PlaybackEngines'
+Cmd: initializeCompiler
+
+Cmd: preprocess
+ insize=4032 file=/ surfaceOnly=0 buildPlatform=19 validAPIs=295472 pKW=SHADER_API_DESKTOP dKW=UNITY_NO_DXT5nm UNITY_ENABLE_REFLECTION_BUFFERS UNITY_FRAMEBUFFER_FETCH_AVAILABLE UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_LIGHTMAP_FULL_HDR UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 UNITY_UNIFIED_SHADER_PRECISION_MODEL ok=1 outsize=195
+