From 6bc4163b2b69f47f86b60633230de973dbba0b63 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 9 May 2022 00:32:29 +0800 Subject: [PATCH 01/24] =?UTF-8?q?fix.=E6=9B=B4=E6=96=B0=E4=BC=81=E9=B9=85?= =?UTF-8?q?=E8=AF=86=E5=88=AB=E5=BA=93=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E8=AF=86=E5=88=AB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../include/penguin-stats-recognize/depot.hpp | 8 +- .../penguin-stats-recognize/recognize.hpp | 9 +- .../penguin-stats-recognize/recognizer.hpp | 8 +- .../penguin-stats-recognize/result.hpp | 125 +++++++++++------- 4 files changed, 92 insertions(+), 58 deletions(-) diff --git a/3rdparty/include/penguin-stats-recognize/depot.hpp b/3rdparty/include/penguin-stats-recognize/depot.hpp index b2ab6b3c59..704a51de9d 100644 --- a/3rdparty/include/penguin-stats-recognize/depot.hpp +++ b/3rdparty/include/penguin-stats-recognize/depot.hpp @@ -16,6 +16,7 @@ using dict = nlohmann::ordered_json; namespace penguin { + enum CircleFlags { X = 0, @@ -36,7 +37,7 @@ public: _get_item_list(); return *this; } - const dict report([[maybe_unused]] bool debug = false) + const dict report(bool debug = false) { dict _report = dict::object(); return _report; @@ -112,7 +113,7 @@ private: } } } - _item_diameter = static_cast(round(cv::mean(item_circles)[R] * 2)); + _item_diameter = round(cv::mean(item_circles)[R] * 2); for (const cv::Vec3i& c : item_circles) { @@ -127,7 +128,7 @@ private: // show_img(img_blur); int radius = _item_diameter / 2; - int offset = static_cast(radius * 1.2); + int offset = radius * 1.2; ItemTemplates templs; for (const cv::Vec3i& c : item_circles) { @@ -156,6 +157,7 @@ private: // show_img(_img_ext); } }; + } // namespace penguin #endif // PENGUIN_DEPOT_HPP_ diff --git a/3rdparty/include/penguin-stats-recognize/recognize.hpp b/3rdparty/include/penguin-stats-recognize/recognize.hpp index bd0327d908..e8e0acec3a 100644 --- a/3rdparty/include/penguin-stats-recognize/recognize.hpp +++ b/3rdparty/include/penguin-stats-recognize/recognize.hpp @@ -15,6 +15,7 @@ using dict = nlohmann::ordered_json; namespace penguin { + enum class StatusFlags { NORMAL = 0, @@ -842,9 +843,11 @@ private: } void _get_quantity() { - cv::Rect quantityrect = cv::Rect(0, static_cast(round(height * _ITEM_QTY_Y_PROP)), - static_cast(round(width * _ITEM_QTY_WIDTH_PROP)), - static_cast(round(height * _ITEM_QTY_HEIGHT_PROP))); + cv::Rect quantityrect = + cv::Rect(0, + static_cast(round(height * _ITEM_QTY_Y_PROP)), + static_cast(round(width * _ITEM_QTY_WIDTH_PROP)), + static_cast(round(height * _ITEM_QTY_HEIGHT_PROP))); cv::Mat quantityimg = _img(quantityrect); _quantity.set_img(quantityimg); _quantity.analyze(); diff --git a/3rdparty/include/penguin-stats-recognize/recognizer.hpp b/3rdparty/include/penguin-stats-recognize/recognizer.hpp index 070664a2c2..1ec99ff572 100644 --- a/3rdparty/include/penguin-stats-recognize/recognizer.hpp +++ b/3rdparty/include/penguin-stats-recognize/recognizer.hpp @@ -18,7 +18,13 @@ #include "depot.hpp" #include "result.hpp" -static const std::string version = "4.2.3"; +#ifdef PENGUIN_RECOGNIZER_RELEASE_VERSION +#define PENGUIN_RECOGNIZER_VERSION_STRING PENGUIN_RECOGNIZER_RELEASE_VERSION +#else +#define PENGUIN_RECOGNIZER_VERSION_STRING "v0.0.0" +#endif + +static const std::string version = PENGUIN_RECOGNIZER_VERSION_STRING; static const std::string opencv_version = CV_VERSION; cv::Mat decode(std::string JSarrayBuffer) diff --git a/3rdparty/include/penguin-stats-recognize/result.hpp b/3rdparty/include/penguin-stats-recognize/result.hpp index 0d9a639550..ae40bbbeb7 100644 --- a/3rdparty/include/penguin-stats-recognize/result.hpp +++ b/3rdparty/include/penguin-stats-recognize/result.hpp @@ -31,7 +31,7 @@ const double DROP_AREA_X_PROP = 0.21; const double DROP_AREA_Y_PROP = 0.2; const double DROP_AREA_HEIGHT_PROP = 0.8; const double ITEM_DIAMETER_PROP = 0.524; -const double W_H_PROP = 7; +const double W_H_PROP = 6.5; enum DroptypeFlags { @@ -201,7 +201,7 @@ public: } private: - size_t _stars = 0; + int _stars = 0; void _get_is_3stars() { auto& self = *this; @@ -232,7 +232,7 @@ private: star_rect.width = sp.back().end - star_rect.x; _img = star_img = star_img(star_rect); self._relate(star_rect.tl()); - _stars = sp.size(); + _stars = static_cast(sp.size()); } }; @@ -612,7 +612,7 @@ private: { continue; } - int dist = static_cast(abs(kh - hsv[H])); + int dist = static_cast(round(abs(kh - hsv[H]))); _candidates.emplace_back(vtype, dist); } std::sort(_candidates.begin(), _candidates.end(), @@ -751,11 +751,23 @@ public: const int items_count() const { return _items_count; } Widget_Droptype() = default; Widget_Droptype(const cv::Mat& img, const std::string& label, Widget* const parent_widget = nullptr) - : WidgetWithCandidate(img, label, parent_widget) {} + : WidgetWithCandidate(label, parent_widget) + { + set_img(img); + } + void set_img(const cv::Mat& img) + { + cv::Mat img_bin = img; + cv::cvtColor(img_bin, img_bin, cv::COLOR_BGR2GRAY); + cv::threshold(img_bin, img_bin, 127, 255, cv::THRESH_BINARY); + int bottom = separate(img_bin, DirectionFlags::BOTTOM, 1)[0].end; + Widget::set_img(img(cv::Rect(0, 0, img.cols, bottom))); + } Widget_Droptype& analyze() { if (!_img.empty()) { + _get_items_count(); _get_candidates(); } if (const auto type = droptype(); @@ -790,7 +802,7 @@ public: } private: - int _items_count = static_cast(round(width / (height * W_H_PROP))); + int _items_count = 0; Widget_DroptypeLine _line {this}; Widget_DroptypeText _text {this}; void _get_candidates() @@ -809,6 +821,10 @@ private: _candidates = _text.candidates(); } } + void _get_items_count() + { + _items_count = static_cast(round(width / (height * W_H_PROP))); + } }; class Widget_DropArea : public Widget @@ -827,8 +843,7 @@ public: : Widget("dropArea", parent_widget) {} Widget_DropArea(const cv::Mat& img, Widget* const parent_widget = nullptr) : Widget(img, "dropArea", parent_widget) {} - Widget_DropArea& analyze(const std::string& stage, - const std::string& difficulty) + Widget_DropArea& analyze(const std::string& stage) { if (!_img.empty()) { @@ -849,7 +864,7 @@ public: widget_label = "droptypes"; push_exception(ERROR, ExcSubtypeFlags::EXC_ILLEGAL); } - _get_drops(stage, difficulty); + _get_drops(stage); } else { @@ -995,7 +1010,7 @@ private: _droptype_list = q.top(); } - void _get_drops(const std::string& stage, [[maybe_unused]] const std::string& difficulty) + void _get_drops(const std::string& stage) { if (_status == StatusFlags::HAS_ERROR || _status == StatusFlags::ERROR) { @@ -1015,10 +1030,10 @@ private: { continue; } - else if (std::string label = - "drops." + std::to_string(_drop_list.size()); - type == DroptypeFlags::FURNITURE) + else if (type == DroptypeFlags::FURNITURE) { + std::string label = + "drops." + std::to_string(_drop_list.size()); _drop_list.emplace_back( Drop(Widget_Item(FURNI_1, label, this), type)); } @@ -1034,13 +1049,13 @@ private: int length = (droptype.width) / items_count; for (int i = 0; i < items_count; i++) { - std::string cur_label = + std::string label = "drops." + std::to_string(_drop_list.size()); auto range = cv::Range(droptype.x - x + length * i, droptype.x - x + length * (i + 1)); auto dropimg = _img(cv::Range(0, droptype.y - y), range); - Widget_Item drop {dropimg, item_diameter, cur_label, this}; + Widget_Item drop {dropimg, item_diameter, label, this}; drop.analyze(templs); _drop_list.emplace_back(drop, type); _drops_data.push_back({{"dropType", Droptype2Str[type]}, @@ -1216,10 +1231,10 @@ private: } const auto& bv = _baseline_v; auto drop_area_img = _img( - cv::Range(static_cast(bv.y + bv.height * DROP_AREA_Y_PROP), bv.y + bv.height), - cv::Range(static_cast(bv.x + bv.height * DROP_AREA_X_PROP), width)); + cv::Range(bv.y + static_cast(bv.height * DROP_AREA_Y_PROP), bv.y + bv.height), + cv::Range(bv.x + static_cast(bv.height * DROP_AREA_X_PROP), width)); _drop_area.set_img(drop_area_img); - _drop_area.analyze(_stage.stage_code(), "NORMAL"); + _drop_area.analyze(_stage.stage_code()); } }; @@ -1285,11 +1300,10 @@ private: { return; } - cv::Mat img_bin = _img(cv::Rect( - 0, - static_cast(0.2 * height), - static_cast(0.2 * width), - static_cast(0.4 * height))); + cv::Mat img_bin = _img(cv::Rect(0, + static_cast(0.2 * height), + static_cast(0.2 * width), + static_cast(0.4 * height))); cv::cvtColor(img_bin, img_bin, cv::COLOR_BGR2GRAY); cv::threshold(img_bin, img_bin, 120, 255, cv::THRESH_BINARY); @@ -1309,8 +1323,9 @@ private: abs(img_temp.cols - last_height) <= 1 && abs(first_height - last_height) <= 1) { - baseline_v_rect = cv::Rect(range.start, sp2.front().start + static_cast(0.2 * height), - img_temp.cols, sp2.back().end - sp2.front().start); + baseline_v_rect = + cv::Rect(range.start, sp2.front().start + static_cast(0.2 * height), + img_temp.cols, sp2.back().end - sp2.front().start); break; } } @@ -1336,11 +1351,10 @@ private: : x(x_), y(y_), width(width_), height(height_), area(area_) {} }; - cv::Mat img_bin = _img(cv::Rect( - 0, - static_cast(0.2 * height), - static_cast(0.2 * width), - static_cast(0.4 * height))); + cv::Mat img_bin = _img(cv::Rect(0, + static_cast(0.2 * height), + static_cast(0.2 * width), + static_cast(0.4 * height))); cv::cvtColor(img_bin, img_bin, cv::COLOR_BGR2GRAY); cv::threshold(img_bin, img_bin, 120, 255, cv::THRESH_BINARY); cv::Mat _; @@ -1381,10 +1395,11 @@ private: { if (ccomps[0].x == ccomps[1].x) { - baseline_v_rect = cv::Rect(ccomps[0].x, - ccomps[0].y + static_cast(0.2 * height), - ccomps[0].width, - ccomps[1].y - ccomps[0].y + ccomps[1].height); + baseline_v_rect = + cv::Rect(ccomps[0].x, + ccomps[0].y + static_cast(0.2 * height), + ccomps[0].width, + ccomps[1].y - ccomps[0].y + ccomps[1].height); } } else if (const auto ccsize = ccomps.size(); @@ -1393,10 +1408,11 @@ private: for (int i = 0; i < ccsize - 1; ++i) { if (ccomps[i].x == ccomps[i + 1].x) - baseline_v_rect = cv::Rect(ccomps[i].x, - ccomps[i].y + static_cast(0.2 * height), - ccomps[i].width, - ccomps[i + 1].y - ccomps[i].y + ccomps[i + 1].height); + baseline_v_rect = + cv::Rect(ccomps[i].x, + ccomps[i].y + static_cast(0.2 * height), + ccomps[i].width, + ccomps[i + 1].y - ccomps[i].y + ccomps[i + 1].height); } } @@ -1420,8 +1436,9 @@ private: } const auto& bv = _baseline_v; int left_margin = bv.x + bv.width; - auto result_img = _img(cv::Range(bv.y, bv.y + bv.height / 2), - cv::Range(left_margin, static_cast(left_margin + 1.5 * bv.height))); + auto result_img = + _img(cv::Range(bv.y, bv.y + bv.height / 2), + cv::Range(left_margin, left_margin + static_cast(1.5 * bv.height))); cv::Mat img_bin; cv::cvtColor(result_img, img_bin, cv::COLOR_BGR2GRAY); cv::threshold(img_bin, img_bin, 200, 255, cv::THRESH_BINARY); @@ -1438,8 +1455,9 @@ private: } const auto& bv = _baseline_v; int left_margin = bv.x + bv.width; - auto star_img = _img(cv::Range(bv.y + bv.height / 2, bv.y + bv.height), - cv::Range(left_margin, static_cast(left_margin + 1.2 * bv.height))); + auto star_img = + _img(cv::Range(bv.y + bv.height / 2, bv.y + bv.height), + cv::Range(left_margin, left_margin + static_cast(1.2 * bv.height))); cv::Mat img_bin; cv::cvtColor(star_img, img_bin, cv::COLOR_BGR2GRAY); cv::threshold(img_bin, img_bin, 127, 255, cv::THRESH_BINARY); @@ -1456,9 +1474,10 @@ private: } const auto& bv = _baseline_v; int left_margin = bv.x + bv.width; - auto stage_img = _img(cv::Range(0, bv.y), - cv::Range(static_cast(left_margin + 0.43 * bv.height), - static_cast(left_margin + 1.5 * bv.height))); + auto stage_img = + _img(cv::Range(0, bv.y), + cv::Range(left_margin + static_cast(0.43 * bv.height), + left_margin + static_cast(1.5 * bv.height))); cv::Mat img_bin; cv::cvtColor(stage_img, img_bin, cv::COLOR_BGR2GRAY); cv::threshold(img_bin, img_bin, 200, 255, cv::THRESH_BINARY); @@ -1475,8 +1494,9 @@ private: } const auto& bv = _baseline_v; int left_margin = bv.x + bv.width; - auto diff_img = _img(cv::Range(0, bv.y), - cv::Range(left_margin, static_cast(left_margin + 0.43 * bv.height))); + auto diff_img = + _img(cv::Range(0, bv.y), + cv::Range(left_margin, left_margin + static_cast(0.43 * bv.height))); cv::Mat img_bin; cv::cvtColor(diff_img, img_bin, cv::COLOR_BGR2GRAY); cv::threshold(img_bin, img_bin, 64, 255, cv::THRESH_BINARY); @@ -1492,19 +1512,22 @@ private: return; } const auto& bv = _baseline_v; - cv::Mat img_bin = _img(cv::Range(bv.y + bv.height, height), - cv::Range(bv.x + bv.width, static_cast(0.2 * width))); + cv::Mat img_bin = + _img(cv::Range(bv.y + bv.height, height), + cv::Range(bv.x + bv.width, static_cast(0.2 * width))); cv::cvtColor(img_bin, img_bin, cv::COLOR_BGR2GRAY); cv::threshold(img_bin, img_bin, 127, 255, cv::THRESH_BINARY); auto sp = separate(img_bin, DirectionFlags::TOP, 2); int top_margin = bv.y + bv.height + sp[1].start; auto drop_area_img = _img( - cv::Range(top_margin + static_cast(bv.height * DROP_AREA_Y_PROP), top_margin + bv.height), + cv::Range(top_margin + static_cast(bv.height * DROP_AREA_Y_PROP), + top_margin + bv.height), cv::Range(bv.x + bv.width, width)); _drop_area.set_img(drop_area_img); - _drop_area.analyze(_stage.stage_code(), _difficutly.difficulty()); + _drop_area.analyze(_stage.stage_code()); } }; + } // namespace penguin #endif // PENGUIN_RESULT_HPP_ From 7bd8a0d0599149dcc6d35b17bf7ac236d912822e Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 9 May 2022 00:33:22 +0800 Subject: [PATCH 02/24] =?UTF-8?q?chore.=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7v3.3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/Version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAssistant/Version.h b/src/MeoAssistant/Version.h index efb55c9201..f2a33f6ba9 100644 --- a/src/MeoAssistant/Version.h +++ b/src/MeoAssistant/Version.h @@ -2,5 +2,5 @@ namespace asst { - constexpr static const char* Version = "v3.3.1"; + constexpr static const char* Version = "v3.3.2"; } From a2d6617a0fca66df5f07012ff12bb89c873970d1 Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Sun, 8 May 2022 01:26:06 +0800 Subject: [PATCH 03/24] =?UTF-8?q?chore.=E4=BF=AE=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=96=87=E4=BB=B6=E4=BB=A5=E9=80=82=E9=85=8D=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E5=B7=A5=E5=85=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + MeoAssistantArknights.sln | 55 +- src/MeoAssistant/MeoAssistant.vcxproj | 617 ++++++++++-------- src/MeoAsstGui/MeoAsstGui.csproj | 60 +- .../Properties/Resources.Designer.cs | 72 -- src/MeoAsstGui/Properties/Resources.resx | 117 ---- .../Properties/Settings.Designer.cs | 30 - src/MeoAsstGui/Properties/Settings.settings | 7 - 8 files changed, 393 insertions(+), 566 deletions(-) delete mode 100644 src/MeoAsstGui/Properties/Resources.Designer.cs delete mode 100644 src/MeoAsstGui/Properties/Resources.resx delete mode 100644 src/MeoAsstGui/Properties/Settings.Designer.cs delete mode 100644 src/MeoAsstGui/Properties/Settings.settings diff --git a/.gitignore b/.gitignore index 025aa6f8be..77f946f4f5 100644 --- a/.gitignore +++ b/.gitignore @@ -436,3 +436,4 @@ adb_screen.png tools/**/*.png resource/infrast .vscode +!3rdparty/tools/* diff --git a/MeoAssistantArknights.sln b/MeoAssistantArknights.sln index 513ca97847..a2deaf4e91 100644 --- a/MeoAssistantArknights.sln +++ b/MeoAssistantArknights.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31515.178 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32414.318 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{6C4B8D52-51D1-45F8-AAEC-808035443FD6}" EndProject @@ -11,9 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCaller", "tools\TestCal EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeoAsstGui", "src\MeoAsstGui\MeoAsstGui.csproj", "{FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}" - ProjectSection(ProjectDependencies) = postProject - {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300} - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TransparentImageCvt", "tools\TransparentImageCvt\TransparentImageCvt.vcxproj", "{093A3174-A27E-4D23-B64E-16F9448AD5AC}" EndProject @@ -24,44 +21,52 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MeoAssistantBuilder", "src\MeoAssistantBuilder\MeoAssistantBuilder.csproj", "{8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + CICD|x64 = CICD|x64 + Debug|x64 = Debug|x64 Release|x64 = Release|x64 - Release|x86 = Release|x86 RelWithDebInfo|x64 = RelWithDebInfo|x64 - RelWithDebInfo|x86 = RelWithDebInfo|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.CICD|x64.ActiveCfg = RelWithDebInfo|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.CICD|x64.Build.0 = RelWithDebInfo|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.ActiveCfg = RelWithDebInfo|x64 + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Debug|x64.Build.0 = RelWithDebInfo|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.ActiveCfg = Release|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.Build.0 = Release|x64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x86.ActiveCfg = Release|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64 - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.ActiveCfg = Release|Any CPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.Build.0 = Release|Any CPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x86.ActiveCfg = Release|Any CPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x86.Build.0 = Release|Any CPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|Any CPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|Any CPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU - {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.CICD|x64.ActiveCfg = CICD|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.CICD|x64.Build.0 = CICD|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Debug|x64.ActiveCfg = Release|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.ActiveCfg = Release|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.Release|x64.Build.0 = Release|x64 + {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 + {093A3174-A27E-4D23-B64E-16F9448AD5AC}.CICD|x64.ActiveCfg = Release|x64 + {093A3174-A27E-4D23-B64E-16F9448AD5AC}.CICD|x64.Build.0 = Release|x64 + {093A3174-A27E-4D23-B64E-16F9448AD5AC}.Debug|x64.ActiveCfg = Release|x64 + {093A3174-A27E-4D23-B64E-16F9448AD5AC}.Debug|x64.Build.0 = Release|x64 {093A3174-A27E-4D23-B64E-16F9448AD5AC}.Release|x64.ActiveCfg = Release|x64 {093A3174-A27E-4D23-B64E-16F9448AD5AC}.Release|x64.Build.0 = Release|x64 - {093A3174-A27E-4D23-B64E-16F9448AD5AC}.Release|x86.ActiveCfg = Release|Win32 - {093A3174-A27E-4D23-B64E-16F9448AD5AC}.Release|x86.Build.0 = Release|Win32 {093A3174-A27E-4D23-B64E-16F9448AD5AC}.RelWithDebInfo|x64.ActiveCfg = Release|x64 {093A3174-A27E-4D23-B64E-16F9448AD5AC}.RelWithDebInfo|x64.Build.0 = Release|x64 - {093A3174-A27E-4D23-B64E-16F9448AD5AC}.RelWithDebInfo|x86.ActiveCfg = Release|Win32 - {093A3174-A27E-4D23-B64E-16F9448AD5AC}.RelWithDebInfo|x86.Build.0 = Release|Win32 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.CICD|x64.ActiveCfg = CICD|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.CICD|x64.Build.0 = CICD|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.ActiveCfg = RelWithDebInfo|x64 + {362D1E30-F5AE-4279-9985-65C27B3BA300}.Debug|x64.Build.0 = RelWithDebInfo|x64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.ActiveCfg = Release|x64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x64.Build.0 = Release|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x86.ActiveCfg = Release|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.Release|x86.Build.0 = Release|x64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64 - {362D1E30-F5AE-4279-9985-65C27B3BA300}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x64 + {8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.CICD|x64.ActiveCfg = Release|x64 + {8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.CICD|x64.Build.0 = Release|x64 + {8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.Debug|x64.ActiveCfg = Debug|x64 + {8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.Release|x64.ActiveCfg = Release|x64 + {8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.Release|x64.Build.0 = Release|x64 + {8D9036DD-75F1-4BD0-89E2-DFB37B925DA3}.RelWithDebInfo|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index d3be7e62ce..bc44ff174b 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -1,280 +1,337 @@ - - - - - Release - x64 - - - RelWithDebInfo - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 16.0 - Win32Proj - {362d1e30-f5ae-4279-9985-65c27b3ba300} - MeoAssistant - 10.0 - - - - DynamicLibrary - false - v143 - true - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - false - $(SolutionDir)include;$(SolutionDir)3rdparty\include;$(IncludePath) - $(TargetDir);$(SolutionDir)\3rdparty\lib;$(LibraryPath) - - - false - $(SolutionDir)include;$(SolutionDir)3rdparty\include;$(IncludePath) - $(TargetDir);$(SolutionDir)\3rdparty\lib;$(LibraryPath) - - - - Level4 - true - true - true - NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - MaxSpeed - /utf-8 /MP %(AdditionalOptions) - - - Console - true - true - true - ppocr.lib;opencv_world453.lib;zlibstatic.lib;%(AdditionalDependencies) - RequireAdministrator - - - true - msvcrt.lib - - - - - - - xcopy /e /y /i /c $(SolutionDir)resource $(TargetDir)resource -xcopy /e /y /i /c $(SolutionDir)3rdparty\resource $(TargetDir)resource - - - copy resource - - - xcopy /e /y /i /c $(SolutionDir)3rdparty\bin $(TargetDir) - - - copy 3rd party dll - - - - - Level4 - - - false - true - NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;ASST_DEBUG;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - Disabled - true - EnableFastChecks - /utf-8 /MP %(AdditionalOptions) - - - Console - true - true - true - ppocr.lib;opencv_world453.lib;zlibstatic.lib;%(AdditionalDependencies) - RequireAdministrator - - - true - msvcrt.lib - - - - - - - xcopy /e /y /i /c $(SolutionDir)resource $(TargetDir)resource -xcopy /e /y /i /c $(SolutionDir)3rdparty\resource $(TargetDir)resource - - - copy resource - - - xcopy /e /y /i /c $(SolutionDir)3rdparty\bin $(TargetDir) - - - copy 3rd party dll - - - - - - - - - - - \ No newline at end of file + + + + + Release + x64 + + + RelWithDebInfo + x64 + + + CICD + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 16.0 + Win32Proj + {362d1e30-f5ae-4279-9985-65c27b3ba300} + MeoAssistant + 10.0 + + + + DynamicLibrary + false + v143 + true + Unicode + + + DynamicLibrary + false + v143 + true + Unicode + + + DynamicLibrary + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + false + $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(IncludePath) + $(TargetDir);$(ProjectDir)..\..\3rdparty\lib;$(LibraryPath) + $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(IncludePath) + $(TargetDir);$(ProjectDir)..\..\3rdparty\lib;$(LibraryPath) + $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + + + false + $(ProjectDir)..\..\include;$(ProjectDir)..\..\3rdparty\include;$(IncludePath) + $(TargetDir);$(ProjectDir)..\..\3rdparty\lib;$(LibraryPath) + $(ProjectDir)..\..\$(Platform)\$(Configuration)\ + + + + Level4 + true + true + true + NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + MaxSpeed + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + ppocr.lib;opencv_world453.lib;zlibstatic.lib;%(AdditionalDependencies) + RequireAdministrator + + + true + msvcrt.lib + + + + + + + + xcopy /e /y /i /c $(ProjectDir)..\..\resource $(TargetDir)resource + xcopy /e /y /i /c $(ProjectDir)..\..\3rdparty\resource $(TargetDir)resource + + + + Copy resource + + + + xcopy /e /y /i /c $(ProjectDir)..\..\3rdparty\bin $(TargetDir) + + + + Copy 3rd party dll + + + + + Level4 + true + true + true + NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + MaxSpeed + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + ppocr.lib;opencv_world453.lib;zlibstatic.lib;%(AdditionalDependencies) + RequireAdministrator + + + true + msvcrt.lib + + + + + Level4 + + + false + true + NDEBUG;_CONSOLE;ASST_DLL_EXPORTS;ASST_DEBUG;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + Disabled + true + EnableFastChecks + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + ppocr.lib;opencv_world453.lib;zlibstatic.lib;%(AdditionalDependencies) + RequireAdministrator + + + true + msvcrt.lib + + + + + + + + xcopy /e /y /i /c $(ProjectDir)..\..\resource $(TargetDir)resource + xcopy /e /y /i /c $(ProjectDir)..\..\3rdparty\resource $(TargetDir)resource + + + + Copy resource + + + + xcopy /e /y /i /c $(ProjectDir)..\..\3rdparty\bin $(TargetDir) + + + + Copy 3rd party dll + + + + + + + + + + + diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj index 7d8ee09952..500b1633c0 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MeoAsstGui.csproj @@ -38,23 +38,25 @@ false true - - x64 - pdbonly - true - ..\..\x64\Release\ - TRACE - prompt - 4 - false - - Always + OnBuildSuccess newlogo.ico - + + MeoAsstGui.App + + + ..\..\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + + ..\..\x64\RelWithDebInfo\ DEBUG;TRACE false @@ -63,8 +65,15 @@ 7.3 prompt - - MeoAsstGui.App + + ..\..\x64\CICD\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + true @@ -225,26 +234,7 @@ Code - - True - True - Resources.resx - - - True - Settings.settings - True - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - SettingsSingleFileGenerator - Settings.Designer.cs - @@ -252,7 +242,7 @@ False - Microsoft .NET Framework 4.7.2 %28x86 和 x64%29 + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 true @@ -417,6 +407,6 @@ - xcopy /e /y /i /c $(SolutionDir)resource $(TargetDir)resource + xcopy /e /y /i /c $(ProjectDir)..\..\3rdparty\tools $(TargetDir) \ No newline at end of file diff --git a/src/MeoAsstGui/Properties/Resources.Designer.cs b/src/MeoAsstGui/Properties/Resources.Designer.cs deleted file mode 100644 index 18701c716e..0000000000 --- a/src/MeoAsstGui/Properties/Resources.Designer.cs +++ /dev/null @@ -1,72 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace MeoAsstGui.Properties -{ - using System; - - - /// - /// 一个强类型的资源类，用于查找本地化的字符串等。 - /// - // 此类是由 StronglyTypedResourceBuilder - // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 - // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen - // (以 /str 作为命令选项)，或重新生成 VS 项目。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { - } - - /// - /// 返回此类使用的缓存的 ResourceManager 实例。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if (object.ReferenceEquals(resourceMan, null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MeoAsstGui.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// 重写当前线程的 CurrentUICulture 属性，对 - /// 使用此强类型资源类的所有资源查找执行重写。 - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { - return resourceCulture; - } - set - { - resourceCulture = value; - } - } - } -} diff --git a/src/MeoAsstGui/Properties/Resources.resx b/src/MeoAsstGui/Properties/Resources.resx deleted file mode 100644 index af7dbebbac..0000000000 --- a/src/MeoAsstGui/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/src/MeoAsstGui/Properties/Settings.Designer.cs b/src/MeoAsstGui/Properties/Settings.Designer.cs deleted file mode 100644 index af956e4392..0000000000 --- a/src/MeoAsstGui/Properties/Settings.Designer.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// 此代码由工具生成。 -// 运行时版本:4.0.30319.42000 -// -// 对此文件的更改可能会导致不正确的行为，并且如果 -// 重新生成代码，这些更改将会丢失。 -// -//------------------------------------------------------------------------------ - -namespace MeoAsstGui.Properties -{ - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { - return defaultInstance; - } - } - } -} diff --git a/src/MeoAsstGui/Properties/Settings.settings b/src/MeoAsstGui/Properties/Settings.settings deleted file mode 100644 index 033d7a5e9e..0000000000 --- a/src/MeoAsstGui/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From 164728eb9cb7e2c2ad686948bcfd5a2e1adc81d4 Mon Sep 17 00:00:00 2001 From: MistEO Date: Mon, 9 May 2022 00:53:55 +0800 Subject: [PATCH 04/24] =?UTF-8?q?chore.=E6=9B=B4=E6=96=B0=E4=BC=81?= =?UTF-8?q?=E9=B9=85=E5=BA=93=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/MaaAssistantArknights/recognizer/commit/cf5ebbc89c84684179a4d2c7e7ccdbc131960a2c --- 3rdparty/include/penguin-stats-recognize/depot.hpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/3rdparty/include/penguin-stats-recognize/depot.hpp b/3rdparty/include/penguin-stats-recognize/depot.hpp index 704a51de9d..6e7d46798e 100644 --- a/3rdparty/include/penguin-stats-recognize/depot.hpp +++ b/3rdparty/include/penguin-stats-recognize/depot.hpp @@ -16,7 +16,6 @@ using dict = nlohmann::ordered_json; namespace penguin { - enum CircleFlags { X = 0, @@ -37,7 +36,7 @@ public: _get_item_list(); return *this; } - const dict report(bool debug = false) + const dict report([[maybe_unused]] bool debug = false) { dict _report = dict::object(); return _report; @@ -113,7 +112,7 @@ private: } } } - _item_diameter = round(cv::mean(item_circles)[R] * 2); + _item_diameter = static_cast(round(cv::mean(item_circles)[R] * 2)); for (const cv::Vec3i& c : item_circles) { @@ -128,7 +127,7 @@ private: // show_img(img_blur); int radius = _item_diameter / 2; - int offset = radius * 1.2; + int offset = static_cast(radius * 1.2); ItemTemplates templs; for (const cv::Vec3i& c : item_circles) { @@ -157,7 +156,6 @@ private: // show_img(_img_ext); } }; - } // namespace penguin -#endif // PENGUIN_DEPOT_HPP_ +#endif // PENGUIN_DEPOT_HPP_ \ No newline at end of file From 311ce4d84969a41076cfd3fa64e0926ef5b69f4a Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 13:05:28 +0800 Subject: [PATCH 05/24] =?UTF-8?q?bump.=E6=B8=85=E7=90=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/MeoAsstGui.csproj | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj index 500b1633c0..9d8e758887 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MeoAsstGui.csproj @@ -76,24 +76,9 @@ true - - ..\..\packages\Costura.Fody.5.6.0\lib\netstandard1.0\Costura.dll - - - ..\..\packages\gong-wpf-dragdrop.2.4.1\lib\net47\GongSolutions.WPF.DragDrop.dll - - - ..\..\packages\HandyControl.3.2.0\lib\net472\HandyControl.dll - - - ..\..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\Stylet.1.3.6\lib\net45\Stylet.dll - @@ -261,13 +246,13 @@ all - 2.4.3 + 3.1.1 3.3.0 - 5.0.4 + 6.0.3 4.3.0 @@ -279,7 +264,7 @@ 13.0.1 - 6.1.0.1 + 6.1.0.5 1.3.6 @@ -300,7 +285,7 @@ 4.3.0 - 5.0.1 + 6.0.0 4.3.0 From 4de65cc66ec0ac4b88d684fdb1e0bf5743f50393 Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 13:05:46 +0800 Subject: [PATCH 06/24] =?UTF-8?q?feat.=E6=B7=BB=E5=8A=A0=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistantBuilder/Constants.cs | 23 ++++ .../Helper/BuildCoreHelper.cs | 17 +++ .../Helper/BuildWpfHelper.cs | 18 ++++ .../Helper/CleanDirectoryHelper.cs | 60 +++++++++++ .../Helper/FileCopyHelper.cs | 53 +++++++++ .../Helper/GetBuildInformationHelper.cs | 38 +++++++ src/MeoAssistantBuilder/MaaBuildContext.cs | 28 +++++ .../MeoAssistantBuilder.csproj | 17 +++ src/MeoAssistantBuilder/Program.cs | 15 +++ src/MeoAssistantBuilder/README.md | 23 ++++ src/MeoAssistantBuilder/Tasks/DevBuildTask.cs | 78 ++++++++++++++ .../Tasks/ReleaseCoreTask.cs | 102 ++++++++++++++++++ .../Tasks/ReleaseResourceTask.cs | 58 ++++++++++ .../Tasks/ReleaseWpfTask.cs | 61 +++++++++++ 14 files changed, 591 insertions(+) create mode 100644 src/MeoAssistantBuilder/Constants.cs create mode 100644 src/MeoAssistantBuilder/Helper/BuildCoreHelper.cs create mode 100644 src/MeoAssistantBuilder/Helper/BuildWpfHelper.cs create mode 100644 src/MeoAssistantBuilder/Helper/CleanDirectoryHelper.cs create mode 100644 src/MeoAssistantBuilder/Helper/FileCopyHelper.cs create mode 100644 src/MeoAssistantBuilder/Helper/GetBuildInformationHelper.cs create mode 100644 src/MeoAssistantBuilder/MaaBuildContext.cs create mode 100644 src/MeoAssistantBuilder/MeoAssistantBuilder.csproj create mode 100644 src/MeoAssistantBuilder/Program.cs create mode 100644 src/MeoAssistantBuilder/README.md create mode 100644 src/MeoAssistantBuilder/Tasks/DevBuildTask.cs create mode 100644 src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs create mode 100644 src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs create mode 100644 src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs diff --git a/src/MeoAssistantBuilder/Constants.cs b/src/MeoAssistantBuilder/Constants.cs new file mode 100644 index 0000000000..7b67b1daf4 --- /dev/null +++ b/src/MeoAssistantBuilder/Constants.cs @@ -0,0 +1,23 @@ +namespace MeoAssistantBuilder; + +public static class Constants +{ + public const string MaaProjectRootDirectory = "../../"; + public const string MaaProjectThirdPartyDirectory = "../../3rdparty"; + public const string MaaProjectResourceDirectory = "../../resource"; + public const string MaaProjectArtifactDirectory = "../../artifacts"; + + public const string MaaCoreProjectDirectory = "../MeoAssistant"; + public const string MaaWpfProjectDirectory = "../MeoAsstGui"; + + public const string MaaCoreProjectFilePath = $"{MaaCoreProjectDirectory}/MeoAssistant.vcxproj"; + public const string MaaWpfProjectFilePath = $"{MaaWpfProjectDirectory}/MeoAsstGui.csproj"; + + public const string MaaBuildOutputDirectory = $"{MaaProjectRootDirectory}/x64"; + + public const string MaaCoreBuildIntermediatOutputDirectory = $"{MaaCoreProjectDirectory}/x64"; + + public static readonly string[] MaaCoreExtraFiles = new [] { "MeoAssistant.pdb", "MeoAssistant.lib", "MeoAssistant.exp" }; + + public static readonly string[] MaaWpfExtraFiles = new[] { "MeoAsstGui.pdb", "MeoAsstGui.exe.config" }; +} diff --git a/src/MeoAssistantBuilder/Helper/BuildCoreHelper.cs b/src/MeoAssistantBuilder/Helper/BuildCoreHelper.cs new file mode 100644 index 0000000000..078a94f099 --- /dev/null +++ b/src/MeoAssistantBuilder/Helper/BuildCoreHelper.cs @@ -0,0 +1,17 @@ +using Cake.Common.Tools.MSBuild; + +namespace MeoAssistantBuilder.Helper; + +public static class BuildCoreHelper +{ + public static void BuildCore(this MaaBuildContext context, string configuration) + { + context.MSBuild(Constants.MaaCoreProjectFilePath, new MSBuildSettings + { + WorkingDirectory = Constants.MaaProjectRootDirectory, + ToolPath = context.MsBuildExecutable, + Configuration = configuration, + PlatformTarget = PlatformTarget.x64 + }); + } +} diff --git a/src/MeoAssistantBuilder/Helper/BuildWpfHelper.cs b/src/MeoAssistantBuilder/Helper/BuildWpfHelper.cs new file mode 100644 index 0000000000..d3ed8f052a --- /dev/null +++ b/src/MeoAssistantBuilder/Helper/BuildWpfHelper.cs @@ -0,0 +1,18 @@ +using Cake.Common.Tools.MSBuild; + +namespace MeoAssistantBuilder.Helper; + +public static class BuildWpfHelper +{ + public static void BuildWpf(this MaaBuildContext context, string configuration) + { + context.MSBuild(Constants.MaaWpfProjectFilePath, new MSBuildSettings + { + WorkingDirectory = Constants.MaaProjectRootDirectory, + Restore = true, + ToolPath = context.MsBuildExecutable, + Configuration = configuration, + PlatformTarget = PlatformTarget.x64 + }); + } +} diff --git a/src/MeoAssistantBuilder/Helper/CleanDirectoryHelper.cs b/src/MeoAssistantBuilder/Helper/CleanDirectoryHelper.cs new file mode 100644 index 0000000000..44611e9631 --- /dev/null +++ b/src/MeoAssistantBuilder/Helper/CleanDirectoryHelper.cs @@ -0,0 +1,60 @@ +using Cake.Common.Diagnostics; +using Cake.Common.IO; + +namespace MeoAssistantBuilder.Helper; +public static class CleanDirectoryHelper +{ + public static void CleanArtifacts(this MaaBuildContext context) + { + context.CleanDirectory(Constants.MaaProjectArtifactDirectory); + if (Directory.Exists(Constants.MaaProjectArtifactDirectory)) + { + Directory.CreateDirectory(Constants.MaaProjectArtifactDirectory); + } + } + + public static void CleanCore(this MaaBuildContext context) + { + context.CleanDirectory(Constants.MaaBuildOutputDirectory); + context.CleanDirectory(Constants.MaaCoreBuildIntermediatOutputDirectory); + } + + public static void CleanWpf(this MaaBuildContext context) + { + context.CleanDirectory(Constants.MaaBuildOutputDirectory); + context.CleanDirectory(Path.Combine(Constants.MaaWpfProjectDirectory, "bin")); + context.CleanDirectory(Path.Combine(Constants.MaaWpfProjectDirectory, "obj")); + } + + public static void CleanAll(this MaaBuildContext context) + { + CleanCore(context); + CleanWpf(context); + } + + public static void RemoveExtraCore(this MaaBuildContext context, string buildOutput) + { + foreach (var extra in Constants.MaaCoreExtraFiles) + { + var file = Path.Combine(buildOutput, extra); + if (File.Exists(file)) + { + File.Delete(file); + context.Information($"Delete file: {file}"); + } + } + } + + public static void RemoveExtraWpf(this MaaBuildContext context, string buildOutput) + { + foreach (var extra in Constants.MaaWpfExtraFiles) + { + var file = Path.Combine(buildOutput, extra); + if (File.Exists(file)) + { + File.Delete(file); + context.Information($"Delete file: {file}"); + } + } + } +} diff --git a/src/MeoAssistantBuilder/Helper/FileCopyHelper.cs b/src/MeoAssistantBuilder/Helper/FileCopyHelper.cs new file mode 100644 index 0000000000..be2e4dcd73 --- /dev/null +++ b/src/MeoAssistantBuilder/Helper/FileCopyHelper.cs @@ -0,0 +1,53 @@ +using Cake.Common.Diagnostics; +using Cake.Common.IO; + +namespace MeoAssistantBuilder.Helper +{ + public static class FileCopyHelper + { + public static void CopyThirdPartyDlls(this MaaBuildContext context, string outputDir) + { + var thirdPartyDlls = Directory.GetFiles(Path.Combine(Constants.MaaProjectThirdPartyDirectory, "bin")); + foreach (var f in thirdPartyDlls) + { + var fileName = new FileInfo(f).Name; + context.CopyFile(f, Path.Combine(outputDir, fileName)); + context.Information($"Copy file: FROM {f} to {Path.Combine(outputDir, fileName)}"); + } + } + + public static void CopyResources(this MaaBuildContext context, string outputDir) + { + var resourceTargetDir = Path.Combine(outputDir, "resource"); + var resourceThirdParty = Path.Combine(Constants.MaaProjectRootDirectory, "3rdparty\\resource"); + var resoutceMaa = Path.Combine(Constants.MaaProjectRootDirectory, "resource"); + + var files = new List(); + var directories = new List(); + + files.AddRange(Directory.GetFiles(resourceThirdParty)); + files.AddRange(Directory.GetFiles(resoutceMaa)); + directories.AddRange(Directory.GetDirectories(resourceThirdParty)); + directories.AddRange(Directory.GetDirectories(resoutceMaa)); + + if (Directory.Exists(resourceTargetDir) is false) + { + Directory.CreateDirectory(resourceTargetDir); + } + + foreach (var f in files) + { + var fileName = new FileInfo(f).Name; + context.CopyFile(f, Path.Combine(resourceTargetDir, fileName)); + context.Information($"Copy file: FROM {f} TO {Path.Combine(resourceTargetDir, fileName)}"); + } + + foreach (var d in directories) + { + var dirName = new DirectoryInfo(d).Name; + context.CopyDirectory(d, Path.Combine(resourceTargetDir, dirName)); + context.Information($"Copy directory: FROM {d} TO {Path.Combine(resourceTargetDir, dirName)}"); + } + } + } +} diff --git a/src/MeoAssistantBuilder/Helper/GetBuildInformationHelper.cs b/src/MeoAssistantBuilder/Helper/GetBuildInformationHelper.cs new file mode 100644 index 0000000000..ac87a4c998 --- /dev/null +++ b/src/MeoAssistantBuilder/Helper/GetBuildInformationHelper.cs @@ -0,0 +1,38 @@ +using Cake.Common.Build; +using Cake.Common.Diagnostics; + +namespace MeoAssistantBuilder.Helper; + +public static class GetBuildInformationHelper +{ + public static (string, string) GetBuildInformation(this MaaBuildContext context) + { + var ghAction = context.GitHubActions(); + + var buildTime = DateTime.UtcNow.AddHours(8); + var bt = buildTime.ToString("yyyy-MM-dd-HH-mm-ss"); + string hash; + + if (ghAction.IsRunningOnGitHubActions) + { + hash = ghAction.Environment.Workflow.Sha.ToLower()[..7]; + } + else + { + try + { + var realPath = new DirectoryInfo(Constants.MaaProjectRootDirectory).FullName; + var repo = new LibGit2Sharp.Repository(realPath); + var commit = repo.Commits.First(); + hash = commit.Sha.ToLower()[..7]; + } + catch (Exception e) + { + context.Warning($"Failed to get git log: {e.Message}"); + hash = "Unknown"; + } + } + + return (bt, hash); + } +} diff --git a/src/MeoAssistantBuilder/MaaBuildContext.cs b/src/MeoAssistantBuilder/MaaBuildContext.cs new file mode 100644 index 0000000000..01044eed84 --- /dev/null +++ b/src/MeoAssistantBuilder/MaaBuildContext.cs @@ -0,0 +1,28 @@ +using Cake.Common; +using Cake.Common.Tools.VSWhere; +using Cake.Core; +using Cake.Core.Diagnostics; +using Cake.Frosting; + +namespace MeoAssistantBuilder; + +public class MaaBuildContext : FrostingContext +{ + public string MsBuildExecutable { get; set; } + + public MaaBuildContext(ICakeContext context) : base(context) + { + MsBuildExecutable = context.Argument("tool", ""); + if (MsBuildExecutable == "") + { + var vsPath = context.VSWhereLatest(); + if (vsPath == null) + { + context.Log.Write(Verbosity.Normal, LogLevel.Fatal, "Can not find Visual Studio install path"); + System.Environment.Exit(-1); + } + MsBuildExecutable = Path.Combine(vsPath.FullPath, "Msbuild\\Current\\Bin\\MsBuild.exe"); + } + context.Log.Information($"Use MsBuild at: {MsBuildExecutable}"); + } +} diff --git a/src/MeoAssistantBuilder/MeoAssistantBuilder.csproj b/src/MeoAssistantBuilder/MeoAssistantBuilder.csproj new file mode 100644 index 0000000000..c8d02f6130 --- /dev/null +++ b/src/MeoAssistantBuilder/MeoAssistantBuilder.csproj @@ -0,0 +1,17 @@ + + + + Exe + net6.0 + enable + disable + x64 + Debug;Release;CICD + + + + + + + + diff --git a/src/MeoAssistantBuilder/Program.cs b/src/MeoAssistantBuilder/Program.cs new file mode 100644 index 0000000000..c14c37d4ef --- /dev/null +++ b/src/MeoAssistantBuilder/Program.cs @@ -0,0 +1,15 @@ +using Cake.Frosting; +using MeoAssistantBuilder; + +var sArgs = new List(); +foreach (var arg in args) +{ + var sa = arg.Split(" ") + .ToList(); + sa.RemoveAll(x => string.IsNullOrEmpty(x) || string.IsNullOrWhiteSpace(x)); + sArgs.AddRange(sa); +} + +return new CakeHost() + .UseContext() + .Run(sArgs); diff --git a/src/MeoAssistantBuilder/README.md b/src/MeoAssistantBuilder/README.md new file mode 100644 index 0000000000..c4288f5cd3 --- /dev/null +++ b/src/MeoAssistantBuilder/README.md @@ -0,0 +1,23 @@ +# MeoAssistantBuilder + +MAA 构建项目 + +## 构建 MAA + +需要安装 +- `.NET SDK 6.0` +- `.NET Framework SDK 4.8` +- `MSVC v143 x64` +- `MSBuild (VS2022)` + +在本项目根目录执行 +``` +dotnet run -- --target +``` + +TARGET 可选项 + +- `DevBuild` +- `ReleaseCore` +- `ReleaseWpf` +- `ReleaseResource` diff --git a/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs b/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs new file mode 100644 index 0000000000..fd5ae6ea8a --- /dev/null +++ b/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs @@ -0,0 +1,78 @@ +using Cake.Common.Build; +using Cake.Common.Diagnostics; +using Cake.Frosting; +using MeoAssistantBuilder.Helper; +using System.IO.Compression; + +namespace MeoAssistantBuilder.Tasks; + +[TaskName("DevBuild")] +public sealed class DevBuildTask : FrostingTask +{ + public override void Run(MaaBuildContext context) + { + context.Information("--------------------------------------------------"); + context.Information("1. Get build information"); + context.Information("--------------------------------------------------"); + + context.CleanArtifacts(); + var (bt, hash) = context.GetBuildInformation(); + var artifact = $"MaaFull-DevBuild-(CONF)-{hash}-{bt}.zip"; + context.Information($"Dev build of commit {hash} at {bt}"); + + context.Information("--------------------------------------------------"); + context.Information("2. Build MaaFull with configuration Release"); + context.Information("--------------------------------------------------"); + + context.CleanAll(); + + context.BuildCore("Release"); + context.BuildWpf("Release"); + var releaseOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "Release"); + var releaseArtifact = Path.Combine(Constants.MaaProjectArtifactDirectory, artifact.Replace("(CONF)", "Release")); + ZipFile.CreateFromDirectory(releaseOutput, releaseArtifact); + + context.Information("--------------------------------------------------"); + context.Information("3. Build MaaFull with configuration RelWithDebInfo"); + context.Information("--------------------------------------------------"); + + context.CleanAll(); + + context.BuildCore("RelWithDebInfo"); + context.BuildWpf("RelWithDebInfo"); + var releaseDebugOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "RelWithDebInfo"); + var releaseDebugArtifact = Path.Combine(Constants.MaaProjectArtifactDirectory, artifact.Replace("(CONF)", "RelWithDebInfo")); + ZipFile.CreateFromDirectory(releaseDebugOutput, releaseDebugArtifact); + + context.Information("--------------------------------------------------"); + context.Information("4. Build MaaFull with configuration CICD"); + context.Information("--------------------------------------------------"); + + context.CleanAll(); + + context.BuildCore("CICD"); + context.BuildWpf("CICD"); + var releaseCiOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "CICD"); + var releaseCiArtifact = Path.Combine(Constants.MaaProjectArtifactDirectory, artifact.Replace("(CONF)", "CICD")); + context.CopyThirdPartyDlls(releaseCiOutput); + context.CopyResources(releaseCiOutput); + ZipFile.CreateFromDirectory(releaseCiOutput, releaseCiArtifact); + + context.Information("--------------------------------------------------"); + context.Information("5. Upload Artifacts"); + context.Information("--------------------------------------------------"); + + var gh = context.GitHubActions(); + if (gh.IsRunningOnGitHubActions) + { + context.Information("Upload artifacts to GitHub Actions"); + gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(releaseArtifact), artifact.Replace("(CONF)", "Release")).Wait(); + gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(releaseDebugArtifact), artifact.Replace("(CONF)", "RelWithDebInfo")).Wait(); + gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(releaseCiArtifact), artifact.Replace("(CONF)", "CICD")).Wait(); + } + else + { + context.Information("Skip"); + } + } +} diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs new file mode 100644 index 0000000000..f2e39cb757 --- /dev/null +++ b/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs @@ -0,0 +1,102 @@ +using Cake.Common.Build; +using Cake.Common.Diagnostics; +using Cake.Frosting; +using MeoAssistantBuilder.Helper; +using System.IO.Compression; +using System.Text.RegularExpressions; + +namespace MeoAssistantBuilder.Tasks; + +[TaskName("ReleaseCore")] +public sealed class ReleaseCoreTask : FrostingTask +{ + public override void Run(MaaBuildContext context) + { + context.Information("--------------------------------------------------"); + context.Information("1. Build MaaCore with CICD configuration"); + context.Information("--------------------------------------------------"); + + context.CleanCore(); + context.CleanArtifacts(); + context.BuildCore("CICD"); + + context.Information("--------------------------------------------------"); + context.Information("2. Remove extra files from build output"); + context.Information("--------------------------------------------------"); + + var buildOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "CICD"); + context.RemoveExtraCore(buildOutput); + + context.Information("--------------------------------------------------"); + context.Information("3. Copy 3rd party library DLLs to output directory"); + context.Information("--------------------------------------------------"); + + var thirdPartyDlls = Directory.GetFiles(Path.Combine(Constants.MaaProjectThirdPartyDirectory, "bin")); + foreach(var f in thirdPartyDlls) + { + var fileName = new FileInfo(f).Name; + File.Copy(f, Path.Combine(buildOutput, fileName)); + context.Information($"Copy file: FROM {f} to {Path.Combine(buildOutput, fileName)}"); + } + + context.Information("--------------------------------------------------"); + context.Information("4. Read MaaCore version string"); + context.Information("--------------------------------------------------"); + + var version = "UNKNOWN"; + var versionFile = Path.Combine(Constants.MaaCoreProjectDirectory, "Version.h"); + var versionFileContent = File.ReadAllText(versionFile); + + var regex = @"v((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"; + + var match = Regex.Match(versionFileContent, regex); + if (match.Success is false) + { + context.Warning("Can not read version"); + Environment.Exit(-1); + } + else + { + version = match.Value; + } + + var ghActions = context.GitHubActions(); + if (ghActions.IsRunningOnGitHubActions is false) + { + version += "-Local"; + } + else + { + if (ghActions.Environment.Workflow.Workflow != "Release MaaCore") + { + version += $"-{ghActions.Environment.Workflow.RunId}"; + } + } + + context.Information($"MaaCore Version: {version}"); + + context.Information("--------------------------------------------------"); + context.Information("5. Bundle MaaCore DLLs"); + context.Information("--------------------------------------------------"); + + var bundle = Path.Combine(Constants.MaaProjectArtifactDirectory, $"MaaCore-{version}.zip"); + ZipFile.CreateFromDirectory(buildOutput, bundle); + + context.Information($"Bundled MAACore DLLs file: {bundle}"); + + context.Information("--------------------------------------------------"); + context.Information("6. Upload Artifact"); + context.Information("--------------------------------------------------"); + + var gh = context.GitHubActions(); + if (gh.IsRunningOnGitHubActions) + { + context.Information("Upload artifacts to GitHub Actions"); + gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(bundle), $"MaaCore-{version}.zip").Wait(); + } + else + { + context.Information("Skip"); + } + } +} diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs new file mode 100644 index 0000000000..e73b1cd893 --- /dev/null +++ b/src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs @@ -0,0 +1,58 @@ +using Cake.Common.Build; +using Cake.Common.Diagnostics; +using Cake.Frosting; +using MeoAssistantBuilder.Helper; +using System.IO.Compression; + +namespace MeoAssistantBuilder.Tasks; + +[TaskName("ReleaseResource")] +public sealed class ReleaseResourceTask : FrostingTask +{ + public override void Run(MaaBuildContext context) + { + context.Information("--------------------------------------------------"); + context.Information("1. Get bundle information"); + context.Information("--------------------------------------------------"); + + var (hash, bt) = context.GetBuildInformation(); + context.CleanArtifacts(); + var version = $"{hash}-{bt}"; + context.Information($"MaaResource Version: {version}"); + + context.Information("--------------------------------------------------"); + context.Information("2. Copy MaaResource"); + context.Information("--------------------------------------------------"); + + var resDir = Path.Combine(Constants.MaaBuildOutputDirectory, "resource"); + if (Directory.Exists(resDir) is false) + { + Directory.CreateDirectory(resDir); + } + context.CopyResources(resDir); + + context.Information("--------------------------------------------------"); + context.Information("3. Bundle MaaResource"); + context.Information("--------------------------------------------------"); + + var bundle = Path.Combine(Constants.MaaProjectArtifactDirectory, $"MaaResource-{version}.zip"); + ZipFile.CreateFromDirectory(resDir, bundle); + + context.Information($"Bundled MaaResource file: {bundle}"); + + context.Information("--------------------------------------------------"); + context.Information("4. Upload Artifact"); + context.Information("--------------------------------------------------"); + + var gh = context.GitHubActions(); + if (gh.IsRunningOnGitHubActions) + { + context.Information("Upload artifacts to GitHub Actions"); + gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(bundle), $"MaaResource-{version}.zip").Wait(); + } + else + { + context.Information("Skip"); + } + } +} diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs new file mode 100644 index 0000000000..681bc85f3a --- /dev/null +++ b/src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs @@ -0,0 +1,61 @@ +using Cake.Common.Build; +using Cake.Common.Diagnostics; +using Cake.Frosting; +using MeoAssistantBuilder.Helper; +using System.IO.Compression; + +namespace MeoAssistantBuilder.Tasks; + +[TaskName("ReleaseWpf")] +public sealed class ReleaseWpfTask : FrostingTask +{ + public override void Run(MaaBuildContext context) + { + context.Information("--------------------------------------------------"); + context.Information("1. Build MaaWpf with ReleaseCore configuration"); + context.Information("--------------------------------------------------"); + + var (hash, bt) = context.GetBuildInformation(); + context.CleanWpf(); + context.CleanArtifacts(); + context.BuildWpf("CICD"); + + context.Information("--------------------------------------------------"); + context.Information("2. Remove extra files from build output"); + context.Information("--------------------------------------------------"); + + var buildOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "CICD"); + context.RemoveExtraWpf(buildOutput); + + context.Information("--------------------------------------------------"); + context.Information("3. Set MaaWpf Version Number"); + context.Information("--------------------------------------------------"); + + var version = $"{hash}-{bt}"; + context.Information($"MaaWpf Version: {version}"); + + context.Information("--------------------------------------------------"); + context.Information("4. Bundle MaaWpf Executables"); + context.Information("--------------------------------------------------"); + + var bundle = Path.Combine(Constants.MaaProjectArtifactDirectory, $"MaaWpf-{version}.zip"); + ZipFile.CreateFromDirectory(buildOutput, bundle); + + context.Information($"Bundled MaaWpf Executables file: {bundle}"); + + context.Information("--------------------------------------------------"); + context.Information("5. Upload Artifact"); + context.Information("--------------------------------------------------"); + + var gh = context.GitHubActions(); + if (gh.IsRunningOnGitHubActions) + { + context.Information("Upload artifacts to GitHub Actions"); + gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(bundle), $"MaaWpf-{version}.zip").Wait(); + } + else + { + context.Information("Skip"); + } + } +} From b21f9e54f5a0ed987b10079d9b5c59435a0464c3 Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 13:06:12 +0800 Subject: [PATCH 07/24] =?UTF-8?q?ci.=E6=B7=BB=E5=8A=A0=20DevBuild=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/maa-dev-build.yaml diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml new file mode 100644 index 0000000000..9b3964d354 --- /dev/null +++ b/.github/workflows/maa-dev-build.yaml @@ -0,0 +1,21 @@ +name: "Maa Dev Build" + +on: + push: + pull_request: + +jobs: + build: + + runs-on: windows-latest + + steps: + - uses: actions/checkout@v3 + - name: Setup .NET 6.0.x + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x + - name: Goto MeoAssistantBuilder source directory + run: cd ./src/MeoAssistantBuilder + - name: Run dev build task + run: dotnet run -- --target DevBuild From 3024082dff01293a60a9c3db65a1717d0b3f15af Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 13:12:41 +0800 Subject: [PATCH 08/24] =?UTF-8?q?ci.=E4=BF=AE=20Ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 9 +++++---- ci-dev-build.ps1 | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 ci-dev-build.ps1 diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index 9b3964d354..f2197e2e3a 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -10,12 +10,13 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v3 + - name: Setup .NET 6.0.x uses: actions/setup-dotnet@v2 with: dotnet-version: 6.0.x - - name: Goto MeoAssistantBuilder source directory - run: cd ./src/MeoAssistantBuilder + - name: Run dev build task - run: dotnet run -- --target DevBuild + run: pwsh .\ci-dev-build.ps1 diff --git a/ci-dev-build.ps1 b/ci-dev-build.ps1 new file mode 100644 index 0000000000..ffb7496e54 --- /dev/null +++ b/ci-dev-build.ps1 @@ -0,0 +1,2 @@ +Set-Location .\src\MeoAssistantBuilder +dotnet run -- --target DevBuild From 0e5914439000c49e59c8fdf3a3b836bfdc1cafb8 Mon Sep 17 00:00:00 2001 From: Alisa Date: Mon, 9 May 2022 13:45:00 +0800 Subject: [PATCH 09/24] =?UTF-8?q?ci.=E4=BF=AE=E5=A4=8D=20CI=20=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=20Artifact=20=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index f2197e2e3a..057782f93a 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -20,3 +20,5 @@ jobs: - name: Run dev build task run: pwsh .\ci-dev-build.ps1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 36df5262813b0d15e1bed25adfd893a75a5e204f Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 14:04:11 +0800 Subject: [PATCH 10/24] =?UTF-8?q?ci.=E4=BF=AE=E6=94=B9=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=20GitHub=20Action=20=E7=9A=84=20Upload=20Artifacts=20=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 8 ++++++-- src/MeoAssistantBuilder/Tasks/DevBuildTask.cs | 17 ----------------- .../Tasks/ReleaseCoreTask.cs | 15 --------------- .../Tasks/ReleaseResourceTask.cs | 15 --------------- src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs | 15 --------------- 5 files changed, 6 insertions(+), 64 deletions(-) diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index 057782f93a..63fb758d0d 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -20,5 +20,9 @@ jobs: - name: Run dev build task run: pwsh .\ci-dev-build.ps1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Upload Artifacts + uses: actions/upload-artifact@v3 + with: + name: Dev Build Bundles + path: ./artifacts diff --git a/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs b/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs index fd5ae6ea8a..0f8d93616b 100644 --- a/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs +++ b/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs @@ -57,22 +57,5 @@ public sealed class DevBuildTask : FrostingTask context.CopyThirdPartyDlls(releaseCiOutput); context.CopyResources(releaseCiOutput); ZipFile.CreateFromDirectory(releaseCiOutput, releaseCiArtifact); - - context.Information("--------------------------------------------------"); - context.Information("5. Upload Artifacts"); - context.Information("--------------------------------------------------"); - - var gh = context.GitHubActions(); - if (gh.IsRunningOnGitHubActions) - { - context.Information("Upload artifacts to GitHub Actions"); - gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(releaseArtifact), artifact.Replace("(CONF)", "Release")).Wait(); - gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(releaseDebugArtifact), artifact.Replace("(CONF)", "RelWithDebInfo")).Wait(); - gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(releaseCiArtifact), artifact.Replace("(CONF)", "CICD")).Wait(); - } - else - { - context.Information("Skip"); - } } } diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs index f2e39cb757..27d2f0df99 100644 --- a/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs +++ b/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs @@ -83,20 +83,5 @@ public sealed class ReleaseCoreTask : FrostingTask ZipFile.CreateFromDirectory(buildOutput, bundle); context.Information($"Bundled MAACore DLLs file: {bundle}"); - - context.Information("--------------------------------------------------"); - context.Information("6. Upload Artifact"); - context.Information("--------------------------------------------------"); - - var gh = context.GitHubActions(); - if (gh.IsRunningOnGitHubActions) - { - context.Information("Upload artifacts to GitHub Actions"); - gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(bundle), $"MaaCore-{version}.zip").Wait(); - } - else - { - context.Information("Skip"); - } } } diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs index e73b1cd893..de89df2d60 100644 --- a/src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs +++ b/src/MeoAssistantBuilder/Tasks/ReleaseResourceTask.cs @@ -39,20 +39,5 @@ public sealed class ReleaseResourceTask : FrostingTask ZipFile.CreateFromDirectory(resDir, bundle); context.Information($"Bundled MaaResource file: {bundle}"); - - context.Information("--------------------------------------------------"); - context.Information("4. Upload Artifact"); - context.Information("--------------------------------------------------"); - - var gh = context.GitHubActions(); - if (gh.IsRunningOnGitHubActions) - { - context.Information("Upload artifacts to GitHub Actions"); - gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(bundle), $"MaaResource-{version}.zip").Wait(); - } - else - { - context.Information("Skip"); - } } } diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs index 681bc85f3a..43b7ceb0b9 100644 --- a/src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs +++ b/src/MeoAssistantBuilder/Tasks/ReleaseWpfTask.cs @@ -42,20 +42,5 @@ public sealed class ReleaseWpfTask : FrostingTask ZipFile.CreateFromDirectory(buildOutput, bundle); context.Information($"Bundled MaaWpf Executables file: {bundle}"); - - context.Information("--------------------------------------------------"); - context.Information("5. Upload Artifact"); - context.Information("--------------------------------------------------"); - - var gh = context.GitHubActions(); - if (gh.IsRunningOnGitHubActions) - { - context.Information("Upload artifacts to GitHub Actions"); - gh.Commands.UploadArtifact(Cake.Core.IO.FilePath.FromString(bundle), $"MaaWpf-{version}.zip").Wait(); - } - else - { - context.Information("Skip"); - } } } From 1c4832b61b6f05f5ee6d0c877962c4a4620f074d Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 14:27:22 +0800 Subject: [PATCH 11/24] =?UTF-8?q?ci.=E5=88=86=E5=BC=80=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9A=84=20Artifacts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index 63fb758d0d..b5564ab2c3 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -21,8 +21,20 @@ jobs: - name: Run dev build task run: pwsh .\ci-dev-build.ps1 - - name: Upload Artifacts + - name: Upload Artifacts Release uses: actions/upload-artifact@v3 with: - name: Dev Build Bundles - path: ./artifacts + name: MaaFull-DevBuild-Release + path: ./artifacts/MaaFull-DevBuild-Release* + + - name: Upload Artifacts RelWithDebInfo + uses: actions/upload-artifact@v3 + with: + name: MaaFull-DevBuild-RelWithDebInfo + path: ./artifacts/MaaFull-DevBuild-RelWithDebInfo* + + - name: Upload Artifacts CICD + uses: actions/upload-artifact@v3 + with: + name: MaaFull-DevBuild-CICD + path: ./artifacts/MaaFull-DevBuild-CICD* From bcd749f1f7fb1d83ba60dc027ff73534cac7221d Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 15:58:57 +0800 Subject: [PATCH 12/24] =?UTF-8?q?ci.=E4=BC=98=E5=8C=96=20DevBuild?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 5 +---- build.ps1 | 16 ++++++++++++++++ ci-dev-build.ps1 | 2 -- 3 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 build.ps1 delete mode 100644 ci-dev-build.ps1 diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index b5564ab2c3..30169a7971 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -19,22 +19,19 @@ jobs: dotnet-version: 6.0.x - name: Run dev build task - run: pwsh .\ci-dev-build.ps1 + run: pwsh .\build.ps1 DevBuild - name: Upload Artifacts Release uses: actions/upload-artifact@v3 with: - name: MaaFull-DevBuild-Release path: ./artifacts/MaaFull-DevBuild-Release* - name: Upload Artifacts RelWithDebInfo uses: actions/upload-artifact@v3 with: - name: MaaFull-DevBuild-RelWithDebInfo path: ./artifacts/MaaFull-DevBuild-RelWithDebInfo* - name: Upload Artifacts CICD uses: actions/upload-artifact@v3 with: - name: MaaFull-DevBuild-CICD path: ./artifacts/MaaFull-DevBuild-CICD* diff --git a/build.ps1 b/build.ps1 new file mode 100644 index 0000000000..c3b9466100 --- /dev/null +++ b/build.ps1 @@ -0,0 +1,16 @@ +if ($args.Length -ne 1) { + throw "One argument required" +} + +$target = $args[0] +$valid_targets = @("ReleaseCore", "ReleaseWpf", "ReleaseResource", "DevBuild") + +if (!$valid_targets.Contains($target)) { + throw "$target is not a valid target" +} + +Set-Location -Path .\src\MeoAssistantBuilder + +dotnet run -- --target $target + +Set-Location -Path ..\..\ diff --git a/ci-dev-build.ps1 b/ci-dev-build.ps1 deleted file mode 100644 index ffb7496e54..0000000000 --- a/ci-dev-build.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Set-Location .\src\MeoAssistantBuilder -dotnet run -- --target DevBuild From 400fc9df8f66060845a4fcb5aa25142422e2c8f5 Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 16:51:24 +0800 Subject: [PATCH 13/24] =?UTF-8?q?ci.=E6=B7=BB=E5=8A=A0=E6=89=8B=E5=8A=A8?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 6 +++ .github/workflows/maa-doc-azure-deploy.yaml | 60 ++++++++++----------- 2 files changed, 36 insertions(+), 30 deletions(-) diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index 30169a7971..fa58c41fb0 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -2,7 +2,10 @@ name: "Maa Dev Build" on: push: + branches: + - master pull_request: + workflow_dispatch: jobs: build: @@ -24,14 +27,17 @@ jobs: - name: Upload Artifacts Release uses: actions/upload-artifact@v3 with: + name: MaaFull-DevBuild-Release path: ./artifacts/MaaFull-DevBuild-Release* - name: Upload Artifacts RelWithDebInfo uses: actions/upload-artifact@v3 with: + name: MaaFull-DevBuild-RelWithDebInfo path: ./artifacts/MaaFull-DevBuild-RelWithDebInfo* - name: Upload Artifacts CICD uses: actions/upload-artifact@v3 with: + name: MaaFull-DevBuild-CICD path: ./artifacts/MaaFull-DevBuild-CICD* diff --git a/.github/workflows/maa-doc-azure-deploy.yaml b/.github/workflows/maa-doc-azure-deploy.yaml index f71103aa47..83b47e6832 100644 --- a/.github/workflows/maa-doc-azure-deploy.yaml +++ b/.github/workflows/maa-doc-azure-deploy.yaml @@ -1,30 +1,30 @@ -name: Azure Static Web Apps CI/CD - -on: - push: - branches: - - master - paths: - - "docs/*" - -jobs: - build_and_deploy: - runs-on: ubuntu-latest - name: Build and Deploy Job - if: github.repository_owner == 'MaaAssistantArknights' - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Build And Deploy - id: builddeploy - uses: Azure/static-web-apps-deploy@v1 - with: - azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GENTLE_DESERT_00290F400 }} - repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) - action: "upload" - ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### - # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig - app_location: "/docs" # App source code path - api_location: "" # Api source code path - optional - output_location: ".vuepress/dist" # Built app content directory - optional +name: Deploy Docs + +on: + push: + branches: + - master + paths: + - "docs/*" + workflow_dispatch: + +jobs: + build_and_deploy: + runs-on: ubuntu-latest + name: Build and Deploy Job + steps: + - uses: actions/checkout@v2 + with: + submodules: true + - name: Build And Deploy + id: builddeploy + uses: Azure/static-web-apps-deploy@v1 + with: + azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_GENTLE_DESERT_00290F400 }} + repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments) + action: "upload" + ###### Repository/Build Configurations - These values can be configured to match your app requirements. ###### + # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig + app_location: "/docs" # App source code path + api_location: "" # Api source code path - optional + output_location: ".vuepress/dist" # Built app content directory - optional From 315d37b411a2abadb4e3ad211dcfbfb15f02099c Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 17:20:36 +0800 Subject: [PATCH 14/24] =?UTF-8?q?ci.=E6=B7=BB=E5=8A=A0=20ReleaseCore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-release-core.yaml | 44 +++++++++++++ .../Tasks/ReleaseCoreTask.cs | 66 +++++++++++-------- 2 files changed, 82 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/maa-release-core.yaml diff --git a/.github/workflows/maa-release-core.yaml b/.github/workflows/maa-release-core.yaml new file mode 100644 index 0000000000..d17e2061c6 --- /dev/null +++ b/.github/workflows/maa-release-core.yaml @@ -0,0 +1,44 @@ +name: Release MaaCore + +on: + release: + types: + - published + +jobs: + + release-core: + + runs-on: windows-latest + + steps: + + - name: Checkout + uses: actions/checkout@v3 + + - name: Get tag + id: tag + uses: dawidd6/action-get-tag@v1 + + - name: Setup .NET 6.0.x + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x + + - name: Run release core task + run: pwsh .\build.ps1 ReleaseCore + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: MaaCore-${{ steps.tag.outputs.tag }} + path: ./artifacts/MaaCore* + + - name: Upload release assets + uses: xresloader/upload-to-github-release@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + file: ./artifacts/MaaCore* + tags: true + verbose: true diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs index 27d2f0df99..8a2131b5e4 100644 --- a/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs +++ b/src/MeoAssistantBuilder/Tasks/ReleaseCoreTask.cs @@ -13,34 +13,7 @@ public sealed class ReleaseCoreTask : FrostingTask public override void Run(MaaBuildContext context) { context.Information("--------------------------------------------------"); - context.Information("1. Build MaaCore with CICD configuration"); - context.Information("--------------------------------------------------"); - - context.CleanCore(); - context.CleanArtifacts(); - context.BuildCore("CICD"); - - context.Information("--------------------------------------------------"); - context.Information("2. Remove extra files from build output"); - context.Information("--------------------------------------------------"); - - var buildOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "CICD"); - context.RemoveExtraCore(buildOutput); - - context.Information("--------------------------------------------------"); - context.Information("3. Copy 3rd party library DLLs to output directory"); - context.Information("--------------------------------------------------"); - - var thirdPartyDlls = Directory.GetFiles(Path.Combine(Constants.MaaProjectThirdPartyDirectory, "bin")); - foreach(var f in thirdPartyDlls) - { - var fileName = new FileInfo(f).Name; - File.Copy(f, Path.Combine(buildOutput, fileName)); - context.Information($"Copy file: FROM {f} to {Path.Combine(buildOutput, fileName)}"); - } - - context.Information("--------------------------------------------------"); - context.Information("4. Read MaaCore version string"); + context.Information("1. Read MaaCore version string"); context.Information("--------------------------------------------------"); var version = "UNKNOWN"; @@ -67,14 +40,51 @@ public sealed class ReleaseCoreTask : FrostingTask } else { + context.Information($"Running in GitHub Action with workflow name: {ghActions.Environment.Workflow.Workflow}, ref: {ghActions.Environment.Workflow.Ref}"); if (ghActions.Environment.Workflow.Workflow != "Release MaaCore") { version += $"-{ghActions.Environment.Workflow.RunId}"; } + else + { + var tag = ghActions.Environment.Workflow.Ref.Replace("refs/tags/", ""); + if (tag != version) + { + context.Error($"Version do not match. From File: {version}. From Ref: {tag}"); + Environment.Exit(-1); + } + } } context.Information($"MaaCore Version: {version}"); + context.Information("--------------------------------------------------"); + context.Information("2. Build MaaCore with CICD configuration"); + context.Information("--------------------------------------------------"); + + context.CleanCore(); + context.CleanArtifacts(); + context.BuildCore("CICD"); + + context.Information("--------------------------------------------------"); + context.Information("3. Remove extra files from build output"); + context.Information("--------------------------------------------------"); + + var buildOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "CICD"); + context.RemoveExtraCore(buildOutput); + + context.Information("--------------------------------------------------"); + context.Information("4. Copy 3rd party library DLLs to output directory"); + context.Information("--------------------------------------------------"); + + var thirdPartyDlls = Directory.GetFiles(Path.Combine(Constants.MaaProjectThirdPartyDirectory, "bin")); + foreach(var f in thirdPartyDlls) + { + var fileName = new FileInfo(f).Name; + File.Copy(f, Path.Combine(buildOutput, fileName)); + context.Information($"Copy file: FROM {f} to {Path.Combine(buildOutput, fileName)}"); + } + context.Information("--------------------------------------------------"); context.Information("5. Bundle MaaCore DLLs"); context.Information("--------------------------------------------------"); From 3d1209564b879365c6b755ece3438633afe631e5 Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 18:21:57 +0800 Subject: [PATCH 15/24] =?UTF-8?q?ci.=E4=BF=AE=E6=94=B9=20ReleaseCore=20?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-release-core.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maa-release-core.yaml b/.github/workflows/maa-release-core.yaml index d17e2061c6..c8735c956f 100644 --- a/.github/workflows/maa-release-core.yaml +++ b/.github/workflows/maa-release-core.yaml @@ -41,4 +41,5 @@ jobs: with: file: ./artifacts/MaaCore* tags: true + draft: false verbose: true From 96094312acc1e9ccf024b01e81326b524ef15348 Mon Sep 17 00:00:00 2001 From: ABA2396 <2396806385@qq.com> Date: Mon, 9 May 2022 19:05:52 +0800 Subject: [PATCH 16/24] =?UTF-8?q?feat.=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=9F=BF?= =?UTF-8?q?=E5=8C=BA=E5=BC=80=E9=87=87=E5=92=8C=E9=99=90=E5=AE=9A=E5=AF=BB?= =?UTF-8?q?=E8=AE=BF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 199 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) diff --git a/resource/tasks.json b/resource/tasks.json index 38c8f90beb..8ade90cc5d 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -1736,6 +1736,205 @@ "RecruitNowConfirm" ] }, + "ActivitiesBegin": { + "algorithm": "justreturn", + "action": "doNothing", + "next": [ + "ReturnToActivities", + "MiningActivities", + "RecruitingActivities" + ] + }, + "ReturnToActivities": { + "template": "Return.png", + "action": "clickSelf", + "roi": [ + 0, + 0, + 180, + 80 + ], + "next": [ + "ReturnToActivities", + "MiningActivities", + "RecruitingActivities", + "Stop" + ] + }, + "MiningActivities": { + "algorithm": "OcrDetect", + "text": [ + "限时开采", + "开采" + ], + "action": "clickSelf", + "roi": [ + 0, + 20, + 302, + 302 + ], + "next": [ + "MiningActivityDigging", + "MiningActivitiesReturn" + ] + }, + "MiningActivityDigging": { + "action": "clickSelf", + "roi": [ + 901, + 469, + 334, + 182 + ], + "next": [ + "MiningActivityDigging", + "MiningActivityDiggingEnd", + "MiningActivitiesReturn" + ] + }, + "MiningActivityDiggingEnd": { + "action": "clickSelf", + "roi": [ + 559, + 563, + 160, + 157 + ], + "next": [ + "MiningActivitiesReturn" + ] + }, + "MiningActivitiesReturn": { + "template": "CloseAnno.png", + "action": "clickSelf", + "roi": [ + 1146, + 0, + 134, + 162 + ], + "next": [ + "RecruitingActivities", + "MiningActivitiesReturn", + "Stop" + ] + }, + "RecruitingActivities": { + "algorithm": "OcrDetect", + "text": [ + "赠送", + "次" + ], + "action": "clickSelf", + "roi": [ + 1148, + 416, + 132, + 138 + ], + "next": [ + "RecruitingActivitiesConfirm", + "RecruitingActivities" + ] + }, + "RecruitingActivitiesConfirm": { + "action": "doNothing", + "algorithm": "OcrDetect", + "text": [ + "赠送", + "次", + "小时" + ], + "roi": [ + 729, + 515, + 303, + 135 + ], + "next": [ + "RecruitingActivitiesRecruit", + "RecruitingActivitiesConfirm" + ] + }, + "RecruitingActivitiesRecruit": { + "algorithm": "OcrDetect", + "action": "clickSelf", + "text": [ + "寻访一次", + "寻访" + ], + "roi": [ + 770, + 577, + 267, + 143 + ], + "next": [ + "RecruitingActivitiesRecruitNowConfirm" + ] + }, + "RecruitingActivitiesRecruitNowConfirm": { + "action": "clickSelf", + "template": "RecruitNowConfirm.png", + "roi": [ + 586, + 399, + 694, + 192 + ], + "next": [ + "RecruitingActivitiesRecruitSkip", + "RecruitingActivitiesRecruitSkipWithoutButton", + "RecruitingActivitiesRecruitNowConfirm" + ] + }, + "RecruitingActivitiesRecruitSkip": { + "action": "clickSelf", + "template": "RecruitSkip.png", + "roi": [ + 1100, + 0, + 180, + 150 + ], + "next": [ + "RecruitingActivitiesRecruitSkip", + "RecruitingActivitiesRecruitSkipWithoutButton" + ] + }, + "RecruitingActivitiesRecruitSkipWithoutButton": { + "action": "clickRect", + "algorithm": "justReturn", + "specificRect": [ + 1180, + 15, + 85, + 60 + ], + "next": [ + "RecruitingActivitiesRecruitEnd", + "RecruitingActivitiesRecruitSkip", + "RecruitingActivitiesRecruitSkipWithoutButton" + ] + }, + "RecruitingActivitiesRecruitEnd": { + "algorithm": "OcrDetect", + "action": "doNothing", + "text": [ + "寻访一次", + "寻访" + ], + "roi": [ + 770, + 577, + 267, + 143 + ], + "next": [ + "Stop" + ] + }, "AwardBegin": { "algorithm": "justreturn", "action": "doNothing", From 644c405e39b87511f0ae0cec5814639aa6577b9b Mon Sep 17 00:00:00 2001 From: ABA2396 <99072975+ABA2396@users.noreply.github.com> Date: Mon, 9 May 2022 19:21:22 +0800 Subject: [PATCH 17/24] =?UTF-8?q?feat.=E6=B7=BB=E5=8A=A0=E4=BA=86=E7=9F=BF?= =?UTF-8?q?=E5=8C=BA=E5=BC=80=E9=87=87=E5=92=8C=E9=99=90=E5=AE=9A=E5=AF=BB?= =?UTF-8?q?=E8=AE=BF=E5=8A=9F=E8=83=BD=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/template/MiningActivityDigging.png | Bin 0 -> 25607 bytes resource/template/MiningActivityDiggingEnd.png | Bin 0 -> 5645 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 resource/template/MiningActivityDigging.png create mode 100644 resource/template/MiningActivityDiggingEnd.png diff --git a/resource/template/MiningActivityDigging.png b/resource/template/MiningActivityDigging.png new file mode 100644 index 0000000000000000000000000000000000000000..386ef5063a0ebc6f65afe382e5b1b20ecc95f1de GIT binary patch literal 25607 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 IJmV4jUya!g{{R30 literal 0 HcmV?d00001 diff --git a/resource/template/MiningActivityDiggingEnd.png b/resource/template/MiningActivityDiggingEnd.png new file mode 100644 index 0000000000000000000000000000000000000000..5456511c3a93f7e5fe91011bd9f3ccff8b7e1075 GIT binary patch literal 5645 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 u(2+D Date: Mon, 9 May 2022 21:03:40 +0800 Subject: [PATCH 18/24] =?UTF-8?q?ci.=E9=99=90=E5=AE=9A=20DevBuild=20?= =?UTF-8?q?=E7=9A=84=E7=94=9F=E6=95=88=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index fa58c41fb0..124abb8cf9 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -3,8 +3,22 @@ name: "Maa Dev Build" on: push: branches: - - master + - dev + paths: + - src/MeoAssistant/** + - src/MeoAssistantBuilder/** + - src/MeoAsstGui/** + - 3rdparty/** + - include/** + - MeoAssistantArknights.sln pull_request: + paths: + - src/MeoAssistant/** + - src/MeoAssistantBuilder/** + - src/MeoAsstGui/** + - 3rdparty/** + - include/** + - MeoAssistantArknights.sln workflow_dispatch: jobs: From f994e5cef6bb2d38813859072ea96d041785d39d Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 21:48:12 +0800 Subject: [PATCH 19/24] =?UTF-8?q?ci.=E6=B7=BB=E5=8A=A0=20MaaWpf=20?= =?UTF-8?q?=E5=92=8C=20MaaResource=20=E7=9A=84=20Release?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-release-resource.yaml | 39 +++++++++++++++++++++ .github/workflows/maa-release-wpf.yaml | 38 ++++++++++++++++++++ read_path.ps1 | 16 +++++++++ 3 files changed, 93 insertions(+) create mode 100644 .github/workflows/maa-release-resource.yaml create mode 100644 .github/workflows/maa-release-wpf.yaml create mode 100644 read_path.ps1 diff --git a/.github/workflows/maa-release-resource.yaml b/.github/workflows/maa-release-resource.yaml new file mode 100644 index 0000000000..d68e94c4da --- /dev/null +++ b/.github/workflows/maa-release-resource.yaml @@ -0,0 +1,39 @@ +name: Release MaaResource + +on: + push: + branches: + - master + paths: + - resource/** + - 3rdparty/resource/** + workflow_dispatch: + +jobs: + + release-resource: + + runs-on: windows-latest + + steps: + + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup .NET 6.0.x + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x + + - name: Run release resource task + run: pwsh .\build.ps1 ReleaseResource + + - name: Read file name + id: read_path + run: pwsh .\read_path.ps1 ./artifacts MaaResource* + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.read_path.outputs.name_0 }} + path: ${{ steps.read_path.outputs.path_0 }} diff --git a/.github/workflows/maa-release-wpf.yaml b/.github/workflows/maa-release-wpf.yaml new file mode 100644 index 0000000000..6dadea0963 --- /dev/null +++ b/.github/workflows/maa-release-wpf.yaml @@ -0,0 +1,38 @@ +name: Release MaaWpf + +on: + push: + branches: + - master + paths: + - src/MeoAsstGui/** + workflow_dispatch: + +jobs: + + release-wpf: + + runs-on: windows-latest + + steps: + + - name: Checkout + uses: actions/checkout@v3 + + - name: Setup .NET 6.0.x + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x + + - name: Run release wpf task + run: pwsh .\build.ps1 ReleaseWpf + + - name: Read file name + id: read_path + run: pwsh .\read_path.ps1 ./artifacts MaaWpf* + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.read_path.outputs.name_0 }} + path: ${{ steps.read_path.outputs.path_0 }} diff --git a/read_path.ps1 b/read_path.ps1 new file mode 100644 index 0000000000..6cfb1aaf0e --- /dev/null +++ b/read_path.ps1 @@ -0,0 +1,16 @@ +if ($args.Length -ne 2) { + throw "Need two arguments" +} + +$fs = Get-ChildItem -Path $args[0] -Filter $args[1] + +$index = 0 +foreach($f in $fs) { + + $name = $f.Name + $path = $f.FullName + Write-Output "::set-output name=name_$index::$name" + Write-Output "::set-output name=path_$index::$path" + + $index = $index + 1 +} From 0139745d0247c898e93269ee60728362b01b1097 Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 23:49:38 +0800 Subject: [PATCH 20/24] =?UTF-8?q?ci.=20=E9=87=8D=E5=91=BD=E5=90=8D=20Bundl?= =?UTF-8?q?e=20=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 26 +++++++++++-------- src/MeoAssistantBuilder/Tasks/DevBuildTask.cs | 8 +++--- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index 124abb8cf9..f4e182094f 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -38,20 +38,24 @@ jobs: - name: Run dev build task run: pwsh .\build.ps1 DevBuild - - name: Upload Artifacts Release - uses: actions/upload-artifact@v3 - with: - name: MaaFull-DevBuild-Release - path: ./artifacts/MaaFull-DevBuild-Release* + - name: Read file name + id: read_path + run: pwsh .\read_path.ps1 ./artifacts MaaBundle - - name: Upload Artifacts RelWithDebInfo + - name: Upload Artifacts 0 uses: actions/upload-artifact@v3 with: - name: MaaFull-DevBuild-RelWithDebInfo - path: ./artifacts/MaaFull-DevBuild-RelWithDebInfo* + name: ${{ steps.read_path.outputs.name_0 }} + path: ${{ steps.read_path.outputs.path_0 }} - - name: Upload Artifacts CICD + - name: Upload Artifacts 1 uses: actions/upload-artifact@v3 with: - name: MaaFull-DevBuild-CICD - path: ./artifacts/MaaFull-DevBuild-CICD* + name: ${{ steps.read_path.outputs.name_1 }} + path: ${{ steps.read_path.outputs.path_1 }} + + - name: Upload Artifacts 2 + uses: actions/upload-artifact@v3 + with: + name: ${{ steps.read_path.outputs.name_2 }} + path: ${{ steps.read_path.outputs.path_2 }} diff --git a/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs b/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs index 0f8d93616b..6b7ce804c7 100644 --- a/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs +++ b/src/MeoAssistantBuilder/Tasks/DevBuildTask.cs @@ -17,11 +17,11 @@ public sealed class DevBuildTask : FrostingTask context.CleanArtifacts(); var (bt, hash) = context.GetBuildInformation(); - var artifact = $"MaaFull-DevBuild-(CONF)-{hash}-{bt}.zip"; + var artifact = $"MaaBundle-DevBuild-(CONF)-{hash}-{bt}.zip"; context.Information($"Dev build of commit {hash} at {bt}"); context.Information("--------------------------------------------------"); - context.Information("2. Build MaaFull with configuration Release"); + context.Information("2. Build MaaBundle with configuration Release"); context.Information("--------------------------------------------------"); context.CleanAll(); @@ -33,7 +33,7 @@ public sealed class DevBuildTask : FrostingTask ZipFile.CreateFromDirectory(releaseOutput, releaseArtifact); context.Information("--------------------------------------------------"); - context.Information("3. Build MaaFull with configuration RelWithDebInfo"); + context.Information("3. Build MaaBundle with configuration RelWithDebInfo"); context.Information("--------------------------------------------------"); context.CleanAll(); @@ -45,7 +45,7 @@ public sealed class DevBuildTask : FrostingTask ZipFile.CreateFromDirectory(releaseDebugOutput, releaseDebugArtifact); context.Information("--------------------------------------------------"); - context.Information("4. Build MaaFull with configuration CICD"); + context.Information("4. Build MaaBundle with configuration CICD"); context.Information("--------------------------------------------------"); context.CleanAll(); From 3f52a6f2f75d15d6edb5bb71a699347c84bfba38 Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Mon, 9 May 2022 23:50:05 +0800 Subject: [PATCH 21/24] =?UTF-8?q?ci.=E6=B7=BB=E5=8A=A0=20MaaBundle=20?= =?UTF-8?q?=E7=9A=84=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-release-bundle.yaml | 45 ++++++++++ build.ps1 | 2 +- .../Tasks/ReleaseBundleTask.cs | 88 +++++++++++++++++++ 3 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/maa-release-bundle.yaml create mode 100644 src/MeoAssistantBuilder/Tasks/ReleaseBundleTask.cs diff --git a/.github/workflows/maa-release-bundle.yaml b/.github/workflows/maa-release-bundle.yaml new file mode 100644 index 0000000000..eb25aaa7f0 --- /dev/null +++ b/.github/workflows/maa-release-bundle.yaml @@ -0,0 +1,45 @@ +name: Release MaaBundle + +on: + release: + types: + - published + +jobs: + + release-bundle: + + runs-on: windows-latest + + steps: + + - name: Checkout + uses: actions/checkout@v3 + + - name: Get tag + id: tag + uses: dawidd6/action-get-tag@v1 + + - name: Setup .NET 6.0.x + uses: actions/setup-dotnet@v2 + with: + dotnet-version: 6.0.x + + - name: Run release core task + run: pwsh .\build.ps1 ReleaseBundle + + - name: Upload artifact + uses: actions/upload-artifact@v3 + with: + name: MaaBundle-${{ steps.tag.outputs.tag }} + path: ./artifacts/MaaBundle* + + - name: Upload release assets + uses: xresloader/upload-to-github-release@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + file: ./artifacts/MaaBundle* + tags: true + draft: false + verbose: true diff --git a/build.ps1 b/build.ps1 index c3b9466100..ee59fbc4fe 100644 --- a/build.ps1 +++ b/build.ps1 @@ -3,7 +3,7 @@ if ($args.Length -ne 1) { } $target = $args[0] -$valid_targets = @("ReleaseCore", "ReleaseWpf", "ReleaseResource", "DevBuild") +$valid_targets = @("ReleaseCore", "ReleaseWpf", "ReleaseResource", "ReleaseBundle", "DevBuild") if (!$valid_targets.Contains($target)) { throw "$target is not a valid target" diff --git a/src/MeoAssistantBuilder/Tasks/ReleaseBundleTask.cs b/src/MeoAssistantBuilder/Tasks/ReleaseBundleTask.cs new file mode 100644 index 0000000000..1a75549b30 --- /dev/null +++ b/src/MeoAssistantBuilder/Tasks/ReleaseBundleTask.cs @@ -0,0 +1,88 @@ +using Cake.Common.Build; +using Cake.Common.Diagnostics; +using Cake.Frosting; +using MeoAssistantBuilder.Helper; +using System.IO.Compression; +using System.Text.RegularExpressions; + +namespace MeoAssistantBuilder.Tasks; + +[TaskName("ReleaseBundle")] +public sealed class ReleaseBundleTask : FrostingTask +{ + public override void Run(MaaBuildContext context) + { + context.Information("--------------------------------------------------"); + context.Information("1. Read MaaCore version string"); + context.Information("--------------------------------------------------"); + + var version = "UNKNOWN"; + var versionFile = Path.Combine(Constants.MaaCoreProjectDirectory, "Version.h"); + var versionFileContent = File.ReadAllText(versionFile); + + var regex = @"v((0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)"; + + var match = Regex.Match(versionFileContent, regex); + if (match.Success is false) + { + context.Warning("Can not read version"); + Environment.Exit(-1); + } + else + { + version = match.Value; + } + + var ghActions = context.GitHubActions(); + if (ghActions.IsRunningOnGitHubActions is false) + { + version += "-Local"; + } + else + { + context.Information($"Running in GitHub Action with workflow name: {ghActions.Environment.Workflow.Workflow}, ref: {ghActions.Environment.Workflow.Ref}"); + if (ghActions.Environment.Workflow.Workflow != "Release MaaCore") + { + version += $"-{ghActions.Environment.Workflow.RunId}"; + } + else + { + var tag = ghActions.Environment.Workflow.Ref.Replace("refs/tags/", ""); + if (tag != version) + { + context.Error($"Version do not match. From File: {version}. From Ref: {tag}"); + Environment.Exit(-1); + } + } + } + + context.Information($"MaaCore Version: {version}"); + + context.Information("--------------------------------------------------"); + context.Information("2. Release MaaCore with third party dlls and resource"); + context.Information("--------------------------------------------------"); + + var buildOutput = Path.Combine(Constants.MaaBuildOutputDirectory, "Release"); + context.CleanAll(); + context.CleanArtifacts(); + + context.BuildCore("Release"); + context.RemoveExtraCore(buildOutput); + + context.Information("--------------------------------------------------"); + context.Information("3. Release MaaWpf with third party executables"); + context.Information("--------------------------------------------------"); + + context.BuildWpf("Release"); + context.RemoveExtraWpf(buildOutput); + + context.Information("--------------------------------------------------"); + context.Information("4. Bundle MaaBundle package"); + context.Information("--------------------------------------------------"); + + var bundle = Path.Combine(Constants.MaaProjectArtifactDirectory, $"MaaBundle-{version}.zip"); + ZipFile.CreateFromDirectory(buildOutput, bundle); + + context.Information($"Bundled MaaBundle file: {bundle}"); + } +} From 96c03d3079976caabbdb410e828c9dc3e6bf1d1e Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Tue, 10 May 2022 00:15:13 +0800 Subject: [PATCH 22/24] =?UTF-8?q?ci.=E4=BF=AE=E5=A4=8D=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maa-dev-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maa-dev-build.yaml b/.github/workflows/maa-dev-build.yaml index f4e182094f..aa321e67d0 100644 --- a/.github/workflows/maa-dev-build.yaml +++ b/.github/workflows/maa-dev-build.yaml @@ -40,7 +40,7 @@ jobs: - name: Read file name id: read_path - run: pwsh .\read_path.ps1 ./artifacts MaaBundle + run: pwsh .\read_path.ps1 ./artifacts MaaBundle* - name: Upload Artifacts 0 uses: actions/upload-artifact@v3 From fc5bf758c3d4c39510b48091187b708b30b200ec Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Tue, 10 May 2022 01:50:42 +0800 Subject: [PATCH 23/24] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=20Warning?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAsstGui/App.config | 2 +- src/MeoAsstGui/Helper/ToastNotification.cs | 63 +++++++++++----------- src/MeoAsstGui/MeoAsstGui.csproj | 6 +-- 3 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/MeoAsstGui/App.config b/src/MeoAsstGui/App.config index 9681c0bbc8..d3b6d9590a 100644 --- a/src/MeoAsstGui/App.config +++ b/src/MeoAsstGui/App.config @@ -11,7 +11,7 @@ - + diff --git a/src/MeoAsstGui/Helper/ToastNotification.cs b/src/MeoAsstGui/Helper/ToastNotification.cs index 16edc963a4..86a4a8d80c 100644 --- a/src/MeoAsstGui/Helper/ToastNotification.cs +++ b/src/MeoAsstGui/Helper/ToastNotification.cs @@ -139,46 +139,45 @@ namespace MeoAsstGui /// 提示音类型 protected async Task PlayNotificationSoundAsync(NotificationSounds sounds = NotificationSounds.None) { - await Task.Run(() => + try { - - try + switch (sounds) { - switch (sounds) - { - case NotificationSounds.Exclamation: SystemSounds.Exclamation.Play(); break; - case NotificationSounds.Asterisk: SystemSounds.Asterisk.Play(); break; - case NotificationSounds.Question: SystemSounds.Question.Play(); break; - case NotificationSounds.Beep: SystemSounds.Beep.Play(); break; - case NotificationSounds.Hand: SystemSounds.Hand.Play(); break; + case NotificationSounds.Exclamation: SystemSounds.Exclamation.Play(); break; + case NotificationSounds.Asterisk: SystemSounds.Asterisk.Play(); break; + case NotificationSounds.Question: SystemSounds.Question.Play(); break; + case NotificationSounds.Beep: SystemSounds.Beep.Play(); break; + case NotificationSounds.Hand: SystemSounds.Hand.Play(); break; - case NotificationSounds.Notification: - using (var key = Registry.CurrentUser.OpenSubKey(@"AppEvents\Schemes\Apps\.Default\Notification.Default\.Current")) + case NotificationSounds.Notification: + using (var key = Registry.CurrentUser.OpenSubKey(@"AppEvents\Schemes\Apps\.Default\Notification.Default\.Current")) + { + if (key != null) { - if (key != null) + // 获取 (Default) 项 + var o = key.GetValue(null); + if (o != null) { - // 获取 (Default) 项 - var o = key.GetValue(null); - if (o != null) - { - var theSound = new SoundPlayer((string)o); - theSound.Play(); - } - } - else - { - // 如果不支持就播放其它提示音 - PlayNotificationSoundAsync(NotificationSounds.Asterisk); + var theSound = new SoundPlayer((string)o); + theSound.Play(); } } - break; + else + { + // 如果不支持就播放其它提示音 + await PlayNotificationSoundAsync(NotificationSounds.Asterisk); + } + } + break; - case NotificationSounds.None: - default: break; - } + case NotificationSounds.None: + default: break; } - catch (Exception) { } - }).ConfigureAwait(false); + } + catch (Exception) + { + // Ignore + } } #endregion @@ -316,7 +315,7 @@ namespace MeoAsstGui } // 播放通知提示音 - PlayNotificationSoundAsync(sound); + PlayNotificationSoundAsync(sound).Wait(); // 任务栏闪烁 FlashWindowEx(); diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj index 9d8e758887..085d1814c6 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MeoAsstGui.csproj @@ -76,9 +76,6 @@ true - - ..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll - @@ -242,8 +239,7 @@ 5.7.0 - runtime; build; native; contentfiles; analyzers; buildtransitive - all + All 3.1.1 From b7fe5edbe0f0471032132b9cd399c3d2faa0bc9e Mon Sep 17 00:00:00 2001 From: MistEO Date: Tue, 10 May 2022 17:46:29 +0800 Subject: [PATCH 24/24] =?UTF-8?q?docs.=E6=9B=B4=E6=96=B0=E5=85=B3=E4=BA=8E?= =?UTF-8?q?WSA=E7=9A=84=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/模拟器支持.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/模拟器支持.md b/docs/模拟器支持.md index 506a0f41c7..8c9efc2a16 100644 --- a/docs/模拟器支持.md +++ b/docs/模拟器支持.md @@ -53,7 +53,7 @@ ### Win11 WSA -不支持。WSA 目前没有实现 AOSP screencap 需要的接口，无法进行截图。等微软支持后会尝试适配 +勉强支持。但 WSA 的截图经常莫名其妙截出来一个白屏，导致识别异常，不推荐使用 ### AVD