Second build

After fixing bugs and improving features from yesterday's playtests, the second build is ready
TomDotScott · Apr 30, 2020 · 3e89632 · 3e89632
1 parent 5c5b7ea
commit 3e89632
Show file tree

Hide file tree

Showing 173 changed files with 385 additions and 424 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,4 @@ crashlytics-build.properties
 
 Assets/Materials/Blue Light.mat.meta
 Assets/Real Stars Skybox/StarSkybox04/CubemapStars.cubemap
+*.zip
diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.0014785795, g: 0.0013591028, b: 0.0012890887, a: 1}
+  m_IndirectSpecularColor: {r: 0.016090982, g: 0.01466979, b: 0.013826404, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

diff --git a/Assets/Scenes/Level1/LightingData.asset b/Assets/Scenes/Level1/LightingData.asset
diff --git a/Assets/Scenes/Level1/Lightmap-0_comp_dir.png b/Assets/Scenes/Level1/Lightmap-0_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-0_comp_light.exr b/Assets/Scenes/Level1/Lightmap-0_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-10_comp_dir.png b/Assets/Scenes/Level1/Lightmap-10_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-10_comp_light.exr b/Assets/Scenes/Level1/Lightmap-10_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-11_comp_dir.png b/Assets/Scenes/Level1/Lightmap-11_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-11_comp_light.exr b/Assets/Scenes/Level1/Lightmap-11_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-12_comp_dir.png b/Assets/Scenes/Level1/Lightmap-12_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-12_comp_light.exr b/Assets/Scenes/Level1/Lightmap-12_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-13_comp_dir.png b/Assets/Scenes/Level1/Lightmap-13_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-13_comp_light.exr b/Assets/Scenes/Level1/Lightmap-13_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-14_comp_dir.png b/Assets/Scenes/Level1/Lightmap-14_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-14_comp_light.exr b/Assets/Scenes/Level1/Lightmap-14_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-15_comp_dir.png b/Assets/Scenes/Level1/Lightmap-15_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-15_comp_light.exr b/Assets/Scenes/Level1/Lightmap-15_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-18_comp_dir.png b/Assets/Scenes/Level1/Lightmap-18_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-18_comp_light.exr b/Assets/Scenes/Level1/Lightmap-18_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-19_comp_dir.png b/Assets/Scenes/Level1/Lightmap-19_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-19_comp_light.exr b/Assets/Scenes/Level1/Lightmap-19_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-1_comp_dir.png b/Assets/Scenes/Level1/Lightmap-1_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-1_comp_light.exr b/Assets/Scenes/Level1/Lightmap-1_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-20_comp_dir.png b/Assets/Scenes/Level1/Lightmap-20_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-20_comp_light.exr b/Assets/Scenes/Level1/Lightmap-20_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-21_comp_dir.png b/Assets/Scenes/Level1/Lightmap-21_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-21_comp_light.exr b/Assets/Scenes/Level1/Lightmap-21_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-22_comp_dir.png b/Assets/Scenes/Level1/Lightmap-22_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-22_comp_light.exr b/Assets/Scenes/Level1/Lightmap-22_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-23_comp_dir.png b/Assets/Scenes/Level1/Lightmap-23_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-23_comp_light.exr b/Assets/Scenes/Level1/Lightmap-23_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-2_comp_dir.png b/Assets/Scenes/Level1/Lightmap-2_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-2_comp_light.exr b/Assets/Scenes/Level1/Lightmap-2_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-3_comp_dir.png b/Assets/Scenes/Level1/Lightmap-3_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-3_comp_light.exr b/Assets/Scenes/Level1/Lightmap-3_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-4_comp_dir.png b/Assets/Scenes/Level1/Lightmap-4_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-4_comp_light.exr b/Assets/Scenes/Level1/Lightmap-4_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-5_comp_dir.png b/Assets/Scenes/Level1/Lightmap-5_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-5_comp_light.exr b/Assets/Scenes/Level1/Lightmap-5_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-6_comp_dir.png b/Assets/Scenes/Level1/Lightmap-6_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-6_comp_light.exr b/Assets/Scenes/Level1/Lightmap-6_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-7_comp_dir.png b/Assets/Scenes/Level1/Lightmap-7_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-7_comp_light.exr b/Assets/Scenes/Level1/Lightmap-7_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-8_comp_dir.png b/Assets/Scenes/Level1/Lightmap-8_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-8_comp_light.exr b/Assets/Scenes/Level1/Lightmap-8_comp_light.exr
diff --git a/Assets/Scenes/Level1/Lightmap-9_comp_dir.png b/Assets/Scenes/Level1/Lightmap-9_comp_dir.png
diff --git a/Assets/Scenes/Level1/Lightmap-9_comp_light.exr b/Assets/Scenes/Level1/Lightmap-9_comp_light.exr
diff --git a/Assets/Scenes/Level1/ReflectionProbe-0.exr b/Assets/Scenes/Level1/ReflectionProbe-0.exr
diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity
@@ -14,10 +14,10 @@ OcclusionCullingSettings:
 RenderSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 9
-  m_Fog: 1
-  m_FogColor: {r: 0.37459162, g: 0, b: 0.5566038, a: 1}
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
-  m_FogDensity: 0.03
+  m_FogDensity: 0.01
   m_LinearFogStart: 0
   m_LinearFogEnd: 300
   m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.0014785795, g: 0.0013591028, b: 0.0012890887, a: 1}
+  m_IndirectSpecularColor: {r: 0.016090982, g: 0.01466979, b: 0.013826404, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -66,7 +66,7 @@ LightmapSettings:
     m_Padding: 2
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
+    m_TextureCompression: 0
     m_FinalGather: 0
     m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 256

diff --git a/Assets/Scenes/Level2/LightingData.asset b/Assets/Scenes/Level2/LightingData.asset
diff --git a/Assets/Scenes/Level2/Lightmap-0_comp_dir.png b/Assets/Scenes/Level2/Lightmap-0_comp_dir.png
diff --git a/Assets/Scenes/Level2/Lightmap-0_comp_light.exr b/Assets/Scenes/Level2/Lightmap-0_comp_light.exr
diff --git a/Assets/Scenes/Level2/Lightmap-1_comp_dir.png b/Assets/Scenes/Level2/Lightmap-1_comp_dir.png
diff --git a/Assets/Scenes/Level2/Lightmap-1_comp_light.exr b/Assets/Scenes/Level2/Lightmap-1_comp_light.exr
diff --git a/Assets/Scenes/Level2/Lightmap-2_comp_dir.png b/Assets/Scenes/Level2/Lightmap-2_comp_dir.png
diff --git a/Assets/Scenes/Level2/Lightmap-2_comp_light.exr b/Assets/Scenes/Level2/Lightmap-2_comp_light.exr
diff --git a/Assets/Scenes/Level2/ReflectionProbe-0.exr b/Assets/Scenes/Level2/ReflectionProbe-0.exr
diff --git a/Assets/Scenes/Level3.unity b/Assets/Scenes/Level3.unity
@@ -20,7 +20,7 @@ RenderSettings:
   m_FogDensity: 0.03
   m_LinearFogStart: 0
   m_LinearFogEnd: 300
-  m_AmbientSkyColor: {r: 0.48235294, g: 0.48235294, b: 0.48235294, a: 1}
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, 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_AmbientIntensity: 1
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.0014785795, g: 0.0013591028, b: 0.0012890887, a: 1}
+  m_IndirectSpecularColor: {r: 0.016090982, g: 0.01466979, b: 0.013826404, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -50,9 +50,9 @@ LightmapSettings:
     m_BounceScale: 1
     m_IndirectOutputScale: 1
     m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 1
+    m_EnvironmentLightingMode: 0
     m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
+    m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
     serializedVersion: 12
     m_Resolution: 2
@@ -2884,11 +2884,6 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 1540230789}
-    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 4294967295
-      objectReference: {fileID: 0}
     - target: {fileID: 3993933184954773781, guid: e7e7a8212119a40468f44cd2e55246fa,
         type: 3}
       propertyPath: m_Mesh
@@ -2909,6 +2904,11 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 1387727403}
+    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e7e7a8212119a40468f44cd2e55246fa, type: 3}
 --- !u!4 &610841847 stripped
@@ -5369,11 +5369,6 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 1968141859}
-    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 4294967295
-      objectReference: {fileID: 0}
     - target: {fileID: 3993933184954773781, guid: e7e7a8212119a40468f44cd2e55246fa,
         type: 3}
       propertyPath: m_Mesh
@@ -5394,6 +5389,11 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 285894618}
+    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e7e7a8212119a40468f44cd2e55246fa, type: 3}
 --- !u!4 &937151137 stripped
@@ -6976,11 +6976,6 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 970707971}
-    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 4294967295
-      objectReference: {fileID: 0}
     - target: {fileID: 3993933184954773781, guid: e7e7a8212119a40468f44cd2e55246fa,
         type: 3}
       propertyPath: m_Mesh
@@ -7001,6 +6996,11 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 352600292}
+    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e7e7a8212119a40468f44cd2e55246fa, type: 3}
 --- !u!4 &1108216001 stripped
@@ -12144,11 +12144,6 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 1928419130}
-    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
-        type: 3}
-      propertyPath: m_StaticEditorFlags
-      value: 4294967295
-      objectReference: {fileID: 0}
     - target: {fileID: 3993933184954773781, guid: e7e7a8212119a40468f44cd2e55246fa,
         type: 3}
       propertyPath: m_Mesh
@@ -12169,6 +12164,11 @@ PrefabInstance:
       propertyPath: m_Mesh
       value: 
       objectReference: {fileID: 1154894054}
+    - target: {fileID: 8446132090308112614, guid: e7e7a8212119a40468f44cd2e55246fa,
+        type: 3}
+      propertyPath: m_StaticEditorFlags
+      value: 4294967295
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e7e7a8212119a40468f44cd2e55246fa, type: 3}
 --- !u!1001 &8650797320336849780

diff --git a/Assets/Scenes/Level3/LightingData.asset b/Assets/Scenes/Level3/LightingData.asset
diff --git a/Assets/Scenes/Level3/Lightmap-0_comp_dir.png b/Assets/Scenes/Level3/Lightmap-0_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-0_comp_light.exr b/Assets/Scenes/Level3/Lightmap-0_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-1_comp_dir.png b/Assets/Scenes/Level3/Lightmap-1_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-1_comp_light.exr b/Assets/Scenes/Level3/Lightmap-1_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-2_comp_dir.png b/Assets/Scenes/Level3/Lightmap-2_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-2_comp_light.exr b/Assets/Scenes/Level3/Lightmap-2_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-3_comp_dir.png b/Assets/Scenes/Level3/Lightmap-3_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-3_comp_light.exr b/Assets/Scenes/Level3/Lightmap-3_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-4_comp_dir.png b/Assets/Scenes/Level3/Lightmap-4_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-4_comp_light.exr b/Assets/Scenes/Level3/Lightmap-4_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-5_comp_dir.png b/Assets/Scenes/Level3/Lightmap-5_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-5_comp_light.exr b/Assets/Scenes/Level3/Lightmap-5_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-6_comp_dir.png b/Assets/Scenes/Level3/Lightmap-6_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-6_comp_light.exr b/Assets/Scenes/Level3/Lightmap-6_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-7_comp_dir.png b/Assets/Scenes/Level3/Lightmap-7_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-7_comp_light.exr b/Assets/Scenes/Level3/Lightmap-7_comp_light.exr
diff --git a/Assets/Scenes/Level3/Lightmap-8_comp_dir.png b/Assets/Scenes/Level3/Lightmap-8_comp_dir.png
diff --git a/Assets/Scenes/Level3/Lightmap-8_comp_light.exr b/Assets/Scenes/Level3/Lightmap-8_comp_light.exr
diff --git a/Assets/Scenes/Level3/ReflectionProbe-0.exr b/Assets/Scenes/Level3/ReflectionProbe-0.exr
diff --git a/Assets/Scenes/Level4.unity b/Assets/Scenes/Level4.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.0014785795, g: 0.0013591028, b: 0.0012890887, a: 1}
+  m_IndirectSpecularColor: {r: 0.016090982, g: 0.01466979, b: 0.013826404, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -66,7 +66,7 @@ LightmapSettings:
     m_Padding: 2
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
+    m_TextureCompression: 0
     m_FinalGather: 0
     m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 256
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,3 +61,4 @@ crashlytics-build.properties

		Assets/Materials/Blue Light.mat.meta
		Assets/Real Stars Skybox/StarSkybox04/CubemapStars.cubemap
		*.zip