Added lots more camera moves and such to rounds 2 and 3.
This commit is contained in:
@@ -218,6 +218,7 @@ public class CaseManager : UdonSharpBehaviour
|
||||
|
||||
public void ContinueToRound1()
|
||||
{
|
||||
_Round2Manager.DeinitialiseGameMode();
|
||||
_Round3Manager.DeinitialiseGameMode();
|
||||
_HostCard.SetGameManager(_Round1Manager);
|
||||
_Round1Manager.InitialiseGameMode();
|
||||
@@ -228,6 +229,7 @@ public class CaseManager : UdonSharpBehaviour
|
||||
public void ContinueToRound2()
|
||||
{
|
||||
_Round1Manager.DeinitialiseGameMode();
|
||||
_Round3Manager.DeinitialiseGameMode();
|
||||
_HostCard.SetGameManager(_Round2Manager);
|
||||
_Round2Manager.InitialiseGameMode();
|
||||
|
||||
@@ -236,6 +238,7 @@ public class CaseManager : UdonSharpBehaviour
|
||||
|
||||
public void ContinueToRound3()
|
||||
{
|
||||
_Round1Manager.DeinitialiseGameMode();
|
||||
_Round2Manager.DeinitialiseGameMode();
|
||||
_HostCard.SetGameManager(_Round3Manager);
|
||||
_Round3Manager.InitialiseGameMode();
|
||||
|
||||
@@ -104,6 +104,8 @@ public class GameManagerRound1 : GameManagerBase
|
||||
_PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium");
|
||||
}
|
||||
|
||||
_CameraControllerRound1.DeinitialiseCameras();
|
||||
|
||||
base.DeinitialiseGameMode();
|
||||
}
|
||||
|
||||
|
||||
@@ -81,6 +81,8 @@ public class GameManagerRound2 : GameManagerBase
|
||||
_JailPhone.Activate = false;
|
||||
_JailChain.Show = false;
|
||||
|
||||
_CameraControllerRound2.DeinitialiseCameras();
|
||||
|
||||
base.DeinitialiseGameMode();
|
||||
}
|
||||
|
||||
|
||||
@@ -575,7 +575,7 @@ MonoBehaviour:
|
||||
Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 4
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 38|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
@@ -587,25 +587,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 39|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
|
||||
- Name: header
|
||||
Entry: 1
|
||||
Data: Camera Controls
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 40|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 39|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -629,13 +611,13 @@ MonoBehaviour:
|
||||
Data: _Markers
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _Markers
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 43|System.RuntimeType, mscorlib
|
||||
Data: 41|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: FloorMapMarker[], Assembly-CSharp
|
||||
@@ -659,13 +641,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 44|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: 45|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 43|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -689,13 +671,13 @@ MonoBehaviour:
|
||||
Data: _CaptureCarmenNewspaper
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CaptureCarmenNewspaper
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 47|System.RuntimeType, mscorlib
|
||||
Data: 45|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CaptureCarmenNewspaper, Assembly-CSharp
|
||||
@@ -719,13 +701,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 47|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -749,13 +731,13 @@ MonoBehaviour:
|
||||
Data: _EndingPlayer
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _EndingPlayer
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 51|System.RuntimeType, mscorlib
|
||||
Data: 49|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: RandomVideoPlayer, Assembly-CSharp
|
||||
@@ -779,13 +761,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 53|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -809,13 +791,13 @@ MonoBehaviour:
|
||||
Data: _CurrentlyActiveMap
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CurrentlyActiveMap
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 55|System.RuntimeType, mscorlib
|
||||
Data: 53|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: ContinentMap, Assembly-CSharp
|
||||
@@ -824,7 +806,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 56|System.RuntimeType, mscorlib
|
||||
Data: 54|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Int32, mscorlib
|
||||
@@ -845,19 +827,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 58|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 56|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 59|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 57|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -881,16 +863,16 @@ MonoBehaviour:
|
||||
Data: _ActiveMarker
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ActiveMarker
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -905,19 +887,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 62|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 60|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 63|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 61|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -941,16 +923,16 @@ MonoBehaviour:
|
||||
Data: _StageIndex
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _StageIndex
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -965,13 +947,13 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 66|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 64|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -995,13 +977,13 @@ MonoBehaviour:
|
||||
Data: _ContinentData
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _ContinentData
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 68|System.RuntimeType, mscorlib
|
||||
Data: 66|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
|
||||
@@ -1010,7 +992,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 68
|
||||
Data: 66
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1025,7 +1007,7 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
@@ -1049,13 +1031,13 @@ MonoBehaviour:
|
||||
Data: _GameStatus
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _GameStatus
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 71|System.RuntimeType, mscorlib
|
||||
Data: 69|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: GameStatus, Assembly-CSharp
|
||||
@@ -1064,7 +1046,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1079,13 +1061,13 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 73|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 71|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1109,7 +1091,7 @@ MonoBehaviour:
|
||||
Data: _RunTimer
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _RunTimer
|
||||
@@ -1133,13 +1115,13 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 75|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: 76|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 74|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1163,16 +1145,16 @@ MonoBehaviour:
|
||||
Data: _Timer
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _Timer
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1187,13 +1169,13 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 78|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: 79|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 77|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1217,16 +1199,16 @@ MonoBehaviour:
|
||||
Data: _SuccessCounter
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _SuccessCounter
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1241,19 +1223,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 82|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 80|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 83|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 81|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1277,16 +1259,16 @@ MonoBehaviour:
|
||||
Data: _FailureCounter
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _FailureCounter
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 56
|
||||
Data: 54
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1301,19 +1283,19 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 86|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 84|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 87|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 85|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1337,13 +1319,13 @@ MonoBehaviour:
|
||||
Data: _CameraControllerRound3
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CameraControllerRound3
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 89|System.RuntimeType, mscorlib
|
||||
Data: 87|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraControllerRound3, Assembly-CSharp
|
||||
@@ -1367,7 +1349,7 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 0
|
||||
|
||||
@@ -32,14 +32,6 @@ public enum GameStatus
|
||||
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
|
||||
public class GameManagerRound3 : GameManagerBase
|
||||
{
|
||||
[Space, Header("Camera Controls")]
|
||||
//[SerializeField] private CameraTimedSwitcher _HostPlayerTimerToggle;
|
||||
//[SerializeField] private GameObject _CameraTriggersGroup;
|
||||
//[SerializeField] private Camera _HostCamera;
|
||||
//[SerializeField] private CameraAnchor[] _HostCameraAnchors;
|
||||
//[SerializeField] private Camera _PlayerCamera;
|
||||
//[SerializeField] private CameraAnchor[] _PlayerCameraAnchors;
|
||||
|
||||
[Space]
|
||||
|
||||
[SerializeField] private FloorMap[] _Maps;
|
||||
@@ -94,23 +86,20 @@ public class GameManagerRound3 : GameManagerBase
|
||||
InitialiseMarkers();
|
||||
GetCurrentMap().RandomiseCountries();
|
||||
|
||||
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(ActivateCameraSwitchers), false);
|
||||
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(EnableAudienceSilencer), false);
|
||||
|
||||
_CameraControllerRound3.InitialiseCameras();
|
||||
_CameraControllerRound3.PlayIFeelGood(true);
|
||||
|
||||
RequestSerialization();
|
||||
}
|
||||
[NetworkCallable]
|
||||
public void ActivateCameraSwitchers(bool Activate)
|
||||
{
|
||||
//_CameraTriggersGroup.SetActive(Activate);
|
||||
}
|
||||
|
||||
public override void DeinitialiseGameMode()
|
||||
{
|
||||
_EndingPlayer.PlayVideo = false;
|
||||
|
||||
_CameraControllerRound3.DeinitialiseCameras();
|
||||
|
||||
base.DeinitialiseGameMode();
|
||||
}
|
||||
|
||||
@@ -122,10 +111,8 @@ public class GameManagerRound3 : GameManagerBase
|
||||
for (int i = 0; i < _Markers.Length; i++)
|
||||
Networking.SetOwner(NewOwner, _Markers[i].gameObject);
|
||||
|
||||
//Networking.SetOwner(NewOwner, _HostPlayerTimerToggle.gameObject);
|
||||
//Networking.SetOwner(NewOwner, _CameraTriggersGroup);
|
||||
//Networking.SetOwner(NewOwner, _CaptureCarmenNewspaper.gameObject);
|
||||
//Networking.SetOwner(NewOwner, _EndingPlayer.gameObject);
|
||||
Networking.SetOwner(NewOwner, _CaptureCarmenNewspaper.gameObject);
|
||||
Networking.SetOwner(NewOwner, _EndingPlayer.gameObject);
|
||||
|
||||
Networking.SetOwner(NewOwner, _CameraController.gameObject);
|
||||
Networking.SetOwner(NewOwner, _CameraControllerRound3.gameObject);
|
||||
@@ -192,7 +179,7 @@ public class GameManagerRound3 : GameManagerBase
|
||||
|
||||
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic");
|
||||
|
||||
//_HostPlayerTimerToggle.Activate = true;
|
||||
_CameraControllerRound3.ActivateHostPlayerCameraSwitcher();
|
||||
|
||||
EnableInteraction("Begin");
|
||||
}
|
||||
@@ -203,8 +190,8 @@ public class GameManagerRound3 : GameManagerBase
|
||||
_GameStatus = GameStatus.Begin;
|
||||
UpdateInterface();
|
||||
|
||||
//_HostPlayerTimerToggle.Activate = false;
|
||||
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(ActivateCameraSwitchers), true);
|
||||
_CameraControllerRound3.HostPlayerTimerToggle.Activate = false;
|
||||
_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = true;
|
||||
GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true);
|
||||
|
||||
_EndingPlayer.LoadRandomVideo();
|
||||
@@ -366,7 +353,7 @@ public class GameManagerRound3 : GameManagerBase
|
||||
SendCustomEventDelayedSeconds(nameof(EndCarmenInJailSFX), 7.0f);
|
||||
}
|
||||
|
||||
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(ActivateCameraSwitchers), false);
|
||||
_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = false;
|
||||
}
|
||||
public void PlayWindDownMusic()
|
||||
{
|
||||
@@ -407,7 +394,7 @@ public class GameManagerRound3 : GameManagerBase
|
||||
SendCustomEventDelayedSeconds(nameof(PlayNewspaperLoseAnimation), 3.0f);
|
||||
}
|
||||
|
||||
SendCustomNetworkEvent(NetworkEventTarget.All, nameof(ActivateCameraSwitchers), false);
|
||||
_CameraControllerRound3.ActivatePlayfieldSwitchTriggerGroup = false;
|
||||
}
|
||||
|
||||
public void PlayNewspaperLoseAnimation()
|
||||
@@ -423,6 +410,8 @@ public class GameManagerRound3 : GameManagerBase
|
||||
Interface.HeaderUI.text = "Rockin' it a capella";
|
||||
Interface.CommentUI.text = "";
|
||||
|
||||
_CameraControllerRound3.PlayDoItRockapella(true);
|
||||
|
||||
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic");
|
||||
SendCustomEventDelayedSeconds(nameof(PlayEndingTheme), 1.25f);
|
||||
|
||||
@@ -446,6 +435,9 @@ public class GameManagerRound3 : GameManagerBase
|
||||
|
||||
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic");
|
||||
|
||||
_CameraControllerRound3.PlayIFeelGood(false);
|
||||
_CameraControllerRound3.PlayDoItRockapella(false);
|
||||
|
||||
_CaseManager.EndGame();
|
||||
|
||||
DisableInteraction("Game Over");
|
||||
|
||||
Reference in New Issue
Block a user