diff --git a/Qwilight/Assets/UI/@Default/@Default.yaml b/Qwilight/Assets/UI/@Default/@Default.yaml
index fe1dc71..fe8672a 100644
--- a/Qwilight/Assets/UI/@Default/@Default.yaml
+++ b/Qwilight/Assets/UI/@Default/@Default.yaml
@@ -152,21 +152,21 @@
lowestJudgmentConditionMode: AutoModePosition0(0), AutoModePosition1(12), 24, 24, 1, 1, 0
file: 12, FilePosition1(0), 72, 24, 0, 1, 0
- fileContents: 162, FilePosition1(0), CommentViewLength(-150), 24, 0, 1, 12.0
- fileViewer: 94, FilePosition1(0), 24, 24, 0, 1, 0
- assistFileViewer: 128, FilePosition1(0), 24, 24, 0, 1, 0
+ fileContents: 147, FilePosition1(0), CommentViewLength(-135), 24, 0, 1, 12.0
+ fileViewer: 89, FilePosition1(0), 24, 24, 0, 1, 0
+ assistFileViewer: 118, FilePosition1(0), 24, 24, 0, 1, 0
judgmentStage: 12, FilePosition1(1), 72, 24, 0, 1, 0
- judgmentStageContents: 94, FilePosition1(1), CommentViewLength(-82), 24, 0, 1, 12.0
+ judgmentStageContents: 89, FilePosition1(1), CommentViewLength(-77), 24, 0, 1, 12.0
totalNotes: 12, FilePosition1(2), 72, 24, 0, 1, 0
- totalNotesContents: 94, FilePosition1(2), CommentViewLength(-82), 24, 0, 1, 12.0
+ totalNotesContents: 89, FilePosition1(2), CommentViewLength(-77), 24, 0, 1, 12.0
highestInputCount: 12, FilePosition1(3), 72, 24, 0, 1, 0
- highestInputCountContents: 94, FilePosition1(3), CommentViewLength(-82), 24, 0, 1, 12.0
+ highestInputCountContents: 89, FilePosition1(3), CommentViewLength(-77), 24, 0, 1, 12.0
length: 12, FilePosition1(4), 72, 24, 0, 1, 0
- lengthContents: 94, FilePosition1(4), CommentViewLength(-82), 24, 0, 1, 12.0
+ lengthContents: 89, FilePosition1(4), CommentViewLength(-77), 24, 0, 1, 12.0
bpm: 12, FilePosition1(5), 72, 24, 0, 1, 0
- bpmContents: 94, FilePosition1(5), CommentViewLength(-82), 24, 0, 1, 12.0
+ bpmContents: 89, FilePosition1(5), CommentViewLength(-77), 24, 0, 1, 12.0
inputMode: 12, FilePosition1(6), 72, 24, 0, 1, 0
- inputModeContents: 94, FilePosition1(6), CommentViewLength(-82), 24, 0, 1, 0
+ inputModeContents: 89, FilePosition1(6), CommentViewLength(-77), 24, 0, 1, 0
# 선곡의 전체 화면 백그라운드 애니메이션
paintProperty0: 0, 0, DefaultLength(), DefaultHeight(), 1, 0, 0, PaintProperty0Variety(), PaintProperty0Etc(), 0
@@ -275,7 +275,7 @@
bpmQuit: LengthQuitPosition0(0), LengthQuitPosition1(1), 48, 12
bpmContentsQuit: LengthQuitPosition0(53), LengthQuitPosition1(1), JudgmentStageQuitLength(), 12, 9.0, 1, 2
inputModeQuit: LengthQuitPosition0(0), LengthQuitPosition1(2), 48, 12
- inputModeContentsQuit: LengthQuitPosition0(53), LengthQuitPosition1(2), 48, 12, 9.0, 1, 2
+ inputModeContentsQuit: LengthQuitPosition0(53), LengthQuitPosition1(2), 24, 12, 9.0, 1, 2
autoModeQuit: 5, AutoModeQuitPosition1(0), 24, 24
noteSaltModeQuit: 39, AutoModeQuitPosition1(0), 24, 24
diff --git a/Qwilight/Assets/UI/@Default/@Default.zip b/Qwilight/Assets/UI/@Default/@Default.zip
index 3151f2a..f46ac13 100644
--- a/Qwilight/Assets/UI/@Default/@Default.zip
+++ b/Qwilight/Assets/UI/@Default/@Default.zip
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:19f770b07a0f5fa980e818301077ed6db81d9d02c88514384fbb1e7b74698029
-size 70959138
+oid sha256:92a55676c953791a5eb6daf1df83225f304ea6f2fd6f8e4e8203612dd66b577e
+size 70958341
diff --git a/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs b/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs
index c86f505..47c7a24 100644
--- a/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs
+++ b/Qwilight/Qwilight/System/DrawingSystem/DrawingSystem.cs
@@ -1051,7 +1051,7 @@
var netPosition1 = drawingComponentValue.netPosition1;
var altNet = drawingComponentValue.altNet;
var netTextPaint = UI.Instance.NetTextPaints[netItemFaintInt];
- var netPaint = UI.Instance.NetWallPaints[netItemFaintInt];
+ var netWallPaint = UI.Instance.NetWallPaints[netItemFaintInt];
for (var i = quitNetPosition; i >= levyingNetPosition; --i)
{
foreach (var netItem in netItems)
@@ -1133,7 +1133,7 @@
}
r.Set(r.Position0 + Levels.StandardEdgeFloat32, r.Position1 + Levels.StandardEdgeFloat32, r.Length - 2 * Levels.StandardEdgeFloat32, r.Height - 2 * Levels.StandardEdgeFloat32);
- targetSession.FillRectangle(r, netPaint);
+ targetSession.FillRectangle(r, netWallPaint);
r.Position0 += highestNetHeight;
r.Length = (highestNetLength - 2 * highestNetHeight) * netItemValue;
diff --git a/Qwilight/Qwilight/System/UI/UI.cs b/Qwilight/Qwilight/System/UI/UI.cs
index 8b75fd4..507f539 100644
--- a/Qwilight/Qwilight/System/UI/UI.cs
+++ b/Qwilight/Qwilight/System/UI/UI.cs
@@ -410,8 +410,8 @@
ArtistColor = Utility.GetText(paintNode, "artist", nameof(Colors.White)).GetColor();
GenreColor = Utility.GetText(paintNode, "genre", nameof(Colors.White)).GetColor();
WantLevelIDColor = Utility.GetText(paintNode, "wantLevelID", nameof(Colors.White)).GetColor();
- DrawingSystem.Instance.SetFaintPaints(this, NetTextPaints, Utility.GetText(paintNode, "netText", nameof(Colors.White)).GetColor());
- DrawingSystem.Instance.SetFaintPaints(this, NetWallPaints, Utility.GetText(paintNode, "netWall", nameof(Colors.Black)).GetColor());
+ parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetTextPaints, Utility.GetText(paintNode, "netText", nameof(Colors.White)).GetColor()));
+ parallelItems.Add(() => DrawingSystem.Instance.SetFaintPaints(this, NetWallPaints, Utility.GetText(paintNode, "netWall", nameof(Colors.Black)).GetColor()));
SaveValueMap(pointNode, "mainPosition");
SaveValueMap(pointNode, "p2Position");
diff --git a/Qwilight/Qwilight/Utilities/Utility.cs b/Qwilight/Qwilight/Utilities/Utility.cs
index a9f5c99..1322d73 100644
--- a/Qwilight/Qwilight/Utilities/Utility.cs
+++ b/Qwilight/Qwilight/Utilities/Utility.cs
@@ -483,7 +483,7 @@
}
}
- public static string GetHighestInputCountText(double averageInputCount, int highestInputCount, double audioMultiplier) => $"{(audioMultiplier * averageInputCount).ToString("#,##0.## / s")} (PEAK: {(audioMultiplier * highestInputCount).ToString("#,##0.## / s")})";
+ public static string GetHighestInputCountText(double averageInputCount, int highestInputCount, double audioMultiplier) => $"{(audioMultiplier * averageInputCount).ToString("#,##0.## / s")} (PEAK: {(audioMultiplier * highestInputCount).ToString("#,##0 / s")})";
public static string GetGenreText(string genre) => string.IsNullOrEmpty(genre) || genre.StartsWith('#') ? genre : $"#{genre}";
diff --git a/Qwilight/Qwilight/View/MainWindow/Layer0View.xaml.cs b/Qwilight/Qwilight/View/MainWindow/Layer0View.xaml.cs
index 46fd57c..28003e6 100644
--- a/Qwilight/Qwilight/View/MainWindow/Layer0View.xaml.cs
+++ b/Qwilight/Qwilight/View/MainWindow/Layer0View.xaml.cs
@@ -160,7 +160,7 @@
targetSession.DrawLine(Paints.Pen4, p1, p2);
}
- var inputCountText = PoolSystem.Instance.GetValueText(inputCount, "NPS: 0/s");
+ var inputCountText = PoolSystem.Instance.GetValueText(inputCount, "NPS: #,##0 / s");
var defaultTextItem = PoolSystem.Instance.GetDefaultTextItem(inputCountText, Levels.FontLevel0, Paints.Paint4);
var defaultTextVisibleItem = PoolSystem.Instance.GetDefaultTextItem(inputCountText, Levels.FontLevel0, Paints.Paint0);
r.SetPosition(Levels.StandardMargin + inputNoteCountViewPosition0, Levels.StandardMargin + inputNoteCountViewPosition1);
@@ -168,7 +168,7 @@
var length = (int)(autoComputer.Length / 1000.0);
var wait = Math.Clamp((int)(autoComputer.LoopingCounter / 1000.0), 0, length);
- inputCountText = PoolSystem.Instance.GetFormattedText("{0}:{1}/{2}:{3}",
+ inputCountText = PoolSystem.Instance.GetFormattedText("{0}:{1} / {2}:{3}",
PoolSystem.Instance.GetValueText(wait / 60, string.Empty),
PoolSystem.Instance.GetValueText(wait % 60, "00"),
PoolSystem.Instance.GetValueText(length / 60, string.Empty),
diff --git a/Qwilight/Qwilight/View/SignUpWindow.xaml b/Qwilight/Qwilight/View/SignUpWindow.xaml
index 14af4ad..24d16b5 100644
--- a/Qwilight/Qwilight/View/SignUpWindow.xaml
+++ b/Qwilight/Qwilight/View/SignUpWindow.xaml
@@ -12,12 +12,18 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Qwilight/Qwilight/View/SignUpWindow.xaml.cs b/Qwilight/Qwilight/View/SignUpWindow.xaml.cs
index 1f40984..fdb8e3b 100644
--- a/Qwilight/Qwilight/View/SignUpWindow.xaml.cs
+++ b/Qwilight/Qwilight/View/SignUpWindow.xaml.cs
@@ -1,5 +1,6 @@
using CommunityToolkit.Mvvm.Messaging;
-using Qwilight.UIComponent;
+using Qwilight.ViewModel;
+using System.Windows.Input;
namespace Qwilight.View
{
@@ -24,5 +25,7 @@
break;
}
}
+
+ void OnInputLower(object sender, KeyEventArgs e) => (DataContext as SignUpViewModel).OnInputLower(e);
}
}
\ No newline at end of file
diff --git a/Qwilight/Qwilight/ViewModel/ConfigureViewModel.cs b/Qwilight/Qwilight/ViewModel/ConfigureViewModel.cs
index 788280e..884ccbb 100644
--- a/Qwilight/Qwilight/ViewModel/ConfigureViewModel.cs
+++ b/Qwilight/Qwilight/ViewModel/ConfigureViewModel.cs
@@ -51,6 +51,8 @@
bool _defaultNetCommentFollow;
double _faint = 1.0;
+ public override double TargetLength => 0.9;
+
public double Faint
{
get => _faint;
diff --git a/Qwilight/Qwilight/ViewModel/InputTextViewModel.cs b/Qwilight/Qwilight/ViewModel/InputTextViewModel.cs
index d4d8ced..c798b90 100644
--- a/Qwilight/Qwilight/ViewModel/InputTextViewModel.cs
+++ b/Qwilight/Qwilight/ViewModel/InputTextViewModel.cs
@@ -24,7 +24,7 @@
public override double TargetLength => 0.5;
- public override double TargetHeight => 0.15;
+ public override double TargetHeight => 0.1;
public Action HandleOK { get; set; }
diff --git a/Qwilight/Qwilight/ViewModel/SignInViewModel.cs b/Qwilight/Qwilight/ViewModel/SignInViewModel.cs
index 2deba62..ecdbda7 100644
--- a/Qwilight/Qwilight/ViewModel/SignInViewModel.cs
+++ b/Qwilight/Qwilight/ViewModel/SignInViewModel.cs
@@ -9,7 +9,7 @@
{
public override double TargetLength => 0.2;
- public override double TargetHeight => 0.2;
+ public override double TargetHeight => 0.25;
public override HorizontalAlignment TargetLengthSystem => HorizontalAlignment.Center;
diff --git a/Qwilight/Qwilight/ViewModel/SignUpViewModel.cs b/Qwilight/Qwilight/ViewModel/SignUpViewModel.cs
index f554210..4611db2 100644
--- a/Qwilight/Qwilight/ViewModel/SignUpViewModel.cs
+++ b/Qwilight/Qwilight/ViewModel/SignUpViewModel.cs
@@ -3,6 +3,7 @@
using Qwilight.Utilities;
using System.Text.RegularExpressions;
using System.Windows;
+using System.Windows.Input;
namespace Qwilight.ViewModel
{
@@ -10,7 +11,7 @@
{
public override double TargetLength => 0.2;
- public override double TargetHeight => 0.45;
+ public override double TargetHeight => 0.35;
public override HorizontalAlignment TargetLengthSystem => HorizontalAlignment.Center;
@@ -34,6 +35,14 @@
Fax = string.Empty;
}
+ public void OnInputLower(KeyEventArgs e)
+ {
+ if (e.Key == Key.Enter)
+ {
+ OnSignUp();
+ }
+ }
+
[RelayCommand]
void OnSignUp() => WeakReferenceMessenger.Default.Send(new()
{
diff --git a/Qwilight/Qwilight/ViewModel/WantViewModel.cs b/Qwilight/Qwilight/ViewModel/WantViewModel.cs
index 193bf04..3252bd6 100644
--- a/Qwilight/Qwilight/ViewModel/WantViewModel.cs
+++ b/Qwilight/Qwilight/ViewModel/WantViewModel.cs
@@ -6,7 +6,7 @@
{
public sealed partial class WantViewModel : BaseViewModel
{
- public override double TargetLength => 0.9;
+ public override double TargetLength => 0.8;
public override double TargetHeight => 0.8;