- Location board syncs much more reliably, and with less NetworkCallables.
- Jail chain syncs properly and disables itself, regardless of ownership. - Also did some work with the cameras in round 2.
This commit is contained in:
@@ -44,7 +44,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 18
|
||||
Data: 20
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
@@ -647,16 +647,124 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: Player1CameraAnchor
|
||||
Data: Player1AndWideShotTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player1AndWideShotTimerToggle
|
||||
- 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: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 42|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: Player2AndWideShotTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player2AndWideShotTimerToggle
|
||||
- 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: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 45|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: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player1CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 41|System.RuntimeType, mscorlib
|
||||
Data: 47|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraAnchor, Assembly-CSharp
|
||||
@@ -680,127 +788,19 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 43|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 49|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 44|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: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player2CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 41
|
||||
- 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: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 47|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: HostAndWinnerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostAndWinnerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 41
|
||||
- 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: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
@@ -824,16 +824,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: LocationBoardCameraAnchor
|
||||
Data: Player2CameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: LocationBoardCameraAnchor
|
||||
Data: Player2CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 41
|
||||
Data: 47
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -878,16 +878,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: ModemCameraAnchor
|
||||
Data: HostAndWinnerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: ModemCameraAnchor
|
||||
Data: HostAndWinnerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 41
|
||||
Data: 47
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -932,16 +932,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
Data: LocationBoardCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
Data: LocationBoardCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 41
|
||||
Data: 47
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -986,16 +986,16 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: WideShotCameraAnchor
|
||||
Data: ModemCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: WideShotCameraAnchor
|
||||
Data: ModemCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 41
|
||||
Data: 47
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1014,12 +1014,120 @@ MonoBehaviour:
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 62|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: VideoPlayerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 47
|
||||
- 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: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 65|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: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: WideShotCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 47
|
||||
- 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: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 62|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 68|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -1028,7 +1136,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1052,13 +1160,13 @@ MonoBehaviour:
|
||||
Data: AllPlayersCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: AllPlayersCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 41
|
||||
Data: 47
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1076,13 +1184,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 65|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: 66|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 72|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
|
||||
@@ -21,6 +21,8 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
[Space]
|
||||
[SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher HostPlayersAndWideShotTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher Player1AndWideShotTimerToggle;
|
||||
[SerializeField] public CameraTimedSwitcher Player2AndWideShotTimerToggle;
|
||||
[Space]
|
||||
[SerializeField] public CameraAnchor Player1CameraAnchor;
|
||||
[SerializeField] public CameraAnchor Player2CameraAnchor;
|
||||
@@ -55,6 +57,8 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
|
||||
Networking.SetOwner(Player, HostAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, HostPlayersAndWideShotTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, Player1AndWideShotTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, Player2AndWideShotTimerToggle.gameObject);
|
||||
|
||||
Networking.SetOwner(Player, Player1CameraAnchor.gameObject);
|
||||
Networking.SetOwner(Player, Player2CameraAnchor.gameObject);
|
||||
@@ -84,6 +88,11 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
SwitchToLiveCamera(HostAndWinnerCamera);
|
||||
}
|
||||
|
||||
public void SwitchToLocationBoardCamera()
|
||||
{
|
||||
SwitchToLiveCamera(LocationBoardCamera);
|
||||
}
|
||||
|
||||
public void SwitchToVideoPlayerCamera()
|
||||
{
|
||||
SwitchToLiveCamera(VideoPlayerCamera);
|
||||
@@ -113,16 +122,34 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
|
||||
public void ActivateHostAllPlayersCameraSwitcher()
|
||||
{
|
||||
ActivateAllPlayersCamera();
|
||||
HostAllPlayersTimerToggle.Activate = true;
|
||||
HostPlayersAndWideShotTimerToggle.Activate = false;
|
||||
Player1AndWideShotTimerToggle.Activate = false;
|
||||
Player2AndWideShotTimerToggle.Activate = false;
|
||||
}
|
||||
|
||||
public void ActivateHostPlayersAndWideShotCameraSwitcher()
|
||||
{
|
||||
ActivateWideShotCamera();
|
||||
HostAllPlayersTimerToggle.Activate = false;
|
||||
HostPlayersAndWideShotTimerToggle.Activate = true;
|
||||
Player1AndWideShotTimerToggle.Activate = false;
|
||||
Player2AndWideShotTimerToggle.Activate = false;
|
||||
}
|
||||
|
||||
public void ActivatePlayer1AndWideShotCameraSwitcher()
|
||||
{
|
||||
HostAllPlayersTimerToggle.Activate = false;
|
||||
HostPlayersAndWideShotTimerToggle.Activate = false;
|
||||
Player1AndWideShotTimerToggle.Activate = true;
|
||||
Player2AndWideShotTimerToggle.Activate = false;
|
||||
}
|
||||
|
||||
public void ActivatePlayer2AndWideShotCameraSwitcher()
|
||||
{
|
||||
HostAllPlayersTimerToggle.Activate = false;
|
||||
HostPlayersAndWideShotTimerToggle.Activate = false;
|
||||
Player1AndWideShotTimerToggle.Activate = false;
|
||||
Player2AndWideShotTimerToggle.Activate = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -145,5 +172,7 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
{
|
||||
HostAllPlayersTimerToggle.Activate = false;
|
||||
HostPlayersAndWideShotTimerToggle.Activate = false;
|
||||
Player1AndWideShotTimerToggle.Activate = false;
|
||||
Player2AndWideShotTimerToggle.Activate = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -206,6 +206,8 @@ public class GameManagerRound2 : GameManagerBase
|
||||
|
||||
_JailPlayer.VideoIndex = (int)_CaseManager.GetCrook();
|
||||
|
||||
_CameraControllerRound2.ActivatePlayer1AndWideShotCameraSwitcher();
|
||||
|
||||
NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
|
||||
"PlayMusicLoop", MusicEventType.RecoverTheLoot);
|
||||
}
|
||||
@@ -309,6 +311,18 @@ public class GameManagerRound2 : GameManagerBase
|
||||
|
||||
_JailChain.Show = true;
|
||||
|
||||
_CameraControllerRound2.DisableAllSwitchers();
|
||||
switch (_CurrentPlayerCounter % 2)
|
||||
{
|
||||
case 0:
|
||||
_CameraControllerRound2.SwitchToPlayer1Camera();
|
||||
break;
|
||||
case 1:
|
||||
_CameraControllerRound2.SwitchToPlayer2Camera();
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
EnableInteraction("Phone Call");
|
||||
}
|
||||
|
||||
@@ -344,10 +358,7 @@ public class GameManagerRound2 : GameManagerBase
|
||||
{
|
||||
_CurrentPlayerCounter++;
|
||||
|
||||
NetworkCalling.SendCustomNetworkEvent(
|
||||
(IUdonEventReceiver)_LocationBoard,
|
||||
NetworkEventTarget.All,
|
||||
"ResetPanelBoard");
|
||||
_LocationBoard.ResetPanelBoard();
|
||||
|
||||
if (UpdateHostCardInterface)
|
||||
{
|
||||
@@ -420,10 +431,10 @@ public class GameManagerRound2 : GameManagerBase
|
||||
{
|
||||
((HostCardRecoverTheLootInterface)GetHostCardInterface(RoundSegmentType.RecoverTheLoot))
|
||||
.DisablePanelButton(Panel);
|
||||
NetworkCalling.SendCustomNetworkEvent(
|
||||
(IUdonEventReceiver)_LocationBoard,
|
||||
NetworkEventTarget.All,
|
||||
"RevealPanel", Panel);
|
||||
_LocationBoard.RevealPanel(Panel);
|
||||
|
||||
_CameraControllerRound2.DisableAllSwitchers();
|
||||
_CameraControllerRound2.SwitchToLocationBoardCamera();
|
||||
}
|
||||
|
||||
[NetworkCallable]
|
||||
@@ -436,12 +447,6 @@ public class GameManagerRound2 : GameManagerBase
|
||||
{
|
||||
_JailPlayer.PlayVideo = true;
|
||||
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", _CaseManager.GetCrook());
|
||||
|
||||
SendCustomEventDelayedSeconds(nameof(HideJailChain), 1.5f);
|
||||
}
|
||||
public void HideJailChain()
|
||||
{
|
||||
_JailChain.Show = false;
|
||||
}
|
||||
|
||||
public void PhoneRing()
|
||||
|
||||
+223
-163
@@ -44,7 +44,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 9
|
||||
Data: 10
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
@@ -116,19 +116,19 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _ChainPivot
|
||||
Data: _Pickup
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ChainPivot
|
||||
Data: _Pickup
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 8|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Transform, UnityEngine.CoreModule
|
||||
Data: VRC.SDK3.Components.VRCPickup, VRCSDK3
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -185,19 +185,79 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _ChainHome
|
||||
Data: _ChainPivot
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ChainPivot
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 13|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Transform, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 13
|
||||
- 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 15|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: _ChainHome
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ChainHome
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 8
|
||||
Data: 13
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 8
|
||||
Data: 13
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -212,13 +272,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 14|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 18|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -242,76 +302,16 @@ MonoBehaviour:
|
||||
Data: _PullTarget
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PullTarget
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 8
|
||||
Data: 13
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 8
|
||||
- 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: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 17|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: _JailChainAnimator
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _JailChainAnimator
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 19|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 19
|
||||
Data: 13
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -329,19 +329,10 @@ MonoBehaviour:
|
||||
Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 21|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 21|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -362,25 +353,25 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _ReturnSpeedMultiplier
|
||||
Data: _JailChainAnimator
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ReturnSpeedMultiplier
|
||||
Data: _JailChainAnimator
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 24|System.RuntimeType, mscorlib
|
||||
Data: 23|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Single, mscorlib
|
||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 24
|
||||
Data: 23
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -395,13 +386,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 3
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 25|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -410,7 +401,76 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 27|UnityEngine.TooltipAttribute, UnityEngine.CoreModule
|
||||
Data: 26|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: _ReturnSpeedMultiplier
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ReturnSpeedMultiplier
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 28|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Single, mscorlib
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 28
|
||||
- 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: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 3
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 30|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 31|UnityEngine.TooltipAttribute, UnityEngine.CoreModule
|
||||
- Name: tooltip
|
||||
Entry: 1
|
||||
Data: Speed at which the chain returns to its neutral pose.
|
||||
@@ -419,7 +479,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 32|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -443,13 +503,13 @@ MonoBehaviour:
|
||||
Data: _Show
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _Show
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 30|System.RuntimeType, mscorlib
|
||||
Data: 34|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Boolean, mscorlib
|
||||
@@ -458,67 +518,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 30
|
||||
- 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: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 33|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: _PullChain
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PullChain
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 30
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 30
|
||||
Data: 34
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -536,13 +536,73 @@ MonoBehaviour:
|
||||
Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 36|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 37|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: _PullChain
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PullChain
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 34
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 34
|
||||
- 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: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 40|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
@@ -563,16 +623,16 @@ MonoBehaviour:
|
||||
Data: _HasBeenActivated
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _HasBeenActivated
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 30
|
||||
Data: 34
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 30
|
||||
Data: 34
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -587,13 +647,13 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 38|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: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
|
||||
using UdonSharp;
|
||||
using UnityEngine;
|
||||
using VRC.SDKBase;
|
||||
using VRC.Udon;
|
||||
using VRC.SDK3.Components;
|
||||
using VRC.Udon.Common.Interfaces;
|
||||
|
||||
|
||||
@@ -11,6 +10,7 @@ public class JailChain : UdonSharpBehaviour
|
||||
{
|
||||
[SerializeField] private GameManagerRound2 _GameManager;
|
||||
[Space]
|
||||
[SerializeField] private VRCPickup _Pickup;
|
||||
[SerializeField] private Transform _ChainPivot;
|
||||
[SerializeField] private Transform _ChainHome;
|
||||
[SerializeField] private Transform _PullTarget;
|
||||
@@ -34,10 +34,7 @@ public class JailChain : UdonSharpBehaviour
|
||||
_HasBeenActivated = true;
|
||||
RequestSerialization();
|
||||
|
||||
if (Networking.IsOwner(gameObject))
|
||||
{
|
||||
_GameManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayInJailAnimation");
|
||||
}
|
||||
_GameManager.SendCustomNetworkEvent(NetworkEventTarget.Owner, "PlayInJailAnimation");
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -60,9 +57,18 @@ public class JailChain : UdonSharpBehaviour
|
||||
public override void OnDrop()
|
||||
{
|
||||
_PullChain = false;
|
||||
if (_HasBeenActivated)
|
||||
{
|
||||
_Pickup.pickupable = false;
|
||||
SendCustomEventDelayedSeconds(nameof(HideJailChain), 3.0f);
|
||||
}
|
||||
RequestSerialization();
|
||||
base.OnDrop();
|
||||
}
|
||||
public void HideJailChain()
|
||||
{
|
||||
Show = false;
|
||||
}
|
||||
|
||||
|
||||
public void Initialise()
|
||||
@@ -82,9 +88,8 @@ public class JailChain : UdonSharpBehaviour
|
||||
{
|
||||
set
|
||||
{
|
||||
Debug.Log("[JailChain] " + (value ? "Showing" : "Hiding") + " jail chain...");
|
||||
|
||||
_Show = value;
|
||||
if (_Show) _Pickup.pickupable = true;
|
||||
_JailChainAnimator.SetBool("Show", _Show);
|
||||
RequestSerialization();
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 21
|
||||
Data: 22
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data:
|
||||
@@ -902,13 +902,13 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: _ActiveSpinners
|
||||
Data: _RevealedPanel
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ActiveSpinners
|
||||
Data: _RevealedPanel
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 33
|
||||
@@ -932,13 +932,19 @@ MonoBehaviour:
|
||||
Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 63|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 13
|
||||
Data:
|
||||
@@ -959,13 +965,13 @@ MonoBehaviour:
|
||||
Data: _OrderIsCorrect
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _OrderIsCorrect
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 64|System.RuntimeType, mscorlib
|
||||
Data: 65|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Boolean[], mscorlib
|
||||
@@ -974,7 +980,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 64
|
||||
Data: 65
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -989,13 +995,13 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 67|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1019,16 +1025,16 @@ MonoBehaviour:
|
||||
Data: _HasBeenCheckedBefore
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _HasBeenCheckedBefore
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 64
|
||||
Data: 65
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 64
|
||||
Data: 65
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1043,13 +1049,13 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 69|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 70|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1073,13 +1079,13 @@ MonoBehaviour:
|
||||
Data: _LootMaterial
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _LootMaterial
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 71|System.RuntimeType, mscorlib
|
||||
Data: 72|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Material, UnityEngine.CoreModule
|
||||
@@ -1088,7 +1094,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 71
|
||||
Data: 72
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1103,13 +1109,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1133,13 +1139,13 @@ MonoBehaviour:
|
||||
Data: _LocationSheetMaterialSelections
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _LocationSheetMaterialSelections
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 75|System.RuntimeType, mscorlib
|
||||
Data: 76|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Material[], UnityEngine.CoreModule
|
||||
@@ -1148,7 +1154,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 75
|
||||
Data: 76
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1163,13 +1169,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 76|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: 77|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 78|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1193,13 +1199,13 @@ MonoBehaviour:
|
||||
Data: _Animator
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _Animator
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 79|System.RuntimeType, mscorlib
|
||||
Data: 80|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||
@@ -1208,7 +1214,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 79
|
||||
Data: 80
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1223,7 +1229,7 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
@@ -1247,13 +1253,13 @@ MonoBehaviour:
|
||||
Data: _LootImageDownloader
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _LootImageDownloader
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 82|System.RuntimeType, mscorlib
|
||||
Data: 83|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3
|
||||
@@ -1262,7 +1268,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 82
|
||||
Data: 83
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1277,7 +1283,55 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
- 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: _ActiveSpinners
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ActiveSpinners
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 33
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 33
|
||||
- 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: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
|
||||
@@ -30,7 +30,8 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
[UdonSynced, FieldChangeCallback(nameof(Landmarks))] private string[] _Landmarks;
|
||||
[UdonSynced, FieldChangeCallback(nameof(RandomMaterialSettings))] private int[] _RandomMaterialSettings;
|
||||
|
||||
[UdonSynced] private int _ActiveSpinners = 0;
|
||||
[UdonSynced, FieldChangeCallback(nameof(RevealedPanel))] private int _RevealedPanel = 0;
|
||||
|
||||
[UdonSynced] private bool[] _OrderIsCorrect = new bool[3];
|
||||
[UdonSynced] private bool[] _HasBeenCheckedBefore;
|
||||
|
||||
@@ -40,6 +41,8 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
private Animator _Animator;
|
||||
private VRCImageDownloader _LootImageDownloader;
|
||||
|
||||
private int _ActiveSpinners = 0;
|
||||
|
||||
|
||||
void Start()
|
||||
{
|
||||
@@ -87,32 +90,41 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
}
|
||||
|
||||
|
||||
[NetworkCallable]
|
||||
public void RevealPanel(int Panel)
|
||||
{
|
||||
RevealedPanel = Panel;
|
||||
RequestSerialization();
|
||||
}
|
||||
|
||||
private void _RevealPanel_Private()
|
||||
{
|
||||
Debug.Log("[LocationBoard] Revealing panel " + RevealedPanel);
|
||||
|
||||
if (_ActiveSpinners < 3)
|
||||
{
|
||||
_Animator.SetBool("Flip " + Panel, true);
|
||||
Debug.Log("[LocationBoard] Active spinners is currently less than three");
|
||||
|
||||
_Animator.SetBool("Flip " + RevealedPanel, true);
|
||||
|
||||
switch (_ActiveSpinners)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
_OrderIsCorrect[0] = (Panel == LootLocation);
|
||||
_OrderIsCorrect[0] = (RevealedPanel == LootLocation);
|
||||
|
||||
if (_OrderIsCorrect[0])
|
||||
{
|
||||
_GameManager.OnTheRightTrack();
|
||||
}
|
||||
else if (Panel == WarrantLocation)
|
||||
else if (RevealedPanel == WarrantLocation)
|
||||
{
|
||||
_GameManager.OutOfOrder(PanelType.Warrant);
|
||||
}
|
||||
else if (Panel == CrookLocation)
|
||||
else if (RevealedPanel == CrookLocation)
|
||||
{
|
||||
_GameManager.OutOfOrder(PanelType.Crook);
|
||||
}
|
||||
else if (_HasBeenCheckedBefore[Panel - 1])
|
||||
else if (_HasBeenCheckedBefore[RevealedPanel - 1])
|
||||
{
|
||||
_GameManager.AlreadyTried();
|
||||
SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 1.0f);
|
||||
@@ -125,7 +137,7 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
} break;
|
||||
case 1:
|
||||
{
|
||||
_OrderIsCorrect[1] = (Panel == WarrantLocation);
|
||||
_OrderIsCorrect[1] = (RevealedPanel == WarrantLocation);
|
||||
|
||||
if (_OrderIsCorrect[1])
|
||||
{
|
||||
@@ -138,15 +150,15 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
_GameManager.AlmostThere();
|
||||
}
|
||||
}
|
||||
else if (Panel == LootLocation)
|
||||
else if (RevealedPanel == LootLocation)
|
||||
{
|
||||
_GameManager.OutOfOrder(PanelType.Loot);
|
||||
}
|
||||
else if (Panel == CrookLocation)
|
||||
else if (RevealedPanel == CrookLocation)
|
||||
{
|
||||
_GameManager.OutOfOrder(PanelType.Crook);
|
||||
}
|
||||
else if (_HasBeenCheckedBefore[Panel - 1])
|
||||
else if (_HasBeenCheckedBefore[RevealedPanel - 1])
|
||||
{
|
||||
if (!_OrderIsCorrect[0])
|
||||
{
|
||||
@@ -166,7 +178,7 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
} break;
|
||||
case 2:
|
||||
{
|
||||
_OrderIsCorrect[2] = (Panel == CrookLocation);
|
||||
_OrderIsCorrect[2] = (RevealedPanel == CrookLocation);
|
||||
|
||||
if (_OrderIsCorrect[2])
|
||||
{
|
||||
@@ -176,17 +188,17 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 2.5f);
|
||||
}
|
||||
}
|
||||
else if (Panel == LootLocation)
|
||||
else if (RevealedPanel == LootLocation)
|
||||
{
|
||||
_GameManager.OutOfOrder(PanelType.Loot);
|
||||
SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 2.5f);
|
||||
}
|
||||
else if (Panel == WarrantLocation)
|
||||
else if (RevealedPanel == WarrantLocation)
|
||||
{
|
||||
_GameManager.OutOfOrder(PanelType.Warrant);
|
||||
SendCustomEventDelayedSeconds(nameof(InitiateBoardReset), 2.5f);
|
||||
}
|
||||
else if (_HasBeenCheckedBefore[Panel - 1])
|
||||
else if (_HasBeenCheckedBefore[RevealedPanel - 1])
|
||||
{
|
||||
if (!_OrderIsCorrect[0] || !_OrderIsCorrect[1])
|
||||
{
|
||||
@@ -208,20 +220,17 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
|
||||
_ActiveSpinners++;
|
||||
|
||||
if (Panel == LootLocation || Panel == WarrantLocation || Panel == CrookLocation)
|
||||
if (RevealedPanel == LootLocation)
|
||||
{
|
||||
if (Panel == LootLocation)
|
||||
{
|
||||
_GameManager.SendCustomEventDelayedSeconds("PlayTheLoot", 0.35f);
|
||||
}
|
||||
else if (Panel == WarrantLocation)
|
||||
{
|
||||
_GameManager.SendCustomEventDelayedSeconds("PlayTheWarrant", 0.35f);
|
||||
}
|
||||
else if (Panel == CrookLocation)
|
||||
{
|
||||
_GameManager.SendCustomEventDelayedSeconds("PlayTheCrookTheme", 0.35f);
|
||||
}
|
||||
_GameManager.SendCustomEventDelayedSeconds("PlayTheLoot", 0.35f);
|
||||
}
|
||||
else if (RevealedPanel == WarrantLocation)
|
||||
{
|
||||
_GameManager.SendCustomEventDelayedSeconds("PlayTheWarrant", 0.35f);
|
||||
}
|
||||
else if (RevealedPanel == CrookLocation)
|
||||
{
|
||||
_GameManager.SendCustomEventDelayedSeconds("PlayTheCrookTheme", 0.35f);
|
||||
}
|
||||
|
||||
if (_OrderIsCorrect[0] && _OrderIsCorrect[1] && _OrderIsCorrect[2])
|
||||
@@ -230,14 +239,18 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
_HasBeenCheckedBefore[Panel - 1] = true;
|
||||
_HasBeenCheckedBefore[RevealedPanel - 1] = true;
|
||||
}
|
||||
|
||||
|
||||
public void InitiateBoardReset() { _GameManager.LocationBoardReset(true); }
|
||||
|
||||
[NetworkCallable]
|
||||
public void ResetPanelBoard()
|
||||
{
|
||||
RevealedPanel = 0;
|
||||
RequestSerialization();
|
||||
}
|
||||
private void _ResetPanelBoard_Private()
|
||||
{
|
||||
for (int i = 1; i <= 15; i++)
|
||||
{
|
||||
@@ -425,4 +438,22 @@ public class LocationBoard : UdonSharpBehaviour
|
||||
}
|
||||
get => _RandomMaterialSettings;
|
||||
}
|
||||
|
||||
|
||||
private int RevealedPanel
|
||||
{
|
||||
set
|
||||
{
|
||||
_RevealedPanel = value;
|
||||
if (_RevealedPanel > 0)
|
||||
{
|
||||
_RevealPanel_Private();
|
||||
}
|
||||
else
|
||||
{
|
||||
_ResetPanelBoard_Private();
|
||||
}
|
||||
}
|
||||
get => _RevealedPanel;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user