From 589106c0559622830c7b49e57490292a4457cfb1 Mon Sep 17 00:00:00 2001 From: Ctrlcvs <1509167646@qq.com> Date: Sat, 6 May 2023 19:21:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=9A=E4=B8=AA=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=A7=92=E8=89=B2=E6=97=B6=E7=BB=91=E5=AE=9A=E5=8F=AA?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=B8=80=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/model/mys/apiTool.js | 6 ------ plugins/genshin/model/user.js | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/plugins/genshin/model/mys/apiTool.js b/plugins/genshin/model/mys/apiTool.js index 4be59f4..e986cde 100644 --- a/plugins/genshin/model/mys/apiTool.js +++ b/plugins/genshin/model/mys/apiTool.js @@ -124,12 +124,6 @@ export default class apiTool { } if (this.server.startsWith('os')) { - urlMap.genshin.bbs_sign_info.url = 'https://hk4e-api-os.hoyoverse.com/event/sol/info' - urlMap.genshin.bbs_sign_info.query = `act_id=e202102251931481®ion=${this.server}&uid=${this.uid}` - urlMap.genshin.bbs_sign_home.url = 'https://hk4e-api-os.hoyoverse.com/event/sol/home' - urlMap.genshin.bbs_sign_home.query = `act_id=e202102251931481®ion=${this.server}&uid=${this.uid}` - urlMap.genshin.bbs_sign.url = 'https://hk4e-api-os.hoyoverse.com/event/sol/sign' - urlMap.genshin.bbs_sign.body = { act_id: 'e202102251931481', region: this.server, uid: this.uid } urlMap.genshin.detail.url = 'https://sg-public-api.hoyolab.com/event/calculateos/sync/avatar/detail'// 角色天赋详情 urlMap.genshin.detail.query = `lang=zh-cn&uid=${this.uid}®ion=${this.server}&avatar_id=${data.avatar_id}` urlMap.genshin.avatarSkill.url = 'https://sg-public-api.hoyolab.com/event/calculateos/avatar/skill_list'// 查询未持有的角色天赋 diff --git a/plugins/genshin/model/user.js b/plugins/genshin/model/user.js index 7473d1d..5af7e7d 100644 --- a/plugins/genshin/model/user.js +++ b/plugins/genshin/model/user.js @@ -152,11 +152,14 @@ export default class User extends base { res.data.list = res.data.list.filter(v => ['hk4e_cn', 'hkrpg_cn', 'hk4e_global'].includes(v.game_biz)) } + //避免同时多个默认展示角色时候只绑定一个 + let is_chosen =false /** 米游社默认展示的角色 */ for (let val of res.data.list) { - if (val.is_chosen) { + if (val.is_chosen&&!is_chosen) { this.uid = val.game_uid this.region_name = val.region_name + is_chosen=true } else { this.allUid.push({ uid: val.game_uid, @@ -165,6 +168,7 @@ export default class User extends base { } } + if (!this.uid && res.data?.list?.length > 0) { this.uid = res.data.list[0].game_uid this.region_name = res.data.list[0].region_name