Skip to content

Commit 379e902

Browse files
committed
fix:guessable no guess mode fail on first click on mine
1 parent 98e95fc commit 379e902

File tree

5 files changed

+30
-37
lines changed

5 files changed

+30
-37
lines changed

src/ui/ui_main_board.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,6 @@ def setupUi(self, MainWindow):
462462
self.menu_3.addAction(self.actiongaun_yv)
463463
self.menu_3.addAction(self.actionauto_update)
464464
self.menu_3.addAction(self.actionchajian)
465-
self.menu_4.addAction(self.action_level)
466-
self.menu_4.addAction(self.action_best)
467465
self.menu_4.addAction(self.action_open_replay)
468466
self.menu_4.addAction(self.action_open_ini)
469467
self.menubar.addAction(self.menu.menuAction())
@@ -496,8 +494,8 @@ def retranslateUi(self, MainWindow):
496494
self.action_save.setText(_translate("MainWindow", "保存"))
497495
self.action_replay.setText(_translate("MainWindow", "回放"))
498496
self.actionauto_update.setText(_translate("MainWindow", "检查更新"))
499-
self.action_open_replay.setText(_translate("MainWindow", "录像所在位置"))
500-
self.action_open_ini.setText(_translate("MainWindow", "设置所在位置"))
497+
self.action_open_replay.setText(_translate("MainWindow", "录像目录"))
498+
self.action_open_ini.setText(_translate("MainWindow", "设置目录"))
501499
self.action_level.setText(_translate("MainWindow", "成就"))
502500
self.action_best.setText(_translate("MainWindow", "个人纪录"))
503501
self.actionchajian.setText(_translate("MainWindow", "插件"))

src/ui/ui_video_control.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,24 @@ def setupUi(self, Form):
9393
self.horizontalLayout.setObjectName("horizontalLayout")
9494
self.pushButton_replay = QtWidgets.QPushButton(self.widget)
9595
self.pushButton_replay.setMinimumSize(QtCore.QSize(40, 40))
96+
self.pushButton_replay.setMaximumSize(QtCore.QSize(40, 40))
9697
self.pushButton_replay.setToolTipDuration(0)
9798
self.pushButton_replay.setStyleSheet("QPushButton {\n"
98-
" border-image: url(media/replay.svg);\n"
99-
"}\n"
100-
"QPushButton::hover{\n"
101-
" background-color: rgb(170, 255, 255);\n"
99+
" background-color: rgba(0,0,0,0);\n"
100+
" border: none;\n"
101+
" image: url(media/replay.svg);\n"
102102
"}")
103103
self.pushButton_replay.setText("")
104104
self.pushButton_replay.setObjectName("pushButton_replay")
105105
self.horizontalLayout.addWidget(self.pushButton_replay)
106106
self.pushButton_play = QtWidgets.QPushButton(self.widget)
107107
self.pushButton_play.setMinimumSize(QtCore.QSize(40, 40))
108+
self.pushButton_play.setMaximumSize(QtCore.QSize(40, 40))
108109
self.pushButton_play.setToolTipDuration(0)
109110
self.pushButton_play.setStyleSheet("QPushButton {\n"
110-
" border-image: url(media/play.svg);\n"
111-
"}\n"
112-
"QPushButton::hover{\n"
113-
" background-color: rgb(170, 255, 255);\n"
111+
" background-color: rgba(0,0,0,0);\n"
112+
" border: none;\n"
113+
" image: url(media/play.svg);\n"
114114
"}")
115115
self.pushButton_play.setText("")
116116
self.pushButton_play.setObjectName("pushButton_play")

src/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ def enumerateChangeBoard(board: ms.EvfVideo | List[List[int]],
368368
"""
369369
if not isinstance(board, list):
370370
board = board.into_vec_vec()
371-
if all([board[x][y] != -1 for x, y in poses]):
372-
board = board.into_vec_vec()
371+
# if all([board[x][y] != -1 for x, y in poses]):
372+
# board = board.into_vec_vec()
373373
if all([board[x][y] != -1 for x, y in poses]):
374374
# 全不是雷
375375
return board, True

src/videoControl.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -420,21 +420,6 @@ def __init__(self, r_path, game_setting, parent):
420420

421421
self.horizontalSlider_time.valueChanged[int].connect(self.set_double_spin_box_time)
422422
self.doubleSpinBox_time.valueChanged[float].connect(self.set_horizontal_slider_time)
423-
424-
self.pushButton_replay.setStyleSheet("QPushButton{border-image: url(" +\
425-
str(r_path.with_name('media').\
426-
joinpath('replay.svg')).replace("\\", "/") + ");}")
427-
self.pushButton_play.setStyleSheet("QPushButton{border-image: url(" +\
428-
str(r_path.with_name('media').\
429-
joinpath('play.svg')).replace("\\", "/") + ");}")
430-
self.label_speed.setStyleSheet("QLabel{border-image: url(" +\
431-
str(r_path.with_name('media').\
432-
joinpath('speed.svg')).replace("\\", "/") + ");\n"
433-
"font: 12pt \"微软雅黑\";\n"
434-
"color: #50A6EA;}")
435-
self.label_2.setStyleSheet("border-image: url(" + str(r_path.with_name('media').joinpath('mul.svg')).replace("\\", "/") + ");\n"
436-
"font: 12pt \"微软雅黑\";\n"
437-
"color: #50A6EA;")
438423
self.QWidget.move(game_setting.value("DEFAULT/videocontroltop", 100, int),
439424
game_setting.value("DEFAULT/videocontrolleft", 300, int))
440425
self.tabWidget.tabCloseRequested.connect(self.close_tab)

uiFiles/ui_video_control.ui

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,12 @@ QSlider::add-page:horizontal:disabled, QSlider::sub-page:horizontal:disabled, QS
149149
<height>40</height>
150150
</size>
151151
</property>
152+
<property name="maximumSize">
153+
<size>
154+
<width>40</width>
155+
<height>40</height>
156+
</size>
157+
</property>
152158
<property name="toolTip">
153159
<string>重播</string>
154160
</property>
@@ -157,10 +163,9 @@ QSlider::add-page:horizontal:disabled, QSlider::sub-page:horizontal:disabled, QS
157163
</property>
158164
<property name="styleSheet">
159165
<string notr="true">QPushButton {
160-
border-image: url(media/replay.svg);
161-
}
162-
QPushButton::hover{
163-
background-color: rgb(170, 255, 255);
166+
background-color: rgba(0,0,0,0);
167+
border: none;
168+
image: url(media/replay.svg);
164169
}</string>
165170
</property>
166171
<property name="text">
@@ -176,6 +181,12 @@ QPushButton::hover{
176181
<height>40</height>
177182
</size>
178183
</property>
184+
<property name="maximumSize">
185+
<size>
186+
<width>40</width>
187+
<height>40</height>
188+
</size>
189+
</property>
179190
<property name="toolTip">
180191
<string>播放/暂停</string>
181192
</property>
@@ -184,10 +195,9 @@ QPushButton::hover{
184195
</property>
185196
<property name="styleSheet">
186197
<string notr="true">QPushButton {
187-
border-image: url(media/play.svg);
188-
}
189-
QPushButton::hover{
190-
background-color: rgb(170, 255, 255);
198+
background-color: rgba(0,0,0,0);
199+
border: none;
200+
image: url(media/play.svg);
191201
}</string>
192202
</property>
193203
<property name="text">

0 commit comments

Comments
 (0)