Skip to content

Commit 3e66528

Browse files
committed
feat: 打开目录。fix:ui文件错误
1 parent c353c88 commit 3e66528

File tree

5 files changed

+24
-10
lines changed

5 files changed

+24
-10
lines changed

src/main.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
import mineSweeperGUI as mineSweeperGUI
1111
import ms_toollib as ms
1212
import ctypes
13-
from ctypes import wintypes
13+
# from ctypes import wintypes
1414
from mp_plugins.context import AppContext
1515
from mp_plugins.events import *
1616
from mp_plugins import PluginManager
1717
from pathlib import Path
18-
import os
18+
# import os
1919

2020
os.environ["QT_FONT_DPI"] = "96"
2121

src/mineSweeperGUI.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from PyQt5 import QtCore
2-
from PyQt5.QtCore import QTimer, QCoreApplication, Qt, QRect
3-
from PyQt5.QtGui import QPixmap
2+
from PyQt5.QtCore import QTimer, QCoreApplication, Qt, QRect, QUrl
3+
from PyQt5.QtGui import QPixmap, QDesktopServices
44
# from PyQt5.QtWidgets import QLineEdit, QInputDialog, QShortcut
55
# from PyQt5.QtWidgets import QApplication, QFileDialog, QWidget
66
import gameDefinedParameter
@@ -55,7 +55,6 @@ def __init__(self, MainWindow: MainWindow, args):
5555
self.actionzhogn_ji.triggered.connect(lambda: self.predefined_Board(2))
5656
self.actiongao_ji.triggered.connect(lambda: self.predefined_Board(3))
5757
self.actionzi_ding_yi.triggered.connect(self.action_CEvent)
58-
self.actiongao_ji.triggered.connect(lambda: self.predefined_Board(3))
5958

6059
def save_evf_file_integrated():
6160
if self.game_state != "ready" and self.game_state != "playing" and\
@@ -81,6 +80,13 @@ def save_evf_file_integrated():
8180
lambda: self.trans_language("pl_PL"))
8281
self.german_action.triggered.connect(
8382
lambda: self.trans_language("de_DE"))
83+
84+
# 查看菜单
85+
self.action_open_replay.triggered.connect(
86+
lambda: QDesktopServices.openUrl(
87+
QUrl.fromLocalFile(str(self.setting_path / 'replay'))))
88+
self.action_open_ini.triggered.connect(
89+
lambda: QDesktopServices.openUrl(QUrl.fromLocalFile(str(self.setting_path))))
8490

8591
# config = configparser.ConfigParser()
8692
# config.read(self.game_setting_path, encoding='utf-8')
@@ -286,6 +292,7 @@ def minenum(self, minenum):
286292
self._minenum = minenum
287293

288294
def layMine(self, i, j):
295+
289296
xx = self.row
290297
yy = self.column
291298
num = self.minenum
@@ -475,7 +482,7 @@ def mineNumWheel(self, i):
475482
# self.timer_mine_num.start(3000)
476483

477484
def gameStart(self):
478-
# 画界面,但是不埋雷
485+
# 画界面,但是不埋雷。等价于点脸、f2、设置确定后的效果
479486
self.mineUnFlagedNum = self.minenum # 没有标出的雷,显示在左上角
480487
self.showMineNum(self.mineUnFlagedNum) # 在左上角画雷数
481488
# pixmap = QPixmap(self.pixmapNum[14])
@@ -513,13 +520,10 @@ def gameRestart(self, e=None): # 画界面,但是不埋雷,改数据而不
513520
return
514521
# 此时self.label.ms_board是utils.abstract_game_board的实例
515522
if self.game_state == 'display' or self.game_state == 'showdisplay':
516-
# self.timer_video.stop()
517-
# self.ui_video_control.QWidget.close()
518523
self.label.ms_board = ms.BaseVideo(
519524
[[0] * self.column for _ in range(self.row)], self.pixSize)
520525
self.label.ms_board.mode = self.gameMode
521526
elif self.game_state == 'study':
522-
# self.num_bar_ui.QWidget.close()
523527
self.score_board_manager.visible()
524528
self.label.ms_board = ms.BaseVideo(
525529
[[0] * self.column for _ in range(self.row)], self.pixSize)

src/ui/ui_main_board.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@ def setupUi(self, MainWindow):
436436
self.action_best.setFont(font)
437437
self.action_best.setShortcut("P")
438438
self.action_best.setObjectName("action_best")
439+
self.actionchajian = QtWidgets.QAction(MainWindow)
440+
self.actionchajian.setObjectName("actionchajian")
439441
self.menu.addAction(self.actionopen)
440442
self.menu.addSeparator()
441443
self.menu.addAction(self.actionnew_game)
@@ -459,6 +461,7 @@ def setupUi(self, MainWindow):
459461
self.menu_2.addAction(self.language_menu.menuAction())
460462
self.menu_3.addAction(self.actiongaun_yv)
461463
self.menu_3.addAction(self.actionauto_update)
464+
self.menu_3.addAction(self.actionchajian)
462465
self.menu_4.addAction(self.action_level)
463466
self.menu_4.addAction(self.action_best)
464467
self.menu_4.addAction(self.action_open_replay)
@@ -497,6 +500,7 @@ def retranslateUi(self, MainWindow):
497500
self.action_open_ini.setText(_translate("MainWindow", "设置所在位置"))
498501
self.action_level.setText(_translate("MainWindow", "成就"))
499502
self.action_best.setText(_translate("MainWindow", "个人纪录"))
503+
self.actionchajian.setText(_translate("MainWindow", "插件"))
500504
from ui.mineLabel import mineLabel
501505
from ui.mineNumLabel import mineNumLabel
502506
from ui.uiComponents import StatusLabel

src/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def enumerateChangeBoard(board: ms.EvfVideo | List[List[int]],
176176
for j in range(len(board[0])):
177177
if game_board[i][j] == 11:
178178
game_board[i][j] = 10
179-
game_board = ms.mark_board(game_board)
179+
game_board = ms.mark_board(game_board, remark=True)
180180
if any([game_board[x][y] == 11 for x,y in poses]):
181181
# 有一个必然是雷,就直接返回
182182
return board, False

uiFiles/main_board.ui

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,7 @@
684684
</property>
685685
<addaction name="actiongaun_yv"/>
686686
<addaction name="actionauto_update"/>
687+
<addaction name="actionchajian"/>
687688
</widget>
688689
<widget class="QMenu" name="menu_4">
689690
<property name="font">
@@ -1061,6 +1062,11 @@
10611062
<string notr="true">P</string>
10621063
</property>
10631064
</action>
1065+
<action name="actionchajian">
1066+
<property name="text">
1067+
<string>插件</string>
1068+
</property>
1069+
</action>
10641070
</widget>
10651071
<customwidgets>
10661072
<customwidget>

0 commit comments

Comments
 (0)