we love deadlines #3

Merged
Mercury merged 53 commits from Introduction-Level into main 2024-03-10 23:33:14 +01:00
3 changed files with 327 additions and 13 deletions
Showing only changes of commit 41f1b6945c - Show all commits

View file

@ -1661,47 +1661,47 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1099863755}
m_Modifications: m_Modifications:
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 4 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalScale.x propertyPath: m_LocalScale.x
value: 10 value: 0.05882353
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalScale.y propertyPath: m_LocalScale.y
value: 10 value: 0.05882352
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
value: 10 value: 0.05882352
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -9.028 value: -0.053105883
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -1.526 value: 0.16984297
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -30.6833 value: -0.0017999761
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.7071067 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0.7071068 value: -0.00000008940697
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} - target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
@ -1733,6 +1733,164 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
--- !u!1 &1994180162 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
m_PrefabInstance: {fileID: 1994180161}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1994180163
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1994180162}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a35f6cfbfba9b548aaa00d52cfe8a50, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_Colliders: []
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_DistanceCalculationMode: 0
m_SelectMode: 0
m_FocusMode: 1
m_CustomReticle: {fileID: 0}
m_AllowGazeInteraction: 0
m_AllowGazeSelect: 0
m_OverrideGazeTimeToSelect: 0
m_GazeTimeToSelect: 0.5
m_OverrideTimeToAutoDeselectGaze: 0
m_TimeToAutoDeselectGaze: 3
m_AllowGazeAssistance: 0
m_FirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_LastHoverExited:
m_PersistentCalls:
m_Calls: []
m_HoverEntered:
m_PersistentCalls:
m_Calls: []
m_HoverExited:
m_PersistentCalls:
m_Calls: []
m_FirstSelectEntered:
m_PersistentCalls:
m_Calls: []
m_LastSelectExited:
m_PersistentCalls:
m_Calls: []
m_SelectEntered:
m_PersistentCalls:
m_Calls: []
m_SelectExited:
m_PersistentCalls:
m_Calls: []
m_FirstFocusEntered:
m_PersistentCalls:
m_Calls: []
m_LastFocusExited:
m_PersistentCalls:
m_Calls: []
m_FocusEntered:
m_PersistentCalls:
m_Calls: []
m_FocusExited:
m_PersistentCalls:
m_Calls: []
m_Activated:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1994180164}
m_TargetAssemblyTypeName: Unlocker, Assembly-CSharp
m_MethodName: Unlock
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 1994180162}
m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
m_MethodName: SetActive
m_Mode: 6
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Deactivated:
m_PersistentCalls:
m_Calls: []
m_StartingHoverFilters: []
m_StartingSelectFilters: []
m_StartingInteractionStrengthFilters: []
m_OnFirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnLastHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectEntered:
m_PersistentCalls:
m_Calls: []
m_OnSelectExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectCanceled:
m_PersistentCalls:
m_Calls: []
m_OnActivate:
m_PersistentCalls:
m_Calls: []
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
--- !u!114 &1994180164
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1994180162}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: afdc71e568c06fa479327632679b7632, type: 3}
m_Name:
m_EditorClassIdentifier:
attachedLockables:
- {fileID: 2782228159376791284}
--- !u!135 &1994180168
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1994180162}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.012
m_Center: {x: -0.00035421105, y: -0.00035895035, z: 0.0013450432}
--- !u!4 &2014617382 stripped --- !u!4 &2014617382 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
@ -1943,6 +2101,154 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
--- !u!1 &2782228159376791283 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3052626997859917880, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
m_PrefabInstance: {fileID: 2782228159376791282}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2782228159376791284
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782228159376791283}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5ce9749f8b04eee4896e68462ad25738, type: 3}
m_Name:
m_EditorClassIdentifier:
looping: 1
loopingAfterUnlock: 0
locked: 1
doorAnimator: {fileID: 4089286531209251646}
--- !u!114 &2782228159376791285
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782228159376791283}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a35f6cfbfba9b548aaa00d52cfe8a50, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_Colliders: []
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_DistanceCalculationMode: 1
m_SelectMode: 0
m_FocusMode: 1
m_CustomReticle: {fileID: 0}
m_AllowGazeInteraction: 0
m_AllowGazeSelect: 0
m_OverrideGazeTimeToSelect: 0
m_GazeTimeToSelect: 0.5
m_OverrideTimeToAutoDeselectGaze: 0
m_TimeToAutoDeselectGaze: 3
m_AllowGazeAssistance: 0
m_FirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_LastHoverExited:
m_PersistentCalls:
m_Calls: []
m_HoverEntered:
m_PersistentCalls:
m_Calls: []
m_HoverExited:
m_PersistentCalls:
m_Calls: []
m_FirstSelectEntered:
m_PersistentCalls:
m_Calls: []
m_LastSelectExited:
m_PersistentCalls:
m_Calls: []
m_SelectEntered:
m_PersistentCalls:
m_Calls: []
m_SelectExited:
m_PersistentCalls:
m_Calls: []
m_FirstFocusEntered:
m_PersistentCalls:
m_Calls: []
m_LastFocusExited:
m_PersistentCalls:
m_Calls: []
m_FocusEntered:
m_PersistentCalls:
m_Calls: []
m_FocusExited:
m_PersistentCalls:
m_Calls: []
m_Activated:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 2782228159376791284}
m_TargetAssemblyTypeName: Lockable, Assembly-CSharp
m_MethodName: TryUnlock
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_Deactivated:
m_PersistentCalls:
m_Calls: []
m_StartingHoverFilters: []
m_StartingSelectFilters: []
m_StartingInteractionStrengthFilters: []
m_OnFirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnLastHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectEntered:
m_PersistentCalls:
m_Calls: []
m_OnSelectExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectCanceled:
m_PersistentCalls:
m_Calls: []
m_OnActivate:
m_PersistentCalls:
m_Calls: []
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
--- !u!135 &2782228159376791289
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782228159376791283}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.002
m_Center: {x: 0.0000007558556, y: -0.000024558793, z: 0.00018842802}
--- !u!1001 &4089286531209251644 --- !u!1001 &4089286531209251644
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2073,6 +2379,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4089286531257402899, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} m_CorrespondingSourceObject: {fileID: 4089286531257402899, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
m_PrefabInstance: {fileID: 4089286531209251644} m_PrefabInstance: {fileID: 4089286531209251644}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!95 &4089286531209251646 stripped
Animator:
m_CorrespondingSourceObject: {fileID: 5851408491557976711, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
m_PrefabInstance: {fileID: 4089286531209251644}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7715194072447317414 --- !u!1001 &7715194072447317414
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View file

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: keycode panel mat m_Name: keycode panel mat
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: [] m_ValidKeywords: []
m_InvalidKeywords: [] m_InvalidKeywords: []
m_LightmapFlags: 4 m_LightmapFlags: 4

View file

@ -2,10 +2,13 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
// not attached directly to a door, instead takes a refrence to a door animator and opens it when start unlock is called
public class DoorUnlock : Lockable public class DoorUnlock : Lockable
{ {
public Animator doorAnimator;
public override void StartUnlock(){ public override void StartUnlock(){
return; doorAnimator.SetBool("doorisopen", true);
} }
public override void FailedUnlock(){ public override void FailedUnlock(){
return; return;