All: Fix various bugs

Arcthesia · Aug 7, 2024 · 53a25a6 · 53a25a6
1 parent 92ba067
commit 53a25a6
Show file tree

Hide file tree

Showing 9 changed files with 155 additions and 13 deletions.
diff --git a/Assets/Fonts/NotoSans-Light SDF.asset b/Assets/Fonts/NotoSans-Light SDF.asset
diff --git a/Assets/Materials/Compose/Waveform.mat b/Assets/Materials/Compose/Waveform.mat
@@ -74,7 +74,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
-    - _ToSample: 18909312
+    - _ToSample: 24155812
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:

diff --git a/Assets/Scripts/Compose/EventsEditor/Group/GroupTable.cs b/Assets/Scripts/Compose/EventsEditor/Group/GroupTable.cs
@@ -117,12 +117,18 @@ private void OnRemoveButton()
 
             int index = IndexOf(Selected);
             int num = Selected.GroupNumber;
-            ICommand cmd = new RemoveTimingGroupCommand(I18n.S(
+
+            List<ArcEvent> scCamEvents = new List<ArcEvent>();
+            scCamEvents.AddRange(Services.Gameplay.Chart.GetAll<CameraEvent>().Where(c => c.TimingGroup == num));
+            scCamEvents.AddRange(Services.Gameplay.Chart.GetAll<ScenecontrolEvent>().Where(s => s.TimingGroup == num));
+            ICommand tgCmd = new RemoveTimingGroupCommand("", Selected);
+            ICommand evCmd = new EventCommand("", remove: scCamEvents);
+            ICommand combination = new CombinedCommand(I18n.S(
                 "Compose.Notify.GroupTable.RemoveGroup", new Dictionary<string, object>
                 {
                     { "Number", num },
-                }), Selected);
-            Services.History.AddCommand(cmd);
+                }), tgCmd, evCmd);
+            Services.History.AddCommand(combination);
 
             // Trigger OnEdittingTimingGroup
             Values.EditingTimingGroup.Value = Mathf.Min(Selected.GroupNumber, Services.Gameplay.Chart.TimingGroups.Count - 1);

diff --git a/Assets/Scripts/Gameplay/Camera/CameraService.cs b/Assets/Scripts/Gameplay/Camera/CameraService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ArcCreate.Gameplay.Chart;
 using ArcCreate.Gameplay.Data;
 using ArcCreate.Utility.Extension;
 using UnityEngine;
@@ -107,6 +108,36 @@ public void Remove(IEnumerable<CameraEvent> events)
             RebuildList();
         }
 
+        public void RemoveTimingGroup(TimingGroup group)
+        {
+            events.RemoveAll(e => e.TimingGroup == group.GroupNumber);
+
+            foreach (var cam in events)
+            {
+                if (cam.TimingGroup > group.GroupNumber)
+                {
+                    cam.TimingGroup -= 1;
+                    cam.ResetTimingGroupChangedFrom();
+                }
+            }
+
+            RebuildList();
+        }
+
+        public void InsertTimingGroup(TimingGroup group)
+        {
+            foreach (var cam in events)
+            {
+                if (cam.TimingGroup >= group.GroupNumber)
+                {
+                    cam.TimingGroup += 1;
+                    cam.ResetTimingGroupChangedFrom();
+                }
+            }
+
+            RebuildList();
+        }
+
         public IEnumerable<CameraEvent> FindByTiming(int from, int to)
         {
             for (int i = 0; i < events.Count; i++)

diff --git a/Assets/Scripts/Gameplay/Camera/ICameraService.cs b/Assets/Scripts/Gameplay/Camera/ICameraService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ArcCreate.Gameplay.Chart;
 using ArcCreate.Gameplay.Data;
 using UnityEngine;
 
@@ -67,6 +68,10 @@ public interface ICameraService : ICameraControl
         /// <param name="events">The events collection.</param>
         void Change(IEnumerable<CameraEvent> events);
 
+        void RemoveTimingGroup(TimingGroup group);
+
+        void InsertTimingGroup(TimingGroup group);
+
         /// <summary>
         /// Clear all events.
         /// </summary>

diff --git a/Assets/Scripts/Gameplay/Chart/ChartService.cs b/Assets/Scripts/Gameplay/Chart/ChartService.cs
@@ -425,6 +425,8 @@ public TimingGroup GetTimingGroup(int tg)
 
         public void RemoveTimingGroup(TimingGroup group)
         {
+            Services.Camera.RemoveTimingGroup(group);
+            Services.Scenecontrol.RemoveTimingGroup(group);
             for (int i = 0; i < timingGroups.Count; i++)
             {
                 if (timingGroups[i] == group)
@@ -443,6 +445,9 @@ public void RemoveTimingGroup(TimingGroup group)
 
         public void InsertTimingGroup(TimingGroup group)
         {
+            Services.Camera.InsertTimingGroup(group);
+            Services.Scenecontrol.InsertTimingGroup(group);
+
             if (string.IsNullOrEmpty(group.GroupProperties.FileName))
             {
                 group.GroupProperties.FileName = timingGroups[0].GroupProperties.FileName;

diff --git a/Assets/Scripts/Gameplay/Scenecontrol/IScenecontrolService.cs b/Assets/Scripts/Gameplay/Scenecontrol/IScenecontrolService.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ArcCreate.Gameplay.Chart;
 using ArcCreate.Gameplay.Data;
 using TMPro;
 
@@ -57,6 +58,10 @@ public interface IScenecontrolService : IScenecontrolControl
         /// <param name="events">The events collection.</param>
         void Change(IEnumerable<ScenecontrolEvent> events);
 
+        void RemoveTimingGroup(TimingGroup group);
+
+        void InsertTimingGroup(TimingGroup group);
+
         /// <summary>
         /// Clear all events.
         /// </summary>

diff --git a/Assets/Scripts/Gameplay/Scenecontrol/ScenecontrolService.cs b/Assets/Scripts/Gameplay/Scenecontrol/ScenecontrolService.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using ArcCreate.ChartFormat;
+using ArcCreate.Gameplay.Chart;
 using ArcCreate.Gameplay.Data;
 using ArcCreate.Utility.Extension;
 using Cysharp.Threading.Tasks;
@@ -76,6 +77,36 @@ public void Remove(IEnumerable<ScenecontrolEvent> events)
             RebuildList();
         }
 
+        public void RemoveTimingGroup(TimingGroup group)
+        {
+            events.RemoveAll(e => e.TimingGroup == group.GroupNumber);
+
+            foreach (var sc in events)
+            {
+                if (sc.TimingGroup > group.GroupNumber)
+                {
+                    sc.TimingGroup -= 1;
+                    sc.ResetTimingGroupChangedFrom();
+                }
+            }
+
+            RebuildList();
+        }
+
+        public void InsertTimingGroup(TimingGroup group)
+        {
+            foreach (var sc in events)
+            {
+                if (sc.TimingGroup >= group.GroupNumber)
+                {
+                    sc.TimingGroup += 1;
+                    sc.ResetTimingGroupChangedFrom();
+                }
+            }
+
+            RebuildList();
+        }
+
         public IEnumerable<ScenecontrolEvent> FindByTiming(int from, int to)
         {
             int i = events.BisectLeft(from, n => n.Timing);

diff --git a/Assets/Scripts/Storage/StorageData.cs b/Assets/Scripts/Storage/StorageData.cs
@@ -424,6 +424,11 @@ public PackStorage GetLastSelectedPack()
 
         public CharacterStorage GetSelectedCharacter()
         {
+            if (CharacterCollection.Count() == 1)
+            {
+                return CharacterCollection.FindAll().First();
+            }
+
             string id = PlayerPrefs.GetString("Selection.LastCharacter", null);
             if (id == null)
             {