Merge branch 'master' of http://git.thirdlevel.gmbh:80/GameDevOS/LD39

game/Assets/3DArt/Anim/Enemy_Walking.anim

@@ -18,32 +18,32 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: {x: -90.00001, y: 0, z: 42.703003}
+        value: {x: -100.00001, y: 0, z: 42.703003}
         inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: -40, y: -0, z: -0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.25
-        value: {x: -90.00001, y: 0, z: 42.703003}
+        value: {x: -110.00001, y: 0, z: 42.703003}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.5
-        value: {x: -90.00001, y: 0, z: 42.703003}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100.00001, y: 0, z: 42.703003}
+        inSlope: {x: 40.000015, y: 0, z: 0}
+        outSlope: {x: 40.000015, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.75
-        value: {x: -90.00001, y: 0, z: 42.703003}
+        value: {x: -90, y: 0, z: 42.703003}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 1
-        value: {x: -90.00001, y: 0, z: 42.703003}
-        inSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100.00001, y: 0, z: 42.703003}
+        inSlope: {x: -40.00003, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       m_PreInfinity: 2
@@ -57,30 +57,30 @@ AnimationClip:
         time: 0
         value: {x: -90.00001, y: 0, z: -45.000004}
         inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: -40, y: -0, z: -0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.25
-        value: {x: -90.00001, y: 0, z: -45.000004}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100.00001, y: 0, z: -45.000004}
+        inSlope: {x: -40, y: 0, z: 0}
+        outSlope: {x: -40, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.5
-        value: {x: -90.00001, y: 0, z: -45.000004}
+        value: {x: -110.00001, y: 0, z: -45.000004}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.75
-        value: {x: -90.00001, y: 0, z: -45.000004}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100.00001, y: 0, z: -45.000004}
+        inSlope: {x: 40.000015, y: 0, z: 0}
+        outSlope: {x: 40.000015, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 1
-        value: {x: -90.00001, y: 0, z: -45.000004}
-        inSlope: {x: 0, y: 0, z: 0}
+        value: {x: -90, y: 0, z: -45.000004}
+        inSlope: {x: 40.00003, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       m_PreInfinity: 2
@@ -92,15 +92,15 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: {x: -90.00001, y: 0, z: 132.703}
+        value: {x: -110.00001, y: 0, z: 132.703}
         inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 40, y: -0, z: -0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.25
-        value: {x: -90.00001, y: 0, z: 132.703}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100.00001, y: 0, z: 132.703}
+        inSlope: {x: 40, y: 0, z: 0}
+        outSlope: {x: 40, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.5
@@ -110,14 +110,14 @@ AnimationClip:
         tangentMode: 0
       - serializedVersion: 2
         time: 0.75
-        value: {x: -90.00001, y: 0, z: 132.703}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100, y: 0, z: 132.703}
+        inSlope: {x: -39.999985, y: 0, z: 0}
+        outSlope: {x: -39.999985, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 1
-        value: {x: -90.00001, y: 0, z: 132.703}
-        inSlope: {x: 0, y: 0, z: 0}
+        value: {x: -110, y: 0, z: 132.703}
+        inSlope: {x: -40, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       m_PreInfinity: 2
@@ -129,9 +129,9 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: {x: -90.00001, y: 0, z: -135}
+        value: {x: -100.00001, y: 0, z: -135}
         inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 40, y: -0, z: -0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.25
@@ -141,20 +141,20 @@ AnimationClip:
         tangentMode: 0
       - serializedVersion: 2
         time: 0.5
-        value: {x: -90.00001, y: 0, z: -135}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100, y: 0, z: -135}
+        inSlope: {x: -39.999985, y: 0, z: 0}
+        outSlope: {x: -39.999985, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 0.75
-        value: {x: -90.00001, y: 0, z: -135}
+        value: {x: -110, y: 0, z: -135}
         inSlope: {x: 0, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       - serializedVersion: 2
         time: 1
-        value: {x: -90.00001, y: 0, z: -135}
-        inSlope: {x: 0, y: 0, z: 0}
+        value: {x: -100.00001, y: 0, z: -135}
+        inSlope: {x: 39.99997, y: 0, z: 0}
         outSlope: {x: 0, y: 0, z: 0}
         tangentMode: 0
       m_PreInfinity: 2
@@ -227,32 +227,32 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: -90.00001
+        value: -100.00001
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -40
+        tangentMode: 69
       - serializedVersion: 2
         time: 0.25
-        value: -90.00001
+        value: -110.00001
         inSlope: 0
         outSlope: 0
         tangentMode: 136
       - serializedVersion: 2
         time: 0.5
-        value: -90.00001
-        inSlope: 0
-        outSlope: 0
+        value: -100.00001
+        inSlope: 40.000015
+        outSlope: 40.000015
         tangentMode: 136
       - serializedVersion: 2
         time: 0.75
-        value: -90.00001
+        value: -90
         inSlope: 0
         outSlope: 0
         tangentMode: 136
       - serializedVersion: 2
         time: 1
-        value: -90.00001
-        inSlope: 0
+        value: -100.00001
+        inSlope: -40.00003
         outSlope: 0
         tangentMode: 69
       m_PreInfinity: 2
@@ -269,8 +269,8 @@ AnimationClip:
         time: 0
         value: 0
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: 0
@@ -291,8 +291,8 @@ AnimationClip:
         time: 0
         value: 42.703003
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: 42.703003
@@ -313,30 +313,30 @@ AnimationClip:
         time: 0
         value: -90.00001
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -40
+        tangentMode: 69
       - serializedVersion: 2
         time: 0.25
-        value: -90.00001
-        inSlope: 0
-        outSlope: 0
+        value: -100.00001
+        inSlope: -40
+        outSlope: -40
         tangentMode: 136
       - serializedVersion: 2
         time: 0.5
-        value: -90.00001
+        value: -110.00001
         inSlope: 0
         outSlope: 0
         tangentMode: 136
       - serializedVersion: 2
         time: 0.75
-        value: -90.00001
-        inSlope: 0
-        outSlope: 0
+        value: -100.00001
+        inSlope: 40.000015
+        outSlope: 40.000015
         tangentMode: 136
       - serializedVersion: 2
         time: 1
-        value: -90.00001
-        inSlope: 0
+        value: -90
+        inSlope: 40.00003
         outSlope: 0
         tangentMode: 69
       m_PreInfinity: 2
@@ -353,8 +353,8 @@ AnimationClip:
         time: 0
         value: 0
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: 0
@@ -375,8 +375,8 @@ AnimationClip:
         time: 0
         value: -45.000004
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: -45.000004
@@ -395,15 +395,15 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: -90.00001
+        value: -110.00001
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: 40
+        tangentMode: 69
       - serializedVersion: 2
         time: 0.25
-        value: -90.00001
-        inSlope: 0
-        outSlope: 0
+        value: -100.00001
+        inSlope: 40
+        outSlope: 40
         tangentMode: 136
       - serializedVersion: 2
         time: 0.5
@@ -413,14 +413,14 @@ AnimationClip:
         tangentMode: 136
       - serializedVersion: 2
         time: 0.75
-        value: -90.00001
-        inSlope: 0
-        outSlope: 0
+        value: -100
+        inSlope: -39.999985
+        outSlope: -39.999985
         tangentMode: 136
       - serializedVersion: 2
         time: 1
-        value: -90.00001
-        inSlope: 0
+        value: -110
+        inSlope: -40
         outSlope: 0
         tangentMode: 69
       m_PreInfinity: 2
@@ -437,8 +437,8 @@ AnimationClip:
         time: 0
         value: 0
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: 0
@@ -459,8 +459,8 @@ AnimationClip:
         time: 0
         value: 132.703
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: 132.703
@@ -479,10 +479,10 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 2
         time: 0
-        value: -90.00001
+        value: -100.00001
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: 40
+        tangentMode: 69
       - serializedVersion: 2
         time: 0.25
         value: -90.00001
@@ -491,20 +491,20 @@ AnimationClip:
         tangentMode: 136
       - serializedVersion: 2
         time: 0.5
-        value: -90.00001
-        inSlope: 0
-        outSlope: 0
+        value: -100
+        inSlope: -39.999985
+        outSlope: -39.999985
         tangentMode: 136
       - serializedVersion: 2
         time: 0.75
-        value: -90.00001
+        value: -110
         inSlope: 0
         outSlope: 0
         tangentMode: 136
       - serializedVersion: 2
         time: 1
-        value: -90.00001
-        inSlope: 0
+        value: -100.00001
+        inSlope: 39.99997
         outSlope: 0
         tangentMode: 69
       m_PreInfinity: 2
@@ -521,8 +521,8 @@ AnimationClip:
         time: 0
         value: 0
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: 0
@@ -543,8 +543,8 @@ AnimationClip:
         time: 0
         value: -135
         inSlope: 0
-        outSlope: 0
-        tangentMode: 136
+        outSlope: -0
+        tangentMode: 69
       - serializedVersion: 2
         time: 1
         value: -135
@@ -566,7 +566,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: RightBackLeg
+    path: LeftFrontLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -576,7 +576,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: RightBackLeg
+    path: LeftFrontLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -586,7 +586,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: RightBackLeg
+    path: LeftFrontLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -596,7 +596,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: LeftBackLeg
+    path: RightBackLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -606,7 +606,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: LeftBackLeg
+    path: RightBackLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -616,7 +616,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: LeftBackLeg
+    path: RightBackLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -626,7 +626,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: LeftFrontLeg
+    path: LeftBackLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -636,7 +636,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: LeftFrontLeg
+    path: LeftBackLeg
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -646,7 +646,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: LeftFrontLeg
+    path: LeftBackLeg
     classID: 4
     script: {fileID: 0}
   - curve:

game/Assets/3DArt/Materials/Metal.mat

@@ -11,7 +11,6 @@ Material:
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
@@ -73,6 +72,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.8195453, g: 0.2958477, b: 0.83823526, a: 1}
+    - _Color: {r: 0.7992368, g: 0.73664576, b: 0.8014706, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

game/Assets/3DArt/Materials/No Name.mat.meta

@@ -1,15 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< HEAD
-guid: 4a72f5796b6518e44a9aaa125339278f
-timeCreated: 1501410776
-licenseType: Pro
-=======
-guid: 3c3fe720abe584b43ae82f6035a67b7a
-timeCreated: 1501423414
-licenseType: Free
->>>>>>> 572d0e91501ee9825d0e464dfeb24718532b49c2
-NativeFormatImporter:
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

game/Assets/3DArt/Materials/PowerDrop.mat

@@ -7,14 +7,13 @@ Material:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: PowerDrop
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
   m_LightmapFlags: 0
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
-  stringTagMap:
-    RenderType: Transparent
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
@@ -40,7 +39,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 59665bfd8382fb444853196b4be76b2b, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
@@ -63,6 +62,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _InvFade: 1
     - _Metallic: 0
     - _Mode: 3
     - _OcclusionStrength: 1
@@ -75,3 +75,4 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 0.9724138, b: 0, a: 0.578}
     - _EmissionColor: {r: 0.94482756, g: 1, b: 0, a: 1}
+    - _TintColor: {r: 0.32352942, g: 0.55213004, b: 1, a: 0.5}

game/Assets/3DArt/Materials/No Name.mat

@@ -6,12 +6,11 @@ Material:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: No Name
+  m_Name: SolarCells
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
@@ -62,7 +61,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 1
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
@@ -72,5 +71,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.78676474, g: 0.42230755, b: 0.7465488, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

game/Assets/3DArt/Materials/SolarCells.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d9b9b5c29bf7052498471d53c360e9ef
+timeCreated: 1501535772
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/3DArt/Materials/SuperGlow.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: SuperGlow
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _EMISSION
+  m_LightmapFlags: 0
+  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: 0.16911763, g: 0.16911763, b: 0.16911763, a: 1}
+    - _EmissionColor: {r: 1.9062881, g: 2, b: 1.0294118, a: 1}

game/Assets/3DArt/Materials/SuperGlow.mat.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a3dc6f93b4a26054eaab223fab4c9af2
+timeCreated: 1501535830
+licenseType: Free
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/Materials/No Name.mat

@@ -6,12 +6,11 @@ Material:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
-  m_Name: No Name
+  m_Name: Metal
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
@@ -62,7 +61,7 @@ Material:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 1
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02

game/Assets/Materials/No Name.mat.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: d95cce7178eef5f4b93405e168213b99
-timeCreated: 1501436825
+guid: e7d72168295afce49a9874124668318d
+timeCreated: 1501535622
 licenseType: Free
 NativeFormatImporter:
   mainObjectFileID: 2100000

game/Assets/Materials/Robo_4.mat

@@ -60,9 +60,9 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _GlossMapScale: 1
-    - _Glossiness: 0.5
+    - _Glossiness: 0.407
     - _GlossyReflections: 1
-    - _Metallic: 0
+    - _Metallic: 0.75
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
@@ -72,5 +72,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.8774341, g: 0.8897059, b: 0, a: 1}
+    - _Color: {r: 0.60354745, g: 0.6102941, b: 0.121161334, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

game/Assets/PostProcessingProfile.asset

@@ -101,8 +101,8 @@ MonoBehaviour:
     m_Settings:
       bloom:
         intensity: 1
-        threshold: 1.54
-        softKnee: 0.058
+        threshold: 1
+        softKnee: 0
         radius: 1
         antiFlicker: 1
       lensDirt:
@@ -289,9 +289,9 @@ MonoBehaviour:
     m_Enabled: 1
     m_Settings:
       colored: 0
-      intensity: 0.279
-      size: 0.65
-      luminanceContribution: 0.463
+      intensity: 1
+      size: 0.723
+      luminanceContribution: 1
   vignette:
     m_Enabled: 0
     m_Settings:

game/Assets/Prefabs/Enemy.prefab

@@ -923,7 +923,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -955,7 +955,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: 9ab11714b79356448813f757518372d2, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1083,7 +1083,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1115,7 +1115,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1147,7 +1147,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1179,7 +1179,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1211,7 +1211,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1275,7 +1275,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: d9b9b5c29bf7052498471d53c360e9ef, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1371,7 +1371,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1435,7 +1435,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: d9b9b5c29bf7052498471d53c360e9ef, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1467,7 +1467,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1499,7 +1499,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1531,7 +1531,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1563,7 +1563,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1659,7 +1659,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 0}
+  - {fileID: 2100000, guid: bd22b198bd1dd3244b60f3ec783c2bb4, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1885,23 +1885,6 @@ MeshFilter:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1266103636548028}
   m_Mesh: {fileID: 4300048, guid: e3361cd0f09938f408c722a0bc8509e7, type: 3}
---- !u!95 &95793623767830418
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1242844294937050}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: 0bf03c274482a764481c813fa83e3b35, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
 --- !u!82 &82026114199403268
 AudioSource:
   m_ObjectHideFlags: 1
@@ -1982,6 +1965,23 @@ AudioSource:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 0
+--- !u!95 &95793623767830418
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1242844294937050}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 0bf03c274482a764481c813fa83e3b35, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
 --- !u!114 &114575230278841902
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2077,9 +2077,7 @@ ParticleSystem:
   looping: 1
   prewarm: 0
   playOnAwake: 0
-  useUnscaledTime: 0
   autoRandomSeed: 1
-  useRigidbodyForVelocity: 1
   startDelay:
     serializedVersion: 2
     minMaxState: 0
@@ -2566,7 +2564,6 @@ ParticleSystem:
         m_RotationOrder: 4
   ShapeModule:
     serializedVersion: 4
-    serializedVersion: 5
     enabled: 1
     type: 0
     angle: 10.2
@@ -2574,24 +2571,6 @@ ParticleSystem:
     boxX: 1
     boxY: 1
     boxZ: 1
-    boxThickness: {x: 0, y: 0, z: 0}
-    radiusThickness: 1
-    donutRadius: 0.2
-    m_Position: {x: 0, y: 0.49, z: 0.25}
-    m_Rotation: {x: 0, y: 0, z: 0}
-    m_Scale: {x: 1, y: 1, z: 1}
-    placementMode: 0
-    m_Mesh: {fileID: 4300016, guid: e3361cd0f09938f408c722a0bc8509e7, type: 3}
-    m_MeshRenderer: {fileID: 0}
-    m_SkinnedMeshRenderer: {fileID: 0}
-    m_MeshMaterialIndex: 0
-    m_MeshNormalOffset: 0
-    m_UseMeshMaterialIndex: 0
-    m_UseMeshColors: 0
-    alignToDirection: 0
-    randomDirectionAmount: 0
-    sphericalDirectionAmount: 0
-    randomPositionAmount: 0
     radius:
       value: 1.5
       mode: 0
@@ -3100,7 +3079,6 @@ ParticleSystem:
         m_NumAlphaKeys: 2
   UVModule:
     enabled: 0
-    mode: 0
     frameOverTime:
       serializedVersion: 2
       minMaxState: 1
@@ -3192,8 +3170,6 @@ ParticleSystem:
     flipU: 0
     flipV: 0
     randomRow: 1
-    sprites:
-    - sprite: {fileID: 0}
   VelocityModule:
     enabled: 0
     x:
@@ -3960,129 +3936,6 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     remapEnabled: 0
-    positionAmount:
-      serializedVersion: 2
-      minMaxState: 0
-      scalar: 1
-      minScalar: 1
-      maxCurve:
-        serializedVersion: 2
-        m_Curve:
-        - serializedVersion: 2
-          time: 0
-          value: 1
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        - serializedVersion: 2
-          time: 1
-          value: 1
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        m_PreInfinity: 2
-        m_PostInfinity: 2
-        m_RotationOrder: 4
-      minCurve:
-        serializedVersion: 2
-        m_Curve:
-        - serializedVersion: 2
-          time: 0
-          value: 1
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        - serializedVersion: 2
-          time: 1
-          value: 1
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        m_PreInfinity: 2
-        m_PostInfinity: 2
-        m_RotationOrder: 4
-    rotationAmount:
-      serializedVersion: 2
-      minMaxState: 0
-      scalar: 0
-      minScalar: 0
-      maxCurve:
-        serializedVersion: 2
-        m_Curve:
-        - serializedVersion: 2
-          time: 0
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        - serializedVersion: 2
-          time: 1
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        m_PreInfinity: 2
-        m_PostInfinity: 2
-        m_RotationOrder: 4
-      minCurve:
-        serializedVersion: 2
-        m_Curve:
-        - serializedVersion: 2
-          time: 0
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        - serializedVersion: 2
-          time: 1
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        m_PreInfinity: 2
-        m_PostInfinity: 2
-        m_RotationOrder: 4
-    sizeAmount:
-      serializedVersion: 2
-      minMaxState: 0
-      scalar: 0
-      minScalar: 0
-      maxCurve:
-        serializedVersion: 2
-        m_Curve:
-        - serializedVersion: 2
-          time: 0
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        - serializedVersion: 2
-          time: 1
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        m_PreInfinity: 2
-        m_PostInfinity: 2
-        m_RotationOrder: 4
-      minCurve:
-        serializedVersion: 2
-        m_Curve:
-        - serializedVersion: 2
-          time: 0
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        - serializedVersion: 2
-          time: 1
-          value: 0
-          inSlope: 0
-          outSlope: 0
-          tangentMode: 0
-        m_PreInfinity: 2
-        m_PostInfinity: 2
-        m_RotationOrder: 4
   SizeBySpeedModule:
     enabled: 0
     curve:
@@ -4408,10 +4261,6 @@ ParticleSystem:
     serializedVersion: 3
     type: 0
     collisionMode: 0
-    colliderForce: 0
-    multiplyColliderForceByParticleSize: 0
-    multiplyColliderForceByParticleSpeed: 0
-    multiplyColliderForceByCollisionAngle: 1
     plane0: {fileID: 0}
     plane1: {fileID: 0}
     plane2: {fileID: 0}
@@ -4715,7 +4564,6 @@ ParticleSystem:
     sizeAffectsWidth: 1
     sizeAffectsLifetime: 0
     inheritParticleColor: 1
-    generateLightingData: 0
     colorOverLifetime:
       serializedVersion: 2
       minMaxState: 0
@@ -5345,7 +5193,7 @@ ParticleSystem:
         m_RotationOrder: 4
 --- !u!199 &199064972638368032
 ParticleSystemRenderer:
-  serializedVersion: 4
+  serializedVersion: 3
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
@@ -5394,4 +5242,3 @@ ParticleSystemRenderer:
   m_Mesh1: {fileID: 0}
   m_Mesh2: {fileID: 0}
   m_Mesh3: {fileID: 0}
-  m_MaskInteraction: 0

game/Assets/Prefabs/Player.prefab

@@ -351,6 +351,22 @@ GameObject:
   - component: {fileID: 4339398362766808}
   - component: {fileID: 108365963384445830}
   m_Layer: 0
+  m_Name: muzzle light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!1 &1649725940005726
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4205683769526104}
+  - component: {fileID: 108091481422721826}
+  m_Layer: 0
   m_Name: Point light
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -543,6 +559,19 @@ Transform:
   m_Father: {fileID: 4413073277323274}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 0}
+--- !u!4 &4205683769526104
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1649725940005726}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0, z: -0.0116}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 4669542331330086}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &4214464135782952
 Transform:
   m_ObjectHideFlags: 1
@@ -753,7 +782,8 @@ Transform:
   m_LocalRotation: {x: -1.7112914e-15, y: 1, z: -0.000000021855694, w: -0.0000000754979}
   m_LocalPosition: {x: -0.000000043487056, y: 2.4872394, z: 0.26548624}
   m_LocalScale: {x: 43.44231, y: 43.44231, z: 43.44231}
-  m_Children: []
+  m_Children:
+  - {fileID: 4205683769526104}
   m_Father: {fileID: 4239492082957598}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1831,6 +1861,56 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!108 &108091481422721826
+Light:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1649725940005726}
+  m_Enabled: 1
+  serializedVersion: 8
+  m_Type: 2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 0.5
+  m_Range: 25
+  m_SpotAngle: 30
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_Lightmapping: 4
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_FalloffTable:
+    m_Table[0]: 0
+    m_Table[1]: 0
+    m_Table[2]: 0
+    m_Table[3]: 0
+    m_Table[4]: 0
+    m_Table[5]: 0
+    m_Table[6]: 0
+    m_Table[7]: 0
+    m_Table[8]: 0
+    m_Table[9]: 0
+    m_Table[10]: 0
+    m_Table[11]: 0
+    m_Table[12]: 0
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
 --- !u!108 &108365963384445830
 Light:
   m_ObjectHideFlags: 1
@@ -1900,12 +1980,13 @@ MonoBehaviour:
   lookSmoothingSeconds: 0.05
   cameraSmoothingSeconds: 0.8
   bulletUpBias: 0.1
-  bulletForce: 5
+  bulletForce: 2
   powerLevelMax: 20
   gunTransform: {fileID: 4475041197474250}
   bulletPrefab: {fileID: 54376493206981186, guid: b7a50776d2afe4da29c642bd08d6e556,
     type: 2}
   muzzleLight: {fileID: 108365963384445830}
+  headLight: {fileID: 108091481422721826}
   gauge: {fileID: 4874332323323470}
   fidgetSpin: 60
   maxChargingTime: 2

game/Assets/Prefabs/Spinner.prefab

@@ -114,7 +114,7 @@ MeshRenderer:
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 2100000, guid: 9ab11714b79356448813f757518372d2, type: 2}
+  - {fileID: 2100000, guid: a3dc6f93b4a26054eaab223fab4c9af2, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0

game/Assets/Scenes/Main.unity

@@ -4090,6 +4090,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ff26db721962cdf4a8edcdfa9a767d2a, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  profile: {fileID: 11400000, guid: 33391131f7192d242ab5e5f2b501c232, type: 2}
 --- !u!82 &1278158978
 AudioSource:
   m_ObjectHideFlags: 0

game/Assets/Scripts/Enemy/Enemy.cs

@@ -139,7 +139,9 @@ public class Enemy : MonoBehaviour
         dead = true;
         weapon.gameObject.SetActive(false);
 
-        GetComponent<UnityEngine.AI.NavMeshAgent>().isStopped = true;
+        UnityEngine.AI.NavMeshAgent navMeshAgent = GetComponent<UnityEngine.AI.NavMeshAgent>();
+        if (navMeshAgent.isOnNavMesh)
+            navMeshAgent.isStopped = true;
 
         GameObject go = GameObject.Instantiate(powerDrop);
         go.GetComponent<PowerDrop>().powerAmount = power;

game/Assets/Scripts/Player.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -15,7 +16,7 @@ public class Player : MonoBehaviour
     private float powerLevel;
 
     private Color _powerLevelLow = Color.red;
-    private Color _powerLevelMid = new Color(255, 165, 0);
+    private Color _powerLevelMid = Color.yellow * .5f;
     private Color _powerLevelHigh = Color.green;
 
     private GameObject[] _powerUp = new GameObject[3];
@@ -176,7 +177,9 @@ public class Player : MonoBehaviour
     public Transform gunTransform;
     public Rigidbody bulletPrefab;
     public Light muzzleLight;
+    public Light headLight;
     public Transform gauge;
+    private DayTimeManager dayTimeManager;
 
     private Vector3 inputDirection;
     private float speed;
@@ -195,8 +198,11 @@ public class Player : MonoBehaviour
         speed = startSpeed;
         cameraOffset = Camera.main.transform.position - transform.position;
         lightIntensity = muzzleLight.intensity;
+        muzzleLight.intensity = 0;
         var joystickNames = Input.GetJoystickNames();
         useMouseLook = joystickNames.Length == 0 || string.IsNullOrEmpty(joystickNames[0]);
+
+        dayTimeManager = GameObject.FindObjectOfType<DayTimeManager>();
         //if (useMouseLook)
         //{
         //    lookSmoothingSeconds = 0;
@@ -240,12 +246,26 @@ public class Player : MonoBehaviour
         if (shooting)
         {
             Shoot();
-            muzzleLight.intensity = Random.Range(.5f, 2f) * lightIntensity;
+            StartCoroutine(FlashMuzzle());
         }
-        else
+
+        headLight.intensity =
+            (dayTimeManager.dayTimeLabel == DayTimeLabel.Night || dayTimeManager.dayTimeLabel == DayTimeLabel.Evening)
+            ? .5f
+            : 0;
+    }
+
+    private IEnumerator FlashMuzzle()
+    {
+        float start = .1f;
+        float initial = UnityEngine.Random.Range(.5f, 2f) * lightIntensity;
+
+        for (float left = start; left > 0; left -= Time.deltaTime)
         {
-            muzzleLight.intensity = 0;
+            muzzleLight.intensity = Mathf.Lerp(initial, 0, left / start);
+            yield return null;
         }
+        muzzleLight.intensity = 0;
     }
 
     public float fidgetSpin = 30.0f;