diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml
index cb0cd34..a04c5f0 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-07-01 18:00:00"
 - up4:
     - 绮良良
     - 云堇
diff --git a/plugins/genshin/defSet/pool/301.yaml b/plugins/genshin/defSet/pool/301.yaml
index ce9bcf2..224febe 100644
--- a/plugins/genshin/defSet/pool/301.yaml
+++ b/plugins/genshin/defSet/pool/301.yaml
@@ -1,3 +1,13 @@
+- from: '2023-06-13 18:00:00'
+  to: '2023-07-04 14:59:59'
+  five:
+    - 艾尔海森
+    - 枫原万叶
+  four:
+    - 瑶瑶
+    - 鹿野院平藏
+    - 香菱
+  name: 敕诫枢谋|叶落风随
 - from: '2023-05-24 06:00:00'
   to: '2023-06-13 17:59:59'
   five:
diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml
index 29c1ab1..b69ac1d 100644
--- a/plugins/genshin/defSet/pool/302.yaml
+++ b/plugins/genshin/defSet/pool/302.yaml
@@ -1,3 +1,15 @@
+- from: '2023-06-13 18:00:00'
+  to: '2023-07-04 14:59:59'
+  five:
+    - 裁叶萃光
+    - 苍古自由之誓
+  four:
+    - 断浪长鳍
+    - 曚云之月
+    - 西风剑
+    - 祭礼大剑
+    - 西风秘典
+  name: 神铸赋形
 - from: '2023-05-24 06:00:00'
   to: '2023-06-13 17:59:59'
   five:
diff --git a/plugins/genshin/defSet/role/talent.yaml b/plugins/genshin/defSet/role/talent.yaml
index 9d5c227..4c849f1 100644
--- a/plugins/genshin/defSet/role/talent.yaml
+++ b/plugins/genshin/defSet/role/talent.yaml
@@ -294,6 +294,12 @@ Name:
   '604': 诓惑者，接树移花
   '605': 坐庄者，三仙戏法
   '606': 取胜者，大小通吃
+  '611': 物器流转
+  '612': 八尖裹术
+  '613': 万户门牌通识
+  '614': 韦驮骏足
+  '615': 千里一日
+  '616': 沿途百景会心
   '621': 异界之星
   '622': 异界之星
   '623': 异界之星
@@ -408,6 +414,18 @@ Name:
   '804': 晴霜的祝念
   '805': 引示的铃箭
   '806': 依随的策援
+  '811': 高门的谒礼
+  '812': 御驿的径迹
+  '813': 金塔的香献
+  '814': 百柱的酣宴
+  '815': 圣古的库藏
+  '816': 天园的理想
+  '821': 呿吟至微
+  '822': 动静精明
+  '823': 八正定气
+  '824': 法古观冥
+  '825': 盈虚藏象
+  '826': 真邪合离
 Icon:
   '21': UI_Talent_S_Ayaka_01
   '22': UI_Talent_S_Ayaka_02
@@ -703,6 +721,12 @@ Icon:
   '604': UI_Talent_S_Yelan_03
   '605': UI_Talent_U_Yelan_02
   '606': UI_Talent_S_Yelan_04
+  '611': UI_Talent_S_Momoka_01
+  '612': UI_Talent_S_Momoka_02
+  '613': UI_Talent_U_Momoka_01
+  '614': UI_Talent_S_Momoka_04
+  '615': UI_Talent_U_Momoka_02
+  '616': UI_Talent_S_Momoka_03
   '621': UI_Talent_S_Aloy_Lock
   '622': UI_Talent_S_Aloy_Lock
   '623': UI_Talent_S_Aloy_Lock
@@ -817,3 +841,15 @@ Icon:
   '804': UI_Talent_S_Mika_03
   '805': UI_Talent_U_Mika_02
   '806': UI_Talent_S_Mika_04
+  '811': UI_Talent_S_Kaveh_01
+  '812': UI_Talent_S_Kaveh_02
+  '813': UI_Talent_U_Kaveh_02
+  '814': UI_Talent_S_Kaveh_03
+  '815': UI_Talent_U_Kaveh_01
+  '816': UI_Talent_S_Kaveh_04
+  '821': UI_Talent_S_Baizhuer_01
+  '822': UI_Talent_S_Baizhuer_02
+  '823': UI_Talent_U_Baizhuer_01
+  '824': UI_Talent_S_Baizhuer_03
+  '825': UI_Talent_U_Baizhuer_02
+  '826': UI_Talent_S_Baizhuer_04
diff --git a/plugins/genshin/defSet/skill/data.yaml b/plugins/genshin/defSet/skill/data.yaml
index 12a3dc2..f1a9800 100644
--- a/plugins/genshin/defSet/skill/data.yaml
+++ b/plugins/genshin/defSet/skill/data.yaml
@@ -247,6 +247,9 @@ Name:
   '10608': 夜兰-长按瞄准/瞄准模式
   '10609': 夜兰-元素战技
   '10610': 渊图玲珑骰
+  '10611': 普通攻击·箱纸切削术
+  '10612': 呜喵町飞足
+  '10615': 秘法·惊喜特派
   '10621': 普通攻击·快速射击
   '10622': 冰尘雪野
   '10623': 埃洛伊瞄准射击
@@ -326,6 +329,12 @@ Name:
   '10801': 普通攻击·西风枪术·镝传
   '10802': 星霜的流旋
   '10805': 苍翎的颂愿
+  '10811': 普通攻击·旋规设矩
+  '10812': 画则巧施
+  '10815': 繁绘隅穹
+  '10821': 普通攻击·金匮针解
+  '10822': 太素诊要
+  '10825': 愈气全形论
   '20001': 风魔炮
   '20002': 风魔炮
   '20011': 飞行挑战 - 前冲
@@ -415,10 +424,10 @@ Name:
   '20340': 打砖块发球
   '20341': 3.4跑酷冲刺
   '20342': 3.4跑酷冲刺空中
+  '20345': 3.5吃豆人
   '10384': 抓猫扔鱼
   '100540': 普通攻击·故去的追忆
   '100541': 旅行者五连击(火)
-  '100542': 旅行者五连击(水)
   '100543': 普通攻击·异邦铁风
   '100544': 旅行者五连击(冰)
   '100545': 普通攻击·异邦岩锋
@@ -426,7 +435,6 @@ Name:
   '100547': 普通攻击·异邦草翦
   '100550': 普通攻击·故去的追忆
   '100551': 旅行者五连击(火)
-  '100552': 旅行者五连击(水)
   '100553': 普通攻击·异邦铁风
   '100554': 旅行者五连击(冰)
   '100555': 普通攻击·异邦岩锋
@@ -512,6 +520,8 @@ Name:
   '5078010': 艾尔海森空中攻击
   '5079010': 迪希雅空中攻击
   '5080010': 米卡空中攻击
+  '5081010': 卡维空中攻击
+  '5082010': 白术空中攻击
 Icon:
   '10001': ''
   '10002': ''
@@ -760,6 +770,9 @@ Icon:
   '10608': Skill_A_02
   '10609': Skill_S_Yelan_02
   '10610': Skill_E_Yelan_01
+  '10611': Skill_A_01
+  '10612': Skill_S_Momoka_01
+  '10615': Skill_E_Momoka_01
   '10621': Skill_A_02
   '10622': Skill_S_Aloy_01
   '10623': Skill_A_02
@@ -839,6 +852,12 @@ Icon:
   '10801': Skill_A_03
   '10802': Skill_S_Mika_01
   '10805': Skill_E_Mika_01
+  '10811': Skill_A_04
+  '10812': Skill_S_Kaveh_01
+  '10815': Skill_E_Kaveh_01
+  '10821': Skill_A_Catalyst_MD
+  '10822': Skill_S_Baizhuer_01
+  '10825': Skill_E_Baizhuer_01
   '20001': Skill_A_Dvalin_AirGun
   '20002': Skill_A_Dvalin_AirGun
   '20011': Btn_FlightSprint
@@ -932,7 +951,6 @@ Icon:
   '10384': Btn_Recon_Bait
   '100540': Skill_A_01
   '100541': Skill_A_01
-  '100542': Skill_A_01
   '100543': Skill_A_01
   '100544': Skill_A_01
   '100545': Skill_A_01
@@ -940,7 +958,6 @@ Icon:
   '100547': Skill_A_01
   '100550': Skill_A_01
   '100551': Skill_A_01
-  '100552': Skill_A_01
   '100553': Skill_A_01
   '100554': Skill_A_01
   '100555': Skill_A_01
@@ -1026,6 +1043,8 @@ Icon:
   '5078010': Skill_A_01
   '5079010': Skill_A_04
   '5080010': Skill_A_03
+  '5081010': Skill_A_04
+  '5082010': Skill_A_Catalyst_MD
 Talent:
   胡桃:
     - 1
@@ -1231,3 +1250,9 @@ Talent:
   米卡:
     - 2
     - 1
+  卡维:
+    - 2
+    - 1
+  绮良良:
+    - 2
+    - 1
diff --git a/plugins/genshin/defSet/weapon/data.yaml b/plugins/genshin/defSet/weapon/data.yaml
index 6ebc69a..6c103f7 100644
--- a/plugins/genshin/defSet/weapon/data.yaml
+++ b/plugins/genshin/defSet/weapon/data.yaml
@@ -123,6 +123,7 @@ Name:
   '807607555': 天空之卷
   '1455107995': 四风原典
   '693354267': 尘世之锁
+  '4007372867': 碧落之珑
   '1890163363': 不灭月华
   '310247243': 神乐之真意
   '1201790667': 千夜浮梦
@@ -160,6 +161,7 @@ Name:
   '4230231107': 若水
   '2918525947': 飞雷之弦振
   '1348687251': 猎人之径
+  '316078811': 鹮穿之喙
   '4137694339': (test)竿测试
   '2719832059': (test)穿模测试
   '500987603': (test)穿模测试
@@ -289,6 +291,7 @@ Type:
   天空之卷: 法器
   四风原典: 法器
   尘世之锁: 法器
+  碧落之珑: 法器
   不灭月华: 法器
   神乐之真意: 法器
   千夜浮梦: 法器
@@ -326,6 +329,7 @@ Type:
   若水: 弓
   飞雷之弦振: 弓
   猎人之径: 弓
+  鹮穿之喙: 弓
   (test)竿测试: 单手剑
   (test)穿模测试: 弓
 Icon:
@@ -450,6 +454,7 @@ Icon:
   天空之卷: UI_EquipIcon_Catalyst_Dvalin
   四风原典: UI_EquipIcon_Catalyst_Fourwinds
   尘世之锁: UI_EquipIcon_Catalyst_Kunwu
+  碧落之珑: UI_EquipIcon_Catalyst_Morax
   不灭月华: UI_EquipIcon_Catalyst_Kaleido
   神乐之真意: UI_EquipIcon_Catalyst_Narukami
   千夜浮梦: UI_EquipIcon_Catalyst_Ayus
@@ -487,5 +492,6 @@ Icon:
   若水: UI_EquipIcon_Bow_Kirin
   飞雷之弦振: UI_EquipIcon_Bow_Narukami
   猎人之径: UI_EquipIcon_Bow_Ayus
+  鹮穿之喙: UI_EquipIcon_Bow_Ibis
   (test)竿测试: UI_EquipIcon_FishingRod
   (test)穿模测试: UI_EquipIcon_Bow_Template
diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js
index 0d01edf..b18b6d5 100644
--- a/plugins/genshin/model/base.js
+++ b/plugins/genshin/model/base.js
@@ -1,13 +1,13 @@
 
 export default class base {
-  constructor (e = {}) {
+  constructor(e = {}) {
     this.e = e
     this.userId = e?.user_id
     this.model = 'genshin'
     this._path = process.cwd().replace(/\\/g, '/')
   }
 
-  get prefix () {
+  get prefix() {
     return `Yz:genshin:${this.model}:`
   }
 
@@ -17,8 +17,8 @@ export default class base {
    * @param tplFile 模板html路径
    * @param pluResPath 插件资源路径
    */
-  get screenData () {
-    let headImg = '宵宫'
+  get screenData() {
+    let headImg = '枫原万叶'
 
     return {
       saveId: this.userId,
diff --git a/plugins/genshin/resources/img/namecard/枫原万叶.png b/plugins/genshin/resources/img/namecard/枫原万叶.png
new file mode 100644
index 0000000..0f31180
Binary files /dev/null and b/plugins/genshin/resources/img/namecard/枫原万叶.png differ
diff --git a/plugins/other/update.js b/plugins/other/update.js
index e919b5a..5c42e26 100644
--- a/plugins/other/update.js
+++ b/plugins/other/update.js
@@ -27,7 +27,7 @@ export class update extends plugin {
           fnc: 'update'
         },
         {
-          reg: '^#全部更新$',
+          reg: '^#全部(强制)?更新$',
           fnc: 'updateAll',
           permission: 'master'
         }