更新

1. 自动跳过开幕剧情（如果有） 2. 自动识别钻石抽完的情况。当前版本可用于任何钻石和十连券的情况。 3. 优化了部分问题
Carpenter-MK1 · Jun 11, 2024 · 447dd8a · 447dd8a
1 parent c4a24df
commit 447dd8a
Show file tree

Hide file tree

Showing 5 changed files with 170 additions and 62 deletions.
diff --git a/assets/interface.json b/assets/interface.json
@@ -35,15 +35,15 @@
         "抽什么池 | Which Pool": {
             "cases": [
                 {
-                    "name": "UP池20连+普池20连 | 20UP+20Normel",
+                    "name": "UP池+普池 | UP+Normel",
                     "param": {
                         "Gacha_UP_Pool": {
                             "enabled": true
                         }
                     }
                 },
                 {
-                    "name": "全部抽普池40连 | 40Normel",
+                    "name": "全部抽普池 | All In Normel",
                     "param": {
                         "Gacha_Normel_Pool": {
                             "enabled": true

diff --git a/assets/resource/base/image/icon_buy_diamonds.png b/assets/resource/base/image/icon_buy_diamonds.png
diff --git a/assets/resource/base/pipeline/Stupid_Produce.json b/assets/resource/base/pipeline/Stupid_Produce.json
@@ -40,5 +40,59 @@
         "recognition": "TemplateMatch",
         "template": "flag_in_choose_idol.png",
         "action": "Click"
+    },
+    "test_card_detect": {
+        "is_sub": true,
+        "recognition": "ColorMatch",
+        "roi": [
+            4,
+            1135,
+            716,
+            3
+        ],
+        "upper": [
+            255,
+            237,
+            190
+        ],
+        "lower": [
+            211,
+            185,
+            81
+        ],
+        "count": 100,
+        "order_by": "Score",
+        "connected": true,
+        "post_delay": 10,
+        "action": "Click",
+        "target_offset": [
+            0,
+            -40,
+            0,
+            0
+        ],
+        "next": [
+            "Click_Again"
+        ]
+    },
+    "Click_Again": {
+        "action": "Click",
+        "target": "test_card_detect",
+        "target_offset": [
+            0,
+            -40,
+            0,
+            0
+        ],
+        "post_delay": 7000
+    },
+    "Loop_Sub": {
+        "is_sub": true
+    },
+    "Loop_Lesson": {
+        "next": [
+            "test_card_detect",
+            "Loop_Sub"
+        ]
     }
 }
diff --git a/assets/resource/base/pipeline/my_task.json b/assets/resource/base/pipeline/my_task.json
@@ -46,6 +46,7 @@
         "next": [
             "Flag_In_Main",
             "Click_All_Button",
+            "OCR_Skip",
             "Close_Others"
         ]
     },
@@ -86,7 +87,20 @@
             332,
             15
         ],
-        "is_sub": true
+        "is_sub": true,
+        "post_delay": 10
+    },
+    "OCR_Skip": {
+        "is_sub": true,
+        "recognition": "OCR",
+        "expected": "SKIP",
+        "roi": [
+            146,
+            1169,
+            153,
+            63
+        ],
+        "action": "Click"
     },
     "Flag_In_Main": {
         "recognition": "TemplateMatch",
@@ -103,6 +117,36 @@
             "open_gift"
         ]
     },
+    "Loop_Get_Gift": {
+        "next": [
+            "Flag_Empty_Giftbox",
+            "open_gift",
+            "Back"
+        ]
+    },
+    "Flag_Empty_Giftbox": {
+        "recognition": "ColorMatch",
+        "roi": [
+            651,
+            397,
+            47,
+            50
+        ],
+        "lower": [
+            239,
+            0,
+            67
+        ],
+        "upper": [
+            239,
+            155,
+            168
+        ],
+        "inverse": true,
+        "next": [
+            "Go_To_Gacha"
+        ]
+    },
     "open_gift": {
         "recognition": "TemplateMatch",
         "template": "icon_gift.png",
@@ -118,6 +162,10 @@
         "recognition": "TemplateMatch",
         "template": "icon_get_all_gift.png",
         "action": "Click",
+        "threshold": 0.9,
+        "timeout_next": [
+            "Loop_Goto_Home"
+        ],
         "next": [
             "close_gift_info"
         ]
@@ -126,6 +174,9 @@
         "recognition": "TemplateMatch",
         "template": "icon_close_gift_info.png",
         "action": "Click",
+        "timeout_next": [
+            "Loop_Goto_Home"
+        ],
         "next": [
             "Back_To_Main"
         ]
@@ -135,8 +186,7 @@
         "template": "icon_back_to_main.png",
         "action": "Click",
         "next": [
-            "Go_To_Gacha",
-            "Click_All_Button"
+            "Loop_Get_Gift"
         ]
     },
     "Go_To_Gacha": {
@@ -197,60 +247,55 @@
         "order_by": "Score",
         "action": "Click",
         "next": [
-            "Gacha_Normel_With_Diamonds_Confirm_First"
-        ]
-    },
-    "Gacha_Normel_With_Diamonds_Confirm_First": {
-        "recognition": "TemplateMatch",
-        "template": "icon_gacha_with_diamonds_confirm.png",
-        "action": "Click",
-        "next": [
-            "End_Gacha_Normel_With_Diamonds_First"
-        ]
-    },
-    "End_Gacha_Normel_With_Diamonds_First": {
-        "next": [
-            "Leave_Gacha_Normel_With_Diamonds_First",
-            "Skip_Gacha"
+            "Diamonds_Check_Normel"
         ]
     },
-    "Leave_Gacha_Normel_With_Diamonds_First": {
-        "recognition": "TemplateMatch",
-        "template": "icon_leave_gacha.png",
-        "action": "Click",
+    "Diamonds_Check_Normel": {
         "next": [
-            "Gacha_Normel_With_Diamonds_And_Leave"
+            "Flag_Empty_Diamond_Normel",
+            "Gacha_Normel_With_Diamonds_Confirm_First"
         ]
     },
-    "Gacha_Normel_With_Diamonds_And_Leave": {
+    "Flag_Empty_Diamond_Normel": {
         "recognition": "TemplateMatch",
-        "template": "icon_gacha_with_diamonds.png",
-        "order_by": "Score",
+        "template": "icon_buy_diamonds.png",
+        "roi": [
+            335,
+            1088,
+            155,
+            146
+        ],
         "action": "Click",
+        "target": [
+            115,
+            1132,
+            211,
+            57
+        ],
         "next": [
-            "Gacha_Normel_With_Diamonds_Confirm"
+            "Go_To_Idol"
         ]
     },
-    "Gacha_Normel_With_Diamonds_Confirm": {
+    "Gacha_Normel_With_Diamonds_Confirm_First": {
         "recognition": "TemplateMatch",
         "template": "icon_gacha_with_diamonds_confirm.png",
         "action": "Click",
         "next": [
-            "End_Gacha_Normel_With_Diamonds"
+            "End_Gacha_Normel_With_Diamonds_First"
         ]
     },
-    "End_Gacha_Normel_With_Diamonds": {
+    "End_Gacha_Normel_With_Diamonds_First": {
         "next": [
-            "Leave_Gacha_Normel_With_Diamonds",
+            "Leave_Gacha_Normel_With_Diamonds_First",
             "Skip_Gacha"
         ]
     },
-    "Leave_Gacha_Normel_With_Diamonds": {
+    "Leave_Gacha_Normel_With_Diamonds_First": {
         "recognition": "TemplateMatch",
         "template": "icon_leave_gacha.png",
         "action": "Click",
         "next": [
-            "Go_To_Idol"
+            "Gacha_Normel_With_Diamonds"
         ]
     },
     "Change_Pool": {
@@ -268,31 +313,33 @@
         "action": "Click",
         "post_delay": 1000,
         "next": [
-            "Gacha_UP_With_Diamonds_Confirm"
+            "Diamonds_Check_UP"
         ]
     },
-    "Gacha_UP_Pool_Second": {
-        "recognition": "TemplateMatch",
-        "template": "icon_gacha_with_diamonds.png",
-        "order_by": "Score",
-        "action": "Click",
-        "post_delay": 1000,
+    "Diamonds_Check_UP": {
         "next": [
-            "Gacha_UP_With_Diamonds_Confirm_Second"
+            "Flag_Empty_Diamond_UP",
+            "Gacha_UP_With_Diamonds_Confirm"
         ]
     },
-    "Gacha_UP_With_Diamonds_Confirm_Second": {
+    "Flag_Empty_Diamond_UP": {
         "recognition": "TemplateMatch",
-        "template": "icon_gacha_with_diamonds_confirm.png",
+        "template": "icon_buy_diamonds.png",
+        "roi": [
+            335,
+            1088,
+            155,
+            146
+        ],
         "action": "Click",
+        "target": [
+            115,
+            1132,
+            211,
+            57
+        ],
         "next": [
-            "End_Gacha_UP_With_Diamonds_Second"
-        ]
-    },
-    "End_Gacha_UP_With_Diamonds_Second": {
-        "next": [
-            "Leave_Gacha_UP_With_Diamonds",
-            "Skip_Gacha"
+            "Change_Pool_And_Gacha_Normel"
         ]
     },
     "Gacha_UP_With_Diamonds_Confirm": {
@@ -305,24 +352,16 @@
     },
     "End_Gacha_UP_With_Diamonds": {
         "next": [
-            "Leave_Gacha_UP_With_Diamonds_First",
+            "Leave_Gacha_UP_With_Diamonds",
             "Skip_Gacha"
         ]
     },
-    "Leave_Gacha_UP_With_Diamonds_First": {
-        "recognition": "TemplateMatch",
-        "template": "icon_leave_gacha.png",
-        "action": "Click",
-        "next": [
-            "Gacha_UP_Pool_Second"
-        ]
-    },
     "Leave_Gacha_UP_With_Diamonds": {
         "recognition": "TemplateMatch",
         "template": "icon_leave_gacha.png",
         "action": "Click",
         "next": [
-            "Change_Pool_And_Gacha_Normel"
+            "Gacha_UP_Pool"
         ]
     },
     "Change_Pool_And_Gacha_Normel": {
@@ -358,6 +397,7 @@
         "recognition": "TemplateMatch",
         "template": "icon_support_storage.png",
         "action": "Click",
+        "post_wait_freezes": 200,
         "next": [
             "Check_Support_Amount"
         ]
@@ -1101,5 +1141,9 @@
             "Clear_Data"
         ]
     },
+    "Back": {
+        "action": "Key",
+        "key": 4
+    },
     "End_All": {}
 }
diff --git a/assets/resource/base/pipeline/system_control b/assets/resource/base/pipeline/system_control
@@ -0,0 +1,10 @@
+{
+    "Start_App_Gakumas": {
+        "action": "StartApp",
+        "package": "com.bandainamcoent.idolmaster_gakuen/com.google.firebase.MessagingUnityPlayerActivity"
+    },
+    "End_App_Gakumas": {
+        "action": "StopApp",
+        "package": "com.bandainamcoent.idolmaster_gakuen"
+    }
+}