Merge branch 'master' into develop

paralleltree · May 8, 2021 · 07d095e · 07d095e
2 parents bdb012e + 6cf34c2
commit 07d095e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/Ched/Components/Exporter/SusExporter.cs b/Ched/Components/Exporter/SusExporter.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
+using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
@@ -44,7 +45,7 @@ public void Export(Stream stream)
                 writer.WriteLine("#PLAYLEVEL {0}", args.PlayLevel);
                 writer.WriteLine("#SONGID \"{0}\"", args.SongId);
                 writer.WriteLine("#WAVE \"{0}\"", args.SoundFileName);
-                writer.WriteLine("#WAVEOFFSET {0}", args.SoundOffset);
+                writer.WriteLine("#WAVEOFFSET {0}", args.SoundOffset.ToString(CultureInfo.InvariantCulture));
                 writer.WriteLine("#JACKET \"{0}\"", args.JacketFilePath);
                 writer.WriteLine();
 
@@ -71,7 +72,7 @@ public void Export(Stream stream)
                 var bpmIdentifiers = EnumerateIdentifiers(2, NumChars.Concat(AlphaChars)).Skip(1).Take(bpmlist.Count).ToList();
                 foreach (var item in bpmlist.GroupBy(p => p.Index).Select(p => p.First()))
                 {
-                    writer.WriteLine("#BPM{0}: {1}", bpmIdentifiers[item.Index], item.Value.Bpm);
+                    writer.WriteLine("#BPM{0}: {1}", bpmIdentifiers[item.Index], item.Value.Bpm.ToString(CultureInfo.InvariantCulture));
                 }
 
                 // 小節オフセット追加用に初期BPM定義だけ1行に分離
@@ -88,7 +89,7 @@ public void Export(Stream stream)
                 var speeds = book.Score.Events.HighSpeedChangeEvents.Select(p =>
                 {
                     var barPos = BarIndexCalculator.GetBarPositionFromTick(p.Tick);
-                    return string.Format("{0}'{1}:{2}", barPos.BarIndex + (p.Tick == 0 ? 0 : BarIndexOffset), barPos.TickOffset, p.SpeedRatio);
+                    return string.Format("{0}'{1}:{2}", barPos.BarIndex + (p.Tick == 0 ? 0 : BarIndexOffset), barPos.TickOffset, p.SpeedRatio.ToString(CultureInfo.InvariantCulture));
                 });
                 writer.WriteLine("#TIL00: \"{0}\"", string.Join(", ", speeds));
                 writer.WriteLine("#HISPEED 00");

diff --git a/Ched/Properties/AssemblyInfo.cs b/Ched/Properties/AssemblyInfo.cs
@@ -12,6 +12,6 @@
 [assembly: ComVisible(false)]
 [assembly: Guid("4c0c9f98-6fcf-4d2f-b821-37a66362dc75")]
 
-[assembly: AssemblyVersion("3.0.1.0")]
+[assembly: AssemblyVersion("3.1.0.0")]
 
 [assembly: DisableDpiAwareness]
diff --git a/Ched/UI/NoteView.cs b/Ched/UI/NoteView.cs
@@ -1886,7 +1886,7 @@ private RectangleF GetRectFromNotePosition(int tick, int laneIndex, int width)
 
         private RectangleF GetClickableRectFromNotePosition(int tick, int laneIndex, int width)
         {
-            return GetRectFromNotePosition(tick, laneIndex, width).Expand(1);
+            return GetRectFromNotePosition(tick, laneIndex, width).Expand(1, 3);
         }
 
         private Rectangle GetSelectionRect()

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 ## ダウンロード
 
-現在の最新版は[v3.0.1](https://github.com/paralleltree/Ched/releases)です。
+現在の最新版は[v3.1.0](https://github.com/paralleltree/Ched/releases)です。
 
 ## 使い方