From 467ad6b040314e2a0d02e1b2b022e43817ad2b5e Mon Sep 17 00:00:00 2001 From: wangbing Date: Thu, 29 Aug 2024 00:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- ..._L35,881.png => 城镇_探险_L35,881.png} | Bin legend/野外_L449,885.png | Bin 7230 -> 0 bytes legend/野外_搜索_L15,632.png | Bin 1346 -> 0 bytes legend/野外_搜索_L233,881.png | Bin 3411 -> 0 bytes legend/野外_搜索_L33,636.png | Bin 0 -> 444 bytes legend/野外_资源_等级1.png | Bin 403 -> 0 bytes legend/野外_资源_等级2.png | Bin 678 -> 0 bytes legend/野外_资源_等级3.png | Bin 700 -> 0 bytes legend/野外_资源_等级4.png | Bin 696 -> 0 bytes legend/野外_资源_等级5.png | Bin 679 -> 0 bytes legend/野外_资源_等级6.png | Bin 758 -> 0 bytes legend/野外_资源_等级7.png | Bin 595 -> 0 bytes legend/野外_资源_等级8.png | Bin 743 -> 0 bytes .../java/com/example/jmacro/wjdr/JMacro.java | 17 ++++ .../com/example/jmacro/wjdr/JMacroThread.java | 15 +++- .../example/jmacro/wjdr/JMainApplication.java | 5 +- .../example/jmacro/wjdr/JMainController.java | 18 +++- .../com/example/jmacro/wjdr/JMainService.java | 12 +++ .../example/jmacro/wjdr/demo/DemoThread.java | 82 ++++++++++-------- ...askRewards.java => Task_探险领取.java} | 7 +- .../wjdr/demo/task/Task_离线收益.java | 25 ++++++ ...TaskMining.java => Task_自动采矿.java} | 12 +-- ...eAttack.java => Task_采矿被攻击.java} | 4 +- .../com/example/jmacro/wjdr/util/Capture.java | 3 +- src/main/resources/main.fxml | 67 +++++++------- 26 files changed, 182 insertions(+), 87 deletions(-) rename legend/{TAB_探险_L35,881.png => 城镇_探险_L35,881.png} (100%) delete mode 100644 legend/野外_L449,885.png delete mode 100644 legend/野外_搜索_L15,632.png delete mode 100644 legend/野外_搜索_L233,881.png create mode 100644 legend/野外_搜索_L33,636.png delete mode 100644 legend/野外_资源_等级1.png delete mode 100644 legend/野外_资源_等级2.png delete mode 100644 legend/野外_资源_等级3.png delete mode 100644 legend/野外_资源_等级4.png delete mode 100644 legend/野外_资源_等级5.png delete mode 100644 legend/野外_资源_等级6.png delete mode 100644 legend/野外_资源_等级7.png delete mode 100644 legend/野外_资源_等级8.png rename src/main/java/com/example/jmacro/wjdr/demo/task/{TaskRewards.java => Task_探险领取.java} (94%) create mode 100644 src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java rename src/main/java/com/example/jmacro/wjdr/demo/task/{TaskMining.java => Task_自动采矿.java} (94%) rename src/main/java/com/example/jmacro/wjdr/demo/task/{TaskMineAttack.java => Task_采矿被攻击.java} (78%) diff --git a/.idea/misc.xml b/.idea/misc.xml index 32ddfac..6aecfa7 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -11,5 +11,5 @@ - + \ No newline at end of file diff --git a/legend/TAB_探险_L35,881.png b/legend/城镇_探险_L35,881.png similarity index 100% rename from legend/TAB_探险_L35,881.png rename to legend/城镇_探险_L35,881.png diff --git a/legend/野外_L449,885.png b/legend/野外_L449,885.png deleted file mode 100644 index 562fa75128dbe0dfb037c02de95e24658b1c4041..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7230 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 M07*qoM6N<$g0+;icmMzZ diff --git a/legend/野外_搜索_L15,632.png b/legend/野外_搜索_L15,632.png deleted file mode 100644 index f16be24e3f0c3dabd55089d8a5c42106ce56b9f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1346 zcmV-I1-<%-P)b000FENklx}po=iRJj|VLHxUkHK+gxh-3IO!~sCC$2=|JI^G%NGOM_tC*Z#Kz;Kdf}=}t;dcC?9Iy+1(IXK_+4V4t&ti3L zLx3G5?8wUMI&_A2h)k)%1-E#aO{v-hKX)?@5y@4UnKNQ*Yg>vV9O3u29OCy=@7^Oc zp#opsh?Uts5Zu8v8UbNN7@u0O80Y8u#wPS*GsrD&#iLL)Zu(}6XI@Dg4D_DA-+z9D zGVmaz0H6BWL7PlV!LDjxokhv29p1ctuB z(+D-H8niGjtymmbU*AAQT`#WOePy@)R^X1*sUfjtn4355=8%M&sl2WaZoZlL>{=Ag zDP!UHJRe0B9q8)QQ@4*GnkFGAya0901EMK+od(7y=kO$=7-tkQGGH0_C9h6;}YHP_8(Tt>30366^0sBP&9=SZBTu6Cf*p1K-| zq+AV5rq$idZEsUqba0_QlHQYn-}1}Cs9{=MWO=`6LUcx*h*Wyfp2lW2P~$C&`y51P zuO14Y4B0tW>&PFy#=!8zhseoD+8YhdD-WJmvpW75gN%Y!(WD}BDql;-Fh!mwJIiVX ze(l#ZXxfGZg|e&?V^ufyL+N8XZBkV}NJo9k5RKWUxX-n(sO^Q5_aSP|Gptg#2%2PJ z%4B*CjwyqKi~YK@o}s>YL98}DHIMDR%q>#pQdISV>!s&q;M_1i&kHd-za%cRFj+Jb z>A3l3h~|C_?M z&wO0+NDx_INBDV}J_m&tqP=I-l5TN_QeIfrj?2UeQVhG`C&}oYpj_zm(^iXv|DIo1 zLNhf`j=CAC*>%V%Y8DN}@3}-~VaK(DWAF%6;dA1HPbs6eC{_l}%3aH>#tUP=QM2$H zTN{mq&kv7G!9TPRU*C#@UuZt{kp^M$rTB*T{C|P7o>#`v;wYgA#zorgftiKB<#U~V z1_CY+<9Y8{jwlB+B`+tYVV)>+57-4~<@I`-7D~b2?bL)uF@hW!JHo#3)BJ0OcX&2U ziqa=dtWi(meqK7^c@|zyZ>vN44q}e zNrfFaGH?f~dtg{0y0vfZI&fs*tW3F&!`0{=7_%avj{?rhOz0n`rfoTijSXuDjvSno z9S96BqW^Fv1Q+ml^6Y;Ua8`C8fHKh8YY>~Sx~U)k0;$i4Kfl|q0RR9107*qoM6N<$ Eg3aZOP5=M^ diff --git a/legend/野外_搜索_L233,881.png b/legend/野外_搜索_L233,881.png deleted file mode 100644 index aa63fadaf5c7a2813932a5193749ce4668e595a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3411 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 diff --git a/legend/野外_资源_等级2.png b/legend/野外_资源_等级2.png deleted file mode 100644 index 8a58e9a9a0a25d55e55526bb67441471ba36f0a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 678 zcmV;X0$KfuP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;EJ;K`RCwC7l-W;HK@^9-yUlG2-Pl?xY7|!_M8U+U@sYpRci$y3QA8k>tr2S} zP-shg+uPo@cgBYr7HP32aNZ_o=9~GQ`JJQXs!DOqVP2I~J?_&q?f;=lDcbE0b+>`r zXyW_+*=EyVC=_HU6vQx$z874AHkuwkvw4=+w^-TCQmVSAxyjK83p4k4KKqbVast~H zJ)zp)HO=PsdH-RF)vaHB<-MMpX7Swuw^9jA!?={!dmYks9m~|QOaoyV2-Cnc^i#R{ z!y@_pBU)Z-F!{EyxSbe5=r9}#AcTdKl0vaUX73os^(Z+FP8=8CmxDp0(J-&(XFx$L z8YU31@w^sm>1~SDWgOQ-N{N(m@ZS&EHj|0*)3ub6ic=$BDB(6e0LJ5CM&n@&)94A+ zulA{=R(ILXWLeqRrCfC}bd9ligppVTvk$bd`F&qfb!wzHf3Wm*gM;G=nx>H&i}2+B z6v@OGmT3-d{!XVu>7>f~_Y5DGH^>#r_)?J^3G;Gxn#T|B5DW$eGrv*_&ug)Nc+9u- z4xd(cD3qN)?b&sMrt6f-4z{p~MTaqZ`1FGL+no-%y+f8hukj_lOQqgC*Yn-JS4wd= z8E5hB3+A3ZA`}c<{nA#e%|W3^CU_YP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;LPabiq5pf`5F)ItZ@70GR?ULG6=>4`-35` z-+$)$yD#*H$vJJS-KF#F4N;o$_`zKo^%|ac-UIJBLO_&i z+WTF)y#dA)6EsB#s+AI}OAC}kg_J(VSoS)7zO_0GlN?ot14J}=&^@#N(P+J}R4XF{b2l^XHy zLJv_s0pcKP&mncTk`e+t;s7|U{vH5MrYl#+jpt+4?s igg{D(l=7bv`^NyCuN_bLA?B|D0000pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;K1oDDRCwCdmCJ9_KoEz&U1wd}Ndxpn`iLSx1yqDU^afY{aKr^64n-=^7PZQg zG-=*(9Oq$sIkZ62l&UG}fsyvIJNh&;znNK4>T1m`nBg_QDU;J!a#_uC=wKJJn`ZV-eK4^|g=`{pGto;}94t=VfF z1R=#zg%3M>I}w)$VYZD^YE938FvEV@QD^B?2)!*dGkZ z7Rv1G=c#wRiMP0AVp}FcirK^qf`Cf3#+QQ}^;Q=tPP-t|rF(1DaIu-GM e@q^qN_~!s8(-&=#9(Mfz0000pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;ElET{RCwCNm0eF0K@^6cnc11$b}5CFQrhxm1tVSllJeAl;rXK6`nnPNUb`Hr_^{Fr>UhI z_vjDOk!7Yfqt%J%bR)7675!1;i|kUMq~yF}DFpezV6;XE`S0M$bb&^_OqllpP)e~> zuTUyYq0}|NGt-l-tu8ZFoIprHAGO@Jb84F)y4u7 zVThDtc7+fEr4+vL2+Y})%sH%e^aqx=TRYe+Bk(mVjYWK8#seFpnXk@Zt)-XraSozh z!rtKz_Kw;lgOr`!BbvL1EY4TQ2j_D+?%ZBtd7;Yr@I_I~$F0x2e6z{^ahrCW(2Wza z%#E*c-0QLP^*g7XE=nl^qmfdOA&|qiGoC_wipwV38|4qjC#O7Lf6u$kFW4+&GVc=@ zk5-h>>z@rxF$^e#Ih0i6gKcU_Q+r`Tttg=tCBu&e?I{*&GgN0wXzh(Jg&!Cyr6LE% zr$oIz*)V|+0^=!apFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;d`Uz>RCwB~luJ)jK^TUgnRBIw+Hz^(6pKdGn8w5)D-$;+{%BY3H0~f?5;Pd8 z7K-K4%jxN9&t=91T0>g_jkBE0Jl{9(yx%JtJ+1lA%e>AZJyBN(@o!MAHA#{Z4k89o zM3$-Z3x*_@o5RcHFim4-ftgUH6yYG^Yop1|hds7;>$HOifaOAtt=b*79z9^qFX1>g zf{S1=sj1eQUeIUf{U=_&c}Jtwnfa2ZoA-GBbc@Pr3Bxch?=+4RzSIwRz5S6!tAh{% zLkfftXsuCNqcuds5m7WmDRnip8}!+$A9B(T0LahTR96;QF6N0wF$b+SQJhj~g4KNL<&(u`HwzD6R2wE)~B-X|af9S$t`pLO3K&GLkF< zeZ`ncDe=4G6q_v!MeZ1YIzaUGOwO}*KxR2^@)ZfOv9kwJYg`5$JUWj;4c-}tZh)O zl(8*q3M&4Tr%^QI@aUL><}tl~NRnh2hQx6!Dl5y}s`}*Ty_qQ`t_o?T6mgP}{)F1L oHFJvoDx{^9xQ+wP^^^a{0M-f;sQ>@~07*qoM6N<$f>obfxc~qF diff --git a/legend/野外_资源_等级7.png b/legend/野外_资源_等级7.png deleted file mode 100644 index db07cfec9e4fe01b248a92a40c8b0fcb9a90c43e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 595 zcmV-Z0<8UsP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ-*-1n}RCwCdlsk{pKoo^P+nKQ)CnV(Q%|=8DK{OOABnq?*znhwZh5`fmYu9PB* z64KRbXM1tFV(te7VTe-daQhmd>pCK5Ace7>ugWr%QvCIbWlAj5MA!AhP$2|vqr$T% z4|(h_0Z8JM>*19C)fhjFF?5ZhW8*ma2*8wx}EjecrxSloA=yIJp3@GUM|q6 zmN2E<>Vktl&9aQ)Xu`YC14dI1P1ERgT)LfeEK8nd{wRu>EqtOlCIcKxP^*-olFX#`hnR`n#pxwAnyII4O^0YNg)0E+8%9p_nQ!hjagSK1atXV@!aT;{t`F#KN zo0%5?Ps&sCAdDy$@;o?qk$Y5M hulj$J{C5KVGXQXTvt68-!a@K5002ovPDHLkV1gM92_*mk diff --git a/legend/野外_资源_等级8.png b/legend/野外_资源_等级8.png deleted file mode 100644 index 373608c57e78d0c844589e44cc292dfd7bf315bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 743 zcmV?P)Sg700009a7bBm000id z000id0mpBsWB>pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;ZAnByRCwCVmETVjK@i73bGLifAGEZjp``v+R0s(^`RL#6yDvT%U(gT@0&20+ zVkwkf+uOan^`TOOVyQ7C&g;y6cIG=fJ95x>j%zZHYczFLfcv#D5#(Rs&N+;+45A_9 zaZH+JQ(qVclopEQ!Vu4szk@sHh=wEfJ|6ID>pgEj9MF&AsekQGoo7!sSbKPva%ln2 z^X7*eW7*wr^8CeXc0PB0JMivPo7h+YHa8wo$miy7XfzzsY;`#4N0R^%wDQr)pUSZR z^_Y)eI*dl+-+MAE^CU?b#}=DRbY8A5aIaAVpxHjA-5X$&6l+tgwK(Sxk@?^vf_TDt z{8FXF;f=N<(XG4-C#rI{V-j~9)Qj`igLOpS9@3q+8Yh8#5lutek3AFxW)|bM4 z-zOJ_DCPgG1aLUc<<-i^6Crci{1cjG8QtCq+q+FV$7hHLrF_70rO0A&QjI4h_6MBwBTSN#4-~7nmbrhkPHYoCw~pBTa>QU{Xm?NPbbH)r)X`dB z4NudQacr<@IxRm811i-;0Cg;DhHigIY*R!a)IPOpnM!#9-}mRs z-19uD)iO`kACRUQJD(1T#s-&Vxbtb%ibidb&Gmb%)N9jMb(zU!%OZ{qhwX11eC=?0 z7GbQ#We%+sg?x_2N{yS1I>kbM<~x^Jo5(pwlB5`8aBc$ET3 { while (true) { + // 欢迎回来弹框 + jMacro.delayNormal(); + new Task_离线收益(jMacro, screenRect).run(); + // 矿场攻击检测任务 jMacro.delayNormal(); - new TaskMineAttack(jMacro, gameScreen).run(); + new Task_采矿被攻击(jMacro, screenRect).run(); // 矿场攻击检测任务 jMacro.delayNormal(); - new TaskRewards(jMacro, gameScreen).run(); + new Task_探险领取(jMacro, screenRect).run(); // 自动采矿任务 jMacro.delayNormal(); - new TaskMining(jMacro, gameScreen).run(); + new Task_自动采矿(jMacro, screenRect).run(); } }, 10, TimeUnit.MINUTES); } diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/TaskRewards.java b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java similarity index 94% rename from src/main/java/com/example/jmacro/wjdr/demo/task/TaskRewards.java rename to src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java index 27b52a0..d1113b9 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/TaskRewards.java +++ b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java @@ -4,9 +4,9 @@ import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.base.ScreenRect; import com.example.jmacro.wjdr.util.Logger; -public class TaskRewards extends BaseTask { +public class Task_探险领取 extends BaseTask { - public TaskRewards(JMacro jMacro, ScreenRect screenRect) { + public Task_探险领取(JMacro jMacro, ScreenRect screenRect) { super(jMacro, screenRect); } @@ -15,7 +15,7 @@ public class TaskRewards extends BaseTask { Logger.info("》》》探险奖励领取开始》》》"); Logger.info("定位【探险】按钮"); - ScreenRect TAB_探险 = jMacro.waitAndMatchPic(this.screenRect, "TAB_探险_L35,881", 0.9); + ScreenRect TAB_探险 = jMacro.waitAndMatchPic(this.screenRect, "城镇_探险_L35,881", 0.9); if (TAB_探险 == null) { return; } @@ -34,7 +34,6 @@ public class TaskRewards extends BaseTask { ScreenRect 探险_不可领取 = jMacro.waitAndMatchPic(this.screenRect, "探险_不可领取_L420,667", 0.8); if (探险_不可领取 != null) { Logger.info("探险不可领取"); - return; } else { Logger.info("定位领取按钮"); ScreenRect 探险_领取 = jMacro.waitAndMatchPic(this.screenRect, "探险_领取_L426,667", 0.8); diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java new file mode 100644 index 0000000..79d82ba --- /dev/null +++ b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java @@ -0,0 +1,25 @@ +package com.example.jmacro.wjdr.demo.task; + +import com.example.jmacro.wjdr.JMacro; +import com.example.jmacro.wjdr.base.ScreenRect; +import com.example.jmacro.wjdr.util.Logger; + +public class Task_离线收益 extends BaseTask { + + public Task_离线收益(JMacro jMacro, ScreenRect screenRect) { + super(jMacro, screenRect); + } + + @Override + public void run() { + Logger.info("》》》检测离线收益弹框开始》》》"); + jMacro.delay(); + // 定位离线收益弹框，关闭弹框 + ScreenRect rect = jMacro.matchPic(screenRect, "城镇_离线收益_L204,734", 0.9); + if (rect != null) { + jMacro.mouseLeftClick(rect); + Logger.info("检测到离线收益弹框，关闭弹框"); + } + Logger.info("》》》检测离线收益弹框结束》》》"); + } +} diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/TaskMining.java b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java similarity index 94% rename from src/main/java/com/example/jmacro/wjdr/demo/task/TaskMining.java rename to src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java index 57af0b0..0afe9a8 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/TaskMining.java +++ b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java @@ -8,9 +8,9 @@ import com.example.jmacro.wjdr.util.Logger; import java.io.File; -public class TaskMining extends BaseTask { +public class Task_自动采矿 extends BaseTask { - public TaskMining(JMacro jMacro, ScreenRect screenRect) { + public Task_自动采矿(JMacro jMacro, ScreenRect screenRect) { super(jMacro, screenRect); } @@ -24,12 +24,12 @@ public class TaskMining extends BaseTask { Logger.info("当前界面【野外】"); } else { Logger.info("定位【野外】"); - ScreenRect 野外 = jMacro.waitAndMatchPic(this.screenRect, "野外_L449,885", 0.99); + ScreenRect 野外 = jMacro.waitAndMatchPic(this.screenRect, "野外_L444,888", 0.99); if (野外 == null) { Logger.error("定位【野外】失败，采矿终止"); return; } - Logger.error("定位【野外】成功，{}", 野外.toString()); + Logger.info("定位【野外】成功，{}", 野外.toString()); Logger.info("点击【野外】，坐标{}", JSONUtil.toJsonStr(野外.getCenter())); jMacro.mouseLeftClick(野外); @@ -37,7 +37,7 @@ public class TaskMining extends BaseTask { } Logger.info("定位资源搜索按钮"); - ScreenRect 野外搜索 = jMacro.waitAndMatchPic(this.screenRect, "野外_搜索_L15,632", 0.8); + ScreenRect 野外搜索 = jMacro.waitAndMatchPic(this.screenRect, "野外_搜索_L33,636", 0.5); if (野外搜索 == null) { Logger.error("未检测到【资源搜索按钮】，采矿终止"); return; @@ -57,7 +57,7 @@ public class TaskMining extends BaseTask { } // 检测是否是搜索界面 - ScreenRect 搜索 = jMacro.waitAndMatchPic(this.screenRect, "野外_搜索_L233,881", 0.98); + ScreenRect 搜索 = jMacro.waitAndMatchPic(this.screenRect, "野外_搜索_L18,633", 9); if (搜索 != null) { Logger.info("退出资源搜索界面"); jMacro.mouseLeftClick(this.screenRect); diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/TaskMineAttack.java b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java similarity index 78% rename from src/main/java/com/example/jmacro/wjdr/demo/task/TaskMineAttack.java rename to src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java index 4ccf0c4..20e3fe5 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/TaskMineAttack.java +++ b/src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java @@ -4,9 +4,9 @@ import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.base.ScreenRect; import com.example.jmacro.wjdr.util.Logger; -public class TaskMineAttack extends BaseTask { +public class Task_采矿被攻击 extends BaseTask { - public TaskMineAttack(JMacro jMacro, ScreenRect screenRect) { + public Task_采矿被攻击(JMacro jMacro, ScreenRect screenRect) { super(jMacro, screenRect); } diff --git a/src/main/java/com/example/jmacro/wjdr/util/Capture.java b/src/main/java/com/example/jmacro/wjdr/util/Capture.java index 0c0e8f7..2102082 100644 --- a/src/main/java/com/example/jmacro/wjdr/util/Capture.java +++ b/src/main/java/com/example/jmacro/wjdr/util/Capture.java @@ -214,9 +214,8 @@ public class Capture extends JFrame { } public void close() { - // 关闭应用时要释放资源 + setVisible(false); dispose(); - System.exit(0); } /** diff --git a/src/main/resources/main.fxml b/src/main/resources/main.fxml index c145989..c2cff41 100644 --- a/src/main/resources/main.fxml +++ b/src/main/resources/main.fxml @@ -1,45 +1,52 @@ - - - - - - - - - - + + + + + - + + + + + + - - - + + - - - - + + + + - - - - - - + + + + + +