fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-20 02:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 添加借助战作战Tips

Browse Source
This commit is contained in:
Hydrogina
2022-11-24 15:44:58 +08:00
parent b1c4c0b83c
commit 61bc4f2da4
7 changed files with 23 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/MeoAssistant/Assistant.cpp
View File

@@ -116,20 +116,21 @@ asst::Assistant::TaskId asst::Assistant::append_task(const std::string& type, co
if constexpr (false) {}
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(FightTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(StartUpTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(CloseDownTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(AwardTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(VisitTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(MallTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(InfrastTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(RecruitTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(RoguelikeTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(CopilotTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(DepotTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(StartUpTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(CloseDownTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(AwardTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(VisitTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(MallTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(InfrastTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(RecruitTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(RoguelikeTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(CopilotTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(DepotTask)
#ifdef ASST_DEBUG
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(DebugTask)
ASST_ASSISTANT_APPEND_TASK_FROM_STRING_IF_BRANCH(DebugTask)
#endif
else {
else
{
Log.error(__FUNCTION__, "| invalid type:", type);
return 0;
}
@@ -266,7 +267,7 @@ void Assistant::working_proc()
lock.unlock();
// only one instance of working_proc running, unlock here to allow set_task_param to the running task
json::value callback_json = json::object{
json::value callback_json = json::object {
{ "taskchain", task_ptr->get_task_chain() },
{ "taskid", id },
};
@@ -282,7 +283,7 @@ void Assistant::working_proc()
lock.unlock();
auto msg = m_thread_idle ? AsstMsg::TaskChainStopped
: (ret ? AsstMsg::TaskChainCompleted : AsstMsg::TaskChainError);
: (ret ? AsstMsg::TaskChainCompleted : AsstMsg::TaskChainError);
task_callback(msg, callback_json, this);
if (m_thread_idle) {

15
src/MeoAssistant/Task/CreditFightTask.cpp
View File

@@ -19,21 +19,6 @@ asst::CreditFightTask::CreditFightTask(AsstCallback callback, void* callback_arg
m_copilot_task_ptr(std::make_shared<CopilotTask>(m_callback, m_callback_arg))
{
// 进入选关界面
// 对于指定关卡，就是主界面的“终端”点进去
// 对于当前/上次，就是点到 蓝色开始行动 为止。
m_start_up_task_ptr->set_times_limit("StartButton1", 0)
.set_times_limit("StartButton2", 0)
.set_times_limit("MedicineConfirm", 0)
.set_times_limit("StoneConfirm", 0)
.set_times_limit("StageSNReturnFlag", 0)
.set_times_limit("PRTS3", 0)
.set_times_limit("PRTS", 0)
.set_times_limit("PRTS2", 0)
.set_times_limit("EndOfAction", 0)
.set_ignore_error(false)
.set_retry_times(5);
m_stage_navigation_task_ptr->set_enable(false).set_ignore_error(false);
// 战斗结束后

2
src/MeoAssistant/Task/Sub/BattleFormationTask.h
View File

@@ -11,7 +11,7 @@ namespace asst
virtual ~BattleFormationTask() override = default;
void set_stage_name(std::string name);
protected:
using OperGroup = std::vector<BattleDeployOper>;
virtual bool _run() override;

2
src/MeoAsstGui/Helper/AsstProxy.cs
View File

@@ -1270,7 +1270,7 @@ namespace MeoAsstGui
{
var task_params = new JObject();
task_params["credit_fight_task_enabled"] = credit_fight_task_enabled;
TaskId id = AsstAppendTaskWithEncoding("Visit", task_params);
AsstTaskId id = AsstAppendTaskWithEncoding("Visit", task_params);
_latestTaskId[TaskType.Visit] = id;
return id != 0;
}

3
src/MeoAsstGui/Resources/Localizations/en-us.xaml
View File

@@ -224,7 +224,8 @@
<system:String x:Key="Recruiting">Recruit</system:String>
<system:String x:Key="Base">Base</system:String>
<system:String x:Key="Combat">Combat</system:String>
<system:String x:Key="CreditFight">Combat with Support Unit after Visit Friends</system:String>
<system:String x:Key="CreditFight">Combat with Support to earn credits</system:String>
<system:String x:Key="CreditFightTip">Combat with Support Unit in OF-1 after Visit Friends to earn 30 credits</system:String>
<system:String x:Key="Visiting">Visit Friends</system:String>
<system:String x:Key="Mall">Credit Store</system:String>
<system:String x:Key="Mission">Collect mission rewards</system:String>

3
src/MeoAsstGui/Resources/Localizations/zh-cn.xaml
View File

@@ -225,7 +225,8 @@
<system:String x:Key="Recruiting">自动公招</system:String>
<system:String x:Key="Base">基建换班</system:String>
<system:String x:Key="Combat">刷理智</system:String>
<system:String x:Key="CreditFight">访问好友后借助战作战</system:String>
<system:String x:Key="CreditFight">借助战赚信用</system:String>
<system:String x:Key="CreditFightTip">访问好友后借助战打一把OF-1赚30信用</system:String>
<system:String x:Key="Visiting">访问好友</system:String>
<system:String x:Key="Mall">收取信用及购物</system:String>
<system:String x:Key="Mission">领取日常奖励</system:String>

3
src/MeoAsstGui/UserControl/MallSettingsUserControl.xaml
View File

@@ -35,7 +35,8 @@
VerticalAlignment="Center"
Block.TextAlignment="Center"
Content="{DynamicResource CreditFight}"
IsChecked="{Binding CreditFightTaskEnabled}" />
IsChecked="{Binding CreditFightTaskEnabled}"
ToolTip="{DynamicResource CreditFightTip}"/>
<StackPanel
Grid.Row="1"
HorizontalAlignment="Center"