foldcc/ParticleEffectForUGUI
1
0
Fork 0
mirror of https://github.com/mob-sakai/ParticleEffectForUGUI.git synced 2026-06-26 08:23:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Support for skipping "reload domain"

Browse Source 
close #406
This commit is contained in:
mob-sakai
2026-06-24 18:57:55 +09:00
parent 9b3ee547e3
commit b7bb1124f6
7 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Packages/src/Runtime/Internal/Extensions/CanvasExtensions.cs
View File

@@ -98,7 +98,7 @@ namespace Coffee.UIParticleInternal
Profiler.BeginSample("(COF)[CanvasExt] GetViewProjectionMatrix");
var rootCanvas = canvas.rootCanvas;
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)
{

6
Packages/src/Runtime/Internal/Extensions/ComponentExtensions.cs
View File

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

44
Packages/src/Runtime/Internal/ProjectSettings/PreloadedProjectSettings.cs
View File

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

5
Packages/src/Runtime/Internal/Utilities/FastAction.cs
View File

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

14
Packages/src/Runtime/Internal/Utilities/FrameCache.cs
View File

@@ -8,19 +8,19 @@ namespace Coffee.UIParticleInternal
{
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
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
#elif UNITY_EDITOR
[InitializeOnLoadMethod]
#else
[RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
#endif
private static void Clear()
{
s_Caches.Clear();
UIExtraCallbacks.onLateAfterCanvasRebuild -= ClearAllCache;
UIExtraCallbacks.onLateAfterCanvasRebuild += ClearAllCache;
}
#endif
/// <summary>
/// Tries to retrieve a value from the frame cache with a specified key.

8
Packages/src/Runtime/Internal/Utilities/UIExtraCallbacks.cs
View File

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

11
Packages/src/Runtime/UIParticleUpdater.cs
View File

@@ -39,6 +39,17 @@ namespace Coffee.UIExtensions
}
#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]
private static void InitializeOnLoad()
{