diff --git a/AAC/AACShared/Layers/LanternFlicker.cs b/AAC/AACShared/Layers/LanternFlicker.cs index 01f9ff8..e82f8fc 100644 --- a/AAC/AACShared/Layers/LanternFlicker.cs +++ b/AAC/AACShared/Layers/LanternFlicker.cs @@ -3,6 +3,7 @@ using UnityEngine; using AnimatorAsCode.V1; using System.Collections.Generic; using gay.lilyy.aaccore; +using gay.lilyy.aacshared.runtimecomponents; namespace gay.lilyy.aacshared.layers { @@ -29,6 +30,9 @@ namespace gay.lilyy.aacshared.layers public override bool IsApplicable(AACAssets assets) { + var definition = assets.ctx.AvatarRootObject.GetComponent(); + if (definition == null) return false; + if (!definition.enabled) return false; var lamp = GetLantern(assets); if (lamp == null) { diff --git a/AAC/AACShared/Runtime/ChildToggleDefinition.cs b/AAC/AACShared/Runtime/ChildToggleDefinition.cs index 56be80d..a28dcef 100644 --- a/AAC/AACShared/Runtime/ChildToggleDefinition.cs +++ b/AAC/AACShared/Runtime/ChildToggleDefinition.cs @@ -7,6 +7,7 @@ using UnityEditor; namespace gay.lilyy.aacshared.runtimecomponents { + [AddComponentMenu("LillithRosePup/Child Toggle")] public class ChildToggleDefinition : MonoBehaviour, IEditorOnly { // unity needs this to show the enable/disable box diff --git a/AAC/AACShared/Runtime/FloaterDefinition.cs b/AAC/AACShared/Runtime/FloaterDefinition.cs index 3c7978c..074a3c0 100644 --- a/AAC/AACShared/Runtime/FloaterDefinition.cs +++ b/AAC/AACShared/Runtime/FloaterDefinition.cs @@ -4,6 +4,7 @@ using VRC.SDKBase; namespace gay.lilyy.aacshared.runtimecomponents { + [AddComponentMenu("LillithRosePup/Floater")] public class FloaterDefinition: MonoBehaviour, IEditorOnly { // unity needs this to show the enable/disable box diff --git a/AAC/AACShared/Runtime/LanternFlickerDefinition.cs b/AAC/AACShared/Runtime/LanternFlickerDefinition.cs new file mode 100644 index 0000000..85a6e60 --- /dev/null +++ b/AAC/AACShared/Runtime/LanternFlickerDefinition.cs @@ -0,0 +1,14 @@ +using System; +using UnityEngine; +using VRC.SDKBase; +#if UNITY_EDITOR +using UnityEditor; +#endif + +namespace gay.lilyy.aacshared.runtimecomponents +{ + [AddComponentMenu("LillithRosePup/Lantern Flicker")] + public class LanternFlickerDefinition : MonoBehaviour, IEditorOnly { + public bool enabled = true; + } +} \ No newline at end of file diff --git a/AAC/AACShared/Runtime/LanternFlickerDefinition.cs.meta b/AAC/AACShared/Runtime/LanternFlickerDefinition.cs.meta new file mode 100644 index 0000000..26317a2 --- /dev/null +++ b/AAC/AACShared/Runtime/LanternFlickerDefinition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cb97112969463744bbb4e68b3021902b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: