Fixed the round 1 video timer continuing to run when a video was skipped.
This commit is contained in:
@@ -683,6 +683,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 8486626383483289016}
|
||||
- {fileID: 6697273822060760520}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -1476,6 +1477,206 @@ Transform:
|
||||
- {fileID: 5788746246064083641}
|
||||
m_Father: {fileID: 6697273822060760520}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
--- !u!1 &8952199059656852950
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2861988156682277291}
|
||||
- component: {fileID: 769922536613037405}
|
||||
- component: {fileID: 8946899879826710894}
|
||||
- component: {fileID: 2320482393305432288}
|
||||
m_Layer: 0
|
||||
m_Name: Modem Camera Trigger (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!4 &2861988156682277291
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8952199059656852950}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.493, z: -0.54}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6697273822060760520}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!65 &769922536613037405
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8952199059656852950}
|
||||
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: 1.3217603, y: 1.2965493, z: 0.5490893}
|
||||
m_Center: {x: -0.004229122, y: 0.14827466, z: -0.04311371}
|
||||
--- !u!114 &8946899879826710894
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8952199059656852950}
|
||||
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: 2320482393305432288}
|
||||
_CameraController: {fileID: 0}
|
||||
_SwitchFunction: ActivateACMECrimenetComputerCameraSwitcher
|
||||
--- !u!114 &2320482393305432288
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8952199059656852950}
|
||||
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!1001 &4473931141689906385
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 2986715522671662182}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: FOV
|
||||
value: 30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: FarClippingPlane
|
||||
value: 12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: CameraSystemManager
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: serializationData.Prefab
|
||||
value:
|
||||
objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
- target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ACME Crimenet Computer Camera Anchor
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.2354312
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.227
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 5.6014023
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.38155252
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.013669328
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.9236535
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.033090387
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3}
|
||||
--- !u!4 &8486626383483289016 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 4473931141689906385}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &5931982346311858490
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1768,7 +1969,7 @@ PrefabInstance:
|
||||
- target: {fileID: 919132149155446097, guid: 131388005b2ec2642baed4dde9ef0e65,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2753820406339078421, guid: 131388005b2ec2642baed4dde9ef0e65,
|
||||
type: 3}
|
||||
@@ -1874,6 +2075,10 @@ PrefabInstance:
|
||||
type: 3}
|
||||
insertIndex: 4
|
||||
addedObject: {fileID: 2758305394034538769}
|
||||
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 131388005b2ec2642baed4dde9ef0e65,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2861988156682277291}
|
||||
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 131388005b2ec2642baed4dde9ef0e65,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
|
||||
Reference in New Issue
Block a user