runhey 3 лет назад
Родитель
Сommit
086cc4c3be
3 измененных файлов с 5 добавлено и 4 удалено
  1. 2 2
      config/template.json
  2. 2 1
      tasks/Component/BaseActivity/config_activity.py
  3. 1 1
      tasks/Hunt/script_task.py

+ 2 - 2
config/template.json

@@ -548,7 +548,7 @@
     "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": 999,
       "ap_mode": "ap_activity",
       "ap_mode": "ap_activity",
       "activity_toggle": false
       "activity_toggle": false
     },
     },
@@ -860,7 +860,7 @@
       "server_update": "09:00:00"
       "server_update": "09:00:00"
     },
     },
     "missions_config": {
     "missions_config": {
-      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵二 > 御灵一 > 御魂二 > 御魂一"
+      "missions_rule": "契灵 > 觉醒三 > 觉醒二 > 觉醒一 > 御灵三 > 御灵二 > 御灵一 > 御魂二 > 御魂一"
     }
     }
   },
   },
   "hunt": {
   "hunt": {

+ 2 - 1
tasks/Component/BaseActivity/config_activity.py

@@ -50,7 +50,7 @@ class GeneralClimb(ConfigBase):
 
 
     @validator('ap_game_max', pre=True, always=True)
     @validator('ap_game_max', pre=True, always=True)
     def reset_game_max(cls, value):
     def reset_game_max(cls, value):
-        def_value = 999
+        def_value = int(999)
         if isinstance(value, str):
         if isinstance(value, str):
             try:
             try:
                 return int(value)
                 return int(value)
@@ -59,5 +59,6 @@ class GeneralClimb(ConfigBase):
                 return def_value
                 return def_value
         elif isinstance(value, int):
         elif isinstance(value, int):
             return def_value
             return def_value
+        return def_value
 
 
 
 

+ 1 - 1
tasks/Hunt/script_task.py

@@ -92,7 +92,7 @@ class ScriptTask(GameUi, GeneralBattle, GeneralInvite, SwitchSoul, HuntAssets):
         self.ui_click(self.I_KIRIN_CHALLAGE, self.I_KIRIN_GATHER)
         self.ui_click(self.I_KIRIN_CHALLAGE, self.I_KIRIN_GATHER)
         # 等待进入战斗
         # 等待进入战斗
         # 等待挑战, 5秒也是等
         # 等待挑战, 5秒也是等
-        time.sleep(5)
+        sleep(5)
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.device.stuck_record_add('BATTLE_STATUS_S')
         self.wait_until_disappear(self.I_KIRIN_GATHER)
         self.wait_until_disappear(self.I_KIRIN_GATHER)
         self.device.stuck_record_clear()
         self.device.stuck_record_clear()