EnemyHoop and Hoop gamecontroler stuff

diff --git a/Assets/Prefabs/Hoop.prefab b/Assets/Prefabs/Hoop.prefab
index 691d0b2cb83cb532a9d481fe6f218033d99d0d11..7dfd3b967e57346e38785042341781f0a9ecd200 100644 (file)
--- a/Assets/Prefabs/Hoop.prefab
+++ b/Assets/Prefabs/Hoop.prefab
@@ -14,6 +14,9 @@ GameObject:
   - component: {fileID: 2106494524751008832}
   - component: {fileID: 2106494524751008834}
   - component: {fileID: 2106494524751008835}
+  - component: {fileID: 1029364543094105199}
+  - component: {fileID: 2639737386686648195}
+  - component: {fileID: 1022133350338841181}
   m_Layer: 0
   m_Name: Hoop
   m_TagString: Untagged
@@ -183,3 +186,69 @@ BoxCollider2D:
   serializedVersion: 2
   m_Size: {x: 0.040855214, y: 0.030604668}
   m_EdgeRadius: 0
+--- !u!61 &1029364543094105199
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2106494524751008836}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.0056511946, y: 0.005704716}
+  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: 0.32, y: 0.32}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.14921531, y: 0.050745383}
+  m_EdgeRadius: 0
+--- !u!61 &2639737386686648195
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2106494524751008836}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.005651191, y: -0.104769394}
+  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: 0.32, y: 0.32}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 0.14921531, y: 0.030544288}
+  m_EdgeRadius: 0
+--- !u!114 &1022133350338841181
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2106494524751008836}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 40e5d6a883d14c7fb60913ec2fc3009c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Rim: {fileID: 2639737386686648195}
+  Net: {fileID: 1029364543094105199}

diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index 0e8dd5164f7aba28fc080c7534f42b186d13837c..0871fd5f8d8d79d9085eea7fec43d5f1006df0f0 100644 (file)
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -298,77 +298,17 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2106494524751008833, guid: b2939f2eae52d074b81e81fccdde88f9, type: 3}
   m_PrefabInstance: {fileID: 1402386184}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &614591299 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2106494524751008836, guid: b2939f2eae52d074b81e81fccdde88f9, type: 3}
-  m_PrefabInstance: {fileID: 1402386184}
-  m_PrefabAsset: {fileID: 0}
---- !u!61 &614591300
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 614591299}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: -0.005651191, y: -0.104769394}
-  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: 0.32, y: 0.32}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.14921531, y: 0.030544288}
-  m_EdgeRadius: 0
---- !u!61 &614591301
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 614591299}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: -0.0056511946, y: 0.005704716}
-  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: 0.32, y: 0.32}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 0.14921531, y: 0.050745383}
-  m_EdgeRadius: 0
---- !u!114 &614591307
+--- !u!114 &614591307 stripped
 MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 1022133350338841181, guid: b2939f2eae52d074b81e81fccdde88f9, type: 3}
+  m_PrefabInstance: {fileID: 1402386184}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 614591299}
+  m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 40e5d6a883d14c7fb60913ec2fc3009c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Rim: {fileID: 614591300}
-  Net: {fileID: 614591301}
 --- !u!1001 &700993592
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -568,7 +508,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ball: {fileID: 707826158}
   PlayerHoop: {fileID: 614591307}
-  EnemyHoop: {fileID: 0}
+  EnemyHoop: {fileID: 1354192742}
 --- !u!4 &1189511746 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6095859834264611321, guid: c64ad9b908cb44602b3d13a74aef751f, type: 3}
@@ -635,6 +575,17 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b2939f2eae52d074b81e81fccdde88f9, type: 3}
+--- !u!114 &1354192742 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 1022133350338841181, guid: b2939f2eae52d074b81e81fccdde88f9, type: 3}
+  m_PrefabInstance: {fileID: 1354192741}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 40e5d6a883d14c7fb60913ec2fc3009c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &1402386184
 PrefabInstance:
   m_ObjectHideFlags: 0

diff --git a/Assets/Scripts/Controllers/GameController.cs b/Assets/Scripts/Controllers/GameController.cs
index c326c4ef78540c9fb233826fe60e1ae22448e5fc..b39199b5c998cde98f4d9506a8091eadd7fe2534 100644 (file)
--- a/Assets/Scripts/Controllers/GameController.cs
+++ b/Assets/Scripts/Controllers/GameController.cs
@@ -18,6 +18,9 @@ namespace Controllers
     /// </summary>
     [SerializeField] public Ball ball;
 
+    [SerializeField] public Hoop PlayerHoop;
+    [SerializeField] public Hoop EnemyHoop;
+
     private void Awake()
     {
       player = new Player { isEnemy = false, controller = this };
@@ -37,6 +40,19 @@ namespace Controllers
       /// </summary>
       internal GameController controller;
       
+      internal int score;
+
+      private Vector2 lastShotPosition;
+      public void Score(Vector2 Rim) {
+        if (Vector2.Distance(lastShotPosition, Rim) >= 1)
+        {
+          score += 3;
+          Debug.Log("Three point");
+        } else
+          score += 2;
+          Debug.Log("Two point");
+      }
+
       private State dribble => isEnemy ? State.EnemyDribble : State.PlayerDribble;
       private State shoot => isEnemy ? State.EnemyShoot : State.PlayerShoot;
 
@@ -78,6 +94,7 @@ namespace Controllers
         if (controller.state != dribble) return false; // We must be dribbling the ball to shoot it.
         controller.state = shoot;
         controller.ball.Shoot(playerTransform);
+        lastShotPosition = playerTransform.position;
         return true;
       }
     }