Merge pull request 'Fixed hole and ball issues. Created gameplay prefabs.' (#16) from Holeandballupdates into feature/LoadingCourseOnPlane

Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/16

Assets/Atoms/Events/IncrementStrokeCount.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a0635ac2f70594bd3a31a5ced16469dc, type: 3}
+  m_Name: IncrementStrokeCount
+  m_EditorClassIdentifier: 
+  _developerDescription: 
+  _replayBufferSize: 1
+  _inspectorRaiseValue: 0

Assets/Atoms/Events/IncrementStrokeCount.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ec7d602226c7a4b4a9aeacaba953fc38
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Atoms/Events/ResetVariables.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 04d35e2eb934747da9d77a3af62bb8ca, type: 3}
+  m_Name: ResetVariables
+  m_EditorClassIdentifier: 
+  _developerDescription: 
+  _replayBufferSize: 1

Assets/Atoms/Events/ResetVariables.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e40e40bd17724c643a36711277734822
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/CoursePrefabs/AR Content Control Room 1.prefab

@@ -991,7 +991,7 @@ Transform:
   m_GameObject: {fileID: 1703672732398916348}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00000005960465, y: -0.7071068, z: 0.00000005960465, w: 0.7071068}
-  m_LocalPosition: {x: -1.230999, y: -0.0030004978, z: 6.101}
+  m_LocalPosition: {x: -1.230999, y: -0.059, z: 6.101}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -12582,7 +12582,8 @@ MonoBehaviour:
   layerMask:
     serializedVersion: 2
     m_Bits: 1
-  tagsMask: []
+  tagsMask:
+  - {fileID: 11400000, guid: 1f557d488f8464000b778362139a0045, type: 2}
 --- !u!1 &4732476819070144639
 GameObject:
   m_ObjectHideFlags: 0

Assets/GameLogic.cs

@@ -1,6 +1,4 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using UnityAtoms.BaseAtoms;
 using UnityEngine;
 
@@ -19,6 +17,10 @@ namespace MAVRIC.GEEKCup
         }
         public void MoveBallToSpawnPoint()
         {
+            if (spawnPoint is null)
+            {
+                CheckForSpawnPoint();
+            }
             StopCoroutine(MoveBall());
             StartCoroutine(MoveBall());
         }
@@ -36,10 +38,5 @@ namespace MAVRIC.GEEKCup
                 rbBall.isKinematic = false;
             }
         }
-
-        public void ResetScore()
-        {
-            scoreVariable.Value = 0;
-        }
     }
 }

Assets/GolfControls/BallHitController.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 using UnityAtoms.BaseAtoms;
 using UnityEngine;
@@ -8,6 +7,7 @@ namespace GolfControls
     public class BallHitController : MonoBehaviour
     {
         public VoidEvent ballHitEvent;
+        public BoolEvent incrementStrokeCount;
 
         public Vector3Variable AngleVariable;
         public FloatVariable PowerVariable;
@@ -49,7 +49,8 @@ namespace GolfControls
             float ballStopTime = 1.0f;
 
             isMovingVariable.SetValue(true);
-
+            incrementStrokeCount.Raise(true);
+            
             while (!inHoleVariable.Value)
             {
                 yield return null;
@@ -82,6 +83,7 @@ namespace GolfControls
             body.angularVelocity = Vector3.zero;
             
             isMovingVariable.SetValue(false);
+            incrementStrokeCount.Raise(false);
         }
         
     }

Assets/GolfControls/StrokeCounter.cs

@@ -1,4 +1,3 @@
-using System;
 using UnityAtoms.BaseAtoms;
 using UnityEngine;
 
@@ -6,24 +5,16 @@ namespace GolfControls
 {
     public class StrokeCounter : MonoBehaviour
     {
-        public BoolVariable ballMovingVariable;
         public IntVariable StrokeVariable;
-        public VoidEvent HitEvent;
+       
-
+        public void OnHit(bool isHit)
-        private void OnEnable()
         {
-            HitEvent.Register(OnHit);
+            if (!isHit)
-        }
+            {
-
+                return;
-        private void OnDisable()
+            }
-        {
+            
-            HitEvent.Unregister(OnHit);
+            StrokeVariable.SetValue(StrokeVariable.Value + 1);
-        }
-
-        private void OnHit()
-        {
-            if (ballMovingVariable.Value) return;
-            StrokeVariable.SetValue(StrokeVariable.Value+1);
         }
     }
 }

Assets/GolfControls/UI/StrokeDisplay.cs

@@ -1,4 +1,3 @@
-using System;
 using TMPro;
 using UnityAtoms.BaseAtoms;
 using UnityEngine;

Assets/Prefabs/CourseLayoutUI.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5df815d3649b58b4484d2ae582fbf0c3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/ForceArrow.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &209398200812253481
+--- !u!1 &3536464498223786524
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,9 +8,93 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 9189565856448533487}
+  - component: {fileID: 4250719376549075739}
-  - component: {fileID: 8971820068132856849}
+  m_Layer: 0
-  - component: {fileID: 8442916217932174832}
+  m_Name: DirectionalArrowOffset
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4250719376549075739
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3536464498223786524}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7951559575268869371}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4088486235290802487
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7951559575268869371}
+  - component: {fileID: 1383144459455941364}
+  m_Layer: 0
+  m_Name: ForceArrow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7951559575268869371
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4088486235290802487}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0.23469917, y: 0.0533531, z: -0.30785644}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5046504562962061564}
+  - {fileID: 4250719376549075739}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1383144459455941364
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4088486235290802487}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9376744b6cad1d5429f2ecfb2a907fa6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  AngleVariable: {fileID: 11400000, guid: 390945e28bef9ed42b6a83711c25732f, type: 2}
+  HideModelVariable: {fileID: 11400000, guid: 838a13f5fd312c94398e49cfc36e34ad, type: 2}
+  followedBallTransform: {fileID: 0}
+  Model: {fileID: 6098557301774996084}
+  arrowOffset: {x: 0, y: 0.05, z: 0}
+  maxBounceSpeed: 0.08
+  bounceTimeSeconds: 0.5
+--- !u!1 &6098557301774996084
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5046504562962061564}
+  - component: {fileID: 7776865532487365390}
+  - component: {fileID: 4429953264966160871}
   m_Layer: 0
   m_Name: 3D RightArrow
   m_TagString: Untagged
@@ -18,36 +102,36 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &9189565856448533487
+--- !u!4 &5046504562962061564
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 209398200812253481}
+  m_GameObject: {fileID: 6098557301774996084}
   serializedVersion: 2
   m_LocalRotation: {x: 0.60270566, y: -0.60270566, z: 0.36979175, w: 0.36979175}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 4, y: 4, z: 12}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1397921589889988535}
+  m_Father: {fileID: 7951559575268869371}
   m_LocalEulerAnglesHint: {x: 63.063, y: -180, z: -90}
---- !u!33 &8971820068132856849
+--- !u!33 &7776865532487365390
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 209398200812253481}
+  m_GameObject: {fileID: 6098557301774996084}
   m_Mesh: {fileID: -7929139438592967118, guid: c8389a6832c69794daffd97728da0cb9, type: 3}
---- !u!23 &8442916217932174832
+--- !u!23 &4429953264966160871
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 209398200812253481}
+  m_GameObject: {fileID: 6098557301774996084}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -83,87 +167,3 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &4044633927528132889
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2294121502629300613}
-  m_Layer: 0
-  m_Name: DirectionalArrowOffset
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2294121502629300613
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4044633927528132889}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1397921589889988535}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &7142614107621406849
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1397921589889988535}
-  - component: {fileID: 1437102970577853638}
-  m_Layer: 0
-  m_Name: ForceArrow
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1397921589889988535
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7142614107621406849}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.23469917, y: 0.0533531, z: -0.30785644}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 9189565856448533487}
-  - {fileID: 2294121502629300613}
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1437102970577853638
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7142614107621406849}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9376744b6cad1d5429f2ecfb2a907fa6, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  AngleVariable: {fileID: 11400000, guid: 390945e28bef9ed42b6a83711c25732f, type: 2}
-  HideModelVariable: {fileID: 11400000, guid: 838a13f5fd312c94398e49cfc36e34ad, type: 2}
-  followedBallTransform: {fileID: 0}
-  Model: {fileID: 209398200812253481}
-  arrowOffset: {x: 0, y: 0.05, z: 0}
-  maxBounceSpeed: 0.08
-  bounceTimeSeconds: 0.5

Assets/Prefabs/GamePlay.prefab

@@ -0,0 +1,344 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1732258587319875579
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1575695703629199926}
+  - component: {fileID: 3021524037178137395}
+  m_Layer: 0
+  m_Name: GamePlay
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1575695703629199926
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1732258587319875579}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 858.2119, y: 682.1446, z: -26.536821}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5222704817821801315}
+  - {fileID: 7529011191634243865}
+  - {fileID: 2969644529280671742}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3021524037178137395
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1732258587319875579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 45717041bf1ef4ef39d106125da09c45, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ball: {fileID: 8357584060222999024}
+  scoreVariable: {fileID: 11400000, guid: b17566f4d19813249a993793ac86d94c, type: 2}
+--- !u!1001 &2420978955236610172
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1575695703629199926}
+    m_Modifications:
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5560245172605128309, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      propertyPath: m_Name
+      value: GolfController
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5560245172605128309, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+        type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 3173960975074571928}
+  m_SourcePrefab: {fileID: 100100000, guid: 55132ad6f7d78459191ed0f6503c1bbf, type: 3}
+--- !u!114 &373484348262600652 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2645840047853494192, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+    type: 3}
+  m_PrefabInstance: {fileID: 2420978955236610172}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7832039088124763657}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 594dbcb0ac6fee442ac8e47c96781542, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &7529011191634243865 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5324767969826283877, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+    type: 3}
+  m_PrefabInstance: {fileID: 2420978955236610172}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7832039088124763657 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5560245172605128309, guid: 55132ad6f7d78459191ed0f6503c1bbf,
+    type: 3}
+  m_PrefabInstance: {fileID: 2420978955236610172}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3173960975074571928
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7832039088124763657}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9a6ab7cbc45164d19b20476265c251c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _developerDescription: 
+  _unityEventResponse:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 373484348262600652}
+        m_TargetAssemblyTypeName: GolfControls.StrokeCounter, Assembly-CSharp
+        m_MethodName: OnHit
+        m_Mode: 0
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  _actionResponses: []
+  _conditions: []
+  _operator: 0
+  _replayEventBufferOnRegister: 1
+  _eventReference:
+    _usage: 0
+    _event: {fileID: 11400000, guid: ec7d602226c7a4b4a9aeacaba953fc38, type: 2}
+    _eventInstancer: {fileID: 0}
+    _variable: {fileID: 0}
+    _variableInstancer: {fileID: 0}
+--- !u!1001 &2748140329130303384
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1575695703629199926}
+    m_Modifications:
+    - target: {fileID: 1383144459455941364, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: followedBallTransform
+      value: 
+      objectReference: {fileID: 2969644529280671742}
+    - target: {fileID: 4088486235290802487, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_Name
+      value: ForceArrow
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.23469917
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.0533531
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.30785644
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 9f113c033e73444a5bcaee94d59b9e47, type: 3}
+--- !u!4 &5222704817821801315 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7951559575268869371, guid: 9f113c033e73444a5bcaee94d59b9e47,
+    type: 3}
+  m_PrefabInstance: {fileID: 2748140329130303384}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8385526876853903585
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1575695703629199926}
+    m_Modifications:
+    - target: {fileID: 550417892748896529, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_Name
+      value: TestGolfBall
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.18469918
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.0737
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c9932ec1118ae464983a6a298f97bb6d, type: 3}
+--- !u!4 &2969644529280671742 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6730959166714347295, guid: c9932ec1118ae464983a6a298f97bb6d,
+    type: 3}
+  m_PrefabInstance: {fileID: 8385526876853903585}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8357584060222999024 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 550417892748896529, guid: c9932ec1118ae464983a6a298f97bb6d,
+    type: 3}
+  m_PrefabInstance: {fileID: 8385526876853903585}
+  m_PrefabAsset: {fileID: 0}

Assets/Prefabs/GamePlay.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f5a17f6d13f0ba244acf4d98ff306ba3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/GameUI.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 686b51ff9e7b323448470fac3420b8a3
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/GolfController.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &6625697817385347548
+--- !u!1 &5560245172605128309
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,11 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 7120336510224721686}
+  - component: {fileID: 5324767969826283877}
-  - component: {fileID: 8622537253348260754}
+  - component: {fileID: 1837027161384743503}
-  - component: {fileID: 5076113057505029857}
+  - component: {fileID: 2645840047853494192}
-  - component: {fileID: 5540907406031411784}
+  - component: {fileID: 1229042045006618261}
+  - component: {fileID: 1049835781260808948}
   m_Layer: 0
   m_Name: GolfController
   m_TagString: Untagged
@@ -19,13 +20,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7120336510224721686
+--- !u!4 &5324767969826283877
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6625697817385347548}
+  m_GameObject: {fileID: 5560245172605128309}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -34,13 +35,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &8622537253348260754
+--- !u!114 &1837027161384743503
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6625697817385347548}
+  m_GameObject: {fileID: 5560245172605128309}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: d4589060adcf148439fa771bb867ed42, type: 3}
@@ -50,13 +51,13 @@ MonoBehaviour:
   isPausedVariable: {fileID: 11400000, guid: 838a13f5fd312c94398e49cfc36e34ad, type: 2}
   timeToMaxPower: 1
   pauseTimeAtEnds: 0.05
---- !u!114 &5076113057505029857
+--- !u!114 &2645840047853494192
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6625697817385347548}
+  m_GameObject: {fileID: 5560245172605128309}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 594dbcb0ac6fee442ac8e47c96781542, type: 3}
@@ -65,13 +66,13 @@ MonoBehaviour:
   ballMovingVariable: {fileID: 11400000, guid: 838a13f5fd312c94398e49cfc36e34ad, type: 2}
   StrokeVariable: {fileID: 11400000, guid: b17566f4d19813249a993793ac86d94c, type: 2}
   HitEvent: {fileID: 11400000, guid: 90fa28c269919df41acdd37835ee3b9e, type: 2}
---- !u!114 &5540907406031411784
+--- !u!114 &1229042045006618261
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6625697817385347548}
+  m_GameObject: {fileID: 5560245172605128309}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 96934656608554bbdb024f928c94a23b, type: 3}
@@ -86,3 +87,55 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 3b0e06d0a76bceb4296c54d02f0d34a4, type: 2}
   - {fileID: 11400000, guid: b5aa4452d8d082d48b46495c7352e39e, type: 2}
   - {fileID: 11400000, guid: b17566f4d19813249a993793ac86d94c, type: 2}
+--- !u!114 &1049835781260808948
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5560245172605128309}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d2458933140c54c9db0aec7a69c1b617, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _developerDescription: 
+  _unityEventResponse:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1229042045006618261}
+        m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
+        m_MethodName: set_enabled
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+      - m_Target: {fileID: 1229042045006618261}
+        m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
+        m_MethodName: set_enabled
+        m_Mode: 6
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 1
+        m_CallState: 2
+  _actionResponses: []
+  _conditions: []
+  _operator: 0
+  _replayEventBufferOnRegister: 1
+  _eventReference:
+    _usage: 0
+    _event: {fileID: 11400000, guid: e40e40bd17724c643a36711277734822, type: 2}
+    _eventInstancer: {fileID: 0}
+    _collection: {fileID: 0}
+    _list: {fileID: 0}
+    _collectionInstancer: {fileID: 0}
+    _listInstancer: {fileID: 0}

Assets/Prefabs/Hole/Hole.prefab

@@ -85,7 +85,8 @@ MonoBehaviour:
   layerMask:
     serializedVersion: 2
     m_Bits: 1
-  tagsMask: []
+  tagsMask:
+  - {fileID: 11400000, guid: 1f557d488f8464000b778362139a0045, type: 2}
 --- !u!1 &6121683813469744371
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/TestGolfBall.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &5230806379508671494
+--- !u!1 &550417892748896529
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,14 +8,15 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2467910473248597586}
+  - component: {fileID: 6730959166714347295}
-  - component: {fileID: 244342281185285756}
+  - component: {fileID: 5447085274377773335}
-  - component: {fileID: 5003637763754442883}
+  - component: {fileID: 792553325525458092}
-  - component: {fileID: 484000826079521075}
+  - component: {fileID: 8914328749107671963}
-  - component: {fileID: 1959493147369311007}
+  - component: {fileID: 8430371239360964241}
-  - component: {fileID: 499607450978384139}
+  - component: {fileID: 5449085796191868429}
-  - component: {fileID: 8446489467627569825}
+  - component: {fileID: 2848465825052700219}
-  - component: {fileID: 3181796452143029164}
+  - component: {fileID: 3220627860812539771}
+  - component: {fileID: 3638049900979181177}
   m_Layer: 0
   m_Name: TestGolfBall
   m_TagString: Player
@@ -23,13 +24,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2467910473248597586
+--- !u!4 &6730959166714347295
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0.18469918, y: 0.0737, z: 0.15}
@@ -38,21 +39,21 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &244342281185285756
+--- !u!33 &5447085274377773335
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &5003637763754442883
+--- !u!23 &792553325525458092
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -88,13 +89,13 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!135 &484000826079521075
+--- !u!135 &8914328749107671963
 SphereCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   m_Material: {fileID: 13400000, guid: 184736c5873a58647afd11a53f596983, type: 2}
   m_IncludeLayers:
     serializedVersion: 2
@@ -109,13 +110,13 @@ SphereCollider:
   serializedVersion: 3
   m_Radius: 0.5
   m_Center: {x: 0, y: 0, z: 0}
---- !u!54 &1959493147369311007
+--- !u!54 &8430371239360964241
 Rigidbody:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   serializedVersion: 4
   m_Mass: 1
   m_Drag: 0.3
@@ -132,17 +133,17 @@ Rigidbody:
   m_ImplicitCom: 1
   m_ImplicitTensor: 1
   m_UseGravity: 1
-  m_IsKinematic: 0
+  m_IsKinematic: 1
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!114 &499607450978384139
+--- !u!114 &5449085796191868429
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 81288180c711998469ce58b134a7aa18, type: 3}
@@ -151,33 +152,50 @@ MonoBehaviour:
   directionVariable: {fileID: 11400000, guid: e4e9bdd2ae454dc4f8de59b2261b337a, type: 2}
   angleVariable: {fileID: 11400000, guid: 390945e28bef9ed42b6a83711c25732f, type: 2}
   targetTransform: {fileID: 0}
---- !u!114 &8446489467627569825
+--- !u!114 &2848465825052700219
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cd75af7762b9bcb46978ba8c4372c233, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   ballHitEvent: {fileID: 11400000, guid: 90fa28c269919df41acdd37835ee3b9e, type: 2}
+  incrementStrokeCount: {fileID: 11400000, guid: ec7d602226c7a4b4a9aeacaba953fc38,
+    type: 2}
   AngleVariable: {fileID: 11400000, guid: e4e9bdd2ae454dc4f8de59b2261b337a, type: 2}
   PowerVariable: {fileID: 11400000, guid: b5aa4452d8d082d48b46495c7352e39e, type: 2}
   isMovingVariable: {fileID: 11400000, guid: 838a13f5fd312c94398e49cfc36e34ad, type: 2}
   inHoleVariable: {fileID: 11400000, guid: 3b0e06d0a76bceb4296c54d02f0d34a4, type: 2}
   baseForce: 200
---- !u!114 &3181796452143029164
+--- !u!114 &3220627860812539771
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5230806379508671494}
+  m_GameObject: {fileID: 550417892748896529}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 472c31289d980c5498f312ff638077fe, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &3638049900979181177
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 550417892748896529}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3570dca9cf8f40ac9731ef4082c9a4ef, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _tags:
+  - {fileID: 11400000, guid: 1f557d488f8464000b778362139a0045, type: 2}
+  - {fileID: 0}

Assets/Prefabs/UI.prefab

@@ -0,0 +1,397 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &864705718441091586
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7478519019532169470}
+  - component: {fileID: 7589105444495309355}
+  - component: {fileID: 5300136333868868709}
+  - component: {fileID: 8578034693895475379}
+  - component: {fileID: 4024034192225890645}
+  m_Layer: 5
+  m_Name: UI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7478519019532169470
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 864705718441091586}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3084678540669356575}
+  - {fileID: 3746492843800945585}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!223 &7589105444495309355
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 864705718441091586}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &5300136333868868709
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 864705718441091586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &8578034693895475379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 864705718441091586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &4024034192225890645
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 864705718441091586}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09ed0fcb351f94c22bbc762add748e41, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  CourseLayoutObjects:
+  - {fileID: 2515407931999965833}
+  GamePlayObjects:
+  - {fileID: 2170193874541039114}
+  arPlaneManager: {fileID: 0}
+  arPlanePrefab: {fileID: 1585201990951412, guid: a6b7ca1d53c75490595d1f0d5f43be38,
+    type: 3}
+  scoreVariable: {fileID: 11400000, guid: b17566f4d19813249a993793ac86d94c, type: 2}
+  gameLogic: {fileID: 0}
+--- !u!1001 &1297558862873548735
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7478519019532169470}
+    m_Modifications:
+    - target: {fileID: 401978161523643605, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 4024034192225890645}
+    - target: {fileID: 3524450192704275766, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_Name
+      value: CourseLayoutUI
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 800
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 600
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 400
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 300.00003
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5df815d3649b58b4484d2ae582fbf0c3, type: 3}
+--- !u!1 &2515407931999965833 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 3524450192704275766, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+    type: 3}
+  m_PrefabInstance: {fileID: 1297558862873548735}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &3084678540669356575 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 4093525921777245600, guid: 5df815d3649b58b4484d2ae582fbf0c3,
+    type: 3}
+  m_PrefabInstance: {fileID: 1297558862873548735}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8806808859479453287
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7478519019532169470}
+    m_Modifications:
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6845093383438384349, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 4024034192225890645}
+    - target: {fileID: 7216457840435028077, guid: 686b51ff9e7b323448470fac3420b8a3,
+        type: 3}
+      propertyPath: m_Name
+      value: GameUI
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 686b51ff9e7b323448470fac3420b8a3, type: 3}
+--- !u!1 &2170193874541039114 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7216457840435028077, guid: 686b51ff9e7b323448470fac3420b8a3,
+    type: 3}
+  m_PrefabInstance: {fileID: 8806808859479453287}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &3746492843800945585 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 5315978857558658518, guid: 686b51ff9e7b323448470fac3420b8a3,
+    type: 3}
+  m_PrefabInstance: {fileID: 8806808859479453287}
+  m_PrefabAsset: {fileID: 0}

Assets/Prefabs/UI.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3ccc2f7c888da2b4c9997752a4d80cc2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Samples/XR Interaction Toolkit/2.5.2/AR Starter Assets/Prefabs/AR Feathered Plane.prefab

@@ -29,13 +29,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1585201990951412}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.266}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &64925081986755876
 MeshCollider:
@@ -45,9 +45,17 @@ MeshCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1585201990951412}
   m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
   m_IsTrigger: 0
+  m_ProvidesContacts: 0
   m_Enabled: 1
-  serializedVersion: 4
+  serializedVersion: 5
   m_Convex: 0
   m_CookingOptions: 30
   m_Mesh: {fileID: 0}

Assets/Scripts/UIControler.cs

@@ -1,5 +1,3 @@
-using System.Collections;
-using System.Collections.Generic;
 using UnityAtoms.BaseAtoms;
 using UnityEngine;
 using UnityEngine.XR.ARFoundation;
@@ -28,7 +26,6 @@ namespace MAVRIC.GEEKCup
                 obj.SetActive(false);
             }
             setPlaneManagerPrefab(true);
-            scoreVariable.Value = 0;
         }
         
         public void ShowGamePlay()

ProjectSettings/EditorBuildSettings.asset

@@ -14,9 +14,12 @@ EditorBuildSettings:
   - enabled: 0
     path: Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading.unity
     guid: 73904ea13fff84c96a4386ddec7712f2
-  - enabled: 1
+  - enabled: 0
     path: Assets/Samples/MAVRIC.GEEKCup/QRCode/Scenes/QRCodeLoading-Courses.unity
     guid: 6530352416db24017ac352b24d187fbc
+  - enabled: 1
+    path: Assets/Scenes/Loading-Course.unity
+    guid: 60a182c3a97d34a208390639dad50e12
   m_configObjects:
     UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 6ee72d15cf39dd748a13eac57397b9af,
       type: 2}