From 2116fbf347f1cdfe53d398828dc9dce8d07b8298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=93=E4=B8=B6=E6=A2=A6=E4=B8=B6=E4=BB=81?=
 <74444214+Daydreamer114@users.noreply.github.com>
Date: Sun, 11 Aug 2024 19:29:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=9F=E6=81=AF=E6=BC=94=E7=AE=97?=
 =?UTF-8?q?=E5=88=B7=E6=BB=A1=E5=90=8E=E5=81=9C=E6=AD=A2=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=20(#10197)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: 生息演算刷满后停止任务

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 修改出口

* fix: 我也不知道我写的什么玩意 revert掉

* chore: Auto update by pre-commit hooks [skip changelog]

* fix: 用Stop结束任务

* chore: Auto update by pre-commit hooks [skip changelog]

* perf: 删掉多余图片

* feat: 完成后不删除存档并返回主页面

* chore: Auto update by pre-commit hooks [skip changelog]
---
 resource/tasks.json                        |  32 ++++++++++++++++++++-
 resource/template/Reclamation2RightMax.png | Bin 0 -> 1237 bytes
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 resource/template/Reclamation2RightMax.png

diff --git a/resource/tasks.json b/resource/tasks.json
index f6abf0f1c5..e0d78869aa 100644
--- a/resource/tasks.json
+++ b/resource/tasks.json
@@ -10421,7 +10421,7 @@
     "Reclamation2SkipDaysAward": {
         "algorithm": "JustReturn",
         "postDelay": 5000,
-        "next": ["Reclamation2SkipDaysAward2", "Reclamation2SkipDaysAward1"]
+        "next": ["Reclamation2RightMax", "Reclamation2SkipDaysAward2", "Reclamation2SkipDaysAward1"]
     },
     "Reclamation2SkipDaysAward1": {
         "algorithm": "JustReturn",
@@ -10437,6 +10437,36 @@
         "text": ["点击", "任意处", "继续"],
         "next": ["Reclamation2SkipDaysBeginNewDay"]
     },
+    "Reclamation2RightMax": {
+        "roi": [789, 475, 154, 122],
+        "preDelay": 1000,
+        "next": ["Reclamation2SkipDaysAwardEndTask"]
+    },
+    "Reclamation2SkipDaysAwardEndTask": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "roi": [506, 609, 272, 111],
+        "preDelay": 1000,
+        "postDelay": 4000,
+        "text": ["点击", "任意处", "继续"],
+        "next": ["Reclamation2SkipDaysBeginNewDayEndTask"]
+    },
+    "Reclamation2SkipDaysBeginNewDayEndTask": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "text": ["开", "启", "今", "日"],
+        "preDelay": 1000,
+        "roi": [519, 525, 261, 144],
+        "next": ["Reclamation2QuitToMainPage", "Stop"]
+    },
+    "Reclamation2QuitToMainPage": {
+        "algorithm": "OcrDetect",
+        "action": "ClickSelf",
+        "text": ["返回"],
+        "preDelay": 2000,
+        "roi": [33, 0, 97, 63],
+        "next": ["Stop"]
+    },
     "Reclamation2SkipDaysBeginNewDay": {
         "algorithm": "OcrDetect",
         "action": "ClickSelf",
diff --git a/resource/template/Reclamation2RightMax.png b/resource/template/Reclamation2RightMax.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a05ad401df3046277799bee246af7fcbb0f744d
GIT binary patch
literal 1237
zcmV;`1S<Q9P)<h;3K|Lk000e1NJLTq001@s000&U0ssI21dI5*000D>Nkl<Zc-qC6
z>2}&i6o56mMiOFkzy!Rs`O`c=`u^{d#2W@lfYuq!^r|8<Zi3;o>B-f|h}rIUH!((^
zK29C$oFmr$%VB$DE<$JROuHx42<Dtq#)J?E6ZC4EPScwp2p(Rj>={P4x6*K_vMg$?
z4fI3%9+5F7JzoeHVT=(1xR(30n>sxw{datrQfj!6QUYa~rU2Rvk@-acOs;T)u<uGq
z2nE7+?0mkTBA}Omdd4WB)>>27dyG$iOo7bz11{V{rjF9ux5#Wa{9;wt5BL5V1c5kk
zowmvtQ&#0}lT=mJpmWZ>BYdquH{+D^#=9LHG)jpO4D3GSBLp{{lyunyos1D^812zu
zA1)Z@?3hNF;JPkk9c8TfDqJZ#z9S2!m*Lfo9|RmV!26lQvAp@v>kqs`#KB13eh5cn
zuiKC^GM$C9c_1W*uY^$F=hwHx%XyD+a!e^`ky3Il8UQfo2wx{C2*hj=4n{u4sI6@9
z-DK*`7lHJ|LCTZSMeuGa-!Htd@3sEcs>Ybi7Q^|~$n`j9<lVII_qbL_Yx`zu63%&(
zodlE9FFRzxkjW*FBWNjrjxU1#5R9aR;LgIq&<jIR*BC<N`6`ZfE#>lYD_rdRjj3S9
za7>p^+43pr3gVbh#sCq6SZjX>ci5d}6{XH}=0doKBRO06wbpr7Ip5-rFbaCEG4=h|
zI89Z5z<q!3;IgP5?_z}P&F|s$Z-Fr;i3+7^=adjkFf<V73@LLJuQNYj!*TF#62hX*
zrYH*y`r49m1(6;uOTBu|cU$dxj`Ubp-RVv(A9F%1<7E9@?Y3oO+bID&1eb$APS1vz
zJTI%FK#Qy1=)#THW|P#$g6xYFGS%~Wmf51z+f6DshD;#sFBAyI+!d4&!5O9W%y(&9
zn)Ixx2w4ZK%0{bPx>Rc$#|7usn1;|8;|Fvw<erbmh)Frb1RP-d1J(<@O;S)w!oD1h
z{j#vg(c=rYdY17zJzfB|dqG-bsi`%g>=a{j!@AWntF@!5db`OlCbDxz(38@mag?WN
z@pt55jt+Vp(05zQxHGx*l(J6`DMI@F+?!wZfFp@B$G%kqbzK7^)w(`~*pW1fqty;<
zgSFilLQdEZ2*r0_^7VT6?FD47ZwJyN!ex``5Gv{6E>EJoHWlXtQe`-Dq1via|1fB+
zFBQP)8Y_q&U>}t>*~>iBt$VaKEnlteHqlV60HL*dy5B}?n5T<e!{0nL(Ml0S`hAx%
z6h|4ngFquh;OplkUTZLkQu<m`)6k1vqskJL(W1z?5S$A@Ik4b`&lvM?zrhH#7I$-!
zxJ*;6RBdW=_c<}vfck?~kQHeX5eQZsmC&OqFwz19fZl&eFmb+jp*=WAmPJuj%|i6&
z$4k!-y!HoiFX%s>Xx<FV=|f3lk5b!hQk4xNg}cZz81VgofaiaS*jJz6ye!LFzWsR-
zo@%WjBH%xaiG6jf`dOYky&MFRrY!Pwx2wvc+ps}|k9Js96|h=s5W@eAtNp(SVP%uY
zT0!z<>8{9gt#!NI%aQin|C8*QjOW{RRto$DPCvg7ep$Qf00000NkvXXu0mjf&hBB3

literal 0
HcmV?d00001