GridOffset fix, ticker fix

rolopogo · Mar 27, 2019 · c4b91ec · c4b91ec
1 parent d3ce43d
commit c4b91ec
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 35 deletions.
diff --git a/Assets/Notes/GridTarget.prefab b/Assets/Notes/GridTarget.prefab
@@ -53,7 +53,6 @@ GameObject:
   - component: {fileID: 4746374391955190}
   - component: {fileID: 33663386006755960}
   - component: {fileID: 23574994524882688}
-  - component: {fileID: 64287941230110340}
   m_Layer: 9
   m_Name: Ring
   m_TagString: Untagged
@@ -299,7 +298,6 @@ GameObject:
   - component: {fileID: 4592684084126396}
   - component: {fileID: 33866045317062106}
   - component: {fileID: 23153855559817112}
-  - component: {fileID: 64290020295737240}
   m_Layer: 9
   m_Name: Note
   m_TagString: Untagged
@@ -1314,34 +1312,6 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
---- !u!64 &64287941230110340
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1183282628611726}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
---- !u!64 &64290020295737240
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1801917343009394}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 3
-  m_Convex: 0
-  m_CookingOptions: 14
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!114 &114558858861377176
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
@@ -1106,7 +1106,7 @@ GameObject:
   - component: {fileID: 176916393}
   - component: {fileID: 176916392}
   m_Layer: 0
-  m_Name: Cube
+  m_Name: Ticker
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

diff --git a/Assets/Target.cs b/Assets/Target.cs
@@ -29,7 +29,7 @@ public Cue ToCue(int offset)
             var y = Mathf.RoundToInt(gridTarget.transform.position.y + 3);
             pitch = x + 12 * y;
             offsetX = gridTarget.transform.position.x + 5.5f - x;
-            offsetY = gridTarget.transform.position.y + 4 - y;
+            offsetY = gridTarget.transform.position.y + 3 - y;
         }
         Cue cue = new Cue()
         {

diff --git a/Assets/Ticker.cs b/Assets/Ticker.cs
@@ -15,13 +15,10 @@ private void Start()
 
     private void OnTriggerEnter(Collider other)
     {
-        Debug.Log("ping");
         if (layermask == (layermask | (1 << other.gameObject.layer)))
         {
-            Debug.Log(other.transform.position.z);
             if (other.transform.position.z > -1)
             { 
-                Debug.Log("pong");
                 aud.time = 0;
                 aud.Play();
             }