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

127
Assets/Scenes/IntroLevel.unity
View file

@ -751,6 +751,30 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: -9014274408441580892, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: -9014274408441580892, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -9014274408441580892, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: -9014274408441580892, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -9014274408441580892, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -9014274408441580892, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 2
@ -811,6 +835,10 @@ PrefabInstance:
propertyPath: m_MinimumChartSize propertyPath: m_MinimumChartSize
value: 4 value: 4
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -3073643347353195968, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_StaticEditorFlags
value: 0
objectReference: {fileID: 0}
- target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 2 value: 2
@ -1339,7 +1367,7 @@ PrefabInstance:
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Materials.Array.data[1] propertyPath: m_Materials.Array.data[1]
value: value:
objectReference: {fileID: 2100000, guid: 514f479565bb2e44586955071c1334f0, type: 2} objectReference: {fileID: 2100000, guid: 00ee8df7237e1df478292b8d40232b8c, type: 2}
- target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: ceilinglight1 (1) value: ceilinglight1 (1)
@ -1449,6 +1477,91 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1 m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0 m_ShadowRadius: 0
m_ShadowAngle: 0 m_ShadowAngle: 0
--- !u!1001 &1672008727
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1099863756}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalScale.x
value: 0.005882353
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalScale.y
value: 0.0058823517
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalScale.z
value: 0.0058823517
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalPosition.x
value: 0.00049651373
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalPosition.y
value: 0.282
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalPosition.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalRotation.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8631827556080124174, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: -2844284256841088113, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_Name
value: door1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 2198386531113363028, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: beacaae01bfd72c469cf3a333d906953, type: 3}
--- !u!1001 &1687088406 --- !u!1001 &1687088406
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1580,11 +1693,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0.25000006 value: 0.27162
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.009700012 value: 0.0097
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
@ -1621,7 +1734,7 @@ PrefabInstance:
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Materials.Array.data[1] propertyPath: m_Materials.Array.data[1]
value: value:
objectReference: {fileID: 2100000, guid: 514f479565bb2e44586955071c1334f0, type: 2} objectReference: {fileID: 2100000, guid: 00ee8df7237e1df478292b8d40232b8c, type: 2}
- target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: ceilinglight1 (5) value: ceilinglight1 (5)
@ -2037,6 +2150,10 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: ceilinglight1 value: ceilinglight1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1336040340728821430, guid: cb210624344fda646869011f1bd9ae93, type: 3}
propertyPath: m_Materials.Array.data[1]
value:
objectReference: {fileID: 2100000, guid: 00ee8df7237e1df478292b8d40232b8c, type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cb210624344fda646869011f1bd9ae93, type: 3} m_SourcePrefab: {fileID: 100100000, guid: cb210624344fda646869011f1bd9ae93, type: 3}
--- !u!4 &381403257386949810 stripped --- !u!4 &381403257386949810 stripped
@ -2322,7 +2439,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531257402899, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286531257402899, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -0.00012350644 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4089286531257402899, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3} - target: {fileID: 4089286531257402899, guid: 78fff5d14e1bd244e8503acdb30848f7, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w