Mercury/Looking-Glass
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

we love deadlines #3

Merged
Mercury merged 53 commits from Introduction-Level into main 2024-03-10 23:33:14 +01:00
Conversation 0 Commits 53 Files changed 327 +3315 -264
19 changed files with 3315 additions and 264 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit de7ff223ca - Show all commits

127
Assets/Scenes/IntroLevel.unity
View file

@ -1036,6 +1036,25 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 18328f3f4a3ac504e8d255aeb3d1aca4, type: 3}
m_PrefabInstance: {fileID: 1234399570}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1255901449 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6260751921446266403, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
m_PrefabInstance: {fileID: 1099863754}
m_PrefabAsset: {fileID: 0}
--- !u!64 &1255901452
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1255901449}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 9137007078284912136, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
--- !u!1 &1328032656 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2113103318539084319, guid: 62668fa10a1682a449e4b6afd3883237, type: 3}
@ -1052,6 +1071,25 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f8c1541b342b4364ba5d8183152e5e8a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1427762985 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -1414992243360253121, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
m_PrefabInstance: {fileID: 1099863754}
m_PrefabAsset: {fileID: 0}
--- !u!64 &1427762989
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1427762985}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -7670705272621351091, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
--- !u!1001 &1521720146
PrefabInstance:
m_ObjectHideFlags: 0
@ -1599,18 +1637,18 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
m_PrefabInstance: {fileID: 1739106759}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1780349473 stripped
--- !u!1 &1975120003 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
m_CorrespondingSourceObject: {fileID: 3585290252978412211, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
m_PrefabInstance: {fileID: 1099863754}
m_PrefabAsset: {fileID: 0}
--- !u!64 &1780349474
--- !u!64 &1975120006
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1780349473}
m_GameObject: {fileID: 1975120003}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
@ -1618,6 +1656,83 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 790759376422376197, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
--- !u!1001 &1994180161
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalScale.x
value: 10
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalScale.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalScale.z
value: 10
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalPosition.x
value: -9.028
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalPosition.y
value: -1.526
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalPosition.z
value: -30.6674
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071067
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 890b823191b864e48b601dbd2da28c5b, type: 2}
- target: {fileID: 919132149155446097, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
propertyPath: m_Name
value: postitnote multitextured (3)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
--- !u!4 &2014617382 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
@ -1784,11 +1899,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_LocalPosition.x
value: 0.4182
value: 0.418
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_LocalPosition.y
value: 0.1553
value: -0.49
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_LocalPosition.z

BIN
Assets/blends/props.blend
View file

Binary file not shown.

BIN
Assets/blends/props.blend1
View file

Binary file not shown.

3
Assets/csc.rsp Normal file
View file

@ -0,0 +1,3 @@
-r:System.Drawing.dll
-define:SYSTEM_DRAWING

5
Assets/props/key objects/convenient postit note/postit UV 3.mat.meta → Assets/csc.rsp.meta
View file

@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: f1a41988f78e7284eb2e0b0b11053182
NativeFormatImporter:
guid: f769a5c959f174a4a92a2a7616554ae8
DefaultImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

3072
Assets/props/key objects/convenient postit note/postit UV 0.mat
View file

File diff suppressed because it is too large Load diff

80
Assets/props/key objects/convenient postit note/postit UV 1.mat
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: postit UV 1
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: []

80
Assets/props/key objects/convenient postit note/postit UV 2.mat
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: postit UV 2
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: []

8
Assets/props/key objects/convenient postit note/postit UV 2.mat.meta
View file

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

80
Assets/props/key objects/convenient postit note/postit UV 3.mat
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: postit UV 3
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: []

BIN
Assets/props/key objects/convenient postit note/postitnote multitextured.fbx
View file

Binary file not shown.

6
Assets/props/key objects/convenient postit note/postit UV 1.mat.meta → Assets/shaders.meta
View file

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 4269e053112e49948a3ffbf4fe064f53
NativeFormatImporter:
guid: 165140f863a4f1241bcad6dbc5ec3ef2
folderAsset: yes
DefaultImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

76
Assets/shaders/outline shader.shader Normal file
View file

@ -0,0 +1,76 @@
Shader "Tutorial/Outline" {
Properties {
_Texture ("Texture", 2D) = "White" {}
_OutlineColor ("Outline Color", Color) = (0, 0, 0, 1)
_OutlineWidth ("Outline Width", Range(0, 0.1)) = 0.03
}
Subshader {
Tags {
"RenderType" = "Opaque"
}
CGPROGRAM
#pragma surface surf NoLighting noambient
sampler2D _Texture;
fixed4 LightingNoLighting(SurfaceOutput s, fixed3 lightDir, fixed atten) {
return fixed4(s.Albedo, s.Alpha);
}
struct Input {
float2 uv_MainTex;
};
half4 _Color;
half _Glossiness;
half _Metallic;
void surf(Input IN, inout SurfaceOutput o) {
fixed4 c = tex2D (_Texture, IN.uv_MainTex);
o.Albedo = c.rgb;
}
ENDCG
Pass {
Cull Front
CGPROGRAM
#pragma vertex VertexProgram
#pragma fragment FragmentProgram
half _OutlineWidth;
float4 VertexProgram(
float4 position : POSITION,
float3 normal : NORMAL) : SV_POSITION {
position.xyz += normal * _OutlineWidth;
return UnityObjectToClipPos(position);
}
half4 _OutlineColor;
half4 FragmentProgram() : SV_TARGET {
return _OutlineColor;
}
ENDCG
}
}
}

10
Assets/shaders/outline shader.shader.meta Normal file
View file

@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 05c011ffd97fbb34d86b3a2d3bf5b7a9
ShaderImporter:
externalObjects: {}
defaultTextures: []
nonModifiableTextures: []
preprocessorOverride: 0
userData:
assetBundleName:
assetBundleVariant:

1
Packages/manifest.json
View file

@ -9,6 +9,7 @@
"com.unity.ide.vscode": "1.2.5",
"com.unity.inputsystem": "1.7.0",
"com.unity.learn.iet-framework": "3.1.3",
"com.unity.postprocessing": "3.4.0",
"com.unity.render-pipelines.universal": "12.1.13",
"com.unity.test-framework": "1.1.33",
"com.unity.textmeshpro": "3.0.6",

9
Packages/packages-lock.json
View file

@ -111,6 +111,15 @@
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.postprocessing": {
"version": "3.4.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.physics": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.render-pipelines.core": {
"version": "12.1.13",
"depth": 1,

22
Thry/Config.json Normal file
View file

@ -0,0 +1,22 @@
{
"default_texture_type": 0,
"showRenderQueue": true,
"showManualReloadButton": false,
"allowCustomLockingRenaming": false,
"autoMarkPropertiesAnimated": true,
"texturePackerCompressionWithAlphaOverwrite": -1,
"texturePackerCompressionNoAlphaOverwrite": -1,
"gradientEditorCompressionOverwrite": -1,
"locale": "English",
"gradient_name": "gradient_<hash>.png",
"autoSetAnchorOverride": true,
"humanBoneAnchor": 7,
"anchorOverrideObjectName": "AutoAnchorObject",
"autoSetAnchorAskedOnce": false,
"enableDeveloperMode": false,
"disableUnlockedShaderStrippingOnBuild": false,
"forceAsyncCompilationPreview": true,
"fixKeywordsWhenLocking": true,
"saveAfterLockUnlock": true,
"verion": "2.43.3"
}

0
Thry/linked_materials.json Normal file
View file

0
Thry/preset_cache.txt Normal file
View file