Feat: new cn server cafe and exchange

sanmusen214 · Jan 18, 2024 · aed2998 · aed2998
1 parent d6e0c5e
commit aed2998
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 28 deletions.
diff --git a/BAAH_CONFIGS/example.json b/BAAH_CONFIGS/example.json
@@ -26,25 +26,11 @@
     ],
     "INFO2": "悬赏通缉",
     "WANTED_HIGHEST_LEVEL": [
-        [
-            [
-                1,
-                9,
-                -1
-            ]
-        ],
-        [
-            [
-                2,
-                9,
-                -1
-            ]
-        ],
         [
             [
                 3,
-                9,
-                -1
+                4,
+                1
             ]
         ]
     ],
@@ -53,15 +39,8 @@
         [
             [
                 1,
-                9,
-                3
-            ]
-        ],
-        [
-            [
                 1,
-                9,
-                3
+                1
             ]
         ]
     ],
@@ -208,7 +187,7 @@
     "SHOP_CONTEST": [],
     "TASK_ACTIVATE": [
         true,
-        true,
+        false,
         true,
         true,
         true,

diff --git a/DATA/CONFIGS/software_config.json b/DATA/CONFIGS/software_config.json
@@ -1,4 +1,4 @@
 {
-    "NOWVERSION": "1.2.0",
+    "NOWVERSION": "1.2.1",
     "LANGUAGE": "zh_CN"
 }
diff --git a/DATA/assets_cn/BUTTON/BUTTON_CAFE_CANINVITE.png b/DATA/assets_cn/BUTTON/BUTTON_CAFE_CANINVITE.png
diff --git a/DATA/assets_cn/BUTTON/BUTTON_CAFE_CANNOT_COLLECT.png b/DATA/assets_cn/BUTTON/BUTTON_CAFE_CANNOT_COLLECT.png
diff --git a/modules/AllTask/InExchange/InExchange.py b/modules/AllTask/InExchange/InExchange.py
@@ -61,7 +61,7 @@ def on_run(self) -> None:
                 if match(page_pic(PageName.PAGE_EXCHANGE), returnpos=True)[1][1]>133:
                     # 如果右侧Title较低，说明是老版本的国服
                     logging.info("点击较低的三个定位点")
-                    points = np.linspace(271, 557, 3)
+                    points = np.linspace(265, 544, 3)
                 else:
                     # 可点击的一列点
                     points = np.linspace(206, 422, 3)

diff --git a/modules/AllTask/InWanted/InWanted.py b/modules/AllTask/InWanted/InWanted.py
@@ -61,7 +61,7 @@ def on_run(self) -> None:
                 if match(page_pic(PageName.PAGE_WANTED), returnpos=True)[1][1]>133:
                     # 如果右侧Title较低，说明是老版本的国服
                     logging.info("点击较低的三个定位点")
-                    points = np.linspace(271, 557, 3)
+                    points = np.linspace(265, 544, 3)
                 else:
                     # 可点击的一列点
                     points = np.linspace(206, 422, 3)
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,25 +26,11 @@ @@
         ],
         "INFO2": "悬赏通缉",
         "WANTED_HIGHEST_LEVEL": [
-            [
-                [
-,
-,
-                    -1
-                ]
-            ],
-            [
-                [
-,
-,
-                    -1
-                ]
-            ],
             [
                 [
 ,
-,
-                    -1
+,
                 ]
             ]
         ],
@@ Expand All / @@ -53,15 +39,8 @@ @@
             [
                 [
 ,
-,
-                ]
-            ],
-            [
-                [
 ,
-,
                 ]
             ]
         ],
@@ Expand Down Expand Up / @@ -208,7 +187,7 @@ @@
         "SHOP_CONTEST": [],
         "TASK_ACTIVATE": [
             true,
-            true,
+            false,
             true,
             true,
             true,
@@ Expand Down @@