ryland 2 лет назад
Родитель
Сommit
ed5f69a34d

BIN
tasks/ActivityShikigami/0110/0110_battle_check_1.png


BIN
tasks/ActivityShikigami/0110/0110_battle_check_2.png


BIN
tasks/ActivityShikigami/0110/0110_battle_check_3.png


BIN
tasks/ActivityShikigami/0110/0110_battle_check_4.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_1.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_2.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_3.png


BIN
tasks/ActivityShikigami/0110/0110_battle_class_4.png


+ 74 - 0
tasks/ActivityShikigami/0110/image.json

@@ -0,0 +1,74 @@
+[
+  {
+    "itemName": "battle_class_1",
+    "imageName": "0110_battle_class_1.png",
+    "roiFront": "126,132,124,81",
+    "roiBack": "126,132,124,81",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_class_2",
+    "imageName": "0110_battle_class_2.png",
+    "roiFront": "120,231,129,83",
+    "roiBack": "120,231,129,83",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_class_3",
+    "imageName": "0110_battle_class_3.png",
+    "roiFront": "141,331,100,89",
+    "roiBack": "141,331,100,89",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_class_4",
+    "imageName": "0110_battle_class_4.png",
+    "roiFront": "141,435,100,83",
+    "roiBack": "141,435,100,83",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_1",
+    "imageName": "0110_battle_check_1.png",
+    "roiFront": "36,643,39,41",
+    "roiBack": "36,643,39,41",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_2",
+    "imageName": "0110_battle_check_2.png",
+    "roiFront": "31,649,39,45",
+    "roiBack": "31,649,39,45",
+    "method": "Template matching",
+    "threshold": 0.7,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_3",
+    "imageName": "0110_battle_check_3.png",
+    "roiFront": "34,652,38,42",
+    "roiBack": "34,652,38,42",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "battle_check_4",
+    "imageName": "0110_battle_check_4.png",
+    "roiFront": "33,652,38,40",
+    "roiBack": "33,652,38,40",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

BIN
tasks/ActivityShikigami/as/as_ap.png


BIN
tasks/ActivityShikigami/as/as_ap_activity.png


BIN
tasks/ActivityShikigami/as/as_back_green.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


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

@@ -2,7 +2,7 @@
   {
     "itemName": "shi",
     "imageName": "as_shi.png",
-    "roiFront": "437,348,49,39",
+    "roiFront": "382,308,49,39",
     "roiBack": "64,280,1029,142",
     "method": "Template matching",
     "threshold": 0.7,
@@ -11,8 +11,8 @@
   {
     "itemName": "back_green",
     "imageName": "as_back_green.png",
-    "roiFront": "16,21,44,44",
-    "roiBack": "13,18,49,49",
+    "roiFront": "23,27,44,44",
+    "roiBack": "23,27,44,44",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "左上角返回"
@@ -20,8 +20,8 @@
   {
     "itemName": "battle",
     "imageName": "as_battle.png",
-    "roiFront": "642,173,47,172",
-    "roiBack": "618,151,105,220",
+    "roiFront": "558,236,47,172",
+    "roiBack": "526,208,105,220",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "进入爬塔"
@@ -47,8 +47,8 @@
   {
     "itemName": "unlock",
     "imageName": "as_unlock.png",
-    "roiFront": "795,656,28,28",
-    "roiBack": "795,656,28,28",
+    "roiFront": "801,652,28,28",
+    "roiBack": "801,652,28,28",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
     "itemName": "fire",
     "imageName": "as_fire.png",
-    "roiFront": "1130,575,70,79",
-    "roiBack": "1130,575,70,79",
+    "roiFront": "1143,575,70,79",
+    "roiBack": "1143,575,70,79",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
     "itemName": "ap",
     "imageName": "as_ap.png",
-    "roiFront": "1107,497,32,34",
-    "roiBack": "1107,497,32,34",
+    "roiFront": "1127,493,32,26",
+    "roiBack": "1127,493,32,26",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
-    "roiFront": "1108,498,27,31",
-    "roiBack": "1108,498,27,31",
+    "roiFront": "1129,499,27,25",
+    "roiBack": "1129,499,27,25",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
     "itemName": "switch",
     "imageName": "as_switch.png",
-    "roiFront": "1198,502,33,30",
-    "roiBack": "1198,502,33,30",
+    "roiFront": "1220,499,23,23",
+    "roiBack": "1220,499,23,23",
     "method": "Template matching",
     "threshold": 0.8,
     "description": "切换按键"

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

@@ -1,8 +1,8 @@
 [
   {
     "itemName": "remain_ap",
-    "roiFront": "1177,674,80,25",
-    "roiBack": "1177,674,80,25",
+    "roiFront": "1154,679,98,25",
+    "roiBack": "1154,679,98,25",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   {
     "itemName": "remain_ap_activity",
-    "roiFront": "707,24,106,34",
-    "roiBack": "707,24,106,34",
+    "roiFront": "912,25,95,30",
+    "roiBack": "912,25,95,30",
     "mode": "DigitCounter",
     "method": "Default",
     "keyword": "",

+ 29 - 10
tasks/ActivityShikigami/assets.py

@@ -10,6 +10,25 @@ from module.atom.list import RuleList
 class ActivityShikigamiAssets: 
 
 
+	# Image Rule Assets
+	# description 
+	I_BATTLE_CLASS_1 = RuleImage(roi_front=(126,132,124,81), roi_back=(126,132,124,81), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_1.png")
+	# description 
+	I_BATTLE_CLASS_2 = RuleImage(roi_front=(120,231,129,83), roi_back=(120,231,129,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_2.png")
+	# description 
+	I_BATTLE_CLASS_3 = RuleImage(roi_front=(141,331,100,89), roi_back=(141,331,100,89), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_3.png")
+	# description 
+	I_BATTLE_CLASS_4 = RuleImage(roi_front=(141,435,100,83), roi_back=(141,435,100,83), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_class_4.png")
+	# description 
+	I_BATTLE_CHECK_1 = RuleImage(roi_front=(36,643,39,41), roi_back=(36,643,39,41), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_1.png")
+	# description 
+	I_BATTLE_CHECK_2 = RuleImage(roi_front=(31,649,39,45), roi_back=(31,649,39,45), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_2.png")
+	# description 
+	I_BATTLE_CHECK_3 = RuleImage(roi_front=(34,652,38,42), roi_back=(34,652,38,42), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_3.png")
+	# description 
+	I_BATTLE_CHECK_4 = RuleImage(roi_front=(33,652,38,40), roi_back=(33,652,38,40), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/0110/0110_battle_check_4.png")
+
+
 	# Click Rule Assets
 	# description 
 	C_RANDOM_LEFT = RuleClick(roi_front=(21,23,290,599), roi_back=(21,23,290,599), name="random_left")
@@ -25,25 +44,25 @@ class ActivityShikigamiAssets:
 
 	# Image Rule Assets
 	# 进入活动 
-	I_SHI = RuleImage(roi_front=(437,348,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=(382,308,49,39), roi_back=(64,280,1029,142), threshold=0.7, method="Template matching", file="./tasks/ActivityShikigami/as/as_shi.png")
 	# 左上角返回 
-	I_BACK_GREEN = RuleImage(roi_front=(16,21,44,44), roi_back=(13,18,49,49), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_back_green.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=(642,173,47,172), roi_back=(618,151,105,220), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_battle.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_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=(795,656,28,28), roi_back=(795,656,28,28), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_unlock.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_FIRE = RuleImage(roi_front=(1130,575,70,79), roi_back=(1130,575,70,79), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_fire.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_AP = RuleImage(roi_front=(1107,497,32,34), roi_back=(1107,497,32,34), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap.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_ACTIVITY = RuleImage(roi_front=(1108,498,27,31), roi_back=(1108,498,27,31), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_ap_activity.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_SWITCH = RuleImage(roi_front=(1198,502,33,30), roi_back=(1198,502,33,30), threshold=0.8, method="Template matching", file="./tasks/ActivityShikigami/as/as_switch.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_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")
 	# 增加到最大 
@@ -54,9 +73,9 @@ class ActivityShikigamiAssets:
 
 	# Ocr Rule Assets
 	# 体力的数量检测 
-	O_REMAIN_AP = RuleOcr(roi=(1177,674,80,25), area=(1177,674,80,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
+	O_REMAIN_AP = RuleOcr(roi=(1154,679,98,25), area=(1154,679,98,25), mode="DigitCounter", method="Default", keyword="", name="remain_ap")
 	# 活动体力的剩余检测 
-	O_REMAIN_AP_ACTIVITY = RuleOcr(roi=(707,24,106,34), area=(707,24,106,34), mode="DigitCounter", method="Default", keyword="", name="remain_ap_activity")
+	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_BUY = RuleOcr(roi=(808,531,39,42), area=(808,531,39,42), mode="DigitCounter", method="Default", keyword="", name="remain_buy")
 

+ 16 - 1
tasks/ActivityShikigami/script_task.py

@@ -10,11 +10,14 @@ from tasks.AreaBoss.assets import AreaBossAssets
 from tasks.Component.BaseActivity.base_activity import BaseActivity
 from tasks.Component.BaseActivity.config_activity import ApMode
 from tasks.ActivityShikigami.assets import ActivityShikigamiAssets
+from tasks.GameUi.page import page_main
+from tasks.GameUi.game_ui import GameUi
+
 from module.logger import logger
 from module.exception import TaskEnd
 
 
-class ScriptTask(BaseActivity, ActivityShikigamiAssets):
+class ScriptTask(GameUi, BaseActivity, ActivityShikigamiAssets):
 
     def run(self) -> None:
 
@@ -25,6 +28,8 @@ class ScriptTask(BaseActivity, ActivityShikigamiAssets):
                                         seconds=self.limit_time.second)
         self.limit_count = config.general_climb.limit_count
 
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
         self.home_main()
 
         # 设定是否锁定阵容
@@ -103,11 +108,21 @@ class ScriptTask(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):

+ 10 - 2
tasks/Component/BaseActivity/config_activity.py

@@ -13,6 +13,13 @@ class ApMode(str, Enum):
     AP_ACTIVITY = 'ap_activity'
     AP_GAME = 'ap_game'
 
+class BattleMode(str, Enum):
+    CLASS1 = '活动室'
+    CLASS2 = '战术厅'
+    CLASS3 = '船员室'
+    CLASS4 = '黄金阁'
+
+
 
 class GeneralClimb(ConfigBase):
     # 限制执行的时间
@@ -20,7 +27,7 @@ class GeneralClimb(ConfigBase):
     # 限制执行的次数
     limit_count: int = Field(default=50, description='limit_count_help')
     # 每日使用体力挑战的最大次数,默认是300
-    ap_game_max: int = Field(default=300, description='ap_game_max_help')
+    ap_game_max: int = Field(default=1800, description='ap_game_max_help')
     # 爬塔活动挂活动的体力还是游戏的体力
     ap_mode: ApMode = Field(default=ApMode.AP_ACTIVITY, description='ap_mode_help')
     # 游戏体力不足是否需要话勾玉购买
@@ -28,6 +35,7 @@ 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):
@@ -50,7 +58,7 @@ class GeneralClimb(ConfigBase):
 
     @validator('ap_game_max', pre=True, always=True)
     def reset_game_max(cls, value):
-        def_value = int(300)
+        def_value = int(1800)
         if isinstance(value, str):
             try:
                 return int(value)

+ 0 - 2
tasks/Component/GeneralInvite/assets.py

@@ -11,8 +11,6 @@ class GeneralInviteAssets:
 
 
 	# Image Rule Assets
-	# 三人御魂组队左上角的协站队伍
-	GI_IN_ROOM = RuleImage(roi_front=(92, 17, 213, 64), roi_back=(92, 17, 213, 64), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_in_room.png")
 	# 中间的邀请图片 
 	I_ADD_1 = RuleImage(roi_front=(592,288,114,51), roi_back=(592,288,114,51), threshold=0.9, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_add_1.png")
 	# 最右边的邀请