Added a newspaper for round 3 that declares whether Carmen was caught.

2025-09-24 00:03:25 -04:00
parent 1866a92c8a
commit f52b030ded
38 changed files with 5700 additions and 7098 deletions
@@ -44,7 +44,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 19
+      Data: 20
    - Name: 
      Entry: 7
      Data: 
@@ -599,19 +599,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _EndingPlayer
+      Data: _CaptureCarmenNewspaper
    - Name: $v
      Entry: 7
      Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _EndingPlayer
+      Data: _CaptureCarmenNewspaper
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 40|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: RandomVideoPlayer, Assembly-CSharp
+      Data: CaptureCarmenNewspaper, Assembly-CSharp
    - Name: 
      Entry: 8
      Data: 
@@ -659,58 +659,46 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _CurrentlyActiveMap
+      Data: _EndingPlayer
    - Name: $v
      Entry: 7
      Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _CurrentlyActiveMap
+      Data: _EndingPlayer
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 44|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: ContinentMap, Assembly-CSharp
+      Data: RandomVideoPlayer, Assembly-CSharp
    - Name: 
      Entry: 8
      Data: 
    - Name: <SystemType>k__BackingField
-      Entry: 7
-      Data: 45|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: System.Int32, mscorlib
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 4
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
    - Name: 
-      Entry: 3
-      Data: 1
+      Entry: 6
+      Data: 
    - Name: 
      Entry: 8
      Data: 
    - Name: <IsSerialized>k__BackingField
      Entry: 5
-      Data: false
+      Data: true
    - Name: _fieldAttributes
      Entry: 7
-      Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
-      Data: 2
+      Data: 1
    - Name: 
      Entry: 7
-      Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 48|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+      Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule
    - Name: 
      Entry: 8
      Data: 
@@ -731,19 +719,31 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _ActiveMarker
+      Data: _CurrentlyActiveMap
    - Name: $v
      Entry: 7
-      Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _ActiveMarker
+      Data: _CurrentlyActiveMap
    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 45
+      Entry: 7
+      Data: 48|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: ContinentMap, Assembly-CSharp
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 45
+      Entry: 7
+      Data: 49|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: System.Int32, mscorlib
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -791,19 +791,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _StageIndex
+      Data: _ActiveMarker
    - Name: $v
      Entry: 7
      Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _StageIndex
+      Data: _ActiveMarker
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 45
+      Data: 49
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 45
+      Data: 49
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -821,13 +821,73 @@ MonoBehaviour:
      Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
-      Data: 1
+      Data: 2
    - Name: 
      Entry: 7
      Data: 55|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
+    - Name: 
+      Entry: 7
+      Data: 56|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+    - 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: _StageIndex
+    - Name: $v
+      Entry: 7
+      Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _StageIndex
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 49
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 49
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 3
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 59|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: 
      Entry: 13
      Data: 
@@ -848,13 +908,13 @@ MonoBehaviour:
      Data: _ContinentData
    - Name: $v
      Entry: 7
-      Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _ContinentData
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 57|System.RuntimeType, mscorlib
+      Data: 61|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
@@ -863,7 +923,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 57
+      Data: 61
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -878,7 +938,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -902,13 +962,13 @@ MonoBehaviour:
      Data: _GameStatus
    - Name: $v
      Entry: 7
-      Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _GameStatus
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 60|System.RuntimeType, mscorlib
+      Data: 64|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: GameStatus, Assembly-CSharp
@@ -917,7 +977,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 45
+      Data: 49
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -932,13 +992,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -962,7 +1022,7 @@ MonoBehaviour:
      Data: _RunTimer
    - Name: $v
      Entry: 7
-      Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _RunTimer
@@ -986,13 +1046,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 65|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -1016,16 +1076,16 @@ MonoBehaviour:
      Data: _Timer
    - Name: $v
      Entry: 7
-      Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _Timer
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 45
+      Data: 49
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 45
+      Data: 49
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1040,13 +1100,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 72|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -1068,78 +1128,18 @@ MonoBehaviour:
    - Name: $k
      Entry: 1
      Data: _SuccessCounter
-    - Name: $v
-      Entry: 7
-      Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: _SuccessCounter
-    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 45
-    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 45
-    - Name: <SyncMode>k__BackingField
-      Entry: 7
-      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
-    - Name: 
-      Entry: 3
-      Data: 1
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: <IsSerialized>k__BackingField
-      Entry: 5
-      Data: false
-    - Name: _fieldAttributes
-      Entry: 7
-      Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 2
-    - Name: 
-      Entry: 7
-      Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 72|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
-    - 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: _FailureCounter
    - Name: $v
      Entry: 7
      Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _FailureCounter
+      Data: _SuccessCounter
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 45
+      Data: 49
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 45
+      Data: 49
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1182,6 +1182,66 @@ MonoBehaviour:
    - Name: 
      Entry: 8
      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: _FailureCounter
+    - Name: $v
+      Entry: 7
+      Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _FailureCounter
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 49
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 49
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 3
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 2
+    - Name: 
+      Entry: 7
+      Data: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 80|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: 
      Entry: 13
      Data: 
@@ -36,6 +36,7 @@ public class GameManagerRound3 : GameManagerBase

 	[SerializeField] private FloorMap[] _Maps;
 	[SerializeField] private FloorMapMarker[] _Markers;
+	[SerializeField] private CaptureCarmenNewspaper _CaptureCarmenNewspaper;
 	[SerializeField] private RandomVideoPlayer _EndingPlayer;

 	[UdonSynced, FieldChangeCallback(nameof(CurrentlyActiveMap))] private ContinentMap _CurrentlyActiveMap = ContinentMap.INDEX_MAX;
@@ -91,6 +92,7 @@ public class GameManagerRound3 : GameManagerBase
 		for (int i = 0; i < _Markers.Length; i++)
 			Networking.SetOwner(NewOwner, _Markers[i].gameObject);

+		Networking.SetOwner(NewOwner, _CaptureCarmenNewspaper.gameObject);
 		Networking.SetOwner(NewOwner, _EndingPlayer.gameObject);

 		base.SetOwnershipOfObjects(NewOwner);
@@ -321,6 +323,14 @@ public class GameManagerRound3 : GameManagerBase
 	public void EndCarmenInJailSFX()
 	{
 		_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "StopSFX");
+		string[] CurrentWinner = _CaseManager.GetCurrentWinningPlayers();
+		
+		if (CurrentWinner == null || CurrentWinner.Length != 1)
+		{
+			CurrentWinner = new string[1];
+			CurrentWinner[0] = Networking.GetOwner(gameObject).displayName;
+		}
+		_CaptureCarmenNewspaper.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayWinAnimation", CurrentWinner[0]);
 	}

 	[NetworkCallable]
@@ -341,9 +351,15 @@ public class GameManagerRound3 : GameManagerBase

 			_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "StopMusic");
 			SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 2.5f);
+			SendCustomEventDelayedSeconds(nameof(PlayNewspaperLoseAnimation), 3.0f);
 		}
 	}

+	public void PlayNewspaperLoseAnimation()
+	{
+		_CaptureCarmenNewspaper.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayLoseAnimation");
+	}
+
 	
 	private void DoItRockapella()
 	{