Merge pull request #34 from WakVRC/v0.0.40

v0.0.40
WakVRC · Oct 20, 2024 · cc6c843 · cc6c843
2 parents dac7eee + a28e236
commit cc6c843
Show file tree

Hide file tree

Showing 157 changed files with 549 additions and 197 deletions.
diff --git a/Assets/_Mascari4615/Scripts/Util/MDataInitializer.cs b/Assets/_Mascari4615/Scripts/Util/MDataInitializer.cs
@@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+using WakVRC;
+
+namespace Mascari4615
+{
+#if UNITY_EDITOR
+	public class MDataInitializer : MonoBehaviour
+	{
+		[SerializeField] private string prefix;
+		[SerializeField] private string[] someStrings;
+
+		[ContextMenu(nameof(Init))]
+		public void Init()
+		{
+			MData[] mDatas = GetComponentsInChildren<MData>(true);
+
+			for (int i = 0; i < transform.childCount; i++)
+			{
+				MData mData = mDatas[i];
+				mData.Value = $"{prefix} {someStrings[0]}{i}";
+
+				EditorUtility.SetDirty(mData);
+			}
+
+			AssetDatabase.SaveAssets();
+		}
+	}
+#endif
+}
diff --git a/Assets/_Mascari4615/Scripts/Util/MDataInitializer.cs.meta b/Assets/_Mascari4615/Scripts/Util/MDataInitializer.cs.meta
diff --git a/Packages/com.wakvrc.m-udons/Runtime/Basic/ObjectActive/Scripts/Core/ActiveToggle.cs b/Packages/com.wakvrc.m-udons/Runtime/Basic/ObjectActive/Scripts/Core/ActiveToggle.cs
@@ -28,7 +28,7 @@ private void Start()
 			Init();
 		}
 
-		private void Init()
+		protected virtual void Init()
 		{
 			SetActive(defaultActive);
 

diff --git a/Packages/com.wakvrc.m-udons/Runtime/Basic/ObjectActive/Scripts/Impl/CanvasGroupActive.cs b/Packages/com.wakvrc.m-udons/Runtime/Basic/ObjectActive/Scripts/Impl/CanvasGroupActive.cs
@@ -9,8 +9,35 @@ public class CanvasGroupActive : ActiveToggle
 		[SerializeField] private CanvasGroup[] activeCanvasGroups;
 		[SerializeField] private CanvasGroup[] disableCanvasGroups;
 
+		private Collider[] activeColliders = new Collider[0];
+		private Collider[] disableColliders = new Collider[0];
+
 		[Header("_" + nameof(CanvasGroupActive) + " - Options")]
-		[SerializeField] private bool toggleOnlyInteractable;
+		[SerializeField] private bool toggleOnlyInteractable = false;
+		[SerializeField] private bool toggleColliders = false;
+
+		protected override void Init()
+		{
+			for (int i = 0; i < activeCanvasGroups.Length; i++)
+			{
+				if (activeCanvasGroups[i] == null)
+					continue;
+
+				Collider[] colliders = activeCanvasGroups[i].GetComponentsInChildren<Collider>(true);
+				MDataUtil.AddRange(ref activeColliders, colliders);
+			}
+
+			for (int i = 0; i < disableCanvasGroups.Length; i++)
+			{
+				if (disableCanvasGroups[i] == null)
+					continue;
+
+				Collider[] colliders = disableCanvasGroups[i].GetComponentsInChildren<Collider>(true);
+				MDataUtil.AddRange(ref disableColliders, colliders);
+			}
+
+			base.Init();
+		}
 
 		protected override void UpdateActive()
 		{
@@ -32,6 +59,15 @@ protected override void UpdateActive()
 				foreach (CanvasGroup c in disableCanvasGroups)
 					MUtil.SetCanvasGroupActive(c, !Active);
 			}
+
+			if (toggleColliders)
+			{
+				foreach (Collider c in activeColliders)
+					c.enabled = Active;
+
+				foreach (Collider c in disableColliders)
+					c.enabled = !Active;
+			}
 		}
 
 		public void RegisterActiveCanvasGroup(CanvasGroup canvasGroup)
@@ -44,4 +80,6 @@ public void RegisterDisableCanvasGroup(CanvasGroup canvasGroup)
 			MDataUtil.Add(ref disableCanvasGroups, canvasGroup);
 		}
 	}
-}
+}
+
+// 밥
diff --git a/Packages/com.wakvrc.m-udons/Runtime/Basic/ObjectActive/UdonAsset/CanvasGroupActive.asset b/Packages/com.wakvrc.m-udons/Runtime/Basic/ObjectActive/UdonAsset/CanvasGroupActive.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 7
+      Data: 10
     - Name: 
       Entry: 7
       Data: 
@@ -428,10 +428,112 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: toggleOnlyInteractable
+      Data: activeColliders
     - Name: $v
       Entry: 7
       Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: activeColliders
+    - Name: <UserType>k__BackingField
+      Entry: 7
+      Data: 28|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: UnityEngine.Collider[], UnityEngine.PhysicsModule
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 28
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: disableColliders
+    - Name: $v
+      Entry: 7
+      Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: disableColliders
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 28
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 28
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: toggleOnlyInteractable
+    - Name: $v
+      Entry: 7
+      Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: toggleOnlyInteractable
@@ -455,13 +557,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 2
     - Name: 
       Entry: 7
-      Data: 29|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
+      Data: 34|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
     - Name: header
       Entry: 1
       Data: _CanvasGroupActive - Options
@@ -470,7 +572,61 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 30|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 35|UnityEngine.SerializeField, UnityEngine.CoreModule
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: toggleColliders
+    - Name: $v
+      Entry: 7
+      Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: toggleColliders
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 3
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 3
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: true
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 38|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: