diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-七七01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/七七01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-七七01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/七七01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/全-单手剑-主角01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/主角01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/全-单手剑-主角01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/主角01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/主角02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/主角02.png new file mode 100644 index 00000000..93de87c5 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/主角02.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-丽莎01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/丽莎01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-丽莎01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/丽莎01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-丽莎02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/丽莎02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-丽莎02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/丽莎02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-单手剑-久岐忍01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/久岐忍01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-单手剑-久岐忍01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/久岐忍01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-九条裟罗01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/九条裟罗01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-九条裟罗01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/九条裟罗01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-长枪-云堇01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/云堇01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/岩-长枪-云堇01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/云堇01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-弓箭-五郎01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/五郎01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/岩-弓箭-五郎01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/五郎01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-长枪-伊安珊01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/伊安珊01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-长枪-伊安珊01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/伊安珊01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-伊法01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/伊法01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-伊法01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/伊法01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/优菈01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/优菈01.png new file mode 100644 index 00000000..7ad4e85d 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 00000000..ba9751db 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-八重神子01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/八重神子01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-神里绫华01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-神里绫华01.png deleted file mode 100644 index ced3af37..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-神里绫华01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-大剑-优菈01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/冰-大剑-优菈01.png deleted file mode 100644 index b82777cb..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-大剑-优菈01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-埃洛伊01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-埃洛伊01.png deleted file mode 100644 index 4b2b531e..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-埃洛伊01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-甘雨01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-甘雨01.png deleted file mode 100644 index ecd18e1a..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-甘雨01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-茜特菈莉01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-茜特菈莉01.png deleted file mode 100644 index c5839261..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-茜特菈莉01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-莱欧斯利01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-莱欧斯利01.png deleted file mode 100644 index 9adead5e..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-莱欧斯利01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-申鹤01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-申鹤01.png deleted file mode 100644 index 0fbb40e7..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-申鹤01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-法器-凝光01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/凝光01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/岩-法器-凝光01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/凝光01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/凝光02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/凝光02.png new file mode 100644 index 00000000..4ca6bba8 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/凝光02.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-凯亚01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/凯亚01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-凯亚01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/凯亚01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-凯亚02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/凯亚02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-凯亚02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/凯亚02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-单手剑-刻晴01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/刻晴01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-单手剑-刻晴01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/刻晴01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-单手剑-刻晴02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/刻晴02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-单手剑-刻晴02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/刻晴02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-大剑-北斗01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/北斗01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-大剑-北斗01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/北斗01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/千织01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/千织01.png new file mode 100644 index 00000000..f7c050a5 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/草-大剑-卡维01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/卡维01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-长枪-卡齐娜01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/卡齐娜01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/岩-长枪-卡齐娜01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/卡齐娜01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/可莉.png b/repo/js/AutoSwitchRoles/Assets/characterimage/可莉.png new file mode 100644 index 00000000..734beb69 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/可莉.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-法器-可莉02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/可莉02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-法器-可莉02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/可莉02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-嘉明01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/嘉明01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-嘉明01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/嘉明01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-长枪-坎蒂丝01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/坎蒂丝01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-长枪-坎蒂丝01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/坎蒂丝01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/埃洛伊01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/埃洛伊01.png new file mode 100644 index 00000000..8b61e701 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 00000000..20a0c74a 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-夏沃蕾01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/夏沃蕾01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-夏洛蒂01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/夏洛蒂01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-法器-夏洛蒂01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/夏洛蒂01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-大剑-多莉01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/多莉01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-大剑-多莉01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/多莉01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-弓箭-夜兰01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/夜兰01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-弓箭-夜兰01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/夜兰01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-妮露01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/妮露01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-妮露01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/妮露01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-妮露02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/妮露02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-妮露02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/妮露02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/娜维娅01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/娜维娅01.png new file mode 100644 index 00000000..b42853af 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-安柏01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/安柏01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-安柏02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/安柏02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-安柏02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/安柏02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/宵宫01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/宵宫01.png new file mode 100644 index 00000000..c3ddeb1c 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 deleted file mode 100644 index 8494b2bc..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-单手剑-千织01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-单手剑-希诺宁01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/岩-单手剑-希诺宁01.png deleted file mode 100644 index 4fb018f7..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-单手剑-希诺宁01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-单手剑-阿贝多01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/岩-单手剑-阿贝多01.png deleted file mode 100644 index 4e811155..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-单手剑-阿贝多01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-娜维娅01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-娜维娅01.png deleted file mode 100644 index e0f18379..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-娜维娅01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-荒泷一斗01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-荒泷一斗01.png deleted file mode 100644 index de3db720..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-荒泷一斗01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/希格雯01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/希格雯01.png new file mode 100644 index 00000000..33138182 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 00000000..73b1e6a8 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 00000000..0e896c94 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-托马01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/托马01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-弓箭-提纳里01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/提纳里01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/草-弓箭-提纳里01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/提纳里01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-大剑-早柚01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/早柚01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-大剑-早柚01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/早柚01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/林尼01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/林尼01.png new file mode 100644 index 00000000..c9662d16 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-枫原万叶01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/枫原万叶01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-弓箭-柯莱01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/柯莱01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/草-弓箭-柯莱01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/柯莱01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-欧洛伦01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/欧洛伦01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-欧洛伦01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/欧洛伦01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-神里绫人01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-神里绫人01.png deleted file mode 100644 index 9115ef94..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-神里绫人01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-芙宁娜01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-芙宁娜01.png deleted file mode 100644 index 120f90ba..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-芙宁娜01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-弓箭-达达利亚01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/水-弓箭-达达利亚01.png deleted file mode 100644 index 506cb25b..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/水-弓箭-达达利亚01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-希格雯01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-希格雯01.png deleted file mode 100644 index 0851c009..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-希格雯01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-玛拉妮01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-玛拉妮01.png deleted file mode 100644 index f36e9fed..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-玛拉妮01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-珊瑚宫心海01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-珊瑚宫心海01.png deleted file mode 100644 index fc04a766..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-珊瑚宫心海01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-芭芭拉02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-芭芭拉02.png deleted file mode 100644 index 84d3fb85..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-芭芭拉02.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-流浪者01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/流浪者01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-流浪者01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/流浪者01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/温迪01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/温迪01.png new file mode 100644 index 00000000..9a765e1d 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 deleted file mode 100644 index cfcf18b8..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-玛薇卡01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-宵宫01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-宵宫01.png deleted file mode 100644 index 2982b0d1..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-宵宫01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-林尼01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-林尼01.png deleted file mode 100644 index db283098..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/火-弓箭-林尼01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-法器-可莉01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/火-法器-可莉01.png deleted file mode 100644 index 7761e190..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/火-法器-可莉01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-阿蕾奇诺01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-阿蕾奇诺01.png deleted file mode 100644 index 32b4c01f..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-阿蕾奇诺01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-法器-烟绯01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/烟绯01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-法器-烟绯01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/烟绯01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-爱可菲01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/爱可菲01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-爱可菲01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/爱可菲01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/玛拉妮01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/玛拉妮01.png new file mode 100644 index 00000000..4a42407b 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 00000000..caa03592 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-弓箭-珐露珊01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/珐露珊01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-单手剑-班尼特01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/班尼特01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-单手剑-班尼特01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/班尼特01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-琳妮特01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/琳妮特01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-琳妮特01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/琳妮特01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/琴01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/琴01.png new file mode 100644 index 00000000..f61322ed Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/琴01.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-琴02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/琴02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-琴02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/琴02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-长枪-瑶瑶01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/瑶瑶01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/草-长枪-瑶瑶01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/瑶瑶01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/瓦蕾莎01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/瓦蕾莎01.png new file mode 100644 index 00000000..4b059c01 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 00000000..39ab3e4b Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/甘雨01.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-甘雨02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/甘雨02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-甘雨02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/甘雨02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/申鹤01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/申鹤01.png new file mode 100644 index 00000000..ff4346f6 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/申鹤01.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-申鹤02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/申鹤02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-申鹤02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/申鹤02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/白术01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/白术01.png new file mode 100644 index 00000000..9a568bee 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-砂糖01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/砂糖01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/神里绫人01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/神里绫人01.png new file mode 100644 index 00000000..a6569fd7 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 00000000..edd6bfb2 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/神里绫华01.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-神里绫华02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/神里绫华02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-神里绫华02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/神里绫华02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-米卡01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/米卡01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-米卡01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/米卡01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-法器-纳西妲01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/纳西妲01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/草-法器-纳西妲01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/纳西妲01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-单手剑-绮良良01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/绮良良01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/草-单手剑-绮良良01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/绮良良01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-单手剑-绮良良02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/绮良良02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/草-单手剑-绮良良02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/绮良良02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-罗莎莉亚01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/罗莎莉亚01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-罗莎莉亚01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/罗莎莉亚01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-罗莎莉亚02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/罗莎莉亚02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-长枪-罗莎莉亚02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/罗莎莉亚02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-胡桃01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/胡桃01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-胡桃01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/胡桃01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-胡桃02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/胡桃02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-胡桃02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/胡桃02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/艾尔海森01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/艾尔海森01.png new file mode 100644 index 00000000..920b7ff8 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 00000000..8e87f8fc 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 00000000..9f2cd491 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-芭芭拉01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/芭芭拉01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/芭芭拉02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/芭芭拉02.png new file mode 100644 index 00000000..09a16063 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/芭芭拉02.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 00000000..68ab4302 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 deleted file mode 100644 index 98ada03a..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/草-单手剑-艾尔海森01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-大剑-基尼奇01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/草-大剑-基尼奇01.png deleted file mode 100644 index 11c3d350..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/草-大剑-基尼奇01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-法器-白术01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/草-法器-白术01.png deleted file mode 100644 index 73ea522b..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/草-法器-白术01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/草-长枪-艾梅莉埃01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/草-长枪-艾梅莉埃01.png deleted file mode 100644 index c3b705f1..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/草-长枪-艾梅莉埃01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/荒泷一斗01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/荒泷一斗01.png new file mode 100644 index 00000000..04b748bb 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-莫娜01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/莫娜01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-莱依拉01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/莱依拉01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-单手剑-莱依拉01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/莱依拉01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/莱欧斯利01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/莱欧斯利01.png new file mode 100644 index 00000000..e7a5c462 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-大剑-菲米尼01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/菲米尼01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-菲谢尔01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/菲谢尔01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-菲谢尔01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/菲谢尔01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/菲谢尔02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/菲谢尔02.png new file mode 100644 index 00000000..79181c60 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/菲谢尔02.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 00000000..12b52d7c 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-行秋01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/行秋01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-行秋02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/行秋02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-单手剑-行秋02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/行秋02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-诺艾尔01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/诺艾尔01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/岩-大剑-诺艾尔01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/诺艾尔01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/赛索斯01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/赛索斯01.png new file mode 100644 index 00000000..21ac48a6 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 00000000..c7fbe550 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-辛焱01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/辛焱01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/达达利亚.png b/repo/js/AutoSwitchRoles/Assets/characterimage/达达利亚.png new file mode 100644 index 00000000..27854cd9 Binary files /dev/null and b/repo/js/AutoSwitchRoles/Assets/characterimage/达达利亚.png differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-迪卢克01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/迪卢克01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-迪卢克01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/迪卢克01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-迪卢克02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/迪卢克02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-迪卢克02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/迪卢克02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-迪奥娜01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/迪奥娜01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-弓箭-迪奥娜01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/迪奥娜01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-迪希雅01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/迪希雅01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-大剑-迪希雅01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/迪希雅01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-那维莱特01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/那维莱特01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/水-法器-那维莱特01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/那维莱特01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/冰-大剑-重云01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/重云01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/冰-大剑-重云01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/重云01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/岩-长枪-钟离01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/钟离01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/岩-长枪-钟离01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/钟离01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/闲云01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/闲云01.png new file mode 100644 index 00000000..ca656546 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 00000000..d427e1bc 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 00000000..132b5f32 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 deleted file mode 100644 index d698ab9f..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-单手剑-克洛琳德01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-赛索斯01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-赛索斯01.png deleted file mode 100644 index eaae929f..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-弓箭-赛索斯01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-瓦蕾莎01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-瓦蕾莎01.png deleted file mode 100644 index d112135f..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-法器-瓦蕾莎01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-长枪-赛诺01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/雷-长枪-赛诺01.png deleted file mode 100644 index a6ced9ed..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-长枪-赛诺01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-大剑-雷泽01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/雷泽01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-大剑-雷泽01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/雷泽01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/雷-长枪-雷电将军01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/雷电将军01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/雷-长枪-雷电将军01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/雷电将军01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-琴-01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-琴-01.png deleted file mode 100644 index 50c4c4fe..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/风-单手剑-琴-01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-弓箭-恰斯卡01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/风-弓箭-恰斯卡01.png deleted file mode 100644 index 752f1b16..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/风-弓箭-恰斯卡01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-弓箭-温迪01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/风-弓箭-温迪01.png deleted file mode 100644 index d094788c..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/风-弓箭-温迪01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-梦见月瑞希01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-梦见月瑞希01.png deleted file mode 100644 index 57b23362..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-梦见月瑞希01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-蓝砚01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-蓝砚01.png deleted file mode 100644 index 4dd90116..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-蓝砚01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-闲云01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-闲云01.png deleted file mode 100644 index 2c29944a..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-闲云01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/风-长枪-魈01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/风-长枪-魈01.png deleted file mode 100644 index 30e11c4a..00000000 Binary files a/repo/js/AutoSwitchRoles/Assets/characterimage/风-长枪-魈01.png and /dev/null differ diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-香菱01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/香菱01.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-香菱01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/香菱01.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-香菱02.png b/repo/js/AutoSwitchRoles/Assets/characterimage/香菱02.png similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/火-长枪-香菱02.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/香菱02.png diff --git a/repo/js/AutoSwitchRoles/Assets/characterimage/魈01.png b/repo/js/AutoSwitchRoles/Assets/characterimage/魈01.png new file mode 100644 index 00000000..09bfaa97 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 similarity index 100% rename from repo/js/AutoSwitchRoles/Assets/characterimage/风-法器-鹿野院平藏01.png rename to repo/js/AutoSwitchRoles/Assets/characterimage/鹿野院平藏01.png diff --git a/repo/js/AutoSwitchRoles/aliases.txt b/repo/js/AutoSwitchRoles/aliases.txt new file mode 100644 index 00000000..99d98cd1 --- /dev/null +++ b/repo/js/AutoSwitchRoles/aliases.txt @@ -0,0 +1,98 @@ +#格式 真实姓名=[别名1,别名2,别名3,依次延续],别名用中文逗号分割 +阿贝多=[阿贝少,npc,NPC] +阿蕾奇诺=[仆人] +埃洛伊=[] +艾尔海森=[海森,海哥,草刻晴] +艾梅莉埃=[调香师] +爱可菲=[厨娘] +安柏=[] +八重神子=[神子,八重,八重樱] +芭芭拉=[风堇] +白术=[白大夫] +班尼特=[倒霉蛋,班爷,班] +北斗=[北斗船长] +达达利亚=[达达鸭,公子,至冬国最棒的玩具销售员] +迪奥娜=[diona,迪猫猫] +迪卢克=[姥爷,迪姥爷,卢姥爷] +迪希雅=[迪希亚] +多莉=[多利,桑歌玛哈巴依姥爷,桑歌玛哈巴依] +珐露珊=[初音未来] +菲米尼=[] +菲谢尔=[皇女,中二少女,艾咪,艾米,小艾咪,菲谢尔·冯·露弗施洛斯·那菲多特,奥兹] +枫原万叶=[万叶] +芙宁娜=[芙芙,水神,芙宁娜·德·枫丹,fufu,宝宝你是一块香香甜甜的蓝莓小蛋糕] +甘雨=[椰羊] +胡桃=[桃,往生堂堂主] +荒泷一斗=[一斗] +基尼奇=[] +嘉明=[佳明,嘉铭] +九条裟罗=[九条,裟罗,沙罗] +久岐忍=[97刃] +卡齐娜=[] +卡维=[夺少?] +凯亚=[] +坎蒂丝=[坎迪斯] +柯莱=[科莱,克莱] +可莉=[嘟嘟可,火花骑士,蹦蹦炸弹,小可莉] +克洛琳德=克,克姐,柯洁] +刻晴=[牛杂师傅,牛杂] +莱欧斯利=[典狱长] +莱依拉=[] +蓝砚=[蓝颜,蓝烟] +雷电将军=[雷电影,影,雷神] +雷泽=[] +丽莎=[丽莎大姐姐] +林尼=[大魔术师] +琳妮特=[噔噔] +流浪者=[散兵] +鹿野院平藏=[鹿野院,平藏,小鹿] +罗莎莉亚=[] +玛拉妮=[] +米卡=[] +莫娜=[占卜术士,阿斯托洛吉斯·莫娜·梅姬斯图斯] +那维莱特=[龙王,水龙王,那位来客] +纳西妲=[草神,草神,宝宝你是一块香香甜甜的抹茶小蛋糕] +娜维娅=[大小姐] +妮露=[克拉拉] +凝光=[天权星] +诺艾尔=[女仆] +欧洛伦=[孙子] +七七=[小保底,僵尸] +绮良良=[BGI,bgi,绮猫猫,猫猫,琪猫猫] +恰斯卡=[] +千织=[裁缝女,岩刻晴] +茜特菈莉=[黑曜石奶奶,奶奶] +琴=[琴团长,团长] +赛诺=[赛上大,冷笑话] +赛索斯=[塞索斯] +砂糖=[] +珊瑚宫心海=[珊瑚宫,心海] +申鹤=[夫君真行] +神里绫华=[绫华,龟龟,神里凌华,凌华,山里灵活] +神里绫人=[绫人,凌人,神里凌人] +提纳里=[小提] +托马=[] +瓦蕾莎=[牛牛] +温迪=[吟游诗人,风神,巴巴托斯,卖唱的] +五郎=[五朗] +希格雯=[护士长] +希诺宁=[] +夏洛蒂=[夏洛特] +夏沃蕾=[] +闲云=[留云,留云借风真君,那个女人] +香菱=[] +宵宫=[] +魈=[三眼五显仙人] +辛焱=[薪炎] +行秋=[二少爷] +烟绯=[张三,燕飞,律师] +瑶瑶=[瑶] +夜兰=[夜阑] +伊安珊=[123] +伊法=[哥们] +优菈=[优菈劳伦斯,优菈·劳伦斯] +云堇=[云先生] +早柚=[旱抽] +钟离=[岩神,摩拉克斯,岩王帝君,帝君] +重云=[] +主角=[爷,空,荧,莹] \ No newline at end of file diff --git a/repo/js/AutoSwitchRoles/main.js b/repo/js/AutoSwitchRoles/main.js index 4a9c59e9..5b83066d 100644 --- a/repo/js/AutoSwitchRoles/main.js +++ b/repo/js/AutoSwitchRoles/main.js @@ -15,147 +15,384 @@ async function scrollPage(totalDistance, stepDistance = 10, delayMs = 5) { await sleep(100); } +// 读取别名文件 +function readAliases() { + const aliasText = file.ReadTextSync('aliases.txt'); + const aliases = {}; + const lines = aliasText.split('\n'); + for (const line of lines) { + const [name, aliasListStr] = line.split('='); + if (name && aliasListStr) { + const aliasList = aliasListStr.replace('[', '').replace(']', '').split(',').map(alias => alias.trim()); + for (const alias of aliasList) { + aliases[alias] = name; + } + } + } + return aliases; +} + (async function () { // 设置分辨率 setGameMetrics(1920, 1080, 1); // 返回主界面 await genshin.returnMainUi(); - const positionCoordinates = [ - [460, 538], - [792, 538], - [1130, 538], - [1462, 538], - ]; + const option = settings.option; - const positionSettings = [settings.position1, settings.position2, settings.position3, settings.position4]; + if (option === '推荐-非快速配对模式 @Tool_tingsu') { + // main.js 的逻辑 + const positionCoordinates = [ + [460, 538], + [792, 538], + [1130, 538], + [1462, 538] + ]; - // 识别对象定义 - const roTeamConfig = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/队伍配置.png`), 0, 0, 1920, 1080); - const roReplace = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/更换.png`), 0, 0, 1920, 1080); - const roJoin = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/加入.png`), 0, 0, 1920, 1080); + // 读取别名 + const aliases = readAliases(); - let openPairingTries = 0; - let totalOpenPairingTries = 0; - - // 在进入角色切换逻辑前进行检测,如果所有角色设置均为空则直接退出 - if (positionSettings.every((item) => !item || item.trim() === "")) { - log.info("未设置任何角色,跳过切换队伍步骤"); - await genshin.returnMainUi(); - return; - } - - async function openPairingInterface() { - while (openPairingTries < 3) { - keyPress("l"); - await sleep(3500); - const teamConfigResult = captureGameRegion().find(roTeamConfig); - if (teamConfigResult.isExist()) { - openPairingTries = 0; - return true; + const positionSettings = [ + settings.position1, + settings.position2, + settings.position3, + settings.position4 + ].map(input => { + if (input && input.trim()!== "") { + const actualName = aliases[input] || input; + log.info(`设置对应号位为【${input}】,切换角色为【${actualName}】`); + return actualName; } - openPairingTries++; - totalOpenPairingTries++; + return null; + }); + + // 识别对象定义 + const roTeamConfig = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/队伍配置.png`), 0, 0, 1920, 1080); + const roReplace = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/更换.png`), 0, 0, 1920, 1080); + const roJoin = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/加入.png`), 0, 0, 1920, 1080); + + let openPairingTries = 0; + let totalOpenPairingTries = 0; + + // 在进入角色切换逻辑前进行检测,如果所有角色设置均为空则直接退出 + if (positionSettings.every((item) =>!item)) { + log.info("未设置任何角色,跳过切换队伍步骤"); + await genshin.returnMainUi(); + return; } - if (totalOpenPairingTries < 6) { - await genshin.tp("2297.630859375", "-824.5517578125"); - openPairingTries = 0; - return openPairingInterface(); - } else { - log.error("无法打开配对界面,任务结束"); - return false; + + async function openPairingInterface() { + while (openPairingTries < 3) { + keyPress("l"); + await sleep(3500); + const teamConfigResult = captureGameRegion().find(roTeamConfig); + if (teamConfigResult.isExist()) { + openPairingTries = 0; + return true; + } + openPairingTries++; + totalOpenPairingTries++; + } + if (totalOpenPairingTries < 6) { + await genshin.tp("2297.630859375", "-824.5517578125"); + openPairingTries = 0; + return openPairingInterface(); + } else { + log.error("无法打开配对界面,任务结束"); + return false; + } } - } - if (!(await openPairingInterface())) { - return; - } - - // 角色切换逻辑 - for (let i = 0; i < positionSettings.length; i++) { - let rolenum = i + 1; - const selectedCharacter = positionSettings[i]; - if (!selectedCharacter || selectedCharacter.trim() === "") { - log.info(`未设置${rolenum}号位角色,跳过`); - continue; + if (!(await openPairingInterface())) { + return; } - const [x, y] = positionCoordinates[i]; - click(x, y); - log.info(`开始设置${rolenum}号位角色`); - await sleep(1000); + // 角色切换逻辑 + for (let i = 0; i < positionSettings.length; i++) { + let rolenum = i + 1; + const selectedCharacter = positionSettings[i]; + if (!selectedCharacter) { + log.info(`未设置${rolenum}号位角色,跳过`); + continue; + } + const [x, y] = positionCoordinates[i]; + click(x, y); + log.info(`开始设置${rolenum}号位角色`); + await sleep(1000); + let characterFound = false; + let pageTries = 0; - let characterFound = false; - let pageTries = 0; + // 最多尝试滚动页面20次 + while (pageTries < 20) { + // 尝试识别所有可能的角色文件名 + for (let num = 1; ; num++) { + const paddedNum = num.toString().padStart(2, "0"); + const characterFileName = `${selectedCharacter}${paddedNum}`; + try { + const characterRo = RecognitionObject.TemplateMatch( + file.ReadImageMatSync(`Assets/characterimage/${characterFileName}.png`), + 0, + 0, + 1920, + 1080 + ); + const characterResult = captureGameRegion().find(characterRo); + if (characterResult.isExist()) { + log.info(`已找到角色${selectedCharacter}`); + // 计算向右偏移70像素、向下偏移70像素的位置 + const targetX = characterResult.x + 35; + const targetY = characterResult.y + 35; - // 最多尝试滚动页面20次 - while (pageTries < 20) { - // 尝试识别所有可能的角色文件名 - for (let num = 1; ; num++) { - const paddedNum = num.toString().padStart(2, "0"); - const characterFileName = `${selectedCharacter}${paddedNum}`; - try { - const characterRo = RecognitionObject.TemplateMatch( - file.ReadImageMatSync(`Assets/characterimage/${characterFileName}.png`), - 0, - 0, - 1920, - 1080 - ); - const characterResult = captureGameRegion().find(characterRo); - if (characterResult.isExist()) { - log.info(`已找到角色${selectedCharacter}`); - // 计算向右偏移70像素、向下偏移70像素的位置 - const targetX = characterResult.x + 35; - const targetY = characterResult.y + 35; + // 边界检查,确保坐标在屏幕范围内 + const safeX = Math.min(Math.max(targetX, 0), 1920); + const safeY = Math.min(Math.max(targetY, 0), 1080); - // 边界检查,确保坐标在屏幕范围内 - const safeX = Math.min(Math.max(targetX, 0), 1920); - const safeY = Math.min(Math.max(targetY, 0), 1080); - - click(safeX, safeY); - await sleep(500); // 点击角色后等待0.5秒 - characterFound = true; + click(safeX, safeY); + await sleep(500); // 点击角色后等待0.5秒 + characterFound = true; + break; + } + } catch (error) { + // 如果文件不存在,跳出循环 break; } - } catch (error) { - // 如果文件不存在,跳出循环 + } + + if (characterFound) { break; } + + // 如果不是最后一次尝试,尝试滚动页面 + if (pageTries < 15) { + log.info("当前页面没有目标角色,滚动页面"); + await scrollPage(200); // 滚动距离可根据实际情况调整 + } + pageTries++; } - if (characterFound) { + if (!characterFound) { + log.error(`未找到【${selectedCharacter}】`); + continue; + } + + // 识别"更换"或"加入"按钮 + const replaceResult = captureGameRegion().find(roReplace); + const joinResult = captureGameRegion().find(roJoin); + + if (replaceResult.isExist() || joinResult.isExist()) { + await sleep(300); + click(68, 1020); + keyPress("VK_LBUTTON"); + await sleep(500); + } else { + log.error(`该角色已在队伍中,无需切换`); + await sleep(300); + keyPress("VK_ESCAPE"); + await sleep(500); + } + await sleep(500); + } + } else if (option === '存在bug-快速配对模式 @兩夢三醒') { + // 切换队伍 + if (!!settings.partyName) { + try { + log.info("正在尝试切换至" + settings.partyName); + if (!await genshin.switchParty(settings.partyName)) { + log.info("切换队伍失败,前往七天神像重试"); + await genshin.tpToStatueOfTheSeven(); + await genshin.switchParty(settings.partyName); + } + } catch { + log.error("队伍切换失败,可能处于联机模式或其他不可切换状态"); + notification.error(`队伍切换失败,可能处于联机模式或其他不可切换状态`); + await genshin.returnMainUi(); + } + } else { + await genshin.returnMainUi(); + } + + // 角色位置坐标 + const positionCoordinates = [ + [107, 190], + [254, 188], + [414, 189], + [554, 198], + ]; + + // 读取别名 + const aliases = readAliases(); + + // 获取需要切换的角色,并进行别名替换 + const positionSettings = [settings.position1, settings.position2, settings.position3, settings.position4].map(input => { + if (input && input.trim()!== "") { + const actualName = aliases[input] || input; + log.info(`设置对应号位为【${input}】,切换角色为【${actualName}】`); + return actualName; + } + return null; + }); + + // 识别对象定义 + const roTeamConfig = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/队伍配置.png`), 0, 0, 1920, 1080); + // const roReplace = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/更换.png`), 0, 0, 1920, 1080); + // const roJoin = RecognitionObject.TemplateMatch(file.ReadImageMatSync(`Assets/RecognitionObject/加入.png`), 0, 0, 1920, 1080); + + let openPairingTries = 0; + let totalOpenPairingTries = 0; + + // 在进入角色切换逻辑前进行检测,如果所有角色设置均为空则直接退出 + if (positionSettings.every((item) =>!item)) { + log.info("未设置任何角色,跳过切换队伍步骤"); + await genshin.returnMainUi(); + return; + } + + // 打开配对界面 + async function openPairingInterface() { + while (openPairingTries < 3) { + keyPress("l"); + await sleep(3500); + const teamConfigResult = captureGameRegion().find(roTeamConfig); + if (teamConfigResult.isExist()) { + openPairingTries = 0; + return true; + } + openPairingTries++; + totalOpenPairingTries++; + } + if (totalOpenPairingTries < 6) { + await genshin.tp("2297.630859375", "-824.5517578125"); + openPairingTries = 0; + return openPairingInterface(); + } else { + log.error("无法打开配对界面,任务结束"); + return false; + } + } + + if (!(await openPairingInterface())) { + return; + } + + // 需要取消选择的数量 + const ocrRegions = [ + [340, 181, 315, 330], + [655, 181, 315, 330], + [970, 181, 315, 330], + [1285, 181, 315, 330], + ]; + let regionsWithTextCount = 0; + let captureRegion = captureGameRegion(); + for (const [x, y, w, h] of ocrRegions) { + const regionOcrResult = captureRegion.findMulti(RecognitionObject.ocr(x, y, w, h)); + if (regionOcrResult.count > 0) { + regionsWithTextCount++; + } + } + log.info(`有文字的区域数量为: ${regionsWithTextCount}`); + + // 角色切换逻辑 + click(1212, 1020); // 点击快速编队 + await sleep(1000); + log.info(`点击快速编队`); + for (let i = 0; i < regionsWithTextCount; i++) { + if (i >= positionCoordinates.length) { break; } + const [x, y] = positionCoordinates[i]; + click(x, y); + await sleep(1000); + log.info(`取消选择${x},${y}位置的角色`); + } - // 如果不是最后一次尝试,尝试滚动页面 - if (pageTries < 15) { - log.info("当前页面没有目标角色,滚动页面"); - await scrollPage(200); // 滚动距离可根据实际情况调整 + for (let i = 0; i < positionSettings.length; i++) { + let rolenum = i + 1; + const selectedCharacter = positionSettings[i]; + const [x, y] = positionCoordinates[i]; + click(800, 123); + await sleep(1000); + if (!selectedCharacter) { + log.info(`未设置${rolenum}号位角色,保持原来的选择,可能存在未知bug`); + click(x, y); + await sleep(1000); + continue; + } + log.info(`开始设置${rolenum}号位角色`); + log.info(`目标角色为:【${selectedCharacter}】`); + + let characterFound = false; + let pageTries = 0; + + // 最多尝试滚动页面20×2次 + while (pageTries < 40) { + // 尝试识别所有可能的角色文件名 + for (let num = 1; ; num++) { + const paddedNum = num.toString().padStart(2, "0"); + const characterFileName = `${selectedCharacter}${paddedNum}`; + try { + const characterRo = RecognitionObject.TemplateMatch( + file.ReadImageMatSync(`Assets/characterimage/${characterFileName}.png`), + 0, + 0, + 1920, + 1080 + ); + const characterResult = captureGameRegion().find(characterRo); + if (characterResult.isExist()) { + log.info(`已找到角色【${selectedCharacter}】`); + // 计算向右偏移70像素、向下偏移70像素的位置 + const targetX = characterResult.x + 35; + const targetY = characterResult.y + 35; + + // 边界检查,确保坐标在屏幕范围内 + const safeX = Math.min(Math.max(targetX, 0), 1920); + const safeY = Math.min(Math.max(targetY, 0), 1080); + + click(safeX, safeY); + await sleep(500); // 点击角色后等待0.5秒 + characterFound = true; + break; + } + } catch (error) { + // 如果文件不存在,跳出循环 + break; + } + } + + if (characterFound) { + break; + } + + // 如果不是最后一次尝试,尝试滚动页面 + if (pageTries < 30) { + log.info(`当前页面没有目标角色【${selectedCharacter}】,滚动页面`); + await scrollPage(200); // 滚动距离可根据实际情况调整 + } + if (pageTries == 15) { + log.info("滚动完毕,重置位置,再试一次"); + click(800, 123); + await sleep(1000); + } + pageTries++; + } + + if (!characterFound) { + log.error(`未找到【${selectedCharacter}】,尝试选择原来的角色`); + click(800, 123); + await sleep(1000); + click(x, y); + await sleep(1000); + continue; } - pageTries++; } - if (!characterFound) { - log.error(`未找到【${selectedCharacter}】`); - continue; - } - - // 识别"更换"或"加入"按钮 - const replaceResult = captureGameRegion().find(roReplace); - const joinResult = captureGameRegion().find(roJoin); - - if (replaceResult.isExist() || joinResult.isExist()) { - await sleep(300); - click(68, 1020); - keyPress("VK_LBUTTON"); - await sleep(500); - } else { - log.error(`该角色已在队伍中,无需切换`); - } + // 点击保存 + click(427, 1024); + await sleep(1000); + keyPress("VK_LBUTTON"); await sleep(500); - } - - // 返回主界面 - await genshin.returnMainUi(); -})(); + } + // 返回主界面 + await genshin.returnMainUi(); + +})(); \ No newline at end of file diff --git a/repo/js/AutoSwitchRoles/manifest.json b/repo/js/AutoSwitchRoles/manifest.json index 5d680b07..492cb0db 100644 --- a/repo/js/AutoSwitchRoles/manifest.json +++ b/repo/js/AutoSwitchRoles/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "配对界面切换角色", - "version": "1.0", + "version": "2.0", "bgi_version": "0.45.1", "description": "在配对界面切换指定位置的指定角色", "authors": [ diff --git a/repo/js/AutoSwitchRoles/settings.json b/repo/js/AutoSwitchRoles/settings.json index 13086bd2..16dad597 100644 --- a/repo/js/AutoSwitchRoles/settings.json +++ b/repo/js/AutoSwitchRoles/settings.json @@ -1,430 +1,34 @@ [ { - "name": "position1", + "name": "option", "type": "select", - "label": "1号位(空选即不处理)", - "options": [ -"", -"冰-大剑-菲米尼", -"冰-大剑-优菈", -"冰-大剑-重云", -"冰-单手剑-凯亚", -"冰-单手剑-莱依拉", -"冰-单手剑-七七", -"冰-单手剑-神里绫华", -"冰-法器-莱欧斯利", -"冰-法器-茜特菈莉", -"冰-法器-夏洛蒂", -"冰-弓箭-埃洛伊", -"冰-弓箭-迪奥娜", -"冰-弓箭-甘雨", -"冰-长枪-爱可菲", -"冰-长枪-罗莎莉亚", -"冰-长枪-米卡", -"冰-长枪-申鹤", -"草-大剑-基尼奇", -"草-大剑-卡维", -"草-单手剑-艾尔海森", -"草-单手剑-绮良良", -"草-法器-白术", -"草-法器-纳西妲", -"草-弓箭-柯莱", -"草-弓箭-提纳里", -"草-长枪-艾梅莉埃", -"草-长枪-瑶瑶", -"风-大剑-早柚", -"风-单手剑-枫原万叶", -"风-单手剑-琳妮特", -"风-单手剑-琴", -"风-法器-蓝砚", -"风-法器-流浪者", -"风-法器-鹿野院平藏", -"风-法器-梦月见瑞希", -"风-法器-砂糖", -"风-法器-闲云", -"风-法器-伊法", -"风-弓箭-珐露珊", -"风-弓箭-怡斯卡", -"风-弓箭-温迪", -"风-长枪-魈", -"火-单手剑-班尼特", -"火-法器-可莉", -"火-法器-烟绯", -"火-弓箭-安柏", -"火-弓箭-林尼", -"火-弓箭-宵宫", -"火-长枪-胡桃", -"火-长枪-托马", -"火-长枪-夏沃蕾", -"火-长枪-香菱", -"火-长枪-阿蕾奇诺", -"火-大剑-迪卢克", -"火-大剑-迪希雅", -"火-大剑-嘉明", -"火-大剑-玛薇卡", -"火-大剑-辛焱", -"雷-弓箭-菲谢尔", -"雷-弓箭-九条裟罗", -"雷-弓箭-欧洛伦", -"雷-弓箭-赛索斯", -"雷-长枪-雷电将军", -"雷-长枪-赛诺", -"雷-长枪-伊安珊", -"雷-大剑-北斗", -"雷-大剑-多莉", -"雷-大剑-雷泽", -"雷-单手剑-久岐忍", -"雷-单手剑-克洛琳德", -"雷-单手剑-刻晴", -"雷-法器-八重神子", -"雷-法器-丽莎", -"雷-法器-瓦蕾莎", -"岩-大剑-娜维娅", -"岩-大剑-诺艾尔", -"岩-大剑-荒泷一斗", -"岩-单手剑-阿贝多", -"岩-单手剑-千织", -"岩-单手剑-希诺宁", -"岩-法器-凝光", -"岩-弓箭-五郎", -"岩-长枪-卡齐娜", -"岩-长枪-云堇", -"岩-长枪-钟离", -"全-单手剑-主角", -"水-单手剑-芙宁娜", -"水-单手剑-妮露", -"水-单手剑-神里绫人", -"水-单手剑-行秋", -"水-法器-芭芭拉", -"水-法器-玛拉妮", -"水-法器-莫娜", -"水-法器-那维莱特", -"水-法器-珊瑚宫心海", -"水-法器-希格雯", -"水-弓箭-达达利亚", -"水-弓箭-夜兰", -"水-长枪-坎蒂丝" -] + "label": "选择模式", + "options": ["推荐-非快速配对模式 @Tool_tingsu", + "存在bug-快速配对模式 @兩夢三醒"], + "default": "推荐-非快速配对模式 @Tool_tingsu" + }, + { + "name": "position1", + "type": "input-text", + "label": "1号位(空选即不处理,支持别名)", + "default": "" }, { "name": "position2", - "type": "select", - "label": "2号位(空选即不处理)", - "options": [ -"", -"冰-大剑-菲米尼", -"冰-大剑-优菈", -"冰-大剑-重云", -"冰-单手剑-凯亚", -"冰-单手剑-莱依拉", -"冰-单手剑-七七", -"冰-单手剑-神里绫华", -"冰-法器-莱欧斯利", -"冰-法器-茜特菈莉", -"冰-法器-夏洛蒂", -"冰-弓箭-埃洛伊", -"冰-弓箭-迪奥娜", -"冰-弓箭-甘雨", -"冰-长枪-爱可菲", -"冰-长枪-罗莎莉亚", -"冰-长枪-米卡", -"冰-长枪-申鹤", -"草-大剑-基尼奇", -"草-大剑-卡维", -"草-单手剑-艾尔海森", -"草-单手剑-绮良良", -"草-法器-白术", -"草-法器-纳西妲", -"草-弓箭-柯莱", -"草-弓箭-提纳里", -"草-长枪-艾梅莉埃", -"草-长枪-瑶瑶", -"风-大剑-早柚", -"风-单手剑-枫原万叶", -"风-单手剑-琳妮特", -"风-单手剑-琴", -"风-法器-蓝砚", -"风-法器-流浪者", -"风-法器-鹿野院平藏", -"风-法器-梦月见瑞希", -"风-法器-砂糖", -"风-法器-闲云", -"风-法器-伊法", -"风-弓箭-珐露珊", -"风-弓箭-怡斯卡", -"风-弓箭-温迪", -"风-长枪-魈", -"火-单手剑-班尼特", -"火-法器-可莉", -"火-法器-烟绯", -"火-弓箭-安柏", -"火-弓箭-林尼", -"火-弓箭-宵宫", -"火-长枪-胡桃", -"火-长枪-托马", -"火-长枪-夏沃蕾", -"火-长枪-香菱", -"火-长枪-阿蕾奇诺", -"火-大剑-迪卢克", -"火-大剑-迪希雅", -"火-大剑-嘉明", -"火-大剑-玛薇卡", -"火-大剑-辛焱", -"雷-弓箭-菲谢尔", -"雷-弓箭-九条裟罗", -"雷-弓箭-欧洛伦", -"雷-弓箭-赛索斯", -"雷-长枪-雷电将军", -"雷-长枪-赛诺", -"雷-长枪-伊安珊", -"雷-大剑-北斗", -"雷-大剑-多莉", -"雷-大剑-雷泽", -"雷-单手剑-久岐忍", -"雷-单手剑-克洛琳德", -"雷-单手剑-刻晴", -"雷-法器-八重神子", -"雷-法器-丽莎", -"雷-法器-瓦蕾莎", -"岩-大剑-娜维娅", -"岩-大剑-诺艾尔", -"岩-大剑-荒泷一斗", -"岩-单手剑-阿贝多", -"岩-单手剑-千织", -"岩-单手剑-希诺宁", -"岩-法器-凝光", -"岩-弓箭-五郎", -"岩-长枪-卡齐娜", -"岩-长枪-云堇", -"岩-长枪-钟离", -"全-单手剑-主角", -"水-单手剑-芙宁娜", -"水-单手剑-妮露", -"水-单手剑-神里绫人", -"水-单手剑-行秋", -"水-法器-芭芭拉", -"水-法器-玛拉妮", -"水-法器-莫娜", -"水-法器-那维莱特", -"水-法器-珊瑚宫心海", -"水-法器-希格雯", -"水-弓箭-达达利亚", -"水-弓箭-夜兰", -"水-长枪-坎蒂丝" - ] + "type": "input-text", + "label": "2号位(空选即不处理,支持别名)", + "default": "" }, { "name": "position3", - "type": "select", - "label": "3号位(空选即不处理)", - "options": [ -"", -"冰-大剑-菲米尼", -"冰-大剑-优菈", -"冰-大剑-重云", -"冰-单手剑-凯亚", -"冰-单手剑-莱依拉", -"冰-单手剑-七七", -"冰-单手剑-神里绫华", -"冰-法器-莱欧斯利", -"冰-法器-茜特菈莉", -"冰-法器-夏洛蒂", -"冰-弓箭-埃洛伊", -"冰-弓箭-迪奥娜", -"冰-弓箭-甘雨", -"冰-长枪-爱可菲", -"冰-长枪-罗莎莉亚", -"冰-长枪-米卡", -"冰-长枪-申鹤", -"草-大剑-基尼奇", -"草-大剑-卡维", -"草-单手剑-艾尔海森", -"草-单手剑-绮良良", -"草-法器-白术", -"草-法器-纳西妲", -"草-弓箭-柯莱", -"草-弓箭-提纳里", -"草-长枪-艾梅莉埃", -"草-长枪-瑶瑶", -"风-大剑-早柚", -"风-单手剑-枫原万叶", -"风-单手剑-琳妮特", -"风-单手剑-琴", -"风-法器-蓝砚", -"风-法器-流浪者", -"风-法器-鹿野院平藏", -"风-法器-梦月见瑞希", -"风-法器-砂糖", -"风-法器-闲云", -"风-法器-伊法", -"风-弓箭-珐露珊", -"风-弓箭-怡斯卡", -"风-弓箭-温迪", -"风-长枪-魈", -"火-单手剑-班尼特", -"火-法器-可莉", -"火-法器-烟绯", -"火-弓箭-安柏", -"火-弓箭-林尼", -"火-弓箭-宵宫", -"火-长枪-胡桃", -"火-长枪-托马", -"火-长枪-夏沃蕾", -"火-长枪-香菱", -"火-长枪-阿蕾奇诺", -"火-大剑-迪卢克", -"火-大剑-迪希雅", -"火-大剑-嘉明", -"火-大剑-玛薇卡", -"火-大剑-辛焱", -"雷-弓箭-菲谢尔", -"雷-弓箭-九条裟罗", -"雷-弓箭-欧洛伦", -"雷-弓箭-赛索斯", -"雷-长枪-雷电将军", -"雷-长枪-赛诺", -"雷-长枪-伊安珊", -"雷-大剑-北斗", -"雷-大剑-多莉", -"雷-大剑-雷泽", -"雷-单手剑-久岐忍", -"雷-单手剑-克洛琳德", -"雷-单手剑-刻晴", -"雷-法器-八重神子", -"雷-法器-丽莎", -"雷-法器-瓦蕾莎", -"岩-大剑-娜维娅", -"岩-大剑-诺艾尔", -"岩-大剑-荒泷一斗", -"岩-单手剑-阿贝多", -"岩-单手剑-千织", -"岩-单手剑-希诺宁", -"岩-法器-凝光", -"岩-弓箭-五郎", -"岩-长枪-卡齐娜", -"岩-长枪-云堇", -"岩-长枪-钟离", -"全-单手剑-主角", -"水-单手剑-芙宁娜", -"水-单手剑-妮露", -"水-单手剑-神里绫人", -"水-单手剑-行秋", -"水-法器-芭芭拉", -"水-法器-玛拉妮", -"水-法器-莫娜", -"水-法器-那维莱特", -"水-法器-珊瑚宫心海", -"水-法器-希格雯", -"水-弓箭-达达利亚", -"水-弓箭-夜兰", -"水-长枪-坎蒂丝" - ] + "type": "input-text", + "label": "3号位(空选即不处理,支持别名)", + "default": "" }, { "name": "position4", - "type": "select", - "label": "4号位(空选即不处理)", - "options": [ -"", -"冰-大剑-菲米尼", -"冰-大剑-优菈", -"冰-大剑-重云", -"冰-单手剑-凯亚", -"冰-单手剑-莱依拉", -"冰-单手剑-七七", -"冰-单手剑-神里绫华", -"冰-法器-莱欧斯利", -"冰-法器-茜特菈莉", -"冰-法器-夏洛蒂", -"冰-弓箭-埃洛伊", -"冰-弓箭-迪奥娜", -"冰-弓箭-甘雨", -"冰-长枪-爱可菲", -"冰-长枪-罗莎莉亚", -"冰-长枪-米卡", -"冰-长枪-申鹤", -"草-大剑-基尼奇", -"草-大剑-卡维", -"草-单手剑-艾尔海森", -"草-单手剑-绮良良", -"草-法器-白术", -"草-法器-纳西妲", -"草-弓箭-柯莱", -"草-弓箭-提纳里", -"草-长枪-艾梅莉埃", -"草-长枪-瑶瑶", -"风-大剑-早柚", -"风-单手剑-枫原万叶", -"风-单手剑-琳妮特", -"风-单手剑-琴", -"风-法器-蓝砚", -"风-法器-流浪者", -"风-法器-鹿野院平藏", -"风-法器-梦月见瑞希", -"风-法器-砂糖", -"风-法器-闲云", -"风-法器-伊法", -"风-弓箭-珐露珊", -"风-弓箭-怡斯卡", -"风-弓箭-温迪", -"风-长枪-魈", -"火-单手剑-班尼特", -"火-法器-可莉", -"火-法器-烟绯", -"火-弓箭-安柏", -"火-弓箭-林尼", -"火-弓箭-宵宫", -"火-长枪-胡桃", -"火-长枪-托马", -"火-长枪-夏沃蕾", -"火-长枪-香菱", -"火-长枪-阿蕾奇诺", -"火-大剑-迪卢克", -"火-大剑-迪希雅", -"火-大剑-嘉明", -"火-大剑-玛薇卡", -"火-大剑-辛焱", -"雷-弓箭-菲谢尔", -"雷-弓箭-九条裟罗", -"雷-弓箭-欧洛伦", -"雷-弓箭-赛索斯", -"雷-长枪-雷电将军", -"雷-长枪-赛诺", -"雷-长枪-伊安珊", -"雷-大剑-北斗", -"雷-大剑-多莉", -"雷-大剑-雷泽", -"雷-单手剑-久岐忍", -"雷-单手剑-克洛琳德", -"雷-单手剑-刻晴", -"雷-法器-八重神子", -"雷-法器-丽莎", -"雷-法器-瓦蕾莎", -"岩-大剑-娜维娅", -"岩-大剑-诺艾尔", -"岩-大剑-荒泷一斗", -"岩-单手剑-阿贝多", -"岩-单手剑-千织", -"岩-单手剑-希诺宁", -"岩-法器-凝光", -"岩-弓箭-五郎", -"岩-长枪-卡齐娜", -"岩-长枪-云堇", -"岩-长枪-钟离", -"全-单手剑-主角", -"水-单手剑-芙宁娜", -"水-单手剑-妮露", -"水-单手剑-神里绫人", -"水-单手剑-行秋", -"水-法器-芭芭拉", -"水-法器-玛拉妮", -"水-法器-莫娜", -"水-法器-那维莱特", -"水-法器-珊瑚宫心海", -"水-法器-希格雯", -"水-弓箭-达达利亚", -"水-弓箭-夜兰", -"水-长枪-坎蒂丝" - ] + "type": "input-text", + "label": "4号位(空选即不处理,支持别名)", + "default": "" } ] \ No newline at end of file