diff --git a/assets/resource/pipeline/limbus_template/SeaHell/11.png b/assets/resource/pipeline/limbus_template/SeaHell/11.png deleted file mode 100644 index ad53dcd..0000000 Binary files a/assets/resource/pipeline/limbus_template/SeaHell/11.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/SeaHell/12.png b/assets/resource/pipeline/limbus_template/SeaHell/12.png deleted file mode 100644 index 79c81af..0000000 Binary files a/assets/resource/pipeline/limbus_template/SeaHell/12.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/SeaHell/EnterStage.png b/assets/resource/pipeline/limbus_template/SeaHell/EnterStage.png deleted file mode 100644 index fa710bf..0000000 Binary files a/assets/resource/pipeline/limbus_template/SeaHell/EnterStage.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/SeaHell/SeaHell.png b/assets/resource/pipeline/limbus_template/SeaHell/SeaHell.png deleted file mode 100644 index a9ca2c8..0000000 Binary files a/assets/resource/pipeline/limbus_template/SeaHell/SeaHell.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/SeaHell/SelectView.png b/assets/resource/pipeline/limbus_template/SeaHell/SelectView.png deleted file mode 100644 index 2af2894..0000000 Binary files a/assets/resource/pipeline/limbus_template/SeaHell/SelectView.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/SeaHell/StageSelect.png b/assets/resource/pipeline/limbus_template/SeaHell/StageSelect.png deleted file mode 100644 index 6e746b3..0000000 Binary files a/assets/resource/pipeline/limbus_template/SeaHell/StageSelect.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/BattleSetting.png b/assets/resource/pipeline/limbus_template/Startup/BattleSetting.png deleted file mode 100644 index 0d7176a..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/BattleSetting.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/BtnBack.png b/assets/resource/pipeline/limbus_template/Startup/BtnBack.png deleted file mode 100644 index eb12f75..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/BtnBack.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/BtnHome.png b/assets/resource/pipeline/limbus_template/Startup/BtnHome.png deleted file mode 100644 index 0e7688d..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/BtnHome.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/CancelCraft.png b/assets/resource/pipeline/limbus_template/Startup/CancelCraft.png deleted file mode 100644 index e1e743c..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/CancelCraft.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/GiveUp.png b/assets/resource/pipeline/limbus_template/Startup/GiveUp.png deleted file mode 100644 index b31338b..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/GiveUp.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/MainSc.png b/assets/resource/pipeline/limbus_template/Startup/MainSc.png deleted file mode 100644 index 7af7652..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/MainSc.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/PayFail.png b/assets/resource/pipeline/limbus_template/Startup/PayFail.png deleted file mode 100644 index 0f26984..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/PayFail.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/Startup/StartGame.png b/assets/resource/pipeline/limbus_template/Startup/StartGame.png deleted file mode 100644 index 8aa84fb..0000000 Binary files a/assets/resource/pipeline/limbus_template/Startup/StartGame.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/AbnormalEventConfirm.png b/assets/resource/pipeline/limbus_template/daily/AbnormalEventConfirm.png deleted file mode 100644 index 613159b..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/AbnormalEventConfirm.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/AbnormalEventConfirm2.png b/assets/resource/pipeline/limbus_template/daily/AbnormalEventConfirm2.png deleted file mode 100644 index b1924fa..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/AbnormalEventConfirm2.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/AbnormalEventSelect.png b/assets/resource/pipeline/limbus_template/daily/AbnormalEventSelect.png deleted file mode 100644 index 7ba525c..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/AbnormalEventSelect.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/AbnormalEventSkip.png b/assets/resource/pipeline/limbus_template/daily/AbnormalEventSkip.png deleted file mode 100644 index 2b37aaf..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/AbnormalEventSkip.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/BStart2.png b/assets/resource/pipeline/limbus_template/daily/BStart2.png deleted file mode 100644 index c07838d..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/BStart2.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/BattleStart.png b/assets/resource/pipeline/limbus_template/daily/BattleStart.png deleted file mode 100644 index b2afc0c..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/BattleStart.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/Choice.png b/assets/resource/pipeline/limbus_template/daily/Choice.png deleted file mode 100644 index de48112..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/Choice.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/Confirm.png b/assets/resource/pipeline/limbus_template/daily/Confirm.png deleted file mode 100644 index fd565ff..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/Confirm.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/ConfirmCraft.png b/assets/resource/pipeline/limbus_template/daily/ConfirmCraft.png deleted file mode 100644 index 8c6e40f..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/ConfirmCraft.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/Drive.png b/assets/resource/pipeline/limbus_template/daily/Drive.png deleted file mode 100644 index 9ef5f3a..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/Drive.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/Energy.png b/assets/resource/pipeline/limbus_template/daily/Energy.png deleted file mode 100644 index a75af2c..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/Energy.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/Enter.png b/assets/resource/pipeline/limbus_template/daily/Enter.png deleted file mode 100644 index 37762de..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/Enter.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/LuxcavationBtn.png b/assets/resource/pipeline/limbus_template/daily/LuxcavationBtn.png deleted file mode 100644 index 8f8aa96..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/LuxcavationBtn.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/LvlBattle.png b/assets/resource/pipeline/limbus_template/daily/LvlBattle.png deleted file mode 100644 index e96d45c..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/LvlBattle.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/LvlSkip.png b/assets/resource/pipeline/limbus_template/daily/LvlSkip.png deleted file mode 100644 index dbf4676..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/LvlSkip.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/MainMenuNotice.png b/assets/resource/pipeline/limbus_template/daily/MainMenuNotice.png deleted file mode 100644 index 1f9ee00..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/MainMenuNotice.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/MissionClick.png b/assets/resource/pipeline/limbus_template/daily/MissionClick.png deleted file mode 100644 index 842b03f..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/MissionClick.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/MissionNotice.png b/assets/resource/pipeline/limbus_template/daily/MissionNotice.png deleted file mode 100644 index ca5fb17..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/MissionNotice.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/SelAll.png b/assets/resource/pipeline/limbus_template/daily/SelAll.png deleted file mode 100644 index dd1efb9..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/SelAll.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/Skip.png b/assets/resource/pipeline/limbus_template/daily/Skip.png deleted file mode 100644 index 79a4746..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/Skip.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/SkipConfirm.png b/assets/resource/pipeline/limbus_template/daily/SkipConfirm.png deleted file mode 100644 index 85cc17a..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/SkipConfirm.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/Thread.png b/assets/resource/pipeline/limbus_template/daily/Thread.png deleted file mode 100644 index e386d47..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/Thread.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/ThreadBattle.png b/assets/resource/pipeline/limbus_template/daily/ThreadBattle.png deleted file mode 100644 index 332b288..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/ThreadBattle.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/ToBattle.png b/assets/resource/pipeline/limbus_template/daily/ToBattle.png deleted file mode 100644 index 896b6bc..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/ToBattle.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/VeryHigh.png b/assets/resource/pipeline/limbus_template/daily/VeryHigh.png deleted file mode 100644 index 1559926..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/VeryHigh.png and /dev/null differ diff --git a/assets/resource/pipeline/limbus_template/daily/WinRate.png b/assets/resource/pipeline/limbus_template/daily/WinRate.png deleted file mode 100644 index 77f72b8..0000000 Binary files a/assets/resource/pipeline/limbus_template/daily/WinRate.png and /dev/null differ diff --git a/source/cli/CMakeLists.txt b/source/cli/CMakeLists.txt index 3bc96df..89d02d5 100644 --- a/source/cli/CMakeLists.txt +++ b/source/cli/CMakeLists.txt @@ -8,9 +8,9 @@ endif () set(CMAKE_BUILD_TYPE "Release") set(CMAKE_CONFIGURATION_TYPES "Release") -add_executable(MAA1999_CLI main.cpp) -target_link_libraries(MAA1999_CLI PRIVATE MaaFramework MaaToolKit) +add_executable(MAALimbus_CLI main.cpp) +target_link_libraries(MAALimbus_CLI PRIVATE MaaFramework MaaToolKit) -add_dependencies(MAA1999_CLI AssetsResource) +add_dependencies(MAALimbus_CLI AssetsResource) -install(TARGETS MAA1999_CLI RUNTIME DESTINATION .) +install(TARGETS MAALimbus_CLI RUNTIME DESTINATION .) diff --git a/source/cli/main.cpp b/source/cli/main.cpp index 84475c2..e992f84 100644 --- a/source/cli/main.cpp +++ b/source/cli/main.cpp @@ -115,9 +115,9 @@ int main(int argc, char** argv) void print_help() { std::cout << utf8_to_crt( - R"(欢迎使用 MAA 1999 CLI, 源码地址:https://github.com/MaaAssistantArknights/MAA1999 + R"(欢迎使用 MAA LimbusCompany CLI, 源码地址:https://github.com/hxdnshx/MAALimbusCompany -用法: MAA1999.exe [adb路径] [adb地址] [任务名(有序)]... +用法: MAALimbus_CLI.exe [adb路径] [adb地址] [任务名(有序)]... 可以修改 config.json 来配置任务 @@ -350,25 +350,11 @@ bool proc_argv(int argc, char** argv, bool& debug, std::string& adb, std::string << std::endl << utf8_to_crt("选择任务,会自动登录,但不会启动模拟器") << std::endl << std::endl - << utf8_to_crt("1. 启动游戏\n" - "2. 收取荒原\n" - "3. 领取奖励\n" - "4. 每日心相(意志解析)\n" - "5. 3-9 厄险(百灵百验鸟)\n" - "6. 4-20 厄险(双头形骨架)\n" - "7. 2-3 厄险(祝圣秘银)\n" - "8. 3-13 厄险(盐封曼德拉)\n" - "9. 4-10 厄险(啮咬盒)\n" - "10. 3-11 厄险(金爪灵摆)\n" - "11. 尘埃运动 06\n" - "12. 猪鼻美学 06\n" - "13. 丰收时令 04\n" - "14. 群山之声 06(洞悉 岩)\n" - "15. 星陨之所 06(洞悉 星)\n" - "16. 深林之形 06(洞悉 林)\n" - "17. 荒兽之野 06(洞悉 兽)\n" - "18. 活动:绿湖噩梦 17 艰难(活动已结束)\n" - "19. 活动:行至摩卢旁卡 16 艰难\n") + << utf8_to_crt("1. 经验本(战斗)\n" + "2. 纺锤本(跳过)\n" + "3. 纺锤本(战斗)\n" + "4. 体力兑换成Module\n" + "5. 提交赛季每日任务\n") << std::endl << std::endl << utf8_to_crt("请输入要执行的任务序号,可自定义顺序,以空格分隔,例如 1 2 4 12 3: ") << std::endl; @@ -390,44 +376,21 @@ bool proc_argv(int argc, char** argv, bool& debug, std::string& adb, std::string switch (id) { case 1: - task_obj.type = "StartUp"; + task_obj.type = "ExpLuxcavation"; break; case 2: - task_obj.type = "Wilderness"; + task_obj.type = "ThreadLuxcavationSkip"; break; case 3: - task_obj.type = "Awards"; + task_obj.type = "ThreadLuxcavationBattle"; break; case 4: - task_obj.type = "Psychube"; + task_obj.type = "CraftModule"; break; case 5: - case 6: - case 7: - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: - case 16: - case 17: - task_obj.type = "Combat"; - task_obj.param = combat_param(id); - break; - - case 18: - task_obj.type = "ANightmareAtGreenLake"; - task_obj.param = combat_param(id); - break; - - case 19: - task_obj.type = "JourneytoMorPankh"; - task_obj.param = combat_param(id); + task_obj.type = "SubmitMission"; break; default: