mirror of https://github.com/hykilpikonna/AquaDX
[F] Wacca fix impl details
parent
4ebddf78ed
commit
56ce7f9696
|
@ -11,12 +11,16 @@ enum class WaccaGrades(val value: Int) {
|
|||
AA(5),
|
||||
AAA(6),
|
||||
S(7),
|
||||
SS(8),
|
||||
SSS(9),
|
||||
MASTER(10),
|
||||
S_PLUS(11),
|
||||
SS(8),
|
||||
SS_PLUS(12),
|
||||
SSS(9),
|
||||
SSS_PLUS(13),
|
||||
MASTER(10);
|
||||
|
||||
companion object {
|
||||
val valueMap = entries.associateBy { it.value }
|
||||
}
|
||||
}
|
||||
|
||||
enum class WaccaDifficulty(val value: Int) {
|
||||
|
@ -90,7 +94,7 @@ enum class WaccaOptionType(val id: Int, val default: Int) {
|
|||
MASTER_VOL(1001, 3), // 0
|
||||
SET_TITLE_ID(1002, 104001), // ID
|
||||
SET_ICON_ID(1003, 102001), // ID
|
||||
SET_NAV_ID(1004, 210001), // ID
|
||||
SET_NAV_ID(1004, 310001), // ID
|
||||
SET_PLATE_ID(1005, 211001), // ID
|
||||
}
|
||||
|
||||
|
|
|
@ -4,8 +4,10 @@ import ext.*
|
|||
import icu.samnyan.aqua.net.utils.ApiException
|
||||
import icu.samnyan.aqua.sega.general.dao.CardRepository
|
||||
import icu.samnyan.aqua.sega.wacca.WaccaItemType.*
|
||||
import icu.samnyan.aqua.sega.wacca.WaccaOptionType.SET_ICON_ID
|
||||
import icu.samnyan.aqua.sega.wacca.WaccaOptionType.SET_TITLE_ID
|
||||
import icu.samnyan.aqua.sega.wacca.WaccaItemType.NOTE_COLOR
|
||||
import icu.samnyan.aqua.sega.wacca.WaccaItemType.NOTE_SOUND
|
||||
import icu.samnyan.aqua.sega.wacca.WaccaItemType.TOUCH_EFFECT
|
||||
import icu.samnyan.aqua.sega.wacca.WaccaOptionType.*
|
||||
import icu.samnyan.aqua.sega.wacca.model.BaseRequest
|
||||
import icu.samnyan.aqua.sega.wacca.model.db.*
|
||||
import io.ktor.client.utils.*
|
||||
|
@ -168,33 +170,37 @@ fun WaccaServer.init() {
|
|||
// TODO: make this and vip configurable
|
||||
// u.wp = 999999
|
||||
|
||||
u.run {
|
||||
ls("status" - lStatus(),
|
||||
"options" - o.map { (k, v) -> ls(k, v) },
|
||||
"seasonalPlayModeCounts" - (playCounts.mapIndexed { i, it -> ls(season, i + 1, it) } + ls(ls(0, 1, 1))),
|
||||
"items" - ls(MUSIC_UNLOCK, TITLE, ICON, TROPHY, SKILL, TICKET, NOTE_COLOR, NOTE_SOUND, NAVIGATOR, USER_PLATE, TOUCH_EFFECT).map {
|
||||
if (it == TICKET && go?.unlockTickets == true) (0..4).map { ls(it, 106002, 0) }
|
||||
u.run { ls(
|
||||
"0 status" - lStatus(),
|
||||
"1 options" - o.map { (k, v) -> ls(k, v) },
|
||||
"2 seasonalPlayModeCounts" - (playCounts.mapIndexed { i, it -> ls(season, i + 1, it) } + ls(ls(0, 1, 1))),
|
||||
"3 items" - ls(MUSIC_UNLOCK, TITLE, ICON, TROPHY, SKILL, TICKET, NOTE_COLOR, NOTE_SOUND, NAVIGATOR, USER_PLATE, TOUCH_EFFECT).map {
|
||||
if (it == MUSIC_UNLOCK) items[it()]?.flatMap { song ->
|
||||
// Add all difficulties up to the highest unlocked
|
||||
(1..song.p1).map { diff -> ls(song.itemId, diff, 0, song.acquiredDate.sec) }
|
||||
} ?: empty
|
||||
else if (it == TICKET && go?.unlockTickets == true) (0..4).map { ls(it, 106002, 0) }
|
||||
else items[it()]?.map { it.ls() } ?: empty
|
||||
},
|
||||
"scores" - scores.map { it.ls() },
|
||||
"songPlayStatus" - ls(lastSongInfo[0], 1),
|
||||
"seasonInfo" - ls(xp, wpTotal, wpSpent, scores.sumOf { it.score },
|
||||
"4 scores" - scores.map { it.ls() },
|
||||
"5 songPlayStatus" - ls(lastSongInfo[0], 1),
|
||||
"6 seasonInfo" - ls(xp, wpTotal, wpSpent, scores.sumOf { it.score },
|
||||
items[TITLE()]?.size ?: 0, items[ICON()]?.size ?: 0, 0,
|
||||
items[NOTE_COLOR()]?.size ?: 0, items[NOTE_SOUND()]?.size ?: 0, items[USER_PLATE()]?.size ?: 0,
|
||||
gates.sumOf { it.totalPoints }),
|
||||
"playAreaList" - "[[0],[0,0,0,0,0,0],[0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0],[0,0,0,0,0],[0,0,0,0],[0,0,0,0,0,0,0],[0]]".jsonArray(),
|
||||
"songUpdateTime" - lastLoginDate.time / 1000,
|
||||
"favorites" - u.favoriteSongs,
|
||||
"stoppedSongIds" - empty,
|
||||
"events" - empty,
|
||||
"gate" - gates.associateBy { it.gateId }.let { gateMap -> enabledGates.map {
|
||||
"7 playAreaList" - "[[0],[0,0,0,0,0,0],[0,0,0,0,0,0,0],[0,0,0,0,0,0,0,0,0,0],[0,0,0,0,0,0],[0,0,0,0,0],[0,0,0,0],[0,0,0,0,0,0,0],[0]]".jsonArray(),
|
||||
"8 songUpdateTime" - lastLoginDate.time / 1000,
|
||||
"9 favorites" - u.favoriteSongs,
|
||||
"10 stoppedSongIds" - empty,
|
||||
"11 events" - empty,
|
||||
"12 gate" - gates.associateBy { it.gateId }.let { gateMap -> enabledGates.map {
|
||||
gateMap[it]?.ls() ?: WcUserGate().apply { gateId = it }.ls()
|
||||
} },
|
||||
"lastSongInfo" - lastSongInfo,
|
||||
"gateTutorialFlags" - gateTutorialFlags.jsonArray(),
|
||||
"gatchaInfo" - empty,
|
||||
"friendList" - empty,
|
||||
"bingoStatus" - ls(
|
||||
"13 lastSongInfo" - lastSongInfo,
|
||||
"14 gateTutorialFlags" - gateTutorialFlags.jsonArray(),
|
||||
"15 gatchaInfo" - empty,
|
||||
"16 friendList" - empty,
|
||||
"17 bingoStatus" - ls(
|
||||
"pageNumber" - (bingo?.pageNumber ?: 0),
|
||||
"pageStatus" - (bingo?.pageProgress?.jsonArray() ?: empty)
|
||||
)
|
||||
|
@ -210,8 +216,8 @@ fun WaccaServer.init() {
|
|||
WP() -> { u.wp += param; u.wpTotal += param }
|
||||
XP() -> u.xp += param
|
||||
MUSIC_DIFFICULTY_UNLOCK(),
|
||||
MUSIC_UNLOCK() -> newItems += (ex ?: WcUserItem(type, id))
|
||||
.apply { user = u; p1 = min(max(param.long(), p1), WaccaDifficulty.HARD.value.long()) }
|
||||
MUSIC_UNLOCK() -> newItems += (ex ?: WcUserItem(MUSIC_UNLOCK(), id))
|
||||
.apply { user = u; p1 = max(param.long(), p1).coerceAtLeast(WaccaDifficulty.HARD.value.long()) }
|
||||
TROPHY() -> newItems += (ex ?: TROPHY(u, id)).apply { p1 = season.long(); p2 = param.long() }
|
||||
else -> newItems += (ex ?: WcUserItem(type, id)).apply { user = u }
|
||||
}
|
||||
|
@ -242,14 +248,15 @@ fun WaccaServer.init() {
|
|||
empty
|
||||
}
|
||||
|
||||
"user/mission/update" { _, (uid, bingoDetail, items, gateTutorialFlags) ->
|
||||
"user/mission/update" { _, (uid, bingoDetail, items, tutFlags) ->
|
||||
val u = user(uid) ?: (404 - "User not found")
|
||||
u.gateTutorialFlags = gateTutorialFlags.toJson()
|
||||
rp.user.save(u.apply { gateTutorialFlags = tutFlags.toJson() })
|
||||
addItems(items as List<List<Int>>, u, itmGrp(u))
|
||||
|
||||
// Update bingo
|
||||
val (page, prog) = bingoDetail as List<Any>
|
||||
rp.bingo.findByUser(u).firstOrNull() ?: WcUserBingo().apply { user = u; pageNumber = page.int(); pageProgress = prog.toJson() }
|
||||
val bingo = rp.bingo.findByUser(u).firstOrNull() ?: WcUserBingo().apply { user = u; pageNumber = page.int() }
|
||||
rp.bingo.save(bingo.apply { pageProgress = prog.toJson() })
|
||||
|
||||
empty
|
||||
}
|
||||
|
@ -266,7 +273,7 @@ fun WaccaServer.init() {
|
|||
val best = rp.bestScore.findByUserAndSongIdAndDifficulty(u, song.songId, song.difficulty)
|
||||
?: WcUserScore().apply { user = u; songId = song.songId; difficulty = song.difficulty }
|
||||
|
||||
best.grades[song.grade - 1]++
|
||||
best.grades[WaccaGrades.valueMap[song.grade]?.ordinal ?: (400 - "Grade ${song.grade} invalid")]++
|
||||
best.clears = best.clears.zip(song.clears()) { a, b -> a + b }.toMutableList()
|
||||
best.score = max(best.score, song.score)
|
||||
best.bestCombo = max(best.bestCombo, song.maxCombo)
|
||||
|
@ -275,7 +282,7 @@ fun WaccaServer.init() {
|
|||
|
||||
rp.bestScore.save(best)
|
||||
|
||||
ls(best.ls(), ls(song.songId, best.clears[0]), "seasonalInfo" - (1..11).map { 0 }, "rankingInfo" - empty)
|
||||
ls(best.lsMusicUpdate(), ls(song.songId, best.clears[0]), "seasonalInfo" - (1..11).map { 0 }, "rankingInfo" - empty)
|
||||
}
|
||||
"user/music/UpdateCoop" redirect "user/music/update"
|
||||
"user/music/UpdateVersus" redirect "user/music/update"
|
||||
|
@ -295,6 +302,13 @@ fun WaccaServer.init() {
|
|||
empty
|
||||
}
|
||||
|
||||
fun incrUses(u: WaccaUser, opts: Map<Int, Int>) {
|
||||
rp.item.findByUserAndItemIdAndType(u, opts[SET_ICON_ID], ICON())
|
||||
?.let { rp.item.save(it.apply { p1++ }) }
|
||||
rp.item.findByUserAndItemIdAndType(u, opts[SET_NAV_ID], NAVIGATOR())
|
||||
?.let { rp.item.save(it.apply { p1++ }) }
|
||||
}
|
||||
|
||||
"user/status/update" { req, (uid, playType, items, isContinue, isFirstPlayFree, itemsUsed, lastSong) ->
|
||||
val u = user(uid) ?: (404 - "User not found")
|
||||
rp.user.save(u.apply {
|
||||
|
@ -305,7 +319,7 @@ fun WaccaServer.init() {
|
|||
lastSongInfo = (lastSong as List<Int>).toMutableList()
|
||||
lastGameVer = req.appVersion
|
||||
|
||||
// TODO: Add icon and nav items
|
||||
incrUses(u, options(u))
|
||||
})
|
||||
|
||||
empty
|
||||
|
|
|
@ -25,7 +25,9 @@ interface WcUserFriendRepo : IWaccaUserLinked<WcUserFriend>
|
|||
interface WcUserGateRepo : IWaccaUserLinked<WcUserGate> {
|
||||
fun findByUserAndGateId(user: WaccaUser, gateId: Int): WcUserGate?
|
||||
}
|
||||
interface WcUserItemRepo : IWaccaUserLinked<WcUserItem>
|
||||
interface WcUserItemRepo : IWaccaUserLinked<WcUserItem> {
|
||||
fun findByUserAndItemIdAndType(user: WaccaUser, itemId: Int, type: Int): WcUserItem?
|
||||
}
|
||||
interface WcUserBestScoreRepo : IWaccaUserLinked<WcUserScore> {
|
||||
fun findByUserAndSongIdAndDifficulty(user: WaccaUser, songId: Int, difficulty: Int): WcUserScore?
|
||||
}
|
||||
|
|
|
@ -76,12 +76,12 @@ class WcUserItem(
|
|||
var acquiredDate: Date = Date(),
|
||||
) : WaccaUserEntity() {
|
||||
fun ls() = when (type) {
|
||||
MUSIC_UNLOCK() -> ls(itemId, p1, acquiredDate.sec, acquiredDate.sec) // songId, diff, acquireDate, unlockDate
|
||||
MUSIC_UNLOCK() -> ls(itemId, p1, 0, acquiredDate.sec) // songId, diff, acquireDate, unlockDate
|
||||
ICON() -> ls(itemId, 1, p1, acquiredDate.sec) // id, type, uses, acquiredDate
|
||||
TROPHY() -> ls(itemId, p1, p2, p3) // id, season, progress, badgeType
|
||||
SKILL() -> ls(itemId, p1, p2, p3) // skillType, level, flag, badge
|
||||
TICKET() -> ls(id, itemId, p1) // userTicketId, ticketId, expire
|
||||
NAVIGATOR() -> ls(itemId, 1, acquiredDate.sec, p1, p2) // id, type, acquiredDate, uses, usesToday
|
||||
NAVIGATOR() -> ls(itemId, 1, acquiredDate.sec, p1, p1) // id, type, acquiredDate, uses, usesToday
|
||||
|
||||
// Generic: title, note colors, note sounds, plates, touch effects
|
||||
else -> ls(itemId, 1, acquiredDate.sec) // id, type, acquireDate
|
||||
|
@ -105,7 +105,8 @@ class WcUserScore : WaccaUserEntity() {
|
|||
var lowestMissCt = Int.MAX_VALUE
|
||||
var rating = 0
|
||||
|
||||
fun ls() = ls(songId, difficulty, clears, clears, grades, score, lowestMissCt, 0, 1, rating)
|
||||
fun ls() = ls(songId, difficulty, clears, clears, grades, score, bestCombo, lowestMissCt, 1, rating)
|
||||
fun lsMusicUpdate() = ls(songId, difficulty, clears, clears, grades, score, lowestMissCt, 0, 1, rating)
|
||||
}
|
||||
|
||||
@Entity @Table(name = "wacca_user_playlog", uniqueConstraints = [UC("", ["user_id", "song_id", "chart_id", "date_scored"])])
|
||||
|
|
|
@ -50,12 +50,12 @@ class WaccaTest : StringSpec({
|
|||
|
||||
// Check each unordered element
|
||||
listOf(1, 2, 4, ).forEach { i ->
|
||||
((lst[i] as List<*>).toSet() to i) shouldBe ((exp[i] as List<*>).toSet() to i)
|
||||
((lst[i] as List<*>).sortedBy { it.toJson() } to i) shouldBe ((exp[i] as List<*>).sortedBy { it.toJson() } to i)
|
||||
}
|
||||
|
||||
// Check items (unordered element inside ordered element)
|
||||
val setSrc = (lst[3] as List<*>).map { (it as List<*>).toSet() }
|
||||
val setExp = (exp[3] as List<*>).map { (it as List<*>).toSet() }
|
||||
val setSrc = (lst[3] as List<*>).map { (it as List<*>).sortedBy { it.toJson() } }
|
||||
val setExp = (exp[3] as List<*>).map { (it as List<*>).sortedBy { it.toJson() } }
|
||||
setSrc shouldBe setExp
|
||||
}
|
||||
|
||||
|
@ -186,7 +186,7 @@ class WaccaTest : StringSpec({
|
|||
|
||||
"user/status/getDetail #2" {
|
||||
post("user/status/getDetail", "[$uid]").res expGetDetail
|
||||
"""[[$uid, "AZA", 1, 100, 0, 0, 4134, [0, 0, 0], 2, 1, 1, 1, 3376684800, 2, 497], [[1, 38], [2, 3], [108, 94]], [[3, 1, 1], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [0, 1, 1]], [[[1111, 1, 0, 1711419516], [1111, 2, 0, 1711419516], [1111, 3, 0, 1711419516], [2074, 1, 0, 1711419238], [2074, 2, 0, 1711419238], [2074, 3, 0, 1711419238]], [[104001, 1, 1711418627], [104002, 1, 1711418627], [104003, 1, 1711418627], [104005, 1, 1711418627], [304129, 1, 1711419172], [104078, 1, 1711419526], [104125, 1, 1711419526]], [[102001, 1, 1, 1711418627], [102002, 1, 0, 1711418627], [302027, 1, 0, 1711418927], [302030, 1, 0, 1711419486]], [[301001, 3, 1000, 0], [301002, 3, 300, 0], [301003, 3, 100, 0]], [], [[0, 106002, 0], [1, 106002, 0], [2, 106002, 0], [3, 106002, 0], [4, 106002, 0]], [[103001, 1, 1711418627], [203001, 1, 1711418627]], [[105001, 1, 1711418627], [205005, 1, 1711418627]], [[210001, 1, 1711418627, 0, 0], [210002, 1, 1711418627, 0, 0], [210054, 1, 1711418627, 0, 0], [210055, 1, 1711418627, 0, 0], [210056, 1, 1711418627, 0, 0], [210057, 1, 1711418627, 0, 0], [210058, 1, 1711418627, 0, 0], [210059, 1, 1711418627, 0, 0], [210060, 1, 1711418627, 0, 0], [210061, 1, 1711418627, 0, 0], [310001, 1, 1711418627, 1, 1], [310002, 1, 1711418627, 0, 0]], [[211001, 1, 1711418627]], [[312000, 1, 1711418627], [312001, 1, 1711418627]]], [[1116, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0], 812201, 56, 33, 1, 97], [2074, 3, [0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 0, 0, 0, 1, 0], [2074, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 903346, 77, 11, 1, 182], [1111, 3, [0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 0, 0, 0, 1, 0], [1111, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 900776, 157, 19, 1, 218]], [1111, 1], [100, 4134, 0, 2616323, 7, 4, 0, 2, 2, 1, 324], [[0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0]], 1711422586, [], [], [], [[1, 1, 1, 0, 0, 0, 0], [2, 1, 1, 0, 0, 0, 0], [3, 1, 1, 0, 0, 0, 0], [4, 1, 1, 0, 0, 0, 0], [5, 1, 1, 0, 0, 0, 0], [6, 1, 1, 0, 0, 0, 0], [7, 1, 1, 0, 0, 0, 0], [8, 1, 1, 0, 0, 0, 0], [9, 1, 1, 0, 0, 0, 0], [10, 1, 1, 0, 0, 0, 0], [11, 1, 1, 0, 0, 0, 0], [12, 1, 1, 0, 0, 0, 0], [13, 1, 1, 0, 0, 0, 0], [14, 1, 1, 0, 0, 0, 0], [15, 1, 1, 0, 0, 0, 0], [16, 1, 1, 0, 0, 0, 0], [17, 1, 1, 0, 0, 0, 0], [18, 1, 1, 0, 0, 0, 0], [19, 1, 1, 0, 0, 0, 0], [20, 1, 1, 0, 0, 0, 0], [21, 1, 1, 0, 0, 0, 0], [22, 1, 1, 0, 0, 0, 0], [23, 1, 4, 90, 0, 1711418927, 0], [24, 1, 1, 0, 0, 0, 0]], [1111, 2, 1, 5, 2], [[1, 1], [2, 1], [3, 1], [4, 1], [5, 0]], [], [], [1, [[0, 1, 1], [1, 2, 0], [2, 3, 0], [3, 4, 0], [4, 5, 0], [5, 6, 0], [6, 7, 0], [7, 8, 800], [8, 9, 2000000]]]]"""
|
||||
"""[[$uid, "AZA", 1, 100, 0, 0, 4134, [0, 0, 0], 2, 1, 1, 1, 3376684800, 2, 497], [[1, 38], [2, 3], [108, 94]], [[3, 1, 1], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [0, 1, 1]], [[[1111, 1, 0, 1711419516], [1111, 2, 0, 1711419516], [1111, 3, 0, 1711419516], [2074, 1, 0, 1711419238], [2074, 2, 0, 1711419238], [2074, 3, 0, 1711419238]], [[104001, 1, 1711418627], [104002, 1, 1711418627], [104003, 1, 1711418627], [104005, 1, 1711418627], [304129, 1, 1711419172], [104078, 1, 1711419526], [104125, 1, 1711419526]], [[102001, 1, 1, 1711418627], [102002, 1, 0, 1711418627], [302027, 1, 0, 1711418927], [302030, 1, 0, 1711419486]], [[301001, 3, 1000, 0], [301002, 3, 300, 0], [301003, 3, 100, 0]], [], [], [[103001, 1, 1711418627], [203001, 1, 1711418627]], [[105001, 1, 1711418627], [205005, 1, 1711418627]], [[210001, 1, 1711418627, 0, 0], [210002, 1, 1711418627, 0, 0], [210054, 1, 1711418627, 0, 0], [210055, 1, 1711418627, 0, 0], [210056, 1, 1711418627, 0, 0], [210057, 1, 1711418627, 0, 0], [210058, 1, 1711418627, 0, 0], [210059, 1, 1711418627, 0, 0], [210060, 1, 1711418627, 0, 0], [210061, 1, 1711418627, 0, 0], [310001, 1, 1711418627, 1, 1], [310002, 1, 1711418627, 0, 0]], [[211001, 1, 1711418627]], [[312000, 1, 1711418627], [312001, 1, 1711418627]]], [[1116, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0], 812201, 56, 33, 1, 97], [2074, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 903346, 77, 11, 1, 182], [1111, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 900776, 157, 19, 1, 218]], [1111, 1], [100, 4134, 0, 2616323, 7, 4, 0, 2, 2, 1, 324], [[0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0]], 1711422586, [], [], [], [[1, 1, 1, 0, 0, 0, 0], [2, 1, 1, 0, 0, 0, 0], [3, 1, 1, 0, 0, 0, 0], [4, 1, 1, 0, 0, 0, 0], [5, 1, 1, 0, 0, 0, 0], [6, 1, 1, 0, 0, 0, 0], [7, 1, 1, 0, 0, 0, 0], [8, 1, 1, 0, 0, 0, 0], [9, 1, 1, 0, 0, 0, 0], [10, 1, 1, 0, 0, 0, 0], [11, 1, 1, 0, 0, 0, 0], [12, 1, 1, 0, 0, 0, 0], [13, 1, 1, 0, 0, 0, 0], [14, 1, 1, 0, 0, 0, 0], [15, 1, 1, 0, 0, 0, 0], [16, 1, 1, 0, 0, 0, 0], [17, 1, 1, 0, 0, 0, 0], [18, 1, 1, 0, 0, 0, 0], [19, 1, 1, 0, 0, 0, 0], [20, 1, 1, 0, 0, 0, 0], [21, 1, 1, 0, 0, 0, 0], [22, 1, 1, 0, 0, 0, 0], [23, 1, 4, 90, 0, 1711418927, 0], [24, 1, 1, 0, 0, 0, 0]], [1111, 2, 1, 5, 2], [[1, 1], [2, 1], [3, 1], [4, 1], [5, 0]], [], [], [1, [[0, 1, 1], [1, 2, 0], [2, 3, 0], [3, 4, 0], [4, 5, 0], [5, 6, 0], [6, 7, 0], [7, 8, 800], [8, 9, 2000000]]]]"""
|
||||
}
|
||||
|
||||
"user/status/get #3" {
|
||||
|
@ -201,6 +201,6 @@ class WaccaTest : StringSpec({
|
|||
|
||||
"user/status/getDetail #3" {
|
||||
post("user/status/getDetail", "[$uid]").res expGetDetail
|
||||
"""[[$uid, "AZA", 1, 100, 0, 0, 4134, [0, 0, 0], 3, 1, 2, 1, 3376684800, 3, 497], [[1, 38], [2, 3], [108, 94]], [[3, 1, 1], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [0, 1, 1]], [[[1111, 1, 0, 1711419516], [1111, 2, 0, 1711419516], [1111, 3, 0, 1711419516], [2074, 1, 0, 1711419238], [2074, 2, 0, 1711419238], [2074, 3, 0, 1711419238]], [[104001, 1, 1711418627], [104002, 1, 1711418627], [104003, 1, 1711418627], [104005, 1, 1711418627], [304129, 1, 1711419172], [104078, 1, 1711419526], [104125, 1, 1711419526]], [[102001, 1, 1, 1711418627], [102002, 1, 0, 1711418627], [302027, 1, 0, 1711418927], [302030, 1, 0, 1711419486]], [[301001, 3, 1000, 0], [301002, 3, 300, 0], [301003, 3, 100, 0]], [], [[0, 106002, 0], [1, 106002, 0], [2, 106002, 0], [3, 106002, 0], [4, 106002, 0]], [[103001, 1, 1711418627], [203001, 1, 1711418627]], [[105001, 1, 1711418627], [205005, 1, 1711418627]], [[210001, 1, 1711418627, 0, 0], [210002, 1, 1711418627, 0, 0], [210054, 1, 1711418627, 0, 0], [210055, 1, 1711418627, 0, 0], [210056, 1, 1711418627, 0, 0], [210057, 1, 1711418627, 0, 0], [210058, 1, 1711418627, 0, 0], [210059, 1, 1711418627, 0, 0], [210060, 1, 1711418627, 0, 0], [210061, 1, 1711418627, 0, 0], [310001, 1, 1711418627, 1, 1], [310002, 1, 1711418627, 0, 0]], [[211001, 1, 1711418627]], [[312000, 1, 1711418627], [312001, 1, 1711418627]]], [[1116, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0], 812201, 56, 33, 1, 97], [2074, 3, [0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 0, 0, 0, 1, 0], [2074, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 903346, 77, 11, 1, 182], [1111, 3, [0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], 0, 0, 0, 1, 0], [1111, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 900776, 157, 19, 1, 218]], [1111, 1], [100, 4134, 0, 2616323, 7, 4, 0, 2, 2, 1, 324], [[0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0]], 1711422954, [], [], [], [[1, 1, 1, 0, 0, 0, 0], [2, 1, 1, 0, 0, 0, 0], [3, 1, 1, 0, 0, 0, 0], [4, 1, 1, 0, 0, 0, 0], [5, 1, 1, 0, 0, 0, 0], [6, 1, 1, 0, 0, 0, 0], [7, 1, 1, 0, 0, 0, 0], [8, 1, 1, 0, 0, 0, 0], [9, 1, 1, 0, 0, 0, 0], [10, 1, 1, 0, 0, 0, 0], [11, 1, 1, 0, 0, 0, 0], [12, 1, 1, 0, 0, 0, 0], [13, 1, 1, 0, 0, 0, 0], [14, 1, 1, 0, 0, 0, 0], [15, 1, 1, 0, 0, 0, 0], [16, 1, 1, 0, 0, 0, 0], [17, 1, 1, 0, 0, 0, 0], [18, 1, 1, 0, 0, 0, 0], [19, 1, 1, 0, 0, 0, 0], [20, 1, 1, 0, 0, 0, 0], [21, 1, 1, 0, 0, 0, 0], [22, 1, 1, 0, 0, 0, 0], [23, 1, 4, 90, 0, 1711418927, 0], [24, 1, 1, 0, 0, 0, 0]], [1111, 2, 1, 5, 2], [[1, 1], [2, 1], [3, 1], [4, 1], [5, 0]], [], [], [1, [[0, 1, 1], [1, 2, 0], [2, 3, 0], [3, 4, 0], [4, 5, 0], [5, 6, 0], [6, 7, 0], [7, 8, 800], [8, 9, 2000000]]]]"""
|
||||
"""[[$uid, "AZA", 1, 100, 0, 0, 4134, [0, 0, 0], 3, 1, 2, 1, 3376684800, 3, 497], [[1, 38], [2, 3], [108, 94]], [[3, 1, 1], [3, 2, 0], [3, 3, 0], [3, 4, 0], [3, 5, 0], [0, 1, 1]], [[[1111, 1, 0, 1711419516], [1111, 2, 0, 1711419516], [1111, 3, 0, 1711419516], [2074, 1, 0, 1711419238], [2074, 2, 0, 1711419238], [2074, 3, 0, 1711419238]], [[104001, 1, 1711418627], [104002, 1, 1711418627], [104003, 1, 1711418627], [104005, 1, 1711418627], [304129, 1, 1711419172], [104078, 1, 1711419526], [104125, 1, 1711419526]], [[102001, 1, 1, 1711418627], [102002, 1, 0, 1711418627], [302027, 1, 0, 1711418927], [302030, 1, 0, 1711419486]], [[301001, 3, 1000, 0], [301002, 3, 300, 0], [301003, 3, 100, 0]], [], [], [[103001, 1, 1711418627], [203001, 1, 1711418627]], [[105001, 1, 1711418627], [205005, 1, 1711418627]], [[210001, 1, 1711418627, 0, 0], [210002, 1, 1711418627, 0, 0], [210054, 1, 1711418627, 0, 0], [210055, 1, 1711418627, 0, 0], [210056, 1, 1711418627, 0, 0], [210057, 1, 1711418627, 0, 0], [210058, 1, 1711418627, 0, 0], [210059, 1, 1711418627, 0, 0], [210060, 1, 1711418627, 0, 0], [210061, 1, 1711418627, 0, 0], [310001, 1, 1711418627, 1, 1], [310002, 1, 1711418627, 0, 0]], [[211001, 1, 1711418627]], [[312000, 1, 1711418627], [312001, 1, 1711418627]]], [[1116, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0], 812201, 56, 33, 1, 97], [2074, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 903346, 77, 11, 1, 182], [1111, 2, [1, 1, 0, 0, 0], [1, 1, 0, 0, 0], [0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0], 900776, 157, 19, 1, 218]], [1111, 1], [100, 4134, 0, 2616323, 7, 4, 0, 2, 2, 1, 324], [[0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0], [0]], 1711422954, [], [], [], [[1, 1, 1, 0, 0, 0, 0], [2, 1, 1, 0, 0, 0, 0], [3, 1, 1, 0, 0, 0, 0], [4, 1, 1, 0, 0, 0, 0], [5, 1, 1, 0, 0, 0, 0], [6, 1, 1, 0, 0, 0, 0], [7, 1, 1, 0, 0, 0, 0], [8, 1, 1, 0, 0, 0, 0], [9, 1, 1, 0, 0, 0, 0], [10, 1, 1, 0, 0, 0, 0], [11, 1, 1, 0, 0, 0, 0], [12, 1, 1, 0, 0, 0, 0], [13, 1, 1, 0, 0, 0, 0], [14, 1, 1, 0, 0, 0, 0], [15, 1, 1, 0, 0, 0, 0], [16, 1, 1, 0, 0, 0, 0], [17, 1, 1, 0, 0, 0, 0], [18, 1, 1, 0, 0, 0, 0], [19, 1, 1, 0, 0, 0, 0], [20, 1, 1, 0, 0, 0, 0], [21, 1, 1, 0, 0, 0, 0], [22, 1, 1, 0, 0, 0, 0], [23, 1, 4, 90, 0, 1711418927, 0], [24, 1, 1, 0, 0, 0, 0]], [1111, 2, 1, 5, 2], [[1, 1], [2, 1], [3, 1], [4, 1], [5, 0]], [], [], [1, [[0, 1, 1], [1, 2, 0], [2, 3, 0], [3, 4, 0], [4, 5, 0], [5, 6, 0], [6, 7, 0], [7, 8, 800], [8, 9, 2000000]]]]"""
|
||||
}
|
||||
})
|
Loading…
Reference in New Issue