Made the spinning newspaper a render target so it can be shown on camera.

2025-12-27 17:42:21 -05:00
parent 3dec7c19ee
commit af259fa188
28 changed files with 1475 additions and 384 deletions
@@ -44,7 +44,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 22
+      Data: 23
    - Name: 
      Entry: 7
      Data: 
@@ -728,19 +728,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _EndingPlayer
+      Data: _NewspaperPublicDisplay
    - Name: $v
      Entry: 7
      Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _EndingPlayer
+      Data: _NewspaperPublicDisplay
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 49|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
-      Data: RandomVideoPlayer, Assembly-CSharp
+      Data: NewspaperDisplay, Assembly-CSharp
    - Name: 
      Entry: 8
      Data: 
@@ -788,58 +788,46 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _CurrentlyActiveMap
+      Data: _EndingPlayer
    - Name: $v
      Entry: 7
      Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _CurrentlyActiveMap
+      Data: _EndingPlayer
    - Name: <UserType>k__BackingField
      Entry: 7
      Data: 53|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: 54|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: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
-      Data: 2
+      Data: 1
    - Name: 
      Entry: 7
-      Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 57|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
+      Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule
    - Name: 
      Entry: 8
      Data: 
@@ -860,19 +848,31 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _ActiveMarker
+      Data: _CurrentlyActiveMap
    - Name: $v
      Entry: 7
-      Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _ActiveMarker
+      Data: _CurrentlyActiveMap
    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 54
+      Entry: 7
+      Data: 57|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: ContinentMap, Assembly-CSharp
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 54
+      Entry: 7
+      Data: 58|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
@@ -920,19 +920,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _StageIndex
+      Data: _ActiveMarker
    - Name: $v
      Entry: 7
      Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _StageIndex
+      Data: _ActiveMarker
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 54
+      Data: 58
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 54
+      Data: 58
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -950,13 +950,73 @@ MonoBehaviour:
      Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
-      Data: 1
+      Data: 2
    - Name: 
      Entry: 7
      Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
+    - Name: 
+      Entry: 7
+      Data: 65|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: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _StageIndex
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 58
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 58
+    - 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: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 68|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+    - Name: 
+      Entry: 8
+      Data: 
    - Name: 
      Entry: 13
      Data: 
@@ -977,13 +1037,13 @@ MonoBehaviour:
      Data: _ContinentData
    - Name: $v
      Entry: 7
-      Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _ContinentData
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 66|System.RuntimeType, mscorlib
+      Data: 70|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
@@ -992,7 +1052,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 66
+      Data: 70
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1007,7 +1067,7 @@ 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: 0
@@ -1031,13 +1091,13 @@ MonoBehaviour:
      Data: _GameStatus
    - Name: $v
      Entry: 7
-      Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _GameStatus
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 69|System.RuntimeType, mscorlib
+      Data: 73|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: GameStatus, Assembly-CSharp
@@ -1046,7 +1106,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 54
+      Data: 58
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1061,13 +1121,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 75|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -1091,7 +1151,7 @@ MonoBehaviour:
      Data: _RunTimer
    - Name: $v
      Entry: 7
-      Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _RunTimer
@@ -1115,13 +1175,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 78|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -1145,16 +1205,16 @@ MonoBehaviour:
      Data: _Timer
    - Name: $v
      Entry: 7
-      Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _Timer
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 54
+      Data: 58
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 54
+      Data: 58
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1169,13 +1229,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 81|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -1197,78 +1257,18 @@ MonoBehaviour:
    - Name: $k
      Entry: 1
      Data: _SuccessCounter
-    - Name: $v
-      Entry: 7
-      Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
-    - Name: <Name>k__BackingField
-      Entry: 1
-      Data: _SuccessCounter
-    - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 54
-    - Name: <SystemType>k__BackingField
-      Entry: 9
-      Data: 54
-    - 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: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
-    - Name: 
-      Entry: 12
-      Data: 2
-    - Name: 
-      Entry: 7
-      Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 81|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: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _FailureCounter
+      Data: _SuccessCounter
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 54
+      Data: 58
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 54
+      Data: 58
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1316,16 +1316,76 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _CameraControllerRound3
+      Data: _FailureCounter
    - Name: $v
      Entry: 7
      Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _FailureCounter
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 58
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 58
+    - 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: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 2
+    - Name: 
+      Entry: 7
+      Data: 88|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 89|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: _CameraControllerRound3
+    - Name: $v
+      Entry: 7
+      Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _CameraControllerRound3
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 87|System.RuntimeType, mscorlib
+      Data: 91|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: CameraControllerRound3, Assembly-CSharp
@@ -1349,7 +1409,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -37,6 +37,7 @@ public class GameManagerRound3 : GameManagerBase
 	[SerializeField] private FloorMap[] _Maps;
 	[SerializeField] private FloorMapMarker[] _Markers;
 	[SerializeField] private CaptureCarmenNewspaper _CaptureCarmenNewspaper;
+	[SerializeField] private NewspaperDisplay _NewspaperPublicDisplay;
 	[SerializeField] private RandomVideoPlayer _EndingPlayer;

 	[UdonSynced, FieldChangeCallback(nameof(CurrentlyActiveMap))] private ContinentMap _CurrentlyActiveMap = ContinentMap.INDEX_MAX;
@@ -86,6 +87,10 @@ public class GameManagerRound3 : GameManagerBase
 		InitialiseMarkers();
 		GetCurrentMap().RandomiseCountries();

+		_EndingPlayer.PlayVideo = false;
+		_CaptureCarmenNewspaper.ResetAnimation();
+		_NewspaperPublicDisplay.Activate(false);
+
 		SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false);

 		_CameraControllerRound3.InitialiseCameras();
@@ -110,6 +115,7 @@ public class GameManagerRound3 : GameManagerBase
 			Networking.SetOwner(NewOwner, _Markers[i].gameObject);

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

 		Networking.SetOwner(NewOwner, _CameraController.gameObject);
@@ -352,6 +358,8 @@ public class GameManagerRound3 : GameManagerBase
 		}

 		_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = false;
+		_CameraControllerRound3.DisableAllSwitchers();
+		_CameraControllerRound3.SwitchToFrontCamera();
 	}
 	public void PlayWindDownMusic()
 	{
@@ -364,8 +372,9 @@ public class GameManagerRound3 : GameManagerBase
 	public void EndCarmenInJailSFX()
 	{
 		_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "StopSFX");
-		
-		_CaptureCarmenNewspaper.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayWinAnimation", GetRound3PlayerName());
+
+		_CaptureCarmenNewspaper.PlayWinAnimation(GetRound3PlayerName());
+		_NewspaperPublicDisplay.Activate(true);
 	}

 	[NetworkCallable]
@@ -393,11 +402,14 @@ public class GameManagerRound3 : GameManagerBase
 		}

 		_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = false;
+		_CameraControllerRound3.DisableAllSwitchers();
+		_CameraControllerRound3.SwitchToFrontCamera();
 	}

 	public void PlayNewspaperLoseAnimation()
 	{
-		_CaptureCarmenNewspaper.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayLoseAnimation");
+		_CaptureCarmenNewspaper.PlayLoseAnimation();
+		_NewspaperPublicDisplay.Activate(true);
 	}

 	
@@ -408,6 +420,8 @@ public class GameManagerRound3 : GameManagerBase
 		Interface.HeaderUI.text = "Rockin' it a capella";
 		Interface.CommentUI.text = "";

+		_NewspaperPublicDisplay.Activate(false);
+
 		_CameraControllerRound3.PlayDoItRockapella(true);

 		_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic");