Merge pull request icegreentee#439 from segfault-bilibili/rollup-7.2.2

【7.2.2】开荒支持杜鹃花型地图
magirecoAutoBattle · Jun 2, 2023 · 10f1df4 · 10f1df4
2 parents 84884b3 + 47cc1c9
commit 10f1df4
Show file tree

Hide file tree

Showing 68 changed files with 110 additions and 61 deletions.
diff --git a/floatUI.js b/floatUI.js
@@ -8529,8 +8529,11 @@ function algo_init() {
         "sectionOnMapJP",
         "sectionOnMapChap7JP",
         "intermission",
+        "sectionOnMapBranchJP",
         "shinnyNew",
         "shinnyNewChap7",
+        "shinnyNewBranch",
+        "branchStart",
     ];
 
     var loadAllImages = syncer.syn(function () {
@@ -10614,6 +10617,23 @@ function algo_init() {
                 x: 1919, y: 1079, pos: "bottom"
             }
         },
+        sectionOnMapBranchJP: {
+            //搜索整个地图
+            topLeft: {
+                x: 0, y: 128, pos: "top"
+            },
+            bottomRight: {
+                x: 1919, y: 1079, pos: "bottom"
+            }
+        },
+        branchStart: {
+            topLeft: {
+                x: 960, y: 540, pos: "top"
+            },
+            bottomRight: {
+                x: 1919, y: 1079, pos: "bottom"
+            }
+        }
     };
     function getButtonArea(type) {
         let knownArea = knownButtonCoords[type];
@@ -10630,6 +10650,10 @@ function algo_init() {
         let template = knownImgs[type];
         let img = getButtonImg(screenshot, type);
         let point = images.findImage(img, template, {threshold: 0.9});
+        if (point != null) {
+            let area = getButtonArea(type);
+            ["x", "y"].forEach((axis) => point[axis] += area.topLeft[axis]);
+        }
         log(type, point);
         return point;
     }
@@ -10679,6 +10703,10 @@ function algo_init() {
                 topLeft: {x: 0, y: 0, pos: "top"},
                 bottomRight: {x: 210, y: 150, pos: "top"}
             },
+            sectionOnMapBranchJP: {
+                topLeft: {x: 0, y: 0, pos: "top"},
+                bottomRight: {x: 270, y: 210, pos: "top"}
+            },
         }
         const btnOffset = {
             sectionOnMapJP: getConvertedAreaNoCutout({
@@ -10693,11 +10721,16 @@ function algo_init() {
                 topLeft: {x: 0, y: 0, pos: "top"},
                 bottomRight: {x: 116, y: 22, pos: "top"}
             }),
+            sectionOnMapBranchJP: getConvertedAreaNoCutout({
+                topLeft: {x: 0, y: 0, pos: "top"},
+                bottomRight: {x: 209, y: 42, pos: "top"}
+            }),
         }
         const shinnyNewMap = {
             sectionOnMapJP: "shinnyNew",
             intermission: "shinnyNew",
             sectionOnMapChap7JP: "shinnyNewChap7",
+            sectionOnMapBranchJP: "shinnyNewBranch",
         }
 
         let points = [];
@@ -10749,8 +10782,14 @@ function algo_init() {
                 }
                 if (point != null) {
                     log("found area", area);
+                    point = {x: point.x, y: point.y, isBranch: false}; // convert to JS object
                     ["x", "y"].forEach((axis) => point[axis] += area.topLeft[axis]);
                     point.x += parseInt(template.getWidth() / 2);
+                    if (area.imgName === "sectionOnMapBranchJP") {
+                        //杜鹃花型点NEW无反应，需要点NEW往下一点点的位置
+                        point.y += parseInt(template.getHeight() * 2);
+                        point.isBranch = true;
+                    }
                     return true;
                 }
             }) != null) break;
@@ -13095,6 +13134,13 @@ function algo_init() {
                 }
             } else if ((newSectionOnMapPoint = findNewSectionOnMap(screenshot))) {
                 click(newSectionOnMapPoint);
+                if (newSectionOnMapPoint.isBranch) {
+                    sleep(3000);
+                    toast("杜鹃花型活动 暂不会点击特殊关卡(比如FREE)");
+                    let branchStartPoint = findButton(compatCaptureScreen(), "branchStart");
+                    if (branchStartPoint != null) click(branchStartPoint);
+                    else log("branchStartPoint == null");
+                }
                 newSectionOnMapPoint = null;
             }
             sleep(1000);

diff --git a/images/branchStart.png b/images/branchStart.png
diff --git a/images/sectionOnMapBranchJP.png b/images/sectionOnMapBranchJP.png
diff --git a/images/shinnyNewBranch.png b/images/shinnyNewBranch.png
diff --git a/project.json b/project.json
@@ -5,7 +5,7 @@
         "build"
     ],
     "packageName": "top.momoe.auto",
-    "versionName": "7.2.1",
+    "versionName": "7.2.2",
     "versionInfo": "",
     "versionCode": 1,
     "icon":"./images/icon.png",

diff --git a/update/fileJson/13.json b/update/fileJson/13.json
diff --git a/update/fileJson/14.json b/update/fileJson/14.json
diff --git a/update/fileJson/15.json b/update/fileJson/15.json
diff --git a/update/fileJson/16.json b/update/fileJson/16.json
diff --git a/update/fileJson/17.json b/update/fileJson/17.json
diff --git a/update/fileJson/18.json b/update/fileJson/18.json
diff --git a/update/fileJson/19.json b/update/fileJson/19.json
diff --git a/update/fileJson/20.json b/update/fileJson/20.json
diff --git a/update/fileJson/21.json b/update/fileJson/21.json
diff --git a/update/fileJson/22.json b/update/fileJson/22.json
diff --git a/update/fileJson/23.json b/update/fileJson/23.json
diff --git a/update/fileJson/24.json b/update/fileJson/24.json
diff --git a/update/fileJson/25.json b/update/fileJson/25.json
diff --git a/update/fileJson/26.json b/update/fileJson/26.json
diff --git a/update/fileJson/27.json b/update/fileJson/27.json
diff --git a/update/fileJson/28.json b/update/fileJson/28.json
diff --git a/update/fileJson/29.json b/update/fileJson/29.json
diff --git a/update/fileJson/30.json b/update/fileJson/30.json
diff --git a/update/fileJson/31.json b/update/fileJson/31.json
diff --git a/update/fileJson/32.json b/update/fileJson/32.json
diff --git a/update/fileJson/33.json b/update/fileJson/33.json
diff --git a/update/fileJson/34.json b/update/fileJson/34.json
diff --git a/update/fileJson/35.json b/update/fileJson/35.json
diff --git a/update/fileJson/36.json b/update/fileJson/36.json
diff --git a/update/fileJson/37.json b/update/fileJson/37.json
diff --git a/update/fileJson/38.json b/update/fileJson/38.json
diff --git a/update/fileJson/39.json b/update/fileJson/39.json
diff --git a/update/fileJson/40.json b/update/fileJson/40.json
diff --git a/update/fileJson/41.json b/update/fileJson/41.json
diff --git a/update/fileJson/42.json b/update/fileJson/42.json
diff --git a/update/fileJson/43.json b/update/fileJson/43.json
diff --git a/update/fileJson/44.json b/update/fileJson/44.json
diff --git a/update/fileJson/45.json b/update/fileJson/45.json
diff --git a/update/fileJson/46.json b/update/fileJson/46.json
diff --git a/update/fileJson/47.json b/update/fileJson/47.json
diff --git a/update/fileJson/48.json b/update/fileJson/48.json
diff --git a/update/fileJson/49.json b/update/fileJson/49.json
diff --git a/update/fileJson/50.json b/update/fileJson/50.json
diff --git a/update/fileJson/51.json b/update/fileJson/51.json
diff --git a/update/fileJson/52.json b/update/fileJson/52.json
diff --git a/update/fileJson/53.json b/update/fileJson/53.json
diff --git a/update/fileJson/54.json b/update/fileJson/54.json
diff --git a/update/fileJson/55.json b/update/fileJson/55.json
diff --git a/update/fileJson/56.json b/update/fileJson/56.json
diff --git a/update/fileJson/57.json b/update/fileJson/57.json
diff --git a/update/fileJson/58.json b/update/fileJson/58.json
diff --git a/update/fileJson/59.json b/update/fileJson/59.json
diff --git a/update/fileJson/60.json b/update/fileJson/60.json
diff --git a/update/fileJson/61.json b/update/fileJson/61.json
diff --git a/update/fileJson/62.json b/update/fileJson/62.json
diff --git a/update/fileJson/63.json b/update/fileJson/63.json
diff --git a/update/fileJson/64.json b/update/fileJson/64.json
diff --git a/update/fileJson/65.json b/update/fileJson/65.json
diff --git a/update/fileJson/66.json b/update/fileJson/66.json
diff --git a/update/fileJson/67.json b/update/fileJson/67.json
diff --git a/update/fileJson/68.json b/update/fileJson/68.json
diff --git a/update/fileJson/69.json b/update/fileJson/69.json
diff --git a/update/fileJson/70.json b/update/fileJson/70.json
diff --git a/update/fileJson/71.json b/update/fileJson/71.json
diff --git a/update/fileJson/72.json b/update/fileJson/72.json
diff --git a/update/fileJson/73.json b/update/fileJson/73.json
diff --git a/update/updateList.json b/update/updateList.json
diff --git a/update/updateList.json.sig.txt b/update/updateList.json.sig.txt
@@ -1 +1 @@
-JGuj7UL3Qeh69jC7Xz5b1ch02yphj2Bk+xJAN8Bz+NHnqlU8IE7T1T681nXMeVzJVZm7yw0EqJ05HMFYVm1nxyn++3PJVqtlJ4tVCrK8bCog0RGF1VPNqAGI5tYuABL7rno43gjnV0pEn5CA+44EunaKqMeZeRwdhqJUq2NIS0enw9DqK5TTBuLuX+26wWeuQR4tqAwkFFGBIGd5A4tiXGiV1nFoiIat7LwiXE8+VGcsexp8gE0KgHk8wjCvYWBovIGJnV56zf3TXd2ZYE09WkohchFSkMqJwbnKahXk5qLJAhJ3izodY757NpDjKeV/1b4Se3Pp/ExnOYxe85PHjg==
+fRTAhVaweVRhmtRNYVF999+vy4PHVScML3NTDtvhpsGi0V3+3J/yHMqxfAsIu8tQoMajLEZk5IuR1J6YVeGUiL7p0Of7fU8vhA/qWRV3IFkbz42DEhILrO/upN9FpTm3n6ZGtd5b2+2J3gnd+r/SsxyDBx8VDJZR85KbBRfD7ioAPZBxQvs+3yGdR9anV3Daddxco/QpHLHUSy1eAzWSi3cyog9OhWjYofdut5BmkvyU4K/EZ9xcEPXP0RdgAATSvp+y7aPHq8GLuIYOrneGnCvG9syggVEcxUU9FEUr80l2LAWSqD6eZT/ni0FIoP4DCImcZ5qmbbCkOhS/DC/7vw==