diff --git a/resources/map/EquipId2Data.json b/resources/map/EquipId2Data.json
index caee76c..cbc8098 100644
--- a/resources/map/EquipId2Data.json
+++ b/resources/map/EquipId2Data.json
@@ -96,5 +96,19 @@
       32635, 32636, 32641, 32642, 32643, 32644, 32645, 32646
     ],
     "sprite_file": "3DSuitFangedMetal"
+  },
+  "32700": {
+    "equip_id_list": [
+      32721, 32722, 32723, 32724, 32725, 32726, 32731, 32732, 32733, 32734,
+      32735, 32736, 32741, 32742, 32743, 32744, 32745, 32746
+    ],
+    "sprite_file": "3DSuitBranch&BladeSong"
+  },
+  "32800": {
+    "equip_id_list": [
+      32821, 32822, 32823, 32824, 32825, 32826, 32831, 32832, 32833, 32834,
+      32835, 32836, 32841, 32842, 32843, 32844, 32845, 32846
+    ],
+    "sprite_file": "3DSuitAstralVoice"
   }
 }
diff --git a/resources/map/PartnerId2Data.json b/resources/map/PartnerId2Data.json
index d9e272e..99f43c9 100644
--- a/resources/map/PartnerId2Data.json
+++ b/resources/map/PartnerId2Data.json
@@ -1,136 +1,10 @@
 {
-  "1011": {
-    "sprite_id": "01",
-    "name": "安比",
-    "full_name": "安比·德玛拉",
-    "en_name": "Anby"
-  },
-  "1021": {
-    "sprite_id": "11",
-    "name": "猫又",
-    "full_name": "猫宫 又奈",
-    "en_name": "Nekomata"
-  },
-  "1031": {
-    "sprite_id": "12",
-    "name": "妮可",
-    "full_name": "妮可·德玛拉",
-    "en_name": "Nicole"
-  },
-  "1041": {
-    "sprite_id": "05",
-    "name": "「11号」",
-    "full_name": "「11号」",
-    "en_name": "Soldier 11"
-  },
   "1061": {
     "sprite_id": "09",
     "name": "可琳",
     "full_name": "可琳·威克斯",
     "en_name": "Corin"
   },
-  "1071": {
-    "sprite_id": "25",
-    "name": "凯撒",
-    "full_name": "凯撒·金",
-    "en_name": "Caesar"
-  },
-  "1081": {
-    "sprite_id": "10",
-    "name": "比利",
-    "full_name": "比利·奇德",
-    "en_name": "Billy"
-  },
-  "1091": {
-    "sprite_id": "10",
-    "name": "雅",
-    "full_name": "星见 雅",
-    "en_name": "Miyabi"
-  },
-  "1101": {
-    "sprite_id": "14",
-    "name": "珂蕾妲",
-    "full_name": "珂蕾妲·贝洛伯格",
-    "en_name": "Koleda"
-  },
-  "1111": {
-    "sprite_id": "15",
-    "name": "安东",
-    "full_name": "安东·伊万诺夫",
-    "en_name": "Anton"
-  },
-  "1121": {
-    "sprite_id": "16",
-    "name": "本",
-    "full_name": "本·比格",
-    "en_name": "Ben"
-  },
-  "1131": {
-    "sprite_id": "17",
-    "name": "苍角",
-    "full_name": "苍角",
-    "en_name": "Soukaku"
-  },
-  "1141": {
-    "sprite_id": "18",
-    "name": "莱卡恩",
-    "full_name": "冯·莱卡恩",
-    "en_name": "Lycaon"
-  },
-  "1151": {
-    "sprite_id": "27",
-    "name": "露西",
-    "full_name": "露西亚娜·德·蒙特夫",
-    "en_name": "Lucy"
-  },
-  "1161": {
-    "sprite_id": "26",
-    "name": "莱特",
-    "full_name": "莱特",
-    "en_name": "Lighter"
-  },
-  "1171": {
-    "sprite_id": "32",
-    "name": "柏妮思",
-    "full_name": "柏妮思·怀特",
-    "en_name": "Burnice"
-  },
-  "1181": {
-    "sprite_id": "20",
-    "name": "格莉丝",
-    "full_name": "格莉丝·霍华德",
-    "en_name": "Grace"
-  },
-  "1191": {
-    "sprite_id": "21",
-    "name": "艾莲",
-    "full_name": "艾莲·乔",
-    "en_name": "Ellen"
-  },
-  "1201": {
-    "sprite_id": "21",
-    "name": "悠真",
-    "full_name": "浅羽 悠真",
-    "en_name": "Harumasa"
-  },
-  "1211": {
-    "sprite_id": "22",
-    "name": "丽娜",
-    "full_name": "亚历山德丽娜·莎芭丝缇安",
-    "en_name": "Rina"
-  },
-  "1221": {
-    "sprite_id": "31",
-    "name": "柳",
-    "full_name": "月城 柳",
-    "en_name": "Yanagi"
-  },
-  "1241": {
-    "sprite_id": "23",
-    "name": "朱鸢",
-    "full_name": "朱鸢",
-    "en_name": "Zhu Yuan"
-  },
   "1251": {
     "sprite_id": "29",
     "name": "青衣",
@@ -143,34 +17,166 @@
     "full_name": "简·杜",
     "en_name": "Jane"
   },
+  "1131": {
+    "sprite_id": "17",
+    "name": "苍角",
+    "full_name": "苍角",
+    "en_name": "Soukaku"
+  },
+  "1201": {
+    "sprite_id": "35",
+    "name": "悠真",
+    "full_name": "浅羽悠真",
+    "en_name": "Harumasa"
+  },
+  "1081": {
+    "sprite_id": "10",
+    "name": "比利",
+    "full_name": "比利·奇德",
+    "en_name": "Billy"
+  },
+  "1181": {
+    "sprite_id": "20",
+    "name": "格莉丝",
+    "full_name": "格莉丝·霍华德",
+    "en_name": "Grace"
+  },
+  "1321": {
+    "sprite_id": "",
+    "name": "伊芙琳",
+    "full_name": "伊芙琳",
+    "en_name": "Evelyn"
+  },
+  "2011": {
+    "sprite_id": "",
+    "name": "哲",
+    "full_name": "哲",
+    "en_name": "Wise"
+  },
+  "1011": {
+    "sprite_id": "01",
+    "name": "安比",
+    "full_name": "安比·德玛拉",
+    "en_name": "Anby"
+  },
+  "1071": {
+    "sprite_id": "25",
+    "name": "凯撒",
+    "full_name": "凯撒·金",
+    "en_name": "Caesar"
+  },
+  "2021": {
+    "sprite_id": "",
+    "name": "铃",
+    "full_name": "铃",
+    "en_name": "Belle"
+  },
+  "1031": {
+    "sprite_id": "12",
+    "name": "妮可",
+    "full_name": "妮可·德玛拉",
+    "en_name": "Nicole"
+  },
+  "1281": {
+    "sprite_id": "28",
+    "name": "派派",
+    "full_name": "派派",
+    "en_name": "Piper"
+  },
+  "1021": {
+    "sprite_id": "11",
+    "name": "猫又",
+    "full_name": "猫宫又奈",
+    "en_name": "Nekomata"
+  },
+  "1241": {
+    "sprite_id": "23",
+    "name": "朱鸢",
+    "full_name": "朱鸢",
+    "en_name": "Zhu Yuan"
+  },
+  "1141": {
+    "sprite_id": "18",
+    "name": "莱卡恩",
+    "full_name": "冯·莱卡恩",
+    "en_name": "Lycaon"
+  },
+  "1161": {
+    "sprite_id": "26",
+    "name": "莱特",
+    "full_name": "...",
+    "en_name": "Lighter"
+  },
+  "1111": {
+    "sprite_id": "15",
+    "name": "安东",
+    "full_name": "安东·伊万诺夫",
+    "en_name": "Anton"
+  },
+  "1041": {
+    "sprite_id": "05",
+    "name": "「11号」",
+    "full_name": "「11号」",
+    "en_name": "Soldier 11"
+  },
+  "1091": {
+    "sprite_id": "13",
+    "name": "雅",
+    "full_name": "星见雅",
+    "en_name": "Miyabi"
+  },
+  "1121": {
+    "sprite_id": "16",
+    "name": "本",
+    "full_name": "本·比格",
+    "en_name": "Ben"
+  },
+  "1211": {
+    "sprite_id": "22",
+    "name": "丽娜",
+    "full_name": "亚历山德丽娜·莎芭丝缇安",
+    "en_name": "Rina"
+  },
+  "1311": {
+    "sprite_id": "",
+    "name": "耀嘉音",
+    "full_name": "耀嘉音",
+    "en_name": "Avatar_Female_Size03_Astra_En"
+  },
+  "1151": {
+    "sprite_id": "27",
+    "name": "露西",
+    "full_name": "露西亚娜·德·蒙特夫",
+    "en_name": "Lucy"
+  },
+  "1101": {
+    "sprite_id": "14",
+    "name": "珂蕾妲",
+    "full_name": "珂蕾妲·贝洛伯格",
+    "en_name": "Koleda"
+  },
+  "1221": {
+    "sprite_id": "31",
+    "name": "柳",
+    "full_name": "...",
+    "en_name": "Yanagi"
+  },
   "1271": {
     "sprite_id": "30",
     "name": "赛斯",
     "full_name": "赛斯·洛威尔",
     "en_name": "Seth"
   },
-  "1281": {
-    "sprite_id": "28",
-    "name": "派派",
-    "full_name": "派派·韦尔",
-    "en_name": "Piper"
+  "1171": {
+    "sprite_id": "32",
+    "name": "柏妮思",
+    "full_name": "柏妮思·怀特",
+    "en_name": "Burnice"
   },
-  "1351": {
-    "sprite_id": "28",
-    "name": "波可娜",
-    "full_name": "波可娜·费雷尼",
-    "en_name": "Pulchra Feliny"
-  },
-  "2011": {
-    "sprite_id": "28",
-    "name": "哲",
-    "full_name": "哲",
-    "en_name": "Wise"
-  },
-  "2021": {
-    "sprite_id": "28",
-    "name": "铃",
-    "full_name": "铃",
-    "en_name": "Belle"
+  "1191": {
+    "sprite_id": "21",
+    "name": "艾莲",
+    "full_name": "艾莲·乔",
+    "en_name": "Ellen"
   }
 }
diff --git a/resources/map/WeaponId2Sprite.json b/resources/map/WeaponId2Sprite.json
index 1147565..5f00a2f 100644
--- a/resources/map/WeaponId2Sprite.json
+++ b/resources/map/WeaponId2Sprite.json
@@ -25,6 +25,7 @@
   "13010": "Weapon_A_Common_10",
   "13011": "Weapon_A_Common_11",
   "13013": "Weapon_A_Common_13",
+  "13015": "Weapon_A_Common_15",
   "13101": "Weapon_A_1011",
   "13103": "Weapon_A_1031",
   "13106": "Weapon_A_1061",
@@ -41,12 +42,14 @@
   "14102": "Weapon_S_1021",
   "14104": "Weapon_S_1041",
   "14107": "Weapon_S_1071",
+  "14109": "Weapon_S_1091",
   "14110": "Weapon_S_1101",
   "14114": "Weapon_S_1141",
   "14116": "Weapon_S_1161",
   "14117": "Weapon_S_1171",
   "14118": "Weapon_S_1181",
   "14119": "Weapon_S_1191",
+  "14120": "Weapon_S_1201",
   "14121": "Weapon_S_1211",
   "14122": "Weapon_S_1221",
   "14124": "Weapon_S_1241",