From 514efa504191977b74001d5ffb25487c8da5b802 Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Wed, 16 Jul 2025 23:50:56 +0800
Subject: [PATCH] =?UTF-8?q?js=EF=BC=9A=E7=8B=97=E7=B2=AE=E9=87=8D=E5=88=B6?=
 =?UTF-8?q?=E7=89=881.6.0=20(#1359)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 repo/js/AutoArtifactsPro/README.md            |   3 +-
 .../RecognitionObject/ArtifactsButton.png     | Bin 0 -> 4013 bytes
 .../RecognitionObject/AutoAddButton.png       | Bin 0 -> 3316 bytes
 .../RecognitionObject/ConfirmButton.png       | Bin 0 -> 2048 bytes
 .../assets/RecognitionObject/DeleteButton.png | Bin 0 -> 1156 bytes
 .../RecognitionObject/DestoryButton.png       | Bin 0 -> 1866 bytes
 repo/js/AutoArtifactsPro/main.js              | 237 +++++++++++-------
 repo/js/AutoArtifactsPro/manifest.json        |   2 +-
 repo/js/AutoArtifactsPro/settings.json        |  19 +-
 9 files changed, 168 insertions(+), 93 deletions(-)
 create mode 100644 repo/js/AutoArtifactsPro/assets/RecognitionObject/ArtifactsButton.png
 create mode 100644 repo/js/AutoArtifactsPro/assets/RecognitionObject/AutoAddButton.png
 create mode 100644 repo/js/AutoArtifactsPro/assets/RecognitionObject/ConfirmButton.png
 create mode 100644 repo/js/AutoArtifactsPro/assets/RecognitionObject/DeleteButton.png
 create mode 100644 repo/js/AutoArtifactsPro/assets/RecognitionObject/DestoryButton.png

diff --git a/repo/js/AutoArtifactsPro/README.md b/repo/js/AutoArtifactsPro/README.md
index 18365a6b..8f625897 100644
--- a/repo/js/AutoArtifactsPro/README.md
+++ b/repo/js/AutoArtifactsPro/README.md
@@ -171,7 +171,8 @@ https://www.kdocs.cn/wo/sl/v13uXscL
 
 
 ## 更新日志
-
+### 1.6.0（2025.07.16）
+1.新增摧毁换取摩拉的选项和沿途分解选项
 ### 1.5.9（2025.07.15）
 1.微调(激活大炮第二炮掉出影响/204卡木条/216避开穷点/224避开书本/302微调/405微调/407微调/428微调/605微调)
 ### 1.5.7（2025.07.13）
diff --git a/repo/js/AutoArtifactsPro/assets/RecognitionObject/ArtifactsButton.png b/repo/js/AutoArtifactsPro/assets/RecognitionObject/ArtifactsButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f0f79f38241356d55479f3f2b9d68bbeda3efd1
GIT binary patch
literal 4013
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
TAknKY00000NkvXXu0mjfV*JqC

literal 0
HcmV?d00001

diff --git a/repo/js/AutoArtifactsPro/assets/RecognitionObject/AutoAddButton.png b/repo/js/AutoArtifactsPro/assets/RecognitionObject/AutoAddButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d2fbfc7082d7b729bbdbf55c2d403feae7c8feb
GIT binary patch
literal 3316
zcmV<Q3=8v#P)<h;3K|Lk000e1NJLTq001ul001ut1^@s6b0?Fm00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L42elZK~!i%)mmw6
zT-6o+=FND#FJpV`c;DkBb`m=Y35gQ|A&>=;0%|}lM2Mw;R8Wh6s#0lXRaHgd2aO^`
z6G19K5CpUkmVm*KkOs4aER7+H9XqyTd%Q1WdpzUWdd_+8jmP#lad3jl=iK++UEY1)
zJ@?#m&b<@Euksi9LGaU`_D{fheh%d2!H=wYMX31s7L-;jM`T<y%#q<R7!2_H-0-=b
z(w5<eS9=20D=?U%v>Zc$bJzigeF*hOYVp}CZ@|{jMCAr*tG3{qn$!Zh(j_=A<b#Q;
zNtmk7bWw~3BxR&w-L|c$xMedGlM!CG3qB_7^HC#8mje2-qL_%N5hjxv9=8Wyzh8|{
z{<#OewodBKFN08Ns)U8Cn$dD}zdwJW&Rt7<)t>1RV~NMoP3ur`+h%0U&4tG~2Crv~
z>X@+Fb~a!l3Jt($G@<)^J3f4I4^DmY4Tk&e7af3cNkVF+N?IkZ)A1AY%;G|9dhl*+
zeBhUejtz%*Y!qIvha{s(TJL!lU=n_xmy!q3B&d=#%Mou)Mt?^a?7e+jD;??w^#K^m
zEjoF+(ok7{`ChbSF}6PbYm}@khub|y`phaqAJN}d`}sj&!RSy0rsjDz4T=F71-VEs
zDnJj-#6VXM6yh`fj{0Gysqn+Nyw#4AvodhklaC{}q<|#tAc;HSCE}!tQa@b^g;4ES
zK$8=fvv61?y)+9s^9yii<zq<6$&xx9)Ps7bo8jKPQmN9b(~I));In^0QffRro>6(x
z>kA(FM2yj5+kfadPS>@de{cvMZ|KDv5pG6KW(wA<T!ie56w+~#TL993&}@=M!>EK|
zpr;=@fBPqNG_o~Po2ZHY?$O9|HoYhhcmDASWS8W_Gd3L1ZJ$3h`9b>#zCB)ts{M!2
z-r0-MQ5VfrX!0hqP)U|JELxC{tv_3f<it1{fKjW}$TPG7&@v`<G19CkXs&C->wkWh
z%xN>_b@G(%A#20$#Zbq$J@yEet*;=mqwt6c1V)`MbaeLN?74QhJ>#~UF=!vg@!GR!
zXtI&S)w=0sh{5U+6CH^g)-Hu5Aw~wI)d(rh7v*Ol)oPKMQdNp)NWqbh4`T237s(0@
zjt_vzb8f|!4YWWXMpziBiI=PjsS4v<O9!eyKZ;Ke9))YneL-@Ji`9n$lT;K1;o)Ie
zf6WrCTT_nQtW+syC^P_%+mF3FcBAI)4@D!mM&WN+QmwfDuB}8IMBFL*&m=fCki<Xx
z&rz8Hc1U{pbm@nJ`)0NK<iHV}ZEVv@RZ!33$ybxFiMJ-vcSI?eybmjH-Hg<{bhy24
zk~nvyj+nvfz!Lwlz~7pzo-7ov*M+pgY^=KVCN7b3!xL*a_#fT<cSOZTk#(WiM3bH_
z#lC?d*gAUU`Nu+9Y7!DHu>rMVu>EKKcMiMp%(jQoXX}FDz2~3zuibhx>699)=$Nbm
z!5v)*gi^W5<QYbz8T(&-7w>G}1w%{S34ekmn#hwEC6lNlxHIl#jHdJ8m$hWquZ#+r
zX~C^oxsdKA$%hmc6)B1lgFSXUb;m<6blV#IW}}Zhn`Z*~$rv0O!6U!lA-4TWAU-x4
zJO1{F+%E*SJT8|PZ~S!!6tmd`A1&0M3Rol9^5iU>N7jZ+6iZySod5q|v&lZenw74S
zCoiQ{{X{_0k4>_uPU=d67hq<(6<04?fGrzW;f`Cc!_6C3V(H?!NJ&nRdS09^G6Wy*
z{}vrxebdHA!HA{U-_UETBQ;Xvm<!=j7c2)|9H-=vo98GpE5jOySsbHIw3F{R-`<Vp
zmQFOb*l@nBo9Yv=aoutn=zM8Aoq6V6m&@UX@pq3uTzN6#4EB5<R)0e){o;!|G9ny>
z`RUlaeg$s4b{R_N=OQj93L_4uIK2p}&&!^JlHyz%T#5u_gM-89?CzI(OF}H>5cx38
zY)*z^@KFk<aP2ay4NIJfJ#_cYs90Wt*qBHuZ#v(JJ#X*FQ``68oqdPU+dm}b>`gaa
zzZ~~(yGfo~X$B4-J&k&bsX{p}9R?#UT<!U?AvZf!qQcDdWU&f5T1iEilzrHN&udPg
zpCqh<RjDvH9oufdfd-I>6DJ#SthQb@I-x=8L<3WMXVtn42FGj;6B1XI7YB&5-g5Gi
zRbw(f+DkfJ<jpCs*Ky)-ctLRviV8ACU0PbZB)VkjPn`iX#bK;Em(fhJ^~lMZgZQ|q
zUXs5bn#ee!$ob4A@~rbcy@RyLY1e9|!bg#(Lc`Xwvqx6CRm>vC<)`XfBsSkii+o@8
z*ZBU7x(C(qHK~wV_l@j<d8fuEGMCm1Zx@F~9JGK3wANGMa=A$IBnSg}SWdIW9MV_T
zS+*D-eEb!5zxEM!z5G6QzVtp0eO0TqQt@8Zmr}>+rPr%u!^3K2O^io$R0IWr9<olO
zTI)$LDX{nTagavar^|#`GKXwk>_ZM5JyB13IdM}l9fn7o`0iAbwAa;&XW>Hc+k5(<
z@L9>_0$UJH3Gp#lbM-<PNkTJ0e0(%kES*ma)hPaiNprv$MKdrNyheSryW^ullZzZj
zcr-O4FU!Ynvq5*yfaqxnS&dsZug2O{ivyBm9e?+u8hK{icjqSL<)q1T7&$3kq#V<C
z(?Vr+2`9_NCk+9xR&!UhM#o0S(0t+)6z9k&<yk_r*LikCEv=nm>R9*L^p(!flf(`v
z7)-o$Uaq9#!Yo*m;z@@MXlm&|A2~2qLH4o}L2@S(JUTprlQoB-d|P!utC&4{`|NU5
z(nT|Hso)vng<jv-iUIqunB4;M83C|iA*u7xc<q5N;UsIMeDSXjFx)pNBbu%B`J{oR
zfB4uLaYVt0j4;DOYaz^JLQ-O!sEQ6=oI}H-a{AWTY?C$|Vq|5eXf2pHpPm`v7$gt<
z`a4_#g^!YJ_Exdkk&)?tQ=pCfLSX5gqmNgAenifD*xu`BJsef8qF5(AEeY4HE)yN+
zaxV>-Lxz)e&3JR~0hv8kw-Qn(JzQqBRt)q^ZmH(&D)hG5sEp#MvV_#io>m*?ttdxK
zLL4*Ds7wS~0d^*Q_@pnw=`ciOj(v9)k&zKH{ShQ}-kX-p%fq!5WfEn^Mn?%T4vqOV
z?$x(G73pWvAaA^G8Ollv10e>;2eELwnmVv|$4)pXJQwoimXt~t#n;Sd?lLlOe0nPq
zo=A|VwyvR7^m6)uNd*s%LuU@gYELzynHI5wW+9x+A3LDVu72_ZXJzwIO~k)H-9)y2
z6xpOETWF)ghp`+g$V?LrChl~&uy5BZICtVC^{;MPjb%ihe*@~Xbs`}(1sO&8P$<~<
z`6dx0LPpZl=JOpQ*^5b^>zNQ+4mP1}wjNR?n-D!(dlt16Io6XfY@K~Va`A!!3XQMA
zqLO^X(JV1xBUvA|Kt7*>{~oBpp*P>9L9lgHSEopxpT<Zs{7Xdkf?`-w_&ji;&F2rW
zp7K$gB$7VgXEF$udJpL`@0@r+@<4b7xzCKWWGpM2i)&Ub!ji>BB=HC-XN@s%>_QP_
zdqXq!Zht{NCDVvYn)2g9VIJ;%`VUA-vx@X}a{8SYSMB$Wqz>oAq0HtSGl8N{UI!dP
zvz-qHljQSxd;bV_Jz9y@Gxaj40CE1iFK;3HR(U}NK_urC<l=#6o<ve+n!Ml{<29kT
zQSYI^ZD#_#uV9F@Nz!T;^lS`AkF6K~_|22(ZfWC}gfxRfVYwTZSW+w1v8doqMh5I?
zJJX1i+)TtLC#r-)d~h;mN<I|$T^WGrxd}})yKg@I9NOy|)P6PcB5`R?<d+J0#>5Y^
z{pSIgBO;JaGob{2L*kE&e=Io76jR@21y^MM3tF5<s=mNSFT9GT?@mj-yd&iKj~S?!
zi~opBwtvCu<+$;lJ7CSCK#CT!&#QV*k%hJo2y~)DEgnZue!{L_G1G+yK;cDO7ph-=
zi`;(=Mh1C7tFN(|O(D*IGx_<RkCzkEQnBH_Utq<?^-xS~WxV1Y{Xv_U3A#L9tRg6H
zG^mG4iV{ZO2!qG%CTSl;)$ToFvS<AB{iXiLiR}5sxaRgPC@e2UL~I0w(@`|lx>?oU
z;l}!l1etjffT{xWBPCo82YE^->W|mrz-#{|YtkTf(nOy0q!!4PF2Q-j10s190f}n`
z`T*2t?M@Fo6V}Xh<d-c(Zs|N&=A<COnuw_QC`3k+gCX5zho-|xMA<J4k*y!@8$fSs
y2bxcwLBp|Hbhow#B+bxnDmk5Kpiaxn75E>q#y<oMI6PMX0000<MNUMnLSTY#7C+|z

literal 0
HcmV?d00001

diff --git a/repo/js/AutoArtifactsPro/assets/RecognitionObject/ConfirmButton.png b/repo/js/AutoArtifactsPro/assets/RecognitionObject/ConfirmButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..78d72f2993c10c250154aeb18fe31314adbe5dd6
GIT binary patch
literal 2048
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

literal 0
HcmV?d00001

diff --git a/repo/js/AutoArtifactsPro/assets/RecognitionObject/DeleteButton.png b/repo/js/AutoArtifactsPro/assets/RecognitionObject/DeleteButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea48c70df8b43992b746b29236b934eea878a33c
GIT binary patch
literal 1156
zcmV-~1bh35P)<h;3K|Lk000e1NJLTq000{R001Hg1^@s6uA!nZ00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGqB>(^xB>_oNB=7(L1Q|(0K~zXf?N-ZD
z8&?oLdP^W4G6G{TF&N6mMg>k0m*c#gxKc?rS!CyBelDwIlMnDBNu``Pl>%dfotQ^3
zmV_07KnMvvMw33RnbAlxRgMiipV8IK?YT9lyKmp__T)3`X0293-82DkoB}+JKd)g_
zV48KAoDvbCpElvyO+7YE)1z~FptJ*qQAgphgxvlC%H^6!n(I6s4|<|qi1kGg3I%lD
z4wdnjO+IPx3Q?_Qpj@fy$K4>&gXJ~c`(p*^%r4A&lg#h;Vs>T{AKge`^jsVPzu$V(
zAPEF~2n7T1dc94u(oqGe?JS->&)~3F(#1CNg(9A=Cv_Yg6fJ23{NUKgAZDh=ads#s
zWIpQ+;Pd$~IM9#Di4nEjA=?&>@BXrY#fPg(Owd}sWB?V5M<|xc9aa<6JlY*;xKS*y
z;gjc~ct5`W@_k%OOf|_io^9j%AAiFAg(vDx;<!D0RnY3*o^E`5=L_8a_+2<^@CE%J
z4h5YN35VWjgu_8~s|E-;Y|Ap)Jq>`>jih7Qn}Q@=kq|!pa1Mzp6HPKk;m&Rz`}srE
zjFTbr3K^~AzVUcCZsaBp4)h_`A63)2kean#qU}pZ=jHW!Bw&IXjU*x*%ZS`w0YBec
z(lb>qS0xhVYKak<w9Ex$Yy3IjjAR36dhz+Kc_idmsN!z2^ot#Q_rqQM_UB`r2Lk~K
zUk@tPn!1+J$-@~8`1M|?R%L(d*2itRwO;m}WOu&#44>SbmEaR^=~pe#3Z5e_WR`g6
z{16gXC)DS3E8o%G7st<GE-{HSv0jlGsz^lkX6oVyu3Wl+fmn}N!t-gM?#ebTWHxAW
zM51VB`T}l!Fo(-iV>&13|M}TV`0Dm`jGsTNG9n)D!+X~*<Hr0n#zuz_6s6kXkZHEy
z(0wvBNc!YJQp@hHux0~-?uhmGV0bX*C_vC+rX*VHUhhVSgsxO@LuGKzTIUk0TpwJ}
z8O3_<d{4a8ji-gTWG8~RWUmf8{E4>cKUK?^{oRDek})?jw^b#n8g=PAtkce1SCyWm
zBK5CMxdnsrD%Tsj-fk(}#vMymmW-as=CGB_AeTFE3Mz|iDxKAez9)s&2HU-)$T@O*
zvR)KwM+cd$3G3PNUz_;#{<1VfX&lL%C=^Oqe6*^a*z?rCDkDg+@bD>qm-4hFa+aBP
zIAmJfWO#kjOv;@u+T419rImH5bGzzJqI6Wo+COPLc(jJ>&c4csLuvI^H&R&ndsEvB
zmZL^`Y&x>VGG=sUdS-3EG?<+0{WXU6lF^9tAkCJ%rBc)HOUvt6l(rym?ME};|33tz
zYL5=bar63BjE@bgtc8qVwAqpLy08_bJ-RhkZR;RADYzB3-RNa+u7~f0K>~Z|9Ke5{
Wis+tQJ^rx(0000<MNUMnLSTYo>@4p9

literal 0
HcmV?d00001

diff --git a/repo/js/AutoArtifactsPro/assets/RecognitionObject/DestoryButton.png b/repo/js/AutoArtifactsPro/assets/RecognitionObject/DestoryButton.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bff592c5ce149ffdbca14fadcaf240c1893b033
GIT binary patch
literal 1866
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
Ef(*xcbN~PV

literal 0
HcmV?d00001

diff --git a/repo/js/AutoArtifactsPro/main.js b/repo/js/AutoArtifactsPro/main.js
index 7bc87d27..4b8756a5 100644
--- a/repo/js/AutoArtifactsPro/main.js
+++ b/repo/js/AutoArtifactsPro/main.js
@@ -9,6 +9,9 @@ let finished = false;
 const accountName = settings.accountName || "默认账户";
 let version = "default";
 let runnedToday = false;
+let artifactExperienceDiff = 0;
+let moraDiff = 0;
+let pathIndex = 0;
 
 //预处理
 const minIntervalTime = settings.minIntervalTime || "5";
@@ -20,6 +23,7 @@ const runActivatePath = settings.runActivatePath || false;
 let enemyType = "无";
 
 (async function () {
+    setGameMetrics(1920, 1080, 1);
     //伪造js结束记录
     await fakeLog("自动狗粮重制版", true, true, 0);
 
@@ -370,8 +374,12 @@ let enemyType = "无";
     }
 
     //运行前按自定义配置清理狗粮
-    const result1 = await decomposeArtifacts(settings.keep4Star, settings.doDecompose);
-
+    if (settings.decomposeMode === "分解（经验瓶）") {
+        await processArtifacts(21);
+    } else {
+        artifactExperienceDiff -= await processArtifacts(21);
+    }
+    moraDiff -= await mora();
     artifacts: {
         if (runnedToday && finished) {
             break artifacts;
@@ -379,19 +387,9 @@ let enemyType = "无";
 
         // 开始运行狗粮路线
         let runArtifactsResult = true;
-
         runArtifactsResult = await runArtifactsPaths(runRouteA, grindPartyName, settings.useABE);
-        const result2 = await decomposeArtifacts(settings.keep4Star, settings.doDecompose);
-        // 计算 mora 和 artifactExperience 的差值
-        const moraDiff = Number(result2.mora) - Number(result1.mora); // 将字符串转换为数字后计算差值
-        let artifactExperienceDiff;
-        if (!settings.doDecompose) {
-            artifactExperienceDiff = result2.artifactExperience - result1.artifactExperience;
-        } else {
-            artifactExperienceDiff = result2.artifactExperience;
-        }
-
-
+        artifactExperienceDiff += await processArtifacts(21);
+        moraDiff += await mora();
         log.info(`狗粮路线获取摩拉: ${moraDiff}`);
         log.info(`狗粮路线获取狗粮经验: ${artifactExperienceDiff}`);
 
@@ -503,6 +501,10 @@ async function runArtifactsPaths(runRouteA, grindPartyName, useABE) {
 
         // 执行地图追踪文件
         for (const fileName of jsonFilePaths) {
+            pathIndex++;
+            if ((pathIndex % 5 === 0) && settings.autoSalvage && settings.decomposeMode != "保留") {
+                artifactExperienceDiff += await processArtifacts(1);
+            }
             const fullPath = fileName;
             await fakeLog(fileName, false, true, 0);
             currentTask += 1; // 更新当前任务计数器
@@ -934,12 +936,6 @@ function validateTimeoutSetting(value, defaultValue, timeoutType) {
     return timeout;
 }
 
-// 定义替换映射表
-const replacementMap = {
-    "监": "盐",
-    "卵": "卯"
-};
-
 // 定义所有图标的图像识别对象，每个图片都有自己的识别区域
 let CharacterMenuRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("assets/CharacterMenu.png"), 60, 991, 38, 38);
 
@@ -974,12 +970,7 @@ async function recognizeTextAndClick(targetText, ocrRegion, timeout = 3000) {
             let resList = captureGameRegion().findMulti(RecognitionObject.ocr(ocrRegion.x, ocrRegion.y, ocrRegion.width, ocrRegion.height)); // 指定识别区域
             // 遍历识别结果，检查是否找到目标文本
             for (let res of resList) {
-                // 后处理：根据替换映射表检查和替换错误识别的字符
                 let correctedText = res.text;
-                for (let [wrongChar, correctChar] of Object.entries(replacementMap)) {
-                    correctedText = correctedText.replace(new RegExp(wrongChar, 'g'), correctChar);
-                }
-
                 if (correctedText.includes(targetText)) {
                     // 如果找到目标文本，计算并点击文字的中心坐标
                     let centerX = Math.round(res.x + res.width / 2);
@@ -1024,7 +1015,7 @@ async function recognizeTextInRegion(ocrRegion, timeout = 5000) {
             }
         } catch (error) {
             retryCount++; // 增加重试计数
-            log.warn(`OCR 摩拉数识别失败，正在进行第 ${retryCount} 次重试...`);
+            log.warn(`OCR 识别失败，正在进行第 ${retryCount} 次重试...`);
         }
         await sleep(500); // 短暂延迟，避免过快循环
     }
@@ -1032,59 +1023,7 @@ async function recognizeTextInRegion(ocrRegion, timeout = 5000) {
     return null; // 如果未识别到文字，返回 null
 }
 
-async function decomposeArtifacts(keep4Star, doDecompose) {
-    setGameMetrics(1920, 1080, 1);
-    await genshin.returnMainUi();
-
-    // 按下 C 键
-    keyPress("C");
-    await sleep(1500);
-
-    let recognized = false;
-
-    // 识别“角色菜单”图标或“天赋”文字
-    let startTime = Date.now();
-    while (Date.now() - startTime < 5000) {
-        // 尝试识别“角色菜单”图标
-        let characterMenuResult = await recognizeImage(CharacterMenuRo, 5000);
-        if (characterMenuResult.success) {
-            await click(177, 433);
-            await sleep(500);
-            recognized = true;
-            break;
-        }
-
-        // 尝试识别“天赋”文字
-        let targetText = "天赋";
-        let ocrRegion = { x: 133, y: 395, width: 115, height: 70 }; // 设置对应的识别区域
-        let talentResult = await recognizeTextAndClick(targetText, ocrRegion);
-        if (talentResult.success) {
-            log.info(`点击天赋文字，坐标: x=${talentResult.x}, y=${talentResult.y}`);
-            recognized = true;
-            break;
-        }
-
-        await sleep(1000); // 短暂延迟，避免过快循环
-    }
-
-    let recognizedText = "";
-
-    // 如果识别到了“角色菜单”或“天赋”，则识别“摩拉数值”
-    if (recognized) {
-        let ocrRegionMora = { x: 1620, y: 25, width: 152, height: 46 }; // 设置对应的识别区域
-        recognizedText = await recognizeTextInRegion(ocrRegionMora);
-        if (recognizedText) {
-            log.info(`成功识别到摩拉数值: ${recognizedText}`);
-
-        } else {
-            log.warn("未能识别到摩拉数值。");
-        }
-    } else {
-        log.warn("未能识别到角色菜单或天赋，跳过摩拉数值识别。");
-    }
-    await sleep(500);
-    await genshin.returnMainUi();
-
+async function decomposeArtifacts() {
     keyPress("B");
     await sleep(1000);
     await click(670, 45);
@@ -1109,7 +1048,7 @@ async function decomposeArtifacts(keep4Star, doDecompose) {
     let firstNumber = 0;
     let firstNumber2 = 0;
 
-    if (keep4Star) {
+    if (settings.keep4Star) {
         await recognizeTextAndClick("快速选择", { x: 248, y: 996, width: 121, height: 49 });
         moveMouseTo(960, 540);
         await sleep(1000);
@@ -1140,7 +1079,7 @@ async function decomposeArtifacts(keep4Star, doDecompose) {
     moveMouseTo(960, 540);
     await sleep(1000);
 
-    if (keep4Star) {
+    if (settings.keep4Star) {
         await click(370, 370);//取消选择四星
         await sleep(1000);
     }
@@ -1172,7 +1111,7 @@ async function decomposeArtifacts(keep4Star, doDecompose) {
         log.warn(`在指定区域未识别到有效数字: ${newValue}`);
     }
 
-    if (doDecompose) {
+    if (settings.decomposeMode === "分解（经验瓶）") {
         log.info(`用户选择了分解，执行分解`);
         // 根据用户配置，分解狗粮
         await sleep(1000);
@@ -1203,12 +1142,136 @@ async function decomposeArtifacts(keep4Star, doDecompose) {
     if (resultExperience === 0) {
         resultExperience = initialValue;
     }
-    const result = {
-        mora: recognizedText, // 将 recognizedText 赋值给 mora
-        artifactExperience: resultExperience,
-        fourStarNum: fourStarNum
-    };
+    const result = resultExperience;
     await genshin.returnMainUi();
     return result;
 }
 
+/**
+ * 摧毁圣遗物换摩拉
+ */
+async function destroyArtifacts(times = 1) {
+    const ArtifactsButtonRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("Assets/RecognitionObject/ArtifactsButton.png"));
+    const DeleteButtonRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("Assets/RecognitionObject/DeleteButton.png"));
+    const AutoAddButtonRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("Assets/RecognitionObject/AutoAddButton.png"));
+    const ConfirmButtonRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("Assets/RecognitionObject/ConfirmButton.png"));
+    const DestoryButtonRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("Assets/RecognitionObject/DestoryButton.png"));
+    const MidDestoryButtonRo = RecognitionObject.TemplateMatch(file.ReadImageMatSync("Assets/RecognitionObject/DestoryButton.png"), 900, 600, 500, 300);
+    await genshin.returnMainUi();
+    keyPress("B");
+    await sleep(1500);
+
+    let ArtifactsButton = captureGameRegion().find(ArtifactsButtonRo);
+    if (ArtifactsButton.isExist()) {
+        log.info("识别到圣遗物按钮");
+        ArtifactsButton.click();
+        await sleep(1500);
+    }
+
+    try {
+        for (let i = 0; i < times; i++) {
+            captureGameRegion().find(DeleteButtonRo).click();// 点击摧毁
+            await sleep(600);
+            captureGameRegion().find(AutoAddButtonRo).click();// 点击自动添加
+            await sleep(600);
+            await sleep(300);
+            click(150, 150);
+            await sleep(300);
+            click(150, 220);
+            await sleep(300);
+            click(150, 300);
+            if (!settings.keep4Star) {
+                await sleep(300);
+                click(150, 370);
+            }
+            captureGameRegion().find(ConfirmButtonRo).click();// 点击快捷放入
+            await sleep(600);
+            captureGameRegion().find(DestoryButtonRo).click();// 点击摧毁
+            await sleep(600);
+            captureGameRegion().find(MidDestoryButtonRo).click();// 弹出页面点击摧毁
+            await sleep(600);
+            click(960, 1000);// 点击空白处
+            await sleep(1000);
+        }
+    } catch (ex) {
+        log.info("背包里的圣遗物已摧毁完毕，提前结束")
+    } finally {
+        await genshin.returnMainUi();
+    }
+
+}
+
+async function processArtifacts(times = 1) {
+    await genshin.returnMainUi();
+    let result = 0;
+    try {
+        if (settings.decomposeMode === "销毁（摩拉）") {
+            result = await destroyArtifacts(times);
+        } else {
+            result = await decomposeArtifacts();
+        }
+    } catch (error) {
+        log.error(`处理狗粮分解时发生异常: ${error.message}`);
+    }
+    await genshin.returnMainUi();
+    return result;
+}
+
+async function mora() {
+    let result = 0;
+    let tryTimes = 0;
+    while (result = 0 && tryTimes < 3) {
+        await genshin.returnMainUi();
+
+        // 按下 C 键
+        keyPress("C");
+        await sleep(1500);
+
+        let recognized = false;
+
+        // 识别“角色菜单”图标或“天赋”文字
+        let startTime = Date.now();
+        while (Date.now() - startTime < 5000) {
+            // 尝试识别“角色菜单”图标
+            let characterMenuResult = await recognizeImage(CharacterMenuRo, 5000);
+            if (characterMenuResult.success) {
+                await click(177, 433);
+                await sleep(500);
+                recognized = true;
+                break;
+            }
+
+            // 尝试识别“天赋”文字
+            let targetText = "天赋";
+            let ocrRegion = { x: 133, y: 395, width: 115, height: 70 }; // 设置对应的识别区域
+            let talentResult = await recognizeTextAndClick(targetText, ocrRegion);
+            if (talentResult.success) {
+                log.info(`点击天赋文字，坐标: x=${talentResult.x}, y=${talentResult.y}`);
+                recognized = true;
+                break;
+            }
+
+            await sleep(1000); // 短暂延迟，避免过快循环
+        }
+
+        let recognizedText = "";
+
+        // 如果识别到了“角色菜单”或“天赋”，则识别“摩拉数值”
+        if (recognized) {
+            let ocrRegionMora = { x: 1620, y: 25, width: 152, height: 46 }; // 设置对应的识别区域
+            recognizedText = await recognizeTextInRegion(ocrRegionMora);
+            if (recognizedText) {
+                log.info(`成功识别到摩拉数值: ${recognizedText}`);
+                result = recognizedText;
+            } else {
+                log.warn("未能识别到摩拉数值。");
+            }
+        } else {
+            log.warn("未能识别到角色菜单或天赋");
+        }
+        await sleep(500);
+        tryTimes++;
+        await genshin.returnMainUi();
+    }
+    return Number(result);
+}
\ No newline at end of file
diff --git a/repo/js/AutoArtifactsPro/manifest.json b/repo/js/AutoArtifactsPro/manifest.json
index ed014b53..745e0670 100644
--- a/repo/js/AutoArtifactsPro/manifest.json
+++ b/repo/js/AutoArtifactsPro/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "自动狗粮重制版",
-  "version": "1.5.9",
+  "version": "1.6.0",
   "tags": [
     "好感",
     "狗粮"
diff --git a/repo/js/AutoArtifactsPro/settings.json b/repo/js/AutoArtifactsPro/settings.json
index dca90240..a7dafbec 100644
--- a/repo/js/AutoArtifactsPro/settings.json
+++ b/repo/js/AutoArtifactsPro/settings.json
@@ -15,7 +15,7 @@
   {
     "name": "runActivatePath",
     "type": "checkbox",
-    "label": "是否启用激活路线，启用后将先花费约3分钟激活狗粮点\n启用该选项后可提高稳定性，并允许中断后重新运行和极大降低最短间隔时间"
+    "label": "是否启用激活路线，启用后将先花费约5分钟激活狗粮点\n启用该选项后可提高稳定性，并允许极大降低最短间隔时间"
   },
   {
     "name": "useABE",
@@ -47,15 +47,26 @@
     "default": "狗粮"
   },
   {
-    "name": "doDecompose",
-    "type": "checkbox",
-    "label": "是否分解狗粮（默认不分解）"
+    "name": "decomposeMode",
+    "type": "select",
+    "label": "狗粮分解模式",
+    "options": [
+      "保留",
+      "分解（经验瓶）",
+      "销毁（摩拉）"
+    ],
+    "default": "保留"
   },
   {
     "name": "keep4Star",
     "type": "checkbox",
     "label": "是否保留四星（默认不保留）"
   },
+  {
+    "name": "autoSalvage",
+    "type": "checkbox",
+    "label": "是否沿路自动分解（默认：否)"
+  },
   {
     "name": "minIntervalTime",
     "type": "input-text",