Added the updated Gantt Chart

CS383-Dream-Team · Nov 16, 2018 · 6807b58 · 6807b58
1 parent 1028750
commit 6807b58
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 178 deletions.
diff --git a/doc/Group Deliverables/Dream Team Merged Gantt Chart.xlsx b/doc/Group Deliverables/Dream Team Merged Gantt Chart.xlsx
diff --git a/doc/Group Deliverables/Gantt Chart Diagram.xlsx b/doc/Group Deliverables/Gantt Chart Diagram.xlsx
diff --git a/doc/Group Deliverables/Weekly Status Report 4.pptx b/doc/Group Deliverables/Weekly Status Report 4.pptx
diff --git a/src/Chasing the End/Assets/Edgar/Prefab/BossEnemy.prefab b/src/Chasing the End/Assets/Edgar/Prefab/BossEnemy.prefab
@@ -115,10 +115,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 1323455447923484}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4a1803586455c426ea6061191cbf9a22, type: 3}
+  m_Script: {fileID: 11500000, guid: 1e7c1881bd8554948b2e34630b12ab06, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: 2.5
+  speed: 3
 --- !u!212 &212860105860677620
 SpriteRenderer:
   m_ObjectHideFlags: 1

diff --git a/src/Chasing the End/Assets/Edgar/Prefab/Enemy.prefab b/src/Chasing the End/Assets/Edgar/Prefab/Enemy.prefab
@@ -38,7 +38,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1697981930261092}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.72, y: 1, z: 0}
+  m_LocalPosition: {x: 7.278224, y: -0.02362299, z: 0}
   m_LocalScale: {x: 0.23293854, y: 0.19870475, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -115,10 +115,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 1697981930261092}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4a1803586455c426ea6061191cbf9a22, type: 3}
+  m_Script: {fileID: 11500000, guid: 1e7c1881bd8554948b2e34630b12ab06, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  speed: 1
+  speed: 2
 --- !u!212 &212903304046402066
 SpriteRenderer:
   m_ObjectHideFlags: 1

diff --git a/src/Chasing the End/Assets/Edgar/Scripts/Enemy.cs b/src/Chasing the End/Assets/Edgar/Scripts/Enemy.cs
@@ -1,6 +1,8 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
+/*
+ * This is the main enemy class used to
+ * Inherit the player, speed, and which
+ * Way the enemy is facing.
+ */
 using UnityEngine;
 using UnityEngine.SceneManagement;
 

diff --git a/src/Chasing the End/Assets/Edgar/Scripts/EnemyMovement.cs b/src/Chasing the End/Assets/Edgar/Scripts/EnemyMovement.cs
diff --git a/src/Chasing the End/Assets/Edgar/Scripts/EnemyMovement.cs.meta b/src/Chasing the End/Assets/Edgar/Scripts/EnemyMovement.cs.meta
diff --git a/...e End/Assets/Edgar/Scripts/NormalEnemy.cs → ...e End/Assets/Edgar/Scripts/EnemyNormal.cs b/...e End/Assets/Edgar/Scripts/NormalEnemy.cs → ...e End/Assets/Edgar/Scripts/EnemyNormal.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 
 //This class inherits all from Enemy
-public class NormalEnemy : Enemy 
+public class EnemyNormal : Enemy 
 {
 	// Use this for initialization
 	public void Start () 

diff --git a/.../Assets/Edgar/Scripts/NormalEnemy.cs.meta → .../Assets/Edgar/Scripts/EnemyNormal.cs.meta b/.../Assets/Edgar/Scripts/NormalEnemy.cs.meta → .../Assets/Edgar/Scripts/EnemyNormal.cs.meta
diff --git a/src/Chasing the End/Assets/Edgar/Scripts/StationaryMovement.cs b/src/Chasing the End/Assets/Edgar/Scripts/StationaryMovement.cs
diff --git a/src/Chasing the End/Assets/Edgar/Scripts/StationaryMovement.cs.meta b/src/Chasing the End/Assets/Edgar/Scripts/StationaryMovement.cs.meta
diff --git a/src/Chasing the End/Assets/Edgar/Tests/EnemyStressTest.unity b/src/Chasing the End/Assets/Edgar/Tests/EnemyStressTest.unity
@@ -6257,6 +6257,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ac211310268cd404ea11dfd1c06be559, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  inventory: {fileID: 0}
 --- !u!61 &552054507
 BoxCollider2D:
   m_ObjectHideFlags: 0

diff --git a/src/Chasing the End/Assets/Scenes/UpdatedScenes/Level1.unity b/src/Chasing the End/Assets/Scenes/UpdatedScenes/Level1.unity
@@ -2984,6 +2984,48 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &987551244
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 7.76
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -0.08
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
+  m_IsPrefabAsset: 0
 --- !u!1001 &1167851266
 Prefab:
   m_ObjectHideFlags: 0
@@ -8416,48 +8458,6 @@ Tilemap:
     e31: 0
     e32: 0
     e33: 1
---- !u!1001 &1765678278
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: 7.76
-      objectReference: {fileID: 0}
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: -0.08
-      objectReference: {fileID: 0}
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4043784882903560, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 8592497c49d2f40b2b949be2164d31e7, type: 2}
-  m_IsPrefabAsset: 0
 --- !u!1001 &1798596628
 Prefab:
   m_ObjectHideFlags: 0