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 +102 -104
7 changed files with 102 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit aba7286466 - Show all commits

89
Assets/Scenes/IntroLevel.unity
View file

@ -214,7 +214,7 @@ Transform:
m_GameObject: {fileID: 23455521}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.07807059, y: 0.12420002, z: -0.004100003}
m_LocalScale: {x: -0.0004, y: 0.017499998, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.017499998, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -265,8 +265,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
m_Size: {x: 1, y: 23.439781, z: 1}
m_Center: {x: 0, y: -0.22718906, z: -4.023867e-17}
--- !u!23 &32322116
MeshRenderer:
m_ObjectHideFlags: 0
@ -494,7 +494,7 @@ Transform:
m_GameObject: {fileID: 52532266}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.07807059, y: 0.14941178, z: -0.0040999916}
m_LocalScale: {x: -0.0004, y: 0.017499998, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.017499998, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -806,7 +806,7 @@ Transform:
m_GameObject: {fileID: 250262034}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.066529416, y: 0.12420002, z: -0.004100003}
m_LocalScale: {x: -0.0004, y: 0.017499998, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.017499998, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -949,7 +949,7 @@ Transform:
m_GameObject: {fileID: 323372259}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.066529416, y: 0.14941178, z: -0.0040999916}
m_LocalScale: {x: -0.0004, y: 0.017499998, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.017499998, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -1078,7 +1078,7 @@ Transform:
m_GameObject: {fileID: 558880659}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.08914, y: 0.1242, z: -0.0041}
m_LocalScale: {x: -0.0004, y: 0.0175, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.0175, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -1266,6 +1266,18 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6363136317223486412, guid: 62668fa10a1682a449e4b6afd3883237, type: 3}
propertyPath: m_LocalScale.x
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 6363136317223486412, guid: 62668fa10a1682a449e4b6afd3883237, type: 3}
propertyPath: m_LocalScale.y
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 6363136317223486412, guid: 62668fa10a1682a449e4b6afd3883237, type: 3}
propertyPath: m_LocalScale.z
value: 1.5
objectReference: {fileID: 0}
- target: {fileID: 6363136317223486412, guid: 62668fa10a1682a449e4b6afd3883237, type: 3}
propertyPath: m_LocalPosition.x
value: 0
@ -1306,6 +1318,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6363136317223486412, guid: 62668fa10a1682a449e4b6afd3883237, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8888611246345853628, guid: 62668fa10a1682a449e4b6afd3883237, type: 3}
propertyPath: portal
value:
@ -1444,7 +1460,7 @@ Transform:
m_GameObject: {fileID: 791317064}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.056058824, y: 0.12420002, z: -0.004100003}
m_LocalScale: {x: -0.0004, y: 0.017499998, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.017499998, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -1670,7 +1686,7 @@ Transform:
m_GameObject: {fileID: 896293198}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.056058824, y: 0.14941178, z: -0.0040999916}
m_LocalScale: {x: -0.0004, y: 0.017499998, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.017499998, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -2522,8 +2538,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 18.114916, z: 1}
m_Center: {x: 0, y: -8.557449, z: -8.988678e-16}
m_Size: {x: 1, y: 29.10234, z: 1}
m_Center: {x: 0, y: -3.0637362, z: -8.163369e-16}
--- !u!23 &1514955067
MeshRenderer:
m_ObjectHideFlags: 0
@ -3588,6 +3604,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
attachedLockables:
- {fileID: 2782228159376791284}
- {fileID: 2782228159376791287}
--- !u!4 &1994180165 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7c6479b7e0d25a747a6b2a88e81eeaa6, type: 3}
@ -3702,7 +3719,7 @@ Transform:
m_GameObject: {fileID: 2027620916}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.089140005, y: 0.14941178, z: -0.0040999916}
m_LocalScale: {x: -0.0004, y: 0.017499998, z: 0.0119}
m_LocalScale: {x: 0.0004, y: 0.017499998, z: 0.0119}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 790598067}
@ -6415,9 +6432,17 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_LocalScale.x
value: 150
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_LocalScale.y
value: 200
value: 300
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_LocalScale.z
value: 150
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_LocalPosition.x
@ -6459,6 +6484,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -180
objectReference: {fileID: 0}
- target: {fileID: 2384318144014809730, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3052626997859917880, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
propertyPath: m_Name
value: code panel
@ -6567,6 +6596,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 2782228159376791287}
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: []
@ -6600,6 +6641,26 @@ MonoBehaviour:
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
--- !u!1 &2782228159376791286 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3247119835711811341, guid: ab1b07e8ffb221444bea186aa622c0dd, type: 3}
m_PrefabInstance: {fileID: 2782228159376791282}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2782228159376791287
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2782228159376791286}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d7e897a79b42a3448b551a5e92e1e3f3, type: 3}
m_Name:
m_EditorClassIdentifier:
looping: 1
loopingAfterUnlock: 0
locked: 1
--- !u!135 &2782228159376791289
SphereCollider:
m_ObjectHideFlags: 0
@ -6611,7 +6672,7 @@ SphereCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.002
m_Radius: 0.001
m_Center: {x: 0.0000007558556, y: -0.000024558793, z: 0.00018842802}
--- !u!33 &2799655801908033461
MeshFilter:

81
Assets/materials/green mat glow.mat
View file

@ -1,81 +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: green mat glow
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _EMISSION
m_InvalidKeywords: []
m_LightmapFlags: 2
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, g: 1, b: 0.0184803, a: 1}
- _EmissionColor: {r: 0, g: 1, b: 0.001517635, a: 1}
m_BuildTextureStacks: []

8
Assets/materials/green mat glow.mat.meta
View file

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

2
Assets/materials/red mat glow.mat → Assets/materials/keypadscreentemp.mat
View file

@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: red mat glow
m_Name: keypadscreentemp
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _EMISSION

0
Assets/materials/red mat glow.mat.meta → Assets/materials/keypadscreentemp.mat.meta
View file

15
Assets/props/key objects/code panel/KeyPanelLockable.cs Normal file
View file

@ -0,0 +1,15 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class KeyPanelLockable : Lockable
{
Material material;
public override void StartUnlock(){
material = GetComponent<MeshRenderer>().material;
material.color = Color.green;
}
public override void FailedUnlock(){
return;
}
}

11
Assets/props/key objects/code panel/KeyPanelLockable.cs.meta Normal file
View file

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