From 06e2adef6bd56c496fb77bf48d53b91f185f2a59 Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 16 Mar 2022 22:10:22 +0800 Subject: [PATCH] =?UTF-8?q?feat.=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=B4=B8=E6=98=93=E7=AB=99`=E6=BA=90=E7=9F=B3=E7=A2=8E?= =?UTF-8?q?=E7=89=87`=E8=87=AA=E5=8A=A8=E8=A1=A5=E8=B4=A7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 23 + resource/template/ReplenishToMax.png | Bin 0 -> 1711 bytes resource/template/ReplenishToMaxConfirm.png | Bin 0 -> 2098 bytes src/MeoAssistant/Assistant.cpp | 4 +- src/MeoAssistant/MeoAssistant.vcxproj | 552 +++++------ src/MeoAssistant/MeoAssistant.vcxproj.filters | 860 +++++++++--------- .../ReplenishOriginiumShardTaskPlugin.cpp | 25 + .../ReplenishOriginiumShardTaskPlugin.h | 18 + src/MeoAssistant/StageDropsTaskPlugin.cpp | 13 +- src/MeoAssistant/StageDropsTaskPlugin.h | 1 + 10 files changed, 787 insertions(+), 709 deletions(-) create mode 100644 resource/template/ReplenishToMax.png create mode 100644 resource/template/ReplenishToMaxConfirm.png create mode 100644 src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.cpp create mode 100644 src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.h diff --git a/resource/tasks.json b/resource/tasks.json index 56b7b201d1..1427ee4fd0 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -2594,6 +2594,29 @@ "template": "DroneAssistTrade.png", "action": "stop" }, + "ReplenishToMax": { + "action": "ClickSelf", + "roi": [ + 882, + 128, + 165, + 149 + ], + "rearDelay": 1000, + "next": [ + "ReplenishToMaxConfirm", + "Stop" + ] + }, + "ReplenishToMaxConfirm": { + "action": "ClickSelf", + "roi": [ + 854, + 504, + 192, + 187 + ] + }, "ShamareThumbnail": { "algorithm": "JustReturn", "action": "doNothing", diff --git a/resource/template/ReplenishToMax.png b/resource/template/ReplenishToMax.png new file mode 100644 index 0000000000000000000000000000000000000000..912f2ff9bee9887bee6f24314f93de3d5809f6e6 GIT binary patch literal 1711 zcmbtVdsxy}82;r@5Eb#h)EPRQb91KT2uh(05lghl3u2*Wq@#koq){mrPX^_s<;?Mr z_Gq(t1C(@RPMLYZVvdkf%kuh|y1Yg=FSGr&KeoU3?2qr9=Q-#3zVE!}ecy9Ld&7b) z;Er$r04zc%BpNvH1j83*1ded!emww~WQ34*MkE_QZqK6ZFLVS(-vvysIXdNrNc@Vb zaMO=Uj8;*qs1M)Uo0!_!Gn{54;?Xf1$z9oHK{WCNg?ctFWAD=UU zlMk3_e9Vi=%CdidRDI_T?nnKTCr>C8|Hsk&-g(ebJjg5^em8!DR9gi1J zEkAwAC{*8OX|7$pYMoC`d)Y4yE_CVDY6T>a4c%DBMKd!qUYP@A!+L2?PfuH0n?ixP zp@r_Tg$J?OY%W(mvas3PdsxN)@NQuQ3WeTQD9#e%s8nif?9kepKjk6`(!P@9TgR}(`T_M`sgn^+}>N}gwcjO8}X|;e;U}Fod-g1ZuSfgXx#XMn^SJ(2I8upvt9|NN&aD?o&_v2k=7dsj<7l!ZM3#_Eg7?#Pw!9n{V0O=T) zt4f>tZFbfR0?O!z_?Z4f4d&+NuV23ga+vb)&`>W=&yeu&LZL8cL|BpB#2ERR_Yq*; zVQXh+dVXby&ro+`N`qoeUG7K_1n z`s8-fej2U78BdFheDi)Oai491soVTuL*hhtzEmpB%F6Qe^mOn(u=k5%P-~zUcs!oJ zHm)TD+@yjGJAyuJSJZVK;;p>?1_Vc^54H=ShF7m1Xf(&Mv7w=%Cr_SCPfw4C_^$Uz zOX?(CYgqKiO#pTvApp$O^#1+(_^g%mQ>So1dS+&HbTt2ul}IGyijfF*ULX{U#nsi- z;EjNqn^>xfs2Loj7w?`lEF+w8K13q_#jj$}{g*2S!S%Q}A{J}Hhg(?Wi$vg?5)u+3 z*~%TRPY~>`OvO2aB8{qjJh7CMP9Y(kNyn0tA13?h_jIe(19dSs2VQcY-6^M4o0|w2 z(w`X8ZKWLjEh>?}es=ZkoB(Rs-QC?UkGmm})asH!$vk5J1qp=O*-7GZ7eEgX&%XB| z5WFwBtwmoEqLR0jBCL{*9642XLoAM=(?@ah)4H4Lf={-HLpjP-(BKCT9vmAR1AVY{ zYbJ*ytEf1Xnu;M1*5{wMxVpL)6%~1xXgJEujEwBnx4o08%YS6Q-%cSdIz)LZhUP#( zr%!J~!hX5h(?husIJR^O$VvFV>F9uo(FXaz_JDx7cdKK3s0el#@gHM8F5I>!?c3t5 RBJd*uLW06bvcUNBe*$ti4p#sG literal 0 HcmV?d00001 diff --git a/resource/template/ReplenishToMaxConfirm.png b/resource/template/ReplenishToMaxConfirm.png new file mode 100644 index 0000000000000000000000000000000000000000..4fb6b718716486d2fbdc1d1b2393a7c482f5da0f GIT binary patch literal 2098 zcmcgueK^zWA6AkOSs~iED%YYAp@>CFq)BwiI%D47VqOjzrEzlRNM#+yB4u8FJ27W- zyl%GH@zO-i%YKT`)`p^CUOLM=zioB?IRF0sIDdSf?;p?gxv%?kf9~ggo@`GKS9R3` zstO7U>TVaEuS)-Z(hs(4yL8=osga|gpuFPd?Bt!YZMF@KM1<+LF3in6O(dko#W5Il zIat)gg6``>+MPQ%dkr<+ttoriQ;r!24xez^d$%;h-1I_@ot~Pp3+AA?!@5;P9?d!E zmy7on4~NlTy}CZcZTai-V8P?YmdU57y|?mvLtIV;0hjXAdnXMe6;&~Qm-=^V?P|_1 zRX5g5IO+uSJUDSR<5cO{F5-@uvv+@ms*L=!{m|pR4cnB?9S8rL1#?-M;D{gDH%#2P z>~m(peK!|H-U+l=vpJxQBu58U2+O~4xi_P{9*M0F#wPmI`~JA{s3TYZj@9rgoSANS zf`v{xR&?LA-b2=5eQ=r=y;=;8;k%A9uaRS+PQg&*!VcGE0{00z95TZEbMt*!%224K z_7CB?GBGR%C)^^~D=CbnOpnHL(d~8yiT%|)q?WJmfVLP3fVN|X56Sc}?K#@@QLV+i zgnaxouh>`9qcgI{p^2Kdf z>dKQ7?e|BCTWIe`y-J-#_~NzbJ-ah;xnL_9Zlraea5an#>@zz~v3;7?kt>y?N+&d^ z`=~8w;mzHtV&9F3PD4w%6I^^pX5J@y4ZQ4~w*?Q>@|fngLv3e}D2mwoOd_wm17IT= z5|8S6xZshyq^2n2vY6hy|03WcGx3YRg)qXbMZozrqhJ9vqS}`MeGLbNLxRfVVkBD* zfLwLi%&hYhmWMMh!;(mKue+aMXYt(1xYjwsy`lx75`R_gRrDtYC#52`28~*!riyC8 zYVr;$!P=9oJtq;Yenkw<^TF)C3a<}8eQ*R=g{**bm766ncGnIFGQ(wV%%I3;+276^M%f7G$KGOl>5-I?={a#~D<;VDz|aMgA%0|Sk8 zmf@YRp3XaEw(s|ZnI1#>AsiUPLSw^$?h3}V6VeeK9(3WY1XFSOCF*tL8ymsWl^2{T z5}ismm7r33O6E~l3a2QKf9_cmg`SmJPF=DBj@nQneyuwnHFqA#_x*&?HA=!0U=)%16;EwSSUxrWW5 zg;&vq?}K4dR#jcGC%ChUX_if%vw^Yov9aHv9!mkQ6H(dT`B5Vbo_+H(pH6c8CnE>||=w@wa1X-j68tZ;BbNx)AQwgwD=hU)^ z#ooiOVFW_j&1AG?-8VIJnu3y6M)p+dT(RveYo&ZJSdTKc)x92m^BQmN84Nz^Z`{nR z7FJErC!^9qWZXCNj)cYVANdrRmrN!=)}m1zsI6S#d|)7hB&HV-`5HB2Dng3Vj5`DaD^%}9-{y~qy%f=c!@|^+G0uYewQ7fN~imhO@24b`Ejzw<_b(T3s zkJiw$wt0(qQVo(dJ_>_o6gK5~LxekC;McO+?WxK&?wx~q0NGgzZ3V>o`>&29y!A&# zV(!|E0R!dsE<6ibF5zVl6mZEe5DVVX=87Mv-ej$m4n$=28PP>#vS&y<;JZA zs|X!2QbPn1nuP0JSsU6KCoPLy(8$|dYj7kTtyR$8D;G!)6US}lB zy@%4l-9gpDN5zr`x>-qlu*UM&mF(rA4&iu(B)i|zM2>Uj;~(LyvQqB>X>SWL@+Ev7&15A(uV)fg+e<_qlJ1oL;#ru;fX9{$|5=m7ZlZ>#_J0regiseter_plugin(); auto trade_task_ptr = std::make_shared(task_callback, (void*)this, InfrastTaskCahin); trade_task_ptr->set_uses_of_drone(uses_of_drones) .set_work_mode(work_mode) .set_mood_threshold(dorm_threshold) .set_retry_times(InfrastRetryTimes); - trade_task_ptr->regiseter_plugin(); + auto power_task_ptr = std::make_shared(task_callback, (void*)this, InfrastTaskCahin); power_task_ptr->set_work_mode(work_mode) .set_mood_threshold(dorm_threshold) diff --git a/src/MeoAssistant/MeoAssistant.vcxproj b/src/MeoAssistant/MeoAssistant.vcxproj index 3d08500615..a0510b02b3 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj +++ b/src/MeoAssistant/MeoAssistant.vcxproj @@ -1,278 +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 + 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 + + + + + + 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/src/MeoAssistant/MeoAssistant.vcxproj.filters b/src/MeoAssistant/MeoAssistant.vcxproj.filters index ce678a9f07..d3d1944de4 100644 --- a/src/MeoAssistant/MeoAssistant.vcxproj.filters +++ b/src/MeoAssistant/MeoAssistant.vcxproj.filters @@ -1,428 +1,434 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {81d86994-0d89-4cc2-aa6f-d726a0bd0490} - - - {3b93d9f2-728c-4a22-bc13-57ce7df5806c} - - - {1ef28df7-c174-4032-bbcf-9722ae53852d} - - - {557d6d96-11d9-46e1-b611-b2b8216abea6} - - - {1a8ffc31-8eb3-4af6-9065-634de2463a3e} - - - {c6a0898b-5dd7-4437-981c-00e53b30a60d} - - - {07a812fe-6b28-4be0-b6d4-33554824d3c5} - - - {74bd94e1-4973-412a-a17a-d8457de387af} - - - {87c9dee5-847b-41e6-818e-387a6385ea8b} - - - {a37e0b23-e8f8-499c-adf5-9990277e9ffe} - - - {51165426-1842-491a-b5d5-9d26c59facdd} - - - {c600668a-0d70-4694-b1e5-6a78cffd0b1a} - - - {d173e449-880b-4064-bbab-97007e3d090b} - - - {fc8aa302-89bb-4016-924d-10177dc8b334} - - - {9a6160e3-cd35-4dda-ba04-23ede1878740} - - - {a5c43813-70af-4b0e-94ac-9ddecc2e4a3c} - - - {6cd85910-b561-4cf3-85a2-20be3cd1dd76} - - - {34a52261-b34b-49ac-8102-22b0125617f5} - - - {f5faaa93-ae82-472e-9c59-9eccc29294a0} - - - - - 头文件 - - - 头文件 - - - 头文件\Resource - - - 头文件\Resource - - - 头文件\Utils - - - 头文件\Utils - - - 头文件\Utils - - - 头文件\Utils - - - 头文件\Caller - - - 头文件\Caller - - - 头文件\Task - - - 头文件\Task - - - 头文件\Task - - - 头文件\Utils - - - 头文件\Resource - - - 头文件\Resource - - - 头文件\Task - - - 头文件\Resource - - - 头文件\ImageAnalyzer - - - 头文件\Resource - - - 头文件\Resource - - - 头文件\Resource - - - 头文件\Resource - - - 头文件\ImageAnalyzer - - - 头文件 - - - 头文件\ImageAnalyzer - - - 头文件\ImageAnalyzer\General - - - 头文件\ImageAnalyzer\General - - - 头文件\ImageAnalyzer\General - - - 头文件\ImageAnalyzer\General - - - 头文件\ImageAnalyzer\Infrast - - - 头文件\Resource - - - 头文件\ImageAnalyzer\Infrast - - - 头文件 - - - 头文件\ImageAnalyzer\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\Task\Infrast - - - 头文件\ImageAnalyzer\Infrast - - - 头文件\Utils - - - 头文件\ImageAnalyzer\Infrast - - - 头文件 - - - 头文件\Task - - - 头文件\Task\Infrast - - - 头文件\Requester - - - 头文件\TaskPlugin - - - 头文件\TaskPlugin - - - 头文件\TaskPlugin - - - 头文件\ImageAnalyzer - - - 头文件\ImageAnalyzer\General - - - 头文件\ImageAnalyzer - - - 头文件\TaskPlugin - - - 头文件\TaskPlugin - - - 头文件\Resource - - - - - 源文件 - - - 源文件 - - - 源文件\Resource - - - 源文件\Resource - - - 源文件\Task - - - 源文件\Task - - - 源文件\Task - - - 源文件\Caller - - - 源文件\Resource - - - 源文件\Resource - - - 源文件\Task - - - 源文件\Resource - - - 源文件\ImageAnalyzer - - - 源文件\Resource - - - 源文件\Resource - - - 源文件\Resource - - - 源文件\Resource - - - 源文件\ImageAnalyzer - - - 源文件 - - - 源文件\ImageAnalyzer - - - 源文件\ImageAnalyzer\Infrast - - - 源文件\ImageAnalyzer\General - - - 源文件\ImageAnalyzer\General - - - 源文件\ImageAnalyzer\General - - - 源文件\ImageAnalyzer\General - - - 源文件\Resource - - - 源文件\ImageAnalyzer\Infrast - - - 源文件 - - - 源文件\Task\Infrast - - - 源文件\Task\Infrast - - - 源文件\Task\Infrast - - - 源文件\Task\Infrast - - - 源文件\Task\Infrast - - - 源文件\Task\Infrast - - - 源文件\Task\Infrast - - - 源文件\Task\Infrast - - - 源文件\ImageAnalyzer\Infrast - - - 源文件\ImageAnalyzer\Infrast - - - 源文件\Task\Infrast - - - 源文件\ImageAnalyzer\Infrast - - - 源文件 - - - 源文件\Task - - - 源文件\Task\Infrast - - - 源文件\Requester - - - 源文件\TaskPlugin - - - 源文件\TaskPlugin - - - 源文件\TaskPlugin - - - 源文件\ImageAnalyzer - - - 源文件\ImageAnalyzer\General - - - 源文件\ImageAnalyzer - - - 源文件\TaskPlugin - - - 源文件\TaskPlugin - - - 源文件\Resource - - - - - 资源文件 - - - 资源文件 - - - 资源文件 - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {81d86994-0d89-4cc2-aa6f-d726a0bd0490} + + + {3b93d9f2-728c-4a22-bc13-57ce7df5806c} + + + {1ef28df7-c174-4032-bbcf-9722ae53852d} + + + {557d6d96-11d9-46e1-b611-b2b8216abea6} + + + {1a8ffc31-8eb3-4af6-9065-634de2463a3e} + + + {c6a0898b-5dd7-4437-981c-00e53b30a60d} + + + {07a812fe-6b28-4be0-b6d4-33554824d3c5} + + + {74bd94e1-4973-412a-a17a-d8457de387af} + + + {87c9dee5-847b-41e6-818e-387a6385ea8b} + + + {a37e0b23-e8f8-499c-adf5-9990277e9ffe} + + + {51165426-1842-491a-b5d5-9d26c59facdd} + + + {c600668a-0d70-4694-b1e5-6a78cffd0b1a} + + + {d173e449-880b-4064-bbab-97007e3d090b} + + + {fc8aa302-89bb-4016-924d-10177dc8b334} + + + {9a6160e3-cd35-4dda-ba04-23ede1878740} + + + {a5c43813-70af-4b0e-94ac-9ddecc2e4a3c} + + + {6cd85910-b561-4cf3-85a2-20be3cd1dd76} + + + {34a52261-b34b-49ac-8102-22b0125617f5} + + + {f5faaa93-ae82-472e-9c59-9eccc29294a0} + + + + + 头文件 + + + 头文件 + + + 头文件\Resource + + + 头文件\Resource + + + 头文件\Utils + + + 头文件\Utils + + + 头文件\Utils + + + 头文件\Utils + + + 头文件\Caller + + + 头文件\Caller + + + 头文件\Task + + + 头文件\Task + + + 头文件\Task + + + 头文件\Utils + + + 头文件\Resource + + + 头文件\Resource + + + 头文件\Task + + + 头文件\Resource + + + 头文件\ImageAnalyzer + + + 头文件\Resource + + + 头文件\Resource + + + 头文件\Resource + + + 头文件\Resource + + + 头文件\ImageAnalyzer + + + 头文件 + + + 头文件\ImageAnalyzer + + + 头文件\ImageAnalyzer\General + + + 头文件\ImageAnalyzer\General + + + 头文件\ImageAnalyzer\General + + + 头文件\ImageAnalyzer\General + + + 头文件\ImageAnalyzer\Infrast + + + 头文件\Resource + + + 头文件\ImageAnalyzer\Infrast + + + 头文件 + + + 头文件\ImageAnalyzer\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\Task\Infrast + + + 头文件\ImageAnalyzer\Infrast + + + 头文件\Utils + + + 头文件\ImageAnalyzer\Infrast + + + 头文件 + + + 头文件\Task + + + 头文件\Task\Infrast + + + 头文件\Requester + + + 头文件\TaskPlugin + + + 头文件\TaskPlugin + + + 头文件\TaskPlugin + + + 头文件\ImageAnalyzer + + + 头文件\ImageAnalyzer\General + + + 头文件\ImageAnalyzer + + + 头文件\TaskPlugin + + + 头文件\TaskPlugin + + + 头文件\Resource + + + 头文件\TaskPlugin + + + + + 源文件 + + + 源文件 + + + 源文件\Resource + + + 源文件\Resource + + + 源文件\Task + + + 源文件\Task + + + 源文件\Task + + + 源文件\Caller + + + 源文件\Resource + + + 源文件\Resource + + + 源文件\Task + + + 源文件\Resource + + + 源文件\ImageAnalyzer + + + 源文件\Resource + + + 源文件\Resource + + + 源文件\Resource + + + 源文件\Resource + + + 源文件\ImageAnalyzer + + + 源文件 + + + 源文件\ImageAnalyzer + + + 源文件\ImageAnalyzer\Infrast + + + 源文件\ImageAnalyzer\General + + + 源文件\ImageAnalyzer\General + + + 源文件\ImageAnalyzer\General + + + 源文件\ImageAnalyzer\General + + + 源文件\Resource + + + 源文件\ImageAnalyzer\Infrast + + + 源文件 + + + 源文件\Task\Infrast + + + 源文件\Task\Infrast + + + 源文件\Task\Infrast + + + 源文件\Task\Infrast + + + 源文件\Task\Infrast + + + 源文件\Task\Infrast + + + 源文件\Task\Infrast + + + 源文件\Task\Infrast + + + 源文件\ImageAnalyzer\Infrast + + + 源文件\ImageAnalyzer\Infrast + + + 源文件\Task\Infrast + + + 源文件\ImageAnalyzer\Infrast + + + 源文件 + + + 源文件\Task + + + 源文件\Task\Infrast + + + 源文件\Requester + + + 源文件\TaskPlugin + + + 源文件\TaskPlugin + + + 源文件\TaskPlugin + + + 源文件\ImageAnalyzer + + + 源文件\ImageAnalyzer\General + + + 源文件\ImageAnalyzer + + + 源文件\TaskPlugin + + + 源文件\TaskPlugin + + + 源文件\Resource + + + 源文件\TaskPlugin + + + + + 资源文件 + + + 资源文件 + + + 资源文件 + + \ No newline at end of file diff --git a/src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.cpp b/src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.cpp new file mode 100644 index 0000000000..36eb79d7e9 --- /dev/null +++ b/src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.cpp @@ -0,0 +1,25 @@ +#include "ReplenishOriginiumShardTaskPlugin.h" + +#include "ProcessTask.h" + +bool asst::ReplenishOriginiumShardTaskPlugin::verify(AsstMsg msg, const json::value& details) const +{ + if (msg != AsstMsg::SubTaskExtraInfo + || details.get("subtask", std::string()) != "InfrastMfgTask") { + return false; + } + + if (details.at("what").as_string() == "ProductOfFacility" + && details.at("details").at("product").as_string() == "OriginStone") { + return true; + } + else { + return false; + } +} + +bool asst::ReplenishOriginiumShardTaskPlugin::_run() +{ + ProcessTask task(*this, { "ReplenishToMax" }); + return task.run(); +} diff --git a/src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.h b/src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.h new file mode 100644 index 0000000000..929f64b339 --- /dev/null +++ b/src/MeoAssistant/ReplenishOriginiumShardTaskPlugin.h @@ -0,0 +1,18 @@ +#pragma once +#include "AbstractTaskPlugin.h" + +namespace asst +{ + // 制造站“源石碎片”自动补货任务插件 + class ReplenishOriginiumShardTaskPlugin : public AbstractTaskPlugin + { + public: + using AbstractTaskPlugin::AbstractTaskPlugin; + virtual ~ReplenishOriginiumShardTaskPlugin() = default; + + virtual bool verify(AsstMsg msg, const json::value& details) const override; + + private: + virtual bool _run() override; + }; +} diff --git a/src/MeoAssistant/StageDropsTaskPlugin.cpp b/src/MeoAssistant/StageDropsTaskPlugin.cpp index 2f29e9aeb3..6b3f2f911f 100644 --- a/src/MeoAssistant/StageDropsTaskPlugin.cpp +++ b/src/MeoAssistant/StageDropsTaskPlugin.cpp @@ -55,12 +55,13 @@ bool asst::StageDropsTaskPlugin::_run() drop_info_callback(); check_stage_valid(); - - auto upload_future = std::async( - std::launch::async, - std::bind(&StageDropsTaskPlugin::upload_to_penguin, this)); - m_upload_pending.emplace_back(std::move(upload_future)); - + + if (m_enable_penguid) { + auto upload_future = std::async( + std::launch::async, + std::bind(&StageDropsTaskPlugin::upload_to_penguin, this)); + m_upload_pending.emplace_back(std::move(upload_future)); + } return true; } diff --git a/src/MeoAssistant/StageDropsTaskPlugin.h b/src/MeoAssistant/StageDropsTaskPlugin.h index 6e111f4cfd..803f4683c9 100644 --- a/src/MeoAssistant/StageDropsTaskPlugin.h +++ b/src/MeoAssistant/StageDropsTaskPlugin.h @@ -34,5 +34,6 @@ namespace asst bool m_startbutton_delay_setted = false; std::vector> m_upload_pending; ProcessTask* m_cast_ptr = nullptr; + bool m_enable_penguid = true; }; }