Merge pull request icegreentee#440 from segfault-bilibili/rollup-7.2.3

【7.2.3】杜鹃花开荒支持FREE
magirecoAutoBattle · Jun 2, 2023 · 844fcf8 · 844fcf8
2 parents 10f1df4 + 8130c13
commit 844fcf8
Show file tree

Hide file tree

Showing 52 changed files with 92 additions and 59 deletions.
diff --git a/floatUI.js b/floatUI.js
@@ -8530,6 +8530,7 @@ function algo_init() {
         "sectionOnMapChap7JP",
         "intermission",
         "sectionOnMapBranchJP",
+        "freeSectionOnMapBranchJP",
         "shinnyNew",
         "shinnyNewChap7",
         "shinnyNewBranch",
@@ -10626,6 +10627,15 @@ function algo_init() {
                 x: 1919, y: 1079, pos: "bottom"
             }
         },
+        freeSectionOnMapBranchJP: {
+            //搜索整个地图
+            topLeft: {
+                x: 0, y: 128, pos: "top"
+            },
+            bottomRight: {
+                x: 1919, y: 1079, pos: "bottom"
+            }
+        },
         branchStart: {
             topLeft: {
                 x: 960, y: 540, pos: "top"
@@ -10707,6 +10717,10 @@ function algo_init() {
                 topLeft: {x: 0, y: 0, pos: "top"},
                 bottomRight: {x: 270, y: 210, pos: "top"}
             },
+            freeSectionOnMapBranchJP: {
+                topLeft: {x: 0, y: 0, pos: "top"},
+                bottomRight: {x: 270, y: 210, pos: "top"}
+            },
         }
         const btnOffset = {
             sectionOnMapJP: getConvertedAreaNoCutout({
@@ -10725,12 +10739,17 @@ function algo_init() {
                 topLeft: {x: 0, y: 0, pos: "top"},
                 bottomRight: {x: 209, y: 42, pos: "top"}
             }),
+            freeSectionOnMapBranchJP: getConvertedAreaNoCutout({
+                topLeft: {x: 0, y: 0, pos: "top"},
+                bottomRight: {x: 108, y: 52, pos: "top"}
+            }),
         }
         const shinnyNewMap = {
             sectionOnMapJP: "shinnyNew",
             intermission: "shinnyNew",
             sectionOnMapChap7JP: "shinnyNewChap7",
             sectionOnMapBranchJP: "shinnyNewBranch",
+            freeSectionOnMapBranchJP: "shinnyNewBranch",
         }
 
         let points = [];
@@ -10785,10 +10804,15 @@ function algo_init() {
                     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;
+                    switch (area.imgName) {
+                        case "sectionOnMapBranchJP":
+                        case "freeSectionOnMapBranchJP":
+                            {
+                                //杜鹃花型点NEW无反应，需要点NEW往下一点点的位置
+                                point.y += parseInt(template.getHeight() * 2);
+                                point.isBranch = true;
+                                break;
+                            }
                     }
                     return true;
                 }
@@ -13102,12 +13126,20 @@ function algo_init() {
             if (isFirstSupportAvailable(screenshot)) {
                 click(convertCoords(isThirdSupportPlayer(screenshot) ? knownThirdPtPoint : knownFirstPtPoint));
             } else if (isStartButtonPresent(screenshot)) {
-                click(convertCoords(clickSets.start));
+                for (let attempt = 5; attempt > 0; attempt--) {
+                    click(convertCoords(clickSets.start));
+                    sleep(2000);
+                    if (!isStartButtonPresent(compatCaptureScreen())) break;
+                }
+                toast("[尽量凑连携] 已" + (limit.openUpTryToConnect ? "启用" : "停用"));
                 if (limit.openUpTryToConnect) {
-                    mirrorsAutoBattleMain({
-                        CVAutoBattleTryToConnect: true,
-                        CVAutoBattleClickAllSkills: limit.openUpClickAllSkills ? true : false,
-                    });
+                    if (!isStartButtonPresent(compatCaptureScreen())) {
+                        //必须在开始按钮消失后才能认为战斗已经开始
+                        mirrorsAutoBattleMain({
+                            CVAutoBattleTryToConnect: true,
+                            CVAutoBattleClickAllSkills: limit.openUpClickAllSkills ? true : false,
+                        });
+                    }
                 }
             } else if (isDownloadDataOKButtonPresent(screenshot)) {
                 click(convertCoords(clickSets.dataDownloadOK));
@@ -13136,7 +13168,7 @@ function algo_init() {
                 click(newSectionOnMapPoint);
                 if (newSectionOnMapPoint.isBranch) {
                     sleep(3000);
-                    toast("杜鹃花型活动 暂不会点击特殊关卡(比如FREE)");
+                    toast("杜鹃花型活动 部分特殊关卡 暂不会被点击(比如CHALLENGE)");
                     let branchStartPoint = findButton(compatCaptureScreen(), "branchStart");
                     if (branchStartPoint != null) click(branchStartPoint);
                     else log("branchStartPoint == null");

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

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/fileJson/74.json b/update/fileJson/74.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 @@
-fRTAhVaweVRhmtRNYVF999+vy4PHVScML3NTDtvhpsGi0V3+3J/yHMqxfAsIu8tQoMajLEZk5IuR1J6YVeGUiL7p0Of7fU8vhA/qWRV3IFkbz42DEhILrO/upN9FpTm3n6ZGtd5b2+2J3gnd+r/SsxyDBx8VDJZR85KbBRfD7ioAPZBxQvs+3yGdR9anV3Daddxco/QpHLHUSy1eAzWSi3cyog9OhWjYofdut5BmkvyU4K/EZ9xcEPXP0RdgAATSvp+y7aPHq8GLuIYOrneGnCvG9syggVEcxUU9FEUr80l2LAWSqD6eZT/ni0FIoP4DCImcZ5qmbbCkOhS/DC/7vw==
+RrbIaygWG4M51Fh92ZJessDwSNBMe10+bsL7N3dFlFGj8yPTs0qYI3CzKbTHCpdOHhcc3hmngROO7vfqPea7ovimuOokADPKXBi4NCqJ+K5TLVLB/HtPNVcCimhRUd8PhU7fO036aqGw7tW59KETd9yrgBAP5Z0DEJFUSZC+tTI7rCP4i7jFfmFLAuUOOY/b1kD+JUuGBNBj203VnnFs9FpxP5iucXzhhg/25R7fS7p91toq4CDI8IvJP1drej67EZ7qxooptQm2gIfevr3rt112A0dyzzCzykamENN/5JKiG/Lb6LHDXUgwUK+0wPvlbZQhx505S9ZKn/guw355pQ==