diff --git a/resource/roguelike_recruit.json b/resource/roguelike_recruit.json index 5e7143f69b..f1e6e8d490 100644 --- a/resource/roguelike_recruit.json +++ b/resource/roguelike_recruit.json @@ -16,11 +16,6 @@ "level": 6, "skill": 1 }, - { - "name": "Sharp", - "level": 5, - "skill": 1 - }, { "name": "山", "level": 6, @@ -42,11 +37,113 @@ "level": 5, "skill": 1 }, + { + "name": "陈", + "level": 6, + "skill": 2 + }, + { + "name": "拉普兰德", + "level": 5, + "skill": 2 + }, { "name": "阿米娅", "level": 5, "skill": 1 }, + { + "name": "史尔特尔", + "level": 6, + "skill": 2 + }, + { + "name": "银灰", + "level": 6, + "skill": 3, + "alternate_skill": 1 + }, + { + "name": "赫拉格", + "level": 6, + "skill": 1 + }, + { + "name": "耀骑士临光", + "level": 6, + "skill": 1 + }, + { + "name": "幽灵鲨", + "level": 5, + "skill": 2 + }, + { + "name": "杜宾", + "level": 4, + "skill": 1 + }, + { + "name": "斯卡蒂", + "level": 6, + "skill": 1 + }, + { + "name": "Sharp", + "level": 5, + "skill": 1 + }, + { + "name": "龙舌兰", + "level": 5, + "skill": 1 + }, + { + "name": "星极", + "level": 5, + "skill": 2 + }, + { + "name": "棘刺", + "level": 6, + "skill": 3, + "alternate_skill": 2 + }, + { + "name": "柏喙", + "level": 5, + "skill": 2 + }, + { + "name": "芳汀", + "level": 4, + "skill": 2 + }, + { + "name": "断罪者", + "level": 4, + "skill": 1 + }, + { + "name": "战车", + "level": 5, + "skill": 1 + }, + { + "name": "慕斯", + "level": 4, + "skill": 1 + }, + { + "name": "宴", + "level": 4, + "skill": 2 + }, + { + "name": "刻刀", + "level": 4, + "skill": 2 + }, { "name": "泡普卡", "level": 3, @@ -61,6 +158,91 @@ "name": "玫兰莎", "level": 3, "skill": 1 + }, + { + "name": "霜叶", + "level": 4, + "skill": 2 + }, + { + "name": "赤冬", + "level": 5, + "skill": 2 + }, + { + "name": "芙兰卡", + "level": 5, + "skill": 2 + }, + { + "name": "断崖", + "level": 5, + "skill": 2 + }, + { + "name": "Castle-3", + "level": 1, + "skill": 0 + }, + { + "name": "缠丸", + "level": 4, + "skill": 2 + }, + { + "name": "杰克", + "level": 4, + "skill": 1 + }, + { + "name": "鞭刃", + "level": 5, + "skill": 2 + }, + { + "name": "燧石", + "level": 5, + "skill": 2 + }, + { + "name": "铸铁", + "level": 5, + "skill": 2 + }, + { + "name": "布洛卡", + "level": 5, + "skill": 2 + }, + { + "name": "炎客", + "level": 5, + "skill": 2 + }, + { + "name": "诗怀雅", + "level": 5, + "skill": 2 + }, + { + "name": "猎蜂", + "level": 4, + "skill": 2 + }, + { + "name": "暴行", + "level": 5, + "skill": 2 + }, + { + "name": "因陀罗", + "level": 5, + "skill": 2 + }, + { + "name": "艾丝黛尔", + "level": 4, + "skill": 2 } ], "Pioneer": [ @@ -69,6 +251,22 @@ "level": 6, "skill": 2 }, + { + "name": "推进之王", + "level": 6, + "skill": 2 + }, + { + "name": "焰尾", + "level": 6, + "skill": 3, + "alternate_skill": 2 + }, + { + "name": "嵯峨", + "level": 6, + "skill": 2 + }, { "name": "德克萨斯", "level": 5, @@ -79,16 +277,81 @@ "level": 5, "skill": 1 }, + { + "name": "贾维", + "level": 5, + "skill": 2 + }, { "name": "芬", "level": 3, "skill": 1 }, + { + "name": "清道夫", + "level": 4, + "skill": 1 + }, + { + "name": "讯使", + "level": 4, + "skill": 1 + }, + { + "name": "夜半_N", + "level": 5, + "skill": 1 + }, + { + "name": "豆苗_N", + "level": 4, + "skill": 1 + }, + { + "name": "红豆", + "level": 4, + "skill": 2 + }, + { + "name": "苇草", + "level": 5, + "skill": 1 + }, + { + "name": "格拉尼", + "level": 5, + "skill": 1 + }, + { + "name": "琴柳", + "level": 6, + "skill": 3 + }, + { + "name": "极境", + "level": 5, + "skill": 1 + }, { "name": "桃金娘", "level": 4, "skill": 1 }, + { + "name": "香草", + "level": 3, + "skill": 1 + }, + { + "name": "夜刀", + "level": 2, + "skill": 0 + }, + { + "name": "野鬃", + "level": 5, + "skill": 1 + }, { "name": "翎羽", "level": 3, @@ -106,6 +369,16 @@ "level": 6, "skill": 2 }, + { + "name": "暮落", + "level": 5, + "skill": 2 + }, + { + "name": "星熊", + "level": 6, + "skill": 2 + }, { "name": "斑点", "level": 3, @@ -115,29 +388,140 @@ "name": "卡缇", "level": 3, "skill": 1 - } - ], - "Sniper": [ - { - "name": "假日威龙陈", - "level": 6, - "skill": 3, - "alternate_skill": 1 }, { - "name": "Stormeye", + "name": "黑角", + "level": 2, + "skill": 0 + }, + { + "name": "古米", + "level": 4, + "skill": 1 + }, + { + "name": "号角", + "level": 6, + "skill": 3, + "alternate_skill": 2 + }, + { + "name": "临光", "level": 5, "skill": 1 }, + { + "name": "雷蛇", + "level": 5, + "skill": 2 + }, + { + "name": "森蚺", + "level": 6, + "skill": 3 + }, + { + "name": "年", + "level": 6, + "skill": 3 + }, + { + "name": "蛇屠箱", + "level": 4, + "skill": 2 + }, + { + "name": "瑕光", + "level": 6, + "skill": 2 + }, + { + "name": "米格鲁", + "level": 3, + "skill": 1 + }, + { + "name": "角峰", + "level": 4, + "skill": 2 + }, + { + "name": "火神", + "level": 5, + "skill": 2 + }, + { + "name": "可颂", + "level": 5, + "skill": 2 + }, + { + "name": "坚雷", + "level": 4, + "skill": 2 + }, + { + "name": "拜松", + "level": 5, + "skill": 2 + }, + { + "name": "极光", + "level": 5, + "skill": 2 + }, + { + "name": "灰毫", + "level": 5, + "skill": 2 + }, + { + "name": "暴雨", + "level": 5, + "skill": 2 + }, + { + "name": "闪击", + "level": 5, + "skill": 2 + }, + { + "name": "泡泡", + "level": 4, + "skill": 2 + }, + { + "name": "石棉", + "level": 5, + "skill": 2 + }, + { + "name": "吽", + "level": 5, + "skill": 2 + }, + { + "name": "车尔尼", + "level": 5, + "skill": 2 + } + ], + "Sniper": [ { "name": "蓝毒", "level": 5, "skill": 1 }, { - "name": "空弦", + "name": "W", "level": 6, - "skill": 1 + "skill": 2 + }, + { + "name": "菲亚梅塔", + "level": 6, + "skill": 3, + "alternate_skill": 1 }, { "name": "白金", @@ -150,11 +534,147 @@ "skill": 3, "alternate_skill": 1 }, + { + "name": "埃拉托", + "level": 5, + "skill": 1 + }, + { + "name": "灰烬", + "level": 6, + "skill": 1 + }, + { + "name": "灰喉", + "level": 5, + "skill": 1 + }, + { + "name": "假日威龙陈", + "level": 6, + "skill": 3, + "alternate_skill": 1 + }, + { + "name": "空弦", + "level": 6, + "skill": 1 + }, + { + "name": "远牙", + "level": 6, + "skill": 3 + }, + { + "name": "松果", + "level": 4, + "skill": 2 + }, + { + "name": "普罗旺斯", + "level": 5, + "skill": 1 + }, + { + "name": "陨星", + "level": 5, + "skill": 1 + }, + { + "name": "梅", + "level": 4, + "skill": 1 + }, + { + "name": "流星", + "level": 4, + "skill": 1 + }, + { + "name": "早露", + "level": 6, + "skill": 3 + }, + { + "name": "黑", + "level": 6, + "skill": 3 + }, + { + "name": "安比尔", + "level": 4, + "skill": 2 + }, { "name": "克洛丝", "level": 3, "skill": 1 }, + { + "name": "Stormeye", + "level": 5, + "skill": 1 + }, + { + "name": "寒芒克洛丝", + "level": 5, + "skill": 2 + }, + { + "name": "四月", + "level": 5, + "skill": 1 + }, + { + "name": "熔泉", + "level": 5, + "skill": 2 + }, + { + "name": "奥斯塔", + "level": 5, + "skill": 1 + }, + { + "name": "安哲拉", + "level": 5, + "skill": 2 + }, + { + "name": "慑砂", + "level": 5, + "skill": 2 + }, + { + "name": "送葬人", + "level": 5, + "skill": 2 + }, + { + "name": "守林人", + "level": 5, + "skill": 2 + }, + { + "name": "酸糖", + "level": 4, + "skill": 2 + }, + { + "name": "红云", + "level": 4, + "skill": 2 + }, + { + "name": "白雪", + "level": 4, + "skill": 2 + }, + { + "name": "杰西卡", + "level": 4, + "skill": 2 + }, { "name": "安德切尔", "level": 3, @@ -164,21 +684,36 @@ "name": "空爆", "level": 3, "skill": 1 + }, + { + "name": "巡林者", + "level": 2, + "skill": 0 + }, + { + "name": "正义骑士号", + "level": 1, + "skill": 0 + }, + { + "name": "承曦格雷伊", + "level": 5, + "skill": 2 + }, + { + "name": "迷迭香", + "level": 6, + "skill": 2 } ], "Caster": [ { - "name": "澄闪", + "name": "艾雅法拉", "level": 6, "skill": 2 }, { - "name": "Pith", - "level": 5, - "skill": 1 - }, - { - "name": "艾雅法拉", + "name": "澄闪", "level": 6, "skill": 2 }, @@ -187,10 +722,165 @@ "level": 3, "skill": 1 }, + { + "name": "异客", + "level": 6, + "skill": 3 + }, { "name": "阿米娅", "level": 5, "skill": 1 + }, + { + "name": "刻俄柏", + "level": 6, + "skill": 1 + }, + { + "name": "夕", + "level": 6, + "skill": 1 + }, + { + "name": "伊芙利特", + "level": 6, + "skill": 2 + }, + { + "name": "天火", + "level": 5, + "skill": 2 + }, + { + "name": "卡达", + "level": 4, + "skill": 2 + }, + { + "name": "炎熔", + "level": 3, + "skill": 1 + }, + { + "name": "Pith", + "level": 5, + "skill": 1 + }, + { + "name": "夜魔", + "level": 5, + "skill": 1 + }, + { + "name": "惊蛰", + "level": 5, + "skill": 1 + }, + { + "name": "苦艾", + "level": 5, + "skill": 1 + }, + { + "name": "莱恩哈特", + "level": 5, + "skill": 1 + }, + { + "name": "薄绿", + "level": 5, + "skill": 1 + }, + { + "name": "爱丽丝", + "level": 5, + "skill": 1 + }, + { + "name": "炎狱炎熔", + "level": 5, + "skill": 1 + }, + { + "name": "蚀清", + "level": 5, + "skill": 1 + }, + { + "name": "耶拉", + "level": 5, + "skill": 2 + }, + { + "name": "洛洛", + "level": 5, + "skill": 1 + }, + { + "name": "夜烟", + "level": 4, + "skill": 2 + }, + { + "name": "远山", + "level": 4, + "skill": 2 + }, + { + "name": "格雷伊", + "level": 4, + "skill": 1 + }, + { + "name": "深靛", + "level": 4, + "skill": 1 + }, + { + "name": "布丁", + "level": 4, + "skill": 1 + }, + { + "name": "杜林", + "level": 2, + "skill": 0 + }, + { + "name": "12F", + "level": 2, + "skill": 0 + }, + { + "name": "莫斯提马", + "level": 6, + "skill": 2 + }, + { + "name": "卡涅利安", + "level": 6, + "skill": 1 + }, + { + "name": "蜜蜡", + "level": 5, + "skill": 1 + }, + { + "name": "特米米", + "level": 5, + "skill": 2 + }, + { + "name": "星源", + "level": 5, + "skill": 2 + }, + { + "name": "黑键", + "level": 6, + "skill": 2 } ], "Special": [ @@ -198,6 +888,142 @@ "name": "孑", "level": 4, "skill": 2 + }, + { + "name": "傀影", + "level": 6, + "skill": 2 + }, + { + "name": "温蒂", + "level": 6, + "skill": 2 + }, + { + "name": "歌蕾蒂娅", + "level": 6, + "skill": 1 + }, + { + "name": "红", + "level": 5, + "skill": 1 + }, + { + "name": "水月", + "level": 6, + "skill": 1 + }, + { + "name": "狮蝎", + "level": 5, + "skill": 1 + }, + { + "name": "绮良", + "level": 5, + "skill": 1 + }, + { + "name": "老鲤", + "level": 6, + "skill": 3, + "alternate_skill": 1 + }, + { + "name": "伊桑", + "level": 4, + "skill": 1 + }, + { + "name": "风丸", + "level": 5, + "skill": 1 + }, + { + "name": "砾", + "level": 4, + "skill": 2 + }, + { + "name": "暗索", + "level": 4, + "skill": 1 + }, + { + "name": "阿消", + "level": 4, + "skill": 1 + }, + { + "name": "槐琥", + "level": 5, + "skill": 2 + }, + { + "name": "食铁兽", + "level": 5, + "skill": 1 + }, + { + "name": "雪雉", + "level": 5, + "skill": 1 + }, + { + "name": "见行者", + "level": 5, + "skill": 1 + }, + { + "name": "贝娜", + "level": 5, + "skill": 1 + }, + { + "name": "乌有", + "level": 5, + "skill": 2 + }, + { + "name": "崖心", + "level": 5, + "skill": 1 + }, + { + "name": "归溟幽灵鲨", + "level": 6, + "skill": 1 + }, + { + "name": "霜华_N", + "level": 5, + "skill": 1 + }, + { + "name": "罗宾_N", + "level": 5, + "skill": 1 + }, + { + "name": "卡夫卡", + "level": 5, + "skill": 1 + }, + { + "name": "阿_N", + "level": 6, + "skill": 2 + }, + { + "name": "THRM-EX", + "level": 1, + "skill": 0 + }, + { + "name": "多萝西_N", + "level": 6, + "skill": 2 } ], "Medic": [ @@ -208,9 +1034,9 @@ "alternate_skill": 2 }, { - "name": "Touch", - "level": 5, - "skill": 1 + "name": "夜莺", + "level": 6, + "skill": 2 }, { "name": "白面鸮", @@ -227,6 +1053,32 @@ "level": 5, "skill": 1 }, + { + "name": "苏苏洛", + "level": 4, + "skill": 2 + }, + { + "name": "调香师", + "level": 4, + "skill": 1 + }, + { + "name": "流明", + "level": 6, + "skill": 3, + "alternate_skill": 1 + }, + { + "name": "絮雨", + "level": 5, + "skill": 2 + }, + { + "name": "Touch", + "level": 5, + "skill": 1 + }, { "name": "赫默", "level": 5, @@ -237,15 +1089,70 @@ "level": 5, "skill": 2 }, + { + "name": "末药", + "level": 4, + "skill": 1 + }, + { + "name": "嘉维尔", + "level": 4, + "skill": 1 + }, + { + "name": "褐果", + "level": 4, + "skill": 1 + }, { "name": "芙蓉", "level": 3, "skill": 1 }, + { + "name": "微风", + "level": 5, + "skill": 1 + }, { "name": "安赛尔", "level": 3, "skill": 1 + }, + { + "name": "闪灵", + "level": 6, + "skill": 2 + }, + { + "name": "锡兰", + "level": 5, + "skill": 1 + }, + { + "name": "亚叶", + "level": 5, + "skill": 1 + }, + { + "name": "图耶", + "level": 5, + "skill": 1 + }, + { + "name": "清流", + "level": 4, + "skill": 1 + }, + { + "name": "Lancet-2", + "level": 1, + "skill": 0 + }, + { + "name": "濯尘芙蓉", + "level": 5, + "skill": 2 } ], "Support": [ @@ -255,6 +1162,11 @@ "skill": 3, "alternate_skill": 1 }, + { + "name": "波登可", + "level": 4, + "skill": 2 + }, { "name": "灵知", "level": 6, @@ -271,10 +1183,96 @@ "skill": 3, "alternate_skill": 2 }, + { + "name": "巫恋", + "level": 5, + "skill": 1 + }, + { + "name": "初雪", + "level": 5, + "skill": 1 + }, + { + "name": "真理", + "level": 5, + "skill": 1 + }, + { + "name": "格劳克斯", + "level": 5, + "skill": 1 + }, { "name": "梓兰", "level": 3, "skill": 1 + }, + { + "name": "浊心斯卡蒂", + "level": 6, + "skill": 2 + }, + { + "name": "月禾", + "level": 5, + "skill": 1 + }, + { + "name": "稀音", + "level": 5, + "skill": 2 + }, + { + "name": "九色鹿", + "level": 5, + "skill": 1 + }, + { + "name": "夏栎", + "level": 5, + "skill": 1, + "skill_usage": 2 + }, + { + "name": "掠风_N", + "level": 5, + "skill": 1 + }, + { + "name": "深海色", + "level": 4, + "skill": 1 + }, + { + "name": "地灵", + "level": 4, + "skill": 1 + }, + { + "name": "海蒂", + "level": 5, + "skill": 1 + }, + { + "name": "罗比菈塔_N", + "level": 4, + "skill": 1 + }, + { + "name": "麦哲伦", + "level": 6, + "skill": 1 + }, + { + "name": "梅尔", + "level": 5, + "skill": 1 + }, + { + "name": "空", + "level": 5, + "skill": 1 } ], "Alternate": [ @@ -299,4 +1297,4 @@ "skill": 0 } ] -} +} \ No newline at end of file diff --git a/tools/TestCaller/main.cpp b/tools/TestCaller/main.cpp index 5a761408d0..4283a10372 100644 --- a/tools/TestCaller/main.cpp +++ b/tools/TestCaller/main.cpp @@ -28,7 +28,7 @@ int main([[maybe_unused]] int argc, char** argv) return -1; } - bool connected = AsstConnect(ptr, "adb", "127.0.0.1:5555", "DEBUG"); + bool connected = AsstConnect(ptr, "adb", "127.0.0.1:5555", nullptr); if (!connected) { std::cerr << "connect failed" << std::endl; AsstDestroy(ptr); @@ -39,13 +39,13 @@ int main([[maybe_unused]] int argc, char** argv) /* 详细参数可参考 docs / 集成文档.md */ - //AsstAppendTask(ptr, "StartUp", nullptr); + AsstAppendTask(ptr, "StartUp", nullptr); - //AsstAppendTask(ptr, "Fight", R"( - //{ - // "stage": "1-7" - //} - //)"); + AsstAppendTask(ptr, "Fight", R"( + { + "stage": "1-7" + } + )"); //AsstAppendTask(ptr, "Recruit", R"( //{ @@ -88,7 +88,7 @@ int main([[maybe_unused]] int argc, char** argv) //} //)"); - AsstAppendTask(ptr, "Debug", nullptr); + //AsstAppendTask(ptr, "Debug", nullptr); AsstStart(ptr);