Browse Source

Merge pull request #1471 from runhey/dev

Dev
huangrunheng 8 months ago
parent
commit
984dcc0f21

+ 8 - 8
tasks/ActivityShikigami/as/click.json

@@ -1,26 +1,26 @@
 [
   {
     "itemName": "random_left",
-    "roiFront": "17,107,104,378",
-    "roiBack": "17,103,106,385",
+    "roiFront": "17,84,104,356",
+    "roiBack": "17,81,106,365",
     "description": "description"
   },
   {
     "itemName": "random_right",
-    "roiFront": "1133,110,131,408",
-    "roiBack": "1131,108,133,412",
+    "roiFront": "1133,88,131,361",
+    "roiBack": "1131,84,133,363",
     "description": "description"
   },
   {
     "itemName": "random_top",
-    "roiFront": "126,49,904,75",
-    "roiBack": "123,47,911,77",
+    "roiFront": "126,66,989,58",
+    "roiBack": "123,65,991,58",
     "description": "description"
   },
   {
     "itemName": "random_bottom",
-    "roiFront": "179,598,932,78",
-    "roiBack": "179,597,932,81",
+    "roiFront": "196,598,581,78",
+    "roiBack": "194,597,583,81",
     "description": "description"
   },
   {

+ 4 - 4
tasks/ActivityShikigami/assets.py

@@ -12,13 +12,13 @@ class ActivityShikigamiAssets:
 
 	# Click Rule Assets
 	# description 
-	C_RANDOM_LEFT = RuleClick(roi_front=(17,107,104,378), roi_back=(17,103,106,385), name="random_left")
+	C_RANDOM_LEFT = RuleClick(roi_front=(17,84,104,356), roi_back=(17,81,106,365), name="random_left")
 	# description 
-	C_RANDOM_RIGHT = RuleClick(roi_front=(1133,110,131,408), roi_back=(1131,108,133,412), name="random_right")
+	C_RANDOM_RIGHT = RuleClick(roi_front=(1133,88,131,361), roi_back=(1131,84,133,363), name="random_right")
 	# description 
-	C_RANDOM_TOP = RuleClick(roi_front=(126,49,904,75), roi_back=(123,47,911,77), name="random_top")
+	C_RANDOM_TOP = RuleClick(roi_front=(126,66,989,58), roi_back=(123,65,991,58), name="random_top")
 	# description 
-	C_RANDOM_BOTTOM = RuleClick(roi_front=(179,598,932,78), roi_back=(179,597,932,81), name="random_bottom")
+	C_RANDOM_BOTTOM = RuleClick(roi_front=(196,598,581,78), roi_back=(194,597,583,81), name="random_bottom")
 	# description 
 	C_RANDOM_ALL = RuleClick(roi_front=(42,94,1207,543), roi_back=(42,94,1207,543), name="random_all")
 

+ 6 - 20
tasks/ActivityShikigami/script_task.py

@@ -251,6 +251,12 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         """
         logger.hr(f'Start run climb type BOSS')
 
+    def _run_ap100(self):
+        """
+        更新前请先看 ./README.md
+        """
+        logger.hr(f'Start run climb type AP100')
+
     def start_battle(self):
         click_times, max_times = 0, random.randint(2, 4)
         while 1:
@@ -297,31 +303,11 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             if self.appear_then_click(self.I_WIN, interval=2):
                 continue
             #  出现 “魂” 和 紫蛇皮
-<<<<<<< dev
             if self.appear(self.I_REWARD) or self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN) or \
                     self.appear(self.I_REWARD_GOLD) or self.appear(self.I_REWARD_GOLD_SNAKE_SKIN):
                 self.random_reward_click(exclude_click=[self.C_RANDOM_RIGHT])
                 ok_cnt += 1
                 continue
-=======
-            if self.appear(self.I_REWARD) or self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN):
-                logger.info('Win battle')
-                while 1:
-                    self.screenshot()
-                    # appear_reward = self.appear_then_click(self.I_REWARD)
-                    appear_reward_purple_snake_skin = self.appear(self.I_REWARD_PURPLE_SNAKE_SKIN)
-                    appear_reward = self.appear(self.I_REWARD)
-                    if appear_reward:
-                        self.click(self.I_REWARD, interval=0.9)
-                    if not appear_reward and not appear_reward_purple_snake_skin:
-                        break
-                    if appear_reward or appear_reward_purple_snake_skin:
-                        reward_click = random.choice(
-                            [self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT])
-                        self.click(reward_click, interval=1.8)
-                        continue
-                return True
->>>>>>> master
             # 已经不在战斗中了, 且奖励也识别过了, 则随机点击
             if ok_cnt > 0 and not self.is_in_battle(False):
                 self.random_reward_click(exclude_click=[self.C_RANDOM_RIGHT])