ihateunityihateunityihateunityihateunityihateunity

ihateunityihateunityihateunityihateunityihateunity ihateunityihateunityihateunityihateunityihateunity ihateunityihateunityihateunityihateunityihateunity ihateunityihateunityihateunityihateunityihateunity ihateunityihateunityihateunityihateunityihateunity ihateunityihateunityihateunityihateunityihateunity ihateunityihateunityihateunityihateunityihateunity
Arcthesia · Aug 6, 2024 · 1ba4729 · 1ba4729
1 parent 04a708f
commit 1ba4729
Show file tree

Hide file tree

Showing 11 changed files with 13,157 additions and 267 deletions.
diff --git a/Assets/Fonts/NotoSans-Regular SDF.asset b/Assets/Fonts/NotoSans-Regular SDF.asset
diff --git a/Assets/Fonts/NotoSansHK-Regular SDF.asset b/Assets/Fonts/NotoSansHK-Regular SDF.asset
diff --git a/Assets/Fonts/NotoSansJP-Regular SDF.asset b/Assets/Fonts/NotoSansJP-Regular SDF.asset
diff --git a/Assets/Fonts/NotoSansKR-Regular SDF.asset b/Assets/Fonts/NotoSansKR-Regular SDF.asset
diff --git a/Assets/Fonts/NotoSansSC-Regular SDF.asset b/Assets/Fonts/NotoSansSC-Regular SDF.asset
diff --git a/Assets/Fonts/NotoSansThai SDF.asset b/Assets/Fonts/NotoSansThai SDF.asset
diff --git a/Assets/Fonts/SourceCodePro-Regular SDF.asset b/Assets/Fonts/SourceCodePro-Regular 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: 9116338
+    - _ToSample: 18909312
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:

diff --git a/Assets/Scripts/Compose/Editing/Dragging.cs b/Assets/Scripts/Compose/Editing/Dragging.cs
@@ -592,6 +592,10 @@ void UpdateNotes(Vector2 pos)
                     {
                         ArcTap arctap = dragArctap[i];
                         arctap.Arc = closestArc;
+                        if (arctap.TimingGroup != closestArc.TimingGroup)
+                        {
+                            arctap.TimingGroup = closestArc.TimingGroup;
+                        }
                     }
                 }
                 else if (mode == PositionArctapMode.Free)
@@ -604,6 +608,10 @@ void UpdateNotes(Vector2 pos)
                     {
                         ArcTap arctap = dragArctap[i];
                         arctap.Arc = freeArc;
+                        if (arctap.TimingGroup != freeArc.TimingGroup)
+                        {
+                            arctap.TimingGroup = freeArc.TimingGroup;
+                        }
                     }
 
                     Services.Gameplay.Chart.UpdateEvents(freeArcEvents);
@@ -619,6 +627,10 @@ void UpdateNotes(Vector2 pos)
                         ArcTap arctap = dragArctap[i];
                         arctap.Arc = freeArc;
                         arctap.Timing = timing;
+                        if (arctap.TimingGroup != freeArc.TimingGroup)
+                        {
+                            arctap.TimingGroup = freeArc.TimingGroup;
+                        }
                     }
 
                     Services.Gameplay.Chart.UpdateEvents(freeArcEvents);

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -8,7 +8,7 @@
     "com.unity.nuget.newtonsoft-json": "3.2.1",
     "com.unity.postprocessing": "3.4.0",
     "com.unity.test-framework": "1.1.33",
-    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.textmeshpro": "3.0.9",
     "com.unity.timeline": "1.6.5",
     "com.unity.toolchain.linux-x86_64": "2.0.4",
     "com.unity.ugui": "1.0.0",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -89,7 +89,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.textmeshpro": {
-      "version": "3.0.6",
+      "version": "3.0.9",
       "depth": 0,
       "source": "registry",
       "dependencies": {