diff --git a/Qwilight/Assets/UI/@Default/@Default.lua b/Qwilight/Assets/UI/@Default/@Default.lua index c5fbde2..1c5a2b2 100644 --- a/Qwilight/Assets/UI/@Default/@Default.lua +++ b/Qwilight/Assets/UI/@Default/@Default.lua @@ -214,9 +214,9 @@ function PaintProperty0Etc() if IsNoteFileModeUHD() then - return "[UHD0.mp4, UHD1.mp4, UHD2.mp4, UHD3.mp4, UHD4.mp4, UHD5.mp4, UHD6.mp4, UHD7.mp4]" + return "[0UHD.mp4, 1UHD.mp4, 2UHD.mp4, 3UHD.mp4, 4UHD.mp4]" else - return "[HD0.mp4, HD1.mp4, HD2.mp4, HD3.mp4, HD4.mp4, HD5.mp4, HD6.mp4, HD7.mp4]" + return "[0HD.mp4, 1HD.mp4, 2HD.mp4, 3HD.mp4, 4HD.mp4]" end end diff --git a/Qwilight/Assets/UI/@Default/@Default.zip b/Qwilight/Assets/UI/@Default/@Default.zip index d3531e9..787eac9 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:43a37d4b00875c9fc7c1334145608fffefbcb1268df2657c831039888c3ec23c -size 165531871 +oid sha256:b049e32294e7593f89099c24bfa235e3726eb20c167ebda5714b397261f4dc23 +size 465985440 diff --git a/Qwilight/Assets/UI/Default/Default.lua b/Qwilight/Assets/UI/Default/Default.lua index 16cc598..05acc13 100644 --- a/Qwilight/Assets/UI/Default/Default.lua +++ b/Qwilight/Assets/UI/Default/Default.lua @@ -285,37 +285,21 @@ end function LongNoteEdgePosition1() - if not IsFloating() and IsO4U() then + if not IsFloating() then return -51 else return -6 end end -function LongNoteEdgePosition2() - if IsO4U() then - return -26 - else - return -6 - end -end - function LongNoteEdgeHeight1() - if not IsFloating() and IsO4U() then + if not IsFloating() then return 102 else return 11 end end -function LongNoteEdgeHeight2() - if IsO4U() then - return 51 - else - return 11 - end -end - function PaintProperty4Position0() return Contents(0.5) - 4 end @@ -412,14 +396,6 @@ end end -function _GetMain(args) - if IsFloating() and args[1] == 1 then - return "M2" - else - return "M" - end -end - function _GetInput(args) if IsFloating() and args[1] == 1 then return "" diff --git a/Qwilight/Assets/UI/Default/Default.yaml b/Qwilight/Assets/UI/Default/Default.yaml index 8aa5e3a..874d4d0 100644 --- a/Qwilight/Assets/UI/Default/Default.yaml +++ b/Qwilight/Assets/UI/Default/Default.yaml @@ -172,12 +172,12 @@ autoInputPosition1: 5 autoInputHeight: AutoHeight1(), 19, ~, ~, ~, AutoHeight1(), 19, ~, ~, AutoHeight1(), ~ - longNoteTailEdgePosition: LongNoteEdgePosition1(), LongNoteEdgePosition2(), ~, ~, ~, LongNoteEdgePosition1(), LongNoteEdgePosition2(), ~, ~, LongNoteEdgePosition1() - longNoteTailEdgeHeight: LongNoteEdgeHeight1(), LongNoteEdgeHeight2(), ~, ~, ~, LongNoteEdgeHeight1(), LongNoteEdgeHeight2(), ~, ~, LongNoteEdgeHeight1() + longNoteTailEdgePosition: LongNoteEdgePosition1(), -26, ~, ~, ~, LongNoteEdgePosition1(), -26, ~, ~, LongNoteEdgePosition1() + longNoteTailEdgeHeight: LongNoteEdgeHeight1(), 51, ~, ~, ~, LongNoteEdgeHeight1(), 51, ~, ~, LongNoteEdgeHeight1() longNoteTailContentsHeight: 0 - longNoteFrontEdgePosition: LongNoteEdgePosition1(), LongNoteEdgePosition2(), ~, ~, ~, LongNoteEdgePosition1(), LongNoteEdgePosition2(), ~, ~, LongNoteEdgePosition1() - longNoteFrontEdgeHeight: LongNoteEdgeHeight1(), LongNoteEdgeHeight2(), ~, ~, ~, LongNoteEdgeHeight1(), LongNoteEdgeHeight2(), ~, ~, LongNoteEdgeHeight1() + longNoteFrontEdgePosition: LongNoteEdgePosition1(), -26, ~, ~, ~, LongNoteEdgePosition1(), -26, ~, ~, LongNoteEdgePosition1() + longNoteFrontEdgeHeight: LongNoteEdgeHeight1(), 51, ~, ~, ~, LongNoteEdgeHeight1(), 51, ~, ~, LongNoteEdgeHeight1() longNoteFrontContentsHeight: 0 mainPosition: MainPosition(0) diff --git a/Qwilight/Assets/UI/Default/Default.zip b/Qwilight/Assets/UI/Default/Default.zip index 71d4e6b..0ffebc6 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:9a026510a6ce92416f6d038307b496963c4a1526aa3b76fbd04b5bd378bb842f -size 21370696 +oid sha256:54b76ec6abc1c7375e09c5909a7615df05c00887d5425604c72d4c2eee9795fd +size 19812382 diff --git a/Qwilight/Assets/UI/Default/Veil 0.jpg b/Qwilight/Assets/UI/Default/Veil 0.jpg deleted file mode 100644 index 1f586da..0000000 --- a/Qwilight/Assets/UI/Default/Veil 0.jpg +++ /dev/null Binary files differ diff --git a/Qwilight/Assets/UI/Default/Veil 1.jpg b/Qwilight/Assets/UI/Default/Veil 1.jpg deleted file mode 100644 index 4293a9d..0000000 --- a/Qwilight/Assets/UI/Default/Veil 1.jpg +++ /dev/null Binary files differ diff --git a/Qwilight/Assets/UI/Default/Veil 2.jpg b/Qwilight/Assets/UI/Default/Veil 2.jpg deleted file mode 100644 index 04fa5e0..0000000 --- a/Qwilight/Assets/UI/Default/Veil 2.jpg +++ /dev/null Binary files differ