From 349469250f401802aa1400cc095018583715be76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= <huiyadanli@gmail.com>
Date: Wed, 17 Jul 2024 23:13:14 +0800
Subject: [PATCH] auto skip: use new new icon

---
 .../AutoSkip/Assets/1920x1080/disabled_ui.png | Bin 0 -> 1201 bytes
 .../AutoSkip/Assets/AutoSkipAssets.cs         |  21 +++++++++++++-----
 .../GameTask/AutoSkip/AutoSkipTrigger.cs      |   2 +-
 .../User/pick_black_lists.json                |   3 +++
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 BetterGenshinImpact/GameTask/AutoSkip/Assets/1920x1080/disabled_ui.png

diff --git a/BetterGenshinImpact/GameTask/AutoSkip/Assets/1920x1080/disabled_ui.png b/BetterGenshinImpact/GameTask/AutoSkip/Assets/1920x1080/disabled_ui.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5213c532097d4e2ab22e4ae4018db6d8ac5bf8f
GIT binary patch
literal 1201
zcmV;i1Wx;jP)<h;3K|Lk000e1NJLTq000~S000yS1^@s6o?cz~00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1V%|jK~zXfjg@&*
zQ)d*$`CM+DmQ7nhM@SHoAWI7}l9n=H2dztMouYz{wJ@c25to8wBMV6c5rZgUNgxSX
zlpPZGeuk&#yzyRd0%iQ;naSklp5J?(^Smb+JBb+nPyZ&~ew23NF>J3!Wwo~6MRiRB
z{NCZ@b4AU4ftxE4%t!sOSxvb9a|_OVS%*`ntB`$MOVZ$^x)POV>v8MW9SpeaScv-2
z+}wf#pPj<tY!xnkf9>Od8_Qt?eXr5}TL)C7H8_}~!hy^}98~B~)^6pV&=QEB7eG}~
z1)IgVKad};&IMrWHK9g-9-rhC(aS0!K6U2j#V9EL3c89~lve6dNJX>0D3K2#Nu{ZV
z#bglm_607!ox=V5e;{8~Ax<p8j${`R;A{MHuMKWTFMOjfF)=!XKD!wgFJB|5MurvX
zYG5@Rut_e>M<=ni7}^`SwiLq6mOIGJ*U1)1!1~5ZcroCjKqOt*SPEl(c?Qvt7tJ?Y
zk&~|#u#&P`IOq@?OEZ`n_rUG4V!}HlYJUJy!ZugJ=;-(zpB_CepOnSWs&fr^?HLg1
zi!TK6&!dO<@uwU3fz;S^6~|7V5x><{=;5#uj5_lZ%+_m!(a<ddH#Ipd0?3CIzyY@%
zd4=UEFjj7!7M%|skS#N!(B-SwkylWLBROgc2P-*aEy4P17OX9VFg50ZmBM1^>6Ybk
zSTH*?F0N0;7LmCNj&VA$lnQwU-Qr}AJ3B={((Tr;jnr9!U|h>VU?q%YG<L%~@*L}A
zb;hHIoj7(PIk$9RUHt`2kH5k?b=YwJ5_P6Z0dhdZ%&2>YvC_K}GIYUC)-J^S$mn|V
znC4KrC-9s4CiuxBo?qj4SA>lWI+UfN=vRs28!I!|Tn%G85fwq=+3f;8?Gi35GLY@!
zJGYmmn(|sor&F9vU)O}gS!#l*33e7{Q;z_!7{*$jn}XT+bQjP_@{YU^=@!5dPrq1G
z>A<YxCAintj^-OJG(V0$ceXcdD;~l4n;}s=9q8_}Vm3UP3=IQWoW}I6!8UVxGv9w-
zq^%KKXgi*?PYHV$o)FL2J|&F53;IT|MPp%(eDOC|BWU}zU7lz9Of_ZaMD(Qt?yS*!
zBz`Xv@Zy=%M)xjhCwIx>UCJ5Y!+p5;??15O^FjRm=U-42SET@T<$5^n7A(D+#>#Af
zR+bNQw6-FFQFvbs(u%XlFbQZi8xfcs5m!OU*tNW4!7)nb1sN#87!sZy#mhk#Tuv*T
zv{N~GW@C>GlJv}JM=UfZx))9;7%9LFT5-2;-=(lfyD@1ar!?q)gXjGYm`qfZ?v-Sl
zQvLLw$n)YA$a7ZKmXrcqT?pVP&5+ZmrhqtXW^tJl^C5(3PJ?ts`e;qDc%!%+R_fSI
za~c+Rj28gkS!K<1r2yH2?ye`OsQwm?UbBd?Bq=QEp^+_9{8m{rRWbYr^Y3k&czy02
P00000NkvXXu0mjfEm<kv

literal 0
HcmV?d00001

diff --git a/BetterGenshinImpact/GameTask/AutoSkip/Assets/AutoSkipAssets.cs b/BetterGenshinImpact/GameTask/AutoSkip/Assets/AutoSkipAssets.cs
index 06b700d2..c9698fd9 100644
--- a/BetterGenshinImpact/GameTask/AutoSkip/Assets/AutoSkipAssets.cs
+++ b/BetterGenshinImpact/GameTask/AutoSkip/Assets/AutoSkipAssets.cs
@@ -7,7 +7,10 @@ namespace BetterGenshinImpact.GameTask.AutoSkip.Assets;
 public class AutoSkipAssets : BaseAssets<AutoSkipAssets>
 {
     public RecognitionObject StopAutoButtonRo;
-    public RecognitionObject ChatReviewButtonRo;
+
+    // public RecognitionObject ChatReviewButtonRo;
+    public RecognitionObject DisabledUiButtonRo;
+
     public RecognitionObject PlayingTextRo;
 
     public Rect OptionRoi;
@@ -45,12 +48,20 @@ public class AutoSkipAssets : BaseAssets<AutoSkipAssets>
             DrawOnWindow = true
         }.InitTemplate();
 
-        ChatReviewButtonRo = new RecognitionObject
+        // ChatReviewButtonRo = new RecognitionObject
+        // {
+        //     Name = "ChatReviewButton",
+        //     RecognitionType = RecognitionTypes.TemplateMatch,
+        //     TemplateImageMat = GameTaskManager.LoadAssetImage("AutoSkip", "chat_review.png"),
+        //     RegionOfInterest = new Rect(0, 0, CaptureRect.Width / 4, CaptureRect.Height / 8),
+        //     DrawOnWindow = true
+        // }.InitTemplate();
+        DisabledUiButtonRo = new RecognitionObject
         {
-            Name = "ChatReviewButton",
+            Name = "DisabledUiButton",
             RecognitionType = RecognitionTypes.TemplateMatch,
-            TemplateImageMat = GameTaskManager.LoadAssetImage("AutoSkip", "chat_review.png"),
-            RegionOfInterest = new Rect(0, 0, CaptureRect.Width / 4, CaptureRect.Height / 8),
+            TemplateImageMat = GameTaskManager.LoadAssetImage("AutoSkip", "disabled_ui.png"),
+            RegionOfInterest = new Rect(0, 0, CaptureRect.Width / 3, CaptureRect.Height / 8),
             DrawOnWindow = true
         }.InitTemplate();
 
diff --git a/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipTrigger.cs b/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipTrigger.cs
index 782e27fa..6ef48227 100644
--- a/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipTrigger.cs
+++ b/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipTrigger.cs
@@ -140,7 +140,7 @@ public class AutoSkipTrigger : ITaskTrigger
         GetDailyRewardsEsc(_config, content);
 
         // 找左上角剧情自动的按钮
-        using var foundRectArea = content.CaptureRectArea.Find(_autoSkipAssets.ChatReviewButtonRo);
+        using var foundRectArea = content.CaptureRectArea.Find(_autoSkipAssets.DisabledUiButtonRo);
 
         var isPlaying = !foundRectArea.IsEmpty(); // 播放中
 
diff --git a/BetterGenshinImpact/User/pick_black_lists.json b/BetterGenshinImpact/User/pick_black_lists.json
index 7f66ce51..af23d3b9 100644
--- a/BetterGenshinImpact/User/pick_black_lists.json
+++ b/BetterGenshinImpact/User/pick_black_lists.json
@@ -1,4 +1,7 @@
 [
+  "幻想真境剧诗",
+  "开始演奏",
+  "募刻巧像",
   "绘想游迹",
   "祀珑典仪",
   "召唤激流",