From 883d531a23e4b55b99f69b8ab1dd05f92d55044b Mon Sep 17 00:00:00 2001
From: Philip White <PW259246@falmouth.ac.uk>
Date: Mon, 1 Nov 2021 16:21:11 +0000
Subject: [PATCH] Bug Fix Trigger Between CannonBall & Enemy Ship

---
 .../Examples/Defender/CannonBall.prefab       | 31 ++-----------------
 .../Examples/Defender/Enemy Ship.prefab       | 15 ---------
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/Unity-Files/Assets/Examples/Defender/CannonBall.prefab b/Unity-Files/Assets/Examples/Defender/CannonBall.prefab
index a0efc28..bf18cbd 100644
--- a/Unity-Files/Assets/Examples/Defender/CannonBall.prefab
+++ b/Unity-Files/Assets/Examples/Defender/CannonBall.prefab
@@ -10,7 +10,6 @@ GameObject:
   m_Component:
   - component: {fileID: 454194}
   - component: {fileID: 21278666}
-  - component: {fileID: 6151316}
   - component: {fileID: 5075258}
   - component: {fileID: 11477670}
   - component: {fileID: 114000014027203158}
@@ -89,32 +88,6 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!61 &6151316
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 196000}
-  m_Enabled: 0
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 0.32, y: 0.32}
-    newSize: {x: 1, y: 1}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.13, y: 0.37}
-  m_EdgeRadius: 0
 --- !u!50 &5075258
 Rigidbody2D:
   serializedVersion: 4
@@ -127,7 +100,7 @@ Rigidbody2D:
   m_Simulated: 1
   m_UseFullKinematicContacts: 0
   m_UseAutoMass: 1
-  m_Mass: 0.114046305
+  m_Mass: 1
   m_LinearDrag: 0
   m_AngularDrag: 0.05
   m_GravityScale: 0
@@ -195,7 +168,7 @@ BoxCollider2D:
   m_Enabled: 1
   m_Density: 1
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_UsedByEffector: 0
   m_UsedByComposite: 0
   m_Offset: {x: 0, y: 0}
diff --git a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab
index 23992bb..af10556 100644
--- a/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab	
+++ b/Unity-Files/Assets/Examples/Defender/Enemy Ship.prefab	
@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 416926}
   - component: {fileID: 21256868}
   - component: {fileID: 5058630}
-  - component: {fileID: 11424868}
   - component: {fileID: 114000011533140650}
   - component: {fileID: 114000012881949288}
   - component: {fileID: 11441764}
@@ -110,20 +109,6 @@ Rigidbody2D:
   m_SleepingMode: 1
   m_CollisionDetection: 0
   m_Constraints: 0
---- !u!114 &11424868
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 105984}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0c62d65bd264a4e088b75b7511b9467a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  rigidbody2D: {fileID: 0}
-  rotationSpeed: 5
 --- !u!114 &114000011533140650
 MonoBehaviour:
   m_ObjectHideFlags: 0