Explorar el Código

Merge pull request #1198 from BluettDream/dev_feat_kekkai

refactor(Kekkai): custom harvest guild assets times
huangrunheng hace 1 año
padre
commit
d0b16b5a71
Se han modificado 2 ficheros con 4 adiciones y 3 borrados
  1. 1 0
      tasks/KekkaiUtilize/config.py
  2. 3 3
      tasks/KekkaiUtilize/script_task.py

+ 1 - 0
tasks/KekkaiUtilize/config.py

@@ -31,6 +31,7 @@ class UtilizeConfig(BaseModel):
     select_friend_list: SelectFriendList = Field(default=SelectFriendList.SAME_SERVER, description='select_friend_list_help')
     shikigami_class: ShikigamiClass = Field(default=ShikigamiClass.N, description='shikigami_class_help')
     shikigami_order: int = Field(default=4, description='shikigami_order_help')
+    harvest_guild_max_times: int = Field(default=3, description='收取寮资金或体力失败的最大尝试次数')
     utilize_enable: bool = Field(default=True, description='是否蹭卡,小号可以选择不蹭卡')
     guild_ap_enable: bool = Field(default=True, description='guild_ap_enable_help')
     guild_assets_enable: bool = Field(default=True, description='guild_assets_enable_help')

+ 3 - 3
tasks/KekkaiUtilize/script_task.py

@@ -50,13 +50,13 @@ class ScriptTask(GameUi, ReplaceShikigami, KekkaiUtilizeAssets):
         self.check_box_ap_or_exp(con.box_ap_enable, con.box_exp_enable, con.box_exp_waste)
 
         # 收取寮资金和体力
-        self.recive_guild_ap_or_assets()
+        self.recive_guild_ap_or_assets(con.harvest_guild_max_times)
         if not con.utilize_enable:
             self.set_next_run(task='KekkaiUtilize', finish=True, success=True)
         raise TaskEnd
 
-    def recive_guild_ap_or_assets(self):
-        for i in range(1, 5):
+    def recive_guild_ap_or_assets(self, max_tries: int = 3):
+        for i in range(1, max_tries+1):
             self.ui_get_current_page()
             self.ui_goto(page_guild)
             # 在寮的主界面 检查是否有收取体力或者是收取寮资金