goals n shit

KenanMillet · Dec 6, 2017 · edb8018 · edb8018
1 parent 9036f5d
commit edb8018
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 1 deletion.
diff --git a/FinalProject/Assets/Materials/Goal.mat b/FinalProject/Assets/Materials/Goal.mat
@@ -0,0 +1,76 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Goal
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.85, g: 0.85, b: 0.85, a: 1}
diff --git a/FinalProject/Assets/Materials/Goal.mat.meta b/FinalProject/Assets/Materials/Goal.mat.meta
diff --git a/FinalProject/Assets/Scenes/Main.unity b/FinalProject/Assets/Scenes/Main.unity
@@ -10076,6 +10076,31 @@ Prefab:
       propertyPath: portalColors.key2.b
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 23122392849237598, guid: c86b7c1a4b8b5134488389c56d50b498,
+        type: 2}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 42e1bb6cf61eeab4a9df7c7a554df006, type: 2}
+    - target: {fileID: 23883576935220698, guid: c86b7c1a4b8b5134488389c56d50b498,
+        type: 2}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 42e1bb6cf61eeab4a9df7c7a554df006, type: 2}
+    - target: {fileID: 23313441498140320, guid: c86b7c1a4b8b5134488389c56d50b498,
+        type: 2}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 42e1bb6cf61eeab4a9df7c7a554df006, type: 2}
+    - target: {fileID: 23610116930521938, guid: c86b7c1a4b8b5134488389c56d50b498,
+        type: 2}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 42e1bb6cf61eeab4a9df7c7a554df006, type: 2}
+    - target: {fileID: 23645415575680244, guid: c86b7c1a4b8b5134488389c56d50b498,
+        type: 2}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 42e1bb6cf61eeab4a9df7c7a554df006, type: 2}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: c86b7c1a4b8b5134488389c56d50b498, type: 2}
   m_IsPrefabParent: 0

diff --git a/FinalProject/Assets/Scripts/GoalScript.cs b/FinalProject/Assets/Scripts/GoalScript.cs
@@ -23,7 +23,8 @@ void Update ()
 	{
 		foreach(Renderer renderer in renderers) {
 			renderer.material.color = healthColors.Evaluate(1.0f - GameManager.lives / (float)GameManager.maxLives);
-		}
+            renderer.material.SetColor("_EmissionColor", healthColors.Evaluate(1.0f - GameManager.lives / (float)GameManager.maxLives));
+        }
         main.startColor = portalColors.Evaluate(1.0f - GameManager.lives / (float)GameManager.maxLives);
     }
 }