diff --git a/lib/convert/char.js b/lib/convert/char.js
index a7cdf9f..b2f2719 100644
--- a/lib/convert/char.js
+++ b/lib/convert/char.js
@@ -62,6 +62,10 @@ export const aliasToName = _alias => {
     if (id === _alias) return id;
     if (data.includes(_alias)) return id;
   }
+  // 判断PartnerId2SpriteId是否有对应的name
+  for (const [_, data] of Object.entries(PartnerId2SpriteId)) {
+    if (data['name'] === _alias) return data['name'];
+  }
   return null;
 };
 
diff --git a/resources/map/EquipId2Data.json b/resources/map/EquipId2Data.json
index 961e03b..caee76c 100644
--- a/resources/map/EquipId2Data.json
+++ b/resources/map/EquipId2Data.json
@@ -1,114 +1,100 @@
 {
-  "31900": {
+  "31000": {
     "equip_id_list": [
-      31921, 31922, 31923, 31924, 31925, 31926, 
-      31931, 31932, 31933, 31934, 31935, 31936, 
-      31941, 31942, 31943, 31944, 31945, 31946
+      31021, 31022, 31023, 31024, 31025, 31026, 31031, 31032, 31033, 31034,
+      31035, 31036, 31041, 31042, 31043, 31044, 31045, 31046
     ],
-    "sprite_file": "3DSuitProtoPunk"
-  },
-  "31300": {
-    "equip_id_list": [
-      31321, 31322, 31323, 31324, 31325, 31326, 
-      31331, 31332, 31333, 31334, 31335, 31336, 
-      31341, 31342, 31343, 31344, 31345, 31346
-    ],
-    "sprite_file": "3DSuitFreedomBlues"
-  },
-  "31600": {
-    "equip_id_list": [
-      31621, 31622, 31623, 31624, 31625, 31626, 
-      31631, 31632, 31633, 31634, 31635, 31636, 
-      31641, 31642, 31643, 31644, 31645, 31646
-    ],
-    "sprite_file": "3DSuitSwingJazz"
+    "sprite_file": "3DSuitWoodpeckerElectro"
   },
   "31100": {
     "equip_id_list": [
-      31121, 31122, 31123, 31124, 31125, 31126, 
-      31131, 31132, 31133, 31134, 31135, 31136, 
-      31141, 31142, 31143, 31144, 31145, 31146
+      31121, 31122, 31123, 31124, 31125, 31126, 31131, 31132, 31133, 31134,
+      31135, 31136, 31141, 31142, 31143, 31144, 31145, 31146
     ],
     "sprite_file": "3DSuitPufferElectro"
   },
   "31200": {
     "equip_id_list": [
-      31221, 31222, 31223, 31224, 31225, 31226, 
-      31231, 31232, 31233, 31234, 31235, 31236, 
-      31241, 31242, 31243, 31244, 31245, 31246
+      31221, 31222, 31223, 31224, 31225, 31226, 31231, 31232, 31233, 31234,
+      31235, 31236, 31241, 31242, 31243, 31244, 31245, 31246
     ],
     "sprite_file": "3DSuitShockstarDisco"
   },
-  "32400": {
+  "31300": {
     "equip_id_list": [
-      32421, 32422, 32423, 32424, 32425, 32426, 
-      32431, 32432, 32433, 32434, 32435, 32436, 
-      32441, 32442, 32443, 32444, 32445, 32446
+      31321, 31322, 31323, 31324, 31325, 31326, 31331, 31332, 31333, 31334,
+      31335, 31336, 31341, 31342, 31343, 31344, 31345, 31346
     ],
-    "sprite_file": "3DSuitThunderMetal"
+    "sprite_file": "3DSuitFreedomBlues"
+  },
+  "31400": {
+    "equip_id_list": [
+      31421, 31422, 31423, 31424, 31425, 31426, 31431, 31432, 31433, 31434,
+      31435, 31436, 31441, 31442, 31443, 31444, 31445, 31446
+    ],
+    "sprite_file": "3DSuitHormonePunk"
   },
   "31500": {
     "equip_id_list": [
-      31521, 31522, 31523, 31524, 31525, 31526, 
-      31531, 31532, 31533, 31534, 31535, 31536, 
-      31541, 31542, 31543, 31544, 31545, 31546
+      31521, 31522, 31523, 31524, 31525, 31526, 31531, 31532, 31533, 31534,
+      31535, 31536, 31541, 31542, 31543, 31544, 31545, 31546
     ],
     "sprite_file": "3DSuitSoulRock"
   },
+  "31600": {
+    "equip_id_list": [
+      31621, 31622, 31623, 31624, 31625, 31626, 31631, 31632, 31633, 31634,
+      31635, 31636, 31641, 31642, 31643, 31644, 31645, 31646
+    ],
+    "sprite_file": "3DSuitSwingJazz"
+  },
+  "31800": {
+    "equip_id_list": [
+      31821, 31822, 31823, 31824, 31825, 31826, 31831, 31832, 31833, 31834,
+      31835, 31836, 31841, 31842, 31843, 31844, 31845, 31846
+    ],
+    "sprite_file": "3DSuitChaosJazz"
+  },
+  "31900": {
+    "equip_id_list": [
+      31921, 31922, 31923, 31924, 31925, 31926, 31931, 31932, 31933, 31934,
+      31935, 31936, 31941, 31942, 31943, 31944, 31945, 31946
+    ],
+    "sprite_file": "3DSuitProtoPunk"
+  },
+  "32200": {
+    "equip_id_list": [
+      32221, 32222, 32223, 32224, 32225, 32226, 32231, 32232, 32233, 32234,
+      32235, 32236, 32241, 32242, 32243, 32244, 32245, 32246
+    ],
+    "sprite_file": "3DSuitInfernoMetal"
+  },
+  "32300": {
+    "equip_id_list": [
+      32321, 32322, 32323, 32324, 32325, 32326, 32331, 32332, 32333, 32334,
+      32335, 32336, 32341, 32342, 32343, 32344, 32345, 32346
+    ],
+    "sprite_file": "3DSuitChaosMetal"
+  },
+  "32400": {
+    "equip_id_list": [
+      32421, 32422, 32423, 32424, 32425, 32426, 32431, 32432, 32433, 32434,
+      32435, 32436, 32441, 32442, 32443, 32444, 32445, 32446
+    ],
+    "sprite_file": "3DSuitThunderMetal"
+  },
   "32500": {
     "equip_id_list": [
-      32521, 32522, 32523, 32524, 32525, 32526, 
-      32531, 32532, 32533, 32534, 32535, 32536, 
-      32541, 32542, 32543, 32544, 32545, 32546
+      32521, 32522, 32523, 32524, 32525, 32526, 32531, 32532, 32533, 32534,
+      32535, 32536, 32541, 32542, 32543, 32544, 32545, 32546
     ],
     "sprite_file": "3DSuitPolarMetal"
   },
   "32600": {
     "equip_id_list": [
-      32621, 32622, 32623, 32624, 32625, 32626, 
-      32631, 32632, 32633, 32634, 32635, 32636, 
-      32641, 32642, 32643, 32644, 32645, 32646
+      32621, 32622, 32623, 32624, 32625, 32626, 32631, 32632, 32633, 32634,
+      32635, 32636, 32641, 32642, 32643, 32644, 32645, 32646
     ],
     "sprite_file": "3DSuitFangedMetal"
-  },
-  "31800": {
-    "equip_id_list": [
-      31821, 31822, 31823, 31824, 31825, 31826, 
-      31831, 31832, 31833, 31834, 31835, 31836, 
-      31841, 31842, 31843, 31844, 31845, 31846
-    ],
-    "sprite_file": "3DSuitChaosJazz"
-  },
-  "31400": {
-    "equip_id_list": [
-      31421, 31422, 31423, 31424, 31425, 31426, 
-      31431, 31432, 31433, 31434, 31435, 31436, 
-      31441, 31442, 31443, 31444, 31445, 31446
-    ],
-    "sprite_file": "3DSuitHormonePunk"
-  },
-  "32200": {
-    "equip_id_list": [
-      32221, 32222, 32223, 32224, 32225, 32226, 
-      32231, 32232, 32233, 32234, 32235, 32236, 
-      32241, 32242, 32243, 32244, 32245, 32246
-    ],
-    "sprite_file": "3DSuitInfernoMetal"
-  },
-  "31000": {
-    "equip_id_list": [
-      31021, 31022, 31023, 31024, 31025, 31026, 
-      31031, 31032, 31033, 31034, 31035, 31036, 
-      31041, 31042, 31043, 31044, 31045, 31046
-    ],
-    "sprite_file": "3DSuitWoodpeckerElectro"
-  },
-  "32300": {
-    "equip_id_list": [
-      32321, 32322, 32323, 32324, 32325, 32326, 
-      32331, 32332, 32333, 32334, 32335, 32336, 
-      32341, 32342, 32343, 32344, 32345, 32346
-    ],
-    "sprite_file": "3DSuitChaosMetal"
   }
 }
diff --git a/resources/map/PartnerId2Data.json b/resources/map/PartnerId2Data.json
index f50a864..d9e272e 100644
--- a/resources/map/PartnerId2Data.json
+++ b/resources/map/PartnerId2Data.json
@@ -1,10 +1,136 @@
 {
+  "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": "青衣",
@@ -17,154 +143,34 @@
     "full_name": "简·杜",
     "en_name": "Jane"
   },
-  "1131": {
-    "sprite_id": "17",
-    "name": "苍角",
-    "full_name": "苍角",
-    "en_name": "Soukaku"
-  },
-  "1201": {
-    "sprite_id": "",
-    "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"
-  },
-  "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": "",
-    "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"
-  },
-  "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"
   },
-  "1171": {
-    "sprite_id": "32",
-    "name": "柏妮思",
-    "full_name": "柏妮思",
-    "en_name": "Burnice"
+  "1281": {
+    "sprite_id": "28",
+    "name": "派派",
+    "full_name": "派派·韦尔",
+    "en_name": "Piper"
   },
-  "1191": {
-    "sprite_id": "21",
-    "name": "艾莲",
-    "full_name": "艾莲·乔",
-    "en_name": "Ellen"
+  "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"
   }
 }
diff --git a/resources/map/WeaponId2Sprite.json b/resources/map/WeaponId2Sprite.json
index 31117ce..1147565 100644
--- a/resources/map/WeaponId2Sprite.json
+++ b/resources/map/WeaponId2Sprite.json
@@ -1,55 +1,55 @@
 {
-  "13108": "Weapon_A_1081",
-  "14104": "Weapon_S_1041",
-  "12009": "Weapon_B_Common_09",
-  "14107": "Weapon_S_1071",
-  "13103": "Weapon_A_1031",
-  "13002": "Weapon_A_Common_02",
-  "13113": "Weapon_A_1131",
-  "12003": "Weapon_B_Common_03",
-  "12002": "Weapon_B_Common_02",
-  "13008": "Weapon_A_Common_08",
-  "14001": "Weapon_S_Common_01",
-  "13003": "Weapon_A_Common_03",
-  "13010": "Weapon_A_Common_10",
-  "14116": "Weapon_S_1161",
-  "13011": "Weapon_A_Common_11",
-  "14102": "Weapon_S_1021",
-  "14122": "Weapon_S_1221",
-  "14114": "Weapon_S_1141",
-  "14118": "Weapon_S_1181",
-  "12011": "Weapon_B_Common_11",
-  "13007": "Weapon_A_Common_07",
-  "12005": "Weapon_B_Common_05",
-  "13112": "Weapon_A_1121",
-  "12007": "Weapon_B_Common_07",
-  "14119": "Weapon_S_1191",
-  "14117": "Weapon_S_1171",
-  "14124": "Weapon_S_1241",
-  "13101": "Weapon_A_1011",
-  "14110": "Weapon_S_1101",
-  "12013": "Weapon_B_Common_13",
-  "12006": "Weapon_B_Common_06",
-  "13004": "Weapon_A_Common_04",
-  "12014": "Weapon_B_Common_14",
-  "13005": "Weapon_A_Common_05",
-  "13127": "Weapon_A_1271",
-  "13111": "Weapon_A_1111",
-  "14121": "Weapon_S_1211",
-  "12010": "Weapon_B_Common_10",
-  "13115": "Weapon_A_1151",
-  "13009": "Weapon_A_Common_09",
-  "13013": "Weapon_A_Common_13",
-  "12004": "Weapon_B_Common_04",
-  "14126": "Weapon_S_1261",
-  "12008": "Weapon_B_Common_08",
   "12001": "Weapon_B_Common_01",
-  "13106": "Weapon_A_1061",
-  "14002": "Weapon_S_Common_02",
-  "14125": "Weapon_S_1251",
-  "13001": "Weapon_A_Common_01",
-  "13006": "Weapon_A_Common_06",
+  "12002": "Weapon_B_Common_02",
+  "12003": "Weapon_B_Common_03",
+  "12004": "Weapon_B_Common_04",
+  "12005": "Weapon_B_Common_05",
+  "12006": "Weapon_B_Common_06",
+  "12007": "Weapon_B_Common_07",
+  "12008": "Weapon_B_Common_08",
+  "12009": "Weapon_B_Common_09",
+  "12010": "Weapon_B_Common_10",
+  "12011": "Weapon_B_Common_11",
   "12012": "Weapon_B_Common_12",
+  "12013": "Weapon_B_Common_13",
+  "12014": "Weapon_B_Common_14",
+  "13001": "Weapon_A_Common_01",
+  "13002": "Weapon_A_Common_02",
+  "13003": "Weapon_A_Common_03",
+  "13004": "Weapon_A_Common_04",
+  "13005": "Weapon_A_Common_05",
+  "13006": "Weapon_A_Common_06",
+  "13007": "Weapon_A_Common_07",
+  "13008": "Weapon_A_Common_08",
+  "13009": "Weapon_A_Common_09",
+  "13010": "Weapon_A_Common_10",
+  "13011": "Weapon_A_Common_11",
+  "13013": "Weapon_A_Common_13",
+  "13101": "Weapon_A_1011",
+  "13103": "Weapon_A_1031",
+  "13106": "Weapon_A_1061",
+  "13108": "Weapon_A_1081",
+  "13111": "Weapon_A_1111",
+  "13112": "Weapon_A_1121",
+  "13113": "Weapon_A_1131",
+  "13115": "Weapon_A_1151",
+  "13127": "Weapon_A_1271",
+  "13128": "Weapon_A_1281",
+  "14001": "Weapon_S_Common_01",
+  "14002": "Weapon_S_Common_02",
   "14003": "Weapon_S_Common_03",
-  "13128": "Weapon_A_1281"
+  "14102": "Weapon_S_1021",
+  "14104": "Weapon_S_1041",
+  "14107": "Weapon_S_1071",
+  "14110": "Weapon_S_1101",
+  "14114": "Weapon_S_1141",
+  "14116": "Weapon_S_1161",
+  "14117": "Weapon_S_1171",
+  "14118": "Weapon_S_1181",
+  "14119": "Weapon_S_1191",
+  "14121": "Weapon_S_1211",
+  "14122": "Weapon_S_1221",
+  "14124": "Weapon_S_1241",
+  "14125": "Weapon_S_1251",
+  "14126": "Weapon_S_1261"
 }