diff --git a/plugins/genshin/apps/takeBirthdayPhoto.js b/plugins/genshin/apps/takeBirthdayPhoto.js index e99c9cb..00be7c7 100644 --- a/plugins/genshin/apps/takeBirthdayPhoto.js +++ b/plugins/genshin/apps/takeBirthdayPhoto.js @@ -3,25 +3,22 @@ import gsCfg from '../model/gsCfg.js' import fetch from 'node-fetch' export class takeBirthdayPhoto extends plugin { - constructor () { + constructor() { super({ name: '留影叙佳期', dsc: '留影叙佳期', - /** https://oicqjs.github.io/oicq/#events */ event: 'message', priority: 5000, rule: [ { - /** 命令正则匹配 */ - reg: '#?留影叙佳期$', - /** 执行方法 */ + reg: '#?(留影(叙佳期)?|((领)?((角色)?生日)(卡)?))$', fnc: 'birthdaystar' } ] }) } - async birthdaystar (e) { + async birthdaystar(e) { const { user_id } = e const userInfo = await this.getCookie(user_id) @@ -46,28 +43,32 @@ export class takeBirthdayPhoto extends plugin { e.reply('今天没有生日角色哦~', true) return true } - - for (const role of birthday_star_list) { - await e.reply(`正在获取${role.name}的图片,请稍等~`, true) - await e.reply(segment.image(role.take_picture)) - const message = await this.getBirthdayStarImg(userInfo.uid, e_hk4e_token, userInfo.ck, role.role_id) - if (message != 'success') { - await e.reply(message) - return true - } else { - await e.reply(`获取${role.name}的图片成功~`, true) + try { + for (const role of birthday_star_list) { + await e.reply(`正在获取${role.name}的图片,请稍等~`, true) + await e.reply(segment.image(role.take_picture)) + const message = await this.getBirthdayStarImg(userInfo.uid, e_hk4e_token, userInfo.ck, role.role_id) + if (message != 'success') { + await e.reply(message) + return true + } else { + await e.reply(`获取${role.name}的图片成功~`, true) + } } + } catch (error) { + await e.reply(`获取角色留影叙佳期图片失败,可能是ck失效...`, true) + logger.error(error) } return true } - async getCookie (user_id) { + async getCookie(user_id) { const userInfo = ((await gsCfg.getBingCk()).ckQQ)[user_id] return userInfo } - async getEHK4EToken (ck, uid) { + async getEHK4EToken(ck, uid) { const isCN = uid.toString().match(/^[125]/) ? true : false const url = isCN ? 'https://api-takumi.mihoyo.com/common/badge/v1/login/account' : 'https://api-os-takumi.mihoyo.com/common/badge/v1/login/account' const game_biz = isCN ? 'hk4e_cn' : 'hk4e_global' @@ -93,7 +94,7 @@ export class takeBirthdayPhoto extends plugin { return e_hk4e_token } - async getServer (uid) { + async getServer(uid) { switch (String(uid)[0]) { case '1': case '2': @@ -112,7 +113,7 @@ export class takeBirthdayPhoto extends plugin { return 'cn_gf01' } - async getBirthdayStar (uid, e_hk4e_token, ck) { + async getBirthdayStar(uid, e_hk4e_token, ck) { const cookie = `e_hk4e_token=${e_hk4e_token};${ck}` const badge_region = await this.getServer(uid) const isCN = uid.toString().match(/^[125]/) ? true : false @@ -124,7 +125,7 @@ export class takeBirthdayPhoto extends plugin { return res.data.role } - async getBirthdayStarImg (uid, e_hk4e_token, ck, role_id) { + async getBirthdayStarImg(uid, e_hk4e_token, ck, role_id) { const cookie = `e_hk4e_token=${e_hk4e_token};${ck}` const badge_region = await this.getServer(uid) const isCN = uid.toString().match(/^[125]/) ? true : false diff --git a/plugins/genshin/resources/img/talent/今昔剧画_2.png b/plugins/genshin/resources/img/talent/今昔剧画_2.png index 78cc2d8..f1222b6 100644 Binary files a/plugins/genshin/resources/img/talent/今昔剧画_2.png and b/plugins/genshin/resources/img/talent/今昔剧画_2.png differ diff --git a/plugins/genshin/resources/img/talent/今昔剧画_3.png b/plugins/genshin/resources/img/talent/今昔剧画_3.png index 43d40db..57fc913 100644 Binary files a/plugins/genshin/resources/img/talent/今昔剧画_3.png and b/plugins/genshin/resources/img/talent/今昔剧画_3.png differ diff --git a/plugins/genshin/resources/img/talent/今昔剧画_4.png b/plugins/genshin/resources/img/talent/今昔剧画_4.png index 2d68d1f..8d152e9 100644 Binary files a/plugins/genshin/resources/img/talent/今昔剧画_4.png and b/plugins/genshin/resources/img/talent/今昔剧画_4.png differ diff --git a/plugins/genshin/resources/img/talent/凛风奔狼_2.png b/plugins/genshin/resources/img/talent/凛风奔狼_2.png index 23a94c3..89aa1d2 100644 Binary files a/plugins/genshin/resources/img/talent/凛风奔狼_2.png and b/plugins/genshin/resources/img/talent/凛风奔狼_2.png differ diff --git a/plugins/genshin/resources/img/talent/凛风奔狼_3.png b/plugins/genshin/resources/img/talent/凛风奔狼_3.png index e8ed20e..c0c711f 100644 Binary files a/plugins/genshin/resources/img/talent/凛风奔狼_3.png and b/plugins/genshin/resources/img/talent/凛风奔狼_3.png differ diff --git a/plugins/genshin/resources/img/talent/凛风奔狼_4.png b/plugins/genshin/resources/img/talent/凛风奔狼_4.png index c03f2bd..d604f7b 100644 Binary files a/plugins/genshin/resources/img/talent/凛风奔狼_4.png and b/plugins/genshin/resources/img/talent/凛风奔狼_4.png differ diff --git a/plugins/genshin/resources/img/talent/孤云寒林_2.png b/plugins/genshin/resources/img/talent/孤云寒林_2.png index 0ad50ae..db64dc1 100644 Binary files a/plugins/genshin/resources/img/talent/孤云寒林_2.png and b/plugins/genshin/resources/img/talent/孤云寒林_2.png differ diff --git a/plugins/genshin/resources/img/talent/孤云寒林_3.png b/plugins/genshin/resources/img/talent/孤云寒林_3.png index e4a09ab..a6909ca 100644 Binary files a/plugins/genshin/resources/img/talent/孤云寒林_3.png and b/plugins/genshin/resources/img/talent/孤云寒林_3.png differ diff --git a/plugins/genshin/resources/img/talent/孤云寒林_4.png b/plugins/genshin/resources/img/talent/孤云寒林_4.png index 7c2c219..1fd80d1 100644 Binary files a/plugins/genshin/resources/img/talent/孤云寒林_4.png and b/plugins/genshin/resources/img/talent/孤云寒林_4.png differ diff --git a/plugins/genshin/resources/img/talent/悠古弦音_2.png b/plugins/genshin/resources/img/talent/悠古弦音_2.png index 19a01cf..38bd026 100644 Binary files a/plugins/genshin/resources/img/talent/悠古弦音_2.png and b/plugins/genshin/resources/img/talent/悠古弦音_2.png differ diff --git a/plugins/genshin/resources/img/talent/悠古弦音_3.png b/plugins/genshin/resources/img/talent/悠古弦音_3.png index 9e54c7d..9e8d5f2 100644 Binary files a/plugins/genshin/resources/img/talent/悠古弦音_3.png and b/plugins/genshin/resources/img/talent/悠古弦音_3.png differ diff --git a/plugins/genshin/resources/img/talent/悠古弦音_4.png b/plugins/genshin/resources/img/talent/悠古弦音_4.png index fd49851..6cf641e 100644 Binary files a/plugins/genshin/resources/img/talent/悠古弦音_4.png and b/plugins/genshin/resources/img/talent/悠古弦音_4.png differ diff --git a/plugins/genshin/resources/img/talent/无垢之海_2.png b/plugins/genshin/resources/img/talent/无垢之海_2.png index 26bb46a..d85129e 100644 Binary files a/plugins/genshin/resources/img/talent/无垢之海_2.png and b/plugins/genshin/resources/img/talent/无垢之海_2.png differ diff --git a/plugins/genshin/resources/img/talent/无垢之海_3.png b/plugins/genshin/resources/img/talent/无垢之海_3.png index 720fb00..3a2319e 100644 Binary files a/plugins/genshin/resources/img/talent/无垢之海_3.png and b/plugins/genshin/resources/img/talent/无垢之海_3.png differ diff --git a/plugins/genshin/resources/img/talent/无垢之海_4.png b/plugins/genshin/resources/img/talent/无垢之海_4.png index f1f2f6d..9826bcd 100644 Binary files a/plugins/genshin/resources/img/talent/无垢之海_4.png and b/plugins/genshin/resources/img/talent/无垢之海_4.png differ diff --git a/plugins/genshin/resources/img/talent/漆黑陨铁_2.png b/plugins/genshin/resources/img/talent/漆黑陨铁_2.png index 13eb8d9..2352a04 100644 Binary files a/plugins/genshin/resources/img/talent/漆黑陨铁_2.png and b/plugins/genshin/resources/img/talent/漆黑陨铁_2.png differ diff --git a/plugins/genshin/resources/img/talent/漆黑陨铁_3.png b/plugins/genshin/resources/img/talent/漆黑陨铁_3.png index a07f6aa..a8b1c38 100644 Binary files a/plugins/genshin/resources/img/talent/漆黑陨铁_3.png and b/plugins/genshin/resources/img/talent/漆黑陨铁_3.png differ diff --git a/plugins/genshin/resources/img/talent/漆黑陨铁_4.png b/plugins/genshin/resources/img/talent/漆黑陨铁_4.png index 9f77472..68762bd 100644 Binary files a/plugins/genshin/resources/img/talent/漆黑陨铁_4.png and b/plugins/genshin/resources/img/talent/漆黑陨铁_4.png differ diff --git a/plugins/genshin/resources/img/talent/烈日威权_2.png b/plugins/genshin/resources/img/talent/烈日威权_2.png index 0cae78c..04c27e2 100644 Binary files a/plugins/genshin/resources/img/talent/烈日威权_2.png and b/plugins/genshin/resources/img/talent/烈日威权_2.png differ diff --git a/plugins/genshin/resources/img/talent/烈日威权_3.png b/plugins/genshin/resources/img/talent/烈日威权_3.png index 7144aec..f1a318a 100644 Binary files a/plugins/genshin/resources/img/talent/烈日威权_3.png and b/plugins/genshin/resources/img/talent/烈日威权_3.png differ diff --git a/plugins/genshin/resources/img/talent/烈日威权_4.png b/plugins/genshin/resources/img/talent/烈日威权_4.png index 208d834..58c7305 100644 Binary files a/plugins/genshin/resources/img/talent/烈日威权_4.png and b/plugins/genshin/resources/img/talent/烈日威权_4.png differ diff --git a/plugins/genshin/resources/img/talent/狮牙斗士_2.png b/plugins/genshin/resources/img/talent/狮牙斗士_2.png index a52a9e0..5b00d54 100644 Binary files a/plugins/genshin/resources/img/talent/狮牙斗士_2.png and b/plugins/genshin/resources/img/talent/狮牙斗士_2.png differ diff --git a/plugins/genshin/resources/img/talent/狮牙斗士_3.png b/plugins/genshin/resources/img/talent/狮牙斗士_3.png index dc67c9f..24b0068 100644 Binary files a/plugins/genshin/resources/img/talent/狮牙斗士_3.png and b/plugins/genshin/resources/img/talent/狮牙斗士_3.png differ diff --git a/plugins/genshin/resources/img/talent/狮牙斗士_4.png b/plugins/genshin/resources/img/talent/狮牙斗士_4.png index 4cccfbc..6f1006c 100644 Binary files a/plugins/genshin/resources/img/talent/狮牙斗士_4.png and b/plugins/genshin/resources/img/talent/狮牙斗士_4.png differ diff --git a/plugins/genshin/resources/img/talent/纯圣露滴_2.png b/plugins/genshin/resources/img/talent/纯圣露滴_2.png index feb6d11..f80a448 100644 Binary files a/plugins/genshin/resources/img/talent/纯圣露滴_2.png and b/plugins/genshin/resources/img/talent/纯圣露滴_2.png differ diff --git a/plugins/genshin/resources/img/talent/纯圣露滴_3.png b/plugins/genshin/resources/img/talent/纯圣露滴_3.png index 3293f58..36ceb1c 100644 Binary files a/plugins/genshin/resources/img/talent/纯圣露滴_3.png and b/plugins/genshin/resources/img/talent/纯圣露滴_3.png differ diff --git a/plugins/genshin/resources/img/talent/纯圣露滴_4.png b/plugins/genshin/resources/img/talent/纯圣露滴_4.png index 9421042..775b870 100644 Binary files a/plugins/genshin/resources/img/talent/纯圣露滴_4.png and b/plugins/genshin/resources/img/talent/纯圣露滴_4.png differ diff --git a/plugins/genshin/resources/img/talent/绿洲花园_2.png b/plugins/genshin/resources/img/talent/绿洲花园_2.png index 870422e..b95da62 100644 Binary files a/plugins/genshin/resources/img/talent/绿洲花园_2.png and b/plugins/genshin/resources/img/talent/绿洲花园_2.png differ diff --git a/plugins/genshin/resources/img/talent/绿洲花园_3.png b/plugins/genshin/resources/img/talent/绿洲花园_3.png index 2a7c8f6..91f1799 100644 Binary files a/plugins/genshin/resources/img/talent/绿洲花园_3.png and b/plugins/genshin/resources/img/talent/绿洲花园_3.png differ diff --git a/plugins/genshin/resources/img/talent/绿洲花园_4.png b/plugins/genshin/resources/img/talent/绿洲花园_4.png index cc6a949..3cff112 100644 Binary files a/plugins/genshin/resources/img/talent/绿洲花园_4.png and b/plugins/genshin/resources/img/talent/绿洲花园_4.png differ diff --git a/plugins/genshin/resources/img/talent/谧林涓露_2.png b/plugins/genshin/resources/img/talent/谧林涓露_2.png index b3b274a..cabae36 100644 Binary files a/plugins/genshin/resources/img/talent/谧林涓露_2.png and b/plugins/genshin/resources/img/talent/谧林涓露_2.png differ diff --git a/plugins/genshin/resources/img/talent/谧林涓露_3.png b/plugins/genshin/resources/img/talent/谧林涓露_3.png index 0adb941..7f6f7c9 100644 Binary files a/plugins/genshin/resources/img/talent/谧林涓露_3.png and b/plugins/genshin/resources/img/talent/谧林涓露_3.png differ diff --git a/plugins/genshin/resources/img/talent/谧林涓露_4.png b/plugins/genshin/resources/img/talent/谧林涓露_4.png index cb774a0..3a3d52a 100644 Binary files a/plugins/genshin/resources/img/talent/谧林涓露_4.png and b/plugins/genshin/resources/img/talent/谧林涓露_4.png differ diff --git a/plugins/genshin/resources/img/talent/远海夷地_2.png b/plugins/genshin/resources/img/talent/远海夷地_2.png index 9e1992f..2d46384 100644 Binary files a/plugins/genshin/resources/img/talent/远海夷地_2.png and b/plugins/genshin/resources/img/talent/远海夷地_2.png differ diff --git a/plugins/genshin/resources/img/talent/远海夷地_3.png b/plugins/genshin/resources/img/talent/远海夷地_3.png index 4d805c1..1b3945d 100644 Binary files a/plugins/genshin/resources/img/talent/远海夷地_3.png and b/plugins/genshin/resources/img/talent/远海夷地_3.png differ diff --git a/plugins/genshin/resources/img/talent/远海夷地_4.png b/plugins/genshin/resources/img/talent/远海夷地_4.png index a86d2f6..b3b53d1 100644 Binary files a/plugins/genshin/resources/img/talent/远海夷地_4.png and b/plugins/genshin/resources/img/talent/远海夷地_4.png differ diff --git a/plugins/genshin/resources/img/talent/雾海云间_2.png b/plugins/genshin/resources/img/talent/雾海云间_2.png index f584cc2..6b00a05 100644 Binary files a/plugins/genshin/resources/img/talent/雾海云间_2.png and b/plugins/genshin/resources/img/talent/雾海云间_2.png differ diff --git a/plugins/genshin/resources/img/talent/雾海云间_3.png b/plugins/genshin/resources/img/talent/雾海云间_3.png index 434d832..f211028 100644 Binary files a/plugins/genshin/resources/img/talent/雾海云间_3.png and b/plugins/genshin/resources/img/talent/雾海云间_3.png differ diff --git a/plugins/genshin/resources/img/talent/雾海云间_4.png b/plugins/genshin/resources/img/talent/雾海云间_4.png index 6533a7a..7e28693 100644 Binary files a/plugins/genshin/resources/img/talent/雾海云间_4.png and b/plugins/genshin/resources/img/talent/雾海云间_4.png differ diff --git a/plugins/genshin/resources/img/talent/高塔孤王_2.png b/plugins/genshin/resources/img/talent/高塔孤王_2.png index 792c0fe..771a6ff 100644 Binary files a/plugins/genshin/resources/img/talent/高塔孤王_2.png and b/plugins/genshin/resources/img/talent/高塔孤王_2.png differ diff --git a/plugins/genshin/resources/img/talent/高塔孤王_3.png b/plugins/genshin/resources/img/talent/高塔孤王_3.png index e97a1c3..cd86dc6 100644 Binary files a/plugins/genshin/resources/img/talent/高塔孤王_3.png and b/plugins/genshin/resources/img/talent/高塔孤王_3.png differ diff --git a/plugins/genshin/resources/img/talent/高塔孤王_4.png b/plugins/genshin/resources/img/talent/高塔孤王_4.png index f4235f9..005aa1f 100644 Binary files a/plugins/genshin/resources/img/talent/高塔孤王_4.png and b/plugins/genshin/resources/img/talent/高塔孤王_4.png differ diff --git a/plugins/genshin/resources/img/talent/鸣神御灵_2.png b/plugins/genshin/resources/img/talent/鸣神御灵_2.png index f14068d..89c3452 100644 Binary files a/plugins/genshin/resources/img/talent/鸣神御灵_2.png and b/plugins/genshin/resources/img/talent/鸣神御灵_2.png differ diff --git a/plugins/genshin/resources/img/talent/鸣神御灵_3.png b/plugins/genshin/resources/img/talent/鸣神御灵_3.png index 164ae4f..24a10eb 100644 Binary files a/plugins/genshin/resources/img/talent/鸣神御灵_3.png and b/plugins/genshin/resources/img/talent/鸣神御灵_3.png differ diff --git a/plugins/genshin/resources/img/talent/鸣神御灵_4.png b/plugins/genshin/resources/img/talent/鸣神御灵_4.png index d82485e..1f04834 100644 Binary files a/plugins/genshin/resources/img/talent/鸣神御灵_4.png and b/plugins/genshin/resources/img/talent/鸣神御灵_4.png differ