From f279769feb7e0836da9e5bc46e6d37b02702285f Mon Sep 17 00:00:00 2001
From: Dongw <linsann@163.com>
Date: Sun, 16 Jul 2023 23:48:14 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E8=8D=92=E5=8E=9F=E4=BF=A1?=
 =?UTF-8?q?=E8=B5=96=E5=AF=B9=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Wilderness/TrustDialogueInteraction.png   | Bin 0 -> 1618 bytes
 .../template/Wilderness/TrustDialogueNext.png | Bin 0 -> 1271 bytes
 assets/resource/pipeline/wilderness.json      |  44 ++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 assets/resource/pipeline/template/Wilderness/TrustDialogueInteraction.png
 create mode 100644 assets/resource/pipeline/template/Wilderness/TrustDialogueNext.png

diff --git a/assets/resource/pipeline/template/Wilderness/TrustDialogueInteraction.png b/assets/resource/pipeline/template/Wilderness/TrustDialogueInteraction.png
new file mode 100644
index 0000000000000000000000000000000000000000..7841fe62f1129857b2e503e5448c572cfa0935d4
GIT binary patch
literal 1618
zcmV-Y2CeytP)<h;3K|Lk000e1NJLTq001Qb000#T0ssI2PKL1g000IVNkl<ZNDWQF
zdu)~U9R~2{`TpK>+H-G9LD>o;3;v-|Kn)AyB3{6?k!-<jX6(+y$t7D{6vj3Y6kSMw
zfS9q2M2*aZ43}k!T-P{fvc$27a+N?bC{(Vst+kZX)A#*8JLed)eLgJavtSie10w;%
z$p}CY1SF6GB1kkto!kWwbtD8D0mvP!0TOqSbU6f)l9R?_A?NOr%nWr#(wu+*NdS^0
zNRB#!f(X!v&j=&|kWAc35KMeTKnTH;#Ebyl1%icqRuTY`5=b;QP@e$^3|A<LV3o^B
z8tHO^l0ZTNt3XmNGxI9N5?BKg5>x{g@>vLg0MZB`pJ}MXWk~=5#7T%kXl^NuYa2VN
zrK#<UU%2hIoBp(OH_7QUrha(h)TPT;<B|Bn#VgmY4VBBoE;sWy_7FmxBt#X{=_siY
z^SKN`5F}BTBrb{M__iA-Pr7;BxVAWsd;9v&c6DFA+*2N|3=ItdOsAr;W5=XZsZ1s_
zX7s4rC*K-H(YfyKfBpM|Q>V`i4_}u=(%k`&CV2=E3;C=hk^syMK$0YljSUZU+&i!1
zo|C7#cJJ*xa`a>f=I#JdN7M))z`7`fmX@Y(%<E`xpWWNjvu?v5&UBrZD~=P?Ns3Z|
zxoidiNl64ier4+9hkx|Y*>e|n?LKhq_$hY>KoSr@NhARQASr<a1OcR{QX!wq-ZOjp
z{P`Wnj-CGfw(SE0pGv3-AtXu6Vj%~CMnEA%Gp679^Q8+{uif;);S(eU5j3N_@HsOA
zl$@X-fPjn!ChlSlLI}@3{lpzprYu_g#F?)1Q3&pGcNX$ll9G&U|Jv+D3m2?;cJrb4
zkAXBZNF*eXlw?Lp03{Is3Bb%GkuY<KE+-(NR4Oj}>5nH)9Jl;ezrEV?F+fQy<g+9J
zjc#q-y5;Fr&ul(&<U;@?CAGG;0H_RChRS6Kxojq#PLUJ@fHVS0lF%$k5=f*fBbDLd
ziUhf6+`N8uv6z2k>B`E;2m$7E86!g!Hg9~Yr{|N68@Kik4iS`;PN(<3`3iu}xBj_q
z{Z@CaSiYov&MbT`_IPNp++Q>39uJjADwWEfeVy+eI!Y3dyV~!+`>~%b+_dH81D*c>
zz<e%4a^{SwYo2`UndhE=`<-{2i#d{#`UZwjM-qS}5;cMabC((21qfgW<{kqu(j}5!
zB{i2yf7!Y1-GlG1TC?8WS;%M1?5W@UV*0c@7cE}V)zuAxpvwu;=q@vpJBTVXgWz(b
zfslm%Aql{%f>|PY;s9R%^NW=@{?7N7xQm5+h77;kyn5oq2@gKBWZ=_ls3QT;j1nY~
z00;<x1QM(R;4VM_Nk{@+t|$s|oOt3PgwB0C0NmHUKoX0EEXj4xt!!;=`t_3=E?m44
z%p`$?B*@GFN&+AWbp%M7F>yCDcSjvbz$KZ{UG9Fv4P$m}e<6<Jj<5ev5}Qf|l5_8y
zId{&iO<P{-I@e9G1_1H>1@l{5TSkv+&gL7VC^7&RHKrr{pGq7bJb3u^U4I)hdeo*3
ztIC!5!EgV>T>#8%&b>2NJig>VXS*L=`b$YH<a2-~Pr7C8>c{`OYyXQc?<6UCumIxA
z6UJwAnGnoq*<6M|Lqj@_9d#tC`ucnO`vyL`aH+8|JNvF_aa`HE|7}UETf1h(9aC=I
z{_1NxcD_M?%}qr>1Rr_$yT?zQI&t#!<;y)J%?N>n1VI2%Bcp+kWM&Xt4xuWF<O*^z
z2vU+H0PntQ+REk2_U!xnE3dvbFfa&!rDC2y2$r~JeD(I5CQdle`OZfddLV%`n#&<b
zvS1P<5ui~Lsss`O%#4T=4}heY;JgRsE`Ia}2M->8<IVktj~pKvNzBNmVjhIino7BJ
zDtu|e_)@WWzWYL7Z~vt$eJ&9-G=n6FG|45gP7(nL7A&3OaHZ0aPLW~Rl7;urnN=>A
zw{H96p1p4YFf+NcrMXD3sg#vOS`>vsK3^>5n@Xj={!gy<e0+WAI?a+K>Fpg1Q2^lX
z07$xf6rwnZ%?zM>($+TiTi@)Mbj!_cZ8!Gz_dox_OYa>zTB%grog{$&0<)28#gek{
QjQ{`u07*qoM6N<$g5zrMPXGV_

literal 0
HcmV?d00001

diff --git a/assets/resource/pipeline/template/Wilderness/TrustDialogueNext.png b/assets/resource/pipeline/template/Wilderness/TrustDialogueNext.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ae8d4dc56f1ac0630cea3b4b6db5fa4cc02426c
GIT binary patch
literal 1271
zcmV<T1PJ?yP)<h;3K|Lk000e1NJLTq000;O000*V0ssI2o<kUV000EONkl<ZI1x?3
z+mD@983*9s`>yY>zT@oK!|drC+A&B-NJuKRO#v?@(IC-?CcPjg{tqVJ@o#u#!kt`T
zA_+H&u^uA`V%1ck$gS<PVBLrByw-YOraLk5dFaCao<h$NbCzXM6sw4+Kmh_1t15uW
zO~Wv#YFU;<?53&fIyR;%OYeQ#wsf#RC#K*75fhV5Qxio12&7N~iHe)tIF1TUlEkLg
zd*Ah)iWX&I*febefG(aK0to&QRRvL!#A#{?r01Z+FgWL!h?%oI7m=>(LI_Ec<ayz}
zYnnF8EPe6uQvh-<gnk$Rgb;`*O%hR+a86XkL{U+cfVNHJeITNGr&iVFa!JIq*$zGN
z_^AR=5J5!7X$sy45dcI4Rc2Pzq9};jIoGu<5mi;i%x%{V{ZNzzojbjFsH#yE6Z7-e
zzq~h}d+#NP0t6^PgeZy#P=#|70N#qC=-+qGZvO5MRaNzUPy6#7QH`R=+H`ledvv(?
z@Z(Rs^W!+GYLX;zk`R%qwoMa4h?6+Wa%O(&$tV8$_uEkvu`#RVie`1jY~m;mB1s%S
zcm3)=KKhsUK8Qe-nE|M3*R{@h0993ih*VE6UHs=qcdDvtyKb5$+NmuO;T(aKE*xCA
zcI8X&y#E(fB_dVz-uHd)oFk?pFN`rEgy)~V_U8|7c~PjY*K1=89USZdPz}>GiYQdS
z^6d5hJpAv2&mIyWqJ7^v=ZPrKb8D@0Zn6K^-hB7=hj-#A9><~U`q^xUj*l;>iYh|z
z!!Qtph@QKC?T_!iC#r@G69beaNtR_q)HKc2E0=Hm?RJ*sqOw}8k~q%toQ{qbstOPh
zM5OQgaU8E*dFI~Py$7Fu3P7Qm&GNj6qqu3>z4>lkRrl^c0I=C?M5L-JRi&!RqsW|#
zqKJq^!ZbON@cmbAEcO=+Ff*93B_en4-u>mx-%iet<JkATF{Y~Owr$ATn1}#1#*}4A
zL;ymNOD9LK+<3VzOZ=bpx_Rv<uP;|C0ITJii08ZW5W;%BCTn9N=p#syI8D<iiU2V4
zcfa-0<)@#*|A^qd4{p8n^S9%en@!`q%k$jYtZQ2+QC%0_yAT2Z+A7PEnT;`*PL98K
z<7I0twmy5fdi|$AJG+0sZM$ijk|f#LDI`eKHffsD!NFrh@ZOK(=$ykAGpDJI<LKKj
zy?FJR%gpfJzx)2Jw{QNY>mO0Y?(U3;R;yJAvRKUN@Nl6D6%mzj9Hz;s3IJ6QA+z??
zAO2uAs~#>lKl<@&ZQHKbYgH}FDoNsD82i4n)+R|pM~C~W8bq-*O;g|ZfMSb@Ui{h%
zUw`4NzxdU!fB(*(nx+XM#7UfIxvDlzqpEdXhY+YNQh?$(vNmI8=e=`&7<yF=A*5+?
za(w)qZ+_#AH{ZH<cIKQj##B`WplKTCoV8h=XUpY^$|6-!5CF=HJc(m$O)jV^5i#=@
zPEYQ9{K+u%0P4DC=5ZXmt~18eb?uyQ+lI;_QH81kO2kD`#BoeS3NVp~_#j=^Ptz!(
zMUh*ZipYAsRz+2n#+YW)uwgn_?1m8BBOY6J3xF}kdq0ljG)+N-IVy@mRW_SV2*KL4
hEKBEH)3kY>e-5PV;hIR)9UuSz002ovPDHLkV1j(wcK`qY

literal 0
HcmV?d00001

diff --git a/assets/resource/pipeline/wilderness.json b/assets/resource/pipeline/wilderness.json
index 0d87ba30..1088ee16 100644
--- a/assets/resource/pipeline/wilderness.json
+++ b/assets/resource/pipeline/wilderness.json
@@ -5,6 +5,8 @@
             "CollectEXP",
             "CollectMoney",
             "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
             "Sub_StartUp"
         ]
     },
@@ -23,6 +25,8 @@
             "CollectEXP",
             "CollectMoney",
             "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
             "Sub_HomeLoading"
         ]
     },
@@ -39,6 +43,8 @@
         "next": [
             "CollectMoney",
             "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
             "Sub_HomeButton",
             "HomeFlag"
         ]
@@ -55,6 +61,8 @@
         "action": "Click",
         "next": [
             "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
             "Sub_HomeButton",
             "HomeFlag"
         ]
@@ -71,6 +79,42 @@
         "action": "Click",
         "next": [
             "CollectTrust",
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
+            "Sub_HomeButton",
+            "HomeFlag"
+        ]
+    },
+    "TrustDialogueNext": {
+        "recognition": "TemplateMatch",
+        "template": "template/Wilderness/TrustDialogueNext.png",
+        "roi": [
+            1119,
+            631,
+            124,
+            89
+        ],
+        "action": "Click",
+        "next": [
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
+            "Sub_HomeButton",
+            "HomeFlag"
+        ]
+    },
+    "TrustDialogueInteraction": {
+        "recognition": "TemplateMatch",
+        "template": "template/Wilderness/TrustDialogueInteraction.png",
+        "roi": [
+            1095,
+            42,
+            185,
+            593
+        ],
+        "action": "Click",
+        "next": [
+            "TrustDialogueNext",
+            "TrustDialogueInteraction",
             "Sub_HomeButton",
             "HomeFlag"
         ]

From 5c603e67a7d7f7b3c36378a08bb7a1fdf5eb8b26 Mon Sep 17 00:00:00 2001
From: Dongw <linsann@163.com>
Date: Sun, 16 Jul 2023 23:53:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=A1=E8=B5=96?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=B8=8B=E5=81=8F=E6=97=B6=E8=AF=86=E5=88=AB?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/resource/pipeline/wilderness.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/resource/pipeline/wilderness.json b/assets/resource/pipeline/wilderness.json
index 1088ee16..c3bb827e 100644
--- a/assets/resource/pipeline/wilderness.json
+++ b/assets/resource/pipeline/wilderness.json
@@ -72,9 +72,9 @@
         "template": "template/Wilderness/CollectTrust.png",
         "roi": [
             0,
-            131,
-            128,
-            138
+            58,
+            188,
+            438
         ],
         "action": "Click",
         "next": [