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

perf[EternitySea]: 完善组队刷永生之海。永生的房间和别的副本不同,截了一些新的图

GanSer 2 лет назад
Родитель
Сommit
0e4dacb865

+ 353 - 96
config/template.json

@@ -32,7 +32,12 @@
       "priority": 0,
       "priority": 0,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:05:00"
+      "server_update": "09:05:00",
+      "float_time": "00:00:00"
+    },
+    "tasks_config_reset": {
+      "reset_task_datetime_enable": false,
+      "reset_task_datetime": "2023-01-01 00:00:00"
     },
     },
     "harvest_config": {
     "harvest_config": {
       "enable": true,
       "enable": true,
@@ -42,16 +47,26 @@
       "enable_mail": true,
       "enable_mail": true,
       "enable_soul": true,
       "enable_soul": true,
       "enable_ap": true
       "enable_ap": true
+    },
+    "login_character_config": {
+      "character": ""
     }
     }
   },
   },
   "global_game": {
   "global_game": {
     "emergency": {
     "emergency": {
       "friend_invitation": "accept",
       "friend_invitation": "accept",
-      "invitation_detect_interval": 5,
       "when_network_abnormal": "wait_10s",
       "when_network_abnormal": "wait_10s",
       "when_network_error": "restart",
       "when_network_error": "restart",
       "home_client_clear": true
       "home_client_clear": true
     },
     },
+    "costume_config": {
+      "costume_main_type": "costume_main",
+      "costume_realm_type": "costume_realm_default",
+      "costume_theme_type": "costume_theme_default",
+      "costume_shikigami_type": "costume_shikigami_default",
+      "costume_sign_type": "costume_sign_default",
+      "costume_battle_type": "costume_battle_default"
+    },
     "team_flow": {
     "team_flow": {
       "enable": false,
       "enable": false,
       "broker": "",
       "broker": "",
@@ -69,10 +84,14 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "boss": {
     "boss": {
-      "boss_number": 3
+      "boss_number": 3,
+      "boss_reward": false,
+      "reward_floor": "一星",
+      "use_collect": false
     },
     },
     "general_battle": {
     "general_battle": {
       "lock_team_enable": false,
       "lock_team_enable": false,
@@ -98,7 +117,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     }
     }
   },
   },
   "gold_youkai": {
   "gold_youkai": {
@@ -108,7 +128,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "gold_youkai": {
     "gold_youkai": {
       "buff_gold_50_click": false,
       "buff_gold_50_click": false,
@@ -129,7 +150,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "nian_config": {
     "nian_config": {
       "buff_gold_50_click": false,
       "buff_gold_50_click": false,
@@ -143,7 +165,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "raid_config": {
     "raid_config": {
       "number_attack": 30,
       "number_attack": 30,
@@ -177,12 +200,16 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "raid_config": {
     "raid_config": {
-      "raid_mode": "attack_all",
-      "attack_number": "all",
-      "ryou_access": "yes"
+      "limit_time": "00:30:00",
+      "limit_count": 50,
+      "next_ryoutoppa_time": "07:00:00",
+      "skip_difficult": true,
+      "ryou_access": false,
+      "random_delay": false
     },
     },
     "general_battle_config": {
     "general_battle_config": {
       "lock_team_enable": false,
       "lock_team_enable": false,
@@ -208,7 +235,8 @@
       "priority": 2,
       "priority": 2,
       "success_interval": "00 06:00:00",
       "success_interval": "00 06:00:00",
       "failure_interval": "00 06:00:00",
       "failure_interval": "00 06:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "utilize_config": {
     "utilize_config": {
       "utilize_rule": "default",
       "utilize_rule": "default",
@@ -229,7 +257,8 @@
       "priority": 2,
       "priority": 2,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "00 10:00:00",
       "failure_interval": "00 10:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "activation_config": {
     "activation_config": {
       "card_rule": "auto",
       "card_rule": "auto",
@@ -250,14 +279,14 @@
     },
     },
     "demon_soul_config": {
     "demon_soul_config": {
       "enable": false,
       "enable": false,
-      "demon_kiryou_utahime": "-1,-1",
-      "demon_kiryou_utahime_supplementary": "-1,-1",
-      "demon_shinkirou": "-1,-1",
-      "demon_tsuchigumo": "-1,-1",
-      "demon_gashadokuro": "-1,-1",
-      "demon_namazu": "-1,-1",
-      "demon_oboroguruma": "-1,-1",
-      "demon_nightly_aramitama": "-1,-1"
+      "demon_kiryou_utahime": "group,team",
+      "demon_kiryou_utahime_supplementary": "group,team",
+      "demon_shinkirou": "group,team",
+      "demon_tsuchigumo": "group,team",
+      "demon_gashadokuro": "group,team",
+      "demon_namazu": "group,team",
+      "demon_oboroguruma": "group,team",
+      "demon_nightly_aramitama": "group,team"
     }
     }
   },
   },
   "daily_trifles": {
   "daily_trifles": {
@@ -267,12 +296,14 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "trifles_config": {
     "trifles_config": {
       "one_summon": false,
       "one_summon": false,
       "guild_wish": false,
       "guild_wish": false,
       "friend_love": false,
       "friend_love": false,
+      "luck_msg": false,
       "store_sign": false
       "store_sign": false
     }
     }
   },
   },
@@ -283,7 +314,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "00 06:00:00",
       "success_interval": "00 06:00:00",
       "failure_interval": "00 06:00:00",
       "failure_interval": "00 06:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "talisman": {
     "talisman": {
       "level_reward": "金币/勾玉"
       "level_reward": "金币/勾玉"
@@ -296,7 +328,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "pets_config": {
     "pets_config": {
       "pets_happy": true,
       "pets_happy": true,
@@ -310,7 +343,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "simple_tidy": {
     "simple_tidy": {
       "greed_maneki": false
       "greed_maneki": false
@@ -323,7 +357,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "delegation_config": {
     "delegation_config": {
       "miyoshino_painting": false,
       "miyoshino_painting": false,
@@ -341,16 +376,31 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "exploration_config": {
     "exploration_config": {
       "buff_gold_50_click": false,
       "buff_gold_50_click": false,
       "buff_gold_100_click": false,
       "buff_gold_100_click": false,
-      "attack_number": "7",
-      "current_exploration_times": "0",
+      "buff_exp_50_click": false,
+      "buff_exp_100_click": false,
+      "user_status": "alone",
+      "limit_time": "00:30:00",
+      "minions_cnt": "30",
       "exploration_level": "第二十八章",
       "exploration_level": "第二十八章",
       "auto_rotate": "不",
       "auto_rotate": "不",
-      "choose_rarity": "N卡"
+      "choose_rarity": "N卡",
+      "up_type": "up_all"
+    },
+    "scrolls": {
+      "scrolls_enable": false,
+      "scrolls_cd": "00 00:30:00",
+      "scrolls_threshold": "25"
+    },
+    "invite_config": {
+      "friend_1": "",
+      "find_mode": "auto_find",
+      "wait_time": "00:02:00"
     },
     },
     "general_battle_config": {
     "general_battle_config": {
       "lock_team_enable": false,
       "lock_team_enable": false,
@@ -376,10 +426,21 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "wanted_quests_config": {
     "wanted_quests_config": {
-      "before_end": "00:00:00"
+      "before_end": "00:00:00",
+      "invite_friend_name": "",
+      "cooperation_type": "Any",
+      "battle_priority": "挑战 > 秘闻 > 探索"
+    },
+    "switch_soul_config": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
     }
     }
   },
   },
   "tako": {
   "tako": {
@@ -389,7 +450,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "tako_config": {
     "tako_config": {
       "enable": false,
       "enable": false,
@@ -413,7 +475,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "orochi_config": {
     "orochi_config": {
       "user_status": "leader",
       "user_status": "leader",
@@ -444,7 +507,10 @@
       "switch_group_team": "-1,-1",
       "switch_group_team": "-1,-1",
       "enable_switch_by_name": false,
       "enable_switch_by_name": false,
       "group_name": "",
       "group_name": "",
-      "team_name": ""
+      "team_name": "",
+      "auto_switch_soul": false,
+      "eleven_switch": "-1,-1",
+      "twelve_switch": "-1,-1"
     }
     }
   },
   },
   "orochi_moans": {
   "orochi_moans": {
@@ -454,7 +520,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     }
     }
   },
   },
   "sougenbi": {
   "sougenbi": {
@@ -464,7 +531,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "sougenbi_config": {
     "sougenbi_config": {
       "sougenbi_class": "痴",
       "sougenbi_class": "痴",
@@ -500,7 +568,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "fallen_sun_config": {
     "fallen_sun_config": {
       "user_status": "leader",
       "user_status": "leader",
@@ -540,13 +609,67 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "eternity_sea_config": {
     "eternity_sea_config": {
       "user_status": "leader",
       "user_status": "leader",
       "layer": "肆层",
       "layer": "肆层",
       "limit_time": "00:30:00",
       "limit_time": "00:30:00",
       "limit_count": 50
       "limit_count": 50
+    },
+    "general_battle_config": {
+      "lock_team_enable": false,
+      "preset_enable": false,
+      "preset_group": 1,
+      "preset_team": 1,
+      "green_enable": false,
+      "green_mark": "green_left1",
+      "random_click_swipt_enable": false
+    },
+    "switch_soul_config_1": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
+    },
+    "switch_soul_config_2": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
+    },
+    "invite_config": {
+      "invite_number": "one",
+      "friend_1": "",
+      "friend_2": "",
+      "find_mode": "auto_find",
+      "wait_time": "00:02:00",
+      "default_invite": true
+    }
+  },
+  "six_realms": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "switch_soul_config": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
+    },
+    "six_realms_gate": {
+      "limit_time": "00:30:00",
+      "limit_count": 1
     }
     }
   },
   },
   "activity_shikigami": {
   "activity_shikigami": {
@@ -556,14 +679,17 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "general_climb": {
     "general_climb": {
       "limit_time": "00:30:00",
       "limit_time": "00:30:00",
       "limit_count": 50,
       "limit_count": 50,
       "ap_game_max": 300,
       "ap_game_max": 300,
       "ap_mode": "ap_activity",
       "ap_mode": "ap_activity",
-      "activity_toggle": false
+      "activity_toggle": false,
+      "active_souls_clean": false,
+      "random_sleep": false
     },
     },
     "general_battle": {
     "general_battle": {
       "lock_team_enable": false,
       "lock_team_enable": false,
@@ -573,12 +699,20 @@
       "green_enable": false,
       "green_enable": false,
       "green_mark": "green_left1",
       "green_mark": "green_left1",
       "random_click_swipt_enable": false
       "random_click_swipt_enable": false
+    },
+    "switch_soul_config": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
     }
     }
   },
   },
   "meta_demon": {
   "meta_demon": {
     "scheduler": {
     "scheduler": {
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
       "interval": "00 03:00:00"
       "interval": "00 03:00:00"
     },
     },
     "meta_demon_config": {
     "meta_demon_config": {
@@ -586,6 +720,50 @@
       "extreme_notify": false
       "extreme_notify": false
     }
     }
   },
   },
+  "frog_boss": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "frog_boss_config": {
+      "before_end_frog": "00:15:00",
+      "strategy_frog": "frog_majority"
+    }
+  },
+  "float_parade": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "03 00:00:00",
+      "failure_interval": "03 00:00:00",
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "float_parade": {
+      "level_reward": "金币/勾玉"
+    }
+  },
+  "quiz": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "quiz_config": {
+      "quiz_cnt": 1,
+      "quiz_per_round": 150
+    }
+  },
   "bondling_fairyland": {
   "bondling_fairyland": {
     "scheduler": {
     "scheduler": {
       "enable": false,
       "enable": false,
@@ -593,7 +771,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "bondling_config": {
     "bondling_config": {
       "bondling_mode": "mode_1",
       "bondling_mode": "mode_1",
@@ -629,7 +808,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "evo_zone_config": {
     "evo_zone_config": {
       "user_status": "leader",
       "user_status": "leader",
@@ -655,6 +835,13 @@
       "green_enable": false,
       "green_enable": false,
       "green_mark": "green_left1",
       "green_mark": "green_left1",
       "random_click_swipt_enable": false
       "random_click_swipt_enable": false
+    },
+    "switch_soul_config": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
     }
     }
   },
   },
   "goryou_realm": {
   "goryou_realm": {
@@ -664,7 +851,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "goryou_config": {
     "goryou_config": {
       "limit_time": "00:30:00",
       "limit_time": "00:30:00",
@@ -688,6 +876,78 @@
       "team_name": ""
       "team_name": ""
     }
     }
   },
   },
+  "hyakkiyakou": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "hyakkiyakou_config": {
+      "hya_limit_time": "00:20:00",
+      "hya_limit_count": 10,
+      "hya_invite_friend": false,
+      "hya_auto_bean": false,
+      "hya_priorities": "",
+      "hya_sp": 1.0,
+      "hya_ssr": 1.0,
+      "hya_sr": 0.7,
+      "hya_r": 0.3,
+      "hya_n": 0.0,
+      "hya_g": 0.0
+    },
+    "hyakkiyakou_models": {
+      "conf_threshold": 0.6,
+      "iou_threshold": 0.7,
+      "model_precision": "FP32",
+      "inference_engine": "Onnxruntime"
+    },
+    "debug_config": {
+      "hya_show": false,
+      "hya_info": false,
+      "continuous_learning": false,
+      "hya_save_result": false,
+      "hya_interval": 300,
+      "hya_screenshot_method": "window_background"
+    }
+  },
+  "hero_test": {
+    "scheduler": {
+      "enable": false,
+      "next_run": "2023-01-01 00:00:00",
+      "priority": 5,
+      "success_interval": "01 00:00:00",
+      "failure_interval": "01 00:00:00",
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "herotest": {
+      "layer": "鬼兵演武",
+      "limit_time": "00:30:00",
+      "limit_count": 100,
+      "exp_50_buff_enable_help": false,
+      "exp_100_buff_enable_help": false
+    },
+    "general_battle": {
+      "lock_team_enable": false,
+      "preset_enable": false,
+      "preset_group": 1,
+      "preset_team": 1,
+      "green_enable": false,
+      "green_mark": "green_left1",
+      "random_click_swipt_enable": false
+    },
+    "switch_soul_config": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
+    }
+  },
   "true_orochi": {
   "true_orochi": {
     "scheduler": {
     "scheduler": {
       "enable": false,
       "enable": false,
@@ -695,11 +955,19 @@
       "priority": 10,
       "priority": 10,
       "success_interval": "07 00:00:00",
       "success_interval": "07 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "true_orochi_config": {
     "true_orochi_config": {
       "find_true_orochi": true,
       "find_true_orochi": true,
       "current_success": 0
       "current_success": 0
+    },
+    "switch_soul": {
+      "enable": false,
+      "switch_group_team": "-1,-1",
+      "enable_switch_by_name": false,
+      "group_name": "",
+      "team_name": ""
     }
     }
   },
   },
   "rich_man": {
   "rich_man": {
@@ -709,7 +977,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "special_room": {
     "special_room": {
       "enable": false,
       "enable": false,
@@ -790,7 +1059,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "07 00:00:00",
       "success_interval": "07 00:00:00",
       "failure_interval": "07 00:00:00",
       "failure_interval": "07 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "secret_config": {
     "secret_config": {
       "secret_gold_50": false,
       "secret_gold_50": false,
@@ -822,7 +1092,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "07 00:00:00",
       "success_interval": "07 00:00:00",
       "failure_interval": "07 00:00:00",
       "failure_interval": "07 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "trifles": {
     "trifles": {
       "share_collect": true,
       "share_collect": true,
@@ -838,7 +1109,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "shop_config": {
     "shop_config": {
       "time_of_mystery": "00:00:00",
       "time_of_mystery": "00:00:00",
@@ -863,7 +1135,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "duel_config": {
     "duel_config": {
       "switch_all_soul": false,
       "switch_all_soul": false,
@@ -881,7 +1154,8 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
     "missions_config": {
     "missions_config": {
       "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一 > 远远不够",
       "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一 > 远远不够",
@@ -895,14 +1169,19 @@
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "09:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
+    },
+    "hunt_time": {
+      "kirin_time": "19:00:00",
+      "netherworld_time": "19:00:00"
     },
     },
     "hunt_config": {
     "hunt_config": {
       "kirin_group_team": "-1,-1",
       "kirin_group_team": "-1,-1",
       "netherworld_group_team": "-1,-1"
       "netherworld_group_team": "-1,-1"
     }
     }
   },
   },
-  "abyss_shadows": {
+  "dokan": {
     "scheduler": {
     "scheduler": {
       "enable": false,
       "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
@@ -912,6 +1191,12 @@
       "server_update": "09:00:00",
       "server_update": "09:00:00",
       "float_time": "00:00:00"
       "float_time": "00:00:00"
     },
     },
+    "dokan_config": {
+      "dokan_attack_priority": 0,
+      "dokan_auto_cheering_while_cd": false,
+      "random_delay": false,
+      "anti_detect_click_fixed_random_area": false
+    },
     "general_battle_config": {
     "general_battle_config": {
       "lock_team_enable": false,
       "lock_team_enable": false,
       "preset_enable": false,
       "preset_enable": false,
@@ -929,64 +1214,36 @@
       "team_name": ""
       "team_name": ""
     }
     }
   },
   },
-  "dokan": {
+  "abyss_shadows": {
     "scheduler": {
     "scheduler": {
-      "enable": true,
+      "enable": false,
       "next_run": "2023-01-01 00:00:00",
       "next_run": "2023-01-01 00:00:00",
       "priority": 5,
       "priority": 5,
       "success_interval": "01 00:00:00",
       "success_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
       "failure_interval": "01 00:00:00",
-      "server_update": "19:00:00"
+      "server_update": "09:00:00",
+      "float_time": "00:00:00"
     },
     },
-    "dokan_config": {
-      "dokan_attack_priority": 0,
-      "dokan_auto_cheering_while_cd": false,
-      "random_delay": false,
-      "anti_detect_click_fixed_random_area": false
+    "abyss_shadows_time": {
+      "custom_run_time_friday": "19:00:00",
+      "custom_run_time_saturday": "19:00:00",
+      "custom_run_time_sunday": "19:00:00"
     },
     },
     "general_battle_config": {
     "general_battle_config": {
       "lock_team_enable": false,
       "lock_team_enable": false,
-      "preset_enable": true,
+      "preset_enable": false,
       "preset_group": 1,
       "preset_group": 1,
       "preset_team": 1,
       "preset_team": 1,
-      "green_enable": true,
-      "green_mark": "green_left4",
+      "green_enable": false,
+      "green_mark": "green_left1",
       "random_click_swipt_enable": false
       "random_click_swipt_enable": false
     },
     },
     "switch_soul_config": {
     "switch_soul_config": {
       "enable": false,
       "enable": false,
-      "switch_group_team": "1,1",
+      "switch_group_team": "-1,-1",
       "enable_switch_by_name": false,
       "enable_switch_by_name": false,
       "group_name": "",
       "group_name": "",
       "team_name": ""
       "team_name": ""
-    },
-    "hero_test": {
-      "scheduler": {
-        "enable": false,
-        "next_run": "2023-01-01 00:00:00",
-        "priority": 5,
-        "success_interval": "01 00:00:00",
-        "failure_interval": "01 00:00:00",
-        "server_update": "19:00:00",
-        "float_time": "00:00:00"
-      },
-      "herotest_config": {
-        "layer": "鬼兵演武",
-        "limit_time": "00:30:00",
-        "limit_count": 30,
-        "exp_50_buff_enable_help": false,
-        "exp_100_buff_enable_help": false
-      },
-      "general_battle_config": {
-        "lock_team_enable": false,
-        "preset_enable": false,
-        "preset_group": 1,
-        "preset_team": 1,
-        "green_enable": false,
-        "green_mark": "green_left1",
-        "random_click_swipt_enable": false
-      }
-    }
-    
+    }
   }
   }
-}
+}

+ 7 - 5
tasks/Component/GeneralInvite/assets.py

@@ -26,9 +26,9 @@ class GeneralInviteAssets:
 	# 如果是到时间会退出房间,这个右边显示一个匹配的图片 
 	# 如果是到时间会退出房间,这个右边显示一个匹配的图片 
 	I_MATCHING = RuleImage(roi_front=(51,574,52,114), roi_back=(51,574,52,114), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_matching.png")
 	I_MATCHING = RuleImage(roi_front=(51,574,52,114), roi_back=(51,574,52,114), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_matching.png")
 	# 永生之海挑战(还未有队友的图片) 
 	# 永生之海挑战(还未有队友的图片) 
-	I_FIRE_FAIL_SEA = RuleImage(roi_front=(1160,585,100,100), roi_back=(1160,585,100,100), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_fail_sea.png")
+	I_FIRE_FAIL_SEA = RuleImage(roi_front=(1160,585,100,70), roi_back=(1160,585,100,70), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_fail_sea.png")
 	# description 
 	# description 
-	I_FIRE_SEA = RuleImage(roi_front=(1160,586,100,97), roi_back=(1160,586,100,97), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_sea.png")
+	I_FIRE_SEA = RuleImage(roi_front=(1160,586,100,68), roi_back=(1160,586,100,68), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_fire_sea.png")
 	# description 
 	# description 
 	I_LOCK_SEA = RuleImage(roi_front=(781,658,27,28), roi_back=(781,658,27,28), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_lock_sea.png")
 	I_LOCK_SEA = RuleImage(roi_front=(781,658,27,28), roi_back=(781,658,27,28), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_lock_sea.png")
 	# 永生之海 没有锁定队伍的图片 
 	# 永生之海 没有锁定队伍的图片 
@@ -46,9 +46,9 @@ class GeneralInviteAssets:
 	# 左上角退出 
 	# 左上角退出 
 	I_BACK_YELLOW = RuleImage(roi_front=(19,13,58,55), roi_back=(19,13,58,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_back_yellow.png")
 	I_BACK_YELLOW = RuleImage(roi_front=(19,13,58,55), roi_back=(19,13,58,55), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_back_yellow.png")
 	# 点击邀请 
 	# 点击邀请 
-	I_INVITE_ENSURE = RuleImage(roi_front=(500,541,132,60), roi_back=(478,523,378,92), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_invite_ensure.png")
+	I_INVITE_ENSURE = RuleImage(roi_front=(710,544,132,60), roi_back=(710,544,132,60), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_invite_ensure.png")
 	# 判断是否点中好友了 
 	# 判断是否点中好友了 
-	I_SELECTED = RuleImage(roi_front=(895,373,33,32), roi_back=(380,157,568,350), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_selected.png")
+	I_SELECTED = RuleImage(roi_front=(895,373,33,32), roi_back=(895,373,33,32), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_selected.png")
 	# 用来判断当前的列表是哪儿的 
 	# 用来判断当前的列表是哪儿的 
 	I_FLAG_1_ON = RuleImage(roi_front=(354,126,62,21), roi_back=(354,126,62,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_1_on.png")
 	I_FLAG_1_ON = RuleImage(roi_front=(354,126,62,21), roi_back=(354,126,62,21), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_flag_1_on.png")
 	# description 
 	# description 
@@ -90,7 +90,9 @@ class GeneralInviteAssets:
 	# 所有的组队界面都有加成 
 	# 所有的组队界面都有加成 
 	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
 	I_GI_BUFF = RuleImage(roi_front=(794,38,46,42), roi_back=(794,38,46,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_gi_buff.png")
 	# 三人御魂组队左上角的协站队伍 
 	# 三人御魂组队左上角的协站队伍 
-	I_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_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_gi_in_room.png")
+	# description 
+	I_BACK_YELLOW_SEA = RuleImage(roi_front=(31,16,42,42), roi_back=(31,16,42,42), threshold=0.8, method="Template matching", file="./tasks/Component/GeneralInvite/gi/gi_back_yellow_sea.png")
 
 
 
 
 	# Image Rule Assets
 	# Image Rule Assets

+ 7 - 1
tasks/Component/GeneralInvite/general_invite.py

@@ -188,6 +188,9 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
             if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.8):
             if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW, interval=0.8):
                 self.wait_until_appear(self.I_GI_SURE, wait_time=0.8)
                 self.wait_until_appear(self.I_GI_SURE, wait_time=0.8)
                 continue
                 continue
+            if not self.appear(self.I_GI_SURE) and self.appear_then_click(self.I_BACK_YELLOW_SEA, interval=0.8):
+                self.wait_until_appear(self.I_GI_SURE, wait_time=0.8)
+                continue
         return True
         return True
 
 
     def click_fire(self):
     def click_fire(self):
@@ -197,7 +200,8 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                 break
                 break
             if self.appear_then_click(self.I_FIRE, interval=1, threshold=0.7):
             if self.appear_then_click(self.I_FIRE, interval=1, threshold=0.7):
                 continue
                 continue
-
+            if self.appear_then_click(self.I_FIRE_SEA, interval=1, threshold=0.7):
+                continue
     @cached_property
     @cached_property
     def room_type(self) -> RoomType:
     def room_type(self) -> RoomType:
         """
         """
@@ -343,6 +347,8 @@ class GeneralInvite(BaseTask, GeneralInviteAssets):
                 continue
                 continue
             if self.appear_then_click(self.I_ADD_5_4, interval=1):
             if self.appear_then_click(self.I_ADD_5_4, interval=1):
                 continue
                 continue
+            if self.appear_then_click(self.I_ADD_SEA, interval=1):
+                continue
 
 
         friend_class = []
         friend_class = []
         class_ocr = [self.O_F_LIST_1, self.O_F_LIST_2, self.O_F_LIST_3, self.O_F_LIST_4]
         class_ocr = [self.O_F_LIST_1, self.O_F_LIST_2, self.O_F_LIST_3, self.O_F_LIST_4]

BIN
tasks/Component/GeneralInvite/gi/gi_back_yellow_sea.png


BIN
tasks/Component/GeneralInvite/gi/gi_fire_fail_sea.png


BIN
tasks/Component/GeneralInvite/gi/gi_fire_sea.png


BIN
tasks/Component/GeneralInvite/gi/gi_invite_ensure.png


+ 17 - 8
tasks/Component/GeneralInvite/gi/image.json

@@ -65,8 +65,8 @@
   {
   {
     "itemName": "fire_fail_sea",
     "itemName": "fire_fail_sea",
     "imageName": "gi_fire_fail_sea.png",
     "imageName": "gi_fire_fail_sea.png",
-    "roiFront": "1160,585,100,100",
-    "roiBack": "1160,585,100,100",
+    "roiFront": "1160,585,100,70",
+    "roiBack": "1160,585,100,70",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "永生之海挑战(还未有队友的图片)"
     "description": "永生之海挑战(还未有队友的图片)"
@@ -74,8 +74,8 @@
   {
   {
     "itemName": "fire_sea",
     "itemName": "fire_sea",
     "imageName": "gi_fire_sea.png",
     "imageName": "gi_fire_sea.png",
-    "roiFront": "1160,586,100,97",
-    "roiBack": "1160,586,100,97",
+    "roiFront": "1160,586,100,68",
+    "roiBack": "1160,586,100,68",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "description"
     "description": "description"
@@ -155,8 +155,8 @@
   {
   {
     "itemName": "invite_ensure",
     "itemName": "invite_ensure",
     "imageName": "gi_invite_ensure.png",
     "imageName": "gi_invite_ensure.png",
-    "roiFront": "500,541,132,60",
-    "roiBack": "478,523,378,92",
+    "roiFront": "710,544,132,60",
+    "roiBack": "710,544,132,60",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "点击邀请"
     "description": "点击邀请"
@@ -165,7 +165,7 @@
     "itemName": "selected",
     "itemName": "selected",
     "imageName": "gi_selected.png",
     "imageName": "gi_selected.png",
     "roiFront": "895,373,33,32",
     "roiFront": "895,373,33,32",
-    "roiBack": "380,157,568,350",
+    "roiBack": "895,373,33,32",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "判断是否点中好友了"
     "description": "判断是否点中好友了"
@@ -352,11 +352,20 @@
   },
   },
   {
   {
     "itemName": "gi_in_room",
     "itemName": "gi_in_room",
-    "imageName": "gi_in_room.png",
+    "imageName": "gi_gi_in_room.png",
     "roiFront": "92,17,213,64",
     "roiFront": "92,17,213,64",
     "roiBack": "92,17,213,64",
     "roiBack": "92,17,213,64",
     "method": "Template matching",
     "method": "Template matching",
     "threshold": 0.8,
     "threshold": 0.8,
     "description": "三人御魂组队左上角的协站队伍"
     "description": "三人御魂组队左上角的协站队伍"
+  },
+  {
+    "itemName": "back_yellow_sea",
+    "imageName": "gi_back_yellow_sea.png",
+    "roiFront": "31,16,42,42",
+    "roiBack": "31,16,42,42",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "description"
   }
   }
 ]
 ]

+ 15 - 3
tasks/EternitySea/assets.py

@@ -12,10 +12,22 @@ class EternitySeaAssets:
 
 
 	# Image Rule Assets
 	# Image Rule Assets
 	# 选择永生之海 
 	# 选择永生之海 
-	I_ETERNITY_SEA = RuleImage(roi_front=(1150,101,127,416), roi_back=(0,0,1279,719), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/es_eternity_sea.png")
+	I_ETERNITY_SEA = RuleImage(roi_front=(1139,93,127,416), roi_back=(1139,93,127,416), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea.png")
 	# 组队 
 	# 组队 
-	I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/es_form_team.png")
+	I_FORM_TEAM = RuleImage(roi_front=(939,594,96,90), roi_back=(939,594,96,90), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_form_team.png")
 	# 挑战 
 	# 挑战 
-	I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/es_eternity_sea_fire.png")
+	I_ETERNITY_SEA_FIRE = RuleImage(roi_front=(1108,592,96,93), roi_back=(1108,592,96,93), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternity_sea_fire.png")
+	# 开锁 
+	I_ETERNITYSEA_UNLOCK = RuleImage(roi_front=(556,560,35,34), roi_back=(556,560,35,34), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_eternitysea_unlock.png")
+	# 关锁 
+	I_NEWETERNITYSEA_LOCK = RuleImage(roi_front=(556,560,31,37), roi_back=(556,560,31,37), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_neweternitysea_lock.png")
+	# 小小宠物,发现宝藏 
+	I_PET_PRESENT = RuleImage(roi_front=(873,184,62,147), roi_back=(873,184,62,147), threshold=0.8, method="Template matching", file="./tasks/EternitySea/res/res_pet_present.png")
+
+
+	# List Rule Assets
+	# 永生之海层数列表 
+	L_LAYER_LIST = RuleList(folder="./tasks/EternitySea/res", direction="vertical", mode="ocr", roi_back=(138,127,353,435), size=(56, 68), 
+					 array=["壹", "贰", "叁", "肆"])
 
 
 
 

+ 2 - 0
tasks/EternitySea/config.py

@@ -6,6 +6,7 @@ from enum import Enum
 from datetime import datetime, time
 from datetime import datetime, time
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 
 
+from tasks.Component.GeneralInvite.config_invite import InviteConfig
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_scheduler import Scheduler
 from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
@@ -34,4 +35,5 @@ class EternitySea(ConfigBase):
     general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     general_battle_config: GeneralBattleConfig = Field(default_factory=GeneralBattleConfig)
     switch_soul_config_1: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
     switch_soul_config_1: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
     switch_soul_config_2: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
     switch_soul_config_2: SwitchSoulConfig = Field(default_factory=SwitchSoulConfig)
+    invite_config: InviteConfig = Field(default_factory=InviteConfig)
 
 

BIN
tasks/EternitySea/res/es_eternity_sea.png


+ 54 - 27
tasks/EternitySea/res/image.json

@@ -1,29 +1,56 @@
 [
 [
-    {
-        "itemName": "eternity_sea",
-        "imageName": "es_eternity_sea.png",
-        "roiFront": "1150,101,127,416",
-        "roiBack": "0,0,1279,719",
-        "method": "Template matching",
-        "threshold": 0.8,
-        "description": "选择永生之海"
-    },
-    {
-        "itemName": "form_team",
-        "imageName": "es_form_team.png",
-        "roiFront": "939,594,96,90",
-        "roiBack": "939,594,96,90",
-        "method": "Template matching",
-        "threshold": 0.8,
-        "description": "组队"
-    },
-    {
-        "itemName": "eternity_sea_fire",
-        "imageName": "es_eternity_sea_fire.png",
-        "roiFront": "1108,592,96,93",
-        "roiBack": "1108,592,96,93",
-        "method": "Template matching",
-        "threshold": 0.8,
-        "description": "挑战"
-    }
+  {
+    "itemName": "eternity_sea",
+    "imageName": "res_eternity_sea.png",
+    "roiFront": "1139,93,127,416",
+    "roiBack": "1139,93,127,416",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "选择永生之海"
+  },
+  {
+    "itemName": "form_team",
+    "imageName": "res_form_team.png",
+    "roiFront": "939,594,96,90",
+    "roiBack": "939,594,96,90",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "组队"
+  },
+  {
+    "itemName": "eternity_sea_fire",
+    "imageName": "res_eternity_sea_fire.png",
+    "roiFront": "1108,592,96,93",
+    "roiBack": "1108,592,96,93",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "挑战"
+  },
+  {
+    "itemName": "eternitysea_unlock",
+    "imageName": "res_eternitysea_unlock.png",
+    "roiFront": "556,560,35,34",
+    "roiBack": "556,560,35,34",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "开锁"
+  },
+  {
+    "itemName": "neweternitysea_lock",
+    "imageName": "res_neweternitysea_lock.png",
+    "roiFront": "556,560,31,37",
+    "roiBack": "556,560,31,37",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "关锁"
+  },
+  {
+    "itemName": "pet_present",
+    "imageName": "res_pet_present.png",
+    "roiFront": "873,184,62,147",
+    "roiBack": "873,184,62,147",
+    "method": "Template matching",
+    "threshold": 0.8,
+    "description": "小小宠物,发现宝藏"
+  }
 ]
 ]

+ 25 - 0
tasks/EternitySea/res/list.json

@@ -0,0 +1,25 @@
+{
+  "name": "layer_list",
+  "direction": "vertical",
+  "type": "ocr",
+  "roiBack": "138,127,353,435",
+  "description": "永生之海层数列表",
+  "list": [
+    {
+      "itemName": "壹",
+      "roiFront": "266,148,60,64"
+    },
+    {
+      "itemName": "贰",
+      "roiFront": "270,253,54,74"
+    },
+    {
+      "itemName": "叁",
+      "roiFront": "276,367,50,67"
+    },
+    {
+      "itemName": "肆",
+      "roiFront": "271,479,60,70"
+    }
+  ]
+}

BIN
tasks/EternitySea/res/res_eternity_sea.png


+ 0 - 0
tasks/EternitySea/res/es_eternity_sea_fire.png → tasks/EternitySea/res/res_eternity_sea_fire.png


BIN
tasks/EternitySea/res/res_eternitysea_unlock.png


+ 0 - 0
tasks/EternitySea/res/es_form_team.png → tasks/EternitySea/res/res_form_team.png


BIN
tasks/EternitySea/res/res_neweternitysea_lock.png


BIN
tasks/EternitySea/res/res_pet_present.png


+ 184 - 18
tasks/EternitySea/script_task.py

@@ -16,7 +16,7 @@ from tasks.EternitySea.assets import EternitySeaAssets
 from tasks.Orochi.config import UserStatus
 from tasks.Orochi.config import UserStatus
 from tasks.EternitySea.config import EternitySea
 from tasks.EternitySea.config import EternitySea
 from module.exception import RequestHumanTakeover
 from module.exception import RequestHumanTakeover
-
+from tasks.GameUi.page import page_main, page_soul_zones, page_shikigami_records
 
 
 class ScriptTask(
 class ScriptTask(
     GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul, EternitySeaAssets
     GameUi, GeneralBattle, GeneralRoom, GeneralInvite, SwitchSoul, EternitySeaAssets
@@ -40,13 +40,10 @@ class ScriptTask(
         self._two_teams_switch_sous(self._task_config.switch_soul_config_1)
         self._two_teams_switch_sous(self._task_config.switch_soul_config_1)
         self._two_teams_switch_sous(self._task_config.switch_soul_config_2)
         self._two_teams_switch_sous(self._task_config.switch_soul_config_2)
         match self._task_config.eternity_sea_config.user_status:
         match self._task_config.eternity_sea_config.user_status:
-            case UserStatus.ALONE:
-                success = self.run_alone()
-            case _:
-                logger.critical(
-                    f"UserStatus {self._task_config.eternity_sea_config.user_status} not support"
-                )
-                raise RequestHumanTakeover
+            case UserStatus.LEADER: success = self.run_leader()
+            case UserStatus.MEMBER: success = self.run_member()
+            case UserStatus.ALONE: self.run_alone()
+            case _: logger.error('Unknown user status')
 
 
         if success:
         if success:
             self.set_next_run(self.task_name, finish=True, success=True)
             self.set_next_run(self.task_name, finish=True, success=True)
@@ -55,6 +52,139 @@ class ScriptTask(
 
 
         raise TaskEnd(self.task_name)
         raise TaskEnd(self.task_name)
 
 
+
+    def run_leader(self):
+        logger.info('Start run leader')
+        self._navigate_to_soul_zones()
+        self._enter_eternity_sea()
+        layer = self._task_config.eternity_sea_config.layer
+        self.check_layer(layer)
+        self.check_lock(self._task_config.general_battle_config.lock_team_enable)
+        # 创建队伍
+        logger.info('Create team')
+        while 1:
+            self.screenshot()
+            if self.appear(self.I_CHECK_TEAM):
+                break
+            if self.appear_then_click(self.I_FORM_TEAM, interval=1):
+                continue
+        # 创建房间
+        self.create_room()
+        self.ensure_private()
+        self.create_ensure()
+
+        # 邀请队友
+        success = True
+        is_first = True
+        # 这个时候我已经进入房间了哦
+        while 1:
+            self.screenshot()
+            # 无论胜利与否, 都会出现是否邀请一次队友
+            # 区别在于,失败的话不会出现那个勾选默认邀请的框
+            if self.check_and_invite(self._task_config.invite_config.default_invite):
+                continue
+
+            #限制
+            if self.current_count >= self._task_config.eternity_sea_config.limit_count:
+                logger.info("EternitySea count limit out")
+                break
+            if datetime.now() - self.start_time >= self._limit_time:
+                logger.info("EternitySea time limit out")
+                break
+
+            # 如果没有进入房间那就不需要后面的邀请
+            if not self.is_in_room():
+                if self.is_room_dead():
+                    logger.warning('eternity_sea task failed')
+                    success = False
+                    break
+                continue
+
+            # 点击挑战
+            if not is_first:
+                if self.run_invite(config=self._task_config.invite_config):
+                    self.run_general_battle(config=self._task_config.general_battle_config)
+                else:
+                    # 邀请失败,退出任务
+                    logger.warning('Invite failed and exit this eternity_sea task')
+                    success = False
+                    break
+
+            # 第一次会邀请队友
+            if is_first:
+                if not self.run_invite(config=self._task_config.invite_config, is_first=True):
+                    logger.warning('Invite failed and exit this eternity_sea task')
+                    success = False
+                    break
+                else:
+                    is_first = False
+                    self.run_general_battle(config=self._task_config.general_battle_config)
+
+        # 当结束或者是失败退出循环的时候只有两个UI的可能,在房间或者是在组队界面
+        # 如果在房间就退出
+        if self.exit_room():
+            pass
+        # 如果在组队界面就退出
+        if self.exit_team():
+            pass
+
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+
+        if not success:
+            return False
+        return True
+
+
+    def run_member(self):
+        logger.info('Start run member')
+        self.ui_get_current_page()
+        # self.ui_goto(page_soul_zones)
+        # self.orochi_enter()
+        # self.check_lock(self.config.orochi.general_battle_config.lock_team_enable)
+
+        # 进入战斗流程
+        self.device.stuck_record_add('BATTLE_STATUS_S')
+        while 1:
+            self.screenshot()
+
+            #限制
+            if self.current_count >= self._task_config.eternity_sea_config.limit_count:
+                logger.info("EternitySea count limit out")
+                break
+            if datetime.now() - self.start_time >= self._limit_time:
+                logger.info("EternitySea time limit out")
+                break
+
+            if self.check_then_accept():
+                continue
+
+            if self.is_in_room():
+                self.device.stuck_record_clear()
+                if self.wait_battle(wait_time=self._task_config.invite_config.wait_time):
+                    self.run_general_battle(config=self._task_config.general_battle_config)
+                else:
+                    break
+            # 队长秒开的时候,检测是否进入到战斗中
+            elif self.check_take_over_battle(False, config=self._task_config.general_battle_config):
+                continue
+
+        while 1:
+            # 有一种情况是本来要退出的,但是队长邀请了进入的战斗的加载界面
+            if self.appear(self.I_GI_HOME) or self.appear(self.I_GI_EXPLORE):
+                break
+            # 如果可能在房间就退出
+            if self.exit_room():
+                pass
+            # 如果还在战斗中,就退出战斗
+            if self.exit_battle():
+                pass
+
+        self.ui_get_current_page()
+        self.ui_goto(page_main)
+        return True
+
+
     def run_alone(self) -> bool:
     def run_alone(self) -> bool:
         logger.info("Start run alone")
         logger.info("Start run alone")
         self._navigate_to_soul_zones()
         self._navigate_to_soul_zones()
@@ -89,6 +219,16 @@ class ScriptTask(
                     )
                     )
                     break
                     break
 
 
+    def eternitysea_enter(self) -> bool:
+        logger.info('Enter EternitySea')
+        while True:
+            self.screenshot()
+            if self.appear(self.I_FORM_TEAM):
+                return True
+            if self.appear_then_click(self.I_ETERNITY_SEA, interval=1):
+                continue
+
+
     def _is_in_eternity_sea(self) -> bool:
     def _is_in_eternity_sea(self) -> bool:
         self.screenshot()
         self.screenshot()
         return self.appear(self.I_ETERNITY_SEA_FIRE)
         return self.appear(self.I_ETERNITY_SEA_FIRE)
@@ -104,13 +244,10 @@ class ScriptTask(
         logger.info("Enter eternity_sea")
         logger.info("Enter eternity_sea")
         while True:
         while True:
             self.screenshot()
             self.screenshot()
-            if self.appear_then_click(self.I_ETERNITY_SEA, interval=1):
-                break
-
-        while True:
-            self.screenshot()
-            if self.appear(self.I_FORM_TEAM):
-                return
+            if self.appear(self.I_FORM_TEAM, interval=1):
+                return True
+            if self.appear_then_click(self.I_ETERNITY_SEA):
+                continue
 
 
     def _navigate_to_soul_zones(self) -> None:
     def _navigate_to_soul_zones(self) -> None:
         self.ui_get_current_page()
         self.ui_get_current_page()
@@ -124,6 +261,37 @@ class ScriptTask(
     def _task_config(self) -> EternitySea:
     def _task_config(self) -> EternitySea:
         return self.config.model.eternity_sea
         return self.config.model.eternity_sea
 
 
+    def check_layer(self, layer: str) -> bool:
+        """
+        检查挑战的层数, 并选中挑战的层
+        :return:
+        """
+        pos = self.list_find(self.L_LAYER_LIST, layer)
+        if pos:
+            self.device.click(x=pos[0], y=pos[1])
+            return True
+
+    def check_lock(self, lock: bool = True) -> bool:
+        """
+        检查是否锁定阵容, 要求在永生之海界面
+        :param lock:
+        :return:
+        """
+        logger.info('Check lock: %s', lock)
+        if lock:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_NEWETERNITYSEA_LOCK):
+                    return True
+                if self.appear_then_click(self.I_ETERNITYSEA_UNLOCK, interval=1):
+                    continue
+        else:
+            while 1:
+                self.screenshot()
+                if self.appear(self.I_ETERNITYSEA_UNLOCK):
+                    return True
+                if self.appear_then_click(self.I_NEWETERNITYSEA_LOCK, interval=1):
+                    continue
 
 
 if __name__ == "__main__":
 if __name__ == "__main__":
     from module.config.config import Config
     from module.config.config import Config
@@ -132,6 +300,4 @@ if __name__ == "__main__":
     c = Config("oas1")
     c = Config("oas1")
     d = Device(c)
     d = Device(c)
     t = ScriptTask(c, d)
     t = ScriptTask(c, d)
-    t.screenshot()
-
-    t.run()
+    t.screenshot()