diff --git a/plugins/genshin/apps/gcLog.js b/plugins/genshin/apps/gcLog.js index 98c8679..32b0b21 100644 --- a/plugins/genshin/apps/gcLog.js +++ b/plugins/genshin/apps/gcLog.js @@ -39,7 +39,7 @@ export class gcLog extends plugin { fnc: "helpPort" }, { - reg: "^#?(原神|星铁)?(抽卡|抽奖|角色|武器|常驻|up|新手|光锥)池*统计$", + reg: "^#?(原神|星铁)?(抽卡|抽奖|角色|武器|集录|常驻|up|新手|光锥)池*统计$", fnc: "logCount" } ] diff --git a/plugins/genshin/defSet/pool/500.yaml b/plugins/genshin/defSet/pool/500.yaml new file mode 100644 index 0000000..5781e27 --- /dev/null +++ b/plugins/genshin/defSet/pool/500.yaml @@ -0,0 +1,62 @@ +- from: '2024-04-02 18:00:00' + to: '2050-09-15 17:59:59' + five: + - 集录池 + four: [] + name: 集录池 +- from: '2024-03-13 06:00:00' + to: '2024-04-02 17:59:59' + five: + - 优菈 + - 莫娜 + - 阿贝多 + - 可莉 + - 迪卢克 + - 琴 + - 天空之刃 + - 风鹰剑 + - 苇海信标 + - 松籁响起之时 + - 狼的末路 + - 天空之傲 + - 天空之脊 + - 四风原典 + - 天空之卷 + - 猎人之径 + - 天空之翼 + four: + - 米卡 + - 罗莎莉亚 + - 砂糖 + - 迪奥娜 + - 诺艾尔 + - 班尼特 + - 菲谢尔 + - 安柏 + - 雷泽 + - 凯亚 + - 芭芭拉 + - 丽莎 + - 暗巷闪光 + - 匣里龙吟 + - 祭礼剑 + - 笛剑 + - 西风剑 + - 雨裁 + - 祭礼大剑 + - 钟剑 + - 西风大剑 + - 西风长枪 + - 匣里灭辰 + - 暗巷的酒与诗 + - 昭心 + - 祭礼残章 + - 流浪乐章 + - 西风秘典 + - 幽夜华尔兹 + - 暗巷猎手 + - 弓藏 + - 祭礼弓 + - 绝弦 + - 西风猎弓 + name: 集录池 \ No newline at end of file diff --git a/plugins/genshin/model/gachaLog.js b/plugins/genshin/model/gachaLog.js index c114327..4cf9e5c 100644 --- a/plugins/genshin/model/gachaLog.js +++ b/plugins/genshin/model/gachaLog.js @@ -397,7 +397,7 @@ export default class GachaLog extends base { async getAllGcLogData() { this.model = "gachaAllLog" - const poolList = ["角色", "集录", this.e?.isSr ? "光锥" : "武器", "常驻"] + const poolList = ["角色", this.e?.isSr ? "光锥" : "武器", "集录", "常驻"] const logData = [] let fiveMaxNum = 0 const originalMsg = this.e.msg diff --git a/plugins/genshin/model/logCount.js b/plugins/genshin/model/logCount.js index ba01be5..7f00e9e 100644 --- a/plugins/genshin/model/logCount.js +++ b/plugins/genshin/model/logCount.js @@ -19,6 +19,7 @@ export default class LogCount extends base { this.pool = [ { type: 301, typeName: '角色' }, { type: 302, typeName: '武器' }, + { type: 500, typeName: '集录' }, { type: 200, typeName: '常驻' } ] @@ -102,6 +103,10 @@ export default class LogCount extends base { this.type = this.e.isSr ? 1 : 200 this.typeName = '常驻' break + case '集录': + this.type = 500 + this.typeName = '集录' + break case '武器': this.type = this.e.isSr ? 12 : 302 this.typeName = this.e.isSr ? '光锥' : '武器'