From 7c40d4fb4a69aca4ae7048be38ce506c933f8285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8C=8C?= Date: Wed, 13 Mar 2024 13:47:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=BD=95=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/apps/gcLog.js | 5 +++- plugins/genshin/model/gachaLog.js | 23 ++++++++++++++++++- .../resources/html/gacha/gacha-all-log.html | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/plugins/genshin/apps/gcLog.js b/plugins/genshin/apps/gcLog.js index d54d3a1..98c8679 100644 --- a/plugins/genshin/apps/gcLog.js +++ b/plugins/genshin/apps/gcLog.js @@ -23,7 +23,7 @@ export class gcLog extends plugin { fnc: "logJson" }, { - reg: "^#?(原神|星铁)?(全部)?(抽卡|抽奖|角色|武器|常驻|up|新手|光锥|全部)池*(记录|祈愿|分析)$", + reg: "^#?(原神|星铁)?(全部)?(抽卡|抽奖|角色|武器|集录|常驻|up|新手|光锥|全部)池*(记录|祈愿|分析)$", fnc: "getLog" }, { @@ -55,6 +55,9 @@ export class gcLog extends plugin { ], [ { text: "武器记录", callback: `${this.prefix}武器记录` }, { text: "武器统计", callback: `${this.prefix}武器统计` }, + ], [ + { text: "集录记录", callback: `${this.prefix}集录记录` }, + { text: "集录统计", callback: `${this.prefix}集录统计` }, ], [ { text: "常驻记录", callback: `${this.prefix}常驻记录` }, { text: "常驻统计", callback: `${this.prefix}常驻统计` }, diff --git a/plugins/genshin/model/gachaLog.js b/plugins/genshin/model/gachaLog.js index 3aed501..c114327 100644 --- a/plugins/genshin/model/gachaLog.js +++ b/plugins/genshin/model/gachaLog.js @@ -21,6 +21,7 @@ export default class GachaLog extends base { const gsPool = [ { type: 301, typeName: "角色" }, { type: 302, typeName: "武器" }, + { type: 500, typeName: "集录" }, { type: 200, typeName: "常驻" } ] @@ -396,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 @@ -465,6 +466,10 @@ export default class GachaLog extends base { type = this.e.isSr ? 12 : 302 typeName = this.e.isSr ? "光锥" : "武器" break + case "集录": + type = 500 + typeName = "集录" + break case "光锥": type = 12 typeName = "光锥" @@ -804,6 +809,22 @@ export default class GachaLog extends base { { lable: "最欧", num: minValue, unit: "抽" } ]] } +// 集录池 + if ([500].includes(type)) { + line = [[ + { lable: "未出五星", num: data.noFiveNum, unit: "抽" }, + { lable: "五星", num: data.fiveNum, unit: "个" }, + { lable: "五星平均", num: data.fiveAvg, unit: "抽", color: data.fiveColor }, + { lable: `四星${weapon}`, num: data.weaponFourNum, unit: "个" }, + { lable: "最非", num: maxValue, unit: "抽" } + ], [ + { lable: "未出四星", num: data.noFourNum, unit: "抽" }, + { lable: "四星", num: data.fourNum, unit: "个" }, + { lable: "四星平均", num: data.fourAvg, unit: "抽" }, + { lable: "四星最多", num: data.maxFour.num, unit: data.maxFour.name.slice(0, 4) }, + { lable: "最欧", num: minValue, unit: "抽" } + ]] + } // 新手池 if ([100, 2].includes(type)) { line = [[ diff --git a/plugins/genshin/resources/html/gacha/gacha-all-log.html b/plugins/genshin/resources/html/gacha/gacha-all-log.html index 65ff625..b38ac28 100644 --- a/plugins/genshin/resources/html/gacha/gacha-all-log.html +++ b/plugins/genshin/resources/html/gacha/gacha-all-log.html @@ -5,7 +5,7 @@ {{/block}}