From 5611dce94b5c920f9d5229afc7e08cd360f48baa Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Thu, 19 Feb 2026 01:42:12 +0800 Subject: [PATCH 1/3] Upd: asset COMBAT_AUTO --- assets/cn/combat/COMBAT_AUTO.png | Bin 6196 -> 7799 bytes assets/en/combat/COMBAT_AUTO.png | Bin 6196 -> 7799 bytes assets/jp/combat/COMBAT_AUTO.png | Bin 6196 -> 7799 bytes assets/tw/combat/COMBAT_AUTO.png | Bin 6196 -> 7799 bytes module/combat/assets.py | 2 +- 5 files changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/cn/combat/COMBAT_AUTO.png b/assets/cn/combat/COMBAT_AUTO.png index 80a7d2601a057901e91c73db20ab44f3ec135338..c03ba1ba9addc2103f4ef47383fc7f4084c4211f 100644 GIT binary patch literal 7799 zcmeI1c~BHr9>*JkLO=x+@j$~k!~??|%*nJ2#4y~9fdR!36`GzNY+w#%8fLgeO$ZfC;D(&|N6vdcm%U1cD$2#1+MTGazDZsH1%bHd$>*jhZBWV9~Ut_vq4+>uFDatW9G*tYDF{ zlV{G^_>UfwZm$`K+H0d;{bIYobF1AG-c4+Z$GZ(B9;nYTuteomUqc zSWKR27H1K2&41Z#clUX|Gc&^ul+O%_rB@8hV&Pt*HS;Fj+WeKP^^s}R8yDd7rknq6 zZt)t55fM4ltMjcwYBh>`Y3iYm)P2x_mFV}kXBh`IG8jL9y^D5q%cfux6Vlg9KAX-Q z42p9!zS$pZZX4Pc?p!~7uK@M3|8B~YjM|tI8|(hb{XHecs@BERPH#D6Q8454xy14Z zp2zE{)iKm%4o@0Ro>^3hTXzSC|%6ijI%8kflm*Js@v?UnNK1eLSP)^^`UE+LTL^8j^Ecdm?k}!ZbGL&-X?? z{YX*q!M845xeIu?1ttDV4f-Mmgp`=JEmyO5n2#S1%eT zBn}Vxl~&uP+bMsrC=WRT=5!nm=I&~tAB@VSR75Nf$EX^q0?cg)a(2}y5Ht!SNa0un zF5{E?E>@FCxR_54W((;;g&VdW_exM=fe9;u(1a+ICnmePm^y1OATIf%5lPfV2i^`(XDef9PjzM-YB{?g_5?Cbg7?S``eDZpN zP{1^rTCJw4nN+zlg67EM@o01gjlrM*3yLaUMj#rBOl7B)7}XG9DpZLp2wW~BX*H2> zc`U&vlR-b}O?*;?P&h6xQ;ksoJZKt3L35tt3X3PfKr|AB z!sa?MITDNwKDjz6F$#Ogl~M$h6PF?p7)>FI&~<2m!^{1>`D6x_{dDOF%DYE>QSRHl=zM_U*eqyx|* z+L;OjbnPG;*iDHcgj^XUmq+u-+Mq~U&+%>{SWsewKm-VZ0Z}@G1JfBW-6@DphnYN> z&H9Ay1k)$j%f+}P{y$l3mk-H#wCG;A3XC7GYZ_fsfmqDw)97O~u3Jnbl5SbR2s)aA z3W>wSx;TN>XcxL3kwsu&{}`LFZ`$!cm<$-|$YnWkITVb8FexkvC}TJ(W>GLU#$+On zP7=&%w1VU6D!GJEBT8&}1mFl*feET(MOrdeD*Jb%QLo3ebpXgHbOvPtGBRx}S(kKArF~D!M4QyRtC!~#Ug=4%xtbgV;R);@x2ogy@$b0eC}LF9Ppn zte;(aT<=BTy^Qs<>wkvJ^zF+OCIjDq)ZkSK=_SX2*R09mzMcZ;wf3j*Qt5Wk@}a`( z3l#*J&CvcCK;P}14H}IJZ=t(!x1q7cVosiWvL$$TyW%Za9;CVR`2Nkzyp^+S`aAay zT^fR??#klL$@8}JXg2rBw4N;8vT70~s->tfHYNRTh!N$5*^g_@4lMB#DRK&zqeZJ2 zHx4xxs;&-Km8QZLRvE1a&h>Wwbd*{d(Z9DveIv1VD;QgU=?Ulw=n3cv=n3cv=n4FH z1V%D*Es5p>Xycs(mJs)e^w}X2`3P-t!fz4I>^+YnntOYJpgsrmqdW|VR^%jO=>vyrkEdPpk<1MHWTHrot8z1Ps@!aj`3 z7Bw~s0-JVsI3<;=saQuY5@akY%9!35w*CSHZG=jg9>9UE5cfHDvyET2%|=2eGTsITw?j9asOqrmiWu!qM{wY z2KV>=-qJI0>G-qf&osaN{C#jGlBtVYq8rSzslH`{;g|sPFI@_6$7FzkizY zxT3zF$c6mhT5;F+SDMEFz{hf^Ky@m zBN*aSh-n}z2j^g*9d7SdoL;r=f@F-p^-gZb%8s+Oe>H2}G+FDtufHxEbDI15RQ;{? z+M910Po8Q`O0E(J@cPE;lMcfz6-_(Dl{!S9bnpFqO*Acgu&TGK*s0&QYh{UaM M-B$>Xe-^g+UvrqhumAu6 delta 3639 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 diff --git a/assets/en/combat/COMBAT_AUTO.png b/assets/en/combat/COMBAT_AUTO.png index 80a7d2601a057901e91c73db20ab44f3ec135338..c03ba1ba9addc2103f4ef47383fc7f4084c4211f 100644 GIT binary patch literal 7799 zcmeI1c~BHr9>*JkLO=x+@j$~k!~??|%*nJ2#4y~9fdR!36`GzNY+w#%8fLgeO$ZfC;D(&|N6vdcm%U1cD$2#1+MTGazDZsH1%bHd$>*jhZBWV9~Ut_vq4+>uFDatW9G*tYDF{ zlV{G^_>UfwZm$`K+H0d;{bIYobF1AG-c4+Z$GZ(B9;nYTuteomUqc zSWKR27H1K2&41Z#clUX|Gc&^ul+O%_rB@8hV&Pt*HS;Fj+WeKP^^s}R8yDd7rknq6 zZt)t55fM4ltMjcwYBh>`Y3iYm)P2x_mFV}kXBh`IG8jL9y^D5q%cfux6Vlg9KAX-Q z42p9!zS$pZZX4Pc?p!~7uK@M3|8B~YjM|tI8|(hb{XHecs@BERPH#D6Q8454xy14Z zp2zE{)iKm%4o@0Ro>^3hTXzSC|%6ijI%8kflm*Js@v?UnNK1eLSP)^^`UE+LTL^8j^Ecdm?k}!ZbGL&-X?? z{YX*q!M845xeIu?1ttDV4f-Mmgp`=JEmyO5n2#S1%eT zBn}Vxl~&uP+bMsrC=WRT=5!nm=I&~tAB@VSR75Nf$EX^q0?cg)a(2}y5Ht!SNa0un zF5{E?E>@FCxR_54W((;;g&VdW_exM=fe9;u(1a+ICnmePm^y1OATIf%5lPfV2i^`(XDef9PjzM-YB{?g_5?Cbg7?S``eDZpN zP{1^rTCJw4nN+zlg67EM@o01gjlrM*3yLaUMj#rBOl7B)7}XG9DpZLp2wW~BX*H2> zc`U&vlR-b}O?*;?P&h6xQ;ksoJZKt3L35tt3X3PfKr|AB z!sa?MITDNwKDjz6F$#Ogl~M$h6PF?p7)>FI&~<2m!^{1>`D6x_{dDOF%DYE>QSRHl=zM_U*eqyx|* z+L;OjbnPG;*iDHcgj^XUmq+u-+Mq~U&+%>{SWsewKm-VZ0Z}@G1JfBW-6@DphnYN> z&H9Ay1k)$j%f+}P{y$l3mk-H#wCG;A3XC7GYZ_fsfmqDw)97O~u3Jnbl5SbR2s)aA z3W>wSx;TN>XcxL3kwsu&{}`LFZ`$!cm<$-|$YnWkITVb8FexkvC}TJ(W>GLU#$+On zP7=&%w1VU6D!GJEBT8&}1mFl*feET(MOrdeD*Jb%QLo3ebpXgHbOvPtGBRx}S(kKArF~D!M4QyRtC!~#Ug=4%xtbgV;R);@x2ogy@$b0eC}LF9Ppn zte;(aT<=BTy^Qs<>wkvJ^zF+OCIjDq)ZkSK=_SX2*R09mzMcZ;wf3j*Qt5Wk@}a`( z3l#*J&CvcCK;P}14H}IJZ=t(!x1q7cVosiWvL$$TyW%Za9;CVR`2Nkzyp^+S`aAay zT^fR??#klL$@8}JXg2rBw4N;8vT70~s->tfHYNRTh!N$5*^g_@4lMB#DRK&zqeZJ2 zHx4xxs;&-Km8QZLRvE1a&h>Wwbd*{d(Z9DveIv1VD;QgU=?Ulw=n3cv=n3cv=n4FH z1V%D*Es5p>Xycs(mJs)e^w}X2`3P-t!fz4I>^+YnntOYJpgsrmqdW|VR^%jO=>vyrkEdPpk<1MHWTHrot8z1Ps@!aj`3 z7Bw~s0-JVsI3<;=saQuY5@akY%9!35w*CSHZG=jg9>9UE5cfHDvyET2%|=2eGTsITw?j9asOqrmiWu!qM{wY z2KV>=-qJI0>G-qf&osaN{C#jGlBtVYq8rSzslH`{;g|sPFI@_6$7FzkizY zxT3zF$c6mhT5;F+SDMEFz{hf^Ky@m zBN*aSh-n}z2j^g*9d7SdoL;r=f@F-p^-gZb%8s+Oe>H2}G+FDtufHxEbDI15RQ;{? z+M910Po8Q`O0E(J@cPE;lMcfz6-_(Dl{!S9bnpFqO*Acgu&TGK*s0&QYh{UaM M-B$>Xe-^g+UvrqhumAu6 delta 3639 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 diff --git a/assets/jp/combat/COMBAT_AUTO.png b/assets/jp/combat/COMBAT_AUTO.png index 80a7d2601a057901e91c73db20ab44f3ec135338..c03ba1ba9addc2103f4ef47383fc7f4084c4211f 100644 GIT binary patch literal 7799 zcmeI1c~BHr9>*JkLO=x+@j$~k!~??|%*nJ2#4y~9fdR!36`GzNY+w#%8fLgeO$ZfC;D(&|N6vdcm%U1cD$2#1+MTGazDZsH1%bHd$>*jhZBWV9~Ut_vq4+>uFDatW9G*tYDF{ zlV{G^_>UfwZm$`K+H0d;{bIYobF1AG-c4+Z$GZ(B9;nYTuteomUqc zSWKR27H1K2&41Z#clUX|Gc&^ul+O%_rB@8hV&Pt*HS;Fj+WeKP^^s}R8yDd7rknq6 zZt)t55fM4ltMjcwYBh>`Y3iYm)P2x_mFV}kXBh`IG8jL9y^D5q%cfux6Vlg9KAX-Q z42p9!zS$pZZX4Pc?p!~7uK@M3|8B~YjM|tI8|(hb{XHecs@BERPH#D6Q8454xy14Z zp2zE{)iKm%4o@0Ro>^3hTXzSC|%6ijI%8kflm*Js@v?UnNK1eLSP)^^`UE+LTL^8j^Ecdm?k}!ZbGL&-X?? z{YX*q!M845xeIu?1ttDV4f-Mmgp`=JEmyO5n2#S1%eT zBn}Vxl~&uP+bMsrC=WRT=5!nm=I&~tAB@VSR75Nf$EX^q0?cg)a(2}y5Ht!SNa0un zF5{E?E>@FCxR_54W((;;g&VdW_exM=fe9;u(1a+ICnmePm^y1OATIf%5lPfV2i^`(XDef9PjzM-YB{?g_5?Cbg7?S``eDZpN zP{1^rTCJw4nN+zlg67EM@o01gjlrM*3yLaUMj#rBOl7B)7}XG9DpZLp2wW~BX*H2> zc`U&vlR-b}O?*;?P&h6xQ;ksoJZKt3L35tt3X3PfKr|AB z!sa?MITDNwKDjz6F$#Ogl~M$h6PF?p7)>FI&~<2m!^{1>`D6x_{dDOF%DYE>QSRHl=zM_U*eqyx|* z+L;OjbnPG;*iDHcgj^XUmq+u-+Mq~U&+%>{SWsewKm-VZ0Z}@G1JfBW-6@DphnYN> z&H9Ay1k)$j%f+}P{y$l3mk-H#wCG;A3XC7GYZ_fsfmqDw)97O~u3Jnbl5SbR2s)aA z3W>wSx;TN>XcxL3kwsu&{}`LFZ`$!cm<$-|$YnWkITVb8FexkvC}TJ(W>GLU#$+On zP7=&%w1VU6D!GJEBT8&}1mFl*feET(MOrdeD*Jb%QLo3ebpXgHbOvPtGBRx}S(kKArF~D!M4QyRtC!~#Ug=4%xtbgV;R);@x2ogy@$b0eC}LF9Ppn zte;(aT<=BTy^Qs<>wkvJ^zF+OCIjDq)ZkSK=_SX2*R09mzMcZ;wf3j*Qt5Wk@}a`( z3l#*J&CvcCK;P}14H}IJZ=t(!x1q7cVosiWvL$$TyW%Za9;CVR`2Nkzyp^+S`aAay zT^fR??#klL$@8}JXg2rBw4N;8vT70~s->tfHYNRTh!N$5*^g_@4lMB#DRK&zqeZJ2 zHx4xxs;&-Km8QZLRvE1a&h>Wwbd*{d(Z9DveIv1VD;QgU=?Ulw=n3cv=n3cv=n4FH z1V%D*Es5p>Xycs(mJs)e^w}X2`3P-t!fz4I>^+YnntOYJpgsrmqdW|VR^%jO=>vyrkEdPpk<1MHWTHrot8z1Ps@!aj`3 z7Bw~s0-JVsI3<;=saQuY5@akY%9!35w*CSHZG=jg9>9UE5cfHDvyET2%|=2eGTsITw?j9asOqrmiWu!qM{wY z2KV>=-qJI0>G-qf&osaN{C#jGlBtVYq8rSzslH`{;g|sPFI@_6$7FzkizY zxT3zF$c6mhT5;F+SDMEFz{hf^Ky@m zBN*aSh-n}z2j^g*9d7SdoL;r=f@F-p^-gZb%8s+Oe>H2}G+FDtufHxEbDI15RQ;{? z+M910Po8Q`O0E(J@cPE;lMcfz6-_(Dl{!S9bnpFqO*Acgu&TGK*s0&QYh{UaM M-B$>Xe-^g+UvrqhumAu6 delta 3639 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 diff --git a/assets/tw/combat/COMBAT_AUTO.png b/assets/tw/combat/COMBAT_AUTO.png index 80a7d2601a057901e91c73db20ab44f3ec135338..c03ba1ba9addc2103f4ef47383fc7f4084c4211f 100644 GIT binary patch literal 7799 zcmeI1c~BHr9>*JkLO=x+@j$~k!~??|%*nJ2#4y~9fdR!36`GzNY+w#%8fLgeO$ZfC;D(&|N6vdcm%U1cD$2#1+MTGazDZsH1%bHd$>*jhZBWV9~Ut_vq4+>uFDatW9G*tYDF{ zlV{G^_>UfwZm$`K+H0d;{bIYobF1AG-c4+Z$GZ(B9;nYTuteomUqc zSWKR27H1K2&41Z#clUX|Gc&^ul+O%_rB@8hV&Pt*HS;Fj+WeKP^^s}R8yDd7rknq6 zZt)t55fM4ltMjcwYBh>`Y3iYm)P2x_mFV}kXBh`IG8jL9y^D5q%cfux6Vlg9KAX-Q z42p9!zS$pZZX4Pc?p!~7uK@M3|8B~YjM|tI8|(hb{XHecs@BERPH#D6Q8454xy14Z zp2zE{)iKm%4o@0Ro>^3hTXzSC|%6ijI%8kflm*Js@v?UnNK1eLSP)^^`UE+LTL^8j^Ecdm?k}!ZbGL&-X?? z{YX*q!M845xeIu?1ttDV4f-Mmgp`=JEmyO5n2#S1%eT zBn}Vxl~&uP+bMsrC=WRT=5!nm=I&~tAB@VSR75Nf$EX^q0?cg)a(2}y5Ht!SNa0un zF5{E?E>@FCxR_54W((;;g&VdW_exM=fe9;u(1a+ICnmePm^y1OATIf%5lPfV2i^`(XDef9PjzM-YB{?g_5?Cbg7?S``eDZpN zP{1^rTCJw4nN+zlg67EM@o01gjlrM*3yLaUMj#rBOl7B)7}XG9DpZLp2wW~BX*H2> zc`U&vlR-b}O?*;?P&h6xQ;ksoJZKt3L35tt3X3PfKr|AB z!sa?MITDNwKDjz6F$#Ogl~M$h6PF?p7)>FI&~<2m!^{1>`D6x_{dDOF%DYE>QSRHl=zM_U*eqyx|* z+L;OjbnPG;*iDHcgj^XUmq+u-+Mq~U&+%>{SWsewKm-VZ0Z}@G1JfBW-6@DphnYN> z&H9Ay1k)$j%f+}P{y$l3mk-H#wCG;A3XC7GYZ_fsfmqDw)97O~u3Jnbl5SbR2s)aA z3W>wSx;TN>XcxL3kwsu&{}`LFZ`$!cm<$-|$YnWkITVb8FexkvC}TJ(W>GLU#$+On zP7=&%w1VU6D!GJEBT8&}1mFl*feET(MOrdeD*Jb%QLo3ebpXgHbOvPtGBRx}S(kKArF~D!M4QyRtC!~#Ug=4%xtbgV;R);@x2ogy@$b0eC}LF9Ppn zte;(aT<=BTy^Qs<>wkvJ^zF+OCIjDq)ZkSK=_SX2*R09mzMcZ;wf3j*Qt5Wk@}a`( z3l#*J&CvcCK;P}14H}IJZ=t(!x1q7cVosiWvL$$TyW%Za9;CVR`2Nkzyp^+S`aAay zT^fR??#klL$@8}JXg2rBw4N;8vT70~s->tfHYNRTh!N$5*^g_@4lMB#DRK&zqeZJ2 zHx4xxs;&-Km8QZLRvE1a&h>Wwbd*{d(Z9DveIv1VD;QgU=?Ulw=n3cv=n3cv=n4FH z1V%D*Es5p>Xycs(mJs)e^w}X2`3P-t!fz4I>^+YnntOYJpgsrmqdW|VR^%jO=>vyrkEdPpk<1MHWTHrot8z1Ps@!aj`3 z7Bw~s0-JVsI3<;=saQuY5@akY%9!35w*CSHZG=jg9>9UE5cfHDvyET2%|=2eGTsITw?j9asOqrmiWu!qM{wY z2KV>=-qJI0>G-qf&osaN{C#jGlBtVYq8rSzslH`{;g|sPFI@_6$7FzkizY zxT3zF$c6mhT5;F+SDMEFz{hf^Ky@m zBN*aSh-n}z2j^g*9d7SdoL;r=f@F-p^-gZb%8s+Oe>H2}G+FDtufHxEbDI15RQ;{? z+M910Po8Q`O0E(J@cPE;lMcfz6-_(Dl{!S9bnpFqO*Acgu&TGK*s0&QYh{UaM M-B$>Xe-^g+UvrqhumAu6 delta 3639 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 diff --git a/module/combat/assets.py b/module/combat/assets.py index 72acce264..aa4c25109 100644 --- a/module/combat/assets.py +++ b/module/combat/assets.py @@ -17,7 +17,7 @@ BATTLE_STATUS_B = Button(area={'cn': (625, 297, 712, 317), 'en': (625, 297, 712, BATTLE_STATUS_C = Button(area={'cn': (625, 211, 647, 297), 'en': (625, 211, 647, 297), 'jp': (625, 211, 647, 297), 'tw': (625, 211, 647, 297)}, color={'cn': (199, 208, 198), 'en': (199, 208, 198), 'jp': (199, 208, 198), 'tw': (199, 208, 198)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_C.png', 'en': './assets/en/combat/BATTLE_STATUS_C.png', 'jp': './assets/jp/combat/BATTLE_STATUS_C.png', 'tw': './assets/tw/combat/BATTLE_STATUS_C.png'}) BATTLE_STATUS_D = Button(area={'cn': (618, 191, 639, 317), 'en': (618, 191, 639, 317), 'jp': (618, 191, 639, 317), 'tw': (618, 191, 639, 317)}, color={'cn': (199, 208, 199), 'en': (199, 208, 199), 'jp': (199, 208, 199), 'tw': (199, 208, 199)}, button={'cn': (1000, 631, 1055, 689), 'en': (1000, 631, 1055, 689), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_D.png', 'en': './assets/en/combat/BATTLE_STATUS_D.png', 'jp': './assets/jp/combat/BATTLE_STATUS_D.png', 'tw': './assets/tw/combat/BATTLE_STATUS_D.png'}) BATTLE_STATUS_S = Button(area={'cn': (643, 297, 722, 317), 'en': (643, 297, 722, 317), 'jp': (643, 297, 722, 317), 'tw': (643, 297, 722, 317)}, color={'cn': (233, 242, 127), 'en': (233, 242, 127), 'jp': (233, 242, 127), 'tw': (233, 242, 127)}, button={'cn': (1000, 631, 1055, 689), 'en': (999, 630, 1047, 691), 'jp': (1000, 631, 1055, 689), 'tw': (1000, 631, 1055, 689)}, file={'cn': './assets/cn/combat/BATTLE_STATUS_S.png', 'en': './assets/en/combat/BATTLE_STATUS_S.png', 'jp': './assets/jp/combat/BATTLE_STATUS_S.png', 'tw': './assets/tw/combat/BATTLE_STATUS_S.png'}) -COMBAT_AUTO = Button(area={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, color={'cn': (229, 242, 255), 'en': (229, 242, 255), 'jp': (229, 242, 255), 'tw': (229, 242, 255)}, button={'cn': (136, 573, 167, 604), 'en': (136, 573, 167, 604), 'jp': (136, 573, 167, 604), 'tw': (136, 573, 167, 604)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'}) +COMBAT_AUTO = Button(area={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (136, 572, 167, 605), 'en': (136, 572, 167, 605), 'jp': (136, 572, 167, 605), 'tw': (136, 572, 167, 605)}, file={'cn': './assets/cn/combat/COMBAT_AUTO.png', 'en': './assets/en/combat/COMBAT_AUTO.png', 'jp': './assets/jp/combat/COMBAT_AUTO.png', 'tw': './assets/tw/combat/COMBAT_AUTO.png'}) COMBAT_AUTO_133 = Button(area={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, color={'cn': (234, 244, 255), 'en': (234, 244, 255), 'jp': (234, 244, 255), 'tw': (234, 244, 255)}, button={'cn': (131, 568, 170, 609), 'en': (131, 568, 170, 609), 'jp': (131, 568, 170, 609), 'tw': (131, 568, 170, 609)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_133.png', 'en': './assets/en/combat/COMBAT_AUTO_133.png', 'jp': './assets/jp/combat/COMBAT_AUTO_133.png', 'tw': './assets/tw/combat/COMBAT_AUTO_133.png'}) COMBAT_AUTO_150 = Button(area={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, color={'cn': (238, 247, 255), 'en': (238, 247, 255), 'jp': (238, 247, 255), 'tw': (238, 247, 255)}, button={'cn': (129, 567, 172, 611), 'en': (129, 567, 172, 611), 'jp': (129, 567, 172, 611), 'tw': (129, 567, 172, 611)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_150.png', 'en': './assets/en/combat/COMBAT_AUTO_150.png', 'jp': './assets/jp/combat/COMBAT_AUTO_150.png', 'tw': './assets/tw/combat/COMBAT_AUTO_150.png'}) COMBAT_AUTO_SWITCH = Button(area={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, color={'cn': (179, 198, 235), 'en': (105, 137, 189), 'jp': (160, 177, 220), 'tw': (179, 198, 235)}, button={'cn': (18, 38, 36, 56), 'en': (16, 31, 140, 62), 'jp': (18, 36, 54, 57), 'tw': (18, 38, 36, 56)}, file={'cn': './assets/cn/combat/COMBAT_AUTO_SWITCH.png', 'en': './assets/en/combat/COMBAT_AUTO_SWITCH.png', 'jp': './assets/jp/combat/COMBAT_AUTO_SWITCH.png', 'tw': './assets/tw/combat/COMBAT_AUTO_SWITCH.png'}) From 3f9e7edf4e02816a46fdd350827762e65135938d Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Thu, 19 Feb 2026 01:48:45 +0800 Subject: [PATCH 2/3] Add: hide_in_upper_left option for combat manual --- assets/cn/combat/MOVE_LEFT_UP.png | Bin 0 -> 7048 bytes module/combat/assets.py | 1 + module/combat/combat_manual.py | 17 +++++++ module/config/argument/args.json | 72 ++++++++++++++++++--------- module/config/argument/argument.yaml | 4 +- module/config/config_generated.py | 4 +- module/config/i18n/en-US.json | 6 ++- module/config/i18n/ja-JP.json | 6 ++- module/config/i18n/zh-CN.json | 6 ++- module/config/i18n/zh-TW.json | 6 ++- 10 files changed, 86 insertions(+), 36 deletions(-) create mode 100644 assets/cn/combat/MOVE_LEFT_UP.png diff --git a/assets/cn/combat/MOVE_LEFT_UP.png b/assets/cn/combat/MOVE_LEFT_UP.png new file mode 100644 index 0000000000000000000000000000000000000000..93a4efff58688d5b40adc95a6b7e47f8dad1c4d3 GIT binary patch literal 7048 zcmeI1e^3hlUm%{eeYQ1ZqM6= zyVE8Cm1_JQj8l_3SR3=hIFdLTI|-r{p+sjwX-w6cfr4$?6eEa3D;A}F_YM#eJ1H~G zADy|I;k|d?_j$hW^L*atedl&~IWH%3s`3dXf*@0ES(X9>iG|(hwkgr@D}C;=CI+*zT=MN8cR9)2)%ZhHjq_jR?mHX#`Yt_F|DR!lI#5&s&pKNGPJ(Ck$wrAgu z_7BY-{A0uVjhSHXJGCDtto=m`a+{44t1jN|%-EeBpVS@wc6WW_-oaCMb|;&*mb{*u zbm|R%$p<})lLjyKZ){X;xm1DcUu?+rE1x+T*mULdUkbk84S+MKr@+c9UpXXZl7g}eLPrkIQFy+cmT{%hao|GYAHZrrYvYjw2@ zM7D*`$jGy0WQ-t#pboz9%DLqi(q}i9tauZfk^kH_qvB{zMgH`bf@Z8}p}Tt3Q`xEq zvGylwk{-`I|3PQxp5}Kq?>JdEt!@)K5Yx0c{b17SBTc>EuTIv?nSHmby`iQ3x%AS) z18Xa+Q7cdGEKFPA6puMNXGBlZRBF;4Z`Ee0ot>t$Jzamgxq6E$cxX`UPYv#iTJ(zX zl5_#r8X;@z08G*50o^f97<}U+7Qrn@(&|)Fh<5@l*1d_Y)4UoY!pG z{ttG}(Dar=^M96IN6s`Q=T$2&_HF*x`CiW_js36wJZWcCyZZD4%``*>|x{LDL-la#TY4|bkSogCjD z-LTFh9Dm{9B4k$g+Iy3XM#X~duQv4b_0+a@44E%?_fD3AzPIbIB?Vz=SMacei|pAn zE4Wn*CpdsA;P%22N079|0WZU@0}|>0F5Y9tdh5?&D9@R(AL{Ic-J1bQ`K%2-uwp|_ zA-iE6YvQoQi^U8^KnkPz_N5$0zR3sQc3dCYPH|*SNXLn!RJzIOeT|>Ak`#^LknCCdL$-* zd&GINL|DTDMApZ9C0_8LvL@pY$|W;~!FhBfKDXCyAC>or!xSJ7b%61zH7Y{wcB{vF zh?2DeiVO$zNDr|P-UR9bAPVI^7Fa8QN18WQf@4Shz2&~LP&yo|24%nvO+~n>X55mQ zHhbQvhm63*yS*VV2z#8R#5*6t8W)>96G~@nAkckOcbxS|?jd7nWw+B7fi0KAvsuiT zygtndEYH!Qu7flgDV78{t2Z(@rE_q&k>n`csdaJ&qmI>cTHP2an@5xw4+~@|D6Zn6 zj>7>s1HtKV(y7*HZnGG$|2wBtIO>q%D&P}gEy}7ILZuDQ z$Qwh$bRb$ru2d)xl7-pO89u;Bg0D~z%FLK7fy$nv({^~EI7VVDj0B)4LF#FOq&22O zLPKjQn$kT>7-?dRy}y&%7-sgzyp5)`QfWl$^IYLz}Kuvj^&w_&2BNJ Qk7N^@HOEr-gEgD}4N)^I@Bjb+ literal 0 HcmV?d00001 diff --git a/module/combat/assets.py b/module/combat/assets.py index aa4c25109..142b65e71 100644 --- a/module/combat/assets.py +++ b/module/combat/assets.py @@ -39,6 +39,7 @@ LOADING_BAR = Button(area={'cn': (33, 676, 1247, 680), 'en': (33, 676, 1247, 680 MAIN_FLEET_POWER_ZERO = Button(area={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, color={'cn': (63, 79, 98), 'en': (63, 79, 98), 'jp': (63, 79, 98), 'tw': (63, 79, 98)}, button={'cn': (131, 151, 232, 206), 'en': (131, 151, 232, 206), 'jp': (131, 151, 232, 206), 'tw': (131, 151, 232, 206)}, file={'cn': './assets/cn/combat/MAIN_FLEET_POWER_ZERO.png', 'en': './assets/en/combat/MAIN_FLEET_POWER_ZERO.png', 'jp': './assets/jp/combat/MAIN_FLEET_POWER_ZERO.png', 'tw': './assets/tw/combat/MAIN_FLEET_POWER_ZERO.png'}) MOVE_DOWN = Button(area={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, color={'cn': (21, 28, 57), 'en': (21, 28, 57), 'jp': (21, 28, 57), 'tw': (21, 28, 57)}, button={'cn': (148, 647, 155, 669), 'en': (148, 647, 155, 669), 'jp': (148, 647, 155, 669), 'tw': (148, 647, 155, 669)}, file={'cn': './assets/cn/combat/MOVE_DOWN.png', 'en': './assets/en/combat/MOVE_DOWN.png', 'jp': './assets/jp/combat/MOVE_DOWN.png', 'tw': './assets/tw/combat/MOVE_DOWN.png'}) MOVE_LEFT_DOWN = Button(area={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, color={'cn': (65, 80, 100), 'en': (65, 80, 100), 'jp': (65, 80, 100), 'tw': (65, 80, 100)}, button={'cn': (67, 668, 112, 707), 'en': (67, 668, 112, 707), 'jp': (67, 668, 112, 707), 'tw': (67, 668, 112, 707)}, file={'cn': './assets/cn/combat/MOVE_LEFT_DOWN.png', 'en': './assets/en/combat/MOVE_LEFT_DOWN.png', 'jp': './assets/jp/combat/MOVE_LEFT_DOWN.png', 'tw': './assets/tw/combat/MOVE_LEFT_DOWN.png'}) +MOVE_LEFT_UP = Button(area={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, color={'cn': (255, 255, 255), 'en': (255, 255, 255), 'jp': (255, 255, 255), 'tw': (255, 255, 255)}, button={'cn': (101, 539, 136, 574), 'en': (101, 539, 136, 574), 'jp': (101, 539, 136, 574), 'tw': (101, 539, 136, 574)}, file={'cn': './assets/cn/combat/MOVE_LEFT_UP.png', 'en': './assets/cn/combat/MOVE_LEFT_UP.png', 'jp': './assets/cn/combat/MOVE_LEFT_UP.png', 'tw': './assets/cn/combat/MOVE_LEFT_UP.png'}) NEW_SHIP = Button(area={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, color={'cn': (235, 171, 60), 'en': (235, 171, 60), 'jp': (235, 171, 60), 'tw': (235, 171, 60)}, button={'cn': (206, 87, 213, 93), 'en': (206, 87, 213, 93), 'jp': (206, 87, 213, 93), 'tw': (206, 87, 213, 93)}, file={'cn': './assets/cn/combat/NEW_SHIP.png', 'en': './assets/en/combat/NEW_SHIP.png', 'jp': './assets/jp/combat/NEW_SHIP.png', 'tw': './assets/tw/combat/NEW_SHIP.png'}) OPTS_INFO_D = Button(area={'cn': (602, 151, 703, 179), 'en': (565, 143, 692, 179), 'jp': (512, 154, 605, 176), 'tw': (602, 152, 702, 177)}, color={'cn': (157, 115, 123), 'en': (171, 116, 110), 'jp': (201, 187, 191), 'tw': (164, 130, 137)}, button={'cn': (583, 605, 677, 628), 'en': (590, 587, 627, 647), 'jp': (574, 596, 685, 635), 'tw': (583, 604, 676, 627)}, file={'cn': './assets/cn/combat/OPTS_INFO_D.png', 'en': './assets/en/combat/OPTS_INFO_D.png', 'jp': './assets/jp/combat/OPTS_INFO_D.png', 'tw': './assets/tw/combat/OPTS_INFO_D.png'}) QUIT_RECONFIRM = Button(area={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, color={'cn': (207, 140, 133), 'en': (208, 147, 141), 'jp': (203, 138, 132), 'tw': (211, 158, 152)}, button={'cn': (749, 501, 828, 540), 'en': (761, 495, 818, 523), 'jp': (746, 490, 830, 530), 'tw': (754, 491, 825, 522)}, file={'cn': './assets/cn/combat/QUIT_RECONFIRM.png', 'en': './assets/en/combat/QUIT_RECONFIRM.png', 'jp': './assets/jp/combat/QUIT_RECONFIRM.png', 'tw': './assets/tw/combat/QUIT_RECONFIRM.png'}) diff --git a/module/combat/combat_manual.py b/module/combat/combat_manual.py index 3857d9477..fb1f30191 100644 --- a/module/combat/combat_manual.py +++ b/module/combat/combat_manual.py @@ -42,6 +42,20 @@ class CombatManual(ModuleBase): self.device.long_click(MOVE_LEFT_DOWN, duration=(3.5, 5.5)) return True + def handle_combat_stand_still_upper_left(self, auto): + """ + Args: + auto (str): Combat auto mode. + + Returns: + bool: If executed + """ + if auto != 'hide_in_upper_left': + return False + + self.device.long_click(MOVE_LEFT_UP, duration=(1.5, 3.5)) + return True + def handle_combat_weapon_release(self): if self.appear_then_click(READY_AIR_RAID, interval=10): return True @@ -67,5 +81,8 @@ class CombatManual(ModuleBase): if self.handle_combat_stand_still_bottom_left(auto): self.manual_executed = True return True + if self.handle_combat_stand_still_upper_left(auto): + self.manual_executed = True + return True return False diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 258890f0b..8bbb44bbb 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -563,7 +563,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -605,7 +606,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -940,7 +942,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -982,7 +985,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -1317,7 +1321,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -1359,7 +1364,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -1755,7 +1761,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -1797,7 +1804,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -2025,7 +2033,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -2067,7 +2076,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -2418,7 +2428,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -2460,7 +2471,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -3735,7 +3747,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -3777,7 +3790,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -4145,7 +4159,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -4187,7 +4202,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -4555,7 +4571,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -4597,7 +4614,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -4965,7 +4983,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -5007,7 +5026,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -5375,7 +5395,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -5417,7 +5438,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { @@ -5775,7 +5797,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet1Step": { @@ -5817,7 +5840,8 @@ "combat_auto", "combat_manual", "stand_still_in_the_middle", - "hide_in_bottom_left" + "hide_in_bottom_left", + "hide_in_upper_left" ] }, "Fleet2Step": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 4cc3205db..77fc24e65 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -175,7 +175,7 @@ Fleet: option: [ line_ahead, double_line, diamond ] Fleet1Mode: value: combat_auto - option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ] + option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ] Fleet1Step: value: 3 option: [ 2, 3, 4, 5 ] @@ -187,7 +187,7 @@ Fleet: option: [ line_ahead, double_line, diamond ] Fleet2Mode: value: combat_auto - option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left ] + option: [ combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left ] Fleet2Step: value: 2 option: [ 2, 3, 4, 5 ] diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 7c057779a..e698e9877 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -93,11 +93,11 @@ class GeneratedConfig: # Group `Fleet` Fleet_Fleet1 = 1 # 1, 2, 3, 4, 5, 6 Fleet_Fleet1Formation = 'double_line' # line_ahead, double_line, diamond - Fleet_Fleet1Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left + Fleet_Fleet1Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left Fleet_Fleet1Step = 3 # 2, 3, 4, 5 Fleet_Fleet2 = 2 # 0, 1, 2, 3, 4, 5, 6 Fleet_Fleet2Formation = 'double_line' # line_ahead, double_line, diamond - Fleet_Fleet2Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left + Fleet_Fleet2Mode = 'combat_auto' # combat_auto, combat_manual, stand_still_in_the_middle, hide_in_bottom_left, hide_in_upper_left Fleet_Fleet2Step = 2 # 2, 3, 4, 5 Fleet_FleetOrder = 'fleet1_mob_fleet2_boss' # fleet1_mob_fleet2_boss, fleet1_boss_fleet2_mob, fleet1_all_fleet2_standby, fleet1_standby_fleet2_all diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 153b3f6d9..5e03f102b 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -913,7 +913,8 @@ "combat_auto": "combat_auto", "combat_manual": "combat_manual", "stand_still_in_the_middle": "stand_still_in_the_middle", - "hide_in_bottom_left": "hide_in_bottom_left" + "hide_in_bottom_left": "hide_in_bottom_left", + "hide_in_upper_left": "hide_in_upper_left" }, "Fleet1Step": { "name": "Fleet 1 Step Number", @@ -947,7 +948,8 @@ "combat_auto": "combat_auto", "combat_manual": "combat_manual", "stand_still_in_the_middle": "stand_still_in_the_middle", - "hide_in_bottom_left": "hide_in_bottom_left" + "hide_in_bottom_left": "hide_in_bottom_left", + "hide_in_upper_left": "hide_in_upper_left" }, "Fleet2Step": { "name": "Fleet 2 Step Number", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 2de0d9a8b..28561d0c5 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -913,7 +913,8 @@ "combat_auto": "combat_auto", "combat_manual": "combat_manual", "stand_still_in_the_middle": "stand_still_in_the_middle", - "hide_in_bottom_left": "hide_in_bottom_left" + "hide_in_bottom_left": "hide_in_bottom_left", + "hide_in_upper_left": "hide_in_upper_left" }, "Fleet1Step": { "name": "Fleet.Fleet1Step.name", @@ -947,7 +948,8 @@ "combat_auto": "combat_auto", "combat_manual": "combat_manual", "stand_still_in_the_middle": "stand_still_in_the_middle", - "hide_in_bottom_left": "hide_in_bottom_left" + "hide_in_bottom_left": "hide_in_bottom_left", + "hide_in_upper_left": "hide_in_upper_left" }, "Fleet2Step": { "name": "Fleet.Fleet2Step.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 5af93089b..be1b22362 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -913,7 +913,8 @@ "combat_auto": "自律战斗", "combat_manual": "手操", "stand_still_in_the_middle": "中路站桩", - "hide_in_bottom_left": "躲左下角" + "hide_in_bottom_left": "躲左下角", + "hide_in_upper_left": "躲左上角" }, "Fleet1Step": { "name": "一队步长", @@ -947,7 +948,8 @@ "combat_auto": "自律战斗", "combat_manual": "手操", "stand_still_in_the_middle": "中路站桩", - "hide_in_bottom_left": "躲左下角" + "hide_in_bottom_left": "躲左下角", + "hide_in_upper_left": "躲左上角" }, "Fleet2Step": { "name": "二队步长", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 994f878f3..f9a984146 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -913,7 +913,8 @@ "combat_auto": "自律戰鬥", "combat_manual": "手動", "stand_still_in_the_middle": "中路站樁", - "hide_in_bottom_left": "躲左下角" + "hide_in_bottom_left": "躲左下角", + "hide_in_upper_left": "躲左上角" }, "Fleet1Step": { "name": "一隊步幅", @@ -947,7 +948,8 @@ "combat_auto": "自律戰鬥", "combat_manual": "手動", "stand_still_in_the_middle": "中路站樁", - "hide_in_bottom_left": "躲左下角" + "hide_in_bottom_left": "躲左下角", + "hide_in_upper_left": "躲左上角" }, "Fleet2Step": { "name": "二隊步幅", From 9a9454df26819eaf6aa7c1f20748c08c65b10098 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Thu, 12 Mar 2026 18:47:15 +0800 Subject: [PATCH 3/3] Add: event entrance for event_20240229_cn rerun (#5552) --- campaign/Readme.md | 1 + module/config/argument/args.json | 64 ++++++++++++++++++++------------ module/config/i18n/en-US.json | 2 +- module/config/i18n/ja-JP.json | 2 +- module/config/i18n/zh-CN.json | 2 +- 5 files changed, 44 insertions(+), 27 deletions(-) diff --git a/campaign/Readme.md b/campaign/Readme.md index 53184cd30..a166f5702 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -282,3 +282,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐(復刻) | - | | 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 | | 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online | +| 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻(復刻) | - | diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 8bbb44bbb..498af10af 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1641,22 +1641,24 @@ "type": "select", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "display": "hide", "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, @@ -1922,21 +1924,23 @@ "type": "state", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, @@ -2317,21 +2321,23 @@ "type": "state", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, @@ -4042,21 +4048,23 @@ "type": "state", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, @@ -4454,21 +4462,23 @@ "type": "state", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, @@ -4866,21 +4876,23 @@ "type": "state", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, @@ -5278,21 +5290,23 @@ "type": "state", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, @@ -5680,21 +5694,23 @@ "type": "state", "value": "campaign_main", "option": [ + "event_20240229_cn", "event_20260226_cn" ], "option_cn": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_en": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_jp": [ - "event_20260226_cn" + "event_20240229_cn" ], "option_tw": [ "event_20260226_cn" ], "option_bold": [ + "event_20240229_cn", "event_20260226_cn" ] }, diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 5e03f102b..681204ff5 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -748,7 +748,7 @@ "event_20231026_cn": "Tempesta and the Fountain of Youth", "event_20231123_cn": "The Ninja Scrolls: Azur Flash", "event_20231221_cn": "Light-Chasing Sea of Stars Rerun", - "event_20240229_cn": "Snowrealm Peregrination", + "event_20240229_cn": "Snowrealm Peregrination Rerun", "event_20240425_cn": "Heart-Linking Harmony", "event_20240521_cn": "Light of the Martyrium", "event_20240725_cn": "Interlude of Illusions", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 28561d0c5..db515ad10 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -748,7 +748,7 @@ "event_20231026_cn": "テンペスタと若返りの泉", "event_20231123_cn": "蒼閃忍法帖", "event_20231221_cn": "光追う星の海(復刻)", - "event_20240229_cn": "銀界遊廻", + "event_20240229_cn": "銀界遊廻(復刻)", "event_20240425_cn": "共鳴のパッション", "event_20240521_cn": "赫輝のマルティリウム", "event_20240725_cn": "夢幻の間奏曲", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index be1b22362..07bac69f1 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -748,7 +748,7 @@ "event_20231026_cn": "飓风与青春之泉", "event_20231123_cn": "苍闪忍法帖", "event_20231221_cn": "复刻星海逐光", - "event_20240229_cn": "雪境迷踪", + "event_20240229_cn": "复刻雪境迷踪", "event_20240425_cn": "共鸣的PASSION", "event_20240521_cn": "绽放于辉光之城", "event_20240725_cn": "幻梦间奏曲",