Explorar o código

Merge remote-tracking branch 'origin/dev' into dev

ryland hai 10 meses
pai
achega
4381bf3c72

+ 4 - 1
tasks/Exploration/base.py

@@ -211,11 +211,14 @@ class BaseExploration(GameUi, GeneralBattle, GeneralRoom, GeneralInvite, Replace
             if not self.appear(self.I_E_OPEN_SETTINGS):
                 logger.warning('Opening settings failed due to now in battle')
                 return
+
+        # 先点候补式神区域,再切换稀有度,避免点击失败
+        self.click(self.C_CLICK_STANDBY_TEAM)
+
         choose_rarity = self._config.exploration_config.choose_rarity
         rarity = ShikigamiClass.N if choose_rarity == ChooseRarity.N else ShikigamiClass.MATERIAL
         self.switch_shikigami_class(rarity)
 
-        self.click(self.C_CLICK_STANDBY_TEAM)
         # 移动至未候补的狗粮
         while 1:
             # 慢一点

+ 3 - 3
tasks/RichMan/assets.py

@@ -177,15 +177,15 @@ class RichManAssets:
 	# 特殊 
 	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
 	# 特殊 
-	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(102,7,42,42), roi_back=(102,7,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
+	I_SIDE_CHECK_SPECIAL = RuleImage(roi_front=(215,7,42,42), roi_back=(215,7,42,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_special.png")
 	# 荣誉 
 	I_SIDE_SUER_HONOR = RuleImage(roi_front=(1180,191,59,60), roi_back=(1150,159,103,132), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.png")
 	# 荣誉 
-	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(694,12,41,42), roi_back=(694,12,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
+	I_SIDE_CHECK_HONOR = RuleImage(roi_front=(752,11,41,42), roi_back=(752,11,41,42), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_honor.png")
 	# 友情点 
 	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1190,287,43,52), roi_back=(1163,258,93,126), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
 	# 友情点 
-	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(890,8,39,43), roi_back=(890,8,39,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
+	I_SIDE_CHECK_FRIENDS = RuleImage(roi_front=(925,8,39,43), roi_back=(9,8,1266,43), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_friends.png")
 	# 勋章 
 	I_SIDE_SURE_MEDAL = RuleImage(roi_front=(1190,404,39,62), roi_back=(1156,352,112,128), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
 	# 勋章 

+ 6 - 6
tasks/RichMan/mall/navbar/image_side.json

@@ -11,8 +11,8 @@
   {
     "itemName": "side_check_special",
     "imageName": "navbar_side_check_special.png",
-    "roiFront": "102,7,42,42",
-    "roiBack": "102,7,42,42",
+    "roiFront": "215,7,42,42",
+    "roiBack": "215,7,42,42",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "特殊"
@@ -29,8 +29,8 @@
   {
     "itemName": "side_check_honor",
     "imageName": "navbar_side_check_honor.png",
-    "roiFront": "694,12,41,42",
-    "roiBack": "694,12,41,42",
+    "roiFront": "752,11,41,42",
+    "roiBack": "752,11,41,42",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "荣誉"
@@ -47,8 +47,8 @@
   {
     "itemName": "side_check_friends",
     "imageName": "navbar_side_check_friends.png",
-    "roiFront": "890,8,39,43",
-    "roiBack": "890,8,39,43",
+    "roiFront": "925,8,39,43",
+    "roiBack": "9,8,1266,43",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "友情点"

BIN=BIN
tasks/RichMan/mall/navbar/navbar_mall_sccales.png


BIN=BIN
tasks/RichMan/mall/navbar/navbar_mall_sundry.png


BIN=BIN
tasks/RichMan/mall/navbar/navbar_mall_sundry_check.png


BIN=BIN
tasks/RichMan/mall/navbar/navbar_side_check_friends.png


BIN=BIN
tasks/RichMan/mall/navbar/navbar_side_check_honor.png


BIN=BIN
tasks/RichMan/mall/navbar/navbar_side_check_special.png


+ 1 - 1
tasks/WantedQuests/script_task.py

@@ -438,7 +438,7 @@ class ScriptTask(WQExplore, SecretScriptTask, WantedQuestsAssets):
                 break
             if self.appear_then_click(self.I_UI_BACK_RED, interval=1):
                 continue
-            if self.appear_then_click(self.I_UI_BACK_YELLOW, interval=1.5):
+            if self.appear_then_click(self.I_UI_BACK_BLUE, interval=1.5):
                 continue
         logger.info('Secret mission finished')