Updated Stuff

2021-06-21 23:08:41 +02:00 · 2021-06-21 23:08:41 +02:00 · d866e8743f
commit d866e8743f
parent 7bbd3de299
12 changed files with 5676 additions and 155 deletions
--- a/Assets/MainScene.unity
+++ b/Assets/MainScene.unity
@ -134,6 +134,46 @@ PrefabInstance:
      propertyPath: m_Name
      value: 45 ACP Smith and Wesson Gun
      objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100002, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100004, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100006, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100008, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100010, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100012, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100014, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100016, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 100018, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
+      propertyPath: m_Layer
+      value: 8
+      objectReference: {fileID: 0}
    - target: {fileID: 400000, guid: 5d06c8e481e9c63409f7653006d9e396, type: 3}
      propertyPath: m_RootOrder
      value: 0
@ -283,6 +323,63 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 84033919}
  m_CullTransparentMesh: 1
+--- !u!1001 &269309423
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -5.526394
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -9.016741
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.98902553
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.14774445
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 16.992
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6311139751589452140, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_Name
+      value: Crate (1)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
 --- !u!1 &403196526 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 971ab0d68c0a065cd97a31b5cfe9d919, type: 3}
@ -395,7 +492,7 @@ Transform:
  m_LocalScale: {x: 100, y: 1, z: 100}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &672029774
 GameObject:
@ -409,7 +506,8 @@ GameObject:
  - component: {fileID: 672029776}
  - component: {fileID: 672029775}
  - component: {fileID: 672029778}
-  m_Layer: 0
+  - component: {fileID: 672029779}
+  m_Layer: 8
  m_Name: Player
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -470,7 +568,7 @@ Transform:
  - {fileID: 1111358330}
  - {fileID: 1683223787}
  m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &672029778
 MonoBehaviour:
@ -479,48 +577,36 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 672029774}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: d00eba13632cd06d5a0f3600b5bf3818, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  damage: 10
  range: 100
-  fireRate: 2
+  fireRate: 1.5
  automatic: 0
  particle: {fileID: 2078152891}
  camera: {fileID: 1111358333}
--- !u!1 &779182723
-GameObject:
+--- !u!114 &672029779
+MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 779182724}
-  m_Layer: 0
-  m_Name: Bullet
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &779182724
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 779182723}
-  m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5}
-  m_LocalPosition: {x: 0, y: -5, z: 0}
-  m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
-  m_Children:
-  - {fileID: 892856337}
-  m_Father: {fileID: 0}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90}
+  m_GameObject: {fileID: 672029774}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c86dd57fa3a39e30a96c4f980dc8caed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  automatic: 0
+  bullet: {fileID: 2298514568979568508, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+  camera: {fileID: 1111358333}
+  damage: 10
+  fireRate: 2
+  particle: {fileID: 2078152891}
+  range: 100
 --- !u!1 &862517728
 GameObject:
  m_ObjectHideFlags: 0
@ -608,108 +694,12 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 862517728}
  m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
-  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalPosition: {x: 5.35, y: 11.56, z: -6.93}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &892856336
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 892856337}
-  - component: {fileID: 892856340}
-  - component: {fileID: 892856339}
-  - component: {fileID: 892856338}
-  m_Layer: 0
-  m_Name: Cylinder
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &892856337
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 892856336}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 779182724}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!136 &892856338
-CapsuleCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 892856336}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  m_Radius: 0.5000001
-  m_Height: 2
-  m_Direction: 1
-  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- !u!23 &892856339
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 892856336}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 8eb23e1664c3503dca7a81493f232efe, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &892856340
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 892856336}
-  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1070094979
 GameObject:
  m_ObjectHideFlags: 0
@ -720,7 +710,7 @@ GameObject:
  m_Component:
  - component: {fileID: 1070094980}
  - component: {fileID: 1070094981}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: PointLight
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -812,7 +802,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: -8679921383154817045, guid: 971ab0d68c0a065cd97a31b5cfe9d919, type: 3}
      propertyPath: m_RootOrder
-      value: 1
+      value: 4
      objectReference: {fileID: 0}
    - target: {fileID: -8679921383154817045, guid: 971ab0d68c0a065cd97a31b5cfe9d919, type: 3}
      propertyPath: m_LocalScale.x
@ -892,7 +882,7 @@ GameObject:
  - component: {fileID: 1111358333}
  - component: {fileID: 1111358332}
  - component: {fileID: 1111358331}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: Main Camera
  m_TagString: MainCamera
  m_Icon: {fileID: 0}
@ -960,8 +950,8 @@ Camera:
    y: 0
    width: 1
    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
+  near clip plane: 0.05
+  far clip plane: 500
  field of view: 60
  orthographic: 0
  orthographic size: 5
@ -1044,8 +1034,69 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 9
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1370895677
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_RootOrder
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -5.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -9.39
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.98284346
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.18444209
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 21.257
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6092426667914013633, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_UseGravity
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6311139751589452140, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_Name
+      value: Crate (2)
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
 --- !u!1 &1683223786
 GameObject:
  m_ObjectHideFlags: 0
@ -1055,7 +1106,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 1683223787}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: GroundCheck
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -1169,7 +1220,7 @@ RectTransform:
  m_Children:
  - {fileID: 84033920}
  m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 8
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
@ -1205,7 +1256,7 @@ Transform:
  m_Children:
  - {fileID: 1931819606}
  m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 10
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &1870981959 stripped
 Transform:
@ -1353,7 +1404,7 @@ GameObject:
  - component: {fileID: 1976259427}
  - component: {fileID: 1976259426}
  - component: {fileID: 1976259425}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: Capsule
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -1448,7 +1499,7 @@ GameObject:
  - component: {fileID: 2078152889}
  - component: {fileID: 2078152891}
  - component: {fileID: 2078152890}
-  m_Layer: 0
+  m_Layer: 8
  m_Name: FIreEffect
  m_TagString: Untagged
  m_Icon: {fileID: 0}
@ -6242,3 +6293,125 @@ ParticleSystem:
        m_PostInfinity: 2
        m_RotationOrder: 4
    vectorLabel1_3: W
+--- !u!1001 &2086439403
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -5.536
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -10.237
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.99957025
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.029313896
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -3.36
+      objectReference: {fileID: 0}
+    - target: {fileID: 3533619362863836992, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6311139751589452140, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+      propertyPath: m_Name
+      value: Crate
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8705f87da7c20fbf3836db913cb12755, type: 3}
+--- !u!1001 &2298514569421075967
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568507, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514568979568508, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_Icon
+      value: 
+      objectReference: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0}
+    - target: {fileID: 2298514568979568508, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_Name
+      value: Bullet
+      objectReference: {fileID: 0}
+    - target: {fileID: 2298514569067290092, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 4d06d63095c959d05bfd14d2ecec795f, type: 2}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 871e916ccada37cec9bd5e022c159ff8, type: 3}
--- a/Assets/Materials/PlasmaMaterial.mat
+++ b/Assets/Materials/PlasmaMaterial.mat
@ -7,7 +7,7 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: GroundMat
+  m_Name: PlasmaMaterial
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
  m_ShaderKeywords: 
  m_LightmapFlags: 4
@ -61,7 +61,7 @@ Material:
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _GlossMapScale: 1
-    - _Glossiness: 0
+    - _Glossiness: 0.5
    - _GlossyReflections: 1
    - _Metallic: 0
    - _Mode: 0
@ -73,6 +73,6 @@ Material:
    - _UVSec: 0
    - _ZWrite: 1
    m_Colors:
-    - _Color: {r: 0.2830189, g: 0.2830189, b: 0.2830189, a: 1}
+    - _Color: {r: 0.22323768, g: 0.7264151, b: 0.07195621, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/Materials/crate1_diffuse.mat
+++ b/Assets/Materials/crate1_diffuse.mat
@ -7,9 +7,9 @@ Material:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: BulletMat
+  m_Name: crate1_diffuse
  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ShaderKeywords: _METALLICGLOSSMAP
+  m_ShaderKeywords: 
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
@ -40,11 +40,11 @@ Material:
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MainTex:
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 5abe44ecb3b0e58c894323794ea7bd5f, type: 3}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _MetallicGlossMap:
-        m_Texture: {fileID: 10904, guid: 0000000000000000f000000000000000, type: 0}
+        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
    - _OcclusionMap:
@ -61,9 +61,9 @@ Material:
    - _DetailNormalMapScale: 1
    - _DstBlend: 0
    - _GlossMapScale: 1
-    - _Glossiness: 0
+    - _Glossiness: 0.5
    - _GlossyReflections: 1
-    - _Metallic: 1
+    - _Metallic: 0
    - _Mode: 0
    - _OcclusionStrength: 1
    - _Parallax: 0.02
@ -73,6 +73,6 @@ Material:
    - _UVSec: 0
    - _ZWrite: 1
    m_Colors:
-    - _Color: {r: 1, g: 0, b: 0, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
  m_BuildTextureStacks: []
--- a/Assets/Prefabs/Bullet.prefab
+++ b/Assets/Prefabs/Bullet.prefab
@ -0,0 +1,161 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2298514568979568508
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2298514568979568507}
+  - component: {fileID: -6885154554712016896}
+  - component: {fileID: 844738042040734121}
+  m_Layer: 0
+  m_Name: Bullet
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2298514568979568507
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2298514568979568508}
+  m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5}
+  m_LocalPosition: {x: 0, y: -5, z: 0}
+  m_LocalScale: {x: 0.02, y: 0.02, z: 0.02}
+  m_Children:
+  - {fileID: 2298514569067290094}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90}
+--- !u!114 &-6885154554712016896
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2298514568979568508}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 28e02a7868785bf00b5413a0bbe2b10f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rb: {fileID: 844738042040734121}
+--- !u!54 &844738042040734121
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2298514568979568508}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 0
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!1 &2298514569067290095
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2298514569067290094}
+  - component: {fileID: 2298514569067290091}
+  - component: {fileID: 2298514569067290092}
+  - component: {fileID: 2298514569067290093}
+  m_Layer: 0
+  m_Name: Cylinder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2298514569067290094
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2298514569067290095}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2298514568979568507}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &2298514569067290091
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2298514569067290095}
+  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &2298514569067290092
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2298514569067290095}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 0}
+  - {fileID: 2100000, guid: 4d06d63095c959d05bfd14d2ecec795f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!136 &2298514569067290093
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2298514569067290095}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  m_Radius: 0.5000001
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
--- a/Assets/Prefabs/Crate.prefab
+++ b/Assets/Prefabs/Crate.prefab
@ -0,0 +1,159 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6311139751589452140
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3533619362863836992}
+  m_Layer: 6
+  m_Name: Crate
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3533619362863836992
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6311139751589452140}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 673791300344630214}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6509588175075016480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 673791300344630214}
+  - component: {fileID: 5362825738979309322}
+  - component: {fileID: 6628392826447015146}
+  - component: {fileID: 212158073942084951}
+  - component: {fileID: 6092426667914013633}
+  - component: {fileID: 4754628996075010331}
+  m_Layer: 6
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &673791300344630214
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6509588175075016480}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 3533619362863836992}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5362825738979309322
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6509588175075016480}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &6628392826447015146
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6509588175075016480}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: b59f14e4f498b85eca0d85800b017261, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &212158073942084951
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6509588175075016480}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!54 &6092426667914013633
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6509588175075016480}
+  serializedVersion: 2
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_UseGravity: 1
+  m_IsKinematic: 0
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!114 &4754628996075010331
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6509588175075016480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 635780c0999efa0f98f14b57d27cb68c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  health: 100
--- a/Assets/Prefabs/PlasmaProjectlie.prefab
+++ b/Assets/Prefabs/PlasmaProjectlie.prefab
--- a/Assets/Scripts/DummyTarget.cs
+++ b/Assets/Scripts/DummyTarget.cs
@ -6,6 +6,7 @@ public class DummyTarget : Target {
    public float dieShootForce = 500f;
    protected override void die(Transform from) {
        rb.AddForce(Vector3.Normalize(transform.position -from.position) * dieShootForce);
+        gameObject.layer = 7;
    }
    
 }
--- a/Assets/Scripts/PlayerShoot.cs
+++ b/Assets/Scripts/PlayerShoot.cs
@ -34,7 +34,7 @@ public class PlayerShoot : MonoBehaviour {
            if (target != null) {
                target.takeDamage(damage, transform);
            }
-
+            
            nextTimeToFire = Time.time + 1f / fireRate;

        }
--- a/Assets/Scripts/Target.cs
+++ b/Assets/Scripts/Target.cs
@ -20,6 +20,6 @@ public class Target : MonoBehaviour {
    }

    protected virtual void die(Transform from) {
-        Destroy(this);
+        Destroy(gameObject);
    }
 }
--- a/Assets/Textures/crate1_diffuse.png
+++ b/Assets/Textures/crate1_diffuse.png
--- a/ProjectSettings/DynamicsManager.asset
+++ b/ProjectSettings/DynamicsManager.asset
@ -18,7 +18,7 @@ PhysicsManager:
  m_ClothInterCollisionDistance: 0.1
  m_ClothInterCollisionStiffness: 0.2
  m_ContactsGeneration: 1
-  m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+  m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
  m_AutoSimulation: 1
  m_AutoSyncTransforms: 0
  m_ReuseCollisionCallbacks: 0
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -12,8 +12,8 @@ TagManager:
  - Water
  - UI
  - Ground
-  - 
-  - 
+  - DeadBody
+  - Player
  - 
  - 
  -