Sfoglia il codice sorgente

make power drops more visible; improve player lights

Niels 9 anni fa
parent
commit
5842fb3ea0

+ 86 - 4
game/Assets/Prefabs/Player.prefab

@@ -456,6 +456,22 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1944742470847236
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 4044533976694842}
+  - component: {fileID: 108270410685225482}
+  m_Layer: 0
+  m_Name: headlight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1960523801617226
 GameObject:
   m_ObjectHideFlags: 0
@@ -516,6 +532,19 @@ Transform:
   m_Father: {fileID: 4239492082957598}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: -90.00001, y: 0, z: 349.702}
+--- !u!4 &4044533976694842
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1944742470847236}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.0066}
+  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 &4149543191162314
 Transform:
   m_ObjectHideFlags: 1
@@ -752,7 +781,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: 4044533976694842}
   m_Father: {fileID: 4239492082957598}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1750,6 +1780,56 @@ Animator:
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
+--- !u!108 &108270410685225482
+Light:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1944742470847236}
+  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: 1
+    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
@@ -1760,12 +1840,12 @@ Light:
   serializedVersion: 8
   m_Type: 2
   m_Color: {r: 1, g: 0.92058825, b: 0.8014706, a: 1}
-  m_Intensity: 1.5
-  m_Range: 20.36
+  m_Intensity: 5
+  m_Range: 12
   m_SpotAngle: 30
   m_CookieSize: 10
   m_Shadows:
-    m_Type: 2
+    m_Type: 1
     m_Resolution: -1
     m_CustomResolution: -1
     m_Strength: 0.397
@@ -1824,7 +1904,9 @@ MonoBehaviour:
   bulletPrefab: {fileID: 54376493206981186, guid: b7a50776d2afe4da29c642bd08d6e556,
     type: 2}
   muzzleLight: {fileID: 108365963384445830}
+  headLight: {fileID: 108270410685225482}
   gauge: {fileID: 4874332323323470}
+  dayTimeManager: {fileID: 0}
   fidgetSpin: 60
   maxChargingTime: 2
   maxBulletForce: 30

File diff suppressed because it is too large
+ 87 - 3350
game/Assets/Prefabs/PowerDrop.prefab


+ 20 - 4
game/Assets/Scripts/Player.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -173,7 +174,9 @@ public class Player : MonoBehaviour
     public Transform gunTransform;
     public Rigidbody bulletPrefab;
     public Light muzzleLight;
+    public Light headLight;
     public Transform gauge;
+    public DayTimeManager dayTimeManager;
 
     private Vector3 inputDirection;
     private float speed;
@@ -192,6 +195,7 @@ 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]);
         //if (useMouseLook)
@@ -235,12 +239,24 @@ public class Player : MonoBehaviour
         if (shooting)
         {
             Shoot();
-            muzzleLight.intensity = Random.Range(.5f, 2f) * lightIntensity;
+            StartCoroutine(FlashMuzzle());
         }
-        else
+
+        headLight.enabled =
+            (dayTimeManager.dayTimeLabel == DayTimeLabel.Night || dayTimeManager.dayTimeLabel == DayTimeLabel.Evening);
+    }
+
+    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;