diff --git a/resource/tasks.json b/resource/tasks.json index 1427ee4fd0..d172764b80 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -1,4 +1,181 @@ { + "SN-8": { + "algorithm": "justreturn", + "action": "doNothing", + "next": [ + "SNToSN-8" + ] + }, + "SNToSN-8": { + "algorithm": "OcrDetect", + "action": "clickSelf", + "text": [ + "活动已开放" + ], + "roi": [ + 40, + 481, + 308, + 139 + ], + "next": [ + "SNChapter2ToSN-8", + "SNToSN-8" + ] + }, + "SNChapter2ToSN-8": { + "algorithm": "MatchTemplate", + "action": "clickSelf", + "template": "SN-Chapter2.png", + "roi": [ + 114, + 406, + 330, + 166 + ], + "next": [ + "StageSN-8", + "SNChapter2ToSN-8", + "SwipeRightToStageSN-8" + ] + }, + "SwipeRightToStageSN-8": { + "algorithm": "justreturn", + "action": "SwipeToTheRight", + "next": [ + "StageSN-8", + "SwipeRightToStageSN-8" + ] + }, + "StageSN-8": { + "algorithm": "MatchTemplate", + "action": "clickSelf", + "template": "SN-8.png", + "roi": [ + 296, + 93, + 171, + 195 + ] + }, + "SN-9": { + "algorithm": "justreturn", + "action": "doNothing", + "next": [ + "SNToSN-9" + ] + }, + "SNToSN-9": { + "algorithm": "OcrDetect", + "action": "clickSelf", + "text": [ + "活动已开放" + ], + "roi": [ + 40, + 481, + 308, + 139 + ], + "next": [ + "SNChapter3ToSN-9", + "SNToSN-9" + ] + }, + "SNChapter3ToSN-9": { + "algorithm": "MatchTemplate", + "action": "clickSelf", + "template": "SN-Chapter3.png", + "roi": [ + 205, + 487, + 254, + 165 + ], + "next": [ + "StageSN-9", + "SwipeLeftToStageSN-9", + "SNChapter3ToSN-9" + ] + }, + "SwipeLeftToStageSN-9": { + "algorithm": "justreturn", + "action": "SwipeToTheLeft", + "next": [ + "StageSN-9", + "SwipeLeftToStageSN-9" + ] + }, + "StageSN-9": { + "algorithm": "MatchTemplate", + "action": "clickSelf", + "template": "SN-9.png", + "roi": [ + 610, + 328, + 176, + 198 + ] + }, + "SN-10": { + "algorithm": "justreturn", + "action": "doNothing", + "next": [ + "SNToSN-10" + ] + }, + "SNToSN-10": { + "algorithm": "OcrDetect", + "action": "clickSelf", + "text": [ + "活动已开放" + ], + "roi": [ + 40, + 481, + 308, + 139 + ], + "next": [ + "SNChapter3ToSN-10", + "SNToSN-10" + ] + }, + "SNChapter3ToSN-10": { + "algorithm": "MatchTemplate", + "action": "clickSelf", + "template": "SN-Chapter3.png", + "roi": [ + 205, + 487, + 254, + 165 + ], + "next": [ + "StageSN-10", + "SNChapter3ToSN-10", + "SwipeLeftToStageSN-10" + ] + }, + "SwipeLeftToStageSN-10": { + "algorithm": "justreturn", + "action": "SwipeToTheLeft", + "next": [ + "StageSN-10", + "SwipeLeftToStageSN-10" + ] + }, + "StageSN-10": { + "algorithm": "MatchTemplate", + "action": "clickSelf", + "template": "SN-10.png", + "roi": [ + 678, + 220, + 173, + 200 + ] + }, "StartUp": { "algorithm": "justreturn", "action": "doNothing", diff --git a/resource/template/SN-10.png b/resource/template/SN-10.png new file mode 100644 index 0000000000..267d2e3659 Binary files /dev/null and b/resource/template/SN-10.png differ diff --git a/resource/template/SN-8.png b/resource/template/SN-8.png new file mode 100644 index 0000000000..959decb61e Binary files /dev/null and b/resource/template/SN-8.png differ diff --git a/resource/template/SN-9.png b/resource/template/SN-9.png new file mode 100644 index 0000000000..a3dbd929fe Binary files /dev/null and b/resource/template/SN-9.png differ diff --git a/resource/template/SN-Chapter2.png b/resource/template/SN-Chapter2.png new file mode 100644 index 0000000000..66d06e1754 Binary files /dev/null and b/resource/template/SN-Chapter2.png differ diff --git a/resource/template/SN-Chapter3.png b/resource/template/SN-Chapter3.png new file mode 100644 index 0000000000..0c3a442747 Binary files /dev/null and b/resource/template/SN-Chapter3.png differ diff --git a/resource/template/SN-Open.png b/resource/template/SN-Open.png new file mode 100644 index 0000000000..4e99857e15 Binary files /dev/null and b/resource/template/SN-Open.png differ diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index a0510b02b3..d3be7e62ce 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -1,280 +1,280 @@ - - - - - Release - x64 - - - RelWithDebInfo - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 16.0 - Win32Proj - {362d1e30-f5ae-4279-9985-65c27b3ba300} - MeoAssistant - 10.0 - - - - DynamicLibrary - false - v142 - true - Unicode - - - DynamicLibrary - false - v142 - 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 - - - - - - + + + + + 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)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 - - - - - - - - - - +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 diff --git a/tools/TestCaller/TestCaller.vcxproj b/tools/TestCaller/TestCaller.vcxproj index 120a646b0d..3ac4232ba0 100644 --- a/tools/TestCaller/TestCaller.vcxproj +++ b/tools/TestCaller/TestCaller.vcxproj @@ -1,111 +1,111 @@ - - - - - Release - x64 - - - RelWithDebInfo - x64 - - - - - - - 16.0 - Win32Proj - {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64} - Tools - 10.0 - TestCaller - - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - false - $(SolutionDir)\include - $(TargetDir);$(LibraryPath) - - - false - $(SolutionDir)\include - $(TargetDir);$(LibraryPath) - - - - Level4 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - /utf-8 /MP %(AdditionalOptions) - - - Console - true - true - true - MeoAssistant.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - true - - - - - Level3 - true - false - true - LOG_TRACE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - Disabled - /utf-8 /MP %(AdditionalOptions) - - - Console - true - true - true - MeoAssistant.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - true - - - - - + + + + + Release + x64 + + + RelWithDebInfo + x64 + + + + + + + 16.0 + Win32Proj + {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64} + Tools + 10.0 + TestCaller + + + + Application + false + v143 + true + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + false + $(SolutionDir)\include + $(TargetDir);$(LibraryPath) + + + false + $(SolutionDir)\include + $(TargetDir);$(LibraryPath) + + + + Level4 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + MeoAssistant.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + true + + + + + Level3 + true + false + true + LOG_TRACE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + Disabled + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + MeoAssistant.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + true + + + + + \ No newline at end of file diff --git a/tools/TransparentImageCvt/TransparentImageCvt.vcxproj b/tools/TransparentImageCvt/TransparentImageCvt.vcxproj index f3b6a494a6..3c1ac476c4 100644 --- a/tools/TransparentImageCvt/TransparentImageCvt.vcxproj +++ b/tools/TransparentImageCvt/TransparentImageCvt.vcxproj @@ -1,96 +1,96 @@ - - - - - Release - Win32 - - - Release - x64 - - - - 16.0 - Win32Proj - {093a3174-a27e-4d23-b64e-16f9448ad5ac} - TransparentImageCvt - 10.0 - - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - false - - - false - $(SolutionDir)3rdparty\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) - $(SolutionDir)3rdparty\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level4 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - /utf-8 /MP %(AdditionalOptions) - - - Console - true - true - true - opencv_world453.lib;%(AdditionalDependencies) - - - - - - - - + + + + + Release + Win32 + + + Release + x64 + + + + 16.0 + Win32Proj + {093a3174-a27e-4d23-b64e-16f9448ad5ac} + TransparentImageCvt + 10.0 + + + + Application + false + v143 + true + Unicode + + + Application + false + v143 + true + Unicode + + + + + + + + + + + + + + + false + + + false + $(SolutionDir)3rdparty\include;$(VC_IncludePath);$(WindowsSDK_IncludePath) + $(SolutionDir)3rdparty\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64) + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level4 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + /utf-8 /MP %(AdditionalOptions) + + + Console + true + true + true + opencv_world453.lib;%(AdditionalDependencies) + + + + + + + + \ No newline at end of file