diff --git a/plugins/genshin/model/mys/mysApi.js b/plugins/genshin/model/mys/mysApi.js index 2e48f17..8fb0265 100644 --- a/plugins/genshin/model/mys/mysApi.js +++ b/plugins/genshin/model/mys/mysApi.js @@ -70,7 +70,7 @@ export default class MysApi { } async getData(type, data = {}, cached = false) { - if (!this._device_fp && !data?.Getfp) { + if (!this._device_fp && !data?.Getfp && !data?.headers?.['x-rpc-device_fp']) { this._device_fp = await this.getData('getFp', { seed_id: this.generateSeed(16), Getfp: true @@ -92,8 +92,8 @@ export default class MysApi { headers = { ...headers, ...data.headers } } - if (type !== 'getFp' && !headers['x-rpc-device_fp']) { - headers['x-rpc-device_fp'] = this._device_fp.data?.device_fp + if (type !== 'getFp' && !headers['x-rpc-device_fp'] && this._device_fp.data.device_fp) { + headers['x-rpc-device_fp'] = this._device_fp.data.device_fp } let param = { diff --git a/plugins/genshin/model/mys/mysInfo.js b/plugins/genshin/model/mys/mysInfo.js index 66b7fc2..0018916 100644 --- a/plugins/genshin/model/mys/mysInfo.js +++ b/plugins/genshin/model/mys/mysInfo.js @@ -408,9 +408,11 @@ export default class MysInfo { if (res.api === 'detail') res.retcode = 0 break case 5003: + case 10041: if (!isTask) this.e.reply([`UID:${this.uid},米游社账号异常,暂时无法查询`, this.mysButton]) break case 1034: + case 10035: let handler = this.e.runtime?.handler || {} // 如果有注册的mys.req.err,调用