Stopping videos now also resets the video index variable.

2025-08-21 15:19:26 -04:00 · 2025-08-21 15:19:26 -04:00 · a4f9c416a4
commit a4f9c416a4
parent 8dd9c5ce74
11 changed files with 35 additions and 29 deletions
--- a/Assets/Scenes/witwics.unity
+++ b/Assets/Scenes/witwics.unity
@ -72853,35 +72853,35 @@ MonoBehaviour:
  useAssignedLayers: 0
  DynamicPrefabs: []
  DynamicMaterials:
-  - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
-  - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
+  - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
  - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
-  - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2}
-  - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
  - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
  - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
  - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
-  - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
  - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
-  - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
-  - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
+  - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
+  - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
  - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
  - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2}
  - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
  - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
+  - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
  - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
+  - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
+  - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
  - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2}
  - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
-  - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
-  - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
-  - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
-  - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
+  - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2}
  - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
-  - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
+  - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
+  - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
  - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
+  - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
+  - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
+  - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
  - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
+  - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
  LightMapsNear: []
  LightMapsFar: []
  LightMode: 0
--- a/Assets/UdonSharp/CaseVideoSyncPlayer.cs
+++ b/Assets/UdonSharp/CaseVideoSyncPlayer.cs
@ -202,7 +202,6 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour
 		if (VideoIndex < _CaseManager.GetVideoCount())
 		{
 			_VideoPlayer.LoadURL(_CaseManager.GetVideo(VideoIndex));
-			RequestSerialization();
 		}
 		else
 		{
@ -223,6 +222,9 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour
 		Debug.LogWarning("[CaseVideoSyncPlayer] Stopping video " + VideoIndex + ".");

 		_VideoPlayer.Stop();
+
+		VideoIndex = -1;
+		RequestSerialization();
 	}

 	public override void OnVideoReady()
@ -394,7 +396,11 @@ public class CaseVideoSyncPlayer : UdonSharpBehaviour
 		set
 		{
 			_VideoIndex = value;
-			_LoadVideo_Private();
+			if (_VideoIndex >= 0)
+			{
+				_LoadVideo_Private();
+			}
+			RequestSerialization();
 		}
 		get => _VideoIndex;
 	}
--- a/Managers/CaseManager.cs
+++ b/Managers/CaseManager.cs
@ -41,10 +41,10 @@ public class CaseManager : UdonSharpBehaviour

 	[UdonSynced] private VRCUrl _CaseFileCluesURL;
 	[UdonSynced] private VRCUrl _CaseFileLootImage;
-	[UdonSynced] private VRCUrl[] _CaseFileMaps;
-	[UdonSynced] private VRCUrl[] _CaseFileVideos;
-	[UdonSynced] private VRCUrl[] _CaseFileVideosFallback;
-	[UdonSynced] private VRCUrl[] _CaseFileClueImages;
+	[UdonSynced] private VRCUrl[] _CaseFileMaps = new VRCUrl[0];
+	[UdonSynced] private VRCUrl[] _CaseFileVideos = new VRCUrl[0];
+	[UdonSynced] private VRCUrl[] _CaseFileVideosFallback = new VRCUrl[0];
+	[UdonSynced] private VRCUrl[] _CaseFileClueImages = new VRCUrl[0];

 	[UdonSynced] private string _CaseTitle = "";
 	[UdonSynced] private string _CaseDescription = "";
--- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
+++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
  m_Name: BoneFollower
  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
    type: 2}
  udonAssembly: 
  assemblyError: 
--- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
+++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
  m_Name: InteractToggle
  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
    type: 2}
  udonAssembly: 
  assemblyError: 
--- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
+++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
  m_Name: PlayerModSetter
  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
    type: 2}
  udonAssembly: 
  assemblyError: 
--- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
+++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
  m_Name: GlobalToggleObject
  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
    type: 2}
  udonAssembly: 
  assemblyError: 
--- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
+++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
  m_Name: MasterToggleObject
  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
    type: 2}
  udonAssembly: 
  assemblyError: 
--- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
+++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
  m_Name: TrackingDataFollower
  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
    type: 2}
  udonAssembly: 
  assemblyError: 
--- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
+++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
  m_Name: WorldAudioSettings
  m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
    type: 2}
  udonAssembly: 
  assemblyError: 
--- a/ProjectSettings/AudioManager.asset
+++ b/ProjectSettings/AudioManager.asset
@ -10,8 +10,8 @@ AudioManager:
  Default Speaker Mode: 2
  m_SampleRate: 48000
  m_DSPBufferSize: 1024
-  m_VirtualVoiceCount: 64
-  m_RealVoiceCount: 32
+  m_VirtualVoiceCount: 32
+  m_RealVoiceCount: 24
  m_EnableOutputSuspension: 1
  m_SpatializerPlugin: OculusSpatializer
  m_AmbisonicDecoderPlugin: OculusSpatializer