we love deadlines #3

Merged
Mercury merged 53 commits from Introduction-Level into main 2024-03-10 23:33:14 +01:00
8 changed files with 43 additions and 19 deletions
Showing only changes of commit 23010a2b46 - Show all commits

View file

@ -20,7 +20,7 @@ RenderSettings:
m_FogDensity: 0.01 m_FogDensity: 0.01
m_LinearFogStart: 0 m_LinearFogStart: 0
m_LinearFogEnd: 300 m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientSkyColor: {r: 0, g: 0, b: 0, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1 m_AmbientIntensity: 1
@ -33,7 +33,7 @@ RenderSettings:
m_HaloTexture: {fileID: 0} m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0 m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128 m_DefaultReflectionResolution: 16
m_ReflectionBounces: 1 m_ReflectionBounces: 1
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
@ -1045,7 +1045,7 @@ Transform:
m_Children: m_Children:
- {fileID: 934833339} - {fileID: 934833339}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &223021657 stripped --- !u!4 &223021657 stripped
Transform: Transform:
@ -2416,35 +2416,47 @@ PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 1099863755}
m_Modifications: m_Modifications:
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 1 value: 3
objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalScale.x
value: 0.43990937
objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalScale.y
value: 0.43990928
objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalScale.z
value: 0.43990928
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -26.124882 value: -0.11367578
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: -1.647 value: 0.09998825
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -18.808 value: -0.0025117537
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.7071067 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
value: -0.7071068 value: -0.00000008940697
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: 0 value: -0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3} - target: {fileID: 332309802139975467, guid: 837fe78712a53254b84b5b87ffe5edcc, type: 3}
propertyPath: m_LocalRotation.z propertyPath: m_LocalRotation.z
@ -2587,7 +2599,7 @@ PrefabInstance:
objectReference: {fileID: 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: 1
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
@ -5596,11 +5608,11 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198647944757661145, guid: cb210624344fda646869011f1bd9ae93, type: 3} - target: {fileID: 198647944757661145, guid: cb210624344fda646869011f1bd9ae93, type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0.007000001 value: -0.00596
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198647944757661145, guid: cb210624344fda646869011f1bd9ae93, type: 3} - target: {fileID: 198647944757661145, guid: cb210624344fda646869011f1bd9ae93, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.009729416 value: 0.00973
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 198647944757661145, guid: cb210624344fda646869011f1bd9ae93, type: 3} - target: {fileID: 198647944757661145, guid: cb210624344fda646869011f1bd9ae93, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w

Binary file not shown.

After

Width:  |  Height:  |  Size: 752 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

File diff suppressed because one or more lines are too long

View file

@ -47,7 +47,7 @@ ModelImporter:
nodeNameCollisionStrategy: 1 nodeNameCollisionStrategy: 1
fileIdsGeneration: 2 fileIdsGeneration: 2
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 1
useFileUnits: 1 useFileUnits: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
@ -60,10 +60,10 @@ ModelImporter:
meshOptimizationFlags: -1 meshOptimizationFlags: -1
indexFormat: 0 indexFormat: 0
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1 secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40 secondaryUVMinLightmapResolution: 32
secondaryUVMinObjectScale: 1 secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1