Skip to content

Commit 95c4ea2

Browse files
committed
调整难度后,其余设置同步修改
1 parent 90b4748 commit 95c4ea2

File tree

5 files changed

+45
-6
lines changed

5 files changed

+45
-6
lines changed

src/gameScoreBoard.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ def update_namespace(self, ms_board, index_type):
225225
"corr": ms_board.corr,
226226
"ce": ms_board.ce,
227227
"ce_s": ms_board.ce_s,
228+
"rce": ms_board.rce,
229+
"lce": ms_board.lce,
230+
"dce": ms_board.dce,
228231
})
229232
if index_type >= 3:
230233
self.namespace.update({

src/mineSweeperGUI.py

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,18 @@ def pixSize(self, pixSize):
153153
self.predefinedBoardPara[2]['pixsize'] = pixSize
154154
elif (self.row, self.column, self.mineNum) == (16, 30, 99):
155155
self.predefinedBoardPara[3]['pixsize'] = pixSize
156+
elif (self.row, self.column, self.mineNum) == (self.predefinedBoardPara[4]['row'],
157+
self.predefinedBoardPara[4]['column'],
158+
self.predefinedBoardPara[4]['mine_num']):
159+
self.predefinedBoardPara[4]['pixsize'] = pixSize
160+
elif (self.row, self.column, self.mineNum) == (self.predefinedBoardPara[5]['row'],
161+
self.predefinedBoardPara[5]['column'],
162+
self.predefinedBoardPara[5]['mine_num']):
163+
self.predefinedBoardPara[5]['pixsize'] = pixSize
164+
elif (self.row, self.column, self.mineNum) == (self.predefinedBoardPara[6]['row'],
165+
self.predefinedBoardPara[6]['column'],
166+
self.predefinedBoardPara[6]['mine_num']):
167+
self.predefinedBoardPara[6]['pixsize'] = pixSize
156168
else:
157169
self.predefinedBoardPara[0]['pixsize'] = pixSize
158170

@@ -1052,6 +1064,30 @@ def setBoard(self, row, column, mineNum):
10521064
self.gameMode = self.predefinedBoardPara[3]['gamemode']
10531065
self.board_constraint = self.predefinedBoardPara[3]['board_constraint']
10541066
self.attempt_times_limit = self.predefinedBoardPara[3]['attempt_times_limit']
1067+
elif (row, column, mineNum) == (self.predefinedBoardPara[4]['row'],
1068+
self.predefinedBoardPara[4]['column'],
1069+
self.predefinedBoardPara[4]['mine_num']):
1070+
self.actionChecked('C')
1071+
self.pixSize = self.predefinedBoardPara[4]['pixsize']
1072+
self.gameMode = self.predefinedBoardPara[4]['gamemode']
1073+
self.board_constraint = self.predefinedBoardPara[4]['board_constraint']
1074+
self.attempt_times_limit = self.predefinedBoardPara[4]['attempt_times_limit']
1075+
elif (row, column, mineNum) == (self.predefinedBoardPara[5]['row'],
1076+
self.predefinedBoardPara[5]['column'],
1077+
self.predefinedBoardPara[5]['mine_num']):
1078+
self.actionChecked('C')
1079+
self.pixSize = self.predefinedBoardPara[5]['pixsize']
1080+
self.gameMode = self.predefinedBoardPara[5]['gamemode']
1081+
self.board_constraint = self.predefinedBoardPara[5]['board_constraint']
1082+
self.attempt_times_limit = self.predefinedBoardPara[5]['attempt_times_limit']
1083+
elif (row, column, mineNum) == (self.predefinedBoardPara[6]['row'],
1084+
self.predefinedBoardPara[6]['column'],
1085+
self.predefinedBoardPara[6]['mine_num']):
1086+
self.actionChecked('C')
1087+
self.pixSize = self.predefinedBoardPara[6]['pixsize']
1088+
self.gameMode = self.predefinedBoardPara[6]['gamemode']
1089+
self.board_constraint = self.predefinedBoardPara[6]['board_constraint']
1090+
self.attempt_times_limit = self.predefinedBoardPara[6]['attempt_times_limit']
10551091
else:
10561092
self.actionChecked('C')
10571093
self.pixSize = self.predefinedBoardPara[0]['pixsize']

src/superGUI.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@ def __init__(self, MainWindow, args):
205205
self.read_or_create_record()
206206
self.label.setPath(r_path)
207207
self.label_2.setPath(r_path)
208-
self.read_or_create_game_setting()
209-
self.initMineArea()
210208

211209

212210
self.readPredefinedBoardPara()
211+
self.read_or_create_game_setting()
212+
self.initMineArea()
213213
self.retranslateUi(MainWindow)
214214

215215
self.trans = QTranslator()

src/ui/ui_defined_parameter.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def setupUi(self, Form):
7979
"color:black;")
8080
self.spinBox.setAlignment(QtCore.Qt.AlignCenter)
8181
self.spinBox.setMinimum(6)
82-
self.spinBox.setMaximum(1000)
82+
self.spinBox.setMaximum(255)
8383
self.spinBox.setDisplayIntegerBase(10)
8484
self.spinBox.setObjectName("spinBox")
8585
self.gridLayout.addWidget(self.spinBox, 0, 1, 1, 2)
@@ -107,7 +107,7 @@ def setupUi(self, Form):
107107
"color:black;")
108108
self.spinBox_2.setAlignment(QtCore.Qt.AlignCenter)
109109
self.spinBox_2.setMinimum(6)
110-
self.spinBox_2.setMaximum(1000)
110+
self.spinBox_2.setMaximum(255)
111111
self.spinBox_2.setDisplayIntegerBase(10)
112112
self.spinBox_2.setObjectName("spinBox_2")
113113
self.gridLayout.addWidget(self.spinBox_2, 1, 1, 1, 2)

uiFiles/ui_defined_parameter.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ color:black;</string>
159159
<number>6</number>
160160
</property>
161161
<property name="maximum">
162-
<number>1000</number>
162+
<number>255</number>
163163
</property>
164164
<property name="displayIntegerBase">
165165
<number>10</number>
@@ -208,7 +208,7 @@ color:black;</string>
208208
<number>6</number>
209209
</property>
210210
<property name="maximum">
211-
<number>1000</number>
211+
<number>255</number>
212212
</property>
213213
<property name="displayIntegerBase">
214214
<number>10</number>

0 commit comments

Comments
 (0)