we love deadlines #3

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

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 170 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Binary file not shown.

View file

@ -1,80 +0,0 @@
%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: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View file

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2782228160307535209
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalScale.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalPosition.x
value: 0.4182
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalPosition.y
value: 0.1553
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalPosition.z
value: 1.418
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalRotation.y
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -180
objectReference: {fileID: 0}
- target: {fileID: -8391222552659086748, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_ScaleInLightmap
value: 10
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 1d5087c110af07f4dbabf6c69d1566b9, type: 2}
- target: {fileID: -4683669308469848369, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 2d5846623f69ede449626639c135736d, type: 2}
- target: {fileID: 919132149155446097, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_Name
value: code panel
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 69836efcea7e42446965233d84a7746c, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 69836efcea7e42446965233d84a7746c, type: 3}

View file

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

View file

@ -47,7 +47,7 @@ ModelImporter:
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
generateSecondaryUV: 1
useFileUnits: 1
keepQuads: 0
weldVertices: 1
@ -60,11 +60,11 @@ ModelImporter:
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVMinLightmapResolution: 32
secondaryUVMinObjectScale: 100
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:

View file

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

View file

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &381403256302676530
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalScale.x
value: 0.5882353
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalScale.y
value: 0.5882352
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalScale.z
value: 0.5882352
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.x
value: -0.00037058824
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.y
value: 0.007000001
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.z
value: 0.009729416
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.w
value: 0.000000075497915
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.x
value: 3.5527133e-15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000119209275
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 7847d6aa0efaa7b499f405c1f9c73b05, type: 2}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 514f479565bb2e44586955071c1334f0, type: 2}
- target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Name
value: ceilinglight1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cb210624344fda646869011f1bd9ae93
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

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

View file

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &7715194071986492024
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalScale.x
value: 0.5882354
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalScale.y
value: 0.5882352
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalScale.z
value: 0.5882352
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalPosition.x
value: -0.054705884
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalPosition.y
value: 0.13041182
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalPosition.z
value: 0.010005895
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.x
value: -0.000000119209275
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 7847d6aa0efaa7b499f405c1f9c73b05, type: 2}
- target: {fileID: -7511558181221131132, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: bdff8666beeec1b40998e59aec2510da, type: 2}
- target: {fileID: 919132149155446097, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_Name
value: ceilinglight2 (1)
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f58207731640999499a0e5f8ea5e424d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

@ -0,0 +1,83 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &8751160154960044234
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalScale.x
value: 0.5882354
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalScale.y
value: 0.5882352
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalScale.z
value: 0.5882352
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalPosition.x
value: -0.054705884
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalPosition.y
value: 0.10064712
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalPosition.z
value: 0.010005895
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.x
value: -0.000000119209275
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 7847d6aa0efaa7b499f405c1f9c73b05, type: 2}
- target: {fileID: -7511558181221131132, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 6c4b50b51c4e61b4584627a2efa991c0, type: 2}
- target: {fileID: 919132149155446097, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_Name
value: ceilinglight2
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}

View file

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6f32a305c111a124c9253e8546e37248
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View file

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