Skip to content

Commit db9d0a8

Browse files
committed
evf升级到0.3
1 parent da858fc commit db9d0a8

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
pyQt5==5.15.7
2-
ms-toollib==1.4.8
2+
ms-toollib==1.4.9

src/mineSweeperGUI.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,10 @@ def checksum_module_ok(self):
537537
def save_evf_file(self):
538538
# 搜集本局各种信息,存成evf文件
539539
# 调试的时候不会自动存录像,见checksum_module_ok
540+
self.label.ms_board.use_question = False # 禁用问号是共识
541+
self.label.ms_board.use_cursor_pos_lim = False # 目前还不能限制
542+
self.label.ms_board.use_auto_replay = self.auto_replay > 0
543+
540544
self.label.ms_board.is_fair = self.is_fair()
541545
self.label.ms_board.is_offical = self.is_official()
542546
# if self.label.ms_board.is_fair and self.label.ms_board.is_offical:
@@ -551,7 +555,7 @@ def save_evf_file(self):
551555

552556
if not os.path.exists(self.replay_path):
553557
os.mkdir(self.replay_path)
554-
self.label.ms_board.generate_evf_v0_raw_data()
558+
self.label.ms_board.generate_evf_v3_raw_data()
555559
# 补上校验值
556560
checksum = self.checksum_guard.get_checksum(self.label.ms_board.raw_data[:-1])
557561
self.label.ms_board.checksum = checksum
@@ -1171,14 +1175,14 @@ def video_set_a_time(self, time):
11711175
self.timer_video.start()
11721176
self.video_playing = True
11731177

1174-
def is_official(self):
1178+
def is_official(self) -> bool:
11751179
# 局面开始时,判断一下局面是设置是否正式。
11761180
# 极端小的3BV依然是合法的,而网站是否认同不关软件的事。
11771181
if self.board_constraint:
11781182
return False
11791183
return self.game_state == "win" and self.gameMode == 0
11801184

1181-
def is_fair(self):
1185+
def is_fair(self) -> bool:
11821186
if self.board_constraint:
11831187
return False
11841188
return self.game_state == "win" or self.game_state == "fail"
@@ -1187,7 +1191,7 @@ def is_fair(self):
11871191
# 点在局面内,单位是格不是像素
11881192
# return i >= 0 and i < self.row and j >= 0 and j < self.column
11891193

1190-
def pos_is_in_board(self, i, j):
1194+
def pos_is_in_board(self, i, j) -> bool:
11911195
# 点在局面内,单位是像素不是格
11921196
return i >= 0 and i < self.row * self.pixSize and j >= 0 and j < self.column * self.pixSize
11931197

0 commit comments

Comments
 (0)