we love deadlines #3

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

View file

@ -936,8 +936,8 @@ GameObject:
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 2147483647
m_IsActive: 0 m_IsActive: 1
--- !u!4 &1548563262 --- !u!4 &1548563262
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1111,8 +1111,8 @@ GameObject:
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 2147483647
m_IsActive: 0 m_IsActive: 1
--- !u!4 &1658092940 --- !u!4 &1658092940
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1407,18 +1407,26 @@ PrefabInstance:
propertyPath: m_ScaleInLightmap propertyPath: m_ScaleInLightmap
value: 3 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286530596214869, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: dcd4b81d739799c41867e3cfcfe56d45, type: 2}
- target: {fileID: 4089286530596214875, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286530596214875, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_StaticEditorFlags propertyPath: m_StaticEditorFlags
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531079030848, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286531079030848, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_StaticEditorFlags propertyPath: m_StaticEditorFlags
value: 127 value: 126
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531079030850, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286531079030850, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_ScaleInLightmap propertyPath: m_ScaleInLightmap
value: 3 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531079030850, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: dcd4b81d739799c41867e3cfcfe56d45, type: 2}
- target: {fileID: 4089286531257402898, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286531257402898, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: door1 value: door1
@ -1469,7 +1477,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531439898589, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286531439898589, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_StaticEditorFlags propertyPath: m_StaticEditorFlags
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531439898591, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286531439898591, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_CastShadows propertyPath: m_CastShadows
@ -1479,6 +1487,10 @@ PrefabInstance:
propertyPath: m_ScaleInLightmap propertyPath: m_ScaleInLightmap
value: 3 value: 3
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531439898591, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: dcd4b81d739799c41867e3cfcfe56d45, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
--- !u!1001 &8449482749711574517 --- !u!1001 &8449482749711574517

Binary file not shown.

After

Width:  |  Height:  |  Size: 768 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8 KiB

View file

@ -28,7 +28,7 @@ Transform:
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 100, y: 100, z: 100} m_LocalScale: {x: 100, y: 100, z: 100}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 4089286531257402899} m_Father: {fileID: 4089286531257402899}
m_RootOrder: 1 m_RootOrder: 1
@ -111,7 +111,7 @@ Transform:
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 100, y: 100, z: 100} m_LocalScale: {x: 100, y: 100, z: 100}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 4089286531257402899} m_Father: {fileID: 4089286531257402899}
m_RootOrder: 0 m_RootOrder: 0
@ -193,7 +193,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalRotation: {x: -0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: -1.241, z: -25.899} m_LocalPosition: {x: 0, y: -1.241, z: -25.899}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: m_Children:
- {fileID: 4089286531079030849} - {fileID: 4089286531079030849}
- {fileID: 4089286530596214868} - {fileID: 4089286530596214868}
@ -250,7 +250,7 @@ Transform:
m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 100, y: 100, z: 100} m_LocalScale: {x: 100, y: 100, z: 100}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 1
m_Children: [] m_Children: []
m_Father: {fileID: 4089286531257402899} m_Father: {fileID: 4089286531257402899}
m_RootOrder: 2 m_RootOrder: 2

View file

@ -17,9 +17,9 @@ AnimatorStateTransition:
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.25 m_TransitionDuration: 0.49999997
m_TransitionOffset: 0 m_TransitionOffset: 0.25
m_ExitTime: 0.75 m_ExitTime: 0.25
m_HasExitTime: 1 m_HasExitTime: 1
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
@ -36,13 +36,14 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 5147439819958120009} m_State: {fileID: 5147439819958120009}
m_Position: {x: 280, y: 110, z: 0} m_Position: {x: 340, y: 170, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: -4483841024442465445} m_State: {fileID: -4483841024442465445}
m_Position: {x: 490, y: 0, z: 0} m_Position: {x: 340, y: 30, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions:
- {fileID: -2928077222987201869}
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0} m_AnyStatePosition: {x: 50, y: 20, z: 0}
@ -77,6 +78,23 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1109 &-2928077222987201869
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: doorisopen
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -4483841024442465445}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -90,7 +108,7 @@ AnimatorController:
m_Type: 4 m_Type: 4
m_DefaultFloat: 0 m_DefaultFloat: 0
m_DefaultInt: 0 m_DefaultInt: 0
m_DefaultBool: 1 m_DefaultBool: 0
m_Controller: {fileID: 0} m_Controller: {fileID: 0}
m_AnimatorLayers: m_AnimatorLayers:
- serializedVersion: 5 - serializedVersion: 5
@ -149,9 +167,9 @@ AnimatorStateTransition:
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.25 m_TransitionDuration: 0.5
m_TransitionOffset: 0 m_TransitionOffset: 0.25
m_ExitTime: 0.75 m_ExitTime: 0.25
m_HasExitTime: 1 m_HasExitTime: 1
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0

View file

@ -0,0 +1,80 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: lighting workaround material
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.66, g: 0.6490608, b: 0.47038677, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dcd4b81d739799c41867e3cfcfe56d45
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant: