Merge pull request #22 from WakVRC/0.0.36

0.0.36
WakVRC · Oct 4, 2024 · ad9a28e · ad9a28e
2 parents 7b86802 + 9d7f315
commit ad9a28e
Show file tree

Hide file tree

Showing 73 changed files with 575 additions and 97 deletions.
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/120d957b35504fd45a2ff1de1d6bb735.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/120d957b35504fd45a2ff1de1d6bb735.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/2e8bf1e10b967634586562c896d76c89.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/2e8bf1e10b967634586562c896d76c89.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/4d7c22352a2cc5440b7f62e9fc8cbd0b.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/4d7c22352a2cc5440b7f62e9fc8cbd0b.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/60a822cb3d5689e449df5c2269f8764c.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/60a822cb3d5689e449df5c2269f8764c.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/7aa8dc8edb219744b93131b1de7d5b55.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/7aa8dc8edb219744b93131b1de7d5b55.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/9fb923979f1226a41a749251687e479e.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/9fb923979f1226a41a749251687e479e.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/a6dd2a96a73468c4f8480dd02676f7f8.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/a6dd2a96a73468c4f8480dd02676f7f8.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/c37870e75fed28746844847a4317121d.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/c37870e75fed28746844847a4317121d.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/ca41afa6c1f896848854ea798e4d22de.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/ca41afa6c1f896848854ea798e4d22de.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/cb90231adac96014d87244dfec0e0b40.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/cb90231adac96014d87244dfec0e0b40.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/d5b2b61fb8df3f9499ea3510d8867ea8.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/d5b2b61fb8df3f9499ea3510d8867ea8.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/e7de534a8bc397d4ea4b96a863fa713b.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/e7de534a8bc397d4ea4b96a863fa713b.asset
diff --git a/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/f1bbee9b647a12a47949588388c2b2dc.asset b/...e/Basic/SendEvent/UdonAsset/SerializedUdonPrograms/f1bbee9b647a12a47949588388c2b2dc.asset
diff --git a/.../Basic/Waktaverse/UdonAsset/SerializedUdonPrograms/8b8366fb8aa744247b51ed625feb0e3b.asset b/.../Basic/Waktaverse/UdonAsset/SerializedUdonPrograms/8b8366fb8aa744247b51ed625feb0e3b.asset
diff --git a/Packages/com.wakvrc.m-udons/Runtime/CustomValue/MBool/Scripts/UI/UIMBool.cs b/Packages/com.wakvrc.m-udons/Runtime/CustomValue/MBool/Scripts/UI/UIMBool.cs
@@ -44,17 +44,19 @@ public void UpdateUI()
 			}
 		}
 
-		#region HorribleEvents
-		public void ToggleValue() => mBool.SetValue(!mBool.Value);
-		public void SetValueTrue() => mBool.SetValue(true);
-		public void SetValueFalse() => mBool.SetValue(false);
-		#endregion
-
-		#region EditorTime
 		public void SetMBool(MBool mBool)
 		{
+			if (this.mBool != null)
+				this.mBool.RemoveListener(this, nameof(UpdateUI));
+
 			this.mBool = mBool;
+			Init();
 		}
+
+		#region HorribleEvents
+		public void ToggleValue() => mBool.SetValue(!mBool.Value);
+		public void SetValueTrue() => mBool.SetValue(true);
+		public void SetValueFalse() => mBool.SetValue(false);
 		#endregion
 	}
 }
diff --git a/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/3f7a9f26a459b1a44af5835a9be21ff9.asset b/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/3f7a9f26a459b1a44af5835a9be21ff9.asset
diff --git a/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/6ac721d989b0bee4a8228f26f0a071b3.asset b/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/6ac721d989b0bee4a8228f26f0a071b3.asset
diff --git a/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/9688693f1e4867b44b8341c54ca5771c.asset b/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/9688693f1e4867b44b8341c54ca5771c.asset
diff --git a/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/a8b3e698c04efd248b35f1b56e8d84ca.asset b/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/a8b3e698c04efd248b35f1b56e8d84ca.asset
diff --git a/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/d5c6808186f1389469c7a1b0bd9633a6.asset b/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/d5c6808186f1389469c7a1b0bd9633a6.asset
diff --git a/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/e45c11403f8cfbc40ad241e60f55fe2a.asset b/...CustomValue/MBool/UdonAsset/SerializedUdonPrograms/e45c11403f8cfbc40ad241e60f55fe2a.asset
diff --git a/...ustomValue/MColor/UdonAsset/SerializedUdonPrograms/abce4c8162acecc408ad19f4dd726fb7.asset b/...ustomValue/MColor/UdonAsset/SerializedUdonPrograms/abce4c8162acecc408ad19f4dd726fb7.asset
diff --git a/Packages/com.wakvrc.m-udons/Runtime/CustomValue/MString/Scripts/Core/MString.cs b/Packages/com.wakvrc.m-udons/Runtime/CustomValue/MString/Scripts/Core/MString.cs
@@ -11,7 +11,7 @@ public class MString : MEventSender
 		[Header("_" + nameof(MString))]
 
 		[Header("_" + nameof(MString) + " - Options")]
-		[SerializeField] private string defaultString = string.Empty;
+		[SerializeField, TextArea(3, 10)] private string defaultString = string.Empty;
 		[SerializeField] private bool useDefaultWhenEmpty = true;
 		[SerializeField] private bool useSync;
 		[SerializeField] private bool onlyDigit;

diff --git a/Packages/com.wakvrc.m-udons/Runtime/CustomValue/MString/UdonAsset/MString.asset b/Packages/com.wakvrc.m-udons/Runtime/CustomValue/MString/UdonAsset/MString.asset
@@ -467,7 +467,7 @@ MonoBehaviour:
       Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
-      Data: 3
+      Data: 4
     - Name: 
       Entry: 7
       Data: 31|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
@@ -492,6 +492,18 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 34|UnityEngine.TextAreaAttribute, UnityEngine.CoreModule
+    - Name: minLines
+      Entry: 3
+      Data: 3
+    - Name: maxLines
+      Entry: 3
+      Data: 10
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 
@@ -512,7 +524,7 @@ MonoBehaviour:
       Data: useDefaultWhenEmpty
     - Name: $v
       Entry: 7
-      Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: useDefaultWhenEmpty
@@ -536,13 +548,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 7
-      Data: 36|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 37|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -566,7 +578,7 @@ MonoBehaviour:
       Data: useSync
     - Name: $v
       Entry: 7
-      Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: useSync
@@ -590,13 +602,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 7
-      Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 40|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -620,7 +632,7 @@ MonoBehaviour:
       Data: onlyDigit
     - Name: $v
       Entry: 7
-      Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: onlyDigit
@@ -644,13 +656,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 7
-      Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -674,13 +686,13 @@ MonoBehaviour:
       Data: lengthLimit
     - Name: $v
       Entry: 7
-      Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: lengthLimit
     - Name: <UserType>k__BackingField
       Entry: 7
-      Data: 44|System.RuntimeType, mscorlib
+      Data: 45|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
       Data: System.Int32, mscorlib
@@ -689,7 +701,7 @@ MonoBehaviour:
       Data: 
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 44
+      Data: 45
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -704,13 +716,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 7
-      Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -734,7 +746,7 @@ MonoBehaviour:
       Data: _syncedValue
     - Name: $v
       Entry: 7
-      Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: _syncedValue
@@ -758,19 +770,19 @@ MonoBehaviour:
       Data: false
     - Name: _fieldAttributes
       Entry: 7
-      Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 2
     - Name: 
       Entry: 7
-      Data: 49|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
     - Name: 
       Entry: 8
       Data: 
     - Name: 
       Entry: 7
-      Data: 50|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+      Data: 51|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
     - Name: 
       Entry: 8
       Data: 
@@ -794,7 +806,7 @@ MonoBehaviour:
       Data: _value
     - Name: $v
       Entry: 7
-      Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: _value
@@ -818,7 +830,7 @@ MonoBehaviour:
       Data: false
     - Name: _fieldAttributes
       Entry: 7
-      Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0

diff --git a/...stomValue/MString/UdonAsset/SerializedUdonPrograms/2873b3c18704c664c8da36d6d4f0c0d0.asset b/...stomValue/MString/UdonAsset/SerializedUdonPrograms/2873b3c18704c664c8da36d6d4f0c0d0.asset
diff --git a/...ustomValue/MValue/UdonAsset/SerializedUdonPrograms/0d522a9d41a707740ac292922238ca27.asset b/...ustomValue/MValue/UdonAsset/SerializedUdonPrograms/0d522a9d41a707740ac292922238ca27.asset
diff --git a/Packages/com.wakvrc.m-udons/Runtime/MAnimation/Animations/TriggerAnimatorTemplate.controller b/Packages/com.wakvrc.m-udons/Runtime/MAnimation/Animations/TriggerAnimatorTemplate.controller
@@ -219,7 +219,7 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 0}
+    m_Controller: {fileID: 9100000}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer

diff --git a/Packages/com.wakvrc.m-udons/Runtime/MAnimation/Scripts/MAnimator.cs b/Packages/com.wakvrc.m-udons/Runtime/MAnimation/Scripts/MAnimator.cs
@@ -5,6 +5,8 @@ namespace Mascari4615
 {
 	public class MAnimator : MBase
 	{
+		public const string STATE_STRING = "STATE";
+
 		[field: Header("_" + nameof(MAnimator))]
 		[field: SerializeField] public Animator[] Animators { get; private set; }
 		[SerializeField] private string boolName;

diff --git a/...Runtime/MPathCart/UdonAsset/SerializedUdonPrograms/6da713b2a5ad2c1479ebae33edb64d24.asset b/...Runtime/MPathCart/UdonAsset/SerializedUdonPrograms/6da713b2a5ad2c1479ebae33edb64d24.asset
diff --git a/Packages/com.wakvrc.m-udons/Runtime/MSound/SFXManager/Scripts/UIMSFXManager.cs b/Packages/com.wakvrc.m-udons/Runtime/MSound/SFXManager/Scripts/UIMSFXManager.cs
@@ -6,8 +6,10 @@ namespace Mascari4615
 	[UdonBehaviourSyncMode(BehaviourSyncMode.None)]
 	public class UIMSFXManager : MBase
 	{
+		[Header("_" + nameof(UIMSFXManager))]
 		[SerializeField] private MSFXManager sfxManager;
 		[SerializeField] private bool global = false;
+
 		private UIMSFXManagerButton[] buttons;
 
 		private void Start()

diff --git a/Packages/com.wakvrc.m-udons/Runtime/MSound/SFXManager/UdonAsset/UIMSFXManager.asset b/Packages/com.wakvrc.m-udons/Runtime/MSound/SFXManager/UdonAsset/UIMSFXManager.asset
@@ -161,10 +161,19 @@ MonoBehaviour:
       Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
-      Data: 1
+      Data: 2
     - Name: 
       Entry: 7
-      Data: 11|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 11|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
+    - Name: header
+      Entry: 1
+      Data: _UIMSFXManager
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 12|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -188,7 +197,7 @@ MonoBehaviour:
       Data: global
     - Name: $v
       Entry: 7
-      Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: global
@@ -212,13 +221,13 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 1
     - Name: 
       Entry: 7
-      Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 15|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -242,13 +251,13 @@ MonoBehaviour:
       Data: buttons
     - Name: $v
       Entry: 7
-      Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: buttons
     - Name: <UserType>k__BackingField
       Entry: 7
-      Data: 16|System.RuntimeType, mscorlib
+      Data: 17|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
       Data: Mascari4615.UIMSFXManagerButton[], MUdons
@@ -257,7 +266,7 @@ MonoBehaviour:
       Data: 
     - Name: <SystemType>k__BackingField
       Entry: 7
-      Data: 17|System.RuntimeType, mscorlib
+      Data: 18|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
       Data: UnityEngine.Component[], UnityEngine.CoreModule
@@ -278,7 +287,7 @@ MonoBehaviour:
       Data: false
     - Name: _fieldAttributes
       Entry: 7
-      Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0

diff --git a/...s/Runtime/MTarget/UdonAsset/SerializedUdonPrograms/4e8d8b308398c0943a8721f32d7f486a.asset b/...s/Runtime/MTarget/UdonAsset/SerializedUdonPrograms/4e8d8b308398c0943a8721f32d7f486a.asset
diff --git a/...ons/Runtime/MTeam/UdonAsset/SerializedUdonPrograms/248005fd7bff6554f99da88638311ea8.asset b/...ons/Runtime/MTeam/UdonAsset/SerializedUdonPrograms/248005fd7bff6554f99da88638311ea8.asset
diff --git a/...ons/Runtime/MTeam/UdonAsset/SerializedUdonPrograms/cff78f81efb7b76469e7ff892ba0742c.asset b/...ons/Runtime/MTeam/UdonAsset/SerializedUdonPrograms/cff78f81efb7b76469e7ff892ba0742c.asset
diff --git a/Packages/com.wakvrc.m-udons/Runtime/MUI/CustomValueUISetter.meta b/Packages/com.wakvrc.m-udons/Runtime/MUI/CustomValueUISetter.meta
diff --git a/Packages/com.wakvrc.m-udons/Runtime/MUI/CustomValueUISetter/Prefabs.meta b/Packages/com.wakvrc.m-udons/Runtime/MUI/CustomValueUISetter/Prefabs.meta
diff --git a/Packages/com.wakvrc.m-udons/Runtime/MUI/CustomValueUISetter/Scripts.meta b/Packages/com.wakvrc.m-udons/Runtime/MUI/CustomValueUISetter/Scripts.meta