From 7b615fd38f971434211887ddec5099986daf5ab3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=AB=E5=8F=B6?= <id_09261891@qq.com>
Date: Wed, 31 Jan 2024 04:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8E=9F=E7=A5=9E4.4?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=A1=E6=B1=A0=20(#359)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update 301.yaml

* Update 302.yaml

* 四星角色忘改了

* Update pool.yaml

* Update base.js

* Update 301.yaml

* Update 302.yaml

* Update pool.yaml
---
 plugins/genshin/defSet/gacha/pool.yaml | 36 ++++++++++++++++++++++++++
 plugins/genshin/defSet/pool/301.yaml   | 20 ++++++++++++++
 plugins/genshin/defSet/pool/302.yaml   | 24 +++++++++++++++++
 plugins/genshin/model/base.js          |  2 +-
 4 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml
index 3cabb01..e64e5ff 100644
--- a/plugins/genshin/defSet/gacha/pool.yaml
+++ b/plugins/genshin/defSet/gacha/pool.yaml
@@ -1,3 +1,39 @@
+- up4:
+    - 瑶瑶
+    - 辛焱
+    - 凝光
+  up5:
+    - 魈
+  up5_2:
+    - 八重神子
+  weapon5:
+    - 和璞鸢
+    - 神乐之真意
+  weapon4:
+    - 千岩古剑
+    - 匣里龙吟
+    - 西风长枪
+    - 流浪乐章
+    - 绝弦
+  endTime: "2024-03-12 14:59:59"
+- up4:
+    - 嘉明
+    - 珐露珊
+    - 诺艾尔
+  up5:
+    - 闲云
+  up5_2:
+    - 纳西妲
+  weapon5:
+    - 鹤鸣余音
+    - 千夜浮梦
+  weapon4:
+    - 千岩长枪
+    - 祭礼剑
+    - 祭礼大剑
+    - 祭礼残章
+    - 祭礼弓
+  endTime: "2024-02-20 17:59:59"
 - up4:
     - 夏沃蕾
     - 九条裟罗
diff --git a/plugins/genshin/defSet/pool/301.yaml b/plugins/genshin/defSet/pool/301.yaml
index b8c5798..4d9c852 100644
--- a/plugins/genshin/defSet/pool/301.yaml
+++ b/plugins/genshin/defSet/pool/301.yaml
@@ -1,3 +1,23 @@
+- from: '2024-02-20 18:00:00'
+  to: '2024-03-12 14:59:59'
+  five:
+    - 魈
+    - 八重神子
+  four:
+    - 瑶瑶
+    - 辛焱
+    - 凝光
+  name: 烟火之邀|华紫樱绯
+- from: '2024-01-31 06:00:00'
+  to: '2024-02-20 17:59:59'
+  five:
+    - 闲云
+    - 纳西妲
+  four:
+    - 嘉明
+    - 珐露珊
+    - 诺艾尔
+  name: 云府鹤行|白草净华
 - from: '2024-01-09 18:00:00'
   to: '2024-01-30 14:59:59'
   five:
diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml
index 1f49713..4b5e89b 100644
--- a/plugins/genshin/defSet/pool/302.yaml
+++ b/plugins/genshin/defSet/pool/302.yaml
@@ -1,3 +1,27 @@
+- from: '2024-02-20 18:00:00'
+  to: '2024-03-12 14:59:59'
+  five:
+    - 和璞鸢
+    - 神乐之真意
+  four:
+    - 千岩古剑
+    - 匣里龙吟
+    - 西风长枪
+    - 流浪乐章
+    - 绝弦
+  name: 神铸赋形
+- from: '2024-01-31 06:00:00'
+  to: '2024-02-20 17:59:59'
+  five:
+    - 鹤鸣余音
+    - 千夜浮梦
+  four:
+    - 千岩长枪
+    - 祭礼剑
+    - 祭礼大剑
+    - 祭礼残章
+    - 祭礼弓
+  name: 神铸赋形
 - from: '2024-01-09 18:00:00'
   to: '2024-01-30 14:59:59'
   five:
diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js
index adfa651..dfa7365 100644
--- a/plugins/genshin/model/base.js
+++ b/plugins/genshin/model/base.js
@@ -50,7 +50,7 @@ export default class base {
         game: 'sr',
       }
     }
-    let char = Character.get('雷电将军', 'gs')
+    let char = Character.get('闲云', 'gs')
     return {
       ...data,
       tplFile: `./plugins/genshin/resources/html/${this.model}/${this.model}.html`,