Browse Source

Merge pull request #1473 from LGG686/dev

fix(GuildActivityMonitor): 调整代码结构
huangrunheng 7 months ago
parent
commit
d6f62f6756

+ 9 - 0
tasks/GuildActivityMonitor/config.py

@@ -20,6 +20,15 @@ class GuildActivity(BaseModel):
     # 退治
     # 退治
     DemonRetreat: bool = Field(default=True)
     DemonRetreat: bool = Field(default=True)
 
 
+    # 保持前端翻译,自动转换格式
+    def __getattr__(self, name):
+        camel = ''.join(w.capitalize() for w in name.split('_'))
+        return getattr(self, camel) if hasattr(self, camel) else super().__getattr__(name)
+
+    def __setattr__(self, name, value):
+        camel = ''.join(w.capitalize() for w in name.split('_'))
+        super().__setattr__(camel if hasattr(self, camel) else name, value)
+
 
 
 class GuildActivityMonitor(ConfigBase):
 class GuildActivityMonitor(ConfigBase):
     scheduler: Scheduler = Field(default_factory=Scheduler)
     scheduler: Scheduler = Field(default_factory=Scheduler)

+ 2 - 2
tasks/GuildActivityMonitor/script_task.py

@@ -16,6 +16,7 @@ class ScriptTask(GameUi):
         :return:
         :return:
         """
         """
         # 构建关键字映射
         # 构建关键字映射
+        self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
         self.ui_get_current_page()
         self.ui_get_current_page()
         self.ui_goto(page_main)
         self.ui_goto(page_main)
         guild_config = self.config.guild_activity_monitor.guild_activity
         guild_config = self.config.guild_activity_monitor.guild_activity
@@ -48,7 +49,6 @@ class ScriptTask(GameUi):
         while True:
         while True:
             if check_timer.reached():
             if check_timer.reached():
                 logger.info("监控时间到,任务结束")
                 logger.info("监控时间到,任务结束")
-                self.set_next_run(task='GuildActivityMonitor', success=True, finish=True)
                 raise TaskEnd('GuildActivityMonitor')
                 raise TaskEnd('GuildActivityMonitor')
 
 
             if log_timer.reached():
             if log_timer.reached():
@@ -131,4 +131,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.run()
+    t.run()