AttachedPoint from AttachedTiming instead

Assets/Misc/ChangeLog.txt

@@ -5,6 +5,7 @@
 - 修复编辑数值时， 可能会触发滚动相关的快捷键的问题
 - 修复正在播放时难以向后滚动的问题
 - 修复 Arc 坐标网格线被地面 Note 覆盖的问题
+- 修复滚动时， 时间和网格线之间可能出现 1 毫秒误差的问题
 
 ---
 

Assets/Scripts/Compose/Editing/Cursor/AdeCursorManager.cs

@@ -190,7 +190,10 @@ public Vector3 AttachedTrackPoint
 				}
 				else
 				{
-					z = AdeGridManager.Instance.AttachBeatline(trackHit.point.z);
+					z = ArcTimingManager.Instance.CalculatePositionByTiming(
+						AttachedTiming + ArcAudioManager.Instance.AudioOffset,
+						AdeTimingEditor.Instance.currentTimingGroup
+					) / -1000f;
 				}
 				return new Vector3(trackHit.point.x, trackHit.point.y, z);
 			}
@@ -221,9 +224,7 @@ public int AttachedTiming
 				{
 					return overriddenCursorTiming.Value;
 				}
-				Vector3 pos = AttachedTrackPoint;
-				var timingGroup = AdeTimingEditor.Instance.currentTimingGroup;
-				return ArcTimingManager.Instance.CalculateTimingByPosition(-pos.z * 1000, timingGroup) - ArcAudioManager.Instance.AudioOffset;
+				return AdeGridManager.Instance.AttachBeatlineTimingFromFos(trackHit.point.z);
 			}
 		}
 
@@ -272,7 +273,10 @@ private void UpdateTrackCursor()
 				}
 				else
 				{
-					z = AdeGridManager.Instance.AttachBeatline(trackHit.point.z);
+					z = ArcTimingManager.Instance.CalculatePositionByTiming(
+						AttachedTiming + ArcAudioManager.Instance.AudioOffset,
+						AdeTimingEditor.Instance.currentTimingGroup
+					) / -1000f;;
 				}
 				if (TrackEnabled)
 				{

Assets/Scripts/Compose/Editing/Cursor/AdeGridManager.cs

@@ -53,7 +53,12 @@ public string PreferencesSavePath
 		private List<float> verticalXPositions = new List<float>();
 		private List<float> verticalYPositions = new List<float>();
 
-		private List<LineRenderer> beatlineInstances = new List<LineRenderer>();
+		private struct RenderingBeatlineInfo{
+			public LineRenderer renderer;
+			public int timing;
+		};
+
+		private List<RenderingBeatlineInfo> beatlineInstances = new List<RenderingBeatlineInfo>();
 		private List<LineRenderer> verticalInstances = new List<LineRenderer>();
 
 		private CustomGrid customGrid;
@@ -125,7 +130,7 @@ private void HideExceededBeatlineInstance()
 			int count = beatlineInstances.Count;
 			while (count > beatlineInUse)
 			{
-				beatlineInstances[count - 1].enabled = false;
+				beatlineInstances[count - 1].renderer.enabled = false;
 				count--;
 			}
 		}
@@ -139,13 +144,16 @@ private void HideExceededVerticalInstance()
 			}
 		}
 
-		private LineRenderer GetBeatlineInstance()
+		private LineRenderer GetBeatlineInstance(int timing)
 		{
 			while (beatlineInstances.Count < beatlineInUse + 1)
 			{
-				beatlineInstances.Add(Instantiate(BeatlinePrefab, transform).GetComponent<LineRenderer>());
+				beatlineInstances.Add(new RenderingBeatlineInfo{
+					renderer=Instantiate(BeatlinePrefab, transform).GetComponent<LineRenderer>(),
+					timing=timing,
+				});
 			}
-			return beatlineInstances[beatlineInUse++];
+			return beatlineInstances[beatlineInUse++].renderer;
 		}
 		private LineRenderer GetVerticalInstance()
 		{
@@ -408,7 +416,7 @@ private void UpdateBeatline()
 						continue;
 					}
 					float z = pos / 1000f;
-					LineRenderer l = GetBeatlineInstance();
+					LineRenderer l = GetBeatlineInstance(t.Timing);
 					l.enabled = true;
 					l.DrawLine(new Vector3(-xEdgePos, -z), new Vector3(xEdgePos, -z));
 					l.endColor = l.startColor = BeatlineColors[t.Importance];
@@ -442,24 +450,27 @@ private void UpdateVertical()
 			HideExceededVerticalInstance();
 		}
 
-		public float AttachBeatline(float z)
+		public int AttachBeatlineTimingFromFos(float z)
 		{
-			if (!EnableBeatline) return z;
-			if (beatlineInUse == 0) return z;
+			var timingGroup = AdeTimingEditor.Instance.currentTimingGroup;
+			int defaultTiming=ArcTimingManager.Instance.CalculateTimingByPosition(-z * 1000, timingGroup) - ArcAudioManager.Instance.AudioOffset;
+			if (!EnableBeatline) return defaultTiming;
+			if (beatlineInUse == 0) return defaultTiming;
 			List<float> deltas = new List<float>();
 			for (int i = 0; i < beatlineInUse; ++i)
 			{
-				float lz = beatlineInstances[i].GetPosition(0).y;
+				float lz = beatlineInstances[i].renderer.GetPosition(0).y;
 				deltas.Add(Mathf.Abs(lz - z));
 			}
 			int index = deltas.IndexOf(deltas.Min());
 			if (index < 0)
 			{
-				return z;
+				return defaultTiming;
 			}
-			float tz = beatlineInstances[index].GetPosition(0).y;
-			if (Mathf.Abs(tz - z) < 5f) return tz;
-			return z;
+			float tz = beatlineInstances[index].renderer.GetPosition(0).y;
+			int t = beatlineInstances[index].timing;
+			if (Mathf.Abs(tz - z) < 5f) return t;
+			return defaultTiming;
 		}
 		public float AttachVerticalX(float x)
 		{