瀏覽代碼

fix power drops

Niels 9 年之前
父節點
當前提交
74ec7b3f22

+ 6 - 5
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}

+ 83 - 1
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
@@ -1906,7 +1986,9 @@ MonoBehaviour:
   bulletPrefab: {fileID: 54376493206981186, guid: b7a50776d2afe4da29c642bd08d6e556,
     type: 2}
   muzzleLight: {fileID: 108365963384445830}
+  headLight: {fileID: 108091481422721826}
   gauge: {fileID: 4874332323323470}
+  dayTimeManager: {fileID: 0}
   fidgetSpin: 60
   maxChargingTime: 2
   maxBulletForce: 30

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


+ 0 - 11
game/Assets/Scenes/Main.unity

@@ -2821,12 +2821,6 @@ MeshFilter:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 814741110}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!114 &837098851 stripped
-MonoBehaviour:
-  m_PrefabParentObject: {fileID: 114806071709842584, guid: 673629bba9f02458cacf9d13115e1078,
-    type: 2}
-  m_PrefabInternal: {fileID: 1890959033}
-  m_Script: {fileID: 11500000, guid: fa3a4f9ebf76b4ac2bc610f0f6b7d935, type: 3}
 --- !u!1 &837549786
 GameObject:
   m_ObjectHideFlags: 0
@@ -3991,11 +3985,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 2
       objectReference: {fileID: 0}
-    - target: {fileID: 114322613409989222, guid: e6383ffd9f8688f4a9ba9705843d54e2,
-        type: 2}
-      propertyPath: dayTimeManager
-      value: 
-      objectReference: {fileID: 837098851}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: e6383ffd9f8688f4a9ba9705843d54e2, type: 2}
   m_IsPrefabParent: 0