Display DamageTaken

Snip33x · Aug 23, 2021 · 2a1801d · 2a1801d
1 parent edb7b58
commit 2a1801d
Show file tree

Hide file tree

Showing 7 changed files with 1,318 additions and 1,091 deletions.
diff --git a/.gitignore b/.gitignore
@@ -163,3 +163,11 @@ Assets/TileableBricksWall/Textures/Bricks_specular.TGA
 Assets/TileableBricksWall/Textures/Bricks_specular.TGA.meta
 Assets/TileableBricksWall/Textures/Height_map.TGA
 Assets/TileableBricksWall/Textures/Height_map.TGA.meta
+Assets/Materials/blood2.jpg
+Assets/Materials/blood2.jpg.meta
+Assets/Materials/bloodimg.png
+Assets/Materials/bloodimg.png.meta
+Assets/Materials/kisspng-blood-drawing-clip-art-blood-splatter-png-5aad2fdda2ab09.1457484615212994216663.jpg
+Assets/Materials/kisspng-blood-drawing-clip-art-blood-splatter-png-5aad2fdda2ab09.1457484615212994216663.jpg.meta
+Assets/Materials/kisspng-blood-drawing-clip-art-blood-splatter-png-5aad2fddc98619.6932357715212994218255.png
+Assets/Materials/kisspng-blood-drawing-clip-art-blood-splatter-png-5aad2fddc98619.6932357715212994218255.png.meta
diff --git a/Assets/Prefabs/Characters/Player.prefab b/Assets/Prefabs/Characters/Player.prefab
@@ -184,9 +184,10 @@ GameObject:
   - component: {fileID: 7736738776909289183}
   - component: {fileID: 7491606366762778631}
   - component: {fileID: 7659822170989954295}
+  - component: {fileID: 6418684601372836493}
   m_Layer: 0
   m_Name: Player
-  m_TagString: Untagged
+  m_TagString: Player
   m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -343,7 +344,27 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 11d8d7e6d95b7c14da1538db10b43d78, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ammoSlots: []
+  ammoSlots:
+  - ammoType: 0
+    ammoAmount: 10
+  - ammoType: 2
+    ammoAmount: 8
+  - ammoType: 1
+    ammoAmount: 20
+--- !u!114 &6418684601372836493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 100006}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 05f54b39e558eeb44a99305f192ed810, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  impactCanvas: {fileID: 0}
+  impactTime: 0.3
 --- !u!1 &3893588876545880837
 GameObject:
   m_ObjectHideFlags: 0
@@ -417,6 +438,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Shotgun
       objectReference: {fileID: 0}
+    - target: {fileID: 4624349597725176172, guid: 8cf34e861b9f67d4389f14411fa7ab90, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5433361888883862486, guid: 8cf34e861b9f67d4389f14411fa7ab90, type: 3}
       propertyPath: m_RootOrder
       value: 2
@@ -618,6 +643,10 @@ PrefabInstance:
       propertyPath: fpsCamera
       value: 
       objectReference: {fileID: 2000000}
+    - target: {fileID: 6795258648316054807, guid: 49220b6ff155c444aa029939fe4e552d, type: 3}
+      propertyPath: fpsController
+      value: 
+      objectReference: {fileID: 11400004}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 49220b6ff155c444aa029939fe4e552d, type: 3}
 --- !u!4 &543450652945467183 stripped
@@ -636,6 +665,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Pistol
       objectReference: {fileID: 0}
+    - target: {fileID: 4624349597725176172, guid: 3dda37ac6fddb4840b2cacfa6e2f0829, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5433361888883862486, guid: 3dda37ac6fddb4840b2cacfa6e2f0829, type: 3}
       propertyPath: m_RootOrder
       value: 0