Fixed credits

PinkRodeo · Feb 4, 2020 · f1f8cf5 · f1f8cf5
1 parent efc63b4
commit f1f8cf5
Show file tree

Hide file tree

Showing 11 changed files with 282 additions and 189 deletions.
diff --git a/GGJ2020_Unity/Assets/FracturedSunrise/Environment/Endtitle-credits.png b/GGJ2020_Unity/Assets/FracturedSunrise/Environment/Endtitle-credits.png
diff --git a/GGJ2020_Unity/Assets/FracturedSunrise/Environment/Endtitle-credits.png.meta b/GGJ2020_Unity/Assets/FracturedSunrise/Environment/Endtitle-credits.png.meta
diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/EndScreen/EndScreen.unity b/GGJ2020_Unity/Assets/GGJ2020/Levels/EndScreen/EndScreen.unity
@@ -98,7 +98,7 @@ LightmapSettings:
     m_TrainingDataDestination: TrainingData
     m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
-  m_UseShadowmask: 0
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -783,9 +783,9 @@ MonoBehaviour:
     m_SelectOnRight: {fileID: 0}
   m_Transition: 1
   m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_NormalColor: {r: 0.6886792, g: 0.6886792, b: 0.6886792, a: 1}
+    m_HighlightedColor: {r: 0.7216981, g: 0.96678036, b: 1, a: 1}
+    m_PressedColor: {r: 0.16981132, g: 0.2044216, b: 0.2264151, a: 1}
     m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
     m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
     m_ColorMultiplier: 1

diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Environment.unity b/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Environment.unity
@@ -8,8 +8,9 @@ OcclusionCullingSettings:
     smallestOccluder: 5
     smallestHole: 0.25
     backfaceThreshold: 100
-  m_SceneGUID: 00000000000000000000000000000000
-  m_OcclusionCullingData: {fileID: 0}
+  m_SceneGUID: 7f21184685d048c4196e4655e686abb1
+  m_OcclusionCullingData: {fileID: 36300000, guid: 83eb1abee821a3244869ff39aec71907,
+    type: 2}
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0

diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Environment/OcclusionCullingData.asset b/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Environment/OcclusionCullingData.asset
diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Environment/OcclusionCullingData.asset.meta b/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Environment/OcclusionCullingData.asset.meta
diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/Bathroom.fbx.meta b/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/Bathroom.fbx.meta
diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/T_Background.png.meta b/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/T_Background.png.meta
diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/tBackground_Sprite.png b/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/tBackground_Sprite.png
diff --git a/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/tBackground_Sprite.png.meta b/GGJ2020_Unity/Assets/GGJ2020/Levels/Environment/Scene/tBackground_Sprite.png.meta