Bennett/AquaDX
1
0
Fork 0
forked from Cookies_Github_mirror/AquaDX
Code Pull Requests Actions Releases Activity

Compare commits

base: Bennett:master
Branches Tags
Bennett:v1-dev Bennett:mai-unique Bennett:matching Bennett:tmp Bennett:master Bennett:js-formatter
Bennett:nightly Bennett:0.0.47-nightly Bennett:0.0.47 Cookies_Github_mirror:nightly Cookies_Github_mirror:0.0.47-nightly Cookies_Github_mirror:0.0.47
..
compare: Bennett:js-formatter
Branches Tags
Bennett:v1-dev Bennett:mai-unique Bennett:matching Bennett:tmp Bennett:master Bennett:js-formatter Cookies_Github_mirror:v1-dev Cookies_Github_mirror:drop-the-codebase Cookies_Github_mirror:mai-unique Cookies_Github_mirror:matching Cookies_Github_mirror:tmp Cookies_Github_mirror:master Cookies_Github_mirror:js-formatter
Bennett:nightly Bennett:0.0.47-nightly Bennett:0.0.47 Cookies_Github_mirror:nightly Cookies_Github_mirror:0.0.47-nightly Cookies_Github_mirror:0.0.47

1 Commits
master ... js-formatt

Author SHA1 Message Date
Afonso
38bddf1763 add prettier formatter 2024-02-12 18:04:56 +01:00
45 changed files with 1186 additions and 2114 deletions
Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -75,4 +75,7 @@ gradle-app.setting
### Gradle Patch ### ### Gradle Patch ###
# Java heap dump # Java heap dump
*.hprof *.hprof
### Docker ###
/db/*

8
.prettierrc Normal file
View File

@@ -0,0 +1,8 @@
{
"trailingComma": "es5",
"semi": false,
"singleQuote": true,
"bracketSpacing": false,
"plugins": ["prettier-plugin-svelte"],
"overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }]
}

4
AquaMai/AquaMai.toml
View File

@@ -11,6 +11,6 @@ TicketUnlock=true
# Skip the warning screen and logo shown after the POST sequence # Skip the warning screen and logo shown after the POST sequence
SkipWarningScreen=true SkipWarningScreen=true
# Single player: Show 1P only, at the center of the screen # Single player: Show 1P only, at the center of the screen
SinglePlayer=true SinglePlayer=false
# !!EXPERIMENTAL!! Skip from the card-scanning screen directly to music selection screen # !!EXPERIMENTAL!! Skip from the card-scanning screen directly to music selection screen
SkipToMusicSelection=false SkipToMusicSelection=true

41
AquaNet/.eslintrc.cjs
View File

@@ -1,41 +0,0 @@
// ..eslintrc.cjs example
module.exports = {
root: true,
env: {
browser: true,
es2023: true
},
extends: [
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:svelte/recommended',
],
ignorePatterns: ['dist', '..eslintrc.cjs'],
parser: '@typescript-eslint/parser',
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module'
},
rules: {
// Custom styling rules
'comma-dangle': ['warn', 'only-multiline'],
'indent': ['warn', 2],
'semi': ['warn', 'never'],
'quotes': ['warn', 'single'],
'arrow-parens': ['warn', 'as-needed'],
'linebreak-style': ['warn', 'unix'],
'object-curly-spacing': ['warn', 'always'],
'array-bracket-spacing': ["error", "always", {
"singleValue": false,
"objectsInArrays": false,
"arraysInArrays": false
}],
// Disabled rules
'no-unused-vars': 'off',
'@typescript-eslint/no-unused-vars': 'off',
'no-constant-condition': 'off',
'@typescript-eslint/no-explicit-any': 'off',
},
}

5
AquaNet/README.md
View File

@@ -1,6 +1,6 @@
# AquaNet # AquaNet
This is the codebase for the new frontend of AquaDX. This is the codebase for the new frontend of AquaDX.
This project is also heavily WIP, so more details will be added later on. This project is also heavily WIP, so more details will be added later on.
## Development ## Development
@@ -12,8 +12,7 @@ Please check out [SVELTE.md](SVELTE.md) for more details on the technical aspect
### Running locally ### Running locally
First, you would need to install Node.js and yarn. First, you would need to install Node.js and yarn.
Then, you would need to start your testing AquaDX server and configure the `aqua_host` in `src/libs/config.ts` to use your URL. Then, you would need to start your testing AquaDX server and configure the `src/libs/config.ts` to use your URL.
Please leave `data_host` unchanged if you're not sure what it is.
Finally, run: Finally, run:
```shell ```shell

70
AquaNet/SVELTE.md
View File

@@ -1,35 +1,35 @@
## Technical considerations ## Technical considerations
**Why use this over SvelteKit?** **Why use this over SvelteKit?**
- It brings its own routing solution which might not be preferable for some users. - It brings its own routing solution which might not be preferable for some users.
- It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app. - It is first and foremost a framework that just happens to use Vite under the hood, not a Vite app.
This template contains as little as possible to get started with Vite + TypeScript + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project. This template contains as little as possible to get started with Vite + TypeScript + Svelte, while taking into account the developer experience with regards to HMR and intellisense. It demonstrates capabilities on par with the other `create-vite` templates and is a good starting point for beginners dipping their toes into a Vite + Svelte project.
Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate. Should you later need the extended capabilities and extensibility provided by SvelteKit, the template has been structured similarly to SvelteKit so that it is easy to migrate.
**Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?** **Why `global.d.ts` instead of `compilerOptions.types` inside `jsconfig.json` or `tsconfig.json`?**
Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information. Setting `compilerOptions.types` shuts out all other types not explicitly listed in the configuration. Using triple-slash references keeps the default TypeScript setting of accepting type information from the entire workspace, while also adding `svelte` and `vite/client` type information.
**Why include `.vscode/extensions.json`?** **Why include `.vscode/extensions.json`?**
Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project. Other templates indirectly recommend extensions via the README, but this file allows VS Code to prompt the user to install the recommended extension upon opening the project.
**Why enable `allowJs` in the TS template?** **Why enable `allowJs` in the TS template?**
While `allowJs: false` would indeed prevent the use of `.js` files in the project, it does not prevent the use of JavaScript syntax in `.svelte` files. In addition, it would force `checkJs: false`, bringing the worst of both worlds: not being able to guarantee the entire codebase is TypeScript, and also having worse typechecking for the existing JavaScript. In addition, there are valid use cases in which a mixed codebase may be relevant. While `allowJs: false` would indeed prevent the use of `.js` files in the project, it does not prevent the use of JavaScript syntax in `.svelte` files. In addition, it would force `checkJs: false`, bringing the worst of both worlds: not being able to guarantee the entire codebase is TypeScript, and also having worse typechecking for the existing JavaScript. In addition, there are valid use cases in which a mixed codebase may be relevant.
**Why is HMR not preserving my local component state?** **Why is HMR not preserving my local component state?**
HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr). HMR state preservation comes with a number of gotchas! It has been disabled by default in both `svelte-hmr` and `@sveltejs/vite-plugin-svelte` due to its often surprising behavior. You can read the details [here](https://github.com/rixo/svelte-hmr#svelte-hmr).
If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR. If you have state that's important to retain within a component, consider creating an external store which would not be replaced by HMR.
```ts ```ts
// store.ts // store.ts
// An extremely simple external store // An extremely simple external store
import { writable } from 'svelte/store' import {writable} from 'svelte/store'
export default writable(0) export default writable(0)
``` ```

39
AquaNet/index.html
View File

@@ -6,15 +6,36 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>AquaNet</title> <title>AquaNet</title>
<link rel="apple-touch-icon" sizes="180x180" href="/assets/icons/apple-touch-icon.png"> <link
<link rel="icon" type="image/png" sizes="32x32" href="/assets/icons/favicon-32x32.png"> rel="apple-touch-icon"
<link rel="icon" type="image/png" sizes="16x16" href="/assets/icons/favicon-16x16.png"> sizes="180x180"
<link rel="manifest" href="/assets/icons/site.webmanifest"> href="/assets/icons/apple-touch-icon.png"
<link rel="mask-icon" href="/assets/icons/safari-pinned-tab.svg" color="#b3c6ff"> />
<link rel="shortcut icon" href="/assets/icons/favicon.ico"> <link
<meta name="msapplication-TileColor" content="#ffffff"> rel="icon"
<meta name="msapplication-config" content="/assets/icons/browserconfig.xml"> type="image/png"
<meta name="theme-color" content="#ffffff"> sizes="32x32"
href="/assets/icons/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="/assets/icons/favicon-16x16.png"
/>
<link rel="manifest" href="/assets/icons/site.webmanifest" />
<link
rel="mask-icon"
href="/assets/icons/safari-pinned-tab.svg"
color="#b3c6ff"
/>
<link rel="shortcut icon" href="/assets/icons/favicon.ico" />
<meta name="msapplication-TileColor" content="#ffffff" />
<meta
name="msapplication-config"
content="/assets/icons/browserconfig.xml"
/>
<meta name="theme-color" content="#ffffff" />
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

7
AquaNet/package.json
View File

@@ -8,22 +8,21 @@
"build": "vite build", "build": "vite build",
"preview": "vite preview", "preview": "vite preview",
"check": "svelte-check --tsconfig ./tsconfig.json", "check": "svelte-check --tsconfig ./tsconfig.json",
"lint": "eslint . --ext ts,tsx,svelte --max-warnings 0 --fix" "format": "prettier --write ."
}, },
"devDependencies": { "devDependencies": {
"@iconify/svelte": "^3.1.6", "@iconify/svelte": "^3.1.6",
"@sveltejs/vite-plugin-svelte": "^3.0.1", "@sveltejs/vite-plugin-svelte": "^3.0.1",
"@tsconfig/svelte": "^5.0.2", "@tsconfig/svelte": "^5.0.2",
"chartjs-adapter-moment": "^1.0.1", "chartjs-adapter-moment": "^1.0.1",
"eslint": "^8.56.0", "prettier": "^3.2.5",
"eslint-plugin-svelte": "^2.35.1", "prettier-plugin-svelte": "^3.1.2",
"sass": "^1.70.0", "sass": "^1.70.0",
"svelte": "^4.2.10", "svelte": "^4.2.10",
"svelte-check": "^3.6.4", "svelte-check": "^3.6.4",
"svelte-routing": "^2.12.0", "svelte-routing": "^2.12.0",
"tslib": "^2.6.2", "tslib": "^2.6.2",
"typescript": "^5.2.2", "typescript": "^5.2.2",
"typescript-eslint": "^7.0.1",
"vite": "^5.1.1" "vite": "^5.1.1"
}, },
"dependencies": { "dependencies": {

34
AquaNet/public/assets/icons/site.webmanifest
View File

@@ -1,19 +1,19 @@
{ {
"name": "", "name": "",
"short_name": "", "short_name": "",
"icons": [ "icons": [
{ {
"src": "/assets/icons/android-chrome-192x192.png", "src": "/assets/icons/android-chrome-192x192.png",
"sizes": "192x192", "sizes": "192x192",
"type": "image/png" "type": "image/png"
}, },
{ {
"src": "/assets/icons/android-chrome-512x512.png", "src": "/assets/icons/android-chrome-512x512.png",
"sizes": "512x512", "sizes": "512x512",
"type": "image/png" "type": "image/png"
} }
], ],
"theme_color": "#ffffff", "theme_color": "#ffffff",
"background_color": "#ffffff", "background_color": "#ffffff",
"display": "standalone" "display": "standalone"
} }

14
AquaNet/src/App.svelte
View File

@@ -1,11 +1,11 @@
<script lang="ts"> <script lang="ts">
import { Router, Route } from "svelte-routing"; import {Router, Route} from 'svelte-routing'
import Home from "./pages/Home.svelte"; import Home from './pages/Home.svelte'
import MaimaiRating from "./pages/MaimaiRating.svelte"; import MaimaiRating from './pages/MaimaiRating.svelte'
import UserHome from "./pages/UserHome.svelte"; import UserHome from './pages/UserHome.svelte'
import Icon from '@iconify/svelte'; import Icon from '@iconify/svelte'
export let url = ""; export let url = ''
</script> </script>
<nav> <nav>
@@ -53,4 +53,4 @@
@media (max-width: $w-mobile) @media (max-width: $w-mobile)
justify-content: center justify-content: center
</style> </style>

2
AquaNet/src/libs/generalTypes.ts
View File

@@ -2,4 +2,4 @@ export interface TrendEntry {
date: string date: string
rating: number rating: number
plays: number plays: number
} }

57
AquaNet/src/libs/maimai.ts
View File

@@ -1,51 +1,54 @@
import { aqua_host, data_host } from './config' import {aqua_host, data_host} from './config'
import type { TrendEntry } from './generalTypes' import type {TrendEntry} from './generalTypes'
import type { MaimaiUserSummaryEntry } from './maimaiTypes' import type {MaimaiUserSummaryEntry} from './maimaiTypes'
const multTable = [ const multTable = [
[ 100.5, 22.4, 'SSSp' ], [100.5, 22.4, 'SSSp'],
[ 100, 21.6, 'SSS' ], [100, 21.6, 'SSS'],
[ 99.5, 21.1, 'SSp' ], [99.5, 21.1, 'SSp'],
[ 99, 20.8, 'SS' ], [99, 20.8, 'SS'],
[ 98, 20.3, 'Sp' ], [98, 20.3, 'Sp'],
[ 97, 20, 'S' ], [97, 20, 'S'],
[ 94, 16.8, 'AAA' ], [94, 16.8, 'AAA'],
[ 90, 15.2, 'AA' ], [90, 15.2, 'AA'],
[ 80, 13.6, 'A' ] [80, 13.6, 'A'],
] ]
export function getMult(achievement: number) { export function getMult(achievement: number) {
achievement /= 10000 achievement /= 10000
for (let i = 0; i < multTable.length; i++) { for (let i = 0; i < multTable.length; i++) {
if (achievement >= (multTable[i][0] as number)) return multTable[i] if (achievement >= (multTable[i][0] as number)) return multTable[i]
} }
return [ 0, 0, 0 ] return [0, 0, 0]
} }
export async function getMaimai(endpoint: string, params: any) { export async function getMaimai(endpoint: string, params: any) {
return await fetch(`${aqua_host}/Maimai2Servlet/${endpoint}`, { return await fetch(`${aqua_host}/Maimai2Servlet/${endpoint}`, {
method: 'POST', method: 'POST',
body: JSON.stringify(params) body: JSON.stringify(params),
}).then(res => res.json()) }).then((res) => res.json())
} }
export async function getMaimaiAllMusic(): Promise<{ [key: string]: any }> { export async function getMaimaiAllMusic(): Promise<{[key: string]: any}> {
return fetch(`${data_host}/maimai/meta/00/all-music.json`).then(it => it.json()) return fetch(`${data_host}/maimai/meta/00/all-music.json`).then((it) =>
it.json()
)
} }
export async function getMaimaiApi(endpoint: string, params: any) { export async function getMaimaiApi(endpoint: string, params: any) {
const url = new URL(`${aqua_host}/api/game/maimai2new/${endpoint}`) let url = new URL(`${aqua_host}/api/game/maimai2new/${endpoint}`)
Object.keys(params).forEach(key => url.searchParams.append(key, params[key])) Object.keys(params).forEach((key) =>
return await fetch(url).then(res => res.json()) url.searchParams.append(key, params[key])
)
return await fetch(url).then((res) => res.json())
} }
export async function getMaimaiTrend(userId: number): Promise<TrendEntry[]> { export async function getMaimaiTrend(userId: number): Promise<TrendEntry[]> {
return await getMaimaiApi('trend', { userId }) return await getMaimaiApi('trend', {userId})
} }
export async function getMaimaiUser(userId: number): Promise<MaimaiUserSummaryEntry> { export async function getMaimaiUser(
return await getMaimaiApi('user-summary', { userId }) userId: number
} ): Promise<MaimaiUserSummaryEntry> {
return await getMaimaiApi('user-summary', {userId})
}

205
AquaNet/src/libs/maimaiTypes.ts
View File

@@ -1,118 +1,115 @@
export interface Rating { export interface Rating {
musicId: number musicId: number
level: number level: number
achievement: number achievement: number
} }
export interface ParsedRating extends Rating { export interface ParsedRating extends Rating {
music: MaimaiMusic, music: MaimaiMusic
calc: number, calc: number
rank: string rank: string
} }
export interface MaimaiMusic { export interface MaimaiMusic {
name: string, name: string
composer: string, composer: string
bpm: number, bpm: number
ver: number, ver: number
note: { note: {
lv: number lv: number
designer: string designer: string
lv_id: number lv_id: number
notes: number notes: number
} }
} }
export interface MaimaiUserSummaryEntry { export interface MaimaiUserSummaryEntry {
name: string name: string
iconId: number iconId: number
serverRank: number serverRank: number
accuracy: number accuracy: number
rating: number rating: number
ratingHighest: number ratingHighest: number
ranks: { name: string, count: number }[] ranks: {name: string; count: number}[]
maxCombo: number maxCombo: number
fullCombo: number fullCombo: number
allPerfect: number allPerfect: number
totalDxScore: number totalDxScore: number
plays: number plays: number
totalPlayTime: number totalPlayTime: number
joined: string joined: string
lastSeen: string lastSeen: string
lastVersion: string lastVersion: string
best35: string best35: string
best15: string best15: string
recent: MaimaiUserPlaylog[] recent: MaimaiUserPlaylog[]
} }
export interface MaimaiUserPlaylog { export interface MaimaiUserPlaylog {
id: number; id: number
musicId: number; musicId: number
level: number; level: number
userPlayDate: string; trackNo: number
trackNo: number; vsRank: number
vsRank: number; achievement: number
achievement: number; deluxscore: number
deluxscore: number; scoreRank: number
scoreRank: number; maxCombo: number
maxCombo: number; totalCombo: number
totalCombo: number; maxSync: number
maxSync: number; totalSync: number
totalSync: number; tapCriticalPerfect: number
tapCriticalPerfect: number; tapPerfect: number
tapPerfect: number; tapGreat: number
tapGreat: number; tapGood: number
tapGood: number; tapMiss: number
tapMiss: number; holdCriticalPerfect: number
holdCriticalPerfect: number; holdPerfect: number
holdPerfect: number; holdGreat: number
holdGreat: number; holdGood: number
holdGood: number; holdMiss: number
holdMiss: number; slideCriticalPerfect: number
slideCriticalPerfect: number; slidePerfect: number
slidePerfect: number; slideGreat: number
slideGreat: number; slideGood: number
slideGood: number; slideMiss: number
slideMiss: number; touchCriticalPerfect: number
touchCriticalPerfect: number; touchPerfect: number
touchPerfect: number; touchGreat: number
touchGreat: number; touchGood: number
touchGood: number; touchMiss: number
touchMiss: number; breakCriticalPerfect: number
breakCriticalPerfect: number; breakPerfect: number
breakPerfect: number; breakGreat: number
breakGreat: number; breakGood: number
breakGood: number; breakMiss: number
breakMiss: number; isTap: boolean
isTap: boolean; isHold: boolean
isHold: boolean; isSlide: boolean
isSlide: boolean; isTouch: boolean
isTouch: boolean; isBreak: boolean
isBreak: boolean; isCriticalDisp: boolean
isCriticalDisp: boolean; isFastLateDisp: boolean
isFastLateDisp: boolean; fastCount: number
fastCount: number; lateCount: number
lateCount: number; isAchieveNewRecord: boolean
isAchieveNewRecord: boolean; isDeluxscoreNewRecord: boolean
isDeluxscoreNewRecord: boolean; comboStatus: number
comboStatus: number; syncStatus: number
syncStatus: number; isClear: boolean
isClear: boolean; beforeRating: number
beforeRating: number; afterRating: number
afterRating: number; beforeGrade: number
beforeGrade: number; afterGrade: number
afterGrade: number; afterGradeRank: number
afterGradeRank: number; beforeDeluxRating: number
beforeDeluxRating: number; afterDeluxRating: number
afterDeluxRating: number; isPlayTutorial: boolean
isPlayTutorial: boolean; isEventMode: boolean
isEventMode: boolean; isFreedomMode: boolean
isFreedomMode: boolean; playMode: number
playMode: number; isNewFree: boolean
isNewFree: boolean; trialPlayAchievement: number
trialPlayAchievement: number; extNum1: number
extNum1: number; extNum2: number
extNum2: number;
extNum4: number;
extBool1: boolean;
} }

90
AquaNet/src/libs/ui.ts
View File

@@ -6,13 +6,17 @@ import {
LineElement, LineElement,
LinearScale, LinearScale,
PointElement, PointElement,
CategoryScale, TimeScale, type ChartOptions, type LineOptions, CategoryScale,
TimeScale,
type ChartOptions,
type LineOptions,
} from 'chart.js' } from 'chart.js'
import moment from 'moment/moment' import moment from 'moment/moment'
// @ts-expect-error Cal-heatmap does not have proper types // @ts-ignore
import CalHeatmap from 'cal-heatmap' import CalHeatmap from 'cal-heatmap'
// @ts-expect-error Cal-heatmap does not have proper types // @ts-ignore
import CalTooltip from 'cal-heatmap/plugins/Tooltip' import CalTooltip from 'cal-heatmap/plugins/Tooltip'
import type {Line} from 'svelte-chartjs'
export function title(t: string) { export function title(t: string) {
document.title = `AquaNet - ${t}` document.title = `AquaNet - ${t}`
@@ -31,62 +35,72 @@ export function registerChart() {
) )
} }
export function renderCal(el: HTMLElement, d: {date: any, value: any}[]) { export function renderCal(el: HTMLElement, d: {date: any; value: any}[]) {
const cal = new CalHeatmap() const cal = new CalHeatmap()
return cal.paint({ return cal.paint(
itemSelector: el, {
domain: { itemSelector: el,
type: 'month', domain: {
label: { text: 'MMM', textAlign: 'start', position: 'top' }, type: 'month',
}, label: {text: 'MMM', textAlign: 'start', position: 'top'},
subDomain: {
type: 'ghDay',
radius: 2, width: 11, height: 11, gutter: 4
},
range: 12,
data: { source: d, x: 'date', y: 'value' },
scale: {
color: {
type: 'linear',
range: [ '#14432a', '#4dd05a' ],
domain: [ 0, d.reduce((a, b) => Math.max(a, b.value), 0) ]
}, },
subDomain: {
type: 'ghDay',
radius: 2,
width: 11,
height: 11,
gutter: 4,
},
range: 12,
data: {source: d, x: 'date', y: 'value'},
scale: {
color: {
type: 'linear',
range: ['#14432a', '#4dd05a'],
domain: [0, d.reduce((a, b) => Math.max(a, b.value), 0)],
},
},
date: {start: moment().subtract(1, 'year').add(1, 'month').toDate()},
theme: 'dark',
}, },
date: { start: moment().subtract(1, 'year').add(1, 'month').toDate() }, [
theme: 'dark', [
}, [ CalTooltip,
[ CalTooltip, { text: (_: Date, v: number, d: any) => {
`${v ?? 'No'} songs played on ${d.format('MMMM D, YYYY')}` }] text: (_: Date, v: number, d: any) =>
]) `${v ?? 'No'} songs played on ${d.format('MMMM D, YYYY')}`,
},
],
]
)
} }
export const CHARTJS_OPT: ChartOptions<'line'> = { export const CHARTJS_OPT: ChartOptions<'line'> = {
responsive: true, responsive: true,
maintainAspectRatio: false, maintainAspectRatio: false,
// TODO: Show point on hover // TODO: Show point on hover
elements: { elements: {
point: { point: {
radius: 0 radius: 0,
} },
}, },
scales: { scales: {
xAxis: { xAxis: {
type: 'time', type: 'time',
display: false display: false,
}, },
y: { y: {
display: false, display: false,
} },
}, },
plugins: { plugins: {
legend: { legend: {
display: false display: false,
}, },
tooltip: { tooltip: {
mode: 'index', mode: 'index',
intersect: false intersect: false,
} },
}, },
} }
@@ -95,6 +109,8 @@ export const CHARTJS_OPT: ChartOptions<'line'> = {
* *
* @param obj HashMap<string, boolean> * @param obj HashMap<string, boolean>
*/ */
export function clazz(obj: { [key: string]: boolean }) { export function clazz(obj: {[key: string]: boolean}) {
return Object.keys(obj).filter(k => obj[k]).join(' ') return Object.keys(obj)
.filter((k) => obj[k])
.join(' ')
} }

5
AquaNet/src/main.ts
View File

@@ -1,6 +1,7 @@
import './app.sass' import './app.sass'
import App from './App.svelte' import App from './App.svelte'
const app = new App({ target: document.getElementById('app')! }) // @ts-ignore
const app = new App({target: document.getElementById('app')})
export default app export default app

166
AquaNet/src/pages/Home.svelte
View File

@@ -1,83 +1,83 @@
<main id="home" class="no-margin"> <main id="home" class="no-margin">
<h1>AquaNet</h1> <h1>AquaNet</h1>
<div class="btn-group"> <div class="btn-group">
<button>Login</button> <button>Login</button>
<button>Sign Up</button> <button>Sign Up</button>
</div> </div>
<div class="light-pollution"> <div class="light-pollution">
<div class="l1"></div> <div class="l1"></div>
<div class="l2"></div> <div class="l2"></div>
<div class="l3"></div> <div class="l3"></div>
</div> </div>
</main> </main>
<style lang="sass"> <style lang="sass">
@import "../vars" @import "../vars"
#home #home
color: $c-main color: $c-main
position: relative position: relative
width: 100% width: 100%
height: 100% height: 100%
padding-left: 100px padding-left: 100px
overflow: hidden overflow: hidden
box-sizing: border-box box-sizing: border-box
display: flex display: flex
flex-direction: column flex-direction: column
justify-content: center justify-content: center
margin-top: -$nav-height margin-top: -$nav-height
> h1 > h1
font-family: Quicksand, $font font-family: Quicksand, $font
user-select: none user-select: none
// Gap between text characters // Gap between text characters
letter-spacing: 0.2em letter-spacing: 0.2em
margin-top: 0 margin-top: 0
opacity: 0.9 opacity: 0.9
.btn-group .btn-group
display: flex display: flex
gap: 8px gap: 8px
.light-pollution .light-pollution
pointer-events: none pointer-events: none
opacity: 0.6 opacity: 0.6
> div > div
position: absolute position: absolute
z-index: -1 z-index: -1
.l1 .l1
left: -560px left: -560px
top: 90px top: 90px
height: 1130px height: 1130px
width: 1500px width: 1500px
$color: rgb(158, 110, 230) $color: rgb(158, 110, 230)
background: radial-gradient(50% 50% at 50% 50%, rgba($color, 0.28) 0%, rgba($color, 0) 100%) background: radial-gradient(50% 50% at 50% 50%, rgba($color, 0.28) 0%, rgba($color, 0) 100%)
.l2 .l2
left: -200px left: -200px
top: 560px top: 560px
height: 1200px height: 1200px
width: 1500px width: 1500px
$color: rgb(92, 195, 250) $color: rgb(92, 195, 250)
background: radial-gradient(50% 50% at 50% 50%, rgba($color, 0.28) 0%, rgba($color, 0) 100%) background: radial-gradient(50% 50% at 50% 50%, rgba($color, 0.28) 0%, rgba($color, 0) 100%)
.l3 .l3
left: -600px left: -600px
opacity: 0.7 opacity: 0.7
top: -630px top: -630px
width: 1500px width: 1500px
height: 1000px height: 1000px
$color: rgb(230, 110, 156) $color: rgb(230, 110, 156)
background: radial-gradient(50% 50% at 50% 50%, rgba($color, 0.28) 0%, rgba($color, 0) 100%) background: radial-gradient(50% 50% at 50% 50%, rgba($color, 0.28) 0%, rgba($color, 0) 100%)
@media (max-width: 500px) @media (max-width: 500px)
align-items: center align-items: center
padding-left: 0 padding-left: 0
</style> </style>

418
AquaNet/src/pages/MaimaiRating.svelte
View File

@@ -1,199 +1,219 @@
<script lang="ts"> <script lang="ts">
import {data_host} from "../libs/config"; import {data_host} from '../libs/config'
import {getMaimaiAllMusic, getMaimai, getMult} from "../libs/maimai"; import {getMaimaiAllMusic, getMaimai, getMult} from '../libs/maimai'
import type {ParsedRating, Rating} from "../libs/maimaiTypes"; import type {ParsedRating, Rating} from '../libs/maimaiTypes'
export let userId: any export let userId: any
userId = +userId userId = +userId
if (!userId) console.error("No user ID provided") if (!userId) console.error('No user ID provided')
Promise.all([ Promise.all([
getMaimai("GetUserRatingApi", {userId}), getMaimai('GetUserRatingApi', {userId}),
getMaimaiAllMusic() getMaimaiAllMusic(),
]).then(([rating, music]) => { ]).then(([rating, music]) => {
data = rating data = rating
musicInfo = music musicInfo = music
if (!data || !musicInfo) { if (!data || !musicInfo) {
console.error("Failed to fetch data") console.error('Failed to fetch data')
return return
} }
parsedRatings = { parsedRatings = {
old: parseRating(data.userRating.ratingList), old: parseRating(data.userRating.ratingList),
new: parseRating(data.userRating.newRatingList) new: parseRating(data.userRating.newRatingList),
} }
}) })
function parseRating(arr: Rating[]) { function parseRating(arr: Rating[]) {
return arr.map(x => { return arr
const music = musicInfo[x.musicId] .map((x) => {
const music = musicInfo[x.musicId]
if (!music) {
console.error(`Music not found: ${x.musicId}`) if (!music) {
return null console.error(`Music not found: ${x.musicId}`)
} return null
}
music.note = music.notes[x.level]
const mult = getMult(x.achievement) music.note = music.notes[x.level]
return { const mult = getMult(x.achievement)
...x, return {
music: music, ...x,
calc: (mult[1] as number) * music.note.lv, music: music,
rank: mult[2] calc: (mult[1] as number) * music.note.lv,
} rank: mult[2],
}).filter(x => x != null) as ParsedRating[] }
} })
.filter((x) => x != null) as ParsedRating[]
let parsedRatings: { }
old: ParsedRating[],
new: ParsedRating[] let parsedRatings: {
} | null = null old: ParsedRating[]
new: ParsedRating[]
let data: { } | null = null
userRating: {
rating: number, let data: {
ratingList: Rating[], userRating: {
newRatingList: Rating[] rating: number
} ratingList: Rating[]
} | null = null newRatingList: Rating[]
}
let musicInfo: any = null } | null = null
</script>
let musicInfo: any = null
<main> </script>
<!-- Display all parsed ratings -->
{#if parsedRatings} <main>
{#each [{title: "Old", data: parsedRatings.old}, {title: "New", data: parsedRatings.new}] as section} <!-- Display all parsed ratings -->
<h2>{section.title}</h2> {#if parsedRatings}
<div class="rating-cards"> {#each [{title: 'Old', data: parsedRatings.old}, {title: 'New', data: parsedRatings.new}] as section}
{#each section.data as rating} <h2>{section.title}</h2>
<div class="level-{rating.level}"> <div class="rating-cards">
<img class="cover" {#each section.data as rating}
src={`${data_host}/maimai/assetbundle/jacket_s/00${rating.musicId.toString().padStart(6, '0').substring(2)}.png`} <div class="level-{rating.level}">
alt=""> <img
class="cover"
<div class="detail"> src={`${data_host}/maimai/assetbundle/jacket_s/00${rating.musicId
<span class="name">{rating.music.name}</span> .toString()
<span class="rating"> .padStart(6, '0')
<span>{(rating.achievement / 10000).toFixed(2)}%</span> .substring(2)}.png`}
<img class="rank" src={`${data_host}/maimai/sprites/rankimage/UI_GAM_Rank_${rating.rank}.png`} alt=""> alt=""
</span> />
<span>{rating.calc.toFixed(1)}</span>
</div> <div class="detail">
<img class="ver" <span class="name">{rating.music.name}</span>
src={`${data_host}/maimai/sprites/tab/title/UI_CMN_TabTitle_MaimaiTitle_Ver${rating.music.ver.toString().substring(0, 3)}.png`} <span class="rating">
alt=""> <span>{(rating.achievement / 10000).toFixed(2)}%</span>
<div class="lv">{rating.music.note.lv}</div> <img
</div> class="rank"
{/each} src={`${data_host}/maimai/sprites/rankimage/UI_GAM_Rank_${rating.rank}.png`}
</div> alt=""
{/each} />
{/if} </span>
</main> <span>{rating.calc.toFixed(1)}</span>
</div>
<style lang="sass"> <img
.rating-cards class="ver"
display: grid src={`${data_host}/maimai/sprites/tab/title/UI_CMN_TabTitle_MaimaiTitle_Ver${rating.music.ver
gap: 2rem .toString()
width: 100% .substring(0, 3)}.png`}
alt=""
// Fill as many columns as possible />
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr)) <div class="lv">{rating.music.note.lv}</div>
</div>
// Center the cards {/each}
justify-items: center </div>
align-items: center {/each}
{/if}
// Style each card </main>
> div
$border-radius: 20px <style lang="sass">
width: 200px .rating-cards
height: 200px display: grid
border-radius: $border-radius gap: 2rem
width: 100%
display: flex
position: relative // Fill as many columns as possible
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr))
// Difficulty border
border: 5px solid var(--lv-color) // Center the cards
justify-items: center
img align-items: center
object-fit: cover
pointer-events: none // Style each card
> div
img.cover $border-radius: 20px
width: 100% width: 200px
height: 100% height: 200px
border-radius: calc($border-radius - 3px) border-radius: $border-radius
img.ver display: flex
position: absolute position: relative
top: -20px
left: -30px // Difficulty border
height: 50px border: 5px solid var(--lv-color, #60aaff)
&.level-1
// Information --lv-color: #aaff60
.detail &.level-2
position: absolute --lv-color: #f25353
bottom: 0 &.level-3
left: 0 --lv-color: #e881ff
right: 0
padding: 10px img
background: rgba(0, 0, 0, 0.5) object-fit: cover
border-radius: 0 0 calc($border-radius - 3px) calc($border-radius - 3px) pointer-events: none
// Blur img.cover
backdrop-filter: blur(3px) width: 100%
height: 100%
display: flex border-radius: calc($border-radius - 3px)
flex-direction: column
text-align: left img.ver
position: absolute
> span top: -20px
// Disable text wrapping, max 2 lines left: -30px
overflow: hidden height: 50px
text-overflow: ellipsis
white-space: nowrap // Information
.detail
.name position: absolute
font-size: 1.2em bottom: 0
font-weight: bold left: 0
right: 0
.rating padding: 10px
display: flex background: rgba(0, 0, 0, 0.5)
border-radius: 0 0 calc($border-radius - 3px) calc($border-radius - 3px)
img
height: 1.5em // Blur
backdrop-filter: blur(3px)
.lv
position: absolute display: flex
bottom: 0 flex-direction: column
right: 0 text-align: left
padding: 5px 10px
background: var(--lv-color) > span
// Top left border radius // Disable text wrapping, max 2 lines
border-radius: 10px 0 overflow: hidden
text-overflow: ellipsis
font-size: 1.3em white-space: nowrap
&:before .name
content: "Lv" font-size: 1.2em
font-size: 0.8em font-weight: bold
// Mobile .rating
@media (max-width: 500px) display: flex
margin-left: -1rem img
margin-right: -1rem height: 1.5em
width: calc(100% + 2rem)
grid-template-columns: repeat(auto-fill, minmax(130px, 1fr)) .lv
font-size: 0.8em position: absolute
> div bottom: 0
width: 150px right: 0
height: 150px padding: 5px 10px
background: var(--lv-color)
img.ver // Top left border radius
height: 45px border-radius: 10px 0
left: -20px
</style> font-size: 1.3em
&:before
content: "Lv"
font-size: 0.8em
// Mobile
@media (max-width: 500px)
margin-left: -1rem
margin-right: -1rem
width: calc(100% + 2rem)
grid-template-columns: repeat(auto-fill, minmax(130px, 1fr))
font-size: 0.8em
> div
width: 150px
height: 150px
img.ver
height: 45px
left: -20px
</style>

824
AquaNet/src/pages/UserHome.svelte
View File

@@ -1,398 +1,426 @@
<script lang="ts"> <script lang="ts">
import {CHARTJS_OPT, clazz, registerChart, renderCal, title} from "../libs/ui"; import {CHARTJS_OPT, clazz, registerChart, renderCal, title} from '../libs/ui'
import {getMaimaiAllMusic, getMaimaiTrend, getMaimaiUser, getMult} from "../libs/maimai"; import {
import type {MaimaiMusic, MaimaiUserPlaylog, MaimaiUserSummaryEntry} from "../libs/maimaiTypes"; getMaimaiAllMusic,
import type {TrendEntry} from "../libs/generalTypes"; getMaimaiTrend,
import {data_host} from "../libs/config"; getMaimaiUser,
import 'cal-heatmap/cal-heatmap.css'; getMult,
import { Line } from 'svelte-chartjs'; } from '../libs/maimai'
import moment from "moment"; import type {
import 'chartjs-adapter-moment'; MaimaiMusic,
MaimaiUserPlaylog,
registerChart() MaimaiUserSummaryEntry,
} from '../libs/maimaiTypes'
export let userId: any; import type {TrendEntry} from '../libs/generalTypes'
userId = +userId import {data_host} from '../libs/config'
let calElement: HTMLElement import 'cal-heatmap/cal-heatmap.css'
import {Line} from 'svelte-chartjs'
title(`User ${userId}`) import moment from 'moment'
import 'chartjs-adapter-moment'
interface MusicAndPlay extends MaimaiMusic, MaimaiUserPlaylog {}
registerChart()
let d: {
user: MaimaiUserSummaryEntry, export let userId: any
trend: TrendEntry[] userId = +userId
recent: MusicAndPlay[] let calElement: HTMLElement
} | null = null
title(`User ${userId}`)
Promise.all([
getMaimaiUser(userId), interface MusicAndPlay extends MaimaiMusic, MaimaiUserPlaylog {}
getMaimaiTrend(userId),
getMaimaiAllMusic() let d: {
]).then(([user, trend, music]) => { user: MaimaiUserSummaryEntry
console.log(user) trend: TrendEntry[]
console.log(trend) recent: MusicAndPlay[]
console.log(music) } | null = null
// Sort recent by date Promise.all([
user.recent.sort((a, b) => b.userPlayDate < a.userPlayDate ? -1 : 1) getMaimaiUser(userId),
getMaimaiTrend(userId),
d = {user, trend, recent: user.recent.map(it => {return {...music[it.musicId], ...it}})} getMaimaiAllMusic(),
localStorage.setItem("tmp-user-details", JSON.stringify(d)) ]).then(([user, trend, music]) => {
renderCal(calElement, trend.map(it => {return {date: it.date, value: it.plays}})) console.log(user)
}) console.log(trend)
</script> console.log(music)
<main id="user-home"> d = {
{#if d !== null} user,
<div class="user-pfp"> trend,
<img src={`${data_host}/maimai/assetbundle/icon/${d.user.iconId.toString().padStart(6, "0")}.png`} alt="" class="pfp"> recent: user.recent.map((it) => {
<h2>{d.user.name}</h2> return {...music[it.musicId], ...it}
</div> }),
}
<div> localStorage.setItem('tmp-user-details', JSON.stringify(d))
<h2>Rating Statistics</h2> renderCal(
<div class="scoring-info"> calElement,
<div class="chart"> trend.map((it) => {
<div class="info-top"> return {date: it.date, value: it.plays}
<div class="rating"> })
<span>DX Rating</span> )
<span>{d.user.rating.toLocaleString()}</span> })
</div> </script>
<div class="rank"> <main id="user-home">
<span>Server Rank</span> {#if d !== null}
<span>#{d.user.serverRank.toLocaleString()}</span> <div class="user-pfp">
</div> <img
</div> src={`${data_host}/maimai/assetbundle/icon/${d.user.iconId.toString().padStart(6, '0')}.png`}
alt=""
<div class="trend"> class="pfp"
<!-- ChartJS cannot be fully responsive unless there is a parent div that's independent from its size and helps it determine its size --> />
<div class="chartjs-box-reference"> <h2>{d.user.name}</h2>
<Line data={{ </div>
datasets: [
{ <div>
label: 'Rating', <h2>Rating Statistics</h2>
data: d.trend.map(it => {return {x: Date.parse(it.date), y: it.rating}}), <div class="scoring-info">
borderColor: '#646cff', <div class="chart">
tension: 0.1, <div class="info-top">
<div class="rating">
// TODO: Set X axis span to 3 months <span>DX Rating</span>
} <span>{d.user.rating.toLocaleString()}</span>
] </div>
}} options={CHARTJS_OPT} />
</div> <div class="rank">
</div> <span>Server Rank</span>
<span>#{d.user.serverRank.toLocaleString()}</span>
<div class="info-bottom"> </div>
{#each d.user.ranks as r} </div>
<div>
<span>{r.name}</span> <div class="trend">
<span>{r.count}</span> <!-- ChartJS cannot be fully responsive unless there is a parent div that's independent from its size and helps it determine its size -->
</div> <div class="chartjs-box-reference">
{/each} <Line
</div> data={{
</div> datasets: [
{
<div class="other-info"> label: 'Rating',
<div class="accuracy"> data: d.trend.map((it) => {
<span>Accuracy</span> return {x: Date.parse(it.date), y: it.rating}
<span>{(d.user.accuracy / 10000).toFixed(2)}%</span> }),
</div> borderColor: '#646cff',
tension: 0.1,
<div class="max-combo">
<span>Max Combo</span> // TODO: Set X axis span to 3 months
<span>{d.user.maxCombo}</span> },
</div> ],
}}
<div class="full-combo"> options={CHARTJS_OPT}
<span>Full Combo</span> />
<span>{d.user.fullCombo}</span> </div>
</div> </div>
<div class="all-perfect"> <div class="info-bottom">
<span>All Perfect</span> {#each d.user.ranks as r}
<span>{d.user.allPerfect}</span> <div>
</div> <span>{r.name}</span>
<span>{r.count}</span>
<div class="total-dx-score"> </div>
<span>DX Score</span> {/each}
<span>{d.user.totalDxScore.toLocaleString()}</span> </div>
</div> </div>
</div>
</div> <div class="other-info">
</div> <div class="accuracy">
<span>Accuracy</span>
<div> <span>{(d.user.accuracy / 10000).toFixed(2)}%</span>
<h2>Play Activity</h2> </div>
<div class="activity-info">
<div id="cal-heatmap" bind:this={calElement} /> <div class="max-combo">
<span>Max Combo</span>
<div class="info-bottom"> <span>{d.user.maxCombo}</span>
<div class="plays"> </div>
<span>Plays</span>
<span>{d.user.plays}</span> <div class="full-combo">
</div> <span>Full Combo</span>
<span>{d.user.fullCombo}</span>
<div class="time"> </div>
<span>Play Time</span>
<span>{(d.user.totalPlayTime / 60 / 60).toFixed(1)} hr</span> <div class="all-perfect">
</div> <span>All Perfect</span>
<span>{d.user.allPerfect}</span>
<div class="first-play"> </div>
<span>First Seen</span>
<span>{moment(d.user.joined).format("YYYY-MM-DD")}</span> <div class="total-dx-score">
</div> <span>DX Score</span>
<span>{d.user.totalDxScore.toLocaleString()}</span>
<div class="last-play"> </div>
<span>Last Seen</span> </div>
<span>{moment(d.user.lastSeen).format("YYYY-MM-DD")}</span> </div>
</div> </div>
<div class="last-version"> <div>
<span>Last Version</span> <h2>Play Activity</h2>
<span>{d.user.lastVersion}</span> <div class="activity-info">
</div> <div id="cal-heatmap" bind:this={calElement} />
</div>
</div> <div class="info-bottom">
</div> <div class="plays">
<span>Plays</span>
<div class="recent"> <span>{d.user.plays}</span>
<h2>Recent Scores</h2> </div>
<div class="scores">
{#each d.recent as r, i} <div class="time">
<div class={clazz({alt: i % 2 === 0})}> <span>Play Time</span>
<img src={`${data_host}/maimai/assetbundle/jacket_s/00${r.musicId.toString().padStart(6, '0').substring(2)}.png`} alt=""> <span>{(d.user.totalPlayTime / 60 / 60).toFixed(1)} hr</span>
<div class="info"> </div>
<div>
<span class="name">{r.name}</span> <div class="first-play">
</div> <span>First Seen</span>
<div> <span>{moment(d.user.joined).format('YYYY-MM-DD')}</span>
<span class={`lv level-${r.level}`}>{r.notes[r.level].lv}</span> </div>
<span class={"rank-" + ("" + getMult(r.achievement)[2])[0]}>
<span class="rank-text">{("" + getMult(r.achievement)[2]).replace("p", "+")}</span> <div class="last-play">
<span class="rank-num">{(r.achievement / 10000).toFixed(2)}%</span> <span>Last Seen</span>
</span> <span>{moment(d.user.lastSeen).format('YYYY-MM-DD')}</span>
<span class={"dx-change " + clazz({increased: r.afterDeluxRating - r.beforeDeluxRating > 0})}> </div>
{r.afterDeluxRating - r.beforeDeluxRating}
</span> <div class="last-version">
</div> <span>Last Version</span>
</div> <span>{d.user.lastVersion}</span>
</div> </div>
{/each} </div>
</div> </div>
</div> </div>
{:else}
<p>Loading...</p> <div class="recent">
{/if} <h2>Recent Scores</h2>
</main> <div class="scores">
{#each d.recent as r, i}
<style lang="sass"> <div class={clazz({alt: i % 2 === 0})}>
@import "../vars" <img
src={`${data_host}/maimai/assetbundle/jacket_s/00${r.musicId.toString().padStart(6, '0').substring(2)}.png`}
$gap: 20px alt=""
/>
#user-home <div class="info">
display: flex <span class="name">{r.name}</span>
flex-direction: column <div>
gap: $gap <span class={'rank-' + ('' + getMult(r.achievement)[2])[0]}>
margin: 100px auto 0 <span class="rank-text"
padding: 0 32px 32px >{('' + getMult(r.achievement)[2]).replace('p', '+')}</span
min-height: 100% >
max-width: $w-max <span class="rank-num"
>{(r.achievement / 10000).toFixed(2)}%</span
background-color: rgba(black, 0.2) >
border-radius: 16px 16px 0 0 </span>
<span
@media (max-width: #{$w-max + (64px) * 2}) class={'dx-change ' +
margin: 100px 32px 0 clazz({
padding: 0 32px 16px increased: r.afterDeluxRating - r.beforeDeluxRating > 0,
})}
@media (max-width: $w-mobile) >
margin: 100px 0 0 {r.afterDeluxRating - r.beforeDeluxRating}
padding: 0 32px 16px </span>
</div>
.user-pfp </div>
display: flex </div>
align-items: flex-end {/each}
gap: $gap </div>
margin-top: -40px </div>
{:else}
h2 <p>Loading...</p>
font-size: 2rem {/if}
margin: 0 </main>
.pfp <style lang="sass">
width: 100px @import "../vars"
height: 100px
border-radius: 5px $gap: 20px
object-fit: cover
#user-home
.info-bottom, .info-top, .other-info display: flex
display: flex flex-direction: column
gap: $gap gap: $gap
margin: 100px auto 0
> div padding: 0 32px 32px
display: flex min-height: 100%
flex-direction: column max-width: $w-max
> span:first-child background-color: rgba(black, 0.2)
font-weight: bold border-radius: 16px 16px 0 0
font-size: 0.8rem
@media (max-width: #{$w-max + (64px) * 2})
// character spacing margin: 100px 32px 0
letter-spacing: 0.1em padding: 0 32px 16px
color: $c-main
@media (max-width: $w-mobile)
.info-top > div > span:last-child margin: 100px 0 0
font-size: 1.5rem padding: 0 32px 16px
.scoring-info .user-pfp
display: flex display: flex
gap: $gap align-items: flex-end
max-height: 250px gap: $gap
margin-top: -40px
.chart
flex: 0 1 790px h2
display: flex font-size: 2rem
flex-direction: column margin: 0
.other-info .pfp
flex: 1 0 100px width: 100px
flex-direction: column height: 100px
gap: 0 border-radius: 5px
justify-content: space-between object-fit: cover
.trend .info-bottom, .info-top, .other-info
height: 300px display: flex
width: 100% gap: $gap
max-width: 790px
> div
position: relative display: flex
flex-direction: column
> .chartjs-box-reference
position: absolute > span:first-child
inset: 0 font-weight: bold
font-size: 0.8rem
@media (max-width: $w-mobile)
flex-direction: column // character spacing
max-height: unset letter-spacing: 0.1em
color: $c-main
.chart
flex: 0 .info-top > div > span:last-child
font-size: 1.5rem
.trend
max-height: 130px .scoring-info
display: flex
.other-info gap: $gap
> div max-height: 250px
flex-direction: row
justify-content: space-between .chart
flex: 0 1 790px
.info-bottom display: flex
justify-content: space-between flex-direction: column
.activity-info .other-info
display: flex flex: 1 0 100px
flex-direction: column flex-direction: column
gap: $gap gap: 0
justify-content: space-between
#cal-heatmap
overflow-x: auto .trend
height: 300px
@media (max-width: $w-mobile) width: 100%
#cal-heatmap max-width: 790px
width: 100%
position: relative
.info-bottom
flex-direction: column > .chartjs-box-reference
gap: 0 position: absolute
inset: 0
> div
flex-direction: row @media (max-width: $w-mobile)
justify-content: space-between flex-direction: column
max-height: unset
// Recent Scores section
.recent .chart
.scores flex: 0
display: flex
flex-direction: column .trend
flex-wrap: wrap max-height: 130px
gap: $gap
.other-info
> div.alt > div
background-color: rgba(white, 0.03) flex-direction: row
border-radius: 10px justify-content: space-between
// Image and song info .info-bottom
> div justify-content: space-between
display: flex
align-items: center .activity-info
gap: $gap display: flex
padding-right: 16px flex-direction: column
max-width: 100% gap: $gap
box-sizing: border-box
#cal-heatmap
img overflow-x: auto
width: 50px
height: 50px @media (max-width: $w-mobile)
border-radius: 10px #cal-heatmap
object-fit: cover width: 100%
// Song info and score .info-bottom
> div flex-direction: column
flex: 1 gap: 0
display: flex
justify-content: space-between > div
flex-direction: row
// Limit song name to one line justify-content: space-between
overflow: hidden
.name // Recent Scores section
overflow: hidden .recent
overflow-wrap: anywhere .scores
white-space: nowrap display: flex
text-overflow: ellipsis flex-direction: column
flex-wrap: wrap
@media (max-width: $w-mobile) gap: $gap
flex-direction: column
gap: 0 > div.alt
background-color: rgba(white, 0.03)
.rank-text border-radius: 10px
text-align: left
// Image and song info
.rank-S > div
// Gold green gradient on text display: flex
background: linear-gradient(90deg, #ffee94, #ffb798, #ffa3e5, #ebff94) align-items: center
-webkit-background-clip: text gap: $gap
color: transparent padding-right: 16px
max-width: 100%
.rank-A box-sizing: border-box
color: #ff8a8a
img
.rank-B width: 50px
color: #6ba6ff height: 50px
border-radius: 10px
.lv object-fit: cover
background: var(--lv-color)
padding: 0 6px // Song info and score
border-radius: 10px > div
opacity: 0.8 flex: 1
margin-right: 10px display: flex
justify-content: space-between
span
display: inline-block // Limit song name to one line
text-align: right overflow: hidden
.name
// Vertical table-like alignment overflow: hidden
span.rank-text overflow-wrap: anywhere
min-width: 30px white-space: nowrap
span.rank-num text-overflow: ellipsis
min-width: 60px
span.dx-change @media (max-width: $w-mobile)
min-width: 30px flex-direction: column
gap: 0
span.increased
&:before span
content: "+" text-align: left
color: $c-good
</style> .rank-S
// Gold green gradient on text
background: linear-gradient(90deg, #ffee94, #ffb798, #ffa3e5, #ebff94)
-webkit-background-clip: text
color: transparent
.rank-A
color: #ff8a8a
.rank-B
color: #6ba6ff
span
display: inline-block
text-align: right
// Vertical table-like alignment
span.rank-text
min-width: 30px
span.rank-num
min-width: 60px
span.dx-change
min-width: 30px
span.increased
&:before
content: "+"
color: $c-good
</style>

11
AquaNet/src/vars.sass
View File

@@ -6,13 +6,4 @@ $c-bg: #242424
$nav-height: 4rem $nav-height: 4rem
$w-mobile: 560px $w-mobile: 560px
$w-max: 900px $w-max: 900px
.level-0
--lv-color: #6ED43E
.level-1
--lv-color: #F7B807
.level-2
--lv-color: #FF828D
.level-3
--lv-color: #A051DC

2
AquaNet/svelte.config.js
View File

@@ -1,4 +1,4 @@
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte' import {vitePreprocess} from '@sveltejs/vite-plugin-svelte'
export default { export default {
// Consult https://svelte.dev/docs#compile-time-svelte-preprocess // Consult https://svelte.dev/docs#compile-time-svelte-preprocess

2
AquaNet/tsconfig.json
View File

@@ -16,5 +16,5 @@
"isolatedModules": true "isolatedModules": true
}, },
"include": ["src/**/*.ts", "src/**/*.js", "src/**/*.svelte"], "include": ["src/**/*.ts", "src/**/*.js", "src/**/*.svelte"],
"references": [{ "path": "./tsconfig.node.json" }] "references": [{"path": "./tsconfig.node.json"}]
} }

4
AquaNet/vite.config.ts
View File

@@ -1,5 +1,5 @@
import { defineConfig } from 'vite' import {defineConfig} from 'vite'
import { svelte } from '@sveltejs/vite-plugin-svelte' import {svelte} from '@sveltejs/vite-plugin-svelte'
// https://vitejs.dev/config/ // https://vitejs.dev/config/
export default defineConfig({ export default defineConfig({

772
AquaNet/yarn.lock
View File

File diff suppressed because it is too large Load Diff

30
README.md
View File

@@ -1,6 +1,6 @@
# AquaDX # AquaDX
Multipurpose game server powered by Spring Boot, for ALL.Net-based games Multipurpose game server powered by Spring Boot, for ALL.Net based games
This is an attempt to rebuild the [original Aqua server](https://dev.s-ul.net/NeumPhis/aqua) This is an attempt to rebuild the [original Aqua server](https://dev.s-ul.net/NeumPhis/aqua)
@@ -26,9 +26,9 @@ Check out these docs for more information.
* [Frequently asked questions](docs/frequently_asked_questions.md) * [Frequently asked questions](docs/frequently_asked_questions.md)
### Notes ### Notes
* Some games may require additional patches and these will not provided in this project and repository. You already found this, so you know where to find related resources too. * Some game may require additional patches and these will not provided in this project and repository. You already found this, so you know where to find related resources too.
* This repository may contain untested, experimental implementations for a few games which I can't test properly. If you couldn't find your wanted game in the above list, do not expect support. * This repository may contain untested, experimental implementation for few games which I can't test properly. If you couldn't find your wanted game in the above list, do not expect support.
* This server also provides a simple API for viewing play records and editing settings for some games. * This server also provides a simple API for viewing play records and edit settings for some games.
### Usage ### Usage
@@ -37,28 +37,28 @@ Check out these docs for more information.
3. Extract the zip file to a folder. 3. Extract the zip file to a folder.
4. Run `java -jar aqua.jar` in the folder. 4. Run `java -jar aqua.jar` in the folder.
By default, Aqua will use SQLite and save user data in `data/db.sqlite`. By default, Aqua will use sqlite and save user data in data/db.sqlite.
If you want to use optional databases, please edit the configuration file then it will auto-create the table and import some initial data. If you want to use optional databases, edit configuration file then it will auto create the table and import some initial data.
### Configuration ### Configuration
Configuration is saved in `config/application.properties`, spring loads this file automatically. Configuration is saved in `config/application.properties`, spring loads this file automatically.
* The host and port of game title servers can be overwritten in `allnet.server.host` and `allnet.server.port`. By default it will send the same host and port the client used the request this information. * The host and port of game title servers can be overritten in `allnet.server.host` and `allnet.server.port`. By default it will send the same host and port the client used the request this information.
This will be sent to the game at booting and being used by the following request. This will be sent to the game at booting and being used by following request.
* You can switch to the MariaDB (or MySQL) database by commenting the Sqlite part. * You can switch to MariaDB (or MySQL) database by commenting the Sqlite part.
* For some games, you might need to change some game-specific config entries. * For some game, you might need to change some game specific config entries.
### Building ### Building
You need to install JDK on your system. However, you don't need to install Gradle separately, as the `gradlew` wrapper script is included. You need to install JDK on your system. However, you don't need to care about Gradle, as wrapper script is included.
``` ```
gradlew clean build gradlew clean build
``` ```
The `build/libs` folder will contain a jar file. The `build/libs` folder will contain an jar file.
### Credit ### Credit
* **samnyan**: The creator and developer of the original Aqua server * **samnyan**: The creator and developer of the original Aqua server
* **Akasaka Ryuunosuke**: providing all the DIVA protocol information * **Akasaka Ryuunosuke** : providing all the DIVA protocol information
* Dom Eori: Developer of forked Aqua server, from v0.0.17 and up * Dom Eori : Developer of forked Aqua server, from v0.0.17 and up
* All devs who contribute to the [MiniMe server](https://dev.s-ul.net/djhackers/minime) * All devs who contribute to the [MiniMe server](https://dev.s-ul.net/djhackers/minime)
* All contributors by merge requests, issues and other channels * All contributors by merge request, issues and other channels

6
build.gradle.kts
View File

@@ -36,9 +36,9 @@ dependencies {
testImplementation("org.springframework.security:spring-security-test") testImplementation("org.springframework.security:spring-security-test")
// Database // Database
runtimeOnly("com.mysql:mysql-connector-j:8.3.0") runtimeOnly("com.mysql:mysql-connector-j:8.0.33")
runtimeOnly("org.mariadb.jdbc:mariadb-java-client:3.3.2") runtimeOnly("org.mariadb.jdbc:mariadb-java-client:3.1.3")
runtimeOnly("org.xerial:sqlite-jdbc:3.45.1.0") runtimeOnly("org.xerial:sqlite-jdbc:3.41.2.1")
implementation("com.github.gwenn:sqlite-dialect:0.1.4") implementation("com.github.gwenn:sqlite-dialect:0.1.4")
// JSR305 for nullable // JSR305 for nullable

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
networkTimeout=10000 networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

184
gradlew.bat vendored
View File

@@ -1,92 +1,92 @@
@rem @rem
@rem Copyright 2015 the original author or authors. @rem Copyright 2015 the original author or authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem https://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS, @rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%"=="" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@rem @rem
@rem ########################################################################## @rem ##########################################################################
@rem Set local scope for the variables with windows NT shell @rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused @rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter. @rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:findJavaFromJavaHome :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL% set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE% exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
:omega :omega

2
src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserDetail.java
View File

@@ -153,6 +153,4 @@ public class UserDetail implements Serializable {
@Transient @Transient
private int cmLastEmoneyCredit = 69; private int cmLastEmoneyCredit = 69;
private int mapStock; private int mapStock;
private int currentPlayCount;
private int renameCredit;
} }

5
src/main/java/icu/samnyan/aqua/sega/maimai2/model/userdata/UserPlaylog.java
View File

@@ -255,9 +255,4 @@ public class UserPlaylog implements Serializable {
private int extNum2; private int extNum2;
private int extNum4;
@JsonProperty("extBool1")
private boolean extBool1;
} }

14
src/main/resources/db/migration/mariadb/V252__add_maimai_140_h031_events.sql
View File

@@ -1,14 +0,0 @@
INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES
(23120811, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120821, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120822, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120823, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120824, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120825, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120841, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120842, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120843, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120844, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120851, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120852, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23122271, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1');

5
src/main/resources/db/migration/mariadb/V253__add_maimai2_charge.sql
View File

@@ -1,5 +0,0 @@
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (1, 1, 2, 1, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (2, 2, 3, 2, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (3, 3, 4, 3, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (4, 4, 5, 4, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (5, 5, 6, 5, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');

4
src/main/resources/db/migration/mariadb/V254__add_maimai_140_h041_events.sql
View File

@@ -1,4 +0,0 @@
INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES
(24011111, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(24011121, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(24011141, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1');

17
src/main/resources/db/migration/mariadb/V255_2__fix_null.sql
View File

@@ -1,17 +0,0 @@
-- maimai2_user_playlog
-- Set ext_bool1 as NOT NULL and give it a default value (e.g., FALSE)
UPDATE maimai2_user_playlog SET ext_bool1 = FALSE WHERE ext_bool1 IS NULL;
ALTER TABLE maimai2_user_playlog MODIFY COLUMN ext_bool1 BOOLEAN NOT NULL DEFAULT FALSE;
-- Set ext_num4 as NOT NULL (assuming it already has a default value of 0)
UPDATE maimai2_user_playlog SET ext_num4 = 0 WHERE ext_num4 IS NULL;
ALTER TABLE maimai2_user_playlog MODIFY COLUMN ext_num4 INTEGER NOT NULL DEFAULT 0;
-- maimai2_user_detail
-- Add default value for current_play_count and set it as NOT NULL
UPDATE maimai2_user_detail SET current_play_count = 0 WHERE current_play_count IS NULL;
ALTER TABLE maimai2_user_detail MODIFY COLUMN current_play_count INTEGER NOT NULL DEFAULT 0;
-- Add default value for rename_credit and set it as NOT NULL
UPDATE maimai2_user_detail SET rename_credit = 0 WHERE rename_credit IS NULL;
ALTER TABLE maimai2_user_detail MODIFY COLUMN rename_credit INTEGER NOT NULL DEFAULT 0;

8
src/main/resources/db/migration/mariadb/V255__add_maimai_140_ext_field.sql
View File

@@ -1,8 +0,0 @@
-- maimai2_user_playlog
ALTER TABLE maimai2_user_playlog ADD COLUMN ext_bool1 BOOLEAN;
ALTER TABLE maimai2_user_playlog ADD COLUMN ext_num4 INTEGER;
UPDATE maimai2_user_playlog SET ext_num4=0;
-- maimai2_user_detail
ALTER TABLE maimai2_user_detail ADD COLUMN current_play_count INTEGER;
ALTER TABLE maimai2_user_detail ADD COLUMN rename_credit INTEGER;

14
src/main/resources/db/migration/mysql/V252__add_maimai_140_h031_events.sql
View File

@@ -1,14 +0,0 @@
INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES
(23120811, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120821, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120822, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120823, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120824, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120825, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120841, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120842, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120843, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120844, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120851, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120852, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23122271, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1');

5
src/main/resources/db/migration/mysql/V253__add_maimai2_charge.sql
View File

@@ -1,5 +0,0 @@
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (1, 1, 2, 1, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (2, 2, 3, 2, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (3, 3, 4, 3, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (4, 4, 5, 4, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (5, 5, 6, 5, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');

4
src/main/resources/db/migration/mysql/V254__add_maimai_140_h041_events.sql
View File

@@ -1,4 +0,0 @@
INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES
(24011111, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(24011121, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(24011141, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1');

17
src/main/resources/db/migration/mysql/V255_2__fix_null.sql
View File

@@ -1,17 +0,0 @@
-- maimai2_user_playlog
-- Set ext_bool1 as NOT NULL and give it a default value (e.g., FALSE)
UPDATE maimai2_user_playlog SET ext_bool1 = FALSE WHERE ext_bool1 IS NULL;
ALTER TABLE maimai2_user_playlog MODIFY COLUMN ext_bool1 BOOLEAN NOT NULL DEFAULT FALSE;
-- Set ext_num4 as NOT NULL (assuming it already has a default value of 0)
UPDATE maimai2_user_playlog SET ext_num4 = 0 WHERE ext_num4 IS NULL;
ALTER TABLE maimai2_user_playlog MODIFY COLUMN ext_num4 INTEGER NOT NULL DEFAULT 0;
-- maimai2_user_detail
-- Add default value for current_play_count and set it as NOT NULL
UPDATE maimai2_user_detail SET current_play_count = 0 WHERE current_play_count IS NULL;
ALTER TABLE maimai2_user_detail MODIFY COLUMN current_play_count INTEGER NOT NULL DEFAULT 0;
-- Add default value for rename_credit and set it as NOT NULL
UPDATE maimai2_user_detail SET rename_credit = 0 WHERE rename_credit IS NULL;
ALTER TABLE maimai2_user_detail MODIFY COLUMN rename_credit INTEGER NOT NULL DEFAULT 0;

8
src/main/resources/db/migration/mysql/V255__add_maimai_140_ext_field.sql
View File

@@ -1,8 +0,0 @@
-- maimai2_user_playlog
ALTER TABLE maimai2_user_playlog ADD COLUMN ext_bool1 BOOLEAN;
ALTER TABLE maimai2_user_playlog ADD COLUMN ext_num4 INTEGER;
UPDATE maimai2_user_playlog SET ext_num4=0;
-- maimai2_user_detail
ALTER TABLE maimai2_user_detail ADD COLUMN current_play_count INTEGER;
ALTER TABLE maimai2_user_detail ADD COLUMN rename_credit INTEGER;

14
src/main/resources/db/migration/sqlite/V252__add_maimai_140_h031_events.sql
View File

@@ -1,14 +0,0 @@
INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES
(23120811, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120821, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120822, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120823, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120824, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120825, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120841, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120842, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120843, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120844, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120851, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23120852, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(23122271, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1');

5
src/main/resources/db/migration/sqlite/V253__add_maimai2_charge.sql
View File

@@ -1,5 +0,0 @@
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (1, 1, 2, 1, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (2, 2, 3, 2, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (3, 3, 4, 3, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (4, 4, 5, 4, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');
INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (5, 5, 6, 5, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000');

4
src/main/resources/db/migration/sqlite/V254__add_maimai_140_h041_events.sql
View File

@@ -1,4 +0,0 @@
INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES
(24011111, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(24011121, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'),
(24011141, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1');

3
src/main/resources/db/migration/sqlite/V255_2__fix_null.sql
View File

@@ -1,3 +0,0 @@
UPDATE maimai2_user_playlog SET ext_bool1=false;
UPDATE maimai2_user_detail SET current_play_count=0;
UPDATE maimai2_user_detail SET rename_credit=0;

8
src/main/resources/db/migration/sqlite/V255__add_maimai_140_ext_field.sql
View File

@@ -1,8 +0,0 @@
-- maimai2_user_playlog
ALTER TABLE maimai2_user_playlog ADD COLUMN ext_bool1 BOOLEAN;
ALTER TABLE maimai2_user_playlog ADD COLUMN ext_num4 INTEGER;
UPDATE maimai2_user_playlog SET ext_num4=0;
-- maimai2_user_detail
ALTER TABLE maimai2_user_detail ADD COLUMN current_play_count INTEGER;
ALTER TABLE maimai2_user_detail ADD COLUMN rename_credit INTEGER;

156
tools/data_convert.py
View File

@@ -7,14 +7,10 @@ from pathlib import Path
import orjson import orjson
import xmltodict import xmltodict
from hypy_utils import write from hypy_utils import write
from hypy_utils.logging_utils import setup_logger
from hypy_utils.tqdm_utils import pmap from hypy_utils.tqdm_utils import pmap
from wand.image import Image
log = setup_logger()
def convert_path(file: Path): def convert_one(file: Path):
# Get path relative to source # Get path relative to source
rel = file.relative_to(src) rel = file.relative_to(src)
@@ -22,29 +18,8 @@ def convert_path(file: Path):
if len(rel.parts) <= 2: if len(rel.parts) <= 2:
return return
# Generate target file path
# Ignore the first segment of the relative path, and append to the destination
# Also collapse the single-item directory into the filename
# e.g. {src}/A000/music/music000001/Music.xml -> {dst}/music/000001.json
target = dst / '/'.join(rel.parts[1:-2])
file_id = ''.join(filter(str.isdigit, rel.parts[-2]))
file_id = file_id.zfill(6)
target = target / f'{file_id}.json'
return target
def convert_one(file: Path):
target = convert_path(file)
if target is None:
return
# Read xml # Read xml
try: xml = xmltodict.parse(file.read_text())
xml = xmltodict.parse(file.read_text())
except Exception as e:
log.info(f'Error parsing {file}: {e}')
return
# There should only be one root element, expand it # There should only be one root element, expand it
assert len(xml) == 1, f'Expected 1 root element, got {len(xml)}' assert len(xml) == 1, f'Expected 1 root element, got {len(xml)}'
@@ -56,103 +31,51 @@ def convert_one(file: Path):
if '@xmlns:xsd' in xml: if '@xmlns:xsd' in xml:
del xml['@xmlns:xsd'] del xml['@xmlns:xsd']
if target.exists(): # Generate target file path
log.info(f'Overwriting {target}') # Ignore the first segment of the relative path, and append to the destination
# Also collapse the single-item directory into the filename
# e.g. {src}/A000/music/music000001/Music.xml -> {dst}/music/000001.json
target = dst / '/'.join(rel.parts[1:-2])
file_id = ''.join(filter(str.isdigit, rel.parts[-2]))
target = target / f'{file_id}.json'
# Create directories if they don't exist
target.parent.mkdir(parents=True, exist_ok=True)
# Write json # Write json
write(target, orjson.dumps(xml)) write(target, orjson.dumps(xml))
def convert_dds(file: Path): def combine_music():
target = convert_path(file) # Read all music json files
if target is None: music_files = list(dst.rglob('music/*.json'))
return print(f'> Found {len(music_files)} music files')
jsons = [orjson.loads(f.read_text()) for f in music_files]
# Convert dds to jpg # Combine all music
try: combined = {d['name']['id']: {
with Image(filename=str(file)) as img:
img.format = 'jpeg'
img.save(filename=str(target.with_suffix('.png')))
except Exception as e:
log.info(f'Error converting {file}: {e}')
return
def get(d: dict, *keys: str):
"""
Get the first key that exists in the dictionary
:param d: Dictionary
:param keys: Recursive key in the format of keya.keyb.keyc...
"""
for k in keys:
ks = k.split('.')
cd = d
while len(ks) > 0:
cd = cd.get(ks.pop(0))
if cd is None:
break
if cd is not None:
return cd
return None
def convert_music_mai2(d: dict) -> (str, dict):
return d['name']['id'], {
'name': d['name']['str'], 'name': d['name']['str'],
'ver': d.get('version') or d.get('releaseTagName')['str'], 'ver': int(d['version']),
'composer': d['artistName']['str'], 'composer': d['artistName']['str'],
'genre': d['genreName']['str'] or d['genreNames'], 'genre': d['genreName']['str'],
'bpm': int(d['bpm']), 'bpm': int(d['bpm']),
'lock': f"{d['lockType']} {d['subLockType']}", 'lock': f"{d['lockType']} {d['subLockType']}",
'notes': [{ 'notes': [{
'lv': int(n['level']) + (int(n['levelDecimal']) / 10.0), 'lv': int(n['level']) + (int(n['levelDecimal']) / 10),
'designer': n['notesDesigner']['str'], 'designer': n['notesDesigner']['str'],
'lv_id': n['musicLevelID'], 'lv_id': n['musicLevelID'],
'notes': int(n['maxNotes']), 'notes': int(n['maxNotes']),
} for n in d['notesData']['Notes'] if n['isEnable'] != 'false'] } for n in d['notesData']['Notes'] if n['isEnable'] != 'false']
} } for d in jsons}
# Write combined music
def convert_music_chu3(d: dict) -> (str, dict): write(dst / '00/all-music.json', orjson.dumps(combined))
return d['name']['id'], {
'name': d['name']['str'],
'ver': d['releaseTagName']['str'],
'composer': d['artistName']['str'],
'genre': get(d, 'genreName.list.StringID.str'),
'lock': d['firstLock'],
'notes': [{
'lv': int(n['level']) + (int(n['levelDecimal']) / 100.0),
'designer': n.get('notesDesigner'),
'lv_id': n['type']['id'],
} for n in d['fumens']['MusicFumenData'] if n['enable'] != 'false']
}
def convert_music_ongeki(d: dict) -> (str, dict):
return d['Name']['id'], {
'name': d['Name']['str'],
'ver': d['VersionID']['id'],
'composer': d['ArtistName']['str'],
'genre': d['Genre']['str'],
'lock': f"{d['CostToUnlock']} {d['IsLockedAtTheBeginning']}",
'notes': [{
'lv': int(n['FumenConstIntegerPart']) + (int(n['FumenConstFractionalPart']) / 100.0),
'lv_id': i,
} for i, n in enumerate(d['FumenData']['FumenData']) if n['FumenFile']['path'] is not None],
'lunatic': d['IsLunatic']
}
if __name__ == '__main__': if __name__ == '__main__':
agupa = argparse.ArgumentParser() agupa = argparse.ArgumentParser()
# Source can be one of the following:
# - maimai/Package/Sinmai_Data/StreamingAssets
# - chusan/App/data
# - ongeki/package/mu3_Data/StreamingAssets/GameData
agupa.add_argument('source', type=str, help='Package/Sinmai_Data/StreamingAssets directory') agupa.add_argument('source', type=str, help='Package/Sinmai_Data/StreamingAssets directory')
agupa.add_argument('destination', type=str, help='Directory to extract to') agupa.add_argument('destination', type=str, help='Directory to extract to')
agupa.add_argument('-g', '--game', type=str, help='Game to convert', default='mai2', choices=['mai2', 'chu3', 'ongeki'])
args = agupa.parse_args() args = agupa.parse_args()
src = Path(args.source) src = Path(args.source)
@@ -169,7 +92,7 @@ if __name__ == '__main__':
if not d.is_dir(): if not d.is_dir():
continue continue
log.info(f'Relocating {d}') print(f'Relocating {d}')
for file in d.rglob('*.png'): for file in d.rglob('*.png'):
id = ''.join(filter(str.isdigit, file.stem)) id = ''.join(filter(str.isdigit, file.stem))
shutil.move(file, d / f'{id}.png') shutil.move(file, d / f'{id}.png')
@@ -182,36 +105,19 @@ if __name__ == '__main__':
# Assert that target directory does not exist # Assert that target directory does not exist
if dst.exists(): if dst.exists():
if input(f'{dst} already exists, delete? (y/n): ') == 'y': if input(f'{dst} already exists, delete? (y/n): ') == 'y':
log.info(f'Deleting {dst}') print(f'Deleting {dst}')
shutil.rmtree(dst) shutil.rmtree(dst)
# Find all xml files in the source directory # Find all xml files in the source directory
files = list(src.rglob('*.xml')) files = list(src.rglob('*.xml'))
log.info(f'Found {len(files)} xml files') print(f'Found {len(files)} xml files')
# Multithreaded map # Multithreaded map
pmap(convert_one, files, desc='Converting', unit='file', chunksize=50) pmap(convert_one, files, desc='Converting', unit='file', chunksize=50)
log.info('> Finished converting') print('> Finished converting')
# Find all .dds files in the source A000 directory
dds_files = list(src.rglob('*.dds'))
log.info(f'Found {len(dds_files)} dds files')
# Convert and copy dds files (CPU-intensive)
pmap(convert_dds, dds_files, desc='Converting DDS', unit='file', chunksize=50, max_workers=os.cpu_count() - 2)
log.info('> Finished converting DDS')
# Convert all music # Convert all music
log.info('Combining music') print('Combining music')
music_files = list(dst.rglob('music/*.json')) combine_music()
log.info(f'> Found {len(music_files)} music files')
jsons = [orjson.loads(f.read_text()) for f in music_files]
converter = {'mai2': convert_music_mai2, 'chu3': convert_music_chu3, 'ongeki': convert_music_ongeki}[args.game]
combined = {k: v for k, v in [converter(d) for d in jsons]}
# Write combined music
write(dst / '00/all-music.json', orjson.dumps(combined))