fix: Support for skipping "reload domain"

close #406
This commit is contained in:
mob-sakai
2026-06-24 18:57:55 +09:00
parent f0b036de65
commit 733901436d
7 changed files with 62 additions and 30 deletions

View File

@@ -98,7 +98,7 @@ namespace Coffee.UIParticleInternal
Profiler.BeginSample("(COF)[CanvasExt] GetViewProjectionMatrix"); Profiler.BeginSample("(COF)[CanvasExt] GetViewProjectionMatrix");
var rootCanvas = canvas.rootCanvas; var rootCanvas = canvas.rootCanvas;
var cam = rootCanvas.worldCamera; var cam = rootCanvas.worldCamera;
if (rootCanvas && rootCanvas.renderMode != RenderMode.ScreenSpaceOverlay && cam) if (rootCanvas != null && rootCanvas.renderMode != RenderMode.ScreenSpaceOverlay && cam != null)
{ {
if (eye == Camera.MonoOrStereoscopicEye.Mono) if (eye == Camera.MonoOrStereoscopicEye.Mono)
{ {

View File

@@ -99,7 +99,7 @@ namespace Coffee.UIParticleInternal
{ {
T component = null; T component = null;
var transform = self.transform; var transform = self.transform;
while (transform) while (transform != null)
{ {
if (transform.TryGetComponent<T>(out var c)) if (transform.TryGetComponent<T>(out var c))
{ {
@@ -120,7 +120,7 @@ namespace Coffee.UIParticleInternal
where T : Component where T : Component
{ {
var tr = includeSelf ? self.transform : self.transform.parent; var tr = includeSelf ? self.transform : self.transform.parent;
while (tr) while (tr != null)
{ {
if (tr.TryGetComponent<T>(out var c) && valid(c)) return c; if (tr.TryGetComponent<T>(out var c) && valid(c)) return c;
if (tr == stopAfter) return null; if (tr == stopAfter) return null;
@@ -197,7 +197,7 @@ namespace Coffee.UIParticleInternal
if (!includeInactive) return self.GetComponentInParent<T>(); if (!includeInactive) return self.GetComponentInParent<T>();
var current = self.transform; var current = self.transform;
while (current) while (current != null)
{ {
if (current.TryGetComponent<T>(out var c)) return c; if (current.TryGetComponent<T>(out var c)) return c;
current = current.parent; current = current.parent;

View File

@@ -23,17 +23,14 @@ namespace Coffee.UIParticleInternal
protected static bool s_BuildingPlayer; protected static bool s_BuildingPlayer;
private class Postprocessor : AssetPostprocessor private class EditorEvents : AssetPostprocessor, IPreprocessBuildWithReport, IPostprocessBuildWithReport
{ {
int IOrderedCallback.callbackOrder => 0;
private static void OnPostprocessAllAssets(string[] _, string[] __, string[] ___, string[] ____) private static void OnPostprocessAllAssets(string[] _, string[] __, string[] ___, string[] ____)
{ {
Initialize(); Initialize();
} }
}
private class ExcludeFromBuild : IPreprocessBuildWithReport, IPostprocessBuildWithReport
{
int IOrderedCallback.callbackOrder => 0;
void IPreprocessBuildWithReport.OnPreprocessBuild(BuildReport report) void IPreprocessBuildWithReport.OnPreprocessBuild(BuildReport report)
{ {
@@ -44,11 +41,11 @@ namespace Coffee.UIParticleInternal
foreach (var t in TypeCache.GetTypesDerivedFrom(typeof(PreloadedProjectSettings<>))) foreach (var t in TypeCache.GetTypesDerivedFrom(typeof(PreloadedProjectSettings<>)))
{ {
var settings = GetDefaultSettings(t); var settings = GetDefaultSettings(t);
if (!settings || settings.m_PreLoadSettingsInBuild) continue; if (settings == null || settings.m_PreLoadSettingsInBuild) continue;
PlayerSettings.SetPreloadedAssets( PlayerSettings.SetPreloadedAssets(
PlayerSettings.GetPreloadedAssets() PlayerSettings.GetPreloadedAssets()
.Where(x => x && x.GetType() != t) .Where(x => x != null && x.GetType() != t)
.ToArray()); .ToArray());
Debug.Log($"[PreloadedProjectSettings] Build started: removed '{settings.name}' " + Debug.Log($"[PreloadedProjectSettings] Build started: removed '{settings.name}' " +
@@ -62,6 +59,21 @@ namespace Coffee.UIParticleInternal
s_BuildingPlayer = false; s_BuildingPlayer = false;
Initialize(); Initialize();
} }
#if UNITY_2019_3_OR_NEWER
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
private static void OnDomainReload()
{
foreach (var t in TypeCache.GetTypesDerivedFrom(typeof(PreloadedProjectSettings<>)))
{
var defaultSettings = GetDefaultSettings(t);
if (defaultSettings != null)
{
defaultSettings.OnDomainReload();
}
}
}
#endif
} }
private static void Initialize() private static void Initialize()
@@ -154,6 +166,10 @@ namespace Coffee.UIParticleInternal
protected virtual void OnInitialize() protected virtual void OnInitialize()
{ {
} }
protected virtual void OnDomainReload()
{
}
} }
internal abstract class PreloadedProjectSettingsEditor : Editor internal abstract class PreloadedProjectSettingsEditor : Editor
@@ -222,7 +238,7 @@ namespace Coffee.UIParticleInternal
private void OnPlayModeStateChanged(PlayModeStateChange state) private void OnPlayModeStateChanged(PlayModeStateChange state)
{ {
if (!this) return; if (this == null) return;
switch (state) switch (state)
{ {
@@ -239,8 +255,13 @@ namespace Coffee.UIParticleInternal
break; break;
} }
} }
protected override void OnDomainReload()
{
s_Instance = null;
}
#else #else
public static T instance => s_Instance != null ? s_Instance : s_Instance = CreateInstance<T>(); public static T instance => s_Instance != null ? s_Instance : s_Instance = CreateInstance<T>();
#endif #endif
/// <summary> /// <summary>
@@ -256,9 +277,10 @@ namespace Coffee.UIParticleInternal
return; return;
} }
EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
EditorApplication.playModeStateChanged += OnPlayModeStateChanged; EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
#else #else
if (s_Instance && s_Instance != this) if (s_Instance != null && s_Instance != this)
{ {
Destroy(s_Instance); Destroy(s_Instance);
} }
@@ -293,7 +315,7 @@ namespace Coffee.UIParticleInternal
{ {
if (_target == null) if (_target == null)
{ {
if (_editor) if (_editor != null)
{ {
DestroyImmediate(_editor); DestroyImmediate(_editor);
_editor = null; _editor = null;

View File

@@ -66,11 +66,6 @@ namespace Coffee.UIParticleInternal
node = node.Next; node = node.Next;
} }
} }
public void Clear()
{
_delegates.Clear();
}
} }
/// <summary> /// <summary>

View File

@@ -8,19 +8,19 @@ namespace Coffee.UIParticleInternal
{ {
private static readonly Dictionary<Type, IFrameCache> s_Caches = new Dictionary<Type, IFrameCache>(); private static readonly Dictionary<Type, IFrameCache> s_Caches = new Dictionary<Type, IFrameCache>();
static FrameCache()
{
s_Caches.Clear();
UIExtraCallbacks.onLateAfterCanvasRebuild += ClearAllCache;
}
#if UNITY_EDITOR && UNITY_2019_3_OR_NEWER #if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)] [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
#elif UNITY_EDITOR
[InitializeOnLoadMethod]
#else
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
#endif
private static void Clear() private static void Clear()
{ {
s_Caches.Clear(); s_Caches.Clear();
UIExtraCallbacks.onLateAfterCanvasRebuild -= ClearAllCache;
UIExtraCallbacks.onLateAfterCanvasRebuild += ClearAllCache;
} }
#endif
/// <summary> /// <summary>
/// Tries to retrieve a value from the frame cache with a specified key. /// Tries to retrieve a value from the frame cache with a specified key.

View File

@@ -82,14 +82,18 @@ namespace Coffee.UIParticleInternal
message: "InitializeAfterCanvasRebuild"); message: "InitializeAfterCanvasRebuild");
} }
#if UNITY_EDITOR #if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
#elif UNITY_EDITOR
[InitializeOnLoadMethod] [InitializeOnLoadMethod]
#endif #else
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)] [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
#endif
private static void InitializeOnLoad() private static void InitializeOnLoad()
{ {
Canvas.willRenderCanvases -= OnAfterCanvasRebuild; Canvas.willRenderCanvases -= OnAfterCanvasRebuild;
s_IsInitializedAfterCanvasRebuild = false; s_IsInitializedAfterCanvasRebuild = false;
s_LastScreenSize = default;
} }
/// <summary> /// <summary>

View File

@@ -39,6 +39,17 @@ namespace Coffee.UIExtensions
} }
#if UNITY_EDITOR #if UNITY_EDITOR
#if UNITY_2019_3_OR_NEWER
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
private static void OnDomainReload()
{
s_ActiveParticles.Clear();
s_ActiveAttractors.Clear();
s_UpdatedGroupIds.Clear();
s_FrameCount = 0;
}
#endif
[InitializeOnLoadMethod] [InitializeOnLoadMethod]
private static void InitializeOnLoad() private static void InitializeOnLoad()
{ {