diff --git a/hoshino/modules/Genshin_Paimon/gacha/__init__.py b/hoshino/modules/Genshin_Paimon/gacha/__init__.py
index d22fdd6..5145be5 100644
--- a/hoshino/modules/Genshin_Paimon/gacha/__init__.py
+++ b/hoshino/modules/Genshin_Paimon/gacha/__init__.py
@@ -201,12 +201,12 @@ def gacha_type_by_name(gacha_type):
     #     return 'role_1_pool'
     if re.match(r'^彩蛋池?$', gacha_type):
         return 'all_star'
-    # if re.match(r'^新角色1|新限定1(?:池)$', gacha_type):
-    #     return 'role_1_pool'
-    # if re.match(r'^新角色2|新限定2(?:池)$', gacha_type):
-    #     return 'role_2_pool'
-    # if re.match(r'^新武器|新武器池$', gacha_type):
-    #     return 'weapon_pool'
+    if re.match(r'^新角色1|新限定1(?:池)$', gacha_type):
+        return 'role_1_pool'
+    if re.match(r'^新角色2|新限定2(?:池)$', gacha_type):
+        return 'role_2_pool'
+    if re.match(r'^新武器|新武器池$', gacha_type):
+        return 'weapon_pool'
     return 0
 
 
diff --git a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/all_star.json b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/all_star.json
index 5e55764..2e65a11 100644
--- a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/all_star.json
+++ b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/all_star.json
@@ -137,6 +137,12 @@
 "item_name": "甘雨",
 "item_type": "角色",
 "item_type_cn": "角色"
+},
+{
+"item_attr": "水",
+"item_name": "神里绫人",
+"item_type": "角色",
+"item_type_cn": "角色"
 }
     ]
 }
\ No newline at end of file
diff --git a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_1.json b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_1.json
index d10e673..0985fac 100644
--- a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_1.json
+++ b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_1.json
@@ -450,7 +450,7 @@
 {
 "is_up": 1,
 "item_id": -1,
-"item_name": "雷电将军",
+"item_name": "神里绫人",
 "item_type": "角色",
 "order_value": 1,
 "rank": 5
@@ -498,9 +498,9 @@
 ],
 "r5_up_items": [
 {
-"item_attr": "雷",
+"item_attr": "水",
 "item_id": -1,
-"item_name": "雷电将军",
+"item_name": "神里绫人",
 "item_type": "角色",
 "item_type_cn": "角色"
 }
diff --git a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_2.json b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_2.json
index 9b2309f..14eb992 100644
--- a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_2.json
+++ b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/role_2.json
@@ -450,7 +450,7 @@
 {
 "is_up": 1,
 "item_id": -1,
-"item_name": "珊瑚宫心海",
+"item_name": "温迪",
 "item_type": "角色",
 "order_value": 1,
 "rank": 5
@@ -498,9 +498,9 @@
 ],
 "r5_up_items": [
 {
-"item_attr": "水",
+"item_attr": "风",
 "item_id": -1,
-"item_name": "珊瑚宫心海",
+"item_name": "温迪",
 "item_type": "角色",
 "item_type_cn": "角色"
 }
diff --git a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/weapon.json b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/weapon.json
index 1e128f1..329a716 100644
--- a/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/weapon.json
+++ b/hoshino/modules/Genshin_Paimon/res/gacha_res/DIY_gacha_pool/weapon.json
@@ -423,35 +423,35 @@
 {
 "item_attr": "",
 "item_id": -5,
-"item_name": "恶王丸",
+"item_name": "弓藏",
 "item_type": "武器",
 "item_type_cn": "武器"
 },
 {
 "item_attr": "",
 "item_id": -7,
-"item_name": "曚云之月",
+"item_name": "流浪乐章",
 "item_type": "武器",
 "item_type_cn": "武器"
 },
 {
 "item_attr": "",
 "item_id": -6,
-"item_name": "匣里龙吟",
+"item_name": "匣里灭辰",
 "item_type": "武器",
 "item_type_cn": "武器"
 },
 {
 "item_attr": "",
 "item_id": -4,
-"item_name": "西风长枪",
+"item_name": "祭礼大剑",
 "item_type": "武器",
 "item_type_cn": "武器"
 },
 {
 "item_attr": "",
 "item_id": -3,
-"item_name": "祭礼残章",
+"item_name": "笛剑",
 "item_type": "武器",
 "item_type_cn": "武器"
 }
@@ -545,16 +545,14 @@
 {
 "item_attr": "",
 "item_id": -1,
-"item_img": "https://webstatic.mihoyo.com/upload/op-public/2021/12/17/a3e11addf1e714144fd3840b9d37bf2d_4317633571603531158.png",
-"item_name": "薙草之稻光",
+"item_name": "波乱月白经津",
 "item_type": "武器",
 "item_type_cn": "武器"
 },
 {
 "item_attr": "",
 "item_id": -2,
-"item_img": "https://webstatic.mihoyo.com/upload/op-public/2021/07/09/b96f9a44a4f66f11183875d43df79e34_8725185129290866376.png",
-"item_name": "不灭月华",
+"item_name": "终末嗟叹之诗",
 "item_type": "武器",
 "item_type_cn": "武器"
 }
diff --git a/hoshino/modules/Genshin_Paimon/res/gacha_res/type.json b/hoshino/modules/Genshin_Paimon/res/gacha_res/type.json
index 77929f2..6872db5 100644
--- a/hoshino/modules/Genshin_Paimon/res/gacha_res/type.json
+++ b/hoshino/modules/Genshin_Paimon/res/gacha_res/type.json
@@ -109,5 +109,7 @@
   "甘雨":"冰",
   "证誓之明瞳": "法器",
   "神乐之真意": "法器",
-  "八重神子": "雷"
+  "八重神子": "雷",
+  "神里绫人": "水",
+  "波乱月白经津": "单手剑"
 }
diff --git a/hoshino/modules/Genshin_Paimon/res/gacha_res/武器/波乱月白经津.png b/hoshino/modules/Genshin_Paimon/res/gacha_res/武器/波乱月白经津.png
new file mode 100644
index 0000000..0f733cf
Binary files /dev/null and b/hoshino/modules/Genshin_Paimon/res/gacha_res/武器/波乱月白经津.png differ
diff --git a/hoshino/modules/Genshin_Paimon/res/gacha_res/角色/神里绫人.png b/hoshino/modules/Genshin_Paimon/res/gacha_res/角色/神里绫人.png
new file mode 100644
index 0000000..75bea07
Binary files /dev/null and b/hoshino/modules/Genshin_Paimon/res/gacha_res/角色/神里绫人.png differ