From 7d1c19046faede2d7aac51f1a5427cdb4142c600 Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Mon, 2 May 2022 16:34:35 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=96=AD=E7=BA=BF=E9=87=8D=E8=BF=9E?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=8D=A1=E4=BD=8F=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/resource/tasks.json b/resource/tasks.json index be7313e84c..74f1e8c23c 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -5,6 +5,7 @@ "next": [ "GameStart", "StartToWakeUp", + "StartUpConnectingFlag", "Terminal", "CloseAnno", "TodaysSupplies", @@ -1002,6 +1003,7 @@ "FightMissionFailed", "EndOfAction", "StartToWakeUp", + "StartUpConnectingFlag", "OfflineConfirm", "StartButton1" ] @@ -1021,6 +1023,7 @@ "next": [ "EndOfAction", "StartToWakeUp", + "StartUpConnectingFlag", "OfflineConfirm", "StartButton1" ] @@ -1039,7 +1042,8 @@ "PRTS2", "PrtsErrorConfirm", "OfflineConfirm", - "StartToWakeUp" + "StartToWakeUp", + "StartUpConnectingFlag" ] }, "OfflineConfirm": { @@ -4071,6 +4075,25 @@ 100 ], "next": [ + "StartToWakeUpToRoguelike1", + "StartUpConnectingToRoguelike1", + "TerminalToRoguelike1", + "CloseAnnoToRoguelike1", + "TodaysSuppliesToRoguelike1" + ] + }, + "StartUpConnectingToRoguelike1": { + "template": "StartUpConnectingFlag.png", + "action": "doNothing", + "roi": [ + 520, + 460, + 240, + 100 + ], + "next": [ + "StartUpConnectingToRoguelike1", + "StartToWakeUpToRoguelike1", "TerminalToRoguelike1", "CloseAnnoToRoguelike1", "TodaysSuppliesToRoguelike1" @@ -4194,6 +4217,7 @@ "next": [ "CloseAnnoToRoguelike1", "StartToWakeUpToRoguelike1", + "StartUpConnectingToRoguelike1", "OfflineConfirmToRoguelike1" ] }, @@ -4211,6 +4235,7 @@ "ReturnToRoguelike1Confirm", "OfflineConfirmToRoguelike1", "StartToWakeUpToRoguelike1", + "StartUpConnectingToRoguelike1", "StageSNReturnToRoguelike1" ] }, From 1507c53c565e6834bb332d62139cd7bdf359236c Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Mon, 2 May 2022 18:31:31 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix.=E7=BB=A7=E7=BB=AD=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9F=90=E4=BA=9B=E6=83=85=E5=86=B5=E4=B8=8B=E6=96=AD=E7=BA=BF?= =?UTF-8?q?=E9=87=8D=E8=BF=9E=E5=8F=AF=E8=83=BD=E5=8D=A1=E4=BD=8F=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resource/tasks.json b/resource/tasks.json index 74f1e8c23c..8207fab0bd 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -486,6 +486,7 @@ 85 ], "next": [ + "StartToWakeUp", "StartUpConnectingFlag", "Terminal", "CloseAnno", @@ -4092,8 +4093,8 @@ 100 ], "next": [ - "StartUpConnectingToRoguelike1", "StartToWakeUpToRoguelike1", + "StartUpConnectingToRoguelike1", "TerminalToRoguelike1", "CloseAnnoToRoguelike1", "TodaysSuppliesToRoguelike1" From dfab798bebcc6221995a95a5b7bde3a77a01bc16 Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Mon, 2 May 2022 18:35:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=96=AD=E7=BA=BF=E9=87=8D=E8=BF=9E?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E5=8D=A1=E5=9C=A8=E7=99=BB=E5=BD=95=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resource/tasks.json b/resource/tasks.json index 8207fab0bd..9a97a7ded8 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -478,7 +478,7 @@ ] }, "StartUpConnectingFlag": { - "action": "doNothing", + "action": "clickSelf", "roi": [ 0, 635, From f08abc2d600b776309028855aced92e73c08c6d8 Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Mon, 2 May 2022 19:06:45 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8BB=E6=9C=8D=E5=8D=A1=E5=9C=A8?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 27 +++++++++++++++++++++++- resource/template/StartLoginBServer.png | Bin 0 -> 1751 bytes 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 resource/template/StartLoginBServer.png diff --git a/resource/tasks.json b/resource/tasks.json index 9a97a7ded8..c4863c4d48 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -6,6 +6,7 @@ "GameStart", "StartToWakeUp", "StartUpConnectingFlag", + "StartLoginBServer", "Terminal", "CloseAnno", "TodaysSupplies", @@ -471,6 +472,7 @@ "next": [ "StartToWakeUp", "StartUpConnectingFlag", + "StartLoginBServer", "Terminal", "CloseAnno", "OfflineConfirm", @@ -487,6 +489,7 @@ ], "next": [ "StartToWakeUp", + "StartLoginBServer", "StartUpConnectingFlag", "Terminal", "CloseAnno", @@ -494,6 +497,23 @@ "TodaysSupplies" ] }, + "StartLoginBServer": { + "action": "clickSelf", + "roi": [ + 440, + 370, + 400, + 80 + ], + "next": [ + "StartUpConnectingFlag", + "StartLoginBServer", + "Terminal", + "CloseAnno", + "OfflineConfirm", + "TodaysSupplies" + ] + }, "ReturnToTerminal": { "template": "Return.png", "action": "clickSelf", @@ -1005,6 +1025,7 @@ "EndOfAction", "StartToWakeUp", "StartUpConnectingFlag", + "StartLoginBServer", "OfflineConfirm", "StartButton1" ] @@ -1025,6 +1046,7 @@ "EndOfAction", "StartToWakeUp", "StartUpConnectingFlag", + "StartLoginBServer", "OfflineConfirm", "StartButton1" ] @@ -1044,7 +1066,8 @@ "PrtsErrorConfirm", "OfflineConfirm", "StartToWakeUp", - "StartUpConnectingFlag" + "StartUpConnectingFlag", + "StartLoginBServer" ] }, "OfflineConfirm": { @@ -1063,6 +1086,7 @@ "CloseAnno", "StartToWakeUp", "StartUpConnectingFlag", + "StartLoginBServer", "OfflineConfirm", "TodaysSupplies" ] @@ -1078,6 +1102,7 @@ "next": [ "StartToWakeUp", "StartUpConnectingFlag", + "StartLoginBServer", "Terminal", "CloseAnno", "OfflineConfirm", diff --git a/resource/template/StartLoginBServer.png b/resource/template/StartLoginBServer.png new file mode 100644 index 0000000000000000000000000000000000000000..7964baea7d127ea39f3cc3fa083d4e710a0f47a9 GIT binary patch literal 1751 zcmbtV`#;l*8~?0fJGoz$OR%t|omRfsPDq@waCY2t z-ID7O!Y~naB6nj>$VM%fI0|Rq{(LB1&>|sEouP`(#xm3E*%$j0Y47ofNpvN+2lQ-O&zU4<1^Q0I499GYSA|9>{+E zQCfn(3v==c2LP4Z|1}Ul5FP~pGQJoz$|K5eWjdIgNzj0Z_a@kllA{6e_1Ag*wN~_h~R2 zsh%zg9*tquMts|(g>L!)Jm$I)qW{#z=_n(hCqaOs|aQhIKud+eo$$x#gN zd(KcZSS_e{PUyp-*st&LxWg|ZM5Td|`$y6uM!Up=1yDa`dg1`gIVw6-q=R^Y$dj~sxo|S z`BnW^N$GgA?o$Xin{32beqwH9YdcZKF~E)DUUpu5u8M6Kc~4~=_dR1Pi-d@Sk0cQg zQNg*Y%oDE@67`0}3wNOngg=P>NQ4Wo{(MUmdgtX?-Kw}3em-jklg^%?n9*L~K&3cy zwza06V>~kebJK2_^Y=YOEJIvg#tV!)tT3&vBlo(?uWyzlhtL09=Q*?5N?-2j%T7rb zQds+^;gy9=x|6A4CU<##c4hbnAtdlk!VSaK9b}a$hc}Q|-LGgIIVvcQSr!V+mY9zs zZ|2^@Y%KlpyryFEgpAvrYg-v+iYW^I5pAw_cB(64`eV1=-gz=g7p-}NH!hw|Ta0|G zdpqgEMjuKiWzeafy?yEi^`PcW$N{otfX#UlJjqnk%uRYGp~8KmTo{23P&=8N_vh7} zuN((l|AyVXKHoI7J=syK%4*T^)ca!W+~BddBPY?Hf85HbE`F0oe9x1wn3LzJHZ#bJ zOKlc|J!QW}jE{XUQ}$#EugZlWsFQr7;9f4+rjfl7=*dznN4!3Z7a$S2DqGv=%-x)_ z=Voy)PO0P@_ed*yfLdCcHD?IuXZ3j-3r_lJqScnBpPs1Kpj94($}a6rl^85Bcj0pW zPM5letn5Z$ZhKd^GD3=L1^hxF;`cN`a>WtWMU+YPwIES-f^yt;P!Wroc{nxHC4%i9 z9`B;v_tw|)utaNu4{o5UY4|^n6AGPcw*3ZUaGgn=QhC)jqQ)U zhbB53joxV1l$y)l9ad|JY|geopHh#81zFE8i-BENgxNAZK{1xM@gEB2eiDAX`< zY!R!TXh>*fTPdO9t;;P|vxo~y?seNZZ zCtYPe6m@vOx;i`{{M}ZaMz!s9b{pSaxx4atBBdKg+Q-dKIjTMD&^AN=tHVS4o{hYh zQ}Tai7=@F4@49Na@#GYY_=4!sZTpn|TO#5LBIn9_;FR%~PMT51HZIvo()}!{Gp$!j zLXE+}0FLVmhjBkaYhSVH~Ft*9fj%Yh|7qyKfD9zsh=wAJ{?@ z`s`8J{IEAP*j~X$m`S|3WdNUDWvK00qA-0wiR5sjwX+9*^A+uuh zQUA&H*(6*g#ioSpR{)nab>?DYxnsix7MFkdup*59?jyCn?$gxZ6%q2A(5gLMdWZK6 zUjH-k7%>5xd}W<#NLY)v2RUIm_<&Y9cauiLx#o<4(`ROV2buo;n&XL**&2A6X6YGc z3SCcU4Ht2(kN=L;|8{ko1P=fIDW=oNkgxJIkfZr{>Aoh(_W>~WE@-x$|Gj?!E`LH8 literal 0 HcmV?d00001 From f489498420fca41215e4b493b13e2672e3e07ab7 Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Tue, 3 May 2022 02:09:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D`GameStart`=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E7=BC=93=E5=AD=98=E4=BD=8D=E7=BD=AE=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E5=94=A4=E9=86=92=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/tasks.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resource/tasks.json b/resource/tasks.json index c4863c4d48..8a8c4feb24 100644 --- a/resource/tasks.json +++ b/resource/tasks.json @@ -463,6 +463,7 @@ 200, 120 ], + "cache": false, "templThreshold": 0.7, "rearDelay": 3000, "maskRange": [ From d83a65c43fc4c52cb995e88d26c8d36fed02ac0e Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Tue, 3 May 2022 02:22:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?feat.=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/ProcessTask.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/MeoAssistant/ProcessTask.cpp b/src/MeoAssistant/ProcessTask.cpp index e66d695c00..17f6b548fc 100644 --- a/src/MeoAssistant/ProcessTask.cpp +++ b/src/MeoAssistant/ProcessTask.cpp @@ -123,6 +123,11 @@ bool ProcessTask::_run() } if (exec_times >= max_times) { + info["details"] = json::object{ + { "task", cur_name }, + { "exec_times", exec_times }, + { "max_times", max_times } + }; Log.info("exec times exceeds the limit", info.to_string()); m_cur_tasks_name = cur_task_ptr->exceeded_next; sleep(task_delay); From 269a0a8e9b77e29d3d66e6313141e6b6f12d5237 Mon Sep 17 00:00:00 2001 From: zzyyyl <74587068+zzyyyl@users.noreply.github.com> Date: Tue, 3 May 2022 02:48:46 +0800 Subject: [PATCH 7/7] =?UTF-8?q?style.=E4=BF=AE=E5=A4=8D=E4=B8=80=E5=A4=84?= =?UTF-8?q?=E8=8B=B1=E8=AF=AD=E8=AF=AD=E6=B3=95=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/ProcessTask.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MeoAssistant/ProcessTask.cpp b/src/MeoAssistant/ProcessTask.cpp index 17f6b548fc..7abd4d6e3c 100644 --- a/src/MeoAssistant/ProcessTask.cpp +++ b/src/MeoAssistant/ProcessTask.cpp @@ -128,7 +128,7 @@ bool ProcessTask::_run() { "exec_times", exec_times }, { "max_times", max_times } }; - Log.info("exec times exceeds the limit", info.to_string()); + Log.info("exec times exceeded the limit", info.to_string()); m_cur_tasks_name = cur_task_ptr->exceeded_next; sleep(task_delay); continue;