diff --git a/docs/战斗流程协议.md b/docs/战斗流程协议.md index 2cacb116c5..7b9c5c3491 100644 --- a/docs/战斗流程协议.md +++ b/docs/战斗流程协议.md @@ -1,6 +1,6 @@ # 战斗流程协议 -`resource/battle/*.json` 的使用方法及各字段说明 +`resource/copilot/*.json` 的使用方法及各字段说明 ## 完整字段一览 diff --git a/resource/battle/GA-EX8-raid.json b/resource/copilot/GA-EX8-raid.json similarity index 100% rename from resource/battle/GA-EX8-raid.json rename to resource/copilot/GA-EX8-raid.json diff --git a/resource/battle/WD-EX8-raid.json b/resource/copilot/WD-EX8-raid.json similarity index 100% rename from resource/battle/WD-EX8-raid.json rename to resource/copilot/WD-EX8-raid.json diff --git a/resource/battle/test.json b/resource/copilot/test.json similarity index 100% rename from resource/battle/test.json rename to resource/copilot/test.json diff --git a/resource/tasks.json b/resource/tasks.json index 01674eac19..c3d4e48759 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -3507,6 +3507,10 @@ 60 ] }, + "BattleWaitingToLoad": { + "algorithm": "JustReturn", + "rearDelay": 3000 + }, "BattleSpeedUp": { "algorithm": "JustReturn", "action": "ClickRect", diff --git a/src/MeoAssistant/BattleProcessTask.cpp b/src/MeoAssistant/BattleProcessTask.cpp index 6648a50c56..bcf8a3bf03 100644 --- a/src/MeoAssistant/BattleProcessTask.cpp +++ b/src/MeoAssistant/BattleProcessTask.cpp @@ -81,9 +81,8 @@ bool asst::BattleProcessTask::analyze_opers_preview() } std::this_thread::yield(); } - // TODO: 干员头像出来之后,还要过 2 秒左右才可以点击,这里可能还要加个延时 - sleep(3000); - + // 干员头像出来之后,还要过 2 秒左右才可以点击,这里要加个延时 + sleep(Task.get("BattleWaitingToLoad")->rear_delay); battle_pause(); auto opers = oper_analyzer.get_opers(); diff --git a/src/MeoAssistant/Resource.cpp b/src/MeoAssistant/Resource.cpp index e31f954b0c..561cbde803 100644 --- a/src/MeoAssistant/Resource.cpp +++ b/src/MeoAssistant/Resource.cpp @@ -19,7 +19,7 @@ bool asst::Resource::load(const std::string& dir) constexpr static const char* RecruitCfgFilename = "recruit.json"; constexpr static const char* ItemCfgFilename = "item_index.json"; constexpr static const char* InfrastCfgFilename = "infrast.json"; - constexpr static const char* BattleCfgDirname = "battle"; + constexpr static const char* BattleCfgDirname = "copilot"; constexpr static const char* OcrResourceFilename = "PaddleOCR"; constexpr static const char* PenguinResourceFilename = "penguin-stats-recognize"; constexpr static const char* TilesCalcResourceFilename = "Arknights-Tile-Pos"; diff --git a/src/Python/sample.py b/src/Python/sample.py index 7f31b0dbb8..b7f8787e1e 100644 --- a/src/Python/sample.py +++ b/src/Python/sample.py @@ -31,7 +31,6 @@ if __name__ == "__main__": exit() # 任务及参数请参考 docs/集成文档.md - # 详细参数请参考 docs/集成文档.md asst.append_task('StartUp') asst.append_task('Fight', { @@ -53,7 +52,7 @@ if __name__ == "__main__": asst.append_task('Visit') asst.append_task('Mall', { 'shopping': True, - 'shopping': ['家具', '碳'], + 'shopping_list': ['家具', '碳'], 'is_black_list': True }) asst.append_task('Award') diff --git a/src/Python/timed_start/timed_sample.py b/src/Python/timed_start/timed_sample.py index 11a9b4bfeb..dc34f49981 100644 --- a/src/Python/timed_start/timed_sample.py +++ b/src/Python/timed_start/timed_sample.py @@ -26,10 +26,11 @@ def job(): # print("I'm running on thread %s" % threading.current_thread()) print("现在时间:" + datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) - # 详细参数请参考 docs/集成文档.md + # 任务及参数请参考 docs/集成文档.md # asst.append_task('StartUp') asst.append_task('Fight', { + 'report_to_penguin': True, 'stage': 'LastBattle', # 'penguin_id': '1234567' }) @@ -47,7 +48,7 @@ def job(): asst.append_task('Visit') asst.append_task('Mall', { 'shopping': True, - 'shopping': ['家具', '碳'], + 'shopping_list': ['家具', '碳'], 'is_black_list': True }) asst.append_task('Award')