Added a trigger to activate the host/winner camera when the winner crosses it.
This commit is contained in:
parent
0ed7e328d6
commit
3dec7c19ee
@ -3788,6 +3788,111 @@ CanvasRenderer:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 105044289}
|
m_GameObject: {fileID: 105044289}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &106321076
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 106321077}
|
||||||
|
- component: {fileID: 106321080}
|
||||||
|
- component: {fileID: 106321079}
|
||||||
|
- component: {fileID: 106321078}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Winner To Host Switch Trigger
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!4 &106321077
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 106321076}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0.67, y: 0, z: 1.62}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1483356975}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &106321078
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 2
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 106321076}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
interactTextPlacement: {fileID: 0}
|
||||||
|
interactText: Use
|
||||||
|
interactTextGO: {fileID: 0}
|
||||||
|
proximity: 2
|
||||||
|
SynchronizePosition: 0
|
||||||
|
AllowCollisionOwnershipTransfer: 0
|
||||||
|
Reliable: 0
|
||||||
|
_syncMethod: 3
|
||||||
|
serializedProgramAsset: {fileID: 11400000, guid: 8f6bcd3184c8a4d469c3a1397e84a558,
|
||||||
|
type: 2}
|
||||||
|
programSource: {fileID: 11400000, guid: 3613735857a62c049b568719758d7127, type: 2}
|
||||||
|
serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF
|
||||||
|
publicVariablesUnityEngineObjects: []
|
||||||
|
publicVariablesSerializationDataFormat: 0
|
||||||
|
--- !u!114 &106321079
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 106321076}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5e9dcd576c4ed004f81af63358a36755, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
serializationData:
|
||||||
|
SerializedFormat: 2
|
||||||
|
SerializedBytes:
|
||||||
|
ReferencedUnityObjects: []
|
||||||
|
SerializedBytesString:
|
||||||
|
Prefab: {fileID: 0}
|
||||||
|
PrefabModificationsReferencedUnityObjects: []
|
||||||
|
PrefabModifications: []
|
||||||
|
SerializationNodes: []
|
||||||
|
_udonSharpBackingUdonBehaviour: {fileID: 106321078}
|
||||||
|
_CameraController: {fileID: 1355919010}
|
||||||
|
_SwitchFunction: SwitchToHostAndWinnerCamera
|
||||||
|
--- !u!65 &106321080
|
||||||
|
BoxCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 106321076}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IncludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_ExcludeLayers:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 0
|
||||||
|
m_LayerOverridePriority: 0
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_ProvidesContacts: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 3
|
||||||
|
m_Size: {x: 8.241913, y: 5.9157925, z: 0.77569705}
|
||||||
|
m_Center: {x: -0.31782368, y: 2.4578972, z: 0.3432508}
|
||||||
--- !u!1 &106359467 stripped
|
--- !u!1 &106359467 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 4510245985558128150, guid: d065e253d298f0f44bb1d1c926531103,
|
m_CorrespondingSourceObject: {fileID: 4510245985558128150, guid: d065e253d298f0f44bb1d1c926531103,
|
||||||
@ -64136,6 +64241,7 @@ MonoBehaviour:
|
|||||||
PrimaryFocusCamera: {fileID: 2043045206}
|
PrimaryFocusCamera: {fileID: 2043045206}
|
||||||
VideoPlayerCamera: {fileID: 1064115356}
|
VideoPlayerCamera: {fileID: 1064115356}
|
||||||
HostAndAllPlayersCameraTrigger: {fileID: 1311764233}
|
HostAndAllPlayersCameraTrigger: {fileID: 1311764233}
|
||||||
|
HostAndWinnerCameraTrigger: {fileID: 106321079}
|
||||||
HostAllPlayersTimerToggle: {fileID: 35514607}
|
HostAllPlayersTimerToggle: {fileID: 35514607}
|
||||||
HostPlayersAndWideShotTimerToggle: {fileID: 1193018063}
|
HostPlayersAndWideShotTimerToggle: {fileID: 1193018063}
|
||||||
Player1AndLocationBoardTimerToggle: {fileID: 1377550932}
|
Player1AndLocationBoardTimerToggle: {fileID: 1377550932}
|
||||||
@ -68172,6 +68278,7 @@ Transform:
|
|||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 1311764231}
|
- {fileID: 1311764231}
|
||||||
|
- {fileID: 106321077}
|
||||||
- {fileID: 1193018061}
|
- {fileID: 1193018061}
|
||||||
- {fileID: 1377550930}
|
- {fileID: 1377550930}
|
||||||
- {fileID: 741456680}
|
- {fileID: 741456680}
|
||||||
@ -112007,6 +112114,10 @@ MonoBehaviour:
|
|||||||
ID: 1296
|
ID: 1296
|
||||||
SerializedTypeNames:
|
SerializedTypeNames:
|
||||||
- VRC.Udon.UdonBehaviour
|
- VRC.Udon.UdonBehaviour
|
||||||
|
- gameObject: {fileID: 106321076}
|
||||||
|
ID: 1297
|
||||||
|
SerializedTypeNames:
|
||||||
|
- VRC.Udon.UdonBehaviour
|
||||||
portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
|
portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
|
||||||
portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
|
portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
|
||||||
PlayerPersistence: []
|
PlayerPersistence: []
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -18,6 +18,7 @@ public class CameraControllerRound2 : CameraControllerBase
|
|||||||
[SerializeField] public Camera VideoPlayerCamera;
|
[SerializeField] public Camera VideoPlayerCamera;
|
||||||
[Space]
|
[Space]
|
||||||
[SerializeField] public CameraTimerSwitchTrigger HostAndAllPlayersCameraTrigger;
|
[SerializeField] public CameraTimerSwitchTrigger HostAndAllPlayersCameraTrigger;
|
||||||
|
[SerializeField] public CameraSwitchTrigger HostAndWinnerCameraTrigger;
|
||||||
[Space]
|
[Space]
|
||||||
[SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle;
|
[SerializeField] public CameraTimedSwitcher HostAllPlayersTimerToggle;
|
||||||
[SerializeField] public CameraTimedSwitcher HostPlayersAndWideShotTimerToggle;
|
[SerializeField] public CameraTimedSwitcher HostPlayersAndWideShotTimerToggle;
|
||||||
@ -235,6 +236,16 @@ public class CameraControllerRound2 : CameraControllerBase
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void ActivateHostWinnerCameraTrigger()
|
||||||
|
{
|
||||||
|
HostAndWinnerCameraTrigger.gameObject.SetActive(true);
|
||||||
|
}
|
||||||
|
public void DeactivateHostWinnerCameraTrigger()
|
||||||
|
{
|
||||||
|
HostAndWinnerCameraTrigger.gameObject.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public override void DisableAllTriggers()
|
public override void DisableAllTriggers()
|
||||||
{
|
{
|
||||||
HostAndAllPlayersCameraTrigger.gameObject.SetActive(false);
|
HostAndAllPlayersCameraTrigger.gameObject.SetActive(false);
|
||||||
|
|||||||
@ -303,6 +303,7 @@ public class GameManagerRound2 : GameManagerBase
|
|||||||
"StopMusic");
|
"StopMusic");
|
||||||
|
|
||||||
_CameraControllerRound2.ActivateLocationBoardAndWinningPlayerCameraSwitcher();
|
_CameraControllerRound2.ActivateLocationBoardAndWinningPlayerCameraSwitcher();
|
||||||
|
_CameraControllerRound2.ActivateHostWinnerCameraTrigger();
|
||||||
|
|
||||||
AdvanceRound();
|
AdvanceRound();
|
||||||
}
|
}
|
||||||
@ -334,6 +335,8 @@ public class GameManagerRound2 : GameManagerBase
|
|||||||
|
|
||||||
_JailPhone.Activate = true;
|
_JailPhone.Activate = true;
|
||||||
|
|
||||||
|
_CameraControllerRound2.DeactivateHostWinnerCameraTrigger();
|
||||||
|
|
||||||
EnableInteraction("Go To The Map");
|
EnableInteraction("Go To The Map");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -461,6 +464,7 @@ public class GameManagerRound2 : GameManagerBase
|
|||||||
_JailPlayer.PlayVideo = true;
|
_JailPlayer.PlayVideo = true;
|
||||||
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", _CaseManager.GetCrook());
|
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayCrookInJail", _CaseManager.GetCrook());
|
||||||
|
|
||||||
|
_CameraControllerRound2.DeactivateHostWinnerCameraTrigger();
|
||||||
_CameraControllerRound2.ActivateVideoPlayerToWinningPlayerCameraSwitcher();
|
_CameraControllerRound2.ActivateVideoPlayerToWinningPlayerCameraSwitcher();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -468,6 +472,7 @@ public class GameManagerRound2 : GameManagerBase
|
|||||||
{
|
{
|
||||||
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.PhoneRing);
|
_AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFX", SFXEventType.PhoneRing);
|
||||||
|
|
||||||
|
_CameraControllerRound2.DeactivateHostWinnerCameraTrigger();
|
||||||
_CameraControllerRound2.DisableAllSwitchers();
|
_CameraControllerRound2.DisableAllSwitchers();
|
||||||
_CameraControllerRound2.SwitchToHostAndWinnerCamera();
|
_CameraControllerRound2.SwitchToHostAndWinnerCamera();
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user