diff --git a/resource/tasks.json b/resource/tasks.json
index e298e9251a..12600cefc0 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -3020,9 +3020,9 @@
"action": "ClickRect",
"specificRect": [
1000,
- 120,
+ 20,
270,
- 10
+ 50
],
"maxTimes": 5,
"next": [
diff --git a/src/MaaCore/MaaCore.vcxproj b/src/MaaCore/MaaCore.vcxproj
index 003a0b8f55..66df8de952 100644
--- a/src/MaaCore/MaaCore.vcxproj
+++ b/src/MaaCore/MaaCore.vcxproj
@@ -158,7 +158,6 @@
-
@@ -308,7 +307,6 @@
-
diff --git a/src/MaaCore/MaaCore.vcxproj.filters b/src/MaaCore/MaaCore.vcxproj.filters
index 17d9a146a8..a1f98afa0f 100644
--- a/src/MaaCore/MaaCore.vcxproj.filters
+++ b/src/MaaCore/MaaCore.vcxproj.filters
@@ -432,9 +432,6 @@
源文件\Task\Miscellaneous
-
- 源文件\Task\Miscellaneous
-
源文件\Task\Miscellaneous
@@ -851,9 +848,6 @@
源文件\Task\Miscellaneous
-
- 源文件\Task\Miscellaneous
-
源文件\Task\Miscellaneous
diff --git a/src/MaaCore/Task/Interface/FightTask.cpp b/src/MaaCore/Task/Interface/FightTask.cpp
index d5bbc8b7b9..f27ca41caf 100644
--- a/src/MaaCore/Task/Interface/FightTask.cpp
+++ b/src/MaaCore/Task/Interface/FightTask.cpp
@@ -7,7 +7,6 @@
#include "Task/Fight/DrGrandetTaskPlugin.h"
#include "Task/Fight/StageDropsTaskPlugin.h"
#include "Task/Fight/StageNavigationTask.h"
-#include "Task/Miscellaneous/GameCrashRestartTaskPlugin.h"
#include "Task/ProcessTask.h"
#include "Utils/Logger.hpp"
#include "Utils/Ranges.hpp"
@@ -43,8 +42,6 @@ asst::FightTask::FightTask(const AsstCallback& callback, Assistant* inst)
m_stage_drops_plugin_ptr = m_fight_task_ptr->register_plugin();
m_stage_drops_plugin_ptr->set_retry_times(0);
- m_game_restart_plugin_ptr = m_fight_task_ptr->register_plugin();
- m_game_restart_plugin_ptr->set_retry_times(0);
m_dr_grandet_task_plugin_ptr = m_fight_task_ptr->register_plugin();
m_dr_grandet_task_plugin_ptr->set_enable(false);
@@ -98,9 +95,6 @@ bool asst::FightTask::set_params(const json::value& params)
m_dr_grandet_task_plugin_ptr->set_enable(is_dr_grandet);
m_stage_drops_plugin_ptr->set_enable_penguid(enable_penguid);
m_stage_drops_plugin_ptr->set_penguin_id(std::move(penguin_id));
- if (!client_type.empty()) {
- m_game_restart_plugin_ptr->set_client_type(client_type);
- }
return true;
}
diff --git a/src/MaaCore/Task/Interface/FightTask.h b/src/MaaCore/Task/Interface/FightTask.h
index f78b1eb88e..4d3730f55e 100644
--- a/src/MaaCore/Task/Interface/FightTask.h
+++ b/src/MaaCore/Task/Interface/FightTask.h
@@ -7,7 +7,6 @@ namespace asst
{
class ProcessTask;
class StageDropsTaskPlugin;
- class GameCrashRestartTaskPlugin;
class StageNavigationTask;
class DrGrandetTaskPlugin;
@@ -26,7 +25,6 @@ namespace asst
std::shared_ptr m_stage_navigation_task_ptr = nullptr;
std::shared_ptr m_fight_task_ptr = nullptr;
std::shared_ptr m_stage_drops_plugin_ptr = nullptr;
- std::shared_ptr m_game_restart_plugin_ptr = nullptr;
std::shared_ptr m_dr_grandet_task_plugin_ptr = nullptr;
};
}
diff --git a/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp b/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp
index 5ecb90164e..a1c32127b7 100644
--- a/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp
+++ b/src/MaaCore/Task/Miscellaneous/CreditFightTask.cpp
@@ -4,7 +4,6 @@
#include "Config/TaskData.h"
-#include "GameCrashRestartTaskPlugin.h"
#include "Task/AbstractTask.h"
#include "Task/Fight/StageNavigationTask.h"
#include "Task/Interface/CopilotTask.h"
diff --git a/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.cpp b/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.cpp
deleted file mode 100644
index 8419aa4fca..0000000000
--- a/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "GameCrashRestartTaskPlugin.h"
-
-#include "Status.h"
-
-bool asst::GameCrashRestartTaskPlugin::verify(AsstMsg msg, const json::value& details) const
-{
- if (msg != AsstMsg::SubTaskStart || details.get("subtask", std::string()) != "ProcessTask") {
- return false;
- }
-
- // 没啥用，还经常误报
- // if (details.at("details").at("task").as_string() == "Fight@RestartGameAndContinue") {
- // return true;
- // }
- // else {
- return false;
- //}
-}
diff --git a/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.h b/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.h
deleted file mode 100644
index eceb36171a..0000000000
--- a/src/MaaCore/Task/Miscellaneous/GameCrashRestartTaskPlugin.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "StartGameTaskPlugin.h"
-
-namespace asst
-{
- class GameCrashRestartTaskPlugin : public StartGameTaskPlugin
- {
- public:
- using StartGameTaskPlugin::StartGameTaskPlugin;
- virtual ~GameCrashRestartTaskPlugin() noexcept override = default;
-
- virtual bool verify(AsstMsg msg, const json::value& details) const override;
- };
-}
diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index 6d0605676f..bd35d1fa2f 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -761,10 +761,6 @@ namespace MaaWpfGui.Main
_taskQueueViewModel.AddLog(LocalizationHelper.GetString("UpperLimit"), UiLogColor.Info);
break;
- case "RestartGameAndContinue":
- _taskQueueViewModel.AddLog(LocalizationHelper.GetString("GameCrash"), UiLogColor.Warning);
- break;
-
case "OfflineConfirm":
if (_settingsViewModel.AutoRestartOnDrop)
{
@@ -800,6 +796,7 @@ namespace MaaWpfGui.Main
}
#pragma warning disable IDE0060 // 删除未使用的参数
+
private void ProcSubTaskCompleted(JObject details)
#pragma warning restore IDE0060 // 删除未使用的参数
{