archive
/
AquaDX
mirror of https://github.com/hykilpikonna/AquaDX
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v1-dev' of https://github.com/MewoLab/AquaDX into v1-dev

pull/119/head
Azalea 2025-02-24 18:15:55 -05:00
parent ab6f6cd990 97a56bbbfd
commit b840f6709b
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/icu/samnyan/aqua/sega/maimai2/Maimai2Apis.kt
View File

@ -60,20 +60,6 @@ fun Maimai2ServletController.initApis() {
"GetGameEvent" static { mapOf("type" to 1, "gameEventList" to db.gameEvent.findByEnable(true)) } "GetGameEvent" static { mapOf("type" to 1, "gameEventList" to db.gameEvent.findByEnable(true)) }
"GetGameCharge" static { db.gameCharge.findAll().let { mapOf("length" to it.size, "gameChargeList" to it) } } "GetGameCharge" static { db.gameCharge.findAll().let { mapOf("length" to it.size, "gameChargeList" to it) } }
"GetUserRivalData" {
val rivalId = parsing { data["rivalId"]!!.long }
// rivalId should store and fetch with the id column of table rather than card_ext_id
// or user will be able to get others' ext_id by setting them as rival
mapOf(
"userId" to uid,
"userRivalData" to mapOf(
"rivalId" to rivalId,
"rivalName" to (db.userData.findById(rivalId)()?.userName ?: "")
)
)
}
"GetUserOption" { mapOf( "GetUserOption" { mapOf(
"userId" to uid, "userId" to uid,
"userOption" to (db.userOption.findSingleByUser_Card_ExtId(uid)() ?: (404 - "User not found")) "userOption" to (db.userOption.findSingleByUser_Card_ExtId(uid)() ?: (404 - "User not found"))
@ -155,10 +141,16 @@ fun Maimai2ServletController.initApis() {
"GetUserRivalData" { "GetUserRivalData" {
val rivalId = parsing { data["rivalId"]!!.long } val rivalId = parsing { data["rivalId"]!!.long }
mapOf("userId" to uid, "userRivalData" to mapOf(
"rivalId" to rivalId, // rivalId should store and fetch with the id column of table rather than card_ext_id
"rivalName" to (db.userData.findByCardExtId(rivalId)()?.userName ?: "") // or user will be able to get others' ext_id by setting them as rival
)) mapOf(
"userId" to uid,
"userRivalData" to mapOf(
"rivalId" to rivalId,
"rivalName" to (db.userData.findById(rivalId)()?.userName ?: "")
)
)
} }
"GetUserRivalMusic" { "GetUserRivalMusic" {

1
src/main/resources/db/V1000_38__chusan_verse_event_121.sql
View File

@ -69,7 +69,6 @@ INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (1
INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16023,2,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true); INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16023,2,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true);
INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16015,2,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true); INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16015,2,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true);
INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16012,2,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true); INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16012,2,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true);
INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (2412,13,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true);
INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16046,14,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true); INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16046,14,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true);
INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16041,8,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true); INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16041,8,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true);
INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16048,12,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true); INSERT INTO chusan_game_event (id, type, end_date, start_date, enable) VALUES (16048,12,'2029-01-01 00:00:00.000000','2019-01-01 00:00:00.000000',true);