重构:Get* 命名统一 + 用户数据落盘 + use_ticket / reincarnate
1) 命名统一(服务端 API 名带 Get 的,脚本名与函数名一律带 get/Get)
- 26 个 api 脚本改名:userdata.py -> get_user_data.py 等
- 7 个 game_*.py -> get_game_*.py
- 38 个函数改名:UserData -> GetUserData 等
- upsert_snapshot.py -> get_need_user_data.py,
fetch_upsert_snapshot -> GetNeedUserData
- user_getter_common.fetch_all_pages -> get_all_pages
2) GetNeedUserData 抓到的数据自动落盘
- <工程根>/data/<userId>.json,新数据总是覆盖老数据
- 新增 save_user_data / load_user_data / user_data_path /
list_saved_user_ids / DATA_DIR / PROJECT_ROOT
- data/ 已加入 .gitignore
3) use_ticket.py(新)
- 读取账号当前持有的功能票,用 UpsertUserAll 消耗掉
- 依据:GetUserChargeApi 与 UpsertUserAllApi 的 userChargeList 格式相同;
真机实证 userChargeList.stock -1 + useTicketId + playCredit
- playCredit = 投币数 + 票的 creditNum(VOExtensions.cs:838-845)
4) reincarnate.py(新)
- 账号数据迁移(转生):A 的数据克隆到 B
- 每包最多 4 首(真机一局上限),包间用续关登录换新 loginId
续关依据:ContinueProcess.cs:403 -> PacketUserLogin(isContinue: true)
- playlog 从曲目记录反推合成(没有对应的 Get 接口)
自检 238 项全绿。
This commit is contained in:
@@ -0,0 +1,102 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
"""
|
||||
get_user_favorite.py —— 取用户收藏(GetUserFavoriteApi)
|
||||
================================================================================
|
||||
|
||||
取玩家各类收藏夹(称号 / 头像 / 相框 / 搭档 / 背景…)。
|
||||
|
||||
对应接口:GetUserFavoriteApi
|
||||
请求体 :UserFavoriteRequestVO(userId + itemKind)
|
||||
响应 :{userId, userFavorite:{itemKind, itemIdList:[...]}}
|
||||
依据 :source/Assembly-CSharp/Net.VO.Mai2/UserFavoriteRequestVO.cs
|
||||
source/2026-10-05.log:59-68 真机依次请求 itemKind = 3,1,2,10,11
|
||||
|
||||
★ 回传 Upsert 时 userFavoriteList 是**恒 5 条**的完整数组(不做剔除),
|
||||
位串 isNewFavoriteList 是三值 "0"/"1"/"2"。
|
||||
|
||||
调用示例:
|
||||
from api import GetUserFavorite, GetUserFavoriteAll
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
from config import CLIENT_ID, TIMEOUT_MS
|
||||
|
||||
from .log_setup import log_info, log_warning
|
||||
from .maimai_net import MaimaiNetClient
|
||||
from .user_getter_common import _get, UserFavoriteRequestVO, FAVORITE_ITEM_KINDS
|
||||
|
||||
|
||||
def GetUserFavorite(
|
||||
user_id: int,
|
||||
item_kind: int,
|
||||
*,
|
||||
client_id: str = CLIENT_ID,
|
||||
timeout_ms: Optional[int] = None,
|
||||
client: Optional[MaimaiNetClient] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
取用户某一类收藏(对应 GetUserFavoriteApi)。
|
||||
|
||||
参数:
|
||||
user_id: 用户 ID(必填)
|
||||
item_kind: 收藏类别(必填):3=头像 1=称号 2=名牌 10=搭档 11=相框
|
||||
|
||||
返回:
|
||||
原始响应 dict,含 userFavorite
|
||||
"""
|
||||
log_info("取用户收藏:user_id=" + str(user_id) + " itemKind=" + str(item_kind))
|
||||
return _get(
|
||||
"GetUserFavoriteApi",
|
||||
UserFavoriteRequestVO(userId=user_id, itemKind=item_kind),
|
||||
user_id, client_id=client_id, timeout_ms=timeout_ms, client=client,
|
||||
)
|
||||
|
||||
|
||||
def GetUserFavoriteAll(
|
||||
user_id: int,
|
||||
*,
|
||||
item_kinds: Optional[List[int]] = None,
|
||||
client_id: str = CLIENT_ID,
|
||||
timeout_ms: Optional[int] = None,
|
||||
client: Optional[MaimaiNetClient] = None,
|
||||
) -> Dict[str, Any]:
|
||||
"""
|
||||
取用户全部收藏(按真机顺序请求 5 个类别)。
|
||||
|
||||
参数:
|
||||
item_kinds: 类别列表(可选,默认 FAVORITE_ITEM_KINDS = (3,1,2,10,11))
|
||||
|
||||
返回:
|
||||
{"userFavoriteList": [{itemKind, itemIdList}, ...]},恒 5 条
|
||||
"""
|
||||
kinds = list(item_kinds) if item_kinds else list(FAVORITE_ITEM_KINDS)
|
||||
log_info("取用户全部收藏:user_id=" + str(user_id) + " kinds=" + str(kinds))
|
||||
|
||||
result: List[Dict[str, Any]] = []
|
||||
raw_items: List[Dict[str, Any]] = []
|
||||
for kind in kinds:
|
||||
resp = _get(
|
||||
"GetUserFavoriteApi",
|
||||
UserFavoriteRequestVO(userId=user_id, itemKind=kind),
|
||||
user_id, client_id=client_id, timeout_ms=timeout_ms, client=client,
|
||||
)
|
||||
fav = resp.get("userFavorite") or {}
|
||||
if not fav:
|
||||
log_warning("itemKind=" + str(kind) + " 未返回 userFavorite,按空处理")
|
||||
fav = {"itemKind": kind, "itemIdList": []}
|
||||
|
||||
# ★ 真机里 itemKind=10 的响应回的是 {"itemKind":null,"itemIdList":[]}(服务端怪癖)。
|
||||
# 保留一份**原始**副本供 Upsert 差分用 —— 位串里的 "1" 正是它产生的。
|
||||
raw_items.append(dict(fav))
|
||||
|
||||
# 回传用的副本按请求值补齐 itemKind,避免报文里出现 null
|
||||
filled = dict(fav)
|
||||
if not filled.get("itemKind"):
|
||||
filled["itemKind"] = kind
|
||||
result.append(filled)
|
||||
|
||||
log_info("收藏获取完成:" + str(len(result)) + " 类")
|
||||
return {"userFavoriteList": result, "_raw": raw_items}
|
||||
Reference in New Issue
Block a user