From 716ab41ade52196602532b808bc5ac27fe21e29f Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 15 Dec 2022 21:25:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=90=AF=E5=8A=A8=E6=97=B6?= =?UTF-8?q?=E5=88=A0=E9=99=A4.old=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Main/Bootstrapper.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/MaaWpfGui/Main/Bootstrapper.cs b/src/MaaWpfGui/Main/Bootstrapper.cs index 8135b98fa6..35bfa460c2 100644 --- a/src/MaaWpfGui/Main/Bootstrapper.cs +++ b/src/MaaWpfGui/Main/Bootstrapper.cs @@ -78,6 +78,15 @@ namespace MaaWpfGui } } + try + { + Directory.Delete(".old", true); + } + catch (Exception) + { + // ignored + } + foreach (var file in new DirectoryInfo(".").GetFiles("*.old")) { try From 6bb955cba7911702ba85a78fb4ad1058658cd808 Mon Sep 17 00:00:00 2001 From: MistEO Date: Thu, 15 Dec 2022 21:47:45 +0800 Subject: [PATCH 2/3] docs: update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1aa0588cf5..8582b07f41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## v4.8.1 + +- 修复活动关卡导航错误 @ABA2396 + ## v4.8.0 - 启用 ONNX Runtime 进行 OCR,并重新训练了各个语言的识别模型 @MistEO @horror-proton @hguandl @aa889788 @zhangchi0104 @mole828 @WWPXX233 From 1c8844e740040d92c0b2604f915309a2e9583f34 Mon Sep 17 00:00:00 2001 From: Horror Proton <107091537+horror-proton@users.noreply.github.com> Date: Thu, 15 Dec 2022 23:05:25 +0800 Subject: [PATCH 3/3] chore: update cmake checksum --- cmake/fastdeploy.cmake | 7 ++----- cmake/opencv.cmake | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/cmake/fastdeploy.cmake b/cmake/fastdeploy.cmake index 0c1ce0ffe2..953266a6a3 100644 --- a/cmake/fastdeploy.cmake +++ b/cmake/fastdeploy.cmake @@ -8,13 +8,10 @@ set(COMPRESSED_SUFFIX ".tar.gz") if(UNIX) set(FASTDEPLOY_FILENAME "FastDeploy-Linux") - set(FASTDEPLOY_CHECKSUM "5e1dedc72714f6f11fb1dfbc720d675203525152b777bd2711ba26f2a95e5f99") + set(FASTDEPLOY_CHECKSUM "b13891669242c6d219508ae99afba9fadde1ada4af9b3d5781298f58fef9bd34") elseif(WIN32) set(FASTDEPLOY_FILENAME "FastDeploy-Windows") - set(FASTDEPLOY_CHECKSUM "0ea6064921a0af50ba8a1593fe1652a11379acad53f15e100731f02c3c9edfd1") -elseif(APPLE) - set(FASTDEPLOY_FILENAME "FastDeploy-macOS") - set(FASTDEPLOY_CHECKSUM "80188fb70c5632ba5b93338d5c6d323619430dcad77043250399dce8fb480d8d") + set(FASTDEPLOY_CHECKSUM "83e23fd701c828b8e15e38806db65cde71c4fbba3482ca1e24ba23c44fb19028") endif(UNIX) set(FASTDEPLOY_URL ${FASTDEPLOY_URL_PREFIX}/${FASTDEPLOY_TAG}/${FASTDEPLOY_FILENAME}${COMPRESSED_SUFFIX}) diff --git a/cmake/opencv.cmake b/cmake/opencv.cmake index 9e3069653c..63553c75f7 100644 --- a/cmake/opencv.cmake +++ b/cmake/opencv.cmake @@ -8,13 +8,10 @@ set(COMPRESSED_SUFFIX ".tar.gz") if(UNIX) set(OPENCV_FILENAME "OpenCV-Linux") - set(OPENCV_CHECKSUM "ab41d96f64d8aada3c06584f88bcc5c94eab9f8a4c1a6fbe2e20d83d5509f1c3") + set(OPENCV_CHECKSUM "edc4138456189c9e8bdf29114ad2be8ec152e8e31087d98e633f6cda59b141ea") elseif(WIN32) set(OPENCV_FILENAME "OpenCV-Windows") - set(OPENCV_CHECKSUM "92213f8615d5ca74bf6a8a3681abaac1f5981f9da6b5a1808759909329bb5ea2") -elseif(APPLE) - set(OPENCV_FILENAME "OpenCV-macOS") - set(OPENCV_CHECKSUM "44d6308696ee0b38d1ba40b8b16ee0cb1da4a0f9f72b6916afc5b18b99a9089e") + set(OPENCV_CHECKSUM "bf736b243bbdaa020f139e4dfa1e4f15633f4ce7a8ad885524645e660de47a8b") endif(UNIX) set(OPENCV_URL ${OPENCV_URL_PREFIX}/${OPENCV_TAG}/${OPENCV_FILENAME}${COMPRESSED_SUFFIX})