diff --git a/AquaNet/src/libs/maimaiTypes.ts b/AquaNet/src/libs/maimaiTypes.ts
index 39e67f1a..6906f88b 100644
--- a/AquaNet/src/libs/maimaiTypes.ts
+++ b/AquaNet/src/libs/maimaiTypes.ts
@@ -49,6 +49,7 @@ export interface MaimaiUserPlaylog {
id: number;
musicId: number;
level: number;
+ userPlayDate: string;
trackNo: number;
vsRank: number;
achievement: number;
diff --git a/AquaNet/src/pages/Home.svelte b/AquaNet/src/pages/Home.svelte
index 90af2053..3cdb95c3 100644
--- a/AquaNet/src/pages/Home.svelte
+++ b/AquaNet/src/pages/Home.svelte
@@ -39,7 +39,7 @@
letter-spacing: 0.2em
margin-top: 0
opacity: 0.9
-
+
.btn-group
display: flex
gap: 8px
diff --git a/AquaNet/src/pages/MaimaiRating.svelte b/AquaNet/src/pages/MaimaiRating.svelte
index 9de77d91..068d3a94 100644
--- a/AquaNet/src/pages/MaimaiRating.svelte
+++ b/AquaNet/src/pages/MaimaiRating.svelte
@@ -10,7 +10,7 @@
Promise.all([
getMaimai("GetUserRatingApi", {userId}),
- getMaimaiAllMusic().then(it => it.json())
+ getMaimaiAllMusic()
]).then(([rating, music]) => {
data = rating
musicInfo = music
@@ -37,7 +37,8 @@
music.note = music.notes[x.level]
const mult = getMult(x.achievement)
- return {...x,
+ return {
+ ...x,
music: music,
calc: (mult[1] as number) * music.note.lv,
rank: mult[2]
@@ -69,7 +70,9 @@
{#each section.data as rating}
-
.padStart(6,)
+
{rating.music.name}
@@ -79,7 +82,9 @@
{rating.calc.toFixed(1)}
-
.substring(0,)
+
{rating.music.note.lv}
{/each}
@@ -89,111 +94,106 @@
\ No newline at end of file
diff --git a/AquaNet/src/pages/UserHome.svelte b/AquaNet/src/pages/UserHome.svelte
index 7f996efc..1c02f06c 100644
--- a/AquaNet/src/pages/UserHome.svelte
+++ b/AquaNet/src/pages/UserHome.svelte
@@ -34,6 +34,9 @@
console.log(trend)
console.log(music)
+ // Sort recent by date
+ user.recent.sort((a, b) => b.userPlayDate < a.userPlayDate ? -1 : 1)
+
d = {user, trend, recent: user.recent.map(it => {return {...music[it.musicId], ...it}})}
localStorage.setItem("tmp-user-details", JSON.stringify(d))
renderCal(calElement, trend.map(it => {return {date: it.date, value: it.plays}}))
@@ -161,8 +164,11 @@
-
{r.name}
+ {r.name}
+
+
+ {r.notes[r.level].lv}
{("" + getMult(r.achievement)[2]).replace("p", "+")}
{(r.achievement / 10000).toFixed(2)}%
@@ -351,7 +357,7 @@ $gap: 20px
flex-direction: column
gap: 0
- span
+ .rank-text
text-align: left
.rank-S
@@ -366,6 +372,13 @@ $gap: 20px
.rank-B
color: #6ba6ff
+ .lv
+ background: var(--lv-color)
+ padding: 0 6px
+ border-radius: 10px
+ opacity: 0.8
+ margin-right: 10px
+
span
display: inline-block
text-align: right
diff --git a/AquaNet/src/vars.sass b/AquaNet/src/vars.sass
index 32b431ee..e4564e44 100644
--- a/AquaNet/src/vars.sass
+++ b/AquaNet/src/vars.sass
@@ -6,4 +6,13 @@ $c-bg: #242424
$nav-height: 4rem
$w-mobile: 560px
-$w-max: 900px
\ No newline at end of file
+$w-max: 900px
+
+.level-0
+ --lv-color: #6ED43E
+.level-1
+ --lv-color: #F7B807
+.level-2
+ --lv-color: #FF828D
+.level-3
+ --lv-color: #A051DC
\ No newline at end of file