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

166
Assets/Scenes/IntroLevel.unity
View file

@ -266,7 +266,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -0.07402 value: -0.056
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
@ -322,6 +322,87 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
--- !u!1001 &435953202
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1099863755}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_RootOrder
value: 13
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.086
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.y
value: 0.1157
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.z
value: 0.0097
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.w
value: 0.00000007549791
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.x
value: 3.5527137e-15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000059604645
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: 6c4b50b51c4e61b4584627a2efa991c0, type: 2}
- target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Name
value: ceilinglight1 (10)
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}
--- !u!114 &511198482 stripped --- !u!114 &511198482 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3223563472775598281, guid: 4ba2eb97b68381d4796a2f2bcf79f148, type: 3} m_CorrespondingSourceObject: {fileID: 3223563472775598281, guid: 4ba2eb97b68381d4796a2f2bcf79f148, type: 3}
@ -520,7 +601,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -0.07402 value: -0.056
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
@ -952,6 +1033,87 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f8c1541b342b4364ba5d8183152e5e8a, type: 3} m_Script: {fileID: 11500000, guid: f8c1541b342b4364ba5d8183152e5e8a, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1001 &1352287422
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1099863755}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_RootOrder
value: 12
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.086
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.y
value: 0.1543
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalPosition.z
value: 0.0097
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.w
value: 0.00000007549791
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.x
value: 3.5527137e-15
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_LocalRotation.y
value: 0.000000059604645
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: 6c4b50b51c4e61b4584627a2efa991c0, type: 2}
- target: {fileID: 919132149155446097, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Name
value: ceilinglight1 (9)
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}
--- !u!1001 &1521720146 --- !u!1001 &1521720146
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

BIN
Assets/Scenes/IntroLevel/LightingData.asset
View file

Binary file not shown.

BIN
Assets/Scenes/IntroLevel/Lightmap-0_comp_light.exr
View file

Binary file not shown.

BIN
Assets/Scenes/IntroLevel/Lightmap-1_comp_dir.png
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 MiB

BIN
Assets/Scenes/IntroLevel/Lightmap-1_comp_light.exr
View file

Binary file not shown.