From a0c3464f4d5a4a1fed33f842c9a74052479e0ad0 Mon Sep 17 00:00:00 2001 From: kissnavel Date: Thu, 11 Jul 2024 00:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E6=9C=8D=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mysapi.js | 19 +++++++++---------- lib/mysapi/tool.js | 9 ++++++++- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/lib/mysapi.js b/lib/mysapi.js index 2dfe271..1ea270b 100644 --- a/lib/mysapi.js +++ b/lib/mysapi.js @@ -7,7 +7,6 @@ import MysApi from '../../genshin/model/mys/mysApi.js'; // const DEVICE_ID = randomString(32).toUpperCase() const DEVICE_NAME = randomString(_.random(1, 10)); const game_region = [ - 'prod_gf_cn', 'prod_gf_cn', 'prod_gf_us', 'prod_gf_eu', @@ -38,13 +37,13 @@ export default class MysZZZApi extends MysApi { } switch (_uid.slice(0, -8)) { case '10': - return game_region[2]; // 美服 + return game_region[1]; // 美服 case '15': - return game_region[3]; // 欧服 + return game_region[2]; // 欧服 case '13': - return game_region[4]; // 亚服 + return game_region[3]; // 亚服 case '17': - return game_region[5]; // 港澳台服 + return game_region[4]; // 港澳台服 } } @@ -102,9 +101,9 @@ export default class MysZZZApi extends MysApi { getDs(q = '', b = '') { let n = ''; - if (['prod_gf_cn', 'prod_qd_cn'].includes(this.server)) { + if (['prod_gf_cn'].includes(this.server)) { n = 'xV8v4Qu54lUKrEYFZkJhB8cuOh9Asafs'; - } else if (/prod_gf_/.test(this.server)) { + } else { n = 'okr4obncj8bw5a65hbnn5oo6ixjc3l9w'; } let t = Math.round(new Date().getTime() / 1000); @@ -140,10 +139,10 @@ export default class MysZZZApi extends MysApi { Referer: 'https://act.hoyolab.com/', }; let client; - if (/official/.test(this.server)) { - client = os; - } else { + if (['prod_gf_cn'].includes(this.server)) { client = cn; + } else { + client = os; } return { 'x-rpc-app_version': client.app_version, diff --git a/lib/mysapi/tool.js b/lib/mysapi/tool.js index 8d6aa63..585e81b 100644 --- a/lib/mysapi/tool.js +++ b/lib/mysapi/tool.js @@ -23,7 +23,7 @@ export default class ZZZApiTool { host = 'https://api-takumi.mihoyo.com/'; hostRecord = 'https://api-takumi-record.mihoyo.com/'; hostPublicData = 'https://public-data-api.mihoyo.com/'; - } else if (/prod_gf_/.test(this.server)) { + } else { host = 'https://sg-public-api.hoyolab.com/'; hostRecord = 'https://bbs-api-os.hoyolab.com/'; hostPublicData = 'https://sg-public-data-api.hoyoverse.com/'; @@ -90,6 +90,13 @@ export default class ZZZApiTool { }, }, }; + + if (/_us|_eu|_jp|_sg/.test(this.server)) { + urlMap.zzz.zzzNote.url = 'https://sg-act-nap-api.hoyolab.com/event/game_record_zzz/api/zzz/note' + urlMap.zzz.zzzNote.query = `role_id=${this.uid}&server=${this.server}` + urlMap.zzz.zzzIndex.url = 'https://sg-act-nap-api.hoyolab.com/event/game_record_zzz/api/zzz/index' + urlMap.zzz.zzzIndex.query = `role_id=${this.uid}&server=${this.server}` + }; return urlMap[this.game]; }; }