ActualHorse/CarmenSandiego
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects Releases Wiki Activity

- Added extra camera switches to the tiebreaker in round 1.

Browse Source 
- Fixed the buzzers in the tiebreaker round not resetting correctly.
- Added functions to AudioManager to check if music or effects are playing.
- Added extra camera switches to the end of round 2.
This commit is contained in:
Jamie Greunbaum 2025-12-26 13:57:22 -05:00
parent 744a794707
commit 0ed7e328d6
8 changed files with 818 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

866
Assets/Scenes/witwics.unity
View File

File diff suppressed because it is too large Load Diff

10
Assets/UdonSharp/AudioManager.cs
View File

@ -237,6 +237,11 @@ public class AudioManager : UdonSharpBehaviour
_FadeOutMusic = true; _FadeOutMusic = true;
} }
public bool IsMusicPlaying()
{
return _MusicPlayer.isPlaying;
}
private void _PlayMusic_Internal(MusicEventType MusicEvent, bool Loop) private void _PlayMusic_Internal(MusicEventType MusicEvent, bool Loop)
{ {
_MusicPlayer.Stop(); _MusicPlayer.Stop();
@ -304,6 +309,11 @@ public class AudioManager : UdonSharpBehaviour
_PlaySFX_Internal(SFXEventType.None); _PlaySFX_Internal(SFXEventType.None);
} }
public bool IsSFXPlaying()
{
return _SFXPlayer.isPlaying;
}
private void _PlaySFX_Internal(SFXEventType SFXEvent, bool Loop = false, float Pitch = 1.0f) private void _PlaySFX_Internal(SFXEventType SFXEvent, bool Loop = false, float Pitch = 1.0f)
{ {
_SFXPlayer.Stop(); _SFXPlayer.Stop();

234
Assets/UdonSharp/Cameras/CameraControllerRound1.asset
View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 26 Data: 27
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -755,13 +755,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: LightningCorrectToHostAndAllPlayersTimerToggle Data: CorrectToHostAndAllPlayersTimerToggle
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: LightningCorrectToHostAndAllPlayersTimerToggle Data: CorrectToHostAndAllPlayersTimerToggle
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 33 Data: 33
@ -809,13 +809,13 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: LightningIncorrectToHostAndAllPlayersTimerToggle Data: IncorrectToHostAndAllPlayersTimerToggle
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: LightningIncorrectToHostAndAllPlayersTimerToggle Data: IncorrectToHostAndAllPlayersTimerToggle
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 33 Data: 33
@ -917,16 +917,70 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: Player1CameraAnchor Data: BuzzedInPlayerTimerToggle
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: BuzzedInPlayerTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 33
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 57|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: Player1CameraAnchor
- Name: $v
Entry: 7
Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: Player1CameraAnchor Data: Player1CameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 56|System.RuntimeType, mscorlib Data: 59|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: CameraAnchor, Assembly-CSharp Data: CameraAnchor, Assembly-CSharp
@ -950,73 +1004,19 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 58|UnityEngine.SpaceAttribute, UnityEngine.CoreModule Data: 61|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height - Name: height
Entry: 4 Entry: 4
Data: 8 Data: 8
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data: 59|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: Player2CameraAnchor
- Name: $v
Entry: 7
Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player2CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 56
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -1040,16 +1040,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: Player3CameraAnchor Data: Player2CameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: Player3CameraAnchor Data: Player2CameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1094,16 +1094,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: HostCameraAnchor Data: Player3CameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: HostCameraAnchor Data: Player3CameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1148,16 +1148,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: DefaultWideShotCameraAnchor Data: HostCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: DefaultWideShotCameraAnchor Data: HostCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1202,16 +1202,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: VideoPlayerCameraAnchor Data: DefaultWideShotCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: VideoPlayerCameraAnchor Data: DefaultWideShotCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1256,16 +1256,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: AllPlayersViewCameraAnchor Data: VideoPlayerCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: AllPlayersViewCameraAnchor Data: VideoPlayerCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1310,16 +1310,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: VideoMusicClueCameraAnchor Data: AllPlayersViewCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: VideoMusicClueCameraAnchor Data: AllPlayersViewCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1364,16 +1364,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: ACMECrimenetComputerCameraAnchor Data: VideoMusicClueCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: ACMECrimenetComputerCameraAnchor Data: VideoMusicClueCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1418,16 +1418,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: FilingCabinetCameraAnchor Data: ACMECrimenetComputerCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: FilingCabinetCameraAnchor Data: ACMECrimenetComputerCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1472,16 +1472,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: ModemCameraAnchor Data: FilingCabinetCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: ModemCameraAnchor Data: FilingCabinetCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1521,6 +1521,60 @@ MonoBehaviour:
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data:
- Name: $k
Entry: 1
Data: ModemCameraAnchor
- Name: $v
Entry: 7
Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: ModemCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 59
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 92|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: - Name:
Entry: 13 Entry: 13
Data: Data:

67
Assets/UdonSharp/Cameras/CameraControllerRound1.cs
View File

@ -23,9 +23,10 @@ public class CameraControllerRound1 : CameraControllerBase
[SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher HostAndIndividualPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher MapToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher MapToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher LightningStartToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher LightningStartToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher LightningCorrectToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher CorrectToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher LightningIncorrectToHostAndAllPlayersTimerToggle; [SerializeField] public CameraTimedSwitcher IncorrectToHostAndAllPlayersTimerToggle;
[SerializeField] public CameraTimedSwitcher ThinkAboutItTimerToggle; [SerializeField] public CameraTimedSwitcher ThinkAboutItTimerToggle;
[SerializeField] public CameraTimedSwitcher BuzzedInPlayerTimerToggle;
[Space] [Space]
[SerializeField] public CameraAnchor Player1CameraAnchor; [SerializeField] public CameraAnchor Player1CameraAnchor;
[SerializeField] public CameraAnchor Player2CameraAnchor; [SerializeField] public CameraAnchor Player2CameraAnchor;
@ -66,9 +67,10 @@ public class CameraControllerRound1 : CameraControllerBase
Networking.SetOwner(Player, HostAndIndividualPlayersTimerToggle.gameObject); Networking.SetOwner(Player, HostAndIndividualPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, MapToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, MapToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, LightningStartToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, LightningStartToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, LightningCorrectToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, CorrectToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, LightningIncorrectToHostAndAllPlayersTimerToggle.gameObject); Networking.SetOwner(Player, IncorrectToHostAndAllPlayersTimerToggle.gameObject);
Networking.SetOwner(Player, ThinkAboutItTimerToggle.gameObject); Networking.SetOwner(Player, ThinkAboutItTimerToggle.gameObject);
Networking.SetOwner(Player, BuzzedInPlayerTimerToggle.gameObject);
Networking.SetOwner(Player, Player1CameraAnchor.gameObject); Networking.SetOwner(Player, Player1CameraAnchor.gameObject);
Networking.SetOwner(Player, Player2CameraAnchor.gameObject); Networking.SetOwner(Player, Player2CameraAnchor.gameObject);
@ -181,9 +183,10 @@ public class CameraControllerRound1 : CameraControllerBase
HostAndIndividualPlayersTimerToggle.Activate = false; HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = false; MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false; LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = false; CorrectToHostAndAllPlayersTimerToggle.Activate = false;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = false; IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = false; ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = false;
} }
public void ActivateHostIndividualPlayersCameraSwitcher() public void ActivateHostIndividualPlayersCameraSwitcher()
@ -192,9 +195,10 @@ public class CameraControllerRound1 : CameraControllerBase
HostAndIndividualPlayersTimerToggle.Activate = true; HostAndIndividualPlayersTimerToggle.Activate = true;
MapToHostAndAllPlayersTimerToggle.Activate = false; MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false; LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = false; CorrectToHostAndAllPlayersTimerToggle.Activate = false;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = false; IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = false; ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = false;
} }
public void ActivateMapToHostAllPlayersCameraSwitcher() public void ActivateMapToHostAllPlayersCameraSwitcher()
@ -203,9 +207,10 @@ public class CameraControllerRound1 : CameraControllerBase
HostAndIndividualPlayersTimerToggle.Activate = false; HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = true; MapToHostAndAllPlayersTimerToggle.Activate = true;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false; LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = false; CorrectToHostAndAllPlayersTimerToggle.Activate = false;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = false; IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = false; ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = false;
} }
public void ActivateLightningStartToHostAllPlayersCameraSwitcher() public void ActivateLightningStartToHostAllPlayersCameraSwitcher()
@ -215,31 +220,34 @@ public class CameraControllerRound1 : CameraControllerBase
HostAndIndividualPlayersTimerToggle.Activate = false; HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = false; MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = true; LightningStartToHostAndAllPlayersTimerToggle.Activate = true;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = false; CorrectToHostAndAllPlayersTimerToggle.Activate = false;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = false; IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = false; ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = false;
} }
public void ActivateLightningCorrectAnswerToHostAllPlayersCameraSwitcher() public void ActivateCorrectAnswerToHostAllPlayersCameraSwitcher()
{ {
HostAndAllPlayersTimerToggle.Activate = false; HostAndAllPlayersTimerToggle.Activate = false;
HostAndIndividualPlayersTimerToggle.Activate = false; HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = false; MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false; LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = true; CorrectToHostAndAllPlayersTimerToggle.Activate = true;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = false; IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = false; ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = false;
} }
public void ActivateLightningIncorrectAnswerToHostAllPlayersCameraSwitcher() public void ActivateIncorrectAnswerToHostAllPlayersCameraSwitcher()
{ {
HostAndAllPlayersTimerToggle.Activate = false; HostAndAllPlayersTimerToggle.Activate = false;
HostAndIndividualPlayersTimerToggle.Activate = false; HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = false; MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false; LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = false; CorrectToHostAndAllPlayersTimerToggle.Activate = false;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = true; IncorrectToHostAndAllPlayersTimerToggle.Activate = true;
ThinkAboutItTimerToggle.Activate = false; ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = false;
} }
public void ActivateThinkAboutItCameraSwitcher() public void ActivateThinkAboutItCameraSwitcher()
@ -248,9 +256,22 @@ public class CameraControllerRound1 : CameraControllerBase
HostAndIndividualPlayersTimerToggle.Activate = false; HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = false; MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false; LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = false; CorrectToHostAndAllPlayersTimerToggle.Activate = false;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = false; IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = true; ThinkAboutItTimerToggle.Activate = true;
BuzzedInPlayerTimerToggle.Activate = false;
}
public void ActivateBuzzedInPlayerCameraSwitcher()
{
HostAndAllPlayersTimerToggle.Activate = false;
HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
CorrectToHostAndAllPlayersTimerToggle.Activate = false;
IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = true;
} }
@ -275,7 +296,9 @@ public class CameraControllerRound1 : CameraControllerBase
HostAndIndividualPlayersTimerToggle.Activate = false; HostAndIndividualPlayersTimerToggle.Activate = false;
MapToHostAndAllPlayersTimerToggle.Activate = false; MapToHostAndAllPlayersTimerToggle.Activate = false;
LightningStartToHostAndAllPlayersTimerToggle.Activate = false; LightningStartToHostAndAllPlayersTimerToggle.Activate = false;
LightningCorrectToHostAndAllPlayersTimerToggle.Activate = false; CorrectToHostAndAllPlayersTimerToggle.Activate = false;
LightningIncorrectToHostAndAllPlayersTimerToggle.Activate = false; IncorrectToHostAndAllPlayersTimerToggle.Activate = false;
ThinkAboutItTimerToggle.Activate = false;
BuzzedInPlayerTimerToggle.Activate = false;
} }
} }

214
Assets/UdonSharp/Cameras/CameraControllerRound2.asset
View File

@ -44,7 +44,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 12 Entry: 12
Data: 23 Data: 24
- Name: - Name:
Entry: 7 Entry: 7
Data: Data:
@ -917,16 +917,70 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: Player1CameraAnchor Data: VideoPlayerToWinningPlayerTimerToggle
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: VideoPlayerToWinningPlayerTimerToggle
- Name: <UserType>k__BackingField
Entry: 9
Data: 33
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 57|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: Player1CameraAnchor
- Name: $v
Entry: 7
Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: Player1CameraAnchor Data: Player1CameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 7 Entry: 7
Data: 56|System.RuntimeType, mscorlib Data: 59|System.RuntimeType, mscorlib
- Name: - Name:
Entry: 1 Entry: 1
Data: CameraAnchor, Assembly-CSharp Data: CameraAnchor, Assembly-CSharp
@ -950,73 +1004,19 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 58|UnityEngine.SpaceAttribute, UnityEngine.CoreModule Data: 61|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height - Name: height
Entry: 4 Entry: 4
Data: 8 Data: 8
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
- Name:
Entry: 7
Data: 59|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: Player2CameraAnchor
- Name: $v
Entry: 7
Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: Player2CameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 56
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule
@ -1040,16 +1040,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: HostAndWinnerCameraAnchor Data: Player2CameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: HostAndWinnerCameraAnchor Data: Player2CameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1094,16 +1094,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: LocationBoardCameraAnchor Data: HostAndWinnerCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: LocationBoardCameraAnchor Data: HostAndWinnerCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1148,16 +1148,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: ModemCameraAnchor Data: LocationBoardCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: ModemCameraAnchor Data: LocationBoardCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1202,16 +1202,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: VideoPlayerCameraAnchor Data: ModemCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: VideoPlayerCameraAnchor Data: ModemCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1256,16 +1256,16 @@ MonoBehaviour:
Data: Data:
- Name: $k - Name: $k
Entry: 1 Entry: 1
Data: WideShotCameraAnchor Data: VideoPlayerCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: WideShotCameraAnchor Data: VideoPlayerCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1284,12 +1284,66 @@ MonoBehaviour:
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
Data: 77|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: WideShotCameraAnchor
- Name: $v
Entry: 7
Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField
Entry: 1
Data: WideShotCameraAnchor
- Name: <UserType>k__BackingField
Entry: 9
Data: 59
- Name: <SystemType>k__BackingField
Entry: 9
Data: 4
- 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: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 2 Data: 2
- Name: - Name:
Entry: 7 Entry: 7
Data: 77|UnityEngine.SpaceAttribute, UnityEngine.CoreModule Data: 80|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height - Name: height
Entry: 4 Entry: 4
Data: 8 Data: 8
@ -1298,7 +1352,7 @@ MonoBehaviour:
Data: Data:
- Name: - Name:
Entry: 7 Entry: 7
Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:
@ -1322,13 +1376,13 @@ MonoBehaviour:
Data: AllPlayersCameraAnchor Data: AllPlayersCameraAnchor
- Name: $v - Name: $v
Entry: 7 Entry: 7
Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: <Name>k__BackingField - Name: <Name>k__BackingField
Entry: 1 Entry: 1
Data: AllPlayersCameraAnchor Data: AllPlayersCameraAnchor
- Name: <UserType>k__BackingField - Name: <UserType>k__BackingField
Entry: 9 Entry: 9
Data: 56 Data: 59
- Name: <SystemType>k__BackingField - Name: <SystemType>k__BackingField
Entry: 9 Entry: 9
Data: 4 Data: 4
@ -1346,13 +1400,13 @@ MonoBehaviour:
Data: true Data: true
- Name: _fieldAttributes - Name: _fieldAttributes
Entry: 7 Entry: 7
Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name: - Name:
Entry: 12 Entry: 12
Data: 1 Data: 1
- Name: - Name:
Entry: 7 Entry: 7
Data: 81|UnityEngine.SerializeField, UnityEngine.CoreModule Data: 84|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name: - Name:
Entry: 8 Entry: 8
Data: Data:

21
Assets/UdonSharp/Cameras/CameraControllerRound2.cs
View File

@ -26,6 +26,7 @@ public class CameraControllerRound2 : CameraControllerBase
[SerializeField] public CameraTimedSwitcher LocationBoardAndShortHostTimerToggle; [SerializeField] public CameraTimedSwitcher LocationBoardAndShortHostTimerToggle;
[SerializeField] public CameraTimedSwitcher LocationBoardAndLongHostTimerToggle; [SerializeField] public CameraTimedSwitcher LocationBoardAndLongHostTimerToggle;
[SerializeField] public CameraTimedSwitcher LocationBoardAndWinningPlayerTimerToggle; [SerializeField] public CameraTimedSwitcher LocationBoardAndWinningPlayerTimerToggle;
[SerializeField] public CameraTimedSwitcher VideoPlayerToWinningPlayerTimerToggle;
[Space] [Space]
[SerializeField] public CameraAnchor Player1CameraAnchor; [SerializeField] public CameraAnchor Player1CameraAnchor;
[SerializeField] public CameraAnchor Player2CameraAnchor; [SerializeField] public CameraAnchor Player2CameraAnchor;
@ -65,6 +66,7 @@ public class CameraControllerRound2 : CameraControllerBase
Networking.SetOwner(Player, LocationBoardAndShortHostTimerToggle.gameObject); Networking.SetOwner(Player, LocationBoardAndShortHostTimerToggle.gameObject);
Networking.SetOwner(Player, LocationBoardAndLongHostTimerToggle.gameObject); Networking.SetOwner(Player, LocationBoardAndLongHostTimerToggle.gameObject);
Networking.SetOwner(Player, LocationBoardAndWinningPlayerTimerToggle.gameObject); Networking.SetOwner(Player, LocationBoardAndWinningPlayerTimerToggle.gameObject);
Networking.SetOwner(Player, VideoPlayerToWinningPlayerTimerToggle.gameObject);
Networking.SetOwner(Player, Player1CameraAnchor.gameObject); Networking.SetOwner(Player, Player1CameraAnchor.gameObject);
Networking.SetOwner(Player, Player2CameraAnchor.gameObject); Networking.SetOwner(Player, Player2CameraAnchor.gameObject);
@ -135,6 +137,7 @@ public class CameraControllerRound2 : CameraControllerBase
LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false;
LocationBoardAndLongHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false;
LocationBoardAndWinningPlayerTimerToggle.Activate = false; LocationBoardAndWinningPlayerTimerToggle.Activate = false;
VideoPlayerToWinningPlayerTimerToggle.Activate = false;
} }
public void ActivateHostPlayersAndWideShotCameraSwitcher() public void ActivateHostPlayersAndWideShotCameraSwitcher()
@ -146,6 +149,7 @@ public class CameraControllerRound2 : CameraControllerBase
LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false;
LocationBoardAndLongHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false;
LocationBoardAndWinningPlayerTimerToggle.Activate = false; LocationBoardAndWinningPlayerTimerToggle.Activate = false;
VideoPlayerToWinningPlayerTimerToggle.Activate = false;
} }
public void ActivatePlayer1AndLocationBoardCameraSwitcher() public void ActivatePlayer1AndLocationBoardCameraSwitcher()
@ -157,6 +161,7 @@ public class CameraControllerRound2 : CameraControllerBase
LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false;
LocationBoardAndLongHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false;
LocationBoardAndWinningPlayerTimerToggle.Activate = false; LocationBoardAndWinningPlayerTimerToggle.Activate = false;
VideoPlayerToWinningPlayerTimerToggle.Activate = false;
} }
public void ActivatePlayer2AndLocationBoardCameraSwitcher() public void ActivatePlayer2AndLocationBoardCameraSwitcher()
@ -168,6 +173,7 @@ public class CameraControllerRound2 : CameraControllerBase
LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false;
LocationBoardAndLongHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false;
LocationBoardAndWinningPlayerTimerToggle.Activate = false; LocationBoardAndWinningPlayerTimerToggle.Activate = false;
VideoPlayerToWinningPlayerTimerToggle.Activate = false;
} }
public void ActivateLocationBoardAndShortHostCameraSwitcher() public void ActivateLocationBoardAndShortHostCameraSwitcher()
@ -179,6 +185,7 @@ public class CameraControllerRound2 : CameraControllerBase
LocationBoardAndShortHostTimerToggle.Activate = true; LocationBoardAndShortHostTimerToggle.Activate = true;
LocationBoardAndLongHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false;
LocationBoardAndWinningPlayerTimerToggle.Activate = false; LocationBoardAndWinningPlayerTimerToggle.Activate = false;
VideoPlayerToWinningPlayerTimerToggle.Activate = false;
} }
public void ActivateLocationBoardAndLongHostCameraSwitcher() public void ActivateLocationBoardAndLongHostCameraSwitcher()
@ -190,6 +197,7 @@ public class CameraControllerRound2 : CameraControllerBase
LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false;
LocationBoardAndLongHostTimerToggle.Activate = true; LocationBoardAndLongHostTimerToggle.Activate = true;
LocationBoardAndWinningPlayerTimerToggle.Activate = false; LocationBoardAndWinningPlayerTimerToggle.Activate = false;
VideoPlayerToWinningPlayerTimerToggle.Activate = false;
} }
public void ActivateLocationBoardAndWinningPlayerCameraSwitcher() public void ActivateLocationBoardAndWinningPlayerCameraSwitcher()
@ -201,6 +209,19 @@ public class CameraControllerRound2 : CameraControllerBase
LocationBoardAndShortHostTimerToggle.Activate = false; LocationBoardAndShortHostTimerToggle.Activate = false;
LocationBoardAndLongHostTimerToggle.Activate = false; LocationBoardAndLongHostTimerToggle.Activate = false;
LocationBoardAndWinningPlayerTimerToggle.Activate = true; LocationBoardAndWinningPlayerTimerToggle.Activate = true;
VideoPlayerToWinningPlayerTimerToggle.Activate = false;
}
public void ActivateVideoPlayerToWinningPlayerCameraSwitcher()
{
HostAllPlayersTimerToggle.Activate = false;
HostPlayersAndWideShotTimerToggle.Activate = false;
Player1AndLocationBoardTimerToggle.Activate = false;
Player2AndLocationBoardTimerToggle.Activate = false;
LocationBoardAndShortHostTimerToggle.Activate = false;
LocationBoardAndLongHostTimerToggle.Activate = false;
LocationBoardAndWinningPlayerTimerToggle.Activate = false;
VideoPlayerToWinningPlayerTimerToggle.Activate = true;
} }

37
Assets/UdonSharp/Game Managers/GameManagerRound1.cs
View File

@ -741,8 +741,6 @@ public class GameManagerRound1 : GameManagerBase
private void BeginLightningRound() private void BeginLightningRound()
{ {
_CameraControllerRound1.ActivateLightningStartToHostAllPlayersCameraSwitcher();
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayLightningRoundAnimation)); SendCustomNetworkEvent(NetworkEventTarget.All, nameof(PlayLightningRoundAnimation));
HostCardLightningRoundInterface Interface = HostCardLightningRoundInterface Interface =
@ -757,6 +755,8 @@ public class GameManagerRound1 : GameManagerBase
EnableBuzzers(); EnableBuzzers();
_CameraControllerRound1.ActivateLightningStartToHostAllPlayersCameraSwitcher();
EnableInteraction("First Question"); EnableInteraction("First Question");
} }
[NetworkCallable] [NetworkCallable]
@ -831,13 +831,13 @@ public class GameManagerRound1 : GameManagerBase
_QuestionSubstage++; _QuestionSubstage++;
AdvanceQuestion(); AdvanceQuestion();
_CameraControllerRound1.ActivateLightningCorrectAnswerToHostAllPlayersCameraSwitcher(); _CameraControllerRound1.ActivateCorrectAnswerToHostAllPlayersCameraSwitcher();
} }
else else
{ {
WaitForBuzzInsWithoutLastPlayer(); WaitForBuzzInsWithoutLastPlayer();
_CameraControllerRound1.ActivateLightningIncorrectAnswerToHostAllPlayersCameraSwitcher(); _CameraControllerRound1.ActivateIncorrectAnswerToHostAllPlayersCameraSwitcher();
} }
} }
@ -865,7 +865,7 @@ public class GameManagerRound1 : GameManagerBase
WaitForBuzzInsWithoutLastPlayer(); WaitForBuzzInsWithoutLastPlayer();
} }
_CameraControllerRound1.ActivateLightningIncorrectAnswerToHostAllPlayersCameraSwitcher(); _CameraControllerRound1.ActivateIncorrectAnswerToHostAllPlayersCameraSwitcher();
} }
@ -935,17 +935,16 @@ public class GameManagerRound1 : GameManagerBase
{ {
Interface.ChoiceUI[i].text = Choices[i].ToString(); Interface.ChoiceUI[i].text = Choices[i].ToString();
} }
Interface.OtherButton.interactable = true;
_QuestionCorrectResponse = (int)CurrentClue["Correct Response"].Number; _QuestionCorrectResponse = (int)CurrentClue["Correct Response"].Number;
for (int i = 0; i < Interface.ChoiceButtons.Length && i < Interface.ChoiceButtonImages.Length; i++) for (int i = 0; i < Interface.ChoiceButtons.Length && i < Interface.ChoiceButtonImages.Length; i++)
{ {
Interface.ChoiceButtonImages[i].color = (_QuestionCorrectResponse == (i + 1)) ? Color.green : Color.red; Interface.ChoiceButtonImages[i].color = (_QuestionCorrectResponse == (i + 1)) ? Color.green : Color.red;
Interface.ChoiceButtons[i].interactable = true;
} }
Interface.OtherButton.interactable = true;
SendCustomEventDelayedSeconds(nameof(DisplayNextChaseMap), 1.0f); SendCustomEventDelayedSeconds(nameof(DisplayNextChaseMap), 1.2f);
EnableBuzzInPeriodForAllPlayers(); EnableBuzzInPeriodForAllPlayers();
} }
@ -953,6 +952,14 @@ public class GameManagerRound1 : GameManagerBase
{ {
_VideoPlayer.SubMapIndex = _QuestionSubstage * 2; _VideoPlayer.SubMapIndex = _QuestionSubstage * 2;
HostCardTheChaseInterface Interface =
(HostCardTheChaseInterface)GetHostCardInterface(RoundSegmentType.TheChase);
for (int i = 0; i < Interface.ChoiceButtons.Length && i < Interface.ChoiceButtonImages.Length; i++)
{
Interface.ChoiceButtons[i].interactable = true;
}
Interface.OtherButton.interactable = true;
_CameraControllerRound1.DisableAllSwitchers(); _CameraControllerRound1.DisableAllSwitchers();
_CameraControllerRound1.SwitchToVideoPlayerCamera(); _CameraControllerRound1.SwitchToVideoPlayerCamera();
} }
@ -1281,7 +1288,7 @@ public class GameManagerRound1 : GameManagerBase
EnableInteraction("Reveal Next Player Answer"); EnableInteraction("Reveal Next Player Answer");
} }
_CameraControllerRound1.ActivateLightningCorrectAnswerToHostAllPlayersCameraSwitcher(); _CameraControllerRound1.ActivateCorrectAnswerToHostAllPlayersCameraSwitcher();
} }
private bool FinalRoundCheckNeedForTiebreaker() private bool FinalRoundCheckNeedForTiebreaker()
@ -1326,6 +1333,8 @@ public class GameManagerRound1 : GameManagerBase
} }
TiebreakerNeeded = true; TiebreakerNeeded = true;
PrepareTiebreakerRound(Number2Podium.PlayerNumber, Number3Podium.PlayerNumber); PrepareTiebreakerRound(Number2Podium.PlayerNumber, Number3Podium.PlayerNumber);
_CameraControllerRound1.ActivateHostAllPlayersCameraSwitcher();
} }
else else
{ {
@ -1413,6 +1422,7 @@ public class GameManagerRound1 : GameManagerBase
if (TiebreakerNeeded) if (TiebreakerNeeded)
{ {
_CurrentQuestionType = RoundSegmentType.Tiebreaker; _CurrentQuestionType = RoundSegmentType.Tiebreaker;
EnableInteraction("Advance To Tiebreaker"); EnableInteraction("Advance To Tiebreaker");
} }
else else
@ -1537,8 +1547,9 @@ public class GameManagerRound1 : GameManagerBase
public void TiebreakerIncorrectResponse() public void TiebreakerIncorrectResponse()
{ {
_BuzzedInPlayer = -1; EnableBuzzInPeriodForAllPlayers();
_BuzzInAllowed = true;
_CameraControllerRound1.ActivateIncorrectAnswerToHostAllPlayersCameraSwitcher();
RequestSerialization(); RequestSerialization();
} }
@ -1557,6 +1568,8 @@ public class GameManagerRound1 : GameManagerBase
DisableBuzzers(); DisableBuzzers();
EndBuzzInPeriod(); EndBuzzInPeriod();
_CameraControllerRound1.ActivateCorrectAnswerToHostAllPlayersCameraSwitcher();
EnableInteraction("End Tiebreaker"); EnableInteraction("End Tiebreaker");
} }
@ -1683,7 +1696,7 @@ public class GameManagerRound1 : GameManagerBase
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All,
"PlaySFX", SFXEventType.Buzzer); "PlaySFX", SFXEventType.Buzzer);
SendCustomEventDelayedSeconds(nameof(BuzzInCamera), 0.75f); _CameraControllerRound1.ActivateBuzzedInPlayerCameraSwitcher();
} }
public void BuzzInCamera() public void BuzzInCamera()
{ {

20
Assets/UdonSharp/Game Managers/GameManagerRound2.cs
View File

@ -460,16 +460,36 @@ public class GameManagerRound2 : GameManagerBase
{ {
_JailPlayer.PlayVideo = true; _JailPlayer.PlayVideo = true;
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", _CaseManager.GetCrook()); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", _CaseManager.GetCrook());
_CameraControllerRound2.ActivateVideoPlayerToWinningPlayerCameraSwitcher();
} }
public void PhoneRing() public void PhoneRing()
{ {
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.PhoneRing); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.PhoneRing);
_CameraControllerRound2.DisableAllSwitchers();
_CameraControllerRound2.SwitchToHostAndWinnerCamera();
} }
public void PlayJailCall() public void PlayJailCall()
{ {
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), _CaseManager.GetFinalRoundContinent()); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), _CaseManager.GetFinalRoundContinent());
SendCustomEventDelayedSeconds(nameof(CheckIfJailCallIsOver), 1.0f);
_CameraControllerRound2.SwitchToHostAndWinnerCamera();
}
public void CheckIfJailCallIsOver()
{
if (_AudioManager.IsSFXPlaying())
{
SendCustomEventDelayedSeconds(nameof(CheckIfJailCallIsOver), 1.0f);
}
else
{
_CameraControllerRound2.DisableAllSwitchers();
_CameraControllerRound2.SwitchToHostAndWinnerCamera();
}
} }