Skip to content

Commit b0b782b

Browse files
BnanZ0BnanZ0
committed
🐛 fix(wave): 修复波次逻辑
 - 将未初始化波次的默认值从0回调为-1
1 parent ad6dad9 commit b0b782b

4 files changed

Lines changed: 41 additions & 39 deletions

File tree

‎src/tasks/AutoDefence.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def init_runtime_state(self):
112112
def handle_in_mission(self):
113113
"""处理在副本中的逻辑"""
114114
self.get_wave_info()
115-
if self.current_wave != 0:
115+
if self.current_wave != -1:
116116
# 如果是新的波次，重置状态
117117
if self.current_wave != self.runtime_state["wave"]:
118118
self.runtime_state.update(
@@ -146,7 +146,7 @@ def handle_mission_start(self):
146146
self.log_info("任务开始，执行外部移动逻辑")
147147
self.external_movement()
148148
self.log_info(f"外部移动执行完毕，等待战斗开始，{DEFAULT_ACTION_TIMEOUT}秒后超时")
149-
if not self.wait_until(lambda: self.current_wave != 0, post_action=self.get_wave_info,
149+
if not self.wait_until(lambda: self.current_wave != -1, post_action=self.get_wave_info,
150150
time_out=DEFAULT_ACTION_TIMEOUT):
151151
self.log_info("等待战斗开始超时，重开任务")
152152
self.open_in_mission_menu()

‎src/tasks/CommissionsTask.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class CommissionsTask(BaseDNATask):
1818
def __init__(self, *args, **kwargs):
1919
super().__init__(*args, **kwargs)
2020
self.current_round = 0
21-
self.current_wave = 0
21+
self.current_wave = -1
2222
self.mission_status = None
2323
self.action_timeout = 10
2424
self.wave_future = None
@@ -344,6 +344,7 @@ def get_wave_info(self):
344344
return
345345
if prev_wave != self.current_wave:
346346
self.info_set("当前波次", self.current_wave)
347+
return
347348
if self.wave_future is None:
348349
mission_info_box = self.box_of_screen_scaled(2560, 1440, 275, 372, 445, 470, name="mission_info",
349350
hcenter=True)
@@ -355,12 +356,12 @@ def reset_wave_info(self):
355356
if self.wave_future is not None:
356357
self.wave_future.cancel()
357358
self.wave_future = None
358-
self.current_wave = 0
359+
self.current_wave = -1
359360
self.info_set("当前波次", self.current_wave)
360361

361362
def wait_until_get_wave_info(self):
362363
self.log_info("等待波次信息...")
363-
while self.current_wave == 0:
364+
while self.current_wave == -1:
364365
self.get_wave_info()
365366
self.sleep(0.2)
366367

‎src/tasks/fullauto/Auto70jjbTask.py‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def do_run(self):
6464
while True:
6565
if self.in_team():
6666
self.get_wave_info()
67-
if self.current_wave != 0:
67+
if self.current_wave != -1:
6868
if self.current_wave != _wave:
6969
_wave = self.current_wave
7070
_wave_start = time.time()
@@ -94,10 +94,10 @@ def do_run(self):
9494
_wave_start = time.time()
9595

9696
self.reset_wave_info()
97-
while self.current_wave == 0 and time.time() - _wave_start < 2:
97+
while self.current_wave == -1 and time.time() - _wave_start < 2:
9898
self.get_wave_info()
9999
self.sleep(0.2)
100-
if self.current_wave == 0:
100+
if self.current_wave == -1:
101101
self.log_info('未正确到达任务地点')
102102
self.open_in_mission_menu()
103103
self.sleep(0.5)
@@ -118,14 +118,15 @@ def stop_func(self):
118118
n = self.config.get('轮次', 3)
119119
if self.current_round >= n:
120120
return True
121-
121+
122122
def find_track_point(self, x1, y1, x2, y2) -> bool:
123-
box = self.box_of_screen_scaled(2560, 1440, 2560*x1, 1440*y1, 2560*x2, 1440*y2, name="find_track_point", hcenter=True)
123+
box = self.box_of_screen_scaled(2560, 1440, 2560 * x1, 1440 * y1, 2560 * x2, 1440 * y2, name="find_track_point",
124+
hcenter=True)
124125
return super().find_track_point(threshold=0.7, box=box)
125-
126+
126127
def walk_to_aim(self):
127128
found_target = False
128-
if self.find_track_point(0.20,0.54,0.22,0.59):
129+
if self.find_track_point(0.20, 0.54, 0.22, 0.59):
129130
#70皎皎币-无电梯
130131
found_target = True
131132
self.send_key_down("lalt")
@@ -136,9 +137,9 @@ def walk_to_aim(self):
136137
self.sleep(0.1)
137138
self.send_key_down(self.get_dodge_key())
138139
self.sleep(2.2)
139-
self.send_key(self.get_dodge_key(), down_time=0.2)
140+
self.send_key(self.get_dodge_key(), down_time=0.2)
140141
self.sleep(0.8)
141-
self.send_key(self.get_dodge_key(), down_time=0.2)
142+
self.send_key(self.get_dodge_key(), down_time=0.2)
142143
self.sleep(0.8)
143144
self.send_key_down(self.get_dodge_key())
144145
self.sleep(2.2)
@@ -148,15 +149,15 @@ def walk_to_aim(self):
148149
self.sleep(1)
149150
self.send_key_up(self.get_dodge_key())
150151
self.sleep(0.1)
151-
self.send_key(self.get_dodge_key(), down_time=0.2)
152+
self.send_key(self.get_dodge_key(), down_time=0.2)
152153
self.sleep(0.8)
153-
self.send_key(self.get_dodge_key(), down_time=0.2)
154+
self.send_key(self.get_dodge_key(), down_time=0.2)
154155
self.sleep(0.8)
155156
self.send_key_down(self.get_dodge_key())
156157
self.sleep(1.8)
157-
self.send_key(self.get_dodge_key(), down_time=0.2)
158+
self.send_key(self.get_dodge_key(), down_time=0.2)
158159
self.sleep(0.8)
159-
self.send_key(self.get_dodge_key(), down_time=0.2)
160+
self.send_key(self.get_dodge_key(), down_time=0.2)
160161
self.sleep(0.8)
161162
self.send_key_down(self.get_dodge_key())
162163
self.sleep(2.2)
@@ -166,10 +167,10 @@ def walk_to_aim(self):
166167
#分支1直接到达，未到达则进入分支2继续往前走
167168
start = time.time()
168169
self.reset_wave_info()
169-
while self.current_wave == 0 and time.time() - start < 2:
170+
while self.current_wave == -1 and time.time() - start < 2:
170171
self.get_wave_info()
171-
self.sleep(0.2)
172-
if self.current_wave == 0:
172+
self.sleep(0.2)
173+
if self.current_wave == -1:
173174
self.send_key_down('a')
174175
self.sleep(0.2)
175176
self.send_key_down(self.get_dodge_key())
@@ -179,13 +180,13 @@ def walk_to_aim(self):
179180
self.sleep(0.1)
180181
self.send_key_up('a')
181182
self.send_key_up("lalt")
182-
return
183+
return
183184

184-
if self.find_track_point(0.66,0.67,0.69,0.72):
185+
if self.find_track_point(0.66, 0.67, 0.69, 0.72):
185186
#70皎皎币-电梯右
186187
found_target = True
187188
self.reset_and_transport()
188-
self.send_key('s', down_time=0.2,after_sleep=0.2)
189+
self.send_key('s', down_time=0.2, after_sleep=0.2)
189190
self.middle_click(after_sleep=0.2)
190191
self.send_key_down("lalt")
191192
self.sleep(0.05)
@@ -199,17 +200,17 @@ def walk_to_aim(self):
199200
self.sleep(0.1)
200201
self.send_key_up("a")
201202
self.sleep(0.1)
202-
self.send_key('space',down_time=0.3,after_sleep=0.2)
203-
self.send_key('space',down_time=0.3,after_sleep=0.4)
204-
self.send_key(self.get_dodge_key(), down_time=0.2)
203+
self.send_key('space', down_time=0.3, after_sleep=0.2)
204+
self.send_key('space', down_time=0.3, after_sleep=0.4)
205+
self.send_key(self.get_dodge_key(), down_time=0.2)
205206
self.sleep(0.8)
206207
self.send_key_down(self.get_dodge_key())
207208
self.sleep(2.2)
208209
self.send_key_down('d')
209210
self.sleep(0.1)
210211
self.send_key_up(self.get_dodge_key())
211212
self.sleep(0.2)
212-
self.send_key(self.get_dodge_key(), down_time=0.2)
213+
self.send_key(self.get_dodge_key(), down_time=0.2)
213214
self.sleep(0.1)
214215
self.send_key_up("w")
215216
self.sleep(0.7)
@@ -221,7 +222,7 @@ def walk_to_aim(self):
221222
self.sleep(0.7)
222223
self.send_key_up(self.get_dodge_key())
223224
self.sleep(0.1)
224-
self.send_key(self.get_dodge_key(), down_time=0.2)
225+
self.send_key(self.get_dodge_key(), down_time=0.2)
225226
self.sleep(0.8)
226227
self.send_key_down(self.get_dodge_key())
227228
self.sleep(2.5)
@@ -230,9 +231,9 @@ def walk_to_aim(self):
230231
self.send_key_up('w')
231232
self.send_key_up("lalt")
232233
self.reset_and_transport()
233-
return
234+
return
234235

235-
if self.find_track_point(0.32,0.67,0.35,0.73):
236+
if self.find_track_point(0.32, 0.67, 0.35, 0.73):
236237
#70皎皎币-电梯左
237238
found_target = True
238239
self.reset_and_transport()
@@ -248,7 +249,7 @@ def walk_to_aim(self):
248249
self.sleep(0.8)
249250
self.send_key_up(self.get_dodge_key())
250251
self.sleep(0.1)
251-
self.send_key(self.get_dodge_key(), down_time=0.2)
252+
self.send_key(self.get_dodge_key(), down_time=0.2)
252253
self.sleep(0.8)
253254
self.send_key_down(self.get_dodge_key())
254255
self.sleep(2)
@@ -258,7 +259,7 @@ def walk_to_aim(self):
258259
self.sleep(0.8)
259260
self.send_key_up(self.get_dodge_key())
260261
self.sleep(0.1)
261-
self.send_key(self.get_dodge_key(), down_time=0.2)
262+
self.send_key(self.get_dodge_key(), down_time=0.2)
262263
self.sleep(0.8)
263264
self.send_key_down(self.get_dodge_key())
264265
self.sleep(1)
@@ -271,9 +272,9 @@ def walk_to_aim(self):
271272
self.send_key_up('w')
272273
self.send_key_up("lalt")
273274
self.reset_and_transport()
274-
return
275+
return
275276

276-
if self.find_track_point(0.50,0.71,0.53,0.76):
277+
if self.find_track_point(0.50, 0.71, 0.53, 0.76):
277278
#70皎皎币-电梯中
278279
found_target = True
279280
self.reset_and_transport()
@@ -289,19 +290,19 @@ def walk_to_aim(self):
289290
self.sleep(1.2)
290291
self.send_key_up(self.get_dodge_key())
291292
self.sleep(0.2)
292-
self.send_key(self.get_dodge_key(), down_time=0.2)
293+
self.send_key(self.get_dodge_key(), down_time=0.2)
293294
self.sleep(0.4)
294295
self.send_key_down('s')
295296
self.sleep(0.3)
296297
self.send_key_down(self.get_dodge_key())
297298
self.sleep(0.4)
298299
self.send_key_up('s')
299300
self.sleep(1)
300-
self.send_key(self.get_dodge_key(), down_time=0.2)
301+
self.send_key(self.get_dodge_key(), down_time=0.2)
301302
self.sleep(2)
302303
self.send_key_up(self.get_dodge_key())
303304
self.sleep(0.1)
304305
self.send_key_up('d')
305306
self.send_key_up("lalt")
306307
self.reset_and_transport()
307-
return
308+
return

‎src/tasks/fullauto/ImportTask.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def do_run(self):
111111
while True:
112112
if self.in_team():
113113
self.get_wave_info()
114-
if self.current_wave != 0:
114+
if self.current_wave != -1:
115115
if self.current_wave != _wave:
116116
_wave = self.current_wave
117117
_wait_next_wave = False

0 commit comments

Comments
 (0)