Gameplay: Change scenecontorl services update order

Arcthesia · Jul 27, 2024 · 0871d9a · 0871d9a
1 parent 938ba93
commit 0871d9a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/Assets/Scripts/Gameplay/Chart/NoteGroup/NoteGroup.cs b/Assets/Scripts/Gameplay/Chart/NoteGroup/NoteGroup.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using ArcCreate.Gameplay.Data;
-using UnityEngine;
 
 namespace ArcCreate.Gameplay.Chart
 {

diff --git a/Assets/Scripts/Gameplay/GameplayManager.cs b/Assets/Scripts/Gameplay/GameplayManager.cs
@@ -143,12 +143,15 @@ private void Update()
 
             Services.Chart.UpdateChartJudgement(currentTiming);
             Services.Judgement.ProcessInput(currentTiming);
-            Services.Chart.UpdateChartRender(currentTiming);
-            Services.Score.UpdateDisplay(currentTiming);
-            Services.Camera.UpdateCamera(currentTiming);
+
+            Services.Score.UpdateScore(currentTiming);
             Services.Scenecontrol.UpdateScenecontrol(currentTiming);
+            Services.Camera.UpdateCamera(currentTiming);
+            Services.Chart.UpdateChartRender(currentTiming);
+            Services.Score.UpdateDisplay();
             Services.Hitsound.UpdateHitsoundHistory(currentTiming);
             Services.Render.UpdateRenderers();
+
             gameplayData.NotifyUpdate(currentTiming);
         }
     }

diff --git a/Assets/Scripts/Gameplay/Score/IScoreService.cs b/Assets/Scripts/Gameplay/Score/IScoreService.cs
@@ -40,8 +40,13 @@ public interface IScoreService
         /// <summary>
         /// Update the score display.
         /// </summary>
+        void UpdateDisplay();
+
+        /// <summary>
+        /// Update the score calculation.
+        /// </summary>
         /// <param name="currentTiming">The current chart timing.</param>
-        void UpdateDisplay(int currentTiming);
+        void UpdateScore(int currentTiming);
 
         PlayResult GetPlayResult();
     }

diff --git a/Assets/Scripts/Gameplay/Score/ScoreService.cs b/Assets/Scripts/Gameplay/Score/ScoreService.cs
@@ -121,7 +121,7 @@ public void ProcessJudgement(JudgementResult result, Option<int> offset)
             }
         }
 
-        public void UpdateDisplay(int currentTiming)
+        public void UpdateScore(int currentTiming)
         {
             comboRedmix = comboRedmix - (Time.deltaTime / Values.ComboLostFlashDuration);
             comboRedmix = Mathf.Max(comboRedmix, 0);
@@ -152,6 +152,10 @@ public void UpdateDisplay(int currentTiming)
                 }
             }
 
+        }
+
+        public void UpdateDisplay()
+        {
             SetScore(CurrentScoreTotal, CurrentCountTotal);
         }