diff --git a/Qwilight/Assets/UI/@Default/@Default.yaml b/Qwilight/Assets/UI/@Default/@Default.yaml index 1c43645..402cc65 100644 --- a/Qwilight/Assets/UI/@Default/@Default.yaml +++ b/Qwilight/Assets/UI/@Default/@Default.yaml @@ -227,19 +227,19 @@ paintProperty22: AutoModePosition0(-5), PaintProperty22Position1(), 34, 442, 1, 0, 0, 0, null, 0 # 레벨 업 - paintProperty23: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1 + paintProperty23: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 100, null, 1 # 레이팅 Point 얻음 - paintProperty24: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1 + paintProperty24: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 107, null, 1 # 호칭 얻음 - paintProperty25: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1 + paintProperty25: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 106, null, 1 # 도전 과제 클리어 - paintProperty26: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 0, null, 1 + paintProperty26: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 1, 101, null, 1 - # 티어 업 - paintProperty27: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 0, 0, null, 1 + # 티어 상승 + paintProperty27: QuitDrawingPosition0(), QuitDrawingPosition1(), 144, 144, 1, 0, 0, 108, null, 1 fadingProperty00: 50, 60, 0.5 fadingProperty01: 100, 60, 0.25 diff --git a/Qwilight/Assets/UI/Default/Default.lua b/Qwilight/Assets/UI/Default/Default.lua index d3bc082..ee5c3a1 100644 --- a/Qwilight/Assets/UI/Default/Default.lua +++ b/Qwilight/Assets/UI/Default/Default.lua @@ -80,15 +80,7 @@ end end -function NoteHeight1(e) - if IsO4U() and not IsFloating() then - return 2.0 * NoteHeight2(e) - else - return NoteHeight2(e) - end -end - -function NoteHeight2(e) +function NoteHeight(e) if inputCount < 50 then return (51 + noteLength + noteHeight) * e else @@ -387,9 +379,9 @@ end function _GetNote(args) - if IsFloating() and args[1] == 1 and (args[3] == 0 or args[3] == 2 or args[3] == 4 or args[3] == 9 or args[3] == 14) then + if IsFloating() and args[1] == 1 and (args[3] == 4 or args[3] == 9 or args[3] == 14) then return "N2" - elseif IsO4U() and args[1] != 0 and (not IsFloating() or args[1] != 1) then + elseif IsO4U() and (args[1] == 2 or args[1] == 3 or args[1] == 4) and (args[3] == 0 or args[3] == 9) then return "N1" else return "N" diff --git a/Qwilight/Assets/UI/Default/Default.yaml b/Qwilight/Assets/UI/Default/Default.yaml index 8c54193..e6cfb76 100644 --- a/Qwilight/Assets/UI/Default/Default.yaml +++ b/Qwilight/Assets/UI/Default/Default.yaml @@ -34,6 +34,8 @@ judgment-main-frame: 10 judgment-main-framerate: 60 + pause-frame: 100 + note-hit-frame: NoteHitFrame(1.0) note-hit-framerate: 60 @@ -147,8 +149,8 @@ point: noteLength: NoteLength(2.0), NoteLength(1.0), ~, ~, ~, NoteLength(2.0), NoteLength(1.0), ~, ~, NoteLength(2.0) - noteHeight: NoteHeight1(1.0), NoteHeight2(1.0), ~, ~, ~, NoteHeight1(1.0), NoteHeight2(1.0), ~, ~, NoteHeight1(1.0) - noteHeightJudgment: NoteHeight1(0.5), NoteHeight2(0.5), ~, ~, ~, NoteHeight1(0.5), NoteHeight2(0.5), ~, ~, NoteHeight1(0.5) + noteHeight: NoteHeight(1.0) + noteHeightJudgment: NoteHeight(0.5) floatingNotePosition0: 0, ~, ~, ~, ~, ~, ~, ~, ~, FloatingNotePosition0(), FloatingNoteLength6() floatingNoteLength: FloatingNoteLength1(), 0, ~, ~, ~, FloatingNoteLength6(), 0, ~, ~, FloatingNoteLength1(), FloatingNoteLength6() @@ -275,9 +277,9 @@ pauseSystem: 0 pausePosition0: 5 - pausePosition1: 629 - pauseLength: 66 - pauseHeight: 86 + pausePosition1: 5 + pauseLength: 60.25 + pauseHeight: 76.75 mediaPosition0: MediaPosition0() mediaPosition1: 0 diff --git a/Qwilight/Assets/UI/Default/Default.zip b/Qwilight/Assets/UI/Default/Default.zip index dd92ba0..0e365f0 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:8d4444a143d23b5f6ab4bf2ada07d697d2d2ed0e1e8a995de8aae147511bda99 -size 15983111 +oid sha256:d1cb9551f94274b05cd645e1d32388738b843918eb2ffcedab55218ec928e412 +size 22120896