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

feat(task) Optimize area_boss next_run

runhey 3 лет назад
Родитель
Сommit
44e24b3c47

+ 1 - 1
tasks/AreaBoss/config_boss.py

@@ -8,5 +8,5 @@ from pydantic import BaseModel, ValidationError, validator, Field
 class Boss(BaseModel):
     boss_number: int = Field(title='Boss Number',
                              default=3,
-                             description='只可选范围1~3',
+                             description='[Boss数量]:默认为3\n 可选[1-3]',
                              ge=1, le=3)

+ 5 - 5
tasks/AreaBoss/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='已经弃置,不生效')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 1 - 0
tasks/AreaBoss/script_task.py

@@ -166,6 +166,7 @@ class ScriptTask(GeneralBattle, AreaBossAssets):
 
         # 退出
         self.go_back()
+        self.set_next_run(task='AreaBoss')
 
         # 以抛出异常的形式结束
         raise TaskEnd

+ 5 - 5
tasks/DemonEncounter/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/EternitySea/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/ExperienceYoukai/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/FallenSun/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/GoldYoukai/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/Hunt/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/Nian/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/Orochi/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/OrochiJudgement/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/OrochiMoans/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')
 

+ 5 - 5
tasks/Sougenbi/config_scheduler.py

@@ -6,10 +6,10 @@ from datetime import datetime, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
 class Scheduler(BaseModel):
-    enable: bool = Field(default=False,
-                         description='none')
+    enable: bool = Field(default=False, description='[是否启用]:默认为False')
     next_run: datetime = Field(default="2023-01-01 00:00:00",
-                               description='none')
-    priority: int = Field(default=3,
-                          description='default 3')
+                               description='[下次执行时间]:默认为2023-01-01 00:00:00\n 清空后回车设置当前的时间')
+    interval_days: int = Field(default=1, description='[间隔天数]:默认为1\n 可选0-7')
+    interval_hours: int = Field(default=0, description='[间隔小时]:默认为0\n 可选0-23')
+    interval_minutes: int = Field(default=0, description='[间隔分钟]:默认为0\n 可选0-59')