- Modem camera trigger now actually works.
- Adjusted timing of the camera zoom during modem use. - Camera trigger after modem in round 2 now switches to a static wide shot. - Camera lingers a bit longer on the player during the jail call. - Added an extra reflection probe in the modem area of round 2.
This commit is contained in:
@@ -216,6 +216,11 @@ public class CameraControllerRound1 : CameraControllerBase
|
||||
ActivateModemCamera();
|
||||
SwitchToLiveCamera(PrimaryFocusCamera);
|
||||
}
|
||||
public void SwitchToModemCameraAndDisableAllSwitchers()
|
||||
{
|
||||
DisableAllSwitchers();
|
||||
SwitchToModemCamera();
|
||||
}
|
||||
|
||||
|
||||
public void ActivateHostAllPlayersCameraSwitcher()
|
||||
@@ -341,6 +346,7 @@ public class CameraControllerRound1 : CameraControllerBase
|
||||
public override void DisableAllTriggers()
|
||||
{
|
||||
HostCameraTrigger.gameObject.SetActive(false);
|
||||
ModemCameraTrigger.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public override void DisableAllSwitchers()
|
||||
|
||||
@@ -569,19 +569,19 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: $k
|
||||
Entry: 1
|
||||
Data: HostAndAllPlayersCameraTrigger
|
||||
Data: WideShotCameraTrigger
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostAndAllPlayersCameraTrigger
|
||||
Data: WideShotCameraTrigger
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 35|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraTimerSwitchTrigger, Assembly-CSharp
|
||||
Data: CameraSwitchTrigger, Assembly-CSharp
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -646,14 +646,8 @@ MonoBehaviour:
|
||||
Entry: 1
|
||||
Data: HostAndWinnerCameraTrigger
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 40|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraSwitchTrigger, Assembly-CSharp
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
Entry: 9
|
||||
Data: 35
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -671,13 +665,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 42|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 41|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -701,7 +695,7 @@ MonoBehaviour:
|
||||
Data: HostAllPlayersTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostAllPlayersTimerToggle
|
||||
@@ -725,13 +719,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 45|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 44|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -740,7 +734,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 46|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 45|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -764,7 +758,7 @@ MonoBehaviour:
|
||||
Data: HostPlayersAndWideShotTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostPlayersAndWideShotTimerToggle
|
||||
@@ -788,13 +782,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 49|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 48|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -818,7 +812,7 @@ MonoBehaviour:
|
||||
Data: Player1AndLocationBoardTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player1AndLocationBoardTimerToggle
|
||||
@@ -842,13 +836,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 51|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: 52|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 51|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -872,7 +866,7 @@ MonoBehaviour:
|
||||
Data: Player2AndLocationBoardTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player2AndLocationBoardTimerToggle
|
||||
@@ -896,13 +890,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 55|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -926,7 +920,7 @@ MonoBehaviour:
|
||||
Data: LocationBoardAndShortHostTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: LocationBoardAndShortHostTimerToggle
|
||||
@@ -950,13 +944,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 57|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -980,7 +974,7 @@ MonoBehaviour:
|
||||
Data: LocationBoardAndLongHostTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: LocationBoardAndLongHostTimerToggle
|
||||
@@ -1004,13 +998,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 61|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 60|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1034,7 +1028,7 @@ MonoBehaviour:
|
||||
Data: LocationBoardAndCurrentPlayerTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 61|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: LocationBoardAndCurrentPlayerTimerToggle
|
||||
@@ -1058,13 +1052,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 64|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1088,7 +1082,7 @@ MonoBehaviour:
|
||||
Data: LocationBoardAndWinningPlayerTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: LocationBoardAndWinningPlayerTimerToggle
|
||||
@@ -1112,13 +1106,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 67|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1142,7 +1136,7 @@ MonoBehaviour:
|
||||
Data: VideoPlayerToWinningPlayerTimerToggle
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPlayerToWinningPlayerTimerToggle
|
||||
@@ -1166,13 +1160,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 70|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 69|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1196,13 +1190,13 @@ MonoBehaviour:
|
||||
Data: _CameraAnimator
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _CameraAnimator
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 72|System.RuntimeType, mscorlib
|
||||
Data: 71|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: UnityEngine.Animator, UnityEngine.AnimationModule
|
||||
@@ -1211,7 +1205,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 72
|
||||
Data: 71
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1226,13 +1220,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 74|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -1241,7 +1235,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 75|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1265,13 +1259,13 @@ MonoBehaviour:
|
||||
Data: Player1CameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player1CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 77|System.RuntimeType, mscorlib
|
||||
Data: 76|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: CameraAnchor, Assembly-CSharp
|
||||
@@ -1295,13 +1289,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 79|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -1310,7 +1304,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 80|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1334,13 +1328,13 @@ MonoBehaviour:
|
||||
Data: Player2CameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: Player2CameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1358,13 +1352,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 83|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 82|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1388,13 +1382,13 @@ MonoBehaviour:
|
||||
Data: HostAndWinnerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: HostAndWinnerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1412,13 +1406,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 86|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 85|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1442,13 +1436,13 @@ MonoBehaviour:
|
||||
Data: LocationBoardCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 87|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: LocationBoardCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1466,13 +1460,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 88|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 88|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1496,13 +1490,13 @@ MonoBehaviour:
|
||||
Data: ModemCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 90|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: ModemCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1520,13 +1514,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 90|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 92|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 91|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1550,13 +1544,13 @@ MonoBehaviour:
|
||||
Data: VideoPlayerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 92|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: VideoPlayerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1574,13 +1568,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 94|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 93|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 95|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 94|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1604,13 +1598,13 @@ MonoBehaviour:
|
||||
Data: WideShotCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 96|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 95|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: WideShotCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1628,13 +1622,13 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 97|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
Data: 96|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 98|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
Data: 97|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
|
||||
- Name: height
|
||||
Entry: 4
|
||||
Data: 8
|
||||
@@ -1643,7 +1637,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 99|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1667,13 +1661,13 @@ MonoBehaviour:
|
||||
Data: AllPlayersCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 100|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 99|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: AllPlayersCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1691,14 +1685,14 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 101|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
Data: 100|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 102|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 101|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1722,13 +1716,13 @@ MonoBehaviour:
|
||||
Data: WinningPlayerCameraAnchor
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 103|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 102|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: WinningPlayerCameraAnchor
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 77
|
||||
Data: 76
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 4
|
||||
@@ -1746,14 +1740,14 @@ MonoBehaviour:
|
||||
Data: true
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 104|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
Data: 103|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 1
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 105|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
Data: 104|UnityEngine.SerializeField, UnityEngine.CoreModule
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
@@ -1777,13 +1771,13 @@ MonoBehaviour:
|
||||
Data: _PlayModemZoom
|
||||
- Name: $v
|
||||
Entry: 7
|
||||
Data: 106|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
Data: 105|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||
- Name: <Name>k__BackingField
|
||||
Entry: 1
|
||||
Data: _PlayModemZoom
|
||||
- Name: <UserType>k__BackingField
|
||||
Entry: 7
|
||||
Data: 107|System.RuntimeType, mscorlib
|
||||
Data: 106|System.RuntimeType, mscorlib
|
||||
- Name:
|
||||
Entry: 1
|
||||
Data: System.Boolean, mscorlib
|
||||
@@ -1792,7 +1786,7 @@ MonoBehaviour:
|
||||
Data:
|
||||
- Name: <SystemType>k__BackingField
|
||||
Entry: 9
|
||||
Data: 107
|
||||
Data: 106
|
||||
- Name: <SyncMode>k__BackingField
|
||||
Entry: 7
|
||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||
@@ -1807,20 +1801,20 @@ MonoBehaviour:
|
||||
Data: false
|
||||
- Name: _fieldAttributes
|
||||
Entry: 7
|
||||
Data: 108|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
Data: 107|System.Collections.Generic.List`1[[System.Attribute, mscorlib]],
|
||||
mscorlib
|
||||
- Name:
|
||||
Entry: 12
|
||||
Data: 2
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 109|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
Data: 108|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
- Name:
|
||||
Entry: 7
|
||||
Data: 110|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
Data: 109|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime
|
||||
- Name:
|
||||
Entry: 8
|
||||
Data:
|
||||
|
||||
@@ -16,7 +16,7 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
[SerializeField] public Camera PrimaryFocusCamera;
|
||||
[SerializeField] public Camera VideoPlayerCamera;
|
||||
[Space]
|
||||
[SerializeField] public CameraTimerSwitchTrigger HostAndAllPlayersCameraTrigger;
|
||||
[SerializeField] public CameraSwitchTrigger WideShotCameraTrigger;
|
||||
[SerializeField] public CameraSwitchTrigger HostAndWinnerCameraTrigger;
|
||||
[Space]
|
||||
[SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle;
|
||||
@@ -67,7 +67,7 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
Networking.SetOwner(Player, PrimaryFocusCamera.gameObject);
|
||||
Networking.SetOwner(Player, VideoPlayerCamera.gameObject);
|
||||
|
||||
Networking.SetOwner(Player, HostAndAllPlayersCameraTrigger.gameObject);
|
||||
Networking.SetOwner(Player, WideShotCameraTrigger.gameObject);
|
||||
|
||||
Networking.SetOwner(Player, HostAllPlayersTimerToggle.gameObject);
|
||||
Networking.SetOwner(Player, HostPlayersAndWideShotTimerToggle.gameObject);
|
||||
@@ -215,11 +215,11 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
|
||||
public void ActivateHostAllPlayersCameraTrigger()
|
||||
{
|
||||
HostAndAllPlayersCameraTrigger.gameObject.SetActive(true);
|
||||
WideShotCameraTrigger.gameObject.SetActive(true);
|
||||
}
|
||||
public void DeactivateHostAllPlayersCameraTrigger()
|
||||
{
|
||||
HostAndAllPlayersCameraTrigger.gameObject.SetActive(false);
|
||||
WideShotCameraTrigger.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
|
||||
@@ -248,7 +248,7 @@ public class CameraControllerRound2 : CameraControllerBase
|
||||
|
||||
public override void DisableAllTriggers()
|
||||
{
|
||||
HostAndAllPlayersCameraTrigger.gameObject.SetActive(false);
|
||||
WideShotCameraTrigger.gameObject.SetActive(false);
|
||||
}
|
||||
|
||||
public override void DisableAllSwitchers()
|
||||
|
||||
@@ -1462,6 +1462,8 @@ public class GameManagerRound1 : GameManagerBase
|
||||
_Modem.Activate(true);
|
||||
_ArrivalDisplay.Activate(true);
|
||||
|
||||
_CameraControllerRound1.ActivateModemCameraTrigger();
|
||||
|
||||
EnableInteraction("Activate Modem");
|
||||
}
|
||||
|
||||
@@ -1471,6 +1473,7 @@ public class GameManagerRound1 : GameManagerBase
|
||||
SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 2.5f);
|
||||
_CameraControllerRound1.DisableAllSwitchers();
|
||||
_CameraControllerRound1.PlayModemZoom(true);
|
||||
_CameraControllerRound1.DeactivateModemCameraTrigger();
|
||||
}
|
||||
public void _ContinueToRound2_Private()
|
||||
{
|
||||
|
||||
@@ -530,7 +530,7 @@ public class GameManagerRound2 : GameManagerBase
|
||||
_PlayingJailCall = true;
|
||||
|
||||
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayJailCall", _CaseManager.GetCrook(), _CaseManager.GetFinalRoundContinent());
|
||||
SendCustomEventDelayedSeconds(nameof(JailCallIsOver), _AudioManager.CurrentSFXLength());
|
||||
SendCustomEventDelayedSeconds(nameof(JailCallIsOver), _AudioManager.CurrentSFXLength() + 0.5f);
|
||||
|
||||
_CameraControllerRound2.DisableAllSwitchers();
|
||||
_CameraControllerRound2.SwitchToWinningPlayerCamera();
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||
m_Name: BoneFollower
|
||||
m_EditorClassIdentifier:
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
|
||||
type: 2}
|
||||
udonAssembly:
|
||||
assemblyError:
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||
m_Name: InteractToggle
|
||||
m_EditorClassIdentifier:
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
|
||||
type: 2}
|
||||
udonAssembly:
|
||||
assemblyError:
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||
m_Name: PlayerModSetter
|
||||
m_EditorClassIdentifier:
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
|
||||
type: 2}
|
||||
udonAssembly:
|
||||
assemblyError:
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||
m_Name: GlobalToggleObject
|
||||
m_EditorClassIdentifier:
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
|
||||
type: 2}
|
||||
udonAssembly:
|
||||
assemblyError:
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||
m_Name: MasterToggleObject
|
||||
m_EditorClassIdentifier:
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
|
||||
type: 2}
|
||||
udonAssembly:
|
||||
assemblyError:
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||
m_Name: TrackingDataFollower
|
||||
m_EditorClassIdentifier:
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
|
||||
type: 2}
|
||||
udonAssembly:
|
||||
assemblyError:
|
||||
|
||||
@@ -12,7 +12,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
|
||||
m_Name: WorldAudioSettings
|
||||
m_EditorClassIdentifier:
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
|
||||
serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
|
||||
type: 2}
|
||||
udonAssembly:
|
||||
assemblyError:
|
||||
|
||||
Reference in New Issue
Block a user