From d64b65fed63cd4fb5cc1112fabc8850ddd1f6507 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Sat, 12 Jun 2021 16:42:21 -0400 Subject: PlayerHoop log on hit --- Assets/Scenes/Main.unity | 77 ++++++++++++++++++++++++++++++++- Assets/Scripts/Controllers/Hoop.cs | 19 ++++++++ Assets/Scripts/Controllers/Hoop.cs.meta | 3 ++ 3 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 Assets/Scripts/Controllers/Hoop.cs create mode 100644 Assets/Scripts/Controllers/Hoop.cs.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 8979071..0e8dd51 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -298,6 +298,77 @@ 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 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 614591299} + 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 @@ -315,11 +386,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5143626018439341592, guid: 2485406c33a7d4f5481ce936cc9b162e, type: 3} propertyPath: m_LocalPosition.x - value: 3.5 + value: 0.23 objectReference: {fileID: 0} - target: {fileID: 5143626018439341592, guid: 2485406c33a7d4f5481ce936cc9b162e, type: 3} propertyPath: m_LocalPosition.y - value: 5.5 + value: 5.17 objectReference: {fileID: 0} - target: {fileID: 5143626018439341592, guid: 2485406c33a7d4f5481ce936cc9b162e, type: 3} propertyPath: m_LocalPosition.z @@ -496,6 +567,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: ball: {fileID: 707826158} + PlayerHoop: {fileID: 614591307} + EnemyHoop: {fileID: 0} --- !u!4 &1189511746 stripped Transform: m_CorrespondingSourceObject: {fileID: 6095859834264611321, guid: c64ad9b908cb44602b3d13a74aef751f, type: 3} diff --git a/Assets/Scripts/Controllers/Hoop.cs b/Assets/Scripts/Controllers/Hoop.cs new file mode 100644 index 0000000..58f7130 --- /dev/null +++ b/Assets/Scripts/Controllers/Hoop.cs @@ -0,0 +1,19 @@ +using System; +using UnityEngine; + +namespace Controllers +{ + public class Hoop : MonoBehaviour + { + [SerializeField] private BoxCollider2D Rim; + [SerializeField] private BoxCollider2D Net; + + private void OnTriggerEnter2D(Collider2D other) + { + if (other.GetComponent() == null) return; + + if (Rim.IsTouching(other) && Net.IsTouching(other)) + Debug.Log("Swish!"); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Controllers/Hoop.cs.meta b/Assets/Scripts/Controllers/Hoop.cs.meta new file mode 100644 index 0000000..29125c3 --- /dev/null +++ b/Assets/Scripts/Controllers/Hoop.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 40e5d6a883d14c7fb60913ec2fc3009c +timeCreated: 1623524972 \ No newline at end of file -- cgit v1.2.3-56-ge451 From d6d5014337ab72a6eb8c2f93fae107c71d267649 Mon Sep 17 00:00:00 2001 From: Cameron Katri Date: Sat, 12 Jun 2021 16:54:59 -0400 Subject: EnemyHoop and Hoop gamecontroler stuff --- Assets/Prefabs/Hoop.prefab | 69 ++++++++++++++++++++++++ Assets/Scenes/Main.unity | 81 ++++++---------------------- Assets/Scripts/Controllers/GameController.cs | 17 ++++++ 3 files changed, 102 insertions(+), 65 deletions(-) diff --git a/Assets/Prefabs/Hoop.prefab b/Assets/Prefabs/Hoop.prefab index 691d0b2..7dfd3b9 100644 --- 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 0e8dd51..0871fd5 100644 --- 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 c326c4e..b39199b 100644 --- a/Assets/Scripts/Controllers/GameController.cs +++ b/Assets/Scripts/Controllers/GameController.cs @@ -18,6 +18,9 @@ namespace Controllers /// [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 /// 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; } } -- cgit v1.2.3-56-ge451