IFD敌人初步

Assets/Scripts/MainGame/Managers/CombatManager/CombatSystems/MusicBeatSystem/Editor/MusicBeatEditorWindow.cs

@@ -712,9 +712,18 @@ namespace Cielonos.MainGame.Editor
             // Mouse up
             if (e.type == EventType.MouseUp)
             {
-                if (currentDragMode == DragMode.MoveBeat && draggingBeatIndex >= 0)
+                if (currentDragMode == DragMode.MoveBeat && draggingBeatIndex >= 0 && draggingBeatIndex < targetData.beatMarkers.Count)
                 {
-                    // Snap if close to grid
+                    var draggedMarker = targetData.beatMarkers[draggingBeatIndex];
+                    targetData.SortBeats(); // Keep sorted after drag
+                    
+                    // Re-select the dragged marker
+                    int newIndex = targetData.beatMarkers.IndexOf(draggedMarker);
+                    selectedBeatIndex = newIndex;
+                    selectedBeatIndices.Clear();
+                    if (newIndex != -1)
+                        selectedBeatIndices.Add(newIndex);
+                    
                     EditorUtility.SetDirty(targetData);
                 }
 
@@ -958,16 +967,39 @@ namespace Cielonos.MainGame.Editor
 
             Undo.RecordObject(targetData, "Snap Beats to Grid");
 
+            // Cache the selected markers before sorting changes their indices
+            List<BeatMarker> selectedMarkers = new List<BeatMarker>();
             foreach (int idx in selectedBeatIndices)
             {
-                if (idx < 0 || idx >= targetData.beatMarkers.Count) continue;
-                var marker = targetData.beatMarkers[idx];
+                if (idx >= 0 && idx < targetData.beatMarkers.Count)
+                {
+                    selectedMarkers.Add(targetData.beatMarkers[idx]);
+                }
+            }
+
+            foreach (var marker in selectedMarkers)
+            {
                 float adjustedTime = marker.time - targetData.audioStartOffset;
                 int nearestBeatNum = Mathf.RoundToInt(adjustedTime / beatInterval);
                 marker.time = targetData.audioStartOffset + nearestBeatNum * beatInterval;
             }
 
+            targetData.SortBeats(); // Keep sorted
             targetData.RecalculateBarIndices();
+
+            // Re-select markers by finding their new indices
+            selectedBeatIndices.Clear();
+            selectedBeatIndex = -1;
+            for (int i = 0; i < targetData.beatMarkers.Count; i++)
+            {
+                if (selectedMarkers.Contains(targetData.beatMarkers[i]))
+                {
+                    selectedBeatIndices.Add(i);
+                    if (selectedBeatIndex == -1)
+                        selectedBeatIndex = i;
+                }
+            }
+
             EditorUtility.SetDirty(targetData);
             isDirty = true;
         }
@@ -1008,6 +1040,7 @@ namespace Cielonos.MainGame.Editor
 
             var marker = new BeatMarker(time, tags);
             targetData.beatMarkers.Add(marker);
+            targetData.SortBeats(); // Keep sorted
 
             // Calculate bar/beat index
             float beatInterval = targetData.BeatInterval;
@@ -1019,7 +1052,8 @@ namespace Cielonos.MainGame.Editor
                 marker.beatInBar = totalBeat % targetData.beatsPerBar;
             }
 
-            int newIndex = targetData.beatMarkers.Count - 1;
+            // Find the new index after sorting
+            int newIndex = targetData.beatMarkers.IndexOf(marker);
             selectedBeatIndex = newIndex;
             selectedBeatIndices.Clear();
             selectedBeatIndices.Add(newIndex);

Assets/Scripts/MainGame/Managers/CombatManager/CombatSystems/MusicBeatSystem/MusicBeatData.asset

@@ -40,133 +40,43 @@ MonoBehaviour:
   audioStartOffset: 0
   totalDuration: 11.676
   beatMarkers:
-  - time: 0
+  - time: 2.5945945
     tags:
-    - Normal
-    barIndex: 0
-    beatInBar: 0
-  - time: 0.6486486
-    tags:
-    - Normal
-    barIndex: 0
-    beatInBar: 2
-  - time: 1.2972972
-    tags:
-    - Normal
-    barIndex: 0
-    beatInBar: 4
-  - time: 1.8041672
-    tags:
-    - Normal
-    barIndex: 0
-    beatInBar: 6
-  - time: 2.2125
-    tags:
-    - Normal
-    barIndex: 0
-    beatInBar: 7
-  - time: 2.6375
-    tags:
-    - Normal
+    - EnemyAttack0
     barIndex: 1
     beatInBar: 0
-  - time: 2.9875
+  - time: 5.189189
     tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 1
-  - time: 3.2432435
-    tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 2
-  - time: 3.4958336
-    tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 3
-  - time: 3.8918922
-    tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 4
-  - time: 4.1625
-    tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 5
-  - time: 4.3125
-    tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 5
-  - time: 4.5405407
-    tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 6
-  - time: 4.7625
-    tags:
-    - Normal
-    barIndex: 1
-    beatInBar: 7
-  - time: 5.0625
-    tags:
-    - Normal
+    - EnemyAttack0
     barIndex: 2
     beatInBar: 0
+  - time: 7.7837834
+    tags:
+    - EnemyAttack0
+    barIndex: 3
+    beatInBar: 0
+  - time: 10.378378
+    tags:
+    - EnemyAttack0
+    barIndex: 4
+    beatInBar: 0
+  - time: 2.5945945
+    tags:
+    - Normal
+    barIndex: 1
+    beatInBar: 0
   - time: 5.189189
     tags:
     - Normal
     barIndex: 2
     beatInBar: 0
-  - time: 5.837837
-    tags:
-    - Normal
-    barIndex: 2
-    beatInBar: 2
-  - time: 6.4864855
-    tags:
-    - Normal
-    barIndex: 2
-    beatInBar: 4
-  - time: 7.1351337
-    tags:
-    - Normal
-    barIndex: 2
-    beatInBar: 6
-  - time: 7.783782
+  - time: 7.7837834
     tags:
     - Normal
     barIndex: 3
     beatInBar: 0
-  - time: 8.432431
-    tags:
-    - Normal
-    barIndex: 3
-    beatInBar: 2
-  - time: 9.08108
-    tags:
-    - Normal
-    barIndex: 3
-    beatInBar: 4
-  - time: 9.72973
-    tags:
-    - Normal
-    barIndex: 3
-    beatInBar: 6
-  - time: 10.378379
+  - time: 10.378378
     tags:
     - Normal
     barIndex: 4
     beatInBar: 0
-  - time: 11.027028
-    tags:
-    - Normal
-    barIndex: 4
-    beatInBar: 2
-  - time: 11.675677
-    tags:
-    - Normal
-    barIndex: 4
-    beatInBar: 4

Assets/Scripts/MainGame/Managers/CombatManager/CombatSystems/MusicBeatSystem/MusicBeatSystem.cs

@@ -195,6 +195,9 @@ namespace Cielonos.MainGame
                 Deactivate();
             }
 
+            // Ensure beat markers are sorted before starting tracking
+            beatData.SortBeats();
+
             CurrentBeatData = beatData;
             CurrentBPM = beatData.bpm;
             CurrentSongTime = 0f;