we love deadlines #3

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

Binary file not shown.

View file

@ -5,7 +5,7 @@ OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 1
smallestOccluder: 0.75
smallestHole: 0.05
backfaceThreshold: 50.3
m_SceneGUID: a5954c25b20f8b243adcbacd1b44e3e4
@ -213,8 +213,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 23455521}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.07807059, y: 0.1192, z: -0.0038}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.013125701}
m_LocalPosition: {x: -0.07807059, y: 0.1192, z: -0.00242}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -247,8 +247,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32322113}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.07826, y: 0.14889821, z: -0.0037600095}
m_LocalScale: {x: 0.044472, y: 0.0005, z: 0.013236}
m_LocalPosition: {x: -0.07826, y: 0.14889821, z: -0.002380009}
m_LocalScale: {x: 0.044472, y: 0.0005, z: 0.016312046}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -493,8 +493,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 52532266}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.07807059, y: 0.14941, z: -0.0037600012}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.013125701}
m_LocalPosition: {x: -0.07807059, y: 0.14941, z: -0.0023800007}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -744,7 +744,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 186072705}
m_LocalRotation: {x: -0.70705616, y: -0, z: -0, w: 0.7071575}
m_LocalPosition: {x: -1.876, y: 2.260001, z: -0.51000035}
m_LocalPosition: {x: -1.817, y: 2.260001, z: -0.51000035}
m_LocalScale: {x: 0.6263545, y: 0.6263545, z: 0.6263545}
m_ConstrainProportionsScale: 0
m_Children: []
@ -1007,6 +1007,7 @@ GameObject:
m_Component:
- component: {fileID: 4089286531209251645}
- component: {fileID: 4089286531209251646}
- component: {fileID: 4089286531209251647}
m_Layer: 0
m_Name: door1
m_TagString: Untagged
@ -1141,8 +1142,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 250262034}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.066529416, y: 0.1192, z: -0.0038}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.013125701}
m_LocalPosition: {x: -0.066529416, y: 0.1192, z: -0.0024199996}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -1173,7 +1174,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 260719787}
m_LocalRotation: {x: -0.70705616, y: -0, z: -0, w: 0.7071575}
m_LocalPosition: {x: 1.517, y: -1.983, z: -0.506}
m_LocalPosition: {x: 1.517, y: -2.494, z: -0.506}
m_LocalScale: {x: 0.6263545, y: 0.6263545, z: 0.6263545}
m_ConstrainProportionsScale: 0
m_Children: []
@ -1284,8 +1285,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 323372259}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.066529416, y: 0.14941, z: -0.00376}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.013125701}
m_LocalPosition: {x: -0.066529416, y: 0.14941, z: -0.0023799995}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -1413,8 +1414,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 558880659}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.08914, y: 0.11919998, z: -0.0037999973}
m_LocalScale: {x: 0.0004, y: 0.02158625, z: 0.013125701}
m_LocalPosition: {x: -0.08914, y: 0.11919998, z: -0.0024199968}
m_LocalScale: {x: 0.0004, y: 0.02158625, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -1508,7 +1509,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 560786879}
m_LocalRotation: {x: -0.70705616, y: -0, z: -0, w: 0.7071575}
m_LocalPosition: {x: 0.487, y: -1.983, z: -0.506}
m_LocalPosition: {x: 0.487, y: -2.342, z: -0.506}
m_LocalScale: {x: 0.6263545, y: 0.6263545, z: 0.6263545}
m_ConstrainProportionsScale: 0
m_Children: []
@ -1554,7 +1555,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 737779765}
m_LocalRotation: {x: -0.70705616, y: -0, z: -0, w: 0.7071575}
m_LocalPosition: {x: 0.487, y: 2.26, z: -0.51}
m_LocalPosition: {x: 0.403, y: 2.26, z: -0.51}
m_LocalScale: {x: 0.6263545, y: 0.6263545, z: 0.6263545}
m_ConstrainProportionsScale: 0
m_Children: []
@ -1803,8 +1804,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 791317064}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.056058824, y: 0.1192, z: -0.0038}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.013125701}
m_LocalPosition: {x: -0.056058824, y: 0.1192, z: -0.0024199996}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -2107,8 +2108,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 896293198}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.056058824, y: 0.14941, z: -0.0037600012}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.013125701}
m_LocalPosition: {x: -0.056058824, y: 0.14941, z: -0.0023800007}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -2663,6 +2664,10 @@ PrefabInstance:
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalPosition.x
value: -0.04
objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
@ -2831,8 +2836,8 @@ OcclusionArea:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1255901449}
serializedVersion: 2
m_Size: {x: 0.08385499, y: 0.026378542, z: 0.09610018}
m_Center: {x: -0.06692745, y: 0.12917799, z: -0.0007637065}
m_Size: {x: 0.052941184, y: 0.026378542, z: 0.070588216}
m_Center: {x: -0.074705884, y: 0.13641176, z: -0.0007637057}
m_IsViewVolume: 1
--- !u!1 &1293840008
GameObject:
@ -2859,7 +2864,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1293840008}
m_LocalRotation: {x: -0.70705616, y: -0, z: -0, w: 0.7071575}
m_LocalPosition: {x: -1.876, y: -1.983, z: -0.506}
m_LocalPosition: {x: -1.937, y: -2.378, z: -0.506}
m_LocalScale: {x: 0.6263545, y: 0.6263545, z: 0.6263545}
m_ConstrainProportionsScale: 0
m_Children: []
@ -3036,8 +3041,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1514955064}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.07826, y: 0.11919998, z: -0.0037999973}
m_LocalScale: {x: 0.044472, y: 0.0005, z: 0.013236}
m_LocalPosition: {x: -0.07826, y: 0.11919998, z: -0.0024199968}
m_LocalScale: {x: 0.044472, y: 0.0005, z: 0.016312046}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -3734,7 +3739,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1658570140}
m_LocalRotation: {x: -0.70705616, y: -0, z: -0, w: 0.7071575}
m_LocalPosition: {x: -0.676, y: -1.983, z: -0.506}
m_LocalPosition: {x: -0.676, y: -2.334, z: -0.506}
m_LocalScale: {x: 0.6263545, y: 0.6263545, z: 0.6263545}
m_ConstrainProportionsScale: 0
m_Children: []
@ -4662,8 +4667,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2027620916}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.089140005, y: 0.14941, z: -0.0037600012}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.013125701}
m_LocalPosition: {x: -0.089140005, y: 0.14941, z: -0.0023800007}
m_LocalScale: {x: 0.0004, y: 0.021586249, z: 0.016176114}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -9353,6 +9358,102 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!82 &4089286531209251647
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 212429516}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 6495164b7f8b6894682465a0892c58e9, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 0
MinDistance: 5
MaxDistance: 15
Pan2D: 0
rolloffMode: 1
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!33 &4096998494802895448
MeshFilter:
m_ObjectHideFlags: 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 815 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1 MiB

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

View file

@ -176,6 +176,7 @@ GameObject:
m_Component:
- component: {fileID: 6970224103268099477}
- component: {fileID: 6970224103268099478}
- component: {fileID: 379552068827728828}
m_Layer: 0
m_Name: door1
m_TagString: Untagged
@ -222,6 +223,102 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!82 &379552068827728828
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6375730977628750948}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 6495164b7f8b6894682465a0892c58e9, type: 3}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 0
MinDistance: 5
MaxDistance: 15
Pan2D: 0
rolloffMode: 1
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &6375730978512139504
GameObject:
m_ObjectHideFlags: 0

View file

@ -1,5 +1,17 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7787908842078421233
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ec20eecf5a6af2f44afbe889bf558c85, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1101 &-5340576841863526948
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -17,7 +29,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.49999997
m_TransitionDuration: 2
m_TransitionOffset: 0.25
m_ExitTime: 0.25
m_HasExitTime: 1
@ -63,7 +75,8 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: -5340576841863526948}
m_StateMachineBehaviours: []
m_StateMachineBehaviours:
- {fileID: -7787908842078421233}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@ -109,7 +122,7 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
@ -123,6 +136,31 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!114 &3706473873805178271
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3ed83a00d2a922040bb74a9764fdb46a, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 0}
--- !u!114 &5002237059607048293
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ec20eecf5a6af2f44afbe889bf558c85, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1102 &5147439819958120009
AnimatorState:
serializedVersion: 6
@ -135,7 +173,8 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 8129914333284270499}
m_StateMachineBehaviours: []
m_StateMachineBehaviours:
- {fileID: 5002237059607048293}
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
@ -167,7 +206,7 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.5
m_TransitionDuration: 2
m_TransitionOffset: 0.25
m_ExitTime: 0.25
m_HasExitTime: 1

View file

@ -0,0 +1,13 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PlaySoundOnAnimate : StateMachineBehaviour
{
override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
{
animator.gameObject.GetComponent<AudioSource>().Play();
}
}

View file

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ec20eecf5a6af2f44afbe889bf558c85
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View file

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 6495164b7f8b6894682465a0892c58e9
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 0be62a374422b7c46833aa4d05a99039
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -1,6 +1,7 @@
door open and close sfx
less mechanical door model for office section
textures for all the models so far
more office clutter (filing cabinets, stacks of paper, etc)
clutter for big room (think nasa ground control, full of computers and technology)
big room centerpiece containing the looking glass(TM)
prefab for level transitions (something like the airlock transitions from portal probably)
prefab for level transitions (something like the airlock transitions from portal probably)
more textures