From 679fbf51c012d0971395f40ed3f6c8c7d49b30f1 Mon Sep 17 00:00:00 2001 From: bd_ Date: Sun, 24 Nov 2024 18:20:09 -0800 Subject: [PATCH] chore: fix non-editor buil --- .../MoveIndep/MAMoveIndependentlyManager.cs | 13 +++++++++++-- Runtime/MAMoveIndependently.cs | 6 +++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Runtime/ArmatureAwase/MoveIndep/MAMoveIndependentlyManager.cs b/Runtime/ArmatureAwase/MoveIndep/MAMoveIndependentlyManager.cs index b1e7bad4..6332ce38 100644 --- a/Runtime/ArmatureAwase/MoveIndep/MAMoveIndependentlyManager.cs +++ b/Runtime/ArmatureAwase/MoveIndep/MAMoveIndependentlyManager.cs @@ -4,9 +4,11 @@ using Unity.Burst; using Unity.Collections; using Unity.Collections.LowLevel.Unsafe; using Unity.Jobs; -using UnityEditor; using UnityEngine; using UnityEngine.Jobs; +#if UNITY_EDITOR +using UnityEditor; +#endif namespace nadena.dev.modular_avatar.core.armature_lock { @@ -32,8 +34,9 @@ namespace nadena.dev.modular_avatar.core.armature_lock _anyDirty = new NativeArray(1, Allocator.Persistent); _nativeMemoryManager.OnSegmentMove += MoveTransforms; - +#if UNITY_EDITOR AssemblyReloadEvents.beforeAssemblyReload += OnDomainUnload; +#endif } private void OnDomainUnload() @@ -45,7 +48,9 @@ namespace nadena.dev.modular_avatar.core.armature_lock { _lastJob.Complete(); +#if UNITY_EDITOR AssemblyReloadEvents.beforeAssemblyReload -= OnDomainUnload; +#endif if (_virtualParents.isCreated) DeferDestroy.DeferDestroyObj(_virtualParents); if (_trueParents.isCreated) DeferDestroy.DeferDestroyObj(_trueParents); @@ -257,7 +262,9 @@ namespace nadena.dev.modular_avatar.core.armature_lock { if (_mappingStates[i].RequestWriteback) { +#if UNITY_EDITOR Undo.RecordObject(_targets[i], "Move Independently"); +#endif prefabRecord.Add(_targets[i]); } } @@ -281,7 +288,9 @@ namespace nadena.dev.modular_avatar.core.armature_lock { foreach (var transform in prefabRecord) { +#if UNITY_EDITOR PrefabUtility.RecordPrefabInstancePropertyModifications(transform); +#endif } } diff --git a/Runtime/MAMoveIndependently.cs b/Runtime/MAMoveIndependently.cs index 75ec920e..0ef36c6b 100644 --- a/Runtime/MAMoveIndependently.cs +++ b/Runtime/MAMoveIndependently.cs @@ -1,7 +1,9 @@ using System; using nadena.dev.modular_avatar.core.armature_lock; -using UnityEditor; using UnityEngine; +#if UNITY_EDITOR +using UnityEditor; +#endif #if MA_VRCSDK3_AVATARS using VRC.SDKBase; #endif @@ -31,6 +33,7 @@ namespace nadena.dev.modular_avatar.core private void OnValidate() { +#if UNITY_EDITOR if (!PrefabUtility.IsPartOfPrefabAsset(this)) { EditorApplication.delayCall += () => @@ -38,6 +41,7 @@ namespace nadena.dev.modular_avatar.core if (this != null) MaMoveIndependentlyManager.Instance.Activate(this); }; } +#endif } private void OnEnable()