Merge pull request #121 from Eclmist/e6

Final Project Submission
Eclmist · Apr 16, 2020 · ce104f6 · ce104f6
2 parents ca14e0f + d72af91
commit ce104f6
Show file tree

Hide file tree

Showing 214 changed files with 102,234 additions and 49,011 deletions.
diff --git a/.gitignore b/.gitignore
@@ -70,4 +70,6 @@ crashlytics-build.properties
 *.idea/
 
 # UI Elements Schema
-UIElementsSchema/
+UIElementsSchema/
+
+vs-chromium-project.txt
diff --git a/Assets/AI/AiAgentPrefab/AI_Mushroom_Monster.prefab b/Assets/AI/AiAgentPrefab/AI_Mushroom_Monster.prefab
@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 111806652}
   - component: {fileID: 111806651}
   - component: {fileID: 111806650}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: Text
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -123,7 +123,7 @@ GameObject:
   - component: {fileID: 444455645}
   - component: {fileID: 9110477248540820145}
   - component: {fileID: 1959707030263548454}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -246,7 +246,7 @@ GameObject:
   - component: {fileID: 544925049}
   - component: {fileID: 544925048}
   - component: {fileID: 7601883973714319365}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: HealthDecrement
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -348,7 +348,7 @@ GameObject:
   - component: {fileID: 702140408}
   - component: {fileID: 702140407}
   - component: {fileID: 702140406}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: Text (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -457,7 +457,7 @@ GameObject:
   - component: {fileID: 949185682}
   - component: {fileID: 949185681}
   - component: {fileID: 949185680}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: BarOutline
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -562,7 +562,7 @@ GameObject:
   - component: {fileID: 1370526743}
   - component: {fileID: 1370526742}
   - component: {fileID: 1370526741}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: HealthBar (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -648,7 +648,7 @@ GameObject:
   - component: {fileID: 1934064029}
   - component: {fileID: 1934064028}
   - component: {fileID: 1934064027}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: Canvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -887,6 +887,19 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5939f5216c6d4618a768a67faad1bfcb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &9193554624705891611
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5564611183672645285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aa8cf8a3a2c6c7b41a2b68916e4fbb59, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_CanvasGroup: {fileID: 1934064025}
 --- !u!1 &5564611184946383430
 GameObject:
   m_ObjectHideFlags: 0
@@ -901,11 +914,10 @@ GameObject:
   - component: {fileID: 5564611184946383480}
   - component: {fileID: 5564611184946383481}
   - component: {fileID: 1056623341}
-  - component: {fileID: 1056623342}
   - component: {fileID: 4577846166938001396}
   - component: {fileID: -9131157625098729209}
   - component: {fileID: 7582457404112263593}
-  m_Layer: 15
+  m_Layer: 17
   m_Name: AI_Mushroom_Monster
   m_TagString: PlayerDetector
   m_Icon: {fileID: 0}
@@ -981,7 +993,7 @@ SphereCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Radius: 1.8820603
+  m_Radius: 7
   m_Center: {x: 0, y: 1.2893128, z: -0.09274745}
 --- !u!114 &5564611184946383481
 MonoBehaviour:
@@ -1002,6 +1014,8 @@ MonoBehaviour:
   m_DamageAmount: 0
   m_DamageRadius: 10
   m_DamageDuration: 0.2
+  DEBUG_DEATH: 0
+  DEBUG_GOTHIT: 0
 --- !u!114 &1056623341
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1016,19 +1030,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_MaxHealth: 100
   m_Health: 100
---- !u!114 &1056623342
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5564611184946383430}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: aa8cf8a3a2c6c7b41a2b68916e4fbb59, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_CanvasGroup: {fileID: 1934064025}
 --- !u!54 &4577846166938001396
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -1082,7 +1083,7 @@ GameObject:
   - component: {fileID: 155892277059324132}
   - component: {fileID: 2639732365871107833}
   - component: {fileID: 2091231251769241298}
-  m_Layer: 15
+  m_Layer: 16
   m_Name: DeathVfx
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -5901,111 +5902,111 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 100000, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100002, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100004, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100006, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100008, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100010, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100012, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100014, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100016, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100018, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100020, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100022, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100024, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100026, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100028, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Name
       value: Mushroom_Model
       objectReference: {fileID: 0}
     - target: {fileID: 100028, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100030, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100030, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 100032, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100034, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100036, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100038, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100040, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100042, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100044, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100046, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 100048, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_Layer
-      value: 15
+      value: 16
       objectReference: {fileID: 0}
     - target: {fileID: 400028, guid: 229979da46d964325a0f6e9bb695cdcf, type: 3}
       propertyPath: m_LocalPosition.x