huangrunheng 2 лет назад
Родитель
Сommit
03b09503a5

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_battle.png


BIN
tasks/ActivityShikigami/as/as_fire.png


BIN
tasks/ActivityShikigami/as/as_lock.png


BIN
tasks/ActivityShikigami/as/as_shi.png


BIN
tasks/ActivityShikigami/as/as_switch.png


BIN
tasks/ActivityShikigami/as/as_unlock.png


+ 14 - 14
tasks/ActivityShikigami/as/image.json

@@ -2,8 +2,8 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "382,308,49,39",
-    "roiBack": "64,280,1029,142",
+    "roiFront": "443,307,28,39",
+    "roiBack": "64,265,1029,277",
     "method": "Template matching",
     "threshold": 0.7,
     "description": "进入活动"
@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "558,236,47,172",
-    "roiBack": "526,208,105,220",
+    "roiFront": "207,264,47,172",
+    "roiBack": "187,239,105,220",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入爬塔"
@@ -47,8 +47,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "801,652,28,28",
-    "roiBack": "801,652,28,28",
+    "roiFront": "795,656,28,28",
+    "roiBack": "795,656,28,28",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1143,575,70,79",
-    "roiBack": "1143,575,70,79",
+    "roiFront": "1132,592,70,79",
+    "roiBack": "1132,592,70,79",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1127,493,32,26",
-    "roiBack": "1127,493,32,26",
+    "roiFront": "1118,510,32,26",
+    "roiBack": "1118,510,32,26",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1129,499,27,25",
-    "roiBack": "1129,499,27,25",
+    "roiFront": "1122,515,27,25",
+    "roiBack": "1122,515,27,25",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1220,499,23,23",
-    "roiBack": "1220,499,23,23",
+    "roiFront": "1212,517,23,23",
+    "roiBack": "1212,517,23,23",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"

+ 4 - 4
tasks/ActivityShikigami/as/ocr.json

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1154,679,104,25",
-    "roiBack": "1154,679,104,25",
+    "roiFront": "1177,679,77,25",
+    "roiBack": "1177,679,77,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap_activity",
-    "roiFront": "912,25,95,30",
-    "roiBack": "912,25,95,30",
+    "roiFront": "714,26,95,30",
+    "roiBack": "714,26,95,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 9 - 9
tasks/ActivityShikigami/assets.py

@@ -44,25 +44,25 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(382,308,49,39), roi_back=(64,280,1029,142), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
+	I_SHI = RuleImage(roi_front=(443,307,28,39), roi_back=(64,265,1029,277), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
 	I_BACK_GREEN = RuleImage(roi_front=(23,27,44,44), roi_back=(23,27,44,44), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.png")
 	# 进入爬塔 
-	I_BATTLE = RuleImage(roi_front=(558,236,47,172), roi_back=(526,208,105,220), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
+	I_BATTLE = RuleImage(roi_front=(207,264,47,172), roi_back=(187,239,105,220), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.png")
 	# 归鹿之途 
 	I_DRUM = RuleImage(roi_front=(1011,114,29,31), roi_back=(1011,114,29,31), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_drum.png")
 	# 上锁图标 
 	I_LOCK = RuleImage(roi_front=(795,654,25,32), roi_back=(795,654,25,32), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_lock.png")
 	# 还未上锁图片 
-	I_UNLOCK = RuleImage(roi_front=(801,652,28,28), roi_back=(801,652,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
+	I_UNLOCK = RuleImage(roi_front=(795,656,28,28), roi_back=(795,656,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.png")
 	# 点击战斗 
-	I_FIRE = RuleImage(roi_front=(1143,575,70,79), roi_back=(1143,575,70,79), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
+	I_FIRE = RuleImage(roi_front=(1132,592,70,79), roi_back=(1132,592,70,79), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.png")
 	# 体力按钮 
-	I_AP = RuleImage(roi_front=(1127,493,32,26), roi_back=(1127,493,32,26), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
+	I_AP = RuleImage(roi_front=(1118,510,32,26), roi_back=(1118,510,32,26), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.png")
 	# 活动体力 
-	I_AP_ACTIVITY = RuleImage(roi_front=(1129,499,27,25), roi_back=(1129,499,27,25), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
+	I_AP_ACTIVITY = RuleImage(roi_front=(1122,515,27,25), roi_back=(1122,515,27,25), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.png")
 	# 切换按键 
-	I_SWITCH = RuleImage(roi_front=(1220,499,23,23), roi_back=(1220,499,23,23), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.png")
+	I_SWITCH = RuleImage(roi_front=(1212,517,23,23), roi_back=(1212,517,23,23), 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")
 	# 增加到最大 
@@ -73,9 +73,9 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1154,679,104,25), area=(1154,679,104,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1177,679,77,25), area=(1177,679,77,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(912,25,95,30), area=(912,25,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(714,26,95,30), area=(714,26,95,30), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
 	# 还有多少次购买体力的机会 
 	O_REMAIN_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 

+ 0 - 9
tasks/ActivityShikigami/script_task.py

@@ -108,21 +108,12 @@ class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
         从庭院到活动的爬塔界面
         :return:
         """
-        from tasks.Component.BaseActivity.config_activity import BattleMode
-        match (self.config.model.activity_shikigami.general_climb.battle_mode):
-            case BattleMode.CLASS1: target_image = self.I_BATTLE_CLASS_1
-            case BattleMode.CLASS2: target_image = self.I_BATTLE_CLASS_2
-            case BattleMode.CLASS3: target_image = self.I_BATTLE_CLASS_3
-            case BattleMode.CLASS4: target_image = self.I_BATTLE_CLASS_4
-            case _: raise ValueError("Unknown battle mode")
 
         logger.hr("Enter Shikigami", 2)
         while 1:
             self.screenshot()
             if self.appear(self.I_FIRE):
                 break
-            if self.appear_then_click(target_image, interval=2):
-                continue
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
             if self.appear_then_click(self.I_DRUM, interval=1):

+ 1 - 9
tasks/Component/BaseActivity/config_activity.py

@@ -13,13 +13,6 @@ class ApMode(str, Enum):
     AP_ACTIVITY = 'ap_activity'
     AP_GAME = 'ap_game'
 
-class BattleMode(str, Enum):
-    CLASS1 = '活动室'
-    CLASS2 = '战术厅'
-    CLASS3 = '船员室'
-    CLASS4 = '黄金阁'
-
-
 
 class GeneralClimb(ConfigBase):
     # 限制执行的时间
@@ -35,7 +28,6 @@ class GeneralClimb(ConfigBase):
     # 如果挂完的活动的体力,是不是需要挂游戏的体力
     # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
     activity_toggle: bool = Field(default=False, description='activity_toggle_help')
-    battle_mode: BattleMode = Field(default=BattleMode.CLASS1, description='battle_mode_help')
 
     @validator('limit_time', pre=True, always=True)
     def parse_limit_time(cls, value):
@@ -58,7 +50,7 @@ class GeneralClimb(ConfigBase):
 
     @validator('ap_game_max', pre=True, always=True)
     def reset_game_max(cls, value):
-        def_value = int(1800)
+        def_value = int(300)
         if isinstance(value, str):
             try:
                 return int(value)