Merge pull request #3 from MAWHA/main

。
MAWHA · Sep 23, 2024 · 15f6455 · 15f6455
2 parents f3e8d90 + 30f86e2
commit 15f6455
Show file tree

Hide file tree

Showing 56 changed files with 457 additions and 139 deletions.
diff --git a/.github/workflows/resource.yaml b/.github/workflows/resource.yaml
@@ -30,6 +30,7 @@ jobs:
           python res_zip.py
 
       - name: Commit changes
+        if: ${{ github.repository == 'MAWHA/MWA' }}
         uses: EndBug/[email protected]
         with:
           author_name: github-actions[bot]

diff --git a/assets/interface.json b/assets/interface.json
@@ -363,6 +363,17 @@
                             "next": "entry_dispath_one"
                         }
                     }
+                },
+                {
+                    "name": "不领取",
+                    "param": {
+                        "entry_one": {
+                            "next": [
+                                "entry_back",
+                                "entry_convened"
+                            ]
+                        }
+                    }
                 }
             ]
         },
@@ -401,10 +412,13 @@
                     }
                 },
                 {
-                    "name": "不领取(暂不推荐使用，会导致下面选项任务失效，甚至可能最终导致下面所有任务失败)",
+                    "name": "不领取",
                     "param": {
                         "entry_dispath_three": {
-                            "next": []
+                            "next": [
+                                "dispath_back",
+                                "dispath_convened"
+                            ]
                         }
                     }
                 }
@@ -493,10 +507,13 @@
                     }
                 },
                 {
-                    "name": "不制造(暂不推荐使用，会导致下面选项任务失效，甚至可能最终导致下面所有任务失败)",
+                    "name": "不制造",
                     "param": {
                         "entry_dispath_four": {
-                            "next": []
+                            "next": [
+                                "fabricate_back",
+                                "fabricate_convened"
+                            ]
                         }
                     }
                 }
@@ -513,10 +530,13 @@
                     }
                 },
                 {
-                    "name": "不喝茶(暂不推荐使用，会导致下面选项任务失效，甚至可能最终导致下面所有任务失败)",
+                    "name": "不喝茶",
                     "param": {
-                        "dispatch_company_all": {
-                            "next": []
+                        "tea": {
+                            "next": [
+                                "tea_back",
+                                "tea_convened"
+                            ]
                         }
                     }
                 }
@@ -533,10 +553,13 @@
                     }
                 },
                 {
-                    "name": "不领取【反正是派遣公司的最后一个任务（暂时），无所谓，这个可以用】",
+                    "name": "不领取",
                     "param": {
-                        "dispatch_company_all": {
-                            "next": []
+                        "vitality": {
+                            "next": [
+                                "vitality_back",
+                                "vitality-convened"
+                            ]
                         }
                     }
                 }

diff --git a/assets/resource/base/pipeline/1_startup.json b/assets/resource/base/pipeline/1_startup.json
@@ -1,91 +1,21 @@
 {
-    "StartUp": {
+    "Start": {
         "next": [
-            "Sub_StartWuhua",
-            "Sub_CloseAnnouncement",
-            "Sub_StartGame",
-            "Sub_AccumulatedSignIn",
-            "Sub_AccumulatedSignInExit",
-            "convened",
-            "Sub_StartUp"
-        ]
-    },
-    "Sub_StartUp": {
-        "next": [
-            "StartUp"
+            "StartWuhua",
+            "update",
+            "CloseAnnouncement"
         ]
     },
-    "Sub_StartWuhua": {
-        "is_sub": true,
+    "StartWuhua": {
         "action": "StartApp",
         "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity",
-        "post_delay": 5000,
-        "timeout": 20000,
-        "timeout_next": [
-            "advice",
-            "misinterpretation",
-            "examine",
-            "update",
-            "Sub_CloseAnnouncement",
-            "convened"
-        ],
+        "post_wait_freezes": 10000,
         "next": [
-            "advice",
-            "misinterpretation",
-            "examine",
             "update",
-            "Sub_CloseAnnouncement",
+            "CloseAnnouncement",
             "convened"
         ]
     },
-    "misinterpretation": {
-        "recognition": "OCR",
-        "expected": "曲解",
-        "action": "DoNothing",
-        "post_delay": 5000,
-        "timeout": 20000,
-        "timeout_next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ],
-        "next": [
-            "examine",
-            "update",
-            "Sub_CloseAnnouncement"
-        ]
-    },
-    "advice": {
-        "recognition": "OCR",
-        "expected": "健康游戏忠告",
-        "action": "DoNothing",
-        "post_delay": 5000,
-        "timeout": 20000,
-        "timeout_next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ],
-        "next": [
-            "misinterpretation",
-            "examine",
-            "update",
-            "Sub_CloseAnnouncement"
-        ]
-    },
-    "examine": {
-        "recognition": "OCR",
-        "expected": "正在检查更新",
-        "action": "DoNothing",
-        "post_delay": 5000,
-        "timeout": 20000,
-        "timeout_next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ],
-        "next": [
-            "update",
-            "Sub_CloseAnnouncement"
-        ]
-    },
     "update": {
         "recognition": "OCR",
         "expected": "终端数据更新",
@@ -100,7 +30,7 @@
         "timeout": 20000,
         "timeout_next": [
             "update",
-            "Sub_CloseAnnouncement"
+            "CloseAnnouncement"
         ],
         "target": [
             765,
@@ -109,10 +39,10 @@
             0
         ],
         "next": [
-            "Sub_CloseAnnouncement"
+            "CloseAnnouncement"
         ]
     },
-    "Sub_CloseAnnouncement": {
+    "CloseAnnouncement": {
         "recognition": "TemplateMatch",
         "template": "Startup/12.png",
         "roi": [
@@ -122,70 +52,76 @@
             157
         ],
         "action": "Click",
-        "timeout": 20000,
-        "timeout_next": [
-            "Sub_CloseAnnouncement",
-            "Sub_StartGame"
-        ],
+        "post_delay": 5000,
         "next": [
-            "Sub_StartGame"
+            "StartGame",
+            "CloseAnnouncement"
         ]
     },
-    "Sub_StartGame": {
+    "StartGame": {
         "recognition": "OCR",
-        "expected": "抵制不良游戏",
+        "expected": "点击",
         "action": "Click",
-        "next": [
-            "Sub_AccumulatedSignIn"
-        ]
-    },
-    "Sub_AccumulatedSignIn": {
-        "action": "Click",
-        "post_delay": 10000,
-        "timeout": 20000,
-        "timeout_next": [
-            "Sub_AccumulatedSignIn",
-            "Sub_GetResource",
-            "Sub_AccumulatedSignInExit",
-            "convened"
+        "post_delay": 7000,
+        "roi": [
+            190,
+            600,
+            130,
+            70
         ],
         "next": [
-            "Sub_GetResource",
-            "Sub_AccumulatedSignInExit",
+            "AccumulatedSignIn",
+            "AccumulatedSignInExit",
+            "GetResource",
             "convened"
         ]
     },
     "convened": {
         "recognition": "TemplateMatch",
         "template": "Startup/11.png",
+        "action": "DoNothing",
         "roi": [
             906,
             340,
             170,
             205
         ],
+        "post_delay": 2000
+    },
+    "AccumulatedSignIn": {
+        "action": "Click",
+        "target": [
+            800,
+            350,
+            0,
+            0
+        ],
         "post_delay": 3000,
         "next": [
-            "stop"
+            "GetResource",
+            "AccumulatedSignInExit",
+            "convened",
+            "AccumulatedSignIn"
         ]
     },
-    "Sub_AccumulatedSignInExit": {
+    "AccumulatedSignInExit": {
         "recognition": "TemplateMatch",
         "template": "Startup/AccumulatedSignInExit.png",
         "action": "Click",
         "post_delay": 3000,
         "next": [
-            "Sub_GetResource",
-            "Sub_AccumulatedSignInExit",
-            "stop"
+            "GetResource",
+            "AccumulatedSignInExit",
+            "convened"
         ]
     },
-    "Sub_GetResource": {
+    "GetResource": {
         "recognition": "OCR",
         "expected": "获得物资",
         "action": "Click",
         "next": [
-            "Sub_AccumulatedSignInExit"
+            "AccumulatedSignInExit",
+            "convened"
         ]
     }
 }
diff --git a/assets/resource_picli/base/image/2048/1024.png b/assets/resource_picli/base/image/2048/1024.png
diff --git a/assets/resource_picli/base/image/2048/128.png b/assets/resource_picli/base/image/2048/128.png
diff --git a/assets/resource_picli/base/image/2048/16.png b/assets/resource_picli/base/image/2048/16.png
diff --git a/assets/resource_picli/base/image/2048/2.png b/assets/resource_picli/base/image/2048/2.png
diff --git a/assets/resource_picli/base/image/2048/2048.png b/assets/resource_picli/base/image/2048/2048.png
diff --git a/assets/resource_picli/base/image/2048/256.png b/assets/resource_picli/base/image/2048/256.png
diff --git a/assets/resource_picli/base/image/2048/32.png b/assets/resource_picli/base/image/2048/32.png
diff --git a/assets/resource_picli/base/image/2048/4.png b/assets/resource_picli/base/image/2048/4.png
diff --git a/assets/resource_picli/base/image/2048/512.png b/assets/resource_picli/base/image/2048/512.png
diff --git a/assets/resource_picli/base/image/2048/64.png b/assets/resource_picli/base/image/2048/64.png
diff --git a/assets/resource_picli/base/image/2048/8.png b/assets/resource_picli/base/image/2048/8.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_1.png b/assets/resource_picli/base/image/2048_cd/2048_cd_1.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_10.png b/assets/resource_picli/base/image/2048_cd/2048_cd_10.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_11.png b/assets/resource_picli/base/image/2048_cd/2048_cd_11.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_12.png b/assets/resource_picli/base/image/2048_cd/2048_cd_12.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_13.png b/assets/resource_picli/base/image/2048_cd/2048_cd_13.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_14.png b/assets/resource_picli/base/image/2048_cd/2048_cd_14.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_15.png b/assets/resource_picli/base/image/2048_cd/2048_cd_15.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_16.png b/assets/resource_picli/base/image/2048_cd/2048_cd_16.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_2.png b/assets/resource_picli/base/image/2048_cd/2048_cd_2.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_3.png b/assets/resource_picli/base/image/2048_cd/2048_cd_3.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_4.png b/assets/resource_picli/base/image/2048_cd/2048_cd_4.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_5.png b/assets/resource_picli/base/image/2048_cd/2048_cd_5.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_6.png b/assets/resource_picli/base/image/2048_cd/2048_cd_6.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_7.png b/assets/resource_picli/base/image/2048_cd/2048_cd_7.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_8.png b/assets/resource_picli/base/image/2048_cd/2048_cd_8.png
diff --git a/assets/resource_picli/base/image/2048_cd/2048_cd_9.png b/assets/resource_picli/base/image/2048_cd/2048_cd_9.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_1.png b/assets/resource_picli/base/image/2048_hh/2048_hh_1.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_10.png b/assets/resource_picli/base/image/2048_hh/2048_hh_10.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_11.png b/assets/resource_picli/base/image/2048_hh/2048_hh_11.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_12.png b/assets/resource_picli/base/image/2048_hh/2048_hh_12.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_2.png b/assets/resource_picli/base/image/2048_hh/2048_hh_2.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_3.png b/assets/resource_picli/base/image/2048_hh/2048_hh_3.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_4.png b/assets/resource_picli/base/image/2048_hh/2048_hh_4.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_5.png b/assets/resource_picli/base/image/2048_hh/2048_hh_5.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_6.png b/assets/resource_picli/base/image/2048_hh/2048_hh_6.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_7.png b/assets/resource_picli/base/image/2048_hh/2048_hh_7.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_8.png b/assets/resource_picli/base/image/2048_hh/2048_hh_8.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_9.png b/assets/resource_picli/base/image/2048_hh/2048_hh_9.png
diff --git a/assets/resource_picli/base/image/2048_hh/2048_hh_bs.png b/assets/resource_picli/base/image/2048_hh/2048_hh_bs.png
diff --git a/assets/resource_picli/base/pipeline/1_startup.json b/assets/resource_picli/base/pipeline/1_startup.json
@@ -16,7 +16,6 @@
         ]
     },
     "Sub_StartWuhua": {
-        "is_sub": true,
         "action": "StartApp",
         "package": "com.cipaishe.wuhua.bilibili/com.cipaishe.wuhua.bilibili.activity.ONESDKSplashActivity",
         "post_delay": 5000,

diff --git a/assets/resource_picli/base/pipeline/2048_1.json b/assets/resource_picli/base/pipeline/2048_1.json
@@ -0,0 +1,68 @@
+{
+  "2048_1_2": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/2.png",
+    "threshold": 0.95
+  },
+  "2048_1_4": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/4.png",
+    "threshold": 0.95
+  },
+  "2048_1_8": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/8.png",
+    "threshold": 0.95
+  },
+  "2048_1_16": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/16.png",
+    "threshold": 0.95
+  },
+  "2048_1_32": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/32.png",
+    "threshold": 0.95
+  },
+  "2048_1_64": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/64.png",
+    "threshold": 0.95
+  },
+  "2048_1_128": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/128.png",
+    "threshold": 0.95
+  },
+  "2048_1_256": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/256.png",
+    "threshold": 0.95
+  },
+  "2048_1_512": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/512.png",
+    "threshold": 0.95
+  },
+  "2048_1_1024": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/1024.png",
+    "threshold": 0.95
+  },
+  "2048_1_2048": {
+    "recognition": "TemplateMatch",
+    "roi": [347, 100, 588, 579],
+    "template": "2048/2048.png",
+    "threshold": 0.95
+  }
+}