fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 01:40:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 将 Copilot ActionType::ResetTimer 更改为更适合的 ResetStopwatch (#14507)

Browse Source 
* refactor: 为 ActionType::ResetTimer 加入中文变种

* refactor: Timer -> Stopwatch
This commit is contained in:
Weiyou Wang
2025-10-22 22:20:50 +11:00
committed by GitHub
parent 9c53ea10c6
commit 880bdea7d3
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/MaaCore/Task/Miscellaneous/BattleProcessTask.cpp
View File

@@ -264,9 +264,9 @@ bool asst::BattleProcessTask::do_action(const battle::copilot::Action& action, s
ret = move_camera(action.distance);
break;
case ActionType::ResetTimer:
m_baseline_time = std::chrono::steady_clock::now();
m_timer_enabled = true;
case ActionType::ResetStopwatch:
m_stopwatch_start_time = std::chrono::steady_clock::now();
m_stopwatch_enabled = true;
break;
case ActionType::SkillDaemon:
@@ -306,7 +306,7 @@ void asst::BattleProcessTask::notify_action(const battle::copilot::Action& actio
{ ActionType::MoveCamera, "MoveCamera" },
{ ActionType::DrawCard, "DrawCard" },
{ ActionType::CheckIfStartOver, "CheckIfStartOver" },
{ ActionType::Deploy, "ResetTimer" },
{ ActionType::ResetStopwatch, "ResetStopwatch" },
};
json::value info = basic_info_with_what("CopilotAction");
@@ -401,7 +401,7 @@ bool asst::BattleProcessTask::wait_condition(const Action& action)
// 等待全局计时器
if (action.elapsed_time > 0) {
if (m_timer_enabled) {
if (m_stopwatch_enabled) {
update_image_if_empty();
while (!need_exit()) {
if (elapsed_time() >= action.elapsed_time) {