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

代码统一格式化

Browse Source
This commit is contained in:
MistEO
2021-09-12 01:42:50 +08:00
parent bb6c3a6b43
commit 141d2b237d
30 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MeoAssistance/AbstractConfiger.cpp
View File

@@ -40,4 +40,4 @@ bool asst::AbstractConfiger::load(const std::string& filename)
DebugTrace("Load config succeed");
return true;
}
}

2
MeoAssistance/AbstractTask.cpp
View File

@@ -97,4 +97,4 @@ bool asst::AbstractTask::is_ptr_inited() const noexcept
return false;
}
return true;
}
}

2
MeoAssistance/Assistance.cpp
View File

@@ -632,4 +632,4 @@ std::optional<std::unordered_map<std::string, OperInfrastInfo>> Assistance::get_
return std::nullopt;
}
return opers_info;
}
}

2
MeoAssistance/Identify.cpp
View File

@@ -488,4 +488,4 @@ std::pair<double, asst::Rect> Identify::findImageWithFile(const cv::Mat& cur, co
}
return findImage(cur, mat);
}
*/
*/

2
MeoAssistance/IdentifyOperTask.cpp
View File

@@ -185,4 +185,4 @@ int asst::IdentifyOperTask::detect_elite(const cv::Mat& image, const asst::Rect
else {
return 0;
}
}
}

2
MeoAssistance/InfrastAbstractTask.cpp
View File

@@ -336,4 +336,4 @@ bool asst::InfrastAbstractTask::click_first_operator()
const static Rect FirstOperatorRect(420, 80, 125, 270);
return m_controller_ptr->click(FirstOperatorRect);
}
}

2
MeoAssistance/InfrastDormTask.cpp
View File

@@ -354,4 +354,4 @@ std::vector<InfrastDormTask::MoodStatus> InfrastDormTask::detect_mood_status_at_
});
return moods_vec;
}
}

2
MeoAssistance/InfrastOfficeTask.cpp
View File

@@ -44,4 +44,4 @@ int asst::InfrastOfficeTask::select_operators(bool need_to_the_left)
click_confirm_button();
return 1;
}
}

2
MeoAssistance/InfrastPowerTask.cpp
View File

@@ -84,4 +84,4 @@ int asst::InfrastPowerTask::select_operators(bool need_to_the_left)
click_confirm_button();
return 1;
}
}

2
MeoAssistance/InfrastProductionTask.cpp
View File

@@ -247,4 +247,4 @@ bool asst::InfrastProductionTask::swipe_and_select(std::list<std::string>& name_
m_controller_ptr->click(Rect(1105, 655, 150, 40));
sleep(2000);
return true;
}
}

1
MeoAssistance/Logger.hpp
View File

@@ -101,7 +101,6 @@ namespace asst {
}
};
std::mutex m_trace_mutex;
};

2
MeoAssistance/OcrAbstractTask.cpp
View File

@@ -40,4 +40,4 @@ bool asst::OcrAbstractTask::click_text(const cv::Mat& image, const std::string&
}
}
return false;
}
}

2
MeoAssistance/ProcessTask.cpp
View File

@@ -278,4 +278,4 @@ void asst::ProcessTask::exec_swipe_task(ProcessTaskAction action)
default: // 走不到这里，TODO 报个错
break;
}
}
}

2
MeoAssistance/WinMacro.cpp
View File

@@ -313,4 +313,4 @@ cv::Mat asst::WinMacro::get_image(bool raw)
cv::resize(raw_mat, resize_mat, size, cv::INPAINT_NS);
return resize_mat;
}
}
}

2
MeoAsstGui/App.xaml
View File

@@ -26,4 +26,4 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
</Application>

2
MeoAsstGui/Bootstrapper.cs
View File

@@ -30,4 +30,4 @@ namespace MeoAsstGui
// 抛异常了，可以打些日志
}
}
}
}

15
MeoAsstGui/Helper/AsstProxy.cs
View File

@@ -15,22 +15,30 @@ namespace MeoAsstGui
private delegate void ProcCallbckMsg(AsstMsg msg, JObject detail);
[DllImport("MeoAssistance.dll")] static private extern IntPtr AsstCreate();
[DllImport("MeoAssistance.dll")] static private extern IntPtr AsstCreateEx(CallbackDelegate callback, IntPtr custom_arg);
[DllImport("MeoAssistance.dll")] static private extern void AsstDestory(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern bool AsstCatchEmulator(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern bool AsstStartProcessTask(IntPtr ptr, string task);
[DllImport("MeoAssistance.dll")] static private extern bool AsstStartSanity(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern bool AsstStartVisit(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern bool AsstStartOpenRecruit(IntPtr ptr, int[] required_level, int required_len, bool set_time);
[DllImport("MeoAssistance.dll")] static private extern bool AsstStartIndertifyOpers(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern bool AsstStartInfrast(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern bool AsstStartDebugTask(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern void AsstStop(IntPtr ptr);
[DllImport("MeoAssistance.dll")] static private extern bool AsstSetParam(IntPtr p_asst, string type, string param, string value);
[DllImport("MeoAssistance.dll")] static private extern bool AsstSetParam(IntPtr p_asst, string type, string param, string value);
private CallbackDelegate _callback;
@@ -238,6 +246,7 @@ namespace MeoAsstGui
{
return AsstStartSanity(_ptr);
}
public bool AsstStartVisit()
{
return AsstStartVisit(_ptr);
@@ -282,4 +291,4 @@ namespace MeoAsstGui
RecruitSpecialTag,
RecruitResult
};
}
}

2
MeoAsstGui/Resources/Icon.xaml
View File

@@ -234,4 +234,4 @@
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
</ResourceDictionary>
</ResourceDictionary>

2
MeoAsstGui/Resources/Styles.xaml
View File

@@ -24,4 +24,4 @@
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>

2
MeoAsstGui/UserControl/ParamSettingUserControl.xaml
View File

@@ -33,4 +33,4 @@
<CheckBox Grid.Row="3" IsChecked="{Binding Shutdown}" Content="刷完自动关机" Margin="10" HorizontalAlignment="Left" VerticalAlignment="Center" />
</Grid>
</UserControl>
</UserControl>

2
MeoAsstGui/UserControl/ParamSettingUserControl.xaml.cs
View File

@@ -12,4 +12,4 @@ namespace MeoAsstGui
InitializeComponent();
}
}
}
}

2
MeoAsstGui/ViewModels/MainFunctionViewModel.cs
View File

@@ -211,4 +211,4 @@ namespace MeoAsstGui
ExecInfo = "";
}
}
}
}

2
MeoAsstGui/ViewModels/RecruitViewModel.cs
View File

@@ -125,4 +125,4 @@ namespace MeoAsstGui
asstProxy.AsstStartOpenRecruit(levelList.ToArray(), levelList.Count, AutoSetTime);
}
}
}
}

2
MeoAsstGui/ViewModels/RootViewModel.cs
View File

@@ -54,4 +54,4 @@ namespace MeoAsstGui
}
}
}
}
}

2
MeoAsstGui/ViewModels/VersionUpdateViewModel.cs
View File

@@ -79,4 +79,4 @@ namespace MeoAsstGui
RequestClose();
}
}
}
}

2
MeoAsstGui/Views/MainFunctionView.xaml
View File

@@ -29,4 +29,4 @@
<!-- RunStatus -->
<!-- RunStatus-->
</Grid>
</UserControl>
</UserControl>

2
MeoAsstGui/Views/RecruitView.xaml
View File

@@ -30,4 +30,4 @@
<Button Command="{s:Action StartCalc}" Content="开始计算" Margin="30" HorizontalAlignment="Center" VerticalAlignment="Center" Width="150" Height="60" />
</StackPanel>
</Grid>
</UserControl>
</UserControl>

2
MeoAsstGui/Views/RootView.xaml
View File

@@ -9,4 +9,4 @@
<DockPanel>
<TabControl Style="{StaticResource StyletConductorTabControl}" Margin="0,10,0,0" />
</DockPanel>
</Window>
</Window>

2
MeoAsstGui/Views/VersionUpdateView.xaml
View File

@@ -25,4 +25,4 @@
<Button Command="{s:Action Close}" Content="下次一定" Margin="20" Width="120" Height="60" />
</StackPanel>
</Grid>
</Window>
</Window>

2
resource/config.json
View File

@@ -617,4 +617,4 @@
[ "艾丝莱尔", "艾丝黛尔" ],
[ "，斑点", "斑点" ]
]
}
}