From d2608472d82ccc01c38db5eb8ef56a0a93212ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=8C=E8=8E=9E=7E=28=3D=5E=E2=96=BD=5E=3D=29?= Date: Sat, 25 Oct 2025 03:46:05 +0800 Subject: [PATCH 01/24] fix: total_point null (#185) --- .../db/80/V1000_60__fix_maimai2_point_nullability.sql | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/main/resources/db/80/V1000_60__fix_maimai2_point_nullability.sql diff --git a/src/main/resources/db/80/V1000_60__fix_maimai2_point_nullability.sql b/src/main/resources/db/80/V1000_60__fix_maimai2_point_nullability.sql new file mode 100644 index 00000000..553a8e3c --- /dev/null +++ b/src/main/resources/db/80/V1000_60__fix_maimai2_point_nullability.sql @@ -0,0 +1,11 @@ +# Fix NULL values in maimai2_user_detail point and total_point fields +# These fields were added without NOT NULL constraint in V1000_36 + +# First, set NULL values to 0 +UPDATE maimai2_user_detail SET point = 0 WHERE point IS NULL; +UPDATE maimai2_user_detail SET total_point = 0 WHERE total_point IS NULL; + +# Then add NOT NULL constraint +ALTER TABLE maimai2_user_detail MODIFY point INT NOT NULL DEFAULT 0; +ALTER TABLE maimai2_user_detail MODIFY total_point INT NOT NULL DEFAULT 0; + From 9d30cf1e7d0754a95c4ba681e17ed87a64c97b01 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Fri, 14 Nov 2025 18:49:56 +0800 Subject: [PATCH 02/24] [+] Pagination --- AquaNet/src/components/Pagination.svelte | 60 ++++++++++++++++++++++++ AquaNet/src/pages/Ranking.svelte | 47 +++++++++++++++++-- 2 files changed, 102 insertions(+), 5 deletions(-) create mode 100644 AquaNet/src/components/Pagination.svelte diff --git a/AquaNet/src/components/Pagination.svelte b/AquaNet/src/components/Pagination.svelte new file mode 100644 index 00000000..d717b728 --- /dev/null +++ b/AquaNet/src/components/Pagination.svelte @@ -0,0 +1,60 @@ + + + + + diff --git a/AquaNet/src/pages/Ranking.svelte b/AquaNet/src/pages/Ranking.svelte index d0b10ac8..80f246b2 100644 --- a/AquaNet/src/pages/Ranking.svelte +++ b/AquaNet/src/pages/Ranking.svelte @@ -1,4 +1,5 @@
@@ -37,8 +69,12 @@ {#if d} + {#if page > 1} + + {/if} +
-
hoveringUser = d.users[0].username} role="heading" aria-level="2"> +
hoveringUser = paginatedUsers[0]?.username} role="heading" aria-level="2"> {t("Leaderboard.Rank")} {t("Leaderboard.Rating")} @@ -46,7 +82,7 @@ {t("Leaderboard.FC")} {t("Leaderboard.AP")}
- {#each d.users as user, i (user.rank)} + {#each paginatedUsers as user, i (user.rank)}
hoveringUser = user.username} on:focus={() => {}}> @@ -70,6 +106,8 @@ {/each}
+ + hoverLoading = l} /> @@ -132,5 +170,4 @@ &.alternate background-color: vars.$ov-light - From 491044d37a536cc28a3fcb27381cf4406422a992 Mon Sep 17 00:00:00 2001 From: Clansty Date: Fri, 14 Nov 2025 22:11:21 +0800 Subject: [PATCH 03/24] [-] remove munet migration notice --- .../src/components/MunetRegisterBanner.svelte | 32 --------- AquaNet/src/pages/Home.svelte | 4 -- AquaNet/src/pages/Home/MigrateAction.svelte | 69 ------------------- AquaNet/src/pages/Welcome.svelte | 8 +-- 4 files changed, 2 insertions(+), 111 deletions(-) delete mode 100644 AquaNet/src/components/MunetRegisterBanner.svelte delete mode 100644 AquaNet/src/pages/Home/MigrateAction.svelte diff --git a/AquaNet/src/components/MunetRegisterBanner.svelte b/AquaNet/src/components/MunetRegisterBanner.svelte deleted file mode 100644 index 187483d7..00000000 --- a/AquaNet/src/components/MunetRegisterBanner.svelte +++ /dev/null @@ -1,32 +0,0 @@ - - -{#if shouldShow} -
-

MuNET 了解一下！

-
-

MuNET 是 AquaDX 的继任者，提供更适合中国用户的服务器和更好的游戏体验。

-

如果你还没有游戏数据，建议在 MuNET 上创建账号并开始游戏。点击立即前往

-
-
-{/if} - diff --git a/AquaNet/src/pages/Home.svelte b/AquaNet/src/pages/Home.svelte index bd5b275f..1faa9162 100644 --- a/AquaNet/src/pages/Home.svelte +++ b/AquaNet/src/pages/Home.svelte @@ -10,7 +10,6 @@ import { t } from "../libs/i18n"; import ImportDataAction from "./Home/ImportDataAction.svelte"; import Communities from "./Home/Communities.svelte"; - import MigrateAction from "./Home/MigrateAction.svelte"; USER.ensureLoggedIn(); @@ -59,9 +58,6 @@ - {#if me} - - {/if}
{:else if tab === 1}
diff --git a/AquaNet/src/pages/Home/MigrateAction.svelte b/AquaNet/src/pages/Home/MigrateAction.svelte deleted file mode 100644 index 530d2e28..00000000 --- a/AquaNet/src/pages/Home/MigrateAction.svelte +++ /dev/null @@ -1,69 +0,0 @@ - - -{#if shouldShow} - -

迁移到 MuNET

- 更适合中国宝宝体质的服务器，AquaDX 的继任者。点击查看详情 - -{/if} - -{#if showWarning} -
-
-

提示

-

看起来你在 AquaDX 还没有游戏数据，也许是因为没有绑卡或者绑定的卡不是在游戏中点击“查看卡号”获取的…

-

现在迁移的话，大概会导致你的游戏数据无法被正确的迁移。建议你先去检查一下吧

-
- - -
-
-
-{/if} - - diff --git a/AquaNet/src/pages/Welcome.svelte b/AquaNet/src/pages/Welcome.svelte index aeebd01d..cb4a8cc9 100644 --- a/AquaNet/src/pages/Welcome.svelte +++ b/AquaNet/src/pages/Welcome.svelte @@ -5,7 +5,6 @@ import Icon from "@iconify/svelte"; import { USER } from "../libs/sdk"; import { t } from "../libs/i18n" - import MunetRegisterBanner from "../components/MunetRegisterBanner.svelte"; let params = new URLSearchParams(window.location.search) @@ -162,7 +161,7 @@ return submitting = false } - // Send request to server + // Send request to server await USER.changePassword({ token, password }) .then(() => { state = 'verify' @@ -221,9 +220,6 @@ on:turnstile-expired={_ => window.location.reload()} on:turnstile-timeout={_ => console.log(error = t('welcome.turnstile-timeout'))} /> {/if} - {#if isSignup} - - {/if}
{:else if state === "submitreset"}