we love deadlines #3

Merged
Mercury merged 53 commits from Introduction-Level into main 2024-03-10 23:33:14 +01:00
3 changed files with 70 additions and 10 deletions
Showing only changes of commit 550f6a4bcf - Show all commits

View file

@ -475,7 +475,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_ReceiveShadows propertyPath: m_ReceiveShadows
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Materials.Array.data[0] propertyPath: m_Materials.Array.data[0]
@ -748,15 +748,15 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.x propertyPath: m_LocalScale.x
value: 1.7 value: 170
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.y propertyPath: m_LocalScale.y
value: 1.7 value: 170
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
value: 1.7 value: 170
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -8679921383154817045, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -806,6 +806,18 @@ PrefabInstance:
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 11 value: 11
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
@ -818,10 +830,30 @@ PrefabInstance:
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -2097540761788709260, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -1414992243360253121, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 9 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
@ -834,10 +866,26 @@ PrefabInstance:
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -255367324591169471, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 10 value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 1 value: 1
@ -850,6 +898,10 @@ PrefabInstance:
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 646913359339196191, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: bad3e6b043e994545b959bb82b14329b, type: 3} - target: {fileID: 919132149155446097, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_Name propertyPath: m_Name
value: introLevel-Blockup value: introLevel-Blockup
@ -858,6 +910,14 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags propertyPath: m_StaticEditorFlags
value: 2147483647 value: 2147483647
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3585290252978412211, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
- target: {fileID: 6260751921446266403, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
propertyPath: m_StaticEditorFlags
value: 2147483647
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bad3e6b043e994545b959bb82b14329b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: bad3e6b043e994545b959bb82b14329b, type: 3}
--- !u!4 &1099863755 stripped --- !u!4 &1099863755 stripped
@ -957,7 +1017,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_ReceiveShadows propertyPath: m_ReceiveShadows
value: 0 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3} - target: {fileID: -7511558181221131132, guid: 25b8d35363e54db419b6b9aee2db26ab, type: 3}
propertyPath: m_Materials.Array.data[0] propertyPath: m_Materials.Array.data[0]

View file

@ -40,8 +40,8 @@ LightingSettings:
m_FinalGatherFiltering: 1 m_FinalGatherFiltering: 1
m_PVRCulling: 0 m_PVRCulling: 0
m_PVRSampling: 1 m_PVRSampling: 1
m_PVRDirectSampleCount: 16 m_PVRDirectSampleCount: 32
m_PVRSampleCount: 128 m_PVRSampleCount: 256
m_PVREnvironmentSampleCount: 64 m_PVREnvironmentSampleCount: 64
m_PVREnvironmentReferencePointCount: 2048 m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 2 m_LightProbeSampleCountMultiplier: 2

View file

@ -40,13 +40,13 @@ LightingSettings:
m_FinalGatherFiltering: 1 m_FinalGatherFiltering: 1
m_PVRCulling: 0 m_PVRCulling: 0
m_PVRSampling: 1 m_PVRSampling: 1
m_PVRDirectSampleCount: 64 m_PVRDirectSampleCount: 128
m_PVRSampleCount: 2048 m_PVRSampleCount: 2048
m_PVREnvironmentSampleCount: 1024 m_PVREnvironmentSampleCount: 1024
m_PVREnvironmentReferencePointCount: 2048 m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4 m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 6 m_PVRBounces: 8
m_PVRMinBounces: 3 m_PVRMinBounces: 4
m_PVREnvironmentMIS: 1 m_PVREnvironmentMIS: 1
m_PVRFilteringMode: 1 m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1 m_PVRDenoiserTypeDirect: 1