Jelajahi Sumber

Merge pull request #190 from runhey/dev

Dev
huangrunheng 2 tahun lalu
induk
melakukan
f4e18a8544
52 mengubah file dengan 209 tambahan dan 108 penghapusan
  1. 2 2
      dev_tools/assets_test.py
  2. 1 1
      module/ocr/sub_ocr.py
  3. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_ap.png
  4. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_ap_activity.png
  5. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_battle.png
  6. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_fire.png
  7. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_lock.png
  8. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_shi.png
  9. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_switch.png
  10. TEMPAT SAMPAH
      tasks/ActivityShikigami/as/as_unlock.png
  11. 14 14
      tasks/ActivityShikigami/as/image.json
  12. 4 4
      tasks/ActivityShikigami/as/ocr.json
  13. 9 9
      tasks/ActivityShikigami/assets.py
  14. 0 9
      tasks/ActivityShikigami/script_task.py
  15. 1 9
      tasks/Component/BaseActivity/config_activity.py
  16. 8 1
      tasks/Component/Costume/costume_base.py
  17. 10 3
      tasks/Component/Costume/costume_test_realm.py
  18. 30 0
      tasks/Component/CostumeRealm/README.md
  19. 13 0
      tasks/Component/CostumeRealm/assets.py
  20. 47 0
      tasks/Component/CostumeRealm/realm2/image.json
  21. TEMPAT SAMPAH
      tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png
  22. TEMPAT SAMPAH
      tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png
  23. TEMPAT SAMPAH
      tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png
  24. TEMPAT SAMPAH
      tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png
  25. TEMPAT SAMPAH
      tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png
  26. 1 1
      tasks/Component/GeneralBattle/general_battle.py
  27. 2 0
      tasks/GlobalGame/assets.py
  28. TEMPAT SAMPAH
      tasks/GlobalGame/gg/gg_chat_close_button.png
  29. 9 0
      tasks/GlobalGame/gg/image.json
  30. 2 2
      tasks/KekkaiActivation/assets.py
  31. 2 2
      tasks/KekkaiActivation/cards/image.json
  32. 1 1
      tasks/Restart/assets.py
  33. 3 3
      tasks/Restart/login/image.json
  34. TEMPAT SAMPAH
      tasks/Restart/login/login_login_scrooll_close.png
  35. 1 1
      tasks/Restart/script_task.py
  36. 13 13
      tasks/RichMan/assets.py
  37. TEMPAT SAMPAH
      tasks/RichMan/mall/consignment/consignment_con_enter_check.png
  38. 2 2
      tasks/RichMan/mall/consignment/image.json
  39. 2 2
      tasks/RichMan/mall/navbar/image_bottom.json
  40. 18 18
      tasks/RichMan/mall/navbar/image_side.json
  41. TEMPAT SAMPAH
      tasks/RichMan/mall/navbar/navbar_mall_consignment_check.png
  42. TEMPAT SAMPAH
      tasks/RichMan/mall/navbar/navbar_side_suer_honor.png
  43. TEMPAT SAMPAH
      tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png
  44. TEMPAT SAMPAH
      tasks/RichMan/mall/navbar/navbar_side_sure_friends.png
  45. TEMPAT SAMPAH
      tasks/RichMan/mall/navbar/navbar_side_sure_medal.png
  46. 1 1
      tasks/RichMan/mall/special/image.json
  47. TEMPAT SAMPAH
      tasks/RichMan/mall/special/special_sp_swipe_check.png
  48. 3 2
      tasks/RichMan/script_task.py
  49. 0 1
      tasks/Script/config_optimization.py
  50. 3 1
      tasks/Secret/script_task.py
  51. 4 4
      tasks/WantedQuests/script_task.py
  52. 3 2
      tasks/base_task.py

+ 2 - 2
dev_tools/assets_test.py

@@ -32,10 +32,10 @@ def detect_ocr(file: str, target: RuleOcr):
 
 
 
 
 # 图片文件路径 可以是相对路径
 # 图片文件路径 可以是相对路径
-IMAGE_FILE = './log/screenshots/1706857943173.png'
+IMAGE_FILE = './log/error/1707301227880/error1707301227880.png'
 if __name__ == '__main__':
 if __name__ == '__main__':
     from tasks.KekkaiActivation.assets import KekkaiActivationAssets
     from tasks.KekkaiActivation.assets import KekkaiActivationAssets
-    targe = KekkaiActivationAssets.I_CARDS_KAIKO_6
+    targe = KekkaiActivationAssets.I_CARDS_KAIKO_5
     print(detect_image(IMAGE_FILE, targe))
     print(detect_image(IMAGE_FILE, targe))
     # from tasks.KekkaiActivation.assets import KekkaiActivationAssets
     # from tasks.KekkaiActivation.assets import KekkaiActivationAssets
     # target = KekkaiActivationAssets.O_CARD_ALL_TIME
     # target = KekkaiActivationAssets.O_CARD_ALL_TIME

+ 1 - 1
module/ocr/sub_ocr.py

@@ -158,7 +158,7 @@ class Duration(Single):
     def after_process(self, result):
     def after_process(self, result):
         result = result.replace('I', '1').replace('D', '0').replace('S', '5')
         result = result.replace('I', '1').replace('D', '0').replace('S', '5')
         result = result.replace('o', '0').replace('l', '1').replace('O', '0')
         result = result.replace('o', '0').replace('l', '1').replace('O', '0')
-        result = result.replace('B', '8').replace(':', ':').replace(' ', '')
+        result = result.replace('B', '8').replace(':', ':').replace(' ', '').replace('.', ':')
         result = super().after_process(result)
         result = super().after_process(result)
         return result
         return result
 
 

TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_ap.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_ap_activity.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_battle.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_fire.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_lock.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_shi.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_switch.png


TEMPAT SAMPAH
tasks/ActivityShikigami/as/as_unlock.png


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

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "shi",
     "itemName": "shi",
     "imageName": "as_shi.png",
     "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",
     "method": "Template matching",
     "threshold": 0.7,
     "threshold": 0.7,
     "description": "进入活动"
     "description": "进入活动"
@@ -20,8 +20,8 @@
   {
   {
     "itemName": "battle",
     "itemName": "battle",
     "imageName": "as_battle.png",
     "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",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入爬塔"
     "description": "进入爬塔"
@@ -47,8 +47,8 @@
   {
   {
     "itemName": "unlock",
     "itemName": "unlock",
     "imageName": "as_unlock.png",
     "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",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "还未上锁图片"
     "description": "还未上锁图片"
@@ -56,8 +56,8 @@
   {
   {
     "itemName": "fire",
     "itemName": "fire",
     "imageName": "as_fire.png",
     "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",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "点击战斗"
     "description": "点击战斗"
@@ -65,8 +65,8 @@
   {
   {
     "itemName": "ap",
     "itemName": "ap",
     "imageName": "as_ap.png",
     "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",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "体力按钮"
     "description": "体力按钮"
@@ -74,8 +74,8 @@
   {
   {
     "itemName": "ap_activity",
     "itemName": "ap_activity",
     "imageName": "as_ap_activity.png",
     "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",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "活动体力"
     "description": "活动体力"
@@ -83,8 +83,8 @@
   {
   {
     "itemName": "switch",
     "itemName": "switch",
     "imageName": "as_switch.png",
     "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",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "切换按键"
     "description": "切换按键"

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

@@ -1,8 +1,8 @@
 [
 [
   {
   {
     "itemName": "remain_ap",
     "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",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",
@@ -10,8 +10,8 @@
   },
   },
   {
   {
     "itemName": "remain_ap_activity",
     "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",
     "mode": "DigitCounter",
     "method": "Default",
     "method": "Default",
     "keyword": "",
     "keyword": "",

+ 9 - 9
tasks/ActivityShikigami/assets.py

@@ -44,25 +44,25 @@ class ActivityShikigamiAssets:
 
 
 	# Image Rule Assets
 	# 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_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_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_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")
 	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
 	# 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")
 	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:
         :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)
         logger.hr("Enter Shikigami", 2)
         while 1:
         while 1:
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_FIRE):
             if self.appear(self.I_FIRE):
                 break
                 break
-            if self.appear_then_click(target_image, interval=2):
-                continue
             if self.appear_then_click(self.I_SHI, interval=1):
             if self.appear_then_click(self.I_SHI, interval=1):
                 continue
                 continue
             if self.appear_then_click(self.I_DRUM, interval=1):
             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_ACTIVITY = 'ap_activity'
     AP_GAME = 'ap_game'
     AP_GAME = 'ap_game'
 
 
-class BattleMode(str, Enum):
-    CLASS1 = '活动室'
-    CLASS2 = '战术厅'
-    CLASS3 = '船员室'
-    CLASS4 = '黄金阁'
-
-
 
 
 class GeneralClimb(ConfigBase):
 class GeneralClimb(ConfigBase):
     # 限制执行的时间
     # 限制执行的时间
@@ -35,7 +28,6 @@ class GeneralClimb(ConfigBase):
     # 如果挂完的活动的体力,是不是需要挂游戏的体力
     # 如果挂完的活动的体力,是不是需要挂游戏的体力
     # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
     # 在我的设计理念中:活动体力>游戏体力。所以不提供从300挂满然后才到挂活动币
     activity_toggle: bool = Field(default=False, description='activity_toggle_help')
     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)
     @validator('limit_time', pre=True, always=True)
     def parse_limit_time(cls, value):
     def parse_limit_time(cls, value):
@@ -58,7 +50,7 @@ class GeneralClimb(ConfigBase):
 
 
     @validator('ap_game_max', pre=True, always=True)
     @validator('ap_game_max', pre=True, always=True)
     def reset_game_max(cls, value):
     def reset_game_max(cls, value):
-        def_value = int(1800)
+        def_value = int(300)
         if isinstance(value, str):
         if isinstance(value, str):
             try:
             try:
                 return int(value)
                 return int(value)

+ 8 - 1
tasks/Component/Costume/costume_base.py

@@ -57,11 +57,18 @@ main_costume_model = {
 realm_costume_model = {
 realm_costume_model = {
     RealmType.COSTUME_REALM_1: {'I_SHI_CARD': 'I_SHI_CARD_1',
     RealmType.COSTUME_REALM_1: {'I_SHI_CARD': 'I_SHI_CARD_1',
                                 'I_SHI_DEFENSE': 'I_SHI_DEFENSE_1',},
                                 'I_SHI_DEFENSE': 'I_SHI_DEFENSE_1',},
+    RealmType.COSTUME_REALM_2: {'I_SHI_CARD': 'I_SHI_CARD_2',
+                                'I_SHI_DEFENSE': 'I_SHI_DEFENSE_2',
+                                'I_SHI_GROWN': 'I_SHI_GROWN_2',
+                                'I_BOX_AP': 'I_BOX_AP_2',
+                                'I_BOX_EXP': 'I_BOX_EXP_2'},
 }
 }
 
 
 class CostumeBase:
 class CostumeBase:
 
 
-    def check_costume(self, config: CostumeConfig):
+    def check_costume(self, config: CostumeConfig=None):
+        if config is None:
+            config: CostumeConfig = self.config.model.global_game.costume_config
         self.check_costume_main(config.costume_main_type)
         self.check_costume_main(config.costume_main_type)
         self.check_costume_realm(config.costume_realm_type)
         self.check_costume_realm(config.costume_realm_type)
 
 

+ 10 - 3
tasks/Component/Costume/costume_test_realm.py

@@ -7,6 +7,7 @@ from module.logger import logger
 from module.base.timer import Timer
 from module.base.timer import Timer
 
 
 from tasks.KekkaiActivation.script_task import ScriptTask as KekkaiActivationScriptTask
 from tasks.KekkaiActivation.script_task import ScriptTask as KekkaiActivationScriptTask
+from tasks.Component.Costume.config import RealmType
 
 
 class ScriptTask(KekkaiActivationScriptTask):
 class ScriptTask(KekkaiActivationScriptTask):
 
 
@@ -42,12 +43,17 @@ class ScriptTask(KekkaiActivationScriptTask):
                 logger.info('Five seconds test over')
                 logger.info('Five seconds test over')
                 break
                 break
 
 
-        logger.info('--------------------------------------------------------')
-        logger.info('%-20s   %s' % ('Image', 'Count'))
+        print('--------------------------------------------------------')
+        print('%-20s   %s' % ('Image', 'Count'))
         for i in images_count:
         for i in images_count:
-            logger.info('%-20s %3d times' % (i[0], i[1]))
+            print('%-20s %3d times' % (i[0], i[1]))
         logger.info('Test Done')
         logger.info('Test Done')
 
 
+    def set_costume(self, costume: RealmType=RealmType.COSTUME_REALM_DEFAULT):
+        self.config.model.global_game.costume_config.costume_realm_type = costume
+        self.check_costume()
+        logger.info('Set costume to %s' % self.config.model.global_game.costume_config.costume_realm_type)
+
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
@@ -56,6 +62,7 @@ if __name__ == '__main__':
     c = Config('oas1')
     c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
+    t.set_costume(RealmType.COSTUME_REALM_2)
     t.run()
     t.run()
 
 
 
 

+ 30 - 0
tasks/Component/CostumeRealm/README.md

@@ -0,0 +1,30 @@
+
+用于存放测试结果,但是这样也不是办法
+### 1
+```
+Image                  Count
+REALM_SHI_GROWN        4 times
+REALM1_SHI_CARD_1      5 times
+REALM1_SHI_DEFENSE_1   5 times
+REALM_REALM_SHIN       5 times
+REALM_CARD_EXP         5 times
+REALM_BOX_AP           5 times
+REALM_BOX_EXP          5 times
+REALM_BOX_EXP_MAX      0 times
+REALM_UTILIZE_EXP      0 times
+```
+
+### 2
+```
+Image                  Count
+REALM2_SHI_GROWN_2     4 times
+REALM2_SHI_CARD_2      5 times
+REALM2_SHI_DEFENSE_2   5 times
+REALM_REALM_SHIN       5 times
+REALM_CARD_EXP         5 times
+REALM2_BOX_AP_2        5 times
+REALM2_BOX_EXP_2       5 times
+REALM_BOX_EXP_MAX      0 times
+REALM_UTILIZE_EXP      0 times
+```
+

+ 13 - 0
tasks/Component/CostumeRealm/assets.py

@@ -17,3 +17,16 @@ class CostumeRealmAssets:
 	I_SHI_DEFENSE_1 = RuleImage(roi_front=(308,294,35,100), roi_back=(197,241,247,207), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png")
 	I_SHI_DEFENSE_1 = RuleImage(roi_front=(308,294,35,100), roi_back=(197,241,247,207), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm1/realm1_shi_defense_1.png")
 
 
 
 
+	# Image Rule Assets
+	# description 
+	I_SHI_GROWN_2 = RuleImage(roi_front=(663,344,36,68), roi_back=(598,280,159,186), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png")
+	# description 
+	I_SHI_CARD_2 = RuleImage(roi_front=(934,351,36,43), roi_back=(903,318,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png")
+	# description 
+	I_SHI_DEFENSE_2 = RuleImage(roi_front=(369,365,33,100), roi_back=(285,315,178,188), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png")
+	# description 
+	I_BOX_AP_2 = RuleImage(roi_front=(925,448,50,54), roi_back=(852,377,154,160), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png")
+	# description 
+	I_BOX_EXP_2 = RuleImage(roi_front=(991,448,41,59), roi_back=(921,372,155,173), threshold=0.8, method="Template matching", file="./tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png")
+
+

+ 47 - 0
tasks/Component/CostumeRealm/realm2/image.json

@@ -0,0 +1,47 @@
+[
+  {
+    "itemName": "shi_grown_2",
+    "imageName": "realm2_shi_grown_2.png",
+    "roiFront": "663,344,36,68",
+    "roiBack": "598,280,159,186",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "shi_card_2",
+    "imageName": "realm2_shi_card_2.png",
+    "roiFront": "934,351,36,43",
+    "roiBack": "903,318,100,100",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "shi_defense_2",
+    "imageName": "realm2_shi_defense_2.png",
+    "roiFront": "369,365,33,100",
+    "roiBack": "285,315,178,188",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "box_ap_2",
+    "imageName": "realm2_box_ap_2.png",
+    "roiFront": "925,448,50,54",
+    "roiBack": "852,377,154,160",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  },
+  {
+    "itemName": "box_exp_2",
+    "imageName": "realm2_box_exp_2.png",
+    "roiFront": "991,448,41,59",
+    "roiBack": "921,372,155,173",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
+  }
+]

TEMPAT SAMPAH
tasks/Component/CostumeRealm/realm2/realm2_box_ap_2.png


TEMPAT SAMPAH
tasks/Component/CostumeRealm/realm2/realm2_box_exp_2.png


TEMPAT SAMPAH
tasks/Component/CostumeRealm/realm2/realm2_shi_card_2.png


TEMPAT SAMPAH
tasks/Component/CostumeRealm/realm2/realm2_shi_defense_2.png


TEMPAT SAMPAH
tasks/Component/CostumeRealm/realm2/realm2_shi_grown_2.png


+ 1 - 1
tasks/Component/GeneralBattle/general_battle.py

@@ -452,7 +452,7 @@ class GeneralBattle(GeneralBuff, GeneralBattleAssets):
         if not buff:
         if not buff:
             return
             return
         logger.info(f'Open buff {buff}')
         logger.info(f'Open buff {buff}')
-        self.ui_click(self.I_BUFF, self.I_CLOUD)
+        self.ui_click(self.I_BUFF, self.I_CLOUD, interval=2)
         if isinstance(buff, BuffClass):
         if isinstance(buff, BuffClass):
             buff = [buff]
             buff = [buff]
         match_method = {
         match_method = {

+ 2 - 0
tasks/GlobalGame/assets.py

@@ -23,6 +23,8 @@ class GlobalGameAssets:
 	I_NETWORK_ERROR = RuleImage(roi_front=(431,253,416,208), roi_back=(431,253,416,208), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_network_error.png")
 	I_NETWORK_ERROR = RuleImage(roi_front=(431,253,416,208), roi_back=(431,253,416,208), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_network_error.png")
 	# 我还没有碰到这个情况没能截图 
 	# 我还没有碰到这个情况没能截图 
 	I_CLIENT_CLEAR = RuleImage(roi_front=(578,369,151,72), roi_back=(578,369,151,72), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_client_clear.png")
 	I_CLIENT_CLEAR = RuleImage(roi_front=(578,369,151,72), roi_back=(578,369,151,72), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_client_clear.png")
+	# description 
+	I_CHAT_CLOSE_BUTTON = RuleImage(roi_front=(632,343,49,103), roi_back=(632,343,49,103), threshold=0.8, method="Template matching", file="./tasks/GlobalGame/gg/gg_chat_close_button.png")
 
 
 
 
 	# Click Rule Assets
 	# Click Rule Assets

TEMPAT SAMPAH
tasks/GlobalGame/gg/gg_chat_close_button.png


+ 9 - 0
tasks/GlobalGame/gg/image.json

@@ -52,5 +52,14 @@
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "我还没有碰到这个情况没能截图"
     "description": "我还没有碰到这个情况没能截图"
+  },
+  {
+    "itemName": "chat_close_button",
+    "imageName": "gg_chat_close_button.png",
+    "roiFront": "632,343,49,103",
+    "roiBack": "632,343,49,103",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
   }
 ]
 ]

+ 2 - 2
tasks/KekkaiActivation/assets.py

@@ -80,9 +80,9 @@ class KekkaiActivationAssets:
 	# description 
 	# description 
 	I_CARDS_KAIKO_6 = RuleImage(roi_front=(193,192,89,73), roi_back=(169,148,130,501), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_6.png")
 	I_CARDS_KAIKO_6 = RuleImage(roi_front=(193,192,89,73), roi_back=(169,148,130,501), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_6.png")
 	# description 
 	# description 
-	I_CARDS_KAIKO_5 = RuleImage(roi_front=(191,345,88,58), roi_back=(172,162,126,488), threshold=0.9, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_5.png")
+	I_CARDS_KAIKO_5 = RuleImage(roi_front=(191,345,88,58), roi_back=(172,162,126,488), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_5.png")
 	# description 
 	# description 
-	I_CARDS_KAIKO_4 = RuleImage(roi_front=(192,354,90,22), roi_back=(179,165,116,482), threshold=0.9, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_4.png")
+	I_CARDS_KAIKO_4 = RuleImage(roi_front=(192,354,90,22), roi_back=(179,165,116,482), threshold=0.85, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_4.png")
 	# description 
 	# description 
 	I_CARDS_KAIKO_3 = RuleImage(roi_front=(192,187,89,66), roi_back=(183,169,109,474), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_3.png")
 	I_CARDS_KAIKO_3 = RuleImage(roi_front=(192,187,89,66), roi_back=(183,169,109,474), threshold=0.8, method="Template matching", file="./tasks/KekkaiActivation/cards/cards_cards_kaiko_3.png")
 	# description 
 	# description 

+ 2 - 2
tasks/KekkaiActivation/cards/image.json

@@ -14,7 +14,7 @@
     "roiFront": "191,345,88,58",
     "roiFront": "191,345,88,58",
     "roiBack": "172,162,126,488",
     "roiBack": "172,162,126,488",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.9,
+    "threshold": 0.8,
     "description": "description"
     "description": "description"
   },
   },
   {
   {
@@ -23,7 +23,7 @@
     "roiFront": "192,354,90,22",
     "roiFront": "192,354,90,22",
     "roiBack": "179,165,116,482",
     "roiBack": "179,165,116,482",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.9,
+    "threshold": 0.85,
     "description": "description"
     "description": "description"
   },
   },
   {
   {

+ 1 - 1
tasks/Restart/assets.py

@@ -45,7 +45,7 @@ class RestartAssets:
 	# 庭院卷轴打开 
 	# 庭院卷轴打开 
 	I_LOGIN_SCROOLL_OPEN = RuleImage(roi_front=(1208,609,33,83), roi_back=(1208,609,33,83), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_open.png")
 	I_LOGIN_SCROOLL_OPEN = RuleImage(roi_front=(1208,609,33,83), roi_back=(1208,609,33,83), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_open.png")
 	# 庭院卷轴关闭 
 	# 庭院卷轴关闭 
-	I_LOGIN_SCROOLL_CLOSE = RuleImage(roi_front=(1184,628,35,45), roi_back=(1184,628,35,45), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_close.png")
+	I_LOGIN_SCROOLL_CLOSE = RuleImage(roi_front=(1181,634,28,39), roi_back=(1162,595,77,112), threshold=0.7, method="Template matching", file="./tasks/Restart/login/login_login_scrooll_close.png")
 	# description 
 	# description 
 	I_LOGIN_RED_CLOSE = RuleImage(roi_front=(1158,62,39,37), roi_back=(912,42,309,281), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_red_close.png")
 	I_LOGIN_RED_CLOSE = RuleImage(roi_front=(1158,62,39,37), roi_back=(912,42,309,281), threshold=0.8, method="Template matching", file="./tasks/Restart/login/login_login_red_close.png")
 	# description 
 	# description 

+ 3 - 3
tasks/Restart/login/image.json

@@ -11,10 +11,10 @@
   {
   {
     "itemName": "login_scrooll_close",
     "itemName": "login_scrooll_close",
     "imageName": "login_login_scrooll_close.png",
     "imageName": "login_login_scrooll_close.png",
-    "roiFront": "1184,628,35,45",
-    "roiBack": "1184,628,35,45",
+    "roiFront": "1181,634,28,39",
+    "roiBack": "1162,595,77,112",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "庭院卷轴关闭"
     "description": "庭院卷轴关闭"
   },
   },
   {
   {

TEMPAT SAMPAH
tasks/Restart/login/login_login_scrooll_close.png


+ 1 - 1
tasks/Restart/script_task.py

@@ -53,7 +53,7 @@ if __name__ == '__main__':
     config = Config('oas1')
     config = Config('oas1')
     device = Device(config)
     device = Device(config)
     task = ScriptTask(config, device)
     task = ScriptTask(config, device)
-    task.harvest()
+    task.app_restart()
     # task.screenshot()
     # task.screenshot()
     # print(task.appear_then_click(task.I_LOGIN_SCROOLL_CLOSE, threshold=0.9))
     # print(task.appear_then_click(task.I_LOGIN_SCROOLL_CLOSE, threshold=0.9))
 
 

+ 13 - 13
tasks/RichMan/assets.py

@@ -80,7 +80,7 @@ class RichManAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 进入寄售屋 
 	# 进入寄售屋 
-	I_CON_ENTER_CHECK = RuleImage(roi_front=(660,485,393,100), roi_back=(660,485,393,100), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/consignment/consignment_con_enter_check.png")
+	I_CON_ENTER_CHECK = RuleImage(roi_front=(660,423,393,162), roi_back=(660,423,393,162), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/consignment/consignment_con_enter_check.png")
 	# 兑换 
 	# 兑换 
 	I_CON_ENTER = RuleImage(roi_front=(1176,304,68,74), roi_back=(1176,304,68,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/consignment/consignment_con_enter.png")
 	I_CON_ENTER = RuleImage(roi_front=(1176,304,68,74), roi_back=(1176,304,68,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/consignment/consignment_con_enter.png")
 	# 寄售券 
 	# 寄售券 
@@ -152,7 +152,7 @@ class RichManAssets:
 	# 寄售屋 
 	# 寄售屋 
 	I_MALL_CONSIGNMENT = RuleImage(roi_front=(200,626,63,72), roi_back=(175,610,120,103), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment.png")
 	I_MALL_CONSIGNMENT = RuleImage(roi_front=(200,626,63,72), roi_back=(175,610,120,103), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment.png")
 	# 寄售屋 
 	# 寄售屋 
-	I_MALL_CONSIGNMENT_CHECK = RuleImage(roi_front=(171,83,100,49), roi_back=(171,83,100,49), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment_check.png")
+	I_MALL_CONSIGNMENT_CHECK = RuleImage(roi_front=(12,166,100,390), roi_back=(12,166,100,390), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_consignment_check.png")
 	# 密卷屋 
 	# 密卷屋 
 	I_MALL_SCCALES = RuleImage(roi_front=(447,634,91,64), roi_back=(427,621,147,92), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sccales.png")
 	I_MALL_SCCALES = RuleImage(roi_front=(447,634,91,64), roi_back=(427,621,147,92), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_mall_sccales.png")
 	# 密卷屋 
 	# 密卷屋 
@@ -171,25 +171,25 @@ class RichManAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 特殊 
 	# 特殊 
-	I_SIDE_SURE_SPECIAL = RuleImage(roi_front=(1172,91,70,74), roi_back=(1172,91,70,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_special.png")
+	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.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_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_SUER_HONOR = RuleImage(roi_front=(1171,185,72,74), roi_back=(1171,185,72,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_suer_honor.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.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_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_SURE_FRIENDS = RuleImage(roi_front=(1174,279,68,70), roi_back=(1174,279,68,70), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_friends.png")
+	I_SIDE_SURE_FRIENDS = RuleImage(roi_front=(1174,277,68,70), roi_back=(1163,258,93,109), 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.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_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_SURE_MEDAL = RuleImage(roi_front=(1175,370,72,73), roi_back=(1175,370,72,73), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
+	I_SIDE_SURE_MEDAL = RuleImage(roi_front=(1190,375,39,62), roi_back=(1156,352,99,113), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_medal.png")
 	# 勋章 
 	# 勋章 
-	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(889,11,40,44), roi_back=(889,11,40,44), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
+	I_SIDE_CHECK_MEDAL = RuleImage(roi_front=(889,11,40,44), roi_back=(889,11,40,44), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_medal.png")
 	# 魅力值 
 	# 魅力值 
-	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1175,464,72,74), roi_back=(1175,464,72,74), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
+	I_SIDE_SURE_CHARISMA = RuleImage(roi_front=(1181,467,59,58), roi_back=(1158,445,101,106), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png")
 	# 魅力值 
 	# 魅力值 
-	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(886,4,48,46), roi_back=(886,4,48,46), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
+	I_SIDE_CHECK_CHARISMA = RuleImage(roi_front=(886,4,48,46), roi_back=(886,4,48,46), threshold=0.7, method="Template matching", file="./tasks/RichMan/mall/navbar/navbar_side_check_charisma.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets
@@ -284,7 +284,7 @@ class RichManAssets:
 	# 购买低级盘 
 	# 购买低级盘 
 	I_SP_BUY_LOW = RuleImage(roi_front=(176,148,144,108), roi_back=(128,142,902,449), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_buy_low.png")
 	I_SP_BUY_LOW = RuleImage(roi_front=(176,148,144,108), roi_back=(128,142,902,449), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_buy_low.png")
 	# 判断是否滑动到底 
 	# 判断是否滑动到底 
-	I_SP_SWIPE_CHECK = RuleImage(roi_front=(866,439,170,102), roi_back=(759,374,341,193), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_swipe_check.png")
+	I_SP_SWIPE_CHECK = RuleImage(roi_front=(847,461,170,82), roi_back=(759,374,341,193), threshold=0.8, method="Template matching", file="./tasks/RichMan/mall/special/special_sp_swipe_check.png")
 
 
 
 
 	# Ocr Rule Assets
 	# Ocr Rule Assets

TEMPAT SAMPAH
tasks/RichMan/mall/consignment/consignment_con_enter_check.png


+ 2 - 2
tasks/RichMan/mall/consignment/image.json

@@ -2,8 +2,8 @@
   {
   {
     "itemName": "con_enter_check",
     "itemName": "con_enter_check",
     "imageName": "consignment_con_enter_check.png",
     "imageName": "consignment_con_enter_check.png",
-    "roiFront": "660,485,393,100",
-    "roiBack": "660,485,393,100",
+    "roiFront": "660,423,393,162",
+    "roiBack": "660,423,393,162",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "进入寄售屋"
     "description": "进入寄售屋"

+ 2 - 2
tasks/RichMan/mall/navbar/image_bottom.json

@@ -11,8 +11,8 @@
   {
   {
     "itemName": "mall_consignment_check",
     "itemName": "mall_consignment_check",
     "imageName": "navbar_mall_consignment_check.png",
     "imageName": "navbar_mall_consignment_check.png",
-    "roiFront": "171,83,100,49",
-    "roiBack": "171,83,100,49",
+    "roiFront": "12,166,100,390",
+    "roiBack": "12,166,100,390",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "寄售屋"
     "description": "寄售屋"

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

@@ -5,7 +5,7 @@
     "roiFront": "1172,91,70,74",
     "roiFront": "1172,91,70,74",
     "roiBack": "1172,91,70,74",
     "roiBack": "1172,91,70,74",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "特殊"
     "description": "特殊"
   },
   },
   {
   {
@@ -14,16 +14,16 @@
     "roiFront": "102,7,42,42",
     "roiFront": "102,7,42,42",
     "roiBack": "102,7,42,42",
     "roiBack": "102,7,42,42",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "特殊"
     "description": "特殊"
   },
   },
   {
   {
     "itemName": "side_suer_honor",
     "itemName": "side_suer_honor",
     "imageName": "navbar_side_suer_honor.png",
     "imageName": "navbar_side_suer_honor.png",
-    "roiFront": "1171,185,72,74",
-    "roiBack": "1171,185,72,74",
+    "roiFront": "1180,191,59,60",
+    "roiBack": "1150,159,103,132",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "荣誉"
     "description": "荣誉"
   },
   },
   {
   {
@@ -32,16 +32,16 @@
     "roiFront": "694,12,41,42",
     "roiFront": "694,12,41,42",
     "roiBack": "694,12,41,42",
     "roiBack": "694,12,41,42",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "荣誉"
     "description": "荣誉"
   },
   },
   {
   {
     "itemName": "side_sure_friends",
     "itemName": "side_sure_friends",
     "imageName": "navbar_side_sure_friends.png",
     "imageName": "navbar_side_sure_friends.png",
-    "roiFront": "1174,279,68,70",
-    "roiBack": "1174,279,68,70",
+    "roiFront": "1174,277,68,70",
+    "roiBack": "1163,258,93,109",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "友情点"
     "description": "友情点"
   },
   },
   {
   {
@@ -50,16 +50,16 @@
     "roiFront": "890,8,39,43",
     "roiFront": "890,8,39,43",
     "roiBack": "890,8,39,43",
     "roiBack": "890,8,39,43",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "友情点"
     "description": "友情点"
   },
   },
   {
   {
     "itemName": "side_sure_medal",
     "itemName": "side_sure_medal",
     "imageName": "navbar_side_sure_medal.png",
     "imageName": "navbar_side_sure_medal.png",
-    "roiFront": "1175,370,72,73",
-    "roiBack": "1175,370,72,73",
+    "roiFront": "1190,375,39,62",
+    "roiBack": "1156,352,99,113",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "勋章"
     "description": "勋章"
   },
   },
   {
   {
@@ -68,16 +68,16 @@
     "roiFront": "889,11,40,44",
     "roiFront": "889,11,40,44",
     "roiBack": "889,11,40,44",
     "roiBack": "889,11,40,44",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "勋章"
     "description": "勋章"
   },
   },
   {
   {
     "itemName": "side_sure_charisma",
     "itemName": "side_sure_charisma",
     "imageName": "navbar_side_sure_charisma.png",
     "imageName": "navbar_side_sure_charisma.png",
-    "roiFront": "1175,464,72,74",
-    "roiBack": "1175,464,72,74",
+    "roiFront": "1181,467,59,58",
+    "roiBack": "1158,445,101,106",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "魅力值"
     "description": "魅力值"
   },
   },
   {
   {
@@ -86,7 +86,7 @@
     "roiFront": "886,4,48,46",
     "roiFront": "886,4,48,46",
     "roiBack": "886,4,48,46",
     "roiBack": "886,4,48,46",
     "method": "Template matching",
     "method": "Template matching",
-    "threshold": 0.8,
+    "threshold": 0.7,
     "description": "魅力值"
     "description": "魅力值"
   }
   }
 ]
 ]

TEMPAT SAMPAH
tasks/RichMan/mall/navbar/navbar_mall_consignment_check.png


TEMPAT SAMPAH
tasks/RichMan/mall/navbar/navbar_side_suer_honor.png


TEMPAT SAMPAH
tasks/RichMan/mall/navbar/navbar_side_sure_charisma.png


TEMPAT SAMPAH
tasks/RichMan/mall/navbar/navbar_side_sure_friends.png


TEMPAT SAMPAH
tasks/RichMan/mall/navbar/navbar_side_sure_medal.png


+ 1 - 1
tasks/RichMan/mall/special/image.json

@@ -29,7 +29,7 @@
   {
   {
     "itemName": "sp_swipe_check",
     "itemName": "sp_swipe_check",
     "imageName": "special_sp_swipe_check.png",
     "imageName": "special_sp_swipe_check.png",
-    "roiFront": "866,439,170,102",
+    "roiFront": "847,461,170,82",
     "roiBack": "759,374,341,193",
     "roiBack": "759,374,341,193",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,

TEMPAT SAMPAH
tasks/RichMan/mall/special/special_sp_swipe_check.png


+ 3 - 2
tasks/RichMan/script_task.py

@@ -45,11 +45,12 @@ if __name__ == '__main__':
     from module.config.config import Config
     from module.config.config import Config
     from module.device.device import Device
     from module.device.device import Device
     from memory_profiler import profile
     from memory_profiler import profile
-    c = Config('test')
+    c = Config('oas1')
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
 
 
-    t.run()
+    # t.run()
+    t.execute_mall()
 
 
 
 
 
 

+ 0 - 1
tasks/Script/config_optimization.py

@@ -8,7 +8,6 @@ from module.logger import logger
 
 
 class WhenTaskQueueEmpty(str, Enum):
 class WhenTaskQueueEmpty(str, Enum):
     GOTO_MAIN = 'goto_main'
     GOTO_MAIN = 'goto_main'
-    GOTO_HOME = 'goto_home'
     CLOSE_GAME = 'close_game'
     CLOSE_GAME = 'close_game'
 
 
 class ScheduleRule(str, Enum):
 class ScheduleRule(str, Enum):

+ 3 - 1
tasks/Secret/script_task.py

@@ -200,6 +200,8 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
 
 
         if screenshot:
         if screenshot:
             self.screenshot()
             self.screenshot()
+        if self.appear(self.I_CHAT_CLOSE_BUTTON):
+            self.ui_click_until_disappear(self.I_CHAT_CLOSE_BUTTON, interval=2)
         text_pos = self.O_SE_NO_PASS.ocr(self.device.image)
         text_pos = self.O_SE_NO_PASS.ocr(self.device.image)
         if text_pos != (0, 0, 0, 0):
         if text_pos != (0, 0, 0, 0):
             # 如果能找得到 未通关 ,那可以挑战
             # 如果能找得到 未通关 ,那可以挑战
@@ -252,7 +254,7 @@ class ScriptTask(GameUi, GeneralBattle, SwitchSoul, SecretAssets):
             self.screenshot()
             self.screenshot()
             if self.appear(self.I_SE_BATTLE_WIN):
             if self.appear(self.I_SE_BATTLE_WIN):
                 logger.info('Win battle')
                 logger.info('Win battle')
-                self.ui_click_until_disappear(self.I_SE_BATTLE_WIN)
+                self.ui_click_until_disappear(self.I_SE_BATTLE_WIN, interval=2)
                 return True
                 return True
             if self.appear_then_click(self.I_WIN, interval=1):
             if self.appear_then_click(self.I_WIN, interval=1):
                 continue
                 continue

+ 4 - 4
tasks/WantedQuests/script_task.py

@@ -43,7 +43,7 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
             if ocr_error_count > 10:
             if ocr_error_count > 10:
                 logger.warning('OCR failed too many times, exit')
                 logger.warning('OCR failed too many times, exit')
                 break
                 break
-            if self.ocr_appear(self.O_WQ_TEXT_1, interval=0.7):
+            if self.ocr_appear(self.O_WQ_TEXT_1, interval=1):
                 cu, re, total = self.O_WQ_NUM_1.ocr(self.device.image)
                 cu, re, total = self.O_WQ_NUM_1.ocr(self.device.image)
                 if cu == re == total == 0:
                 if cu == re == total == 0:
                     logger.warning('OCR failed and skip this round')
                     logger.warning('OCR failed and skip this round')
@@ -53,8 +53,8 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
                     cu = cu % 10
                     cu = cu % 10
                 if cu < total and re != 0:
                 if cu < total and re != 0:
                     self.execute_mission(self.O_WQ_TEXT_1, total, number_challenge)
                     self.execute_mission(self.O_WQ_TEXT_1, total, number_challenge)
-                continue
-            if self.ocr_appear(self.O_WQ_TEXT_2, interval=0.7):
+
+            if self.ocr_appear(self.O_WQ_TEXT_2, interval=1):
                 cu, re, total = self.O_WQ_NUM_2.ocr(self.device.image)
                 cu, re, total = self.O_WQ_NUM_2.ocr(self.device.image)
                 if cu == re == total == 0:
                 if cu == re == total == 0:
                     logger.warning('OCR failed and skip this round')
                     logger.warning('OCR failed and skip this round')
@@ -253,7 +253,7 @@ class ScriptTask(SecretScriptTask, GeneralInvite, WantedQuestsAssets):
             self.screenshot()
             self.screenshot()
             if not self.appear(add_button):
             if not self.appear(add_button):
                 return False
                 return False
-            self.ui_click(add_button, self.I_INVITE_ENSURE)
+            self.ui_click(add_button, self.I_INVITE_ENSURE, interval=2.5)
             sleep(1)
             sleep(1)
             self.click(self.I_WQ_FIREND_1)
             self.click(self.I_WQ_FIREND_1)
             sleep(0.4)
             sleep(0.4)

+ 3 - 2
tasks/base_task.py

@@ -511,9 +511,10 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
             elif isinstance(click, RuleOcr) and self.ocr_appear_click(click, interval=interval):
                 continue
                 continue
 
 
-    def ui_click_until_disappear(self, click):
+    def ui_click_until_disappear(self, click, interval: float =1):
         """
         """
         点击一个按钮直到消失
         点击一个按钮直到消失
+        :param interval:
         :param click:
         :param click:
         :return:
         :return:
         """
         """
@@ -521,5 +522,5 @@ class BaseTask(GlobalGameAssets, CostumeBase):
             self.screenshot()
             self.screenshot()
             if not self.appear(click):
             if not self.appear(click):
                 break
                 break
-            elif self.appear_then_click(click, interval=1):
+            elif self.appear_then_click(click, interval=interval):
                 continue
                 continue