diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml index c5c87b8..016ddca 100644 --- a/plugins/genshin/defSet/gacha/pool.yaml +++ b/plugins/genshin/defSet/gacha/pool.yaml @@ -1,3 +1,21 @@ +- up4: + - 绮良良 + - 云堇 + - 重云 + up5: + - 宵宫 + up5_2: + - 八重神子 + weapon5: + - 飞雷之弦振 + - 神乐之真意 + weapon4: + - 恶王丸 + - 笛剑 + - 匣里灭辰 + - 流浪乐章 + - 弓藏 + endTime: "2023-06-13 18:00:00" - up4: - 卡维 - 坎蒂丝 diff --git a/plugins/genshin/defSet/pool/301.yaml b/plugins/genshin/defSet/pool/301.yaml index 431d262..ce9bcf2 100644 --- a/plugins/genshin/defSet/pool/301.yaml +++ b/plugins/genshin/defSet/pool/301.yaml @@ -1,3 +1,13 @@ +- from: '2023-05-24 06:00:00' + to: '2023-06-13 17:59:59' + five: + - 宵宫 + - 八重神子 + four: + - 绮良良 + - 云堇 + - 重云 + name: 焰色天河|华紫樱绯 - from: '2023-05-02 18:00:00' to: '2023-05-23 14:59:59' five: diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml index 69201a7..29c1ab1 100644 --- a/plugins/genshin/defSet/pool/302.yaml +++ b/plugins/genshin/defSet/pool/302.yaml @@ -1,3 +1,15 @@ +- from: '2023-05-24 06:00:00' + to: '2023-06-13 17:59:59' + five: + - 飞雷之弦振 + - 神乐之真意 + four: + - 恶王丸 + - 笛剑 + - 匣里灭辰 + - 流浪乐章 + - 弓藏 + name: 神铸赋形 - from: '2023-05-02 18:00:00' to: '2023-05-23 14:59:59' five: @@ -41,7 +53,7 @@ - 赤沙之杖 four: - 暗巷闪光 - - 暗香猎手 + - 暗巷猎手 - 祭礼大剑 - 匣里灭辰 - 昭心 diff --git a/plugins/genshin/defSet/role/name.yaml b/plugins/genshin/defSet/role/name.yaml index 902e7bf..25316fe 100644 --- a/plugins/genshin/defSet/role/name.yaml +++ b/plugins/genshin/defSet/role/name.yaml @@ -577,6 +577,19 @@ - 叶澜 - 腋兰 - 夜天后 +10000061: + - 绮良良 + - Kirara + - kirara + - 琦良良 + - 崎良良 + - 草猫 + - 猫又 + - 宅急便 + - 草猫宅急便 + - 送货员 + - 快递员 + - 草猫快递 10000062: - 埃洛伊 - Aloy diff --git a/plugins/genshin/defSet/role/other.yaml b/plugins/genshin/defSet/role/other.yaml index 48c3175..70a17a9 100644 --- a/plugins/genshin/defSet/role/other.yaml +++ b/plugins/genshin/defSet/role/other.yaml @@ -95,3 +95,4 @@ four: - 10000077 - 10000080 - 10000081 + - 10000061 \ No newline at end of file diff --git a/plugins/genshin/resources/img/role/绮良良.png b/plugins/genshin/resources/img/role/绮良良.png new file mode 100644 index 0000000..9addd74 Binary files /dev/null and b/plugins/genshin/resources/img/role/绮良良.png differ diff --git a/renderers/puppeteer/config_default.yaml b/renderers/puppeteer/config_default.yaml index 57addae..b3e1b39 100644 --- a/renderers/puppeteer/config_default.yaml +++ b/renderers/puppeteer/config_default.yaml @@ -10,7 +10,7 @@ chromiumPath: puppeteerWS: # headless -headless: 'new' +headless: "new" # puppeteer启动args,注意args的--前缀 args: diff --git a/renderers/puppeteer/lib/puppeteer.js b/renderers/puppeteer/lib/puppeteer.js index 1334773..418681c 100644 --- a/renderers/puppeteer/lib/puppeteer.js +++ b/renderers/puppeteer/lib/puppeteer.js @@ -23,7 +23,7 @@ export default class PuppeteerRenderer { /** 截图次数 */ this.renderNum = 0 this.config = { - headless: Data.def(config.headless, true), + headless: Data.def(config.headless, "new"), args: Data.def(config.args, [ '--disable-gpu', '--disable-setuid-sandbox',