فهرست منبع

Merge branch 'runhey:dev' into dev

endlesswxk 3 سال پیش
والد
کامیت
e0b79e3aaf

+ 1 - 1
module/config/config_manual.py

@@ -12,7 +12,7 @@ class ConfigManual:
         >KekkaiUtilize > KekkaiActivation > DemonEncounter
         >KekkaiUtilize > KekkaiActivation > DemonEncounter
         > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > RealmRaid > RyouToppa > DailyTrifles > Exploration
         > AreaBoss > GoldYoukai > ExperienceYoukai > Nian > RealmRaid > RyouToppa > DailyTrifles > Exploration
         > Hunt
         > Hunt
-        > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea > ExploreZones
+        > Orochi > OrochiMoans > OrochiJudgement > Sougenbi > FallenSun > EternitySea
         > ActivityShikigami
         > ActivityShikigami
         > BondlingFairyland > EvoZone > GoryouRealm
         > BondlingFairyland > EvoZone > GoryouRealm
         > TrueOrochi > RichMan
         > TrueOrochi > RichMan

+ 2 - 2
module/config/config_menu.py

@@ -21,9 +21,9 @@ class ConfigMenu:
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         self.menu["Soul Zones"] = ['Orochi', 'Sougenbi', 'FallenSun', 'EternitySea']
         # 日常的任务
         # 日常的任务
         self.menu["Daily Task"] = ['DailyTrifles', 'AreaBoss', 'GoldYoukai', 'ExperienceYoukai', 'Nian',
         self.menu["Daily Task"] = ['DailyTrifles', 'AreaBoss', 'GoldYoukai', 'ExperienceYoukai', 'Nian',
-                                   'TalismanPass', 'DemonEncounter', 'Pets', 'SoulsTidy', 'Delegation', 'Exploration']
+                                   'TalismanPass', 'DemonEncounter', 'Pets', 'SoulsTidy', 'Delegation']
         # 很肝的任务
         # 很肝的任务
-        self.menu["Liver Emperor Exclusive"] = ['BondlingFairyland', 'EvoZone', 'GoryouRealm', 'ExploreZones']
+        self.menu["Liver Emperor Exclusive"] = ['BondlingFairyland', 'EvoZone', 'GoryouRealm', 'Exploration']
         # 阴阳寮
         # 阴阳寮
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'CollectiveMissions',
         self.menu["Guild"] = ['KekkaiUtilize', 'KekkaiActivation', 'RealmRaid', 'RyouToppa', 'CollectiveMissions',
                               'Hunt']
                               'Hunt']

+ 0 - 2
module/config/config_model.py

@@ -47,7 +47,6 @@ from tasks.ActivityShikigami.config import ActivityShikigami
 from tasks.BondlingFairyland.config import BondlingFairyland
 from tasks.BondlingFairyland.config import BondlingFairyland
 from tasks.EvoZone.config import EvoZone
 from tasks.EvoZone.config import EvoZone
 from tasks.GoryouRealm.config import GoryouRealm
 from tasks.GoryouRealm.config import GoryouRealm
-from tasks.ExploreZones.config import ExploreZones
 # ----------------------------------------------------------------------------------------------------------------------
 # ----------------------------------------------------------------------------------------------------------------------
 
 
 # 每周任务---------------------------------------------------------------------------------------------------------------
 # 每周任务---------------------------------------------------------------------------------------------------------------
@@ -96,7 +95,6 @@ class ConfigModel(ConfigBase):
     bondling_fairyland: BondlingFairyland = Field(default_factory=BondlingFairyland)
     bondling_fairyland: BondlingFairyland = Field(default_factory=BondlingFairyland)
     evo_zone: EvoZone = Field(default_factory=EvoZone)
     evo_zone: EvoZone = Field(default_factory=EvoZone)
     goryou_realm: GoryouRealm = Field(default_factory=GoryouRealm)
     goryou_realm: GoryouRealm = Field(default_factory=GoryouRealm)
-    explore_zones: ExploreZones = Field(default_factory=ExploreZones)
 
 
     # 这些是每周任务
     # 这些是每周任务
     true_orochi: TrueOrochi = Field(default_factory=TrueOrochi)
     true_orochi: TrueOrochi = Field(default_factory=TrueOrochi)

+ 7 - 0
module/team_flow/host.py

@@ -51,6 +51,7 @@ class Host(Mqtt, Player):
         :return:
         :return:
         """
         """
         for key, value in self.config.model.items():
         for key, value in self.config.model.items():
+            task_name: str = key
             if key == 'orochi':
             if key == 'orochi':
                 continue
                 continue
             elif key == 'fallen_sun':
             elif key == 'fallen_sun':
@@ -59,6 +60,12 @@ class Host(Mqtt, Player):
                 continue
                 continue
             elif key == 'evo_zone':
             elif key == 'evo_zone':
                 continue
                 continue
+            elif key == 'soul':
+                continue
+            else:
+                continue
+
+
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':

+ 0 - 19
tasks/ExploreZones/config.py

@@ -1,19 +0,0 @@
-# This Python file uses the following encoding: utf-8
-# @author runhey
-# github https://github.com/runhey
-from pydantic import BaseModel, Field
-from enum import Enum
-from datetime import datetime, time
-
-from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, TimeDelta
-from tasks.Utils.config_enum import ShikigamiClass
-
-
-
-
-
-class ExploreZones(ConfigBase):
-    scheduler: Scheduler = Field(default_factory=Scheduler)
-
-

+ 0 - 32
tasks/ExploreZones/script_task.py

@@ -1,32 +0,0 @@
-# This Python file uses the following encoding: utf-8
-# @author runhey
-# github https://github.com/runhey
-from module.logger import logger
-from module.exception import TaskEnd
-
-from tasks.GameUi.game_ui import GameUi
-from tasks.Component.GeneralBattle.general_battle import GeneralBattle
-from tasks.Component.GeneralInvite.general_invite import GeneralInvite
-from tasks.Component.GeneralRoom.general_room import GeneralRoom
-from tasks.Orochi.script_task import ScriptTask as OrochiScriptTask
-from tasks.GameUi.page import page_main, page_soul_zones
-
-
-class ScriptTask(GameUi, GeneralBattle, GeneralInvite, GeneralRoom):
-
-    def run(self):
-        config = self.config.ture_orochi
-        self.ui_get_current_page()
-        self.ui_goto(page_soul_zones)
-
-
-if __name__ == '__main__':
-    from module.config.config import Config
-    from module.device.device import Device
-    c = Config('oas1')
-    d = Device(c)
-    t = ScriptTask(c, d)
-    t.screenshot()
-
-    t.run()
-