diff --git a/Paimon_Gacha/__init__.py b/Paimon_Gacha/__init__.py
index 19d9761..ea77518 100644
--- a/Paimon_Gacha/__init__.py
+++ b/Paimon_Gacha/__init__.py
@@ -222,18 +222,18 @@ async def get_dg_weapon():
 
 
 def gacha_type_by_name(gacha_type):
-    if re.match(r'^角色1|限定1|角色2|限定2(?:池)$', gacha_type):
-        return 301
-    # if re.match(r'^角色1|限定1(?:池)$', gacha_type):
+    # if re.match(r'^角色1|限定1|角色2|限定2(?:池)$', gacha_type):
     #     return 301
-    # if re.match(r'^角色2|限定2(?:池)$', gacha_type):
-    #     return 400
+    if re.match(r'^角色1|限定1(?:池)$', gacha_type):
+        return 301
+    if re.match(r'^角色2|限定2(?:池)$', gacha_type):
+        return 400
     if re.match(r'^武器|武器池$', gacha_type):
         return 302
     if re.match(r'^常驻|普(?:池)$', gacha_type):
         return 200
-    if re.match(r'^新角色1|新限定1|新角色2|新限定2(?:池)$', gacha_type):
-        return 'role_1_pool'
+    # if re.match(r'^新角色1|新限定1|新角色2|新限定2(?:池)$', gacha_type):
+    #     return 'role_1_pool'
     if re.match(r'^彩蛋池?$', gacha_type):
         return 'all_star'
     # if re.match(r'^新角色1|新限定1(?:池)$', gacha_type):
diff --git a/Paimon_Info/draw_player_card.py b/Paimon_Info/draw_player_card.py
index efd244d..fcf2970 100644
--- a/Paimon_Info/draw_player_card.py
+++ b/Paimon_Info/draw_player_card.py
@@ -196,7 +196,7 @@ async def draw_player_card(data, chara_data, uid, nickname="旅行者"):
     bg_draw = ImageDraw.Draw(bg_img)
     # 头部名片
     name_id = random.choice(data['avatars'][0:8])['id']
-    name_card = load_image(os.path.join(res_path, 'name_card', f'{name_id}.png'), crop=(0, 40, 840, 360), size=(846, 322))
+    name_card = load_image(os.path.join(res_path, 'name_card', f'{name_id}.png'), crop=(0, 40, 840, 360), size=(846, 352))
     avatar = load_image(os.path.join(res_path, 'role_profile', f'{name_id}.png'), size=(240, 240))
     bg_img.alpha_composite(name_card, (57, 27))
     bg_img.alpha_composite(avatar, (360, 25))
diff --git a/res/gacha_res/type.json b/res/gacha_res/type.json
index 6872db5..4cd5e84 100644
--- a/res/gacha_res/type.json
+++ b/res/gacha_res/type.json
@@ -111,5 +111,8 @@
   "神乐之真意": "法器",
   "八重神子": "雷",
   "神里绫人": "水",
-  "波乱月白经津": "单手剑"
+  "波乱月白经津": "单手剑",
+  "夜兰": "弓",
+  "久岐忍": "单手剑",
+  "若水": "弓"
 }
diff --git a/res/gacha_res/武器/若水.png b/res/gacha_res/武器/若水.png
new file mode 100644
index 0000000..30773ac
Binary files /dev/null and b/res/gacha_res/武器/若水.png differ
diff --git a/res/gacha_res/角色/久岐忍.png b/res/gacha_res/角色/久岐忍.png
new file mode 100644
index 0000000..b6304f1
Binary files /dev/null and b/res/gacha_res/角色/久岐忍.png differ
diff --git a/res/gacha_res/角色/夜兰.png b/res/gacha_res/角色/夜兰.png
new file mode 100644
index 0000000..3830de9
Binary files /dev/null and b/res/gacha_res/角色/夜兰.png differ
diff --git a/res/name_card/10000060.png b/res/name_card/10000060.png
new file mode 100644
index 0000000..3522218
Binary files /dev/null and b/res/name_card/10000060.png differ
diff --git a/res/name_card/10000065.png b/res/name_card/10000065.png
new file mode 100644
index 0000000..8c6f4bb
Binary files /dev/null and b/res/name_card/10000065.png differ
diff --git a/res/role_card/10000060.png b/res/role_card/10000060.png
new file mode 100644
index 0000000..dc6c38c
Binary files /dev/null and b/res/role_card/10000060.png differ
diff --git a/res/role_card/10000065.png b/res/role_card/10000065.png
new file mode 100644
index 0000000..c9f0ccd
Binary files /dev/null and b/res/role_card/10000065.png differ
diff --git a/res/role_profile/10000060.png b/res/role_profile/10000060.png
new file mode 100644
index 0000000..151c8fc
Binary files /dev/null and b/res/role_profile/10000060.png differ
diff --git a/res/role_profile/10000065.png b/res/role_profile/10000065.png
new file mode 100644
index 0000000..f78f7ba
Binary files /dev/null and b/res/role_profile/10000065.png differ
diff --git a/res/role_splash/久岐忍.png b/res/role_splash/久岐忍.png
new file mode 100644
index 0000000..674b32a
Binary files /dev/null and b/res/role_splash/久岐忍.png differ
diff --git a/res/role_splash/夜兰.png b/res/role_splash/夜兰.png
new file mode 100644
index 0000000..b3f277b
Binary files /dev/null and b/res/role_splash/夜兰.png differ
diff --git a/res/thumb/久岐忍.png b/res/thumb/久岐忍.png
new file mode 100644
index 0000000..2a1f791
Binary files /dev/null and b/res/thumb/久岐忍.png differ
diff --git a/res/thumb/夜兰.png b/res/thumb/夜兰.png
new file mode 100644
index 0000000..82a8858
Binary files /dev/null and b/res/thumb/夜兰.png differ
diff --git a/res/thumb/若水.png b/res/thumb/若水.png
new file mode 100644
index 0000000..ec0e435
Binary files /dev/null and b/res/thumb/若水.png differ
diff --git a/utils/alias.json b/utils/alias.json
index 787604c..4ff3856 100644
--- a/utils/alias.json
+++ b/utils/alias.json
@@ -49,8 +49,8 @@
         "10000063": ["申鹤", "小姨", "小姨妈"],
         "10000064": ["云堇", "云先生"],
         "10000066": ["神里绫人", "0人", "大舅子", "小舅子", "绫人", "神里哥", "凌人", "神里凌人"],
-        "11111111": ["夜兰", "夜阑"],
-        "11111112": ["久岐忍", "忍者", "阿卡丽"],
+        "10000060": ["夜兰", "夜阑", "叶兰"],
+        "10000065": ["久岐忍", "忍者", "阿卡丽"],
         "11111113": ["鹿野院平藏", "近战法师"]
     },
     "weapons": {
diff --git a/utils/short_name.json b/utils/short_name.json
index 2fd3422..5b3bee2 100644
--- a/utils/short_name.json
+++ b/utils/short_name.json
@@ -49,6 +49,8 @@
     "岩主": "岩主",
     "云堇": "云堇",
     "神里绫人": "绫人",
+    "夜兰": "夜兰",
+    "久岐忍": "岐忍",
     "神乐之真意": "神乐",
     "息灾": "息灾",
     "赤角石溃杵": "赤角",
@@ -75,5 +77,6 @@
     "斫峰之刃": "斫峰",
     "磐岩结绿": "绿剑",
     "护摩之杖": "护摩",
-    "波乱月白经津": "波乱"
+    "波乱月白经津": "波乱",
+    "若水": "若水"
 }
\ No newline at end of file