diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/杜林01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/杜林01.png
new file mode 100644
index 000000000..9db112c9a
Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/杜林01.png differ
diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雅珂达01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/雅珂达01.png
new file mode 100644
index 000000000..6e20d23c2
Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/雅珂达01.png differ
diff --git a/repo/js/AutoSwitchRoles/attribute.txt b/repo/js/AutoSwitchRoles/attribute.txt
index dd641b6d0..bfdf17724 100644
--- a/repo/js/AutoSwitchRoles/attribute.txt
+++ b/repo/js/AutoSwitchRoles/attribute.txt
@@ -103,3 +103,5 @@
 爱诺，水，大剑
 菲林斯，雷，长枪
 奈芙尔，草，法器
+雅珂达，风，弓
+杜林，火，单手剑
diff --git a/repo/js/AutoSwitchRoles/combat_avatar.json b/repo/js/AutoSwitchRoles/combat_avatar.json
index 1e8de7c67..825d1bc2c 100644
--- a/repo/js/AutoSwitchRoles/combat_avatar.json
+++ b/repo/js/AutoSwitchRoles/combat_avatar.json
@@ -1,5 +1,6 @@
 [
   {
+    "name": "旅行者",
     "alias": [
       "旅行者",
       "主角",
@@ -9,13 +10,10 @@
       "主",
       "履刑者",
       "抽卡不歪真君"
-    ],
-    "id": "20000000",
-    "name": "旅行者",
-    "nameEn": "Traveler",
-    "weapon": "1"
+    ]
   },
   {
+    "name": "荧",
     "alias": [
       "荧",
       "女主",
@@ -27,13 +25,10 @@
       "女爷",
       "包包",
       "宴宁"
-    ],
-    "id": "10000007",
-    "name": "荧",
-    "nameEn": "PlayerGirl",
-    "weapon": "1"
+    ]
   },
   {
+    "name": "空",
     "alias": [
       "空",
       "男主",
@@ -41,13 +36,10 @@
       "龙哥",
       "空哥",
       "男爷"
-    ],
-    "id": "10000005",
-    "name": "空",
-    "nameEn": "PlayerBoy",
-    "weapon": "1"
+    ]
   },
   {
+    "name": "神里绫华",
     "alias": [
       "神里绫华",
       "Kamisato Ayaka",
@@ -61,15 +53,10 @@
       "龟",
       "龟龟",
       "乌龟"
-    ],
-    "burstCD": 20,
-    "id": "10000002",
-    "name": "神里绫华",
-    "nameEn": "Ayaka",
-    "skillCD": 10,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "琴",
     "alias": [
       "琴",
       "Jean",
@@ -77,15 +64,10 @@
       "代理团长",
       "琴团长",
       "蒲公英骑士"
-    ],
-    "burstCD": 20,
-    "id": "10000003",
-    "name": "琴",
-    "nameEn": "Qin",
-    "skillCD": 6,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "丽莎",
     "alias": [
       "丽莎",
       "Lisa",
@@ -93,16 +75,10 @@
       "图书馆管理员",
       "蔷薇魔女",
       "阿姨"
-    ],
-    "burstCD": 20,
-    "id": "10000006",
-    "name": "丽莎",
-    "nameEn": "Lisa",
-    "skillCD": 1,
-    "skillHoldCD": 16,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "芭芭拉",
     "alias": [
       "芭芭拉",
       "Barbara",
@@ -113,15 +89,10 @@
       "肉身解咒真君",
       "闪耀偶像",
       "偶像"
-    ],
-    "burstCD": 20,
-    "id": "10000014",
-    "name": "芭芭拉",
-    "nameEn": "Barbara",
-    "skillCD": 32,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "凯亚",
     "alias": [
       "凯亚",
       "Kaeya",
@@ -133,15 +104,10 @@
       "骑兵队长",
       "凯子",
       "凝冰渡海真君"
-    ],
-    "burstCD": 15,
-    "id": "10000015",
-    "name": "凯亚",
-    "nameEn": "Kaeya",
-    "skillCD": 6,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "迪卢克",
     "alias": [
       "迪卢克",
       "Diluc",
@@ -157,15 +123,10 @@
       "卢卢伯爵",
       "落魄了",
       "落魄了家人们"
-    ],
-    "burstCD": 12,
-    "id": "10000016",
-    "name": "迪卢克",
-    "nameEn": "Diluc",
-    "skillCD": 10,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "雷泽",
     "alias": [
       "雷泽",
       "Razor",
@@ -176,16 +137,10 @@
       "小狼",
       "小狼狗",
       "狼孩"
-    ],
-    "burstCD": 20,
-    "id": "10000020",
-    "name": "雷泽",
-    "nameEn": "Razor",
-    "skillCD": 6,
-    "skillHoldCD": 10,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "安柏",
     "alias": [
       "安柏",
       "Amber",
@@ -197,15 +152,10 @@
       "点火机",
       "打火机",
       "打火姬"
-    ],
-    "burstCD": 12,
-    "id": "10000021",
-    "name": "安柏",
-    "nameEn": "Ambor",
-    "skillCD": 15,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "温迪",
     "alias": [
       "温迪",
       "Venti",
@@ -222,16 +172,10 @@
       "诶嘿",
       "唉嘿",
       "摸鱼"
-    ],
-    "burstCD": 15,
-    "id": "10000022",
-    "name": "温迪",
-    "nameEn": "Venti",
-    "skillCD": 6,
-    "skillHoldCD": 15,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "香菱",
     "alias": [
       "香菱",
       "Xiangling",
@@ -240,30 +184,20 @@
       "厨师",
       "万民堂厨师",
       "香师傅"
-    ],
-    "burstCD": 20,
-    "id": "10000023",
-    "name": "香菱",
-    "nameEn": "Xiangling",
-    "skillCD": 12,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "北斗",
     "alias": [
       "北斗",
       "Beidou",
       "大姐头",
       "大姐",
       "无冕的龙王"
-    ],
-    "burstCD": 20,
-    "id": "10000024",
-    "name": "北斗",
-    "nameEn": "Beidou",
-    "skillCD": 7.5,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "行秋",
     "alias": [
       "行秋",
       "Xingqiu",
@@ -272,15 +206,10 @@
       "书呆子",
       "枕玉",
       "飞云商会二少爷"
-    ],
-    "burstCD": 20,
-    "id": "10000025",
-    "name": "行秋",
-    "nameEn": "Xingqiu",
-    "skillCD": 21,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "魈",
     "alias": [
       "魈",
       "Xiao",
@@ -297,30 +226,20 @@
       "三点五尺仙人",
       "跳跳虎",
       "风夜叉"
-    ],
-    "burstCD": 18,
-    "id": "10000026",
-    "name": "魈",
-    "nameEn": "Xiao",
-    "skillCD": 10,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "凝光",
     "alias": [
       "凝光",
       "Ningguang",
       "富婆",
       "天权星",
       "天权"
-    ],
-    "burstCD": 12,
-    "id": "10000027",
-    "name": "凝光",
-    "nameEn": "Ningguang",
-    "skillCD": 12,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "可莉",
     "alias": [
       "可莉",
       "逃跑的太阳",
@@ -339,15 +258,10 @@
       "禁闭室",
       "太阳",
       "小太阳"
-    ],
-    "burstCD": 15,
-    "id": "10000029",
-    "name": "可莉",
-    "nameEn": "Klee",
-    "skillCD": 20,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "钟离",
     "alias": [
       "钟离",
       "Zhongli",
@@ -360,16 +274,10 @@
       "未来可期",
       "帝君",
       "拒收病婿"
-    ],
-    "burstCD": 12,
-    "id": "10000030",
-    "name": "钟离",
-    "nameEn": "Zhongli",
-    "skillCD": 4,
-    "skillHoldCD": 12,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "菲谢尔",
     "alias": [
       "菲谢尔",
       "Fischl",
@@ -382,15 +290,10 @@
       "中二少女",
       "中二皇女",
       "奥兹发射器"
-    ],
-    "burstCD": 15,
-    "id": "10000031",
-    "name": "菲谢尔",
-    "nameEn": "Fischl",
-    "skillCD": 25,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "班尼特",
     "alias": [
       "班尼特",
       "Bennett",
@@ -404,15 +307,10 @@
       "倒霉",
       "蒙德火神",
       "六星真神"
-    ],
-    "burstCD": 15,
-    "id": "10000032",
-    "name": "班尼特",
-    "nameEn": "Bennett",
-    "skillCD": 5,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "达达利亚",
     "alias": [
       "达达利亚",
       "Tartaglia",
@@ -426,31 +324,20 @@
       "钱包",
       "鸭鸭",
       "愚人众末席"
-    ],
-    "burstCD": 15,
-    "id": "10000033",
-    "name": "达达利亚",
-    "nameEn": "Tartaglia",
-    "skillCD": 6,
-    "skillHoldCD": 45,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "诺艾尔",
     "alias": [
       "诺艾尔",
       "Noelle",
       "女仆",
       "高达",
       "岩王帝姬"
-    ],
-    "burstCD": 15,
-    "id": "10000034",
-    "name": "诺艾尔",
-    "nameEn": "Noel",
-    "skillCD": 24,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "七七",
     "alias": [
       "七七",
       "Qiqi",
@@ -458,44 +345,29 @@
       "肚饿真君",
       "度厄真君",
       "77"
-    ],
-    "burstCD": 20,
-    "id": "10000035",
-    "name": "七七",
-    "nameEn": "Qiqi",
-    "skillCD": 30,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "重云",
     "alias": [
       "重云",
       "Chongyun",
       "纯阳之体",
       "冰棍"
-    ],
-    "burstCD": 12,
-    "id": "10000036",
-    "name": "重云",
-    "nameEn": "Chongyun",
-    "skillCD": 15,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "甘雨",
     "alias": [
       "甘雨",
       "Ganyu",
       "椰羊",
       "椰奶",
       "王小美"
-    ],
-    "burstCD": 15,
-    "id": "10000037",
-    "name": "甘雨",
-    "nameEn": "Ganyu",
-    "skillCD": 10,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "阿贝多",
     "alias": [
       "阿贝多",
       "Albedo",
@@ -510,15 +382,10 @@
       "花呗多",
       "阿贝夕",
       "阿师傅"
-    ],
-    "burstCD": 12,
-    "id": "10000038",
-    "name": "阿贝多",
-    "nameEn": "Albedo",
-    "skillCD": 4,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "迪奥娜",
     "alias": [
       "迪奥娜",
       "Diona",
@@ -529,16 +396,10 @@
       "猫娘",
       "喵喵",
       "调酒师"
-    ],
-    "burstCD": 20,
-    "id": "10000039",
-    "name": "迪奥娜",
-    "nameEn": "Diona",
-    "skillCD": 6,
-    "skillHoldCD": 15,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "莫娜",
     "alias": [
       "莫娜",
       "Mona",
@@ -553,15 +414,10 @@
       "阿斯托洛吉斯·莫娜·梅姬斯图斯",
       "梅姬斯图斯",
       "梅姬斯图斯姬"
-    ],
-    "burstCD": 15,
-    "id": "10000041",
-    "name": "莫娜",
-    "nameEn": "Mona",
-    "skillCD": 12,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "刻晴",
     "alias": [
       "刻晴",
       "Keqing",
@@ -579,43 +435,28 @@
       "阿晴",
       "啊晴",
       "璃月雷神"
-    ],
-    "burstCD": 12,
-    "id": "10000042",
-    "name": "刻晴",
-    "nameEn": "Keqing",
-    "skillCD": 7.5,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "砂糖",
     "alias": [
       "砂糖",
       "Sucrose",
       "sucrose"
-    ],
-    "burstCD": 20,
-    "id": "10000043",
-    "name": "砂糖",
-    "nameEn": "Sucrose",
-    "skillCD": 15,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "辛焱",
     "alias": [
       "辛焱",
       "Xinyan",
       "辛炎",
       "黑妹",
       "摇滚"
-    ],
-    "burstCD": 15,
-    "id": "10000044",
-    "name": "辛焱",
-    "nameEn": "Xinyan",
-    "skillCD": 18,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "罗莎莉亚",
     "alias": [
       "罗莎莉亚",
       "Rosaria",
@@ -637,15 +478,10 @@
       "萝沙莉娅",
       "萝沙利亚",
       "萝沙利娅"
-    ],
-    "burstCD": 15,
-    "id": "10000045",
-    "name": "罗莎莉亚",
-    "nameEn": "Rosaria",
-    "skillCD": 6,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "胡桃",
     "alias": [
       "胡桃",
       "Hu Tao",
@@ -662,15 +498,10 @@
       "雪霁梅香",
       "桃子",
       "桃"
-    ],
-    "burstCD": 15,
-    "id": "10000046",
-    "name": "胡桃",
-    "nameEn": "Hutao",
-    "skillCD": 16,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "枫原万叶",
     "alias": [
       "枫原万叶",
       "Kaedehara Kazuha",
@@ -679,31 +510,20 @@
       "叶天帝",
       "天帝",
       "叶师傅"
-    ],
-    "burstCD": 15,
-    "id": "10000047",
-    "name": "枫原万叶",
-    "nameEn": "Kazuha",
-    "skillCD": 6,
-    "skillHoldCD": 9,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "烟绯",
     "alias": [
       "烟绯",
       "Yanfei",
       "烟老师",
       "律师",
       "罗翔"
-    ],
-    "burstCD": 20,
-    "id": "10000048",
-    "name": "烟绯",
-    "nameEn": "Feiyan",
-    "skillCD": 9,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "宵宫",
     "alias": [
       "宵宫",
       "Yoimiya",
@@ -712,15 +532,10 @@
       "肖宫",
       "肖工",
       "绷带女孩"
-    ],
-    "burstCD": 15,
-    "id": "10000049",
-    "name": "宵宫",
-    "nameEn": "Yoimiya",
-    "skillCD": 18,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "托马",
     "alias": [
       "托马",
       "Thoma",
@@ -729,15 +544,10 @@
       "地头蛇",
       "男仆",
       "拖马"
-    ],
-    "burstCD": 20,
-    "id": "10000050",
-    "name": "托马",
-    "nameEn": "Tohma",
-    "skillCD": 15,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "优菈",
     "alias": [
       "优菈",
       "Eula",
@@ -747,16 +557,10 @@
       "浪花骑士",
       "记仇",
       "劳伦斯"
-    ],
-    "burstCD": 20,
-    "id": "10000051",
-    "name": "优菈",
-    "nameEn": "Eula",
-    "skillCD": 4,
-    "skillHoldCD": 10,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "雷电将军",
     "alias": [
       "雷电将军",
       "Raiden Shogun",
@@ -772,15 +576,10 @@
       "奶香一刀",
       "无想一刀",
       "宅女"
-    ],
-    "burstCD": 18,
-    "id": "10000052",
-    "name": "雷电将军",
-    "nameEn": "Shougun",
-    "skillCD": 10,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "早柚",
     "alias": [
       "早柚",
       "Sayu",
@@ -788,15 +587,10 @@
       "狸猫",
       "忍者",
       "貉"
-    ],
-    "burstCD": 20,
-    "id": "10000053",
-    "name": "早柚",
-    "nameEn": "Sayu",
-    "skillCD": 6,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "珊瑚宫心海",
     "alias": [
       "珊瑚宫心海",
       "Sangonomiya Kokomi",
@@ -809,15 +603,10 @@
       "水母",
       "鱼",
       "美人鱼"
-    ],
-    "burstCD": 18,
-    "id": "10000054",
-    "name": "珊瑚宫心海",
-    "nameEn": "Kokomi",
-    "skillCD": 20,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "五郎",
     "alias": [
       "五郎",
       "Gorou",
@@ -825,15 +614,10 @@
       "土狗",
       "希娜",
       "希娜小姐"
-    ],
-    "burstCD": 20,
-    "id": "10000055",
-    "name": "五郎",
-    "nameEn": "Gorou",
-    "skillCD": 10,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "九条裟罗",
     "alias": [
       "九条裟罗",
       "Kujou Sara",
@@ -843,15 +627,10 @@
       "裟罗",
       "沙罗",
       "天狗"
-    ],
-    "burstCD": 20,
-    "id": "10000056",
-    "name": "九条裟罗",
-    "nameEn": "Sara",
-    "skillCD": 10,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "荒泷一斗",
     "alias": [
       "荒泷一斗",
       "Arataki Itto",
@@ -872,15 +651,10 @@
       "斗虫",
       "巧乐兹",
       "放牛的"
-    ],
-    "burstCD": 18,
-    "id": "10000057",
-    "name": "荒泷一斗",
-    "nameEn": "Itto",
-    "skillCD": 10,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "八重神子",
     "alias": [
       "八重神子",
       "Yae Miko",
@@ -899,15 +673,10 @@
       "寄子",
       "八神虫子",
       "八神重子"
-    ],
-    "burstCD": 22,
-    "id": "10000058",
-    "name": "八重神子",
-    "nameEn": "Yae",
-    "skillCD": 4,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "鹿野院平藏",
     "alias": [
       "鹿野院平藏",
       "shikanoin heizou",
@@ -917,15 +686,10 @@
       "平藏",
       "鹿野苑平藏",
       "小鹿"
-    ],
-    "burstCD": 12,
-    "id": "10000059",
-    "name": "鹿野院平藏",
-    "nameEn": "Heizo",
-    "skillCD": 10,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "夜兰",
     "alias": [
       "夜兰",
       "Yelan",
@@ -933,15 +697,10 @@
       "叶澜",
       "腋兰",
       "夜天后"
-    ],
-    "burstCD": 18,
-    "id": "10000060",
-    "name": "夜兰",
-    "nameEn": "Yelan",
-    "skillCD": 10,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "绮良良",
     "alias": [
       "绮良良",
       "Kirara",
@@ -957,27 +716,17 @@
       "草喵",
       "草喵喵",
       "猫又"
-    ],
-    "burstCD": 15,
-    "id": "10000061",
-    "name": "绮良良",
-    "nameEn": "Momoka",
-    "skillCD": 8,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "埃洛伊",
     "alias": [
       "埃洛伊",
       "Aloy"
-    ],
-    "burstCD": 12,
-    "id": "10000062",
-    "name": "埃洛伊",
-    "nameEn": "Aloy",
-    "skillCD": 20,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "申鹤",
     "alias": [
       "申鹤",
       "Shenhe",
@@ -985,16 +734,10 @@
       "小姨",
       "小姨子",
       "审鹤"
-    ],
-    "burstCD": 20,
-    "id": "10000063",
-    "name": "申鹤",
-    "nameEn": "Shenhe",
-    "skillCD": 10,
-    "skillHoldCD": 15,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "云堇",
     "alias": [
       "云堇",
       "Yun Jin",
@@ -1003,15 +746,10 @@
       "云先生",
       "云锦",
       "神女劈观"
-    ],
-    "burstCD": 15,
-    "id": "10000064",
-    "name": "云堇",
-    "nameEn": "Yunjin",
-    "skillCD": 9,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "久岐忍",
     "alias": [
       "久岐忍",
       "Kuki Shinobu",
@@ -1026,15 +764,10 @@
       "紫茄子",
       "阿忍",
       "忍姐"
-    ],
-    "burstCD": 15,
-    "id": "10000065",
-    "name": "久岐忍",
-    "nameEn": "Shinobu",
-    "skillCD": 15,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "神里绫人",
     "alias": [
       "神里绫人",
       "Kamisato Ayato",
@@ -1046,15 +779,10 @@
       "神人",
       "零人",
       "大舅哥"
-    ],
-    "burstCD": 20,
-    "id": "10000066",
-    "name": "神里绫人",
-    "nameEn": "Ayato",
-    "skillCD": 12,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "柯莱",
     "alias": [
       "柯莱",
       "Collei",
@@ -1065,45 +793,30 @@
       "须弥安柏",
       "草安柏",
       "须弥飞行冠军"
-    ],
-    "burstCD": 15,
-    "id": "10000067",
-    "name": "柯莱",
-    "nameEn": "Collei",
-    "skillCD": 12,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "多莉",
     "alias": [
       "多莉",
       "Dori",
       "多利",
       "多力",
       "奸商"
-    ],
-    "burstCD": 20,
-    "id": "10000068",
-    "name": "多莉",
-    "nameEn": "Dori",
-    "skillCD": 9,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "提纳里",
     "alias": [
       "提纳里",
       "Tighnari",
       "提那里",
       "小提",
       "驴"
-    ],
-    "burstCD": 12,
-    "id": "10000069",
-    "name": "提纳里",
-    "nameEn": "Tighnari",
-    "skillCD": 12,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "妮露",
     "alias": [
       "妮露",
       "Nilou",
@@ -1111,15 +824,10 @@
       "妮璐",
       "舞娘",
       "红牛"
-    ],
-    "burstCD": 18,
-    "id": "10000070",
-    "name": "妮露",
-    "nameEn": "Nilou",
-    "skillCD": 18,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "赛诺",
     "alias": [
       "赛诺",
       "Cyno",
@@ -1127,30 +835,18 @@
       "胡狼",
       "大风纪官",
       "大风机关"
-    ],
-    "burstCD": 20,
-    "id": "10000071",
-    "name": "赛诺",
-    "nameEn": "Cyno",
-    "skillCD": 7.5,
-    "skillHoldCD": 3,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "坎蒂丝",
     "alias": [
       "坎蒂丝",
       "Candace",
       "坎迪斯"
-    ],
-    "burstCD": 15,
-    "id": "10000072",
-    "name": "坎蒂丝",
-    "nameEn": "Candace",
-    "skillCD": 6,
-    "skillHoldCD": 9,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "纳西妲",
     "alias": [
       "纳西妲",
       "Nahida",
@@ -1166,31 +862,20 @@
       "智慧主",
       "智慧之神",
       "布耶尔"
-    ],
-    "burstCD": 13.5,
-    "id": "10000073",
-    "name": "纳西妲",
-    "nameEn": "Nahida",
-    "skillCD": 5,
-    "skillHoldCD": 6,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "莱依拉",
     "alias": [
       "莱依拉",
       "Layla",
       "莱依菈",
       "来依菈",
       "来依拉"
-    ],
-    "burstCD": 12,
-    "id": "10000074",
-    "name": "莱依拉",
-    "nameEn": "Layla",
-    "skillCD": 12,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "流浪者",
     "alias": [
       "流浪者",
       "Wanderer",
@@ -1202,15 +887,10 @@
       "雷大炮",
       "伞兵",
       "斯卡拉姆齐"
-    ],
-    "burstCD": 15,
-    "id": "10000075",
-    "name": "流浪者",
-    "nameEn": "Wanderer",
-    "skillCD": 6,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "珐露珊",
     "alias": [
       "珐露珊",
       "Faruzan",
@@ -1224,30 +904,20 @@
       "百岁山",
       "前辈",
       "仙贝"
-    ],
-    "burstCD": 20,
-    "id": "10000076",
-    "name": "珐露珊",
-    "nameEn": "Faruzan",
-    "skillCD": 6,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "瑶瑶",
     "alias": [
       "瑶瑶",
       "Yaoyao",
       "遥遥",
       "萝卜",
       "月桂"
-    ],
-    "burstCD": 20,
-    "id": "10000077",
-    "name": "瑶瑶",
-    "nameEn": "Yaoyao",
-    "skillCD": 15,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "艾尔海森",
     "alias": [
       "艾尔海森",
       "Alhaitham",
@@ -1256,15 +926,10 @@
       "海森",
       "海参",
       "书记官"
-    ],
-    "burstCD": 18,
-    "id": "10000078",
-    "name": "艾尔海森",
-    "nameEn": "Alhatham",
-    "skillCD": 18,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "迪希雅",
     "alias": [
       "迪希雅",
       "Dehya",
@@ -1272,57 +937,37 @@
       "迪希娅",
       "迪西雅",
       "迪西亚"
-    ],
-    "burstCD": 18,
-    "id": "10000079",
-    "name": "迪希雅",
-    "nameEn": "Dehya",
-    "skillCD": 20,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "米卡",
     "alias": [
       "米卡",
       "Mika",
       "鹦鹉",
       "凤头",
       "凤头鹦鹉"
-    ],
-    "burstCD": 18,
-    "id": "10000080",
-    "name": "米卡",
-    "nameEn": "Mika",
-    "skillCD": 15,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "卡维",
     "alias": [
       "卡维",
       "Kaveh",
       "艾尔海森室友"
-    ],
-    "burstCD": 20,
-    "id": "10000081",
-    "name": "卡维",
-    "nameEn": "Kaveh",
-    "skillCD": 6,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "白术",
     "alias": [
       "白术",
       "Baizhu",
       "长生",
       "白医生"
-    ],
-    "burstCD": 20,
-    "id": "10000082",
-    "name": "白术",
-    "nameEn": "Baizhuer",
-    "skillCD": 10,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "琳妮特",
     "alias": [
       "琳妮特",
       "Lynette",
@@ -1333,15 +978,10 @@
       "魔术猫",
       "魔术喵",
       "登登"
-    ],
-    "burstCD": 18,
-    "id": "10000083",
-    "name": "琳妮特",
-    "nameEn": "Linette",
-    "skillCD": 12,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "林尼",
     "alias": [
       "林尼",
       "Lyney",
@@ -1350,29 +990,19 @@
       "琳妮",
       "男魔术师",
       "魔术师"
-    ],
-    "burstCD": 15,
-    "id": "10000084",
-    "name": "林尼",
-    "nameEn": "Liney",
-    "skillCD": 15,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "菲米尼",
     "alias": [
       "菲米尼",
       "Freminet",
       "非米尼",
       "潜水员"
-    ],
-    "burstCD": 15,
-    "id": "10000085",
-    "name": "菲米尼",
-    "nameEn": "Freminet",
-    "skillCD": 10,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "莱欧斯利",
     "alias": [
       "莱欧斯利",
       "Wriothesley",
@@ -1381,15 +1011,10 @@
       "公爵",
       "典狱长",
       "牢大"
-    ],
-    "burstCD": 15,
-    "id": "10000086",
-    "name": "莱欧斯利",
-    "nameEn": "Wriothesley",
-    "skillCD": 16,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "那维莱特",
     "alias": [
       "那维莱特",
       "Neuvillette",
@@ -1401,15 +1026,10 @@
       "龙王",
       "最高审判官",
       "水之龙王"
-    ],
-    "burstCD": 18,
-    "id": "10000087",
-    "name": "那维莱特",
-    "nameEn": "Neuvillette",
-    "skillCD": 12,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "夏洛蒂",
     "alias": [
       "夏洛蒂",
       "Charlotte",
@@ -1419,16 +1039,10 @@
       "小记者",
       "佳能400D",
       "400D"
-    ],
-    "burstCD": 20,
-    "id": "10000088",
-    "name": "夏洛蒂",
-    "nameEn": "Charlotte",
-    "skillCD": 12,
-    "skillHoldCD": 18,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "芙宁娜",
     "alias": [
       "芙宁娜",
       "Furina",
@@ -1437,28 +1051,18 @@
       "芙芙",
       "芙卡洛斯",
       "傻芙芙"
-    ],
-    "burstCD": 15,
-    "id": "10000089",
-    "name": "芙宁娜",
-    "nameEn": "Furina",
-    "skillCD": 20,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "夏沃蕾",
     "alias": [
       "夏沃蕾",
       "chevreuse",
       "夏沃雷"
-    ],
-    "burstCD": 15,
-    "id": "10000090",
-    "name": "夏沃蕾",
-    "nameEn": "Chevreuse",
-    "skillCD": 15,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "娜维娅",
     "alias": [
       "娜维娅",
       "navia",
@@ -1470,15 +1074,10 @@
       "娜薇娅",
       "娜薇雅",
       "娜维雅"
-    ],
-    "burstCD": 15,
-    "id": "10000091",
-    "name": "娜维娅",
-    "nameEn": "Navia",
-    "skillCD": 9,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "嘉明",
     "alias": [
       "嘉明",
       "Gaming",
@@ -1489,15 +1088,10 @@
       "镖师",
       "舞狮少年",
       "舞狮"
-    ],
-    "burstCD": 15,
-    "id": "10000092",
-    "name": "嘉明",
-    "nameEn": "Gaming",
-    "skillCD": 6,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "闲云",
     "alias": [
       "闲云",
       "Xianyun",
@@ -1510,15 +1104,10 @@
       "留云借风真君",
       "很会聊天",
       "很会聊天真君"
-    ],
-    "burstCD": 18,
-    "id": "10000093",
-    "name": "闲云",
-    "nameEn": "Liuyun",
-    "skillCD": 12,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "千织",
     "alias": [
       "千织",
       "Chiori",
@@ -1526,30 +1115,20 @@
       "设计师",
       "裁缝",
       "千织屋老板"
-    ],
-    "burstCD": 13.5,
-    "id": "10000094",
-    "name": "千织",
-    "nameEn": "Chiori",
-    "skillCD": 16,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "希格雯",
     "alias": [
       "希格雯",
       "Sigewinne",
       "希格文",
       "护士",
       "护士长"
-    ],
-    "burstCD": 18,
-    "id": "10000095",
-    "name": "希格雯",
-    "nameEn": "Sigewinne",
-    "skillCD": 18,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "阿蕾奇诺",
     "alias": [
       "阿蕾奇诺",
       "Arlecchino",
@@ -1559,30 +1138,20 @@
       "黑暗优菈",
       "父亲",
       "佩露薇利"
-    ],
-    "burstCD": 15,
-    "id": "10000096",
-    "name": "阿蕾奇诺",
-    "nameEn": "Arlecchino",
-    "skillCD": 30,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "赛索斯",
     "alias": [
       "赛索斯",
       "Sethos",
       "塞索斯",
       "塞索思",
       "赛索思"
-    ],
-    "burstCD": 15,
-    "id": "10000097",
-    "name": "赛索斯",
-    "nameEn": "Sethos",
-    "skillCD": 8,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "克洛琳德",
     "alias": [
       "克洛琳德",
       "Clorinde",
@@ -1591,15 +1160,10 @@
       "克洛林德",
       "克罗林德",
       "苹果姐"
-    ],
-    "burstCD": 15,
-    "id": "10000098",
-    "name": "克洛琳德",
-    "nameEn": "Clorinde",
-    "skillCD": 16,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "艾梅莉埃",
     "alias": [
       "艾梅莉埃",
       "Emilie",
@@ -1607,16 +1171,10 @@
       "艾梅",
       "香水设计师",
       "现场清理人"
-    ],
-    "burstCD": 13.5,
-    "id": "10000099",
-    "name": "艾梅莉埃",
-    "nameEn": "Emilie",
-    "skillCD": 10,
-    "skillHoldCD": 14,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "卡齐娜",
     "alias": [
       "卡齐娜",
       "Kachina",
@@ -1626,30 +1184,20 @@
       "卡其那",
       "冲天钻钻",
       "岩莉莉"
-    ],
-    "burstCD": 18,
-    "id": "10000100",
-    "name": "卡齐娜",
-    "nameEn": "Kachina",
-    "skillCD": 20,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "基尼奇",
     "alias": [
       "基尼奇",
       "Kinich",
       "基哥",
       "基尼齐",
       "蜘蛛侠"
-    ],
-    "burstCD": 18,
-    "id": "10000101",
-    "name": "基尼奇",
-    "nameEn": "Kinich",
-    "skillCD": 18,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "玛拉妮",
     "alias": [
       "玛拉妮",
       "Mualani",
@@ -1659,16 +1207,10 @@
       "海豹",
       "纳塔鲨",
       "逐浪客"
-    ],
-    "burstCD": 15,
-    "id": "10000102",
-    "name": "玛拉妮",
-    "nameEn": "Mualani",
-    "skillCD": 1.8,
-    "skillHoldCD": 6,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "希诺宁",
     "alias": [
       "希诺宁",
       "Xilonen",
@@ -1678,30 +1220,20 @@
       "岩猫",
       "岩猫猫",
       "西诺宁"
-    ],
-    "burstCD": 15,
-    "id": "10000103",
-    "name": "希诺宁",
-    "nameEn": "Xilonen",
-    "skillCD": 7,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "恰斯卡",
     "alias": [
       "恰斯卡",
       "Chasca",
       "武卡",
       "调停人",
       "鸟人"
-    ],
-    "burstCD": 15,
-    "id": "10000104",
-    "name": "恰斯卡",
-    "nameEn": "Chasca",
-    "skillCD": 6.5,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "欧洛伦",
     "alias": [
       "欧洛伦",
       "Ororon",
@@ -1709,15 +1241,10 @@
       "孙子",
       "大孙子",
       "蝙蝠侠"
-    ],
-    "burstCD": 15,
-    "id": "10000105",
-    "name": "欧洛伦",
-    "nameEn": "Olorun",
-    "skillCD": 15,
-    "weapon": "12"
+    ]
   },
   {
+    "name": "玛薇卡",
     "alias": [
       "玛薇卡",
       "Mavuika",
@@ -1727,15 +1254,10 @@
       "马维卡",
       "马微卡",
       "玛微卡"
-    ],
-    "burstCD": 18,
-    "id": "10000106",
-    "name": "玛薇卡",
-    "nameEn": "Mavuika",
-    "skillCD": 15,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "茜特菈莉",
     "alias": [
       "茜特菈莉",
       "Citlali",
@@ -1747,15 +1269,10 @@
       "黑曜石",
       "奶奶",
       "老伴"
-    ],
-    "burstCD": 15,
-    "id": "10000107",
-    "name": "茜特菈莉",
-    "nameEn": "Citlali",
-    "skillCD": 16,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "蓝砚",
     "alias": [
       "蓝砚",
       "Lanyan",
@@ -1767,15 +1284,10 @@
       "蓝研",
       "蓝颜",
       "兰颜"
-    ],
-    "burstCD": 15,
-    "id": "10000108",
-    "name": "蓝砚",
-    "nameEn": "Lanyan",
-    "skillCD": 16,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "梦见月瑞希",
     "alias": [
       "梦见月瑞希",
       "Yumemizuki Mizuki",
@@ -1791,15 +1303,10 @@
       "魅魔",
       "心理医生",
       "心理诊疗师"
-    ],
-    "burstCD": 15,
-    "id": "10000109",
-    "name": "梦见月瑞希",
-    "nameEn": "Mizuki",
-    "skillCD": 15,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "伊安珊",
     "alias": [
       "伊安珊",
       "Iansan",
@@ -1807,15 +1314,10 @@
       "伊安姗",
       "教练",
       "依安珊"
-    ],
-    "burstCD": 18,
-    "id": "10000110",
-    "name": "伊安珊",
-    "nameEn": "Iansan",
-    "skillCD": 16,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "瓦雷莎",
     "alias": [
       "瓦雷莎",
       "Varesa",
@@ -1830,15 +1332,10 @@
       "雷牛牛",
       "奶牛",
       "粉牛"
-    ],
-    "burstCD": 18,
-    "id": "10000111",
-    "name": "瓦雷莎",
-    "nameEn": "Varesa",
-    "skillCD": 9,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "爱可菲",
     "alias": [
       "爱可菲",
       "Escoffier",
@@ -1846,44 +1343,28 @@
       "爱可非",
       "艾可菲",
       "艾可非"
-    ],
-    "burstCD": 15,
-    "id": "10000112",
-    "name": "爱可菲",
-    "nameEn": "Escoffier",
-    "skillCD": 15,
-    "skillHoldCD": 6,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "伊法",
     "alias": [
       "伊法",
       "Ifa",
       "哥们",
       "医生"
-    ],
-    "burstCD": 15,
-    "id": "10000113",
-    "name": "伊法",
-    "nameEn": "Ifa",
-    "skillCD": 7.5,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "丝柯克",
     "alias": [
       "丝柯克",
       "Skirk",
       "丝柯可",
       "斯柯克"
-    ],
-    "burstCD": 15,
-    "id": "10000114",
-    "name": "丝柯克",
-    "nameEn": "SkirkNew",
-    "skillCD": 8,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "塔利雅",
     "alias": [
       "塔利雅",
       "Dahlia",
@@ -1891,78 +1372,62 @@
       "塔丽雅",
       "主祭",
       "助祭"
-    ],
-    "burstCD": 15,
-    "id": "10000115",
-    "name": "塔利雅",
-    "nameEn": "Dahlia",
-    "skillCD": 9,
-    "weapon": "1"
+    ]
   },
   {
+    "name": "伊涅芙",
     "alias": [
       "伊涅芙",
       "Ineffa",
       "机器人",
       "机娘"
-    ],
-    "burstCD": 15,
-    "id": "10000116",
-    "name": "伊涅芙",
-    "nameEn": "Ineffa",
-    "skillCD": 16,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "菈乌玛",
     "alias": [
       "菈乌玛",
       "Lauma",
       "鹿女"
-    ],
-    "burstCD": 15,
-    "id": "10000119",
-    "name": "菈乌玛",
-    "nameEn": "Lauma",
-    "skillCD": 12,
-    "weapon": "10"
+    ]
   },
   {
+    "name": "菲林斯",
     "alias": [
       "菲林斯",
       "Flins",
       "执灯人"
-    ],
-    "burstCD": 20,
-    "id": "10000120",
-    "name": "菲林斯",
-    "nameEn": "Flins",
-    "skillCD": 6,
-    "skillHoldCD": 16,
-    "weapon": "13"
+    ]
   },
   {
+    "name": "爱诺",
     "alias": [
       "爱诺",
       "Aino"
-    ],
-    "burstCD": 13.5,
-    "id": "10000121",
-    "name": "爱诺",
-    "nameEn": "Aino",
-    "skillCD": 10,
-    "weapon": "11"
+    ]
   },
   {
+    "name": "奈芙尔",
     "alias": [
       "奈芙尔",
       "Nefer",
       "蛇女"
-    ],
-    "burstCD": 15,
-    "id": "10000122",
-    "name": "奈芙尔",
-    "nameEn": "Nefer",
-    "skillCD": 9,
-    "weapon": "10"
+    ]
+  },
+  {
+    "name": "雅珂达",
+    "alias": [
+      "雅珂达",
+      "Agata"
+    ]
+  },
+  {
+    "name": "杜林",
+    "alias": [
+      "杜林",
+      "Durin",
+      "小杜林",
+      "魔龙"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/repo/js/AutoSwitchRoles/manifest.json b/repo/js/AutoSwitchRoles/manifest.json
index 4490b2480..541801f88 100644
--- a/repo/js/AutoSwitchRoles/manifest.json
+++ b/repo/js/AutoSwitchRoles/manifest.json
@@ -1,8 +1,8 @@
 {
   "manifest_version": 1,
   "name": "配对界面切换角色",
-  "version": "6.1.0",
-  "bgi_version": "0.53.0",
+  "version": "6.2.0",
+  "bgi_version": "0.54.0",
   "description": "在配对界面切换指定位置的指定角色",
   "authors": [
     {