Просмотр исходного кода

perf(ActivityShikigami): Remove unused resources

ryland 10 месяцев назад
Родитель
Сommit
6a4ab0dc94

BIN
tasks/ActivityShikigami/as/as_add_max.png


BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_buy_jade.png


BIN
tasks/ActivityShikigami/as/as_switch.png


BIN
tasks/ActivityShikigami/as/as_toggle_button.png


+ 0 - 54
tasks/ActivityShikigami/as/image.json

@@ -17,60 +17,6 @@
     "threshold": 0.5,
     "description": "还未上锁图片"
   },
-  {
-    "itemName": "ap",
-    "imageName": "as_ap.png",
-    "roiFront": "1181,657,23,24",
-    "roiBack": "1149,631,103,71",
-    "method": "Template matching",
-    "threshold": 0.65,
-    "description": "寿司体力"
-  },
-  {
-    "itemName": "ap_activity",
-    "imageName": "as_ap_activity.png",
-    "roiFront": "1153,636,21,25",
-    "roiBack": "1124,621,84,54",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "活动体力"
-  },
-  {
-    "itemName": "switch",
-    "imageName": "as_switch.png",
-    "roiFront": "1241,533,23,23",
-    "roiBack": "1202,521,74,49",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "切换按键"
-  },
-  {
-    "itemName": "buy_jade",
-    "imageName": "as_buy_jade.png",
-    "roiFront": "1004,192,38,42",
-    "roiBack": "836,619,38,42",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "购买活动的体力"
-  },
-  {
-    "itemName": "add_max",
-    "imageName": "as_add_max.png",
-    "roiFront": "17,24,33,37",
-    "roiBack": "974,524,57,54",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "增加到最大"
-  },
-  {
-    "itemName": "toggle_button",
-    "imageName": "as_toggle_button.png",
-    "roiFront": "1193,463,27,25",
-    "roiBack": "1169,146,73,403",
-    "method": "Template matching",
-    "threshold": 0.8,
-    "description": "description"
-  },
   {
     "itemName": "climb_mode_pass",
     "imageName": "as_climb_mode_pass.png",

+ 0 - 12
tasks/ActivityShikigami/assets.py

@@ -28,18 +28,6 @@ class ActivityShikigamiAssets:
 	I_LOCK = RuleImage(roi_front=(825,657,28,25), roi_back=(739,613,276,85), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
 	I_UNLOCK = RuleImage(roi_front=(884,648,28,25), roi_back=(733,607,266,95), threshold=0.5, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
-	# 寿司体力 
-	I_AP = RuleImage(roi_front=(1181,657,23,24), roi_back=(1149,631,103,71), threshold=0.65, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
-	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1153,636,21,25), roi_back=(1124,621,84,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
-	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1241,533,23,23), roi_back=(1202,521,74,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
-	# 购买活动的体力 
-	I_BUY_JADE = RuleImage(roi_front=(1004,192,38,42), roi_back=(836,619,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_buy_jade.png")
-	# 增加到最大 
-	I_ADD_MAX = RuleImage(roi_front=(17,24,33,37), roi_back=(974,524,57,54), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_add_max.png")
-	# description 
-	I_TOGGLE_BUTTON = RuleImage(roi_front=(1193,463,27,25), roi_back=(1169,146,73,403), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_toggle_button.png")
 	# 活动爬塔标志 
 	I_CLIMB_MODE_PASS = RuleImage(roi_front=(1151,528,21,28), roi_back=(1118,500,62,100), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_climb_mode_pass.png")
 	# 体力爬塔标志 

+ 0 - 56
tasks/ActivityShikigami/script_task.py

@@ -194,54 +194,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
                 continue
             if self.ui_reward_appear_click():
                 continue
-            # 击败魇兽将直接前往下一层
-            # if self.appear(self.I_PASS12):
-            #     logger.info('Found魇兽将')
-            #     from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig as GBC1
-            #     _battle_config = GBC1(lock_team_enable=True)
-            #     _battle_config.lock_team_enable = True
-            #     self.ui_click(self.I_PASS12, stop=self.I_PASS_13)
-            #     self.ui_click_until_disappear(self.I_PASS_13, interval=1)
-            #     self.run_general_battle(config=_battle_config)
-            #     continue
-            # 领箱子
-            # if self.appear_then_click(self.I_PASS_5):
-            #     logger.info('Found箱子')
-            #     continue
-            # 印记
-            # if self.appear(self.I_PASS_6):
-            #     logger.info('Found印记')
-            #     click_index = 0
-            #     clicks = [self.I_PASS_8, self.I_PASS_10, self.I_PASS_11]
-            #     self.ui_click(self.I_PASS_6, stop=self.I_UI_BACK_RED, interval=1)
-            #     self.screenshot()
-            #     if not self.appear(self.I_UI_BACK_RED):
-            #         continue
-            #     while 1:
-            #         self.screenshot()
-            #         if self.ui_reward_appear_click():
-            #             break
-            #         if not self.appear(self.I_UI_BACK_RED):
-            #             break
-            #         # 按照顺序 间隔点击
-            #         if self.click(clicks[click_index], interval=1):
-            #             sleep(1.6)
-            #             click_index += 1
-            #             click_index = click_index % len(clicks)
-            #         if self.appear_then_click(self.I_PASS_9, interval=1.1):
-            #             logger.info('Select one done')
-            #             continue
-            # 下一层
-            # if self.appear_then_click(self.I_PASS_7, interval=1, threshold=0.65):
-            #     logger.info('Next layer')
-            #     continue
-            if click_limit_timer.reached():
-                click_limit_timer.reset()
-                if (self.appear_then_click(self.I_PASS_1)
-                        or self.appear_then_click(self.I_PASS_2)
-                        or self.appear_then_click(self.I_PASS_3)
-                        or self.appear_then_click(self.I_PASS_4)):
-                    continue
             if not ocr_limit_timer.reached():
                 continue
             ocr_limit_timer.reset()
@@ -325,7 +277,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
         for btn in (self.C_RANDOM_LEFT, self.C_RANDOM_RIGHT, self.C_RANDOM_TOP, self.C_RANDOM_BOTTOM):
             btn.name = "BATTLE_RANDOM"
         ok_cnt, max_retry = 0, 5
-        single_start_time = datetime.now()
         while 1:
             sleep(random.uniform(0.5, 1.5))
             self.screenshot()
@@ -363,13 +314,6 @@ class ScriptTask(StateMachine, GameUi, BaseActivity, SwitchSoul, ActivityShikiga
             #     self.random_reward_click(exclude_click=[self.C_RANDOM_BOTTOM])
             #     ok_cnt += 1
             #     continue
-            # # 单局到时间自动退出战斗
-            # if ok_cnt == 0 and datetime.now() - single_start_time > self.conf.general_climb.get_single_limit_time(
-            #         self.climb_type, timedelta(days=1)):
-            #     logger.attr(self.climb_type, 'Time limit arrived, close current battle')
-            #     self.exit_battle(skip_first=True)
-            #     ok_cnt += 1
-            #     continue
             # 战斗中随机滑动
             if ok_cnt == 0 and random_click_swipt_enable:
                 self.random_click_swipt()