diff --git a/package.json b/package.json index 6fe0aac..4ff66c2 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "chalk": "^5.2.0", "chokidar": "^3.5.3", "https-proxy-agent": "5.0.1", - "icqq": "^0.4.10", + "icqq": "^0.4.11", "image-size": "^1.0.2", "inquirer": "^8.2.5", "lodash": "^4.17.21", diff --git a/plugins/genshin/apps/sevenSaints.js b/plugins/genshin/apps/sevenSaints.js index b21a646..c549168 100644 --- a/plugins/genshin/apps/sevenSaints.js +++ b/plugins/genshin/apps/sevenSaints.js @@ -8,14 +8,14 @@ export class sevenSaints extends plugin { name: '七圣召唤卡组查询', dsc: '原神角色信息查询', event: 'message', - priority: 5000, + priority: 0, rule: [ { - reg: '^#*七圣(召唤)?(牌|卡)组(列表)?[0-9]{0,2}$', + reg: '^#*七圣(召唤)?查询(牌|卡)组(列表)?[0-9]{0,2}$', fnc: 'deckIndex' }, { - reg: '^#*七圣(召唤)?(角色|行动)?(卡)?牌(列表)?$', + reg: '^#*七圣(召唤)?查询(角色|行动)?(卡)?牌(列表)?$', fnc: 'deck_cards' } ] diff --git a/plugins/genshin/defSet/pool/11.yaml b/plugins/genshin/defSet/pool/11.yaml index f4010ac..e75196a 100644 --- a/plugins/genshin/defSet/pool/11.yaml +++ b/plugins/genshin/defSet/pool/11.yaml @@ -1,3 +1,12 @@ +- from: '2023-07-19 11:00:00' + to: '2023-08-09 11:59:59' + five: + - 刃 + four: + - 阿兰 + - 娜塔莎 + - 素裳 + name: 业途游魂 - from: '2023-06-28 12:00:00' to: '2023-07-18 14:59:59' five: diff --git a/plugins/genshin/defSet/pool/12.yaml b/plugins/genshin/defSet/pool/12.yaml index 9e466af..4db4b28 100644 --- a/plugins/genshin/defSet/pool/12.yaml +++ b/plugins/genshin/defSet/pool/12.yaml @@ -1,3 +1,12 @@ +- from: '2023-07-19 11:00:00' + to: '2023-08-09 11:59:59'' + five: + - 到不了的彼岸 + four: + - 秘密誓心 + - 同一种心情 + - 论剑 + name: 流光定影 - from: '2023-06-28 12:00:00' to: '2023-07-18 14:59:59' five: diff --git a/plugins/genshin/model/db/UserDB.js b/plugins/genshin/model/db/UserDB.js index c06c1e5..246614a 100644 --- a/plugins/genshin/model/db/UserDB.js +++ b/plugins/genshin/model/db/UserDB.js @@ -2,6 +2,7 @@ import BaseModel from './BaseModel.js' import lodash from 'lodash' import { UserGameDB } from './index.js' import MysUtil from '../mys/MysUtil.js' +import MysUserDB from './MysUserDB.js' const { Types } = BaseModel @@ -95,6 +96,6 @@ class UserDB extends BaseModel { } BaseModel.initDB(UserDB, COLUMNS) -await UserDB.sync({ alter: true }) +await UserDB.sync() export default UserDB \ No newline at end of file diff --git a/plugins/genshin/model/deck.js b/plugins/genshin/model/deck.js index 7e24cb9..35851bf 100644 --- a/plugins/genshin/model/deck.js +++ b/plugins/genshin/model/deck.js @@ -10,21 +10,8 @@ export default class Deck extends base { this.headIndexStyle = `` } - async getdata(api) { - let seed_id = lodash.sample('abcdefghijklmnopqrstuvwxyz0123456789', 16).replace(/,/g, '') - let device_fp = await MysInfo.get(this.e, 'getFp', { - seed_id - }) - let res = await MysInfo.get(this.e, api, { - headers: { - 'x-rpc-device_fp': device_fp?.data?.device_fp - } - }) - return res - } - async getIndex(id, list = false) { - let res = await this.getdata('deckList') + let res = await MysInfo.get(this.e, 'deckList') if (res?.retcode !== 0) return false let Data @@ -58,7 +45,7 @@ export default class Deck extends base { let res = {} for (let api of ['basicInfo', 'avatar_cardList', 'action_cardList']) { if ((id == 2 && api == 'avatar_cardList') || (id == 1 && api == 'action_cardList')) continue - res[api] = (await this.getdata(api)).data + res[api] = (await MysInfo.get(this.e, api)).data } this.model = 'deckCard' diff --git a/plugins/genshin/model/mys/mysInfo.js b/plugins/genshin/model/mys/mysInfo.js index 6e28300..36a909e 100644 --- a/plugins/genshin/model/mys/mysInfo.js +++ b/plugins/genshin/model/mys/mysInfo.js @@ -25,7 +25,7 @@ export default class MysInfo { } // ck对应MysUser对象 this.ckUser = null - this.auth = ['dailyNote', 'bbs_sign_info', 'bbs_sign_home', 'bbs_sign', 'ys_ledger', 'compute', 'avatarSkill', 'detail', 'blueprint', 'UserGame', 'deckList', 'avatar_cardList', 'action_cardList'] + this.auth = ['dailyNote', 'bbs_sign_info', 'bbs_sign_home', 'bbs_sign', 'ys_ledger', 'compute', 'avatarSkill', 'detail', 'blueprint', 'UserGame', 'getFp', 'deckList', 'avatar_cardList', 'action_cardList'] } static async init(e, api) { diff --git a/plugins/genshin/resources/html/deckCard/deckCard.html b/plugins/genshin/resources/html/deckCard/deckCard.html index 601da4b..032e62e 100644 --- a/plugins/genshin/resources/html/deckCard/deckCard.html +++ b/plugins/genshin/resources/html/deckCard/deckCard.html @@ -43,6 +43,9 @@ + {{if !avatar_cardList && !action_cardList}} + + {{/if}} {{/if}}
diff --git a/plugins/genshin/resources/html/deckList/deckList.html b/plugins/genshin/resources/html/deckList/deckList.html index f62c299..6334b08 100644 --- a/plugins/genshin/resources/html/deckList/deckList.html +++ b/plugins/genshin/resources/html/deckList/deckList.html @@ -29,7 +29,7 @@ {{each Data vals}}
-
七圣卡组{{vals.id}} 使用#七圣卡组{{vals.id}}查看详情
+
七圣卡组{{vals.id}} 使用#七圣查询卡组{{vals.id}}查看详情
{{each vals.avatar_cards val}} diff --git a/plugins/genshin/resources/html/user/uid-list.css b/plugins/genshin/resources/html/user/uid-list.css index 58a98cc..6801973 100644 --- a/plugins/genshin/resources/html/user/uid-list.css +++ b/plugins/genshin/resources/html/user/uid-list.css @@ -76,7 +76,7 @@ nobr { } .uid-list .game-inner { display: flex; - background: linear-gradient(to right, rgba(240, 236, 228, 0.7), rgba(240, 236, 228, 0.5), rgba(240, 236, 228, 0)); + background: linear-gradient(to right, rgba(240, 236, 228, 0.6), rgba(240, 236, 228, 0.6), rgba(240, 236, 228, 0), rgba(240, 236, 228, 0)); padding: 4px; border-radius: 33px; } diff --git a/plugins/genshin/resources/html/user/uid-list.less b/plugins/genshin/resources/html/user/uid-list.less index 60484f3..98e6c0d 100644 --- a/plugins/genshin/resources/html/user/uid-list.less +++ b/plugins/genshin/resources/html/user/uid-list.less @@ -94,7 +94,7 @@ nobr { .game-inner { display: flex; - background: linear-gradient(to right, rgba(240, 236, 228, 0.7), rgba(240, 236, 228, 0.5), rgba(240, 236, 228, 0)); + background: linear-gradient(to right, rgba(240, 236, 228, 0.6), rgba(240, 236, 228, 0.6), rgba(240, 236, 228, 0), rgba(240, 236, 228, 0)); padding: 4px; border-radius: 33px;