Browse Source

Merge branch 'runhey:dev' into dev

yuyuyuyuyu 9 months ago
parent
commit
22e4fead50

+ 2 - 2
tasks/GameUi/assets.py

@@ -144,9 +144,9 @@ class GameUiAssets:
 	# description 
 	# description 
 	I_MAIN_GOTO_FRIENDS = RuleImage(roi_front=(845,590,55,55), roi_back=(845,590,120,100), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_main_goto_friends.png")
 	I_MAIN_GOTO_FRIENDS = RuleImage(roi_front=(845,590,55,55), roi_back=(845,590,120,100), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_main_goto_friends.png")
 	# 进入花合战 
 	# 进入花合战 
-	I_MAIN_GOTO_DAILY = RuleImage(roi_front=(735,590,50,32), roi_back=(735,590,120,100), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_main_goto_daily.png")
+	I_MAIN_GOTO_DAILY = RuleImage(roi_front=(765,616,63,38), roi_back=(735,590,120,100), threshold=0.6, method="Template matching", file="./tasks/GameUi/page/page_main_goto_daily.png")
 	# description 
 	# description 
-	I_MAIN_GOTO_MALL = RuleImage(roi_front=(620,590,33,35), roi_back=(620,590,120,100), threshold=0.5, method="Template matching", file="./tasks/GameUi/page/page_main_goto_mall.png")
+	I_MAIN_GOTO_MALL = RuleImage(roi_front=(663,623,33,42), roi_back=(620,590,120,100), threshold=0.5, method="Template matching", file="./tasks/GameUi/page/page_main_goto_mall.png")
 	# description 
 	# description 
 	I_MAIN_GOTO_GUILD = RuleImage(roi_front=(495,590,50,22), roi_back=(495,590,120,100), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_main_goto_guild.png")
 	I_MAIN_GOTO_GUILD = RuleImage(roi_front=(495,590,50,22), roi_back=(495,590,120,100), threshold=0.7, method="Template matching", file="./tasks/GameUi/page/page_main_goto_guild.png")
 	# description 
 	# description 

+ 3 - 3
tasks/GameUi/page/page_img_3.json

@@ -29,16 +29,16 @@
   {
   {
     "itemName": "main_goto_daily",
     "itemName": "main_goto_daily",
     "imageName": "page_main_goto_daily.png",
     "imageName": "page_main_goto_daily.png",
-    "roiFront": "735,590,50,32",
+    "roiFront": "765,616,63,38",
     "roiBack": "735,590,120,100",
     "roiBack": "735,590,120,100",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.7,
+    "threshold": 0.6,
     "description": "进入花合战"
     "description": "进入花合战"
   },
   },
   {
   {
     "itemName": "main_goto_mall",
     "itemName": "main_goto_mall",
     "imageName": "page_main_goto_mall.png",
     "imageName": "page_main_goto_mall.png",
-    "roiFront": "620,590,33,35",
+    "roiFront": "663,623,33,42",
     "roiBack": "620,590,120,100",
     "roiBack": "620,590,120,100",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.5,
     "threshold": 0.5,

BIN
tasks/GameUi/page/page_main_goto_daily.png


+ 1 - 1
tasks/Restart/login.py

@@ -45,7 +45,7 @@ class LoginHandler(BaseTask, RestartAssets, GameUiAssets):
                 continue
                 continue
             # 确认进入庭院(优化:当出现闲庭图片时,点击卷轴关闭区域,然后判断式神录按钮出现就代表登录成功)
             # 确认进入庭院(优化:当出现闲庭图片时,点击卷轴关闭区域,然后判断式神录按钮出现就代表登录成功)
             if self.appear(self.I_LOGIN_COURTYARD, interval=0.2):
             if self.appear(self.I_LOGIN_COURTYARD, interval=0.2):
-                if self.click(self.C_LOGIN_SCROOLL_CLOSE_AREA, interval=2):
+                if self.click(self.C_LOGIN_SCROLL_CLOSE_AREA, interval=2):
                     logger.info('Click scroll close area because courtyard appears')
                     logger.info('Click scroll close area because courtyard appears')
                     self.screenshot()  # 点击后立即获取最新截图,确保后续状态检查准确
                     self.screenshot()  # 点击后立即获取最新截图,确保后续状态检查准确
                     continue
                     continue