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

fix(Hyakkiyakou): Optimize code structure

ryland 2 лет назад
Родитель
Сommit
74dc14609c

+ 1 - 1
tasks/Hyakkiyakou/agent/focus.py

@@ -112,7 +112,7 @@ velocity: {self._v}"""
     @classmethod
     def r(cls, vector: list, omega: float, omega_buff: float) -> float:
         _omega = max(omega, omega_buff)
-        tau = - 140 / (vector[0] - 100)
+        tau = - 140 / (max(101, vector[0]) - 100)
         upsilon = (vector[1] / 250 - vector[2] / 35)
         upsilon = 100 * (upsilon**2 if upsilon > 0 else - upsilon**2)
         result = _omega + tau + upsilon - 0.6

+ 5 - 6
tasks/Hyakkiyakou/script_task.py

@@ -134,8 +134,7 @@ class ScriptTask(GameUi, HyaSlave):
                 logger.info('Hyakkiyakou time limit out')
                 break
                 
-            if self._config.hyakkiyakou_config.hya_invite_friend:
-                self.invite_friend(True)
+
             self.one()
             hya_count += 1
 
@@ -151,12 +150,12 @@ class ScriptTask(GameUi, HyaSlave):
         raise TaskEnd
 
     def one(self):
-        # 初始豆子数量, 初始式神数量, 一次砸豆子的数量, 第一个格子, 第二个格子, 第三个格子, 第四个格子
-        slave_state_default: tuple = [250, 35, 10, -1, -1, -1, -1]
-        # 每次运行时重置为初始值
-        self.slave_state = slave_state_default
+        self.reset_state()
         if not self.appear(self.I_HACCESS):
             logger.warning('Page Error')
+        if self._config.hyakkiyakou_config.hya_invite_friend:
+            self.invite_friend(True)
+        # start
         self.ui_click(self.I_HACCESS, self.I_HSTART, interval=2)
         self.wait_until_appear(self.I_HTITLE)
         # 随机选一个

+ 4 - 1
tasks/Hyakkiyakou/slave/hya_slave.py

@@ -46,7 +46,7 @@ class HyaSlave(HyaDevice, HyaColor, HyakkiyakouAssets):
     BUFF_ROI4: list[int] = [1100, 1, 140, 50]
 
     # 剩余豆子数量, 剩余式神数量, 一次砸豆子的数量, 第一个格子, 第二个格子, 第三个格子, 第四个格子
-    slave_state: tuple = [250, 35, 10,
+    slave_state: tuple = [250, 36, 10,
                           HyaBuff.BUFF_STATE0, HyaBuff.BUFF_STATE0, HyaBuff.BUFF_STATE0, HyaBuff.BUFF_STATE0]
 
     @cached_property
@@ -244,6 +244,9 @@ class HyaSlave(HyaDevice, HyaColor, HyakkiyakouAssets):
         ]
         return self.slave_state
 
+    def reset_state(self):
+        self.slave_state = [250, 36, 10,
+                          HyaBuff.BUFF_STATE0, HyaBuff.BUFF_STATE0, HyaBuff.BUFF_STATE0, HyaBuff.BUFF_STATE0]
 def covert_rgb():
     images_folders: Path = Path(r'E:\Project\OnmyojiAutoScript\tasks\Hyakkiyakou\temp\20240614T214216')
     save_folders = images_folders.parent / 'save14'