From bad96da01f9cd81e9ea485534ab98638bd290b7e Mon Sep 17 00:00:00 2001
From: Kokomi <102026640+yoimiya-kokomi@users.noreply.github.com>
Date: Sun, 28 May 2023 13:20:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B03.7=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=20@Ca(HCO=E2=82=83)=E2=82=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/genshin/defSet/daily/daily.yaml    |  2 ++
 plugins/genshin/defSet/element/role.yaml   |  1 +
 plugins/genshin/defSet/element/weapon.yaml |  1 +
 plugins/genshin/defSet/gacha/pool.yaml     |  2 +-
 plugins/genshin/defSet/pool/302.yaml       |  2 +-
 plugins/genshin/defSet/role/name.yaml      | 17 +++++++++++++----
 plugins/genshin/defSet/role/other.yaml     |  1 +
 plugins/genshin/defSet/weapon/other.yaml   |  2 ++
 plugins/genshin/model/base.js              |  2 +-
 plugins/genshin/model/user.js              |  3 +++
 10 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/plugins/genshin/defSet/daily/daily.yaml b/plugins/genshin/defSet/daily/daily.yaml
index 2c80e5d..d19ca06 100644
--- a/plugins/genshin/defSet/daily/daily.yaml
+++ b/plugins/genshin/defSet/daily/daily.yaml
@@ -89,6 +89,7 @@
         - 珊瑚宫心海
         - 托马
         - 鹿野院平藏
+        - 绮良良
     繁荣:
       - 璃月
       - - 申鹤
@@ -113,6 +114,7 @@
         - 圣显之钥
         - 西福斯的月光
         - 裁叶萃光
+        - 鹮穿之喙
     远海夷地:
       - 稻妻
       - - 雾切之回光
diff --git a/plugins/genshin/defSet/element/role.yaml b/plugins/genshin/defSet/element/role.yaml
index ca0ed17..4a1a657 100644
--- a/plugins/genshin/defSet/element/role.yaml
+++ b/plugins/genshin/defSet/element/role.yaml
@@ -72,3 +72,4 @@
 艾尔海森: 草
 卡维: 草
 白术: 草
+绮良良: 草
diff --git a/plugins/genshin/defSet/element/weapon.yaml b/plugins/genshin/defSet/element/weapon.yaml
index ac570f9..65428c5 100644
--- a/plugins/genshin/defSet/element/weapon.yaml
+++ b/plugins/genshin/defSet/element/weapon.yaml
@@ -149,3 +149,4 @@
 竭泽: 弓
 王下近侍: 弓
 冬极白星: 弓
+鹮穿之喙: 弓
diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml
index 016ddca..cb0cd34 100644
--- a/plugins/genshin/defSet/gacha/pool.yaml
+++ b/plugins/genshin/defSet/gacha/pool.yaml
@@ -33,7 +33,7 @@
     - 匣里龙吟
     - 西风长枪
     - 祭礼弓
-  endTime: "2023-05-22 18:00:00"
+  endTime: "2023-05-20 18:00:00"
 - up4:
     - 久岐忍
     - 多莉
diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml
index e887a40..29c1ab1 100644
--- a/plugins/genshin/defSet/pool/302.yaml
+++ b/plugins/genshin/defSet/pool/302.yaml
@@ -53,7 +53,7 @@
     - 赤沙之杖
   four:
     - 暗巷闪光
-    - 暗香猎手
+    - 暗巷猎手
     - 祭礼大剑
     - 匣里灭辰
     - 昭心
diff --git a/plugins/genshin/defSet/role/name.yaml b/plugins/genshin/defSet/role/name.yaml
index 8a0e217..35516e1 100644
--- a/plugins/genshin/defSet/role/name.yaml
+++ b/plugins/genshin/defSet/role/name.yaml
@@ -577,10 +577,6 @@
   - 叶澜
   - 腋兰
   - 夜天后
-10000061:
-  - 绮良良
-  - 草猫
-  - 猫又
 10000062:
   - 埃洛伊
   - Aloy
@@ -784,3 +780,16 @@
   - 白大夫
   - 白医生
   - 白求恩
+10000061:
+  - 绮良良
+  - Kirara
+  - kirara
+  - 琦良良
+  - 崎良良
+  - 草猫
+  - 猫又
+  - 宅急便
+  - 草猫宅急便
+  - 送货员
+  - 快递员
+  - 草猫快递
diff --git a/plugins/genshin/defSet/role/other.yaml b/plugins/genshin/defSet/role/other.yaml
index 48c3175..c348d5f 100644
--- a/plugins/genshin/defSet/role/other.yaml
+++ b/plugins/genshin/defSet/role/other.yaml
@@ -85,6 +85,7 @@ four:
   - 10000050
   - 10000055
   - 10000059
+  - 10000061
   - 10000064
   - 10000065
   - 10000068
diff --git a/plugins/genshin/defSet/weapon/other.yaml b/plugins/genshin/defSet/weapon/other.yaml
index 9b9608c..748c0ce 100644
--- a/plugins/genshin/defSet/weapon/other.yaml
+++ b/plugins/genshin/defSet/weapon/other.yaml
@@ -42,6 +42,7 @@ sortName:
   磐岩结绿: 绿剑
   裁叶萃光: 萃光
   流浪的晚星: 流浪晚星
+  鹮穿之喙: 鸟弓
 
   角斗士的终幕礼: 角斗士
   流浪大地的乐团: 流浪乐团
@@ -71,3 +72,4 @@ actWeapon:
   - 风信之锋
   - 东花坊时雨
   - 饰铁之花
+  - 鹮穿之喙
diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js
index 689ed12..0d01edf 100644
--- a/plugins/genshin/model/base.js
+++ b/plugins/genshin/model/base.js
@@ -18,7 +18,7 @@ export default class base {
    * @param pluResPath 插件资源路径
    */
   get screenData () {
-    let headImg = '白术'
+    let headImg = '宵宫'
 
     return {
       saveId: this.userId,
diff --git a/plugins/genshin/model/user.js b/plugins/genshin/model/user.js
index 8888b08..d35fb0c 100644
--- a/plugins/genshin/model/user.js
+++ b/plugins/genshin/model/user.js
@@ -40,6 +40,9 @@ export default class User extends base {
     let user = await this.user()
     let set = gsCfg.getConfig('mys', 'set')
 
+    if (this.ck && !this.e.ck) {
+      this.e.ck = this.ck
+    }
     if (!this.e.ck) {
       await this.e.reply(`请【私聊】发送米游社cookie，获取教程：\n${set.cookieDoc}`)
       return