Skip to content

Commit 03c887b

Browse files
committed
chore:设计上下文事件、标识自动去除前后空格
1 parent f653468 commit 03c887b

7 files changed

Lines changed: 42 additions & 16 deletions

File tree

src/gameSettings.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ def processParameter(self):
117117
v = self.spinBox_auto_replay.value()
118118
self.auto_replay = v if self.checkBox_auto_replay.isChecked() else -v
119119
self.auto_notification = self.checkBox_auto_notification.isChecked()
120-
self.player_identifier = self.lineEdit_label.text()
121-
self.race_identifier = self.lineEdit_race_label.text()
122-
self.unique_identifier = self.lineEdit_unique_label.text()
120+
self.player_identifier = self.lineEdit_label.text().strip()
121+
self.race_identifier = self.lineEdit_race_label.text().strip()
122+
self.unique_identifier = self.lineEdit_unique_label.text().strip()
123123
self.country = self.comboBox_country.currentText()
124124
self.autosave_video = self.checkBox_autosave_video.isChecked()
125125
self.autosave_video_set = self.checkBox_autosave_video_set.isChecked()

src/mineSweeperGUI.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ def onGameFinished(self, new_game_state):
357357
software = self.label.ms_board.software,
358358
player_identifier = self.label.ms_board.player_identifier,
359359
race_identifier = self.label.ms_board.race_identifier,
360-
uniqueness_identifier = self.label.ms_board.uniqueness_identifier,
360+
unique_identifier = self.label.ms_board.unique_identifier,
361361
is_official = self.label.ms_board.is_official,
362362
is_fair = self.label.ms_board.is_fair,
363363
op = self.label.ms_board.op,
@@ -805,7 +805,7 @@ def dump_evf_file_data(self):
805805
self.label.ms_board.mode = self.gameMode
806806
self.label.ms_board.player_identifier = self.player_identifier
807807
self.label.ms_board.race_identifier = self.race_identifier
808-
self.label.ms_board.uniqueness_identifier = self.unique_identifier
808+
self.label.ms_board.unique_identifier = self.unique_identifier
809809
self.label.ms_board.country = "XX" if not self.country else\
810810
country_name[self.country].upper()
811811
self.label.ms_board.device_uuid = hashlib.md5(
@@ -1124,7 +1124,7 @@ def try_append_evfs(self, new_game_state):
11241124
self.label.ms_board.mode = self.gameMode
11251125
self.label.ms_board.player_identifier = self.player_identifier
11261126
self.label.ms_board.race_identifier = self.race_identifier
1127-
self.label.ms_board.uniqueness_identifier = self.unique_identifier
1127+
self.label.ms_board.unique_identifier = self.unique_identifier
11281128
self.label.ms_board.country = "XX" if not self.country else\
11291129
country_name[self.country].upper()
11301130
self.label.ms_board.device_uuid = hashlib.md5(
@@ -1284,6 +1284,7 @@ def action_NEvent(self):
12841284
self.player_identifier = ui.player_identifier
12851285
self.label_info.setText(self.player_identifier)
12861286
self.race_identifier = ui.race_identifier
1287+
self.unique_identifier = ui.unique_identifier
12871288
# 用户的国家或地区名的全称,例如”中国“。必须是country_name中有的或None
12881289
# 播放录像时,self.country不会遭到修改
12891290
self.country = ui.country

src/plugins/history/history_table.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class HistoryTable(QWidget):
6666
"software",
6767
"player_identifier",
6868
"race_identifier",
69-
"uniqueness_identifier",
69+
"unique_identifier",
7070
"stnb",
7171
"corr",
7272
"thrp",

src/plugins/history/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class HistoryData:
137137
software: str = ""
138138
player_identifier: str = ""
139139
race_identifier: str = ""
140-
uniqueness_identifier: str = ""
140+
unique_identifier: str = ""
141141
stnb: float = 0.0
142142
corr: float = 0.0
143143
thrp: float = 0.0

src/plugins/history/plugin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ def _init_db(self) -> None:
189189
software TEXT,
190190
player_identifier TEXT,
191191
race_identifier TEXT,
192-
uniqueness_identifier TEXT,
192+
unique_identifier TEXT,
193193
stnb REAL,
194194
corr REAL,
195195
thrp REAL,

src/shared_types/events.py

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,31 @@ class GameStatusChangeEvent(BaseEvent, tag="game_status_change"):
4747

4848

4949
class ContextChangeEvent(BaseEvent, tag="context_change"):
50-
"""上下文变化事件"""
51-
pass
50+
"""上下文变化事件。"""
51+
pix_size: int = 20
52+
rows: int = 16
53+
cols: int = 30
54+
mine_num: int = 99
55+
game_mode: int = 0
56+
# “自动重开比例”,大于等于该比例时,不自动重开。负号表示禁用,负数表示禁用的值。0相当于禁用,但可以编辑。
57+
auto_replay: int = 30
58+
end_then_flag: bool = False
59+
cursor_limit: bool = False
60+
# 是否自动弹窗
61+
auto_notification: bool = True
62+
player_identifier:str = ""
63+
race_identifier: str = ""
64+
unique_identifier: str = ""
65+
# 用户的国家或地区名的全称,例如”中国“。必须是country_name中有的或None
66+
# 播放录像时,self.country不会遭到修改
67+
country: str = ""
68+
autosave_video: bool = True
69+
autosave_video_set: bool = True
70+
# 是否永远使用筛选法取得无猜局面
71+
filter_forever: bool = False
72+
board_constraint: str = ""
73+
attempt_times_limit: int = 100000
74+
language: str = "en_US"
5275

5376

5477
class ButtonClickEvent(BaseEvent, tag="button_click"):
@@ -98,7 +121,7 @@ class GameFinishedEvent(BaseEvent, tag="game_end"):
98121
software: str = "元 3.2.2"
99122
player_identifier: str = "Wang Jianing"
100123
race_identifier: str = "G1234"
101-
uniqueness_identifier: str = ""
124+
unique_identifier: str = ""
102125
is_official: bool = False
103126
is_fair: bool = False
104127
op: int = 0

src/superGUI.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -497,13 +497,14 @@ def read_or_create_game_setting(self):
497497
# 画局面,因此尺寸较完全初始化后偏小,仍有可能有半个窗口在屏幕外,当然这不影响使用。
498498
self.mainWindow.move(mainWinLeft, mainWinTop)
499499

500-
self._row = self.game_setting.get_or_set_value("DEFAULT/row", 16, int)
501-
self._column = self.game_setting.get_or_set_value("DEFAULT/column", 30, int)
502-
self._minenum = self.game_setting.get_or_set_value("DEFAULT/minenum", 99, int)
500+
self._row: int = self.game_setting.get_or_set_value("DEFAULT/row", 16, int)
501+
self._column: int = self.game_setting.get_or_set_value("DEFAULT/column", 30, int)
502+
self._minenum: int = self.game_setting.get_or_set_value("DEFAULT/minenum", 99, int)
503503
self.mineUnFlagedNum = self.minenum
504-
# “自动重开比例”,大于等于该比例时,不自动重开。负数表示禁用。0相当于禁用,但可以编辑。
504+
# “自动重开比例”,大于等于该比例时,不自动重开。负号表示禁用,负数表示禁用的值。0相当于禁用,但可以编辑。
505505
self.auto_replay = self.game_setting.get_or_set_value("DEFAULT/auto_replay", -30, int)
506506
# self.allow_auto_replay = self.game_setting.get_or_set_value("DEFAULT/allow_auto_replay", True, bool)
507+
# 是否自动弹窗
507508
self.auto_notification = self.game_setting.get_or_set_value("DEFAULT/auto_notification", True, bool)
508509
self.player_identifier = self.game_setting.get_or_set_value("DEFAULT/player_identifier", "匿名玩家(anonymous player)", str)
509510
self.race_identifier = self.game_setting.get_or_set_value("DEFAULT/race_identifier", "", str)
@@ -512,6 +513,7 @@ def read_or_create_game_setting(self):
512513
# 是否自动保存录像。开启时,自动保存所有扫完的、正式的录像。假如要其他保存策略,应使用插件来完成。
513514
self.autosave_video = self.game_setting.get_or_set_value("DEFAULT/autosave_video", True, bool)
514515
self.autosave_video_set = self.game_setting.get_or_set_value("DEFAULT/autosave_video_set", False, bool)
516+
# 是否永远使用筛选法取得无猜局面
515517
self.filter_forever = self.game_setting.get_or_set_value("DEFAULT/filter_forever", False, bool)
516518
self.language = self.game_setting.get_or_set_value("DEFAULT/language", "en_US", str)
517519
self.end_then_flag = self.game_setting.get_or_set_value("DEFAULT/end_then_flag", True, bool)

0 commit comments

Comments
 (0)