diff --git a/CHANGELOG.md b/CHANGELOG.md index 287ba49..bbf1ae7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ -# 1.2.5 -* 优化绑定stoken逻辑 +# 1.2.2 ~ 1.2.6 +* 增加七圣召唤图鉴 + * 可通过`#七圣图鉴`获取可查询的目录数据 +* 优化`stoken`绑定 * 优化别名文件 * 新增指令`多体力` * 用户可通过指令同时查询全部绑定的ck体力数据 -# 1.2.4 * 新增`群体力推送` * 用户可通过`#开启、关闭体力推送` 来对体力推送进行操作 * 管理员可通过`#体力设置群推送关闭、开启` 以及推送阈值设置`#体力设置群阈值120` 仅支持群操作 @@ -15,12 +16,9 @@ * 新增`#图鉴设置获取sk开启、关闭` * 绑定ck时自动获取sk * 风险自担!!! 插件只负责提供功能 -# 1.2.3 * 新增地图资源查询功能 * `#月莲在哪里` 指令类似 `某某物品在哪里` * 感谢 **@小灰灰** 提供的webAPI接口服务 -# 1.2.2 -* 重写接口文件去除`promise-retry`跟 `superagent`依赖 * 自动签到增加推送签到信息以及成功信息 # 1.2.1 * 新增指令`获取(抽卡记录|ck)` 导出cookie或者抽卡链接供用户操作到其他bot或app上面 diff --git a/model/mys/mihoyoApi.js b/model/mys/mihoyoApi.js index c0d8ae4..cb15a09 100644 --- a/model/mys/mihoyoApi.js +++ b/model/mys/mihoyoApi.js @@ -162,6 +162,10 @@ export default class miHoYoApi { }, types: 'bbs' }, + geeType: { + url: `https://api.geetest.com/gettype.php`, + query: `gt=${data.gt}` + }, //待定接口 用于获取用户米游社顶部的模块栏 bbs_Businesses_url: { url: `${mys.bbs_api}/user/api/getUserBusinesses`, diff --git a/model/user.js b/model/user.js index b5bb0f0..01dfb99 100644 --- a/model/user.js +++ b/model/user.js @@ -610,7 +610,7 @@ export default class user { try { let res = await this.getData('bbsGetCaptcha', false) // let challenge = res.data["challenge"] - await this.getData("geeType", res.data, false) + // await this.getData("geeType", res.data, false) //接入别的平台请把这段代码放出来 否则会一直出现提示拼图失效的情况 res = await this.getData("validate", res.data, false) if (res?.data?.validate) { res = await this.getData("bbsCaptchaVerify", res.data, false) diff --git a/resources/Atlas_alias/Atlas_list.yaml b/resources/Atlas_alias/Atlas_list.yaml index 2e4cc68..e908d77 100644 --- a/resources/Atlas_alias/Atlas_list.yaml +++ b/resources/Atlas_alias/Atlas_list.yaml @@ -6,6 +6,7 @@ - "#食物图鉴" - "#秘境图鉴" - "#道具图鉴" + - "#七圣图鉴" 角色图鉴|人物图鉴|英雄图鉴: - 角色星级: - "#五星角色图鉴" @@ -1550,3 +1551,143 @@ boss图鉴|BOSS图鉴|Boss图鉴|周本图鉴|世界boss图鉴: - "#流明石触媒图鉴" - "#迷你仙灵图鉴" - "#口袋锚点图鉴" +七圣图鉴|七圣召唤图鉴: + - "#七圣角色图鉴" + - "#七圣场地图鉴" + - "#七圣道具图鉴" + - "#七圣伙伴图鉴" + - "#七圣料理图鉴" + - "#七圣料理图鉴" + - "#七圣其他图鉴" + - "#七圣圣遗物图鉴" + - "#七圣武器图鉴" + - "#七圣元素共鸣图鉴" +七圣角色图鉴|: + - "#七圣刻晴图鉴" + - "#七圣迪奥娜图鉴" + - "#七圣科莱图鉴" + - "#七圣诺艾尔图鉴" + - "#七圣凝光图鉴" + - "#七圣琴图鉴" + - "#七圣砂糖图鉴" + - "#七圣赛诺图鉴" + - "#七圣雷泽图鉴" + - "#七圣菲谢尔图鉴" + - "#七圣宵宫图鉴" + - "#七圣班尼特图鉴" + - "#七圣香菱图鉴" + - "#七圣迪卢克图鉴" + - "#七圣莫娜图鉴" + - "#七圣行秋图鉴" + - "#七圣芭芭拉图鉴" + - "#七圣神里绫华图鉴" + - "#七圣重云图鉴" + - "#七圣凯亚图鉴" + - "#七圣甘雨图鉴" + - "#七圣翠翎恐蕈图鉴" + - "#七圣丘丘岩盔王图鉴" + - "#七圣魔偶剑鬼图鉴" + - "#七圣愚人众·火之债务处理人图鉴" + - "#七圣愚人众·藏镜仕女图鉴" + - "#七圣纯水精灵·洛蒂娅图鉴" +七圣场地图鉴|七圣召唤场地图鉴: + - "#七圣晨曦酒庄图鉴" + - "#七圣璃月港口图鉴" + - "#七圣骑士团图书馆图鉴" + - "#七圣群玉阁图鉴" + - "#七圣望舒客栈图鉴" + - "#七圣西风大教堂图鉴" +七圣道具图鉴|七圣召唤道具图鉴: + - "#七圣便携营养袋图鉴" + - "#七圣参量质变仪图鉴" +七圣伙伴图鉴|七圣召唤伙伴图鉴: + - "#七圣阿圆图鉴" + - "#七圣艾琳图鉴" + - "#七圣常九爷图鉴" + - "#七圣蒂玛乌斯图鉴" + - "#七圣凯瑟琳图鉴" + - "#七圣立本图鉴" + - "#七圣刘苏图鉴" + - "#七圣卯师傅图鉴" + - "#七圣派蒙图鉴" + - "#七圣提米图鉴" + - "#七圣田铁嘴图鉴" + - "#七圣瓦格纳图鉴" +七圣料理图鉴|七圣召唤料理图鉴: + - "#七圣北地烟熏鸡图鉴" + - "#七圣绝云锅巴图鉴" + - "#七圣烤蘑菇披萨图鉴" + - "#七圣莲花酥图鉴" + - "#七圣蒙德土豆饼图鉴" + - "#七圣兽肉薄荷卷图鉴" + - "#七圣甜甜花酿鸡图鉴" + - "#七圣仙跳墙图鉴" +七圣其他图鉴|七圣召唤其他图鉴: + - "#七圣白垩之术图鉴" + - "#七圣本大爷还没有输图鉴" + - "#七圣鹤归之时图鉴" + - "#七圣护法之誓图鉴" + - "#七圣换班时间图鉴" + - "#七圣交给我吧图鉴" + - "#七圣快快缝补术图鉴" + - "#七圣雷楔图鉴" + - "#七圣深渊的呼唤图鉴" + - "#七圣神宝迁宫祝词图鉴" + - "#七圣送你一程图鉴" + - "#七圣星天之兆图鉴" + - "#七圣一掷乾坤图鉴" + - "#七圣运筹帷幄图鉴" + - "#七圣诸武精通图鉴" + - "#七圣最好的伙伴图鉴" +七圣圣遗物图鉴|七圣召唤圣遗物图鉴: + - "#七圣冰风迷途的勇士图鉴" + - "#七圣不动玄石之相图鉴" + - "#七圣沉沦之心图鉴" + - "#七圣炽烈的炎之魔女图鉴" + - "#七圣翠绿的猎人之冠图鉴" + - "#七圣翠绿之影图鉴" + - "#七圣赌徒的耳环图鉴" + - "#七圣唤雷的头冠图鉴" + - "#七圣焦灼的魔女帽图鉴" + - "#七圣教官的帽子图鉴" + - "#七圣酒渍船帽图鉴" + - "#七圣流放者头冠图鉴" + - "#七圣冒险家头带图鉴" + - "#七圣破冰踏雪的回音图鉴" + - "#七圣如雷的盛怒图鉴" + - "#七圣深林的记忆图鉴" + - "#七圣幸运儿银冠图鉴" + - "#七圣悠古的磐岩图鉴" + - "#七圣游医的方巾图鉴" + - "#七圣月桂的宝冠图鉴" +七圣武器图鉴|七圣召唤武器图鉴: + - "#七圣白铁大剑图鉴" + - "#七圣白缨枪图鉴" + - "#七圣风鹰剑图鉴" + - "#七圣祭礼残章图鉴" + - "#七圣祭礼大剑图鉴" + - "#七圣祭礼弓图鉴" + - "#七圣祭礼剑图鉴" + - "#七圣狼的末路图鉴" + - "#七圣旅行剑图鉴" + - "#七圣魔导绪论图鉴" + - "#七圣千岩长枪图鉴" + - "#七圣天空之脊图鉴" + - "#七圣天空之卷图鉴" + - "#七圣天空之翼图鉴" + - "#七圣鸦羽弓图鉴" +七圣元素共鸣图鉴|七圣召唤元素共鸣图鉴: + - "#七圣粉碎之冰图鉴" + - "#七圣坚定之岩图鉴" + - "#七圣交织之冰图鉴" + - "#七圣交织之草图鉴" + - "#七圣交织之风图鉴" + - "#七圣交织之火图鉴" + - "#七圣交织之雷图鉴" + - "#七圣交织之水图鉴" + - "#七圣交织之岩图鉴" + - "#七圣蔓生之草图鉴" + - "#七圣强能之雷图鉴" + - "#七圣热诚之火图鉴" + - "#七圣迅捷之风图鉴" + - "#七圣愈疗之水图鉴"