Skip to content

Commit 8488d21

Browse files
committed
v2.0.0,开始打包
1 parent 2e1de8d commit 8488d21

File tree

11 files changed

+1328
-505
lines changed

11 files changed

+1328
-505
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,4 @@ cython_debug/
193193
/data/audio
194194
/data/TEMP
195195
/data/CSES
196+
/data/images

CHANGELOG/v2.0.0/CHANGELOG.md

Lines changed: 232 additions & 13 deletions
Large diffs are not rendered by default.

app/Language/modules/update.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"update_source": {
5555
"name": "更新源选择",
5656
"description": "选择软件更新下载来源",
57-
"combo_items": ["github", "ghfast", "gh-proxy"],
57+
"combo_items": ["自动检测延迟", "github", "ghfast", "gh-proxy"],
5858
},
5959
},
6060
"EN_US": {
@@ -109,7 +109,12 @@
109109
"update_source": {
110110
"name": "Update source selection",
111111
"description": "Select source of download for software update",
112-
"combo_items": {"0": "GitHub", "1": "ghfast", "2": "gh-proxy"},
112+
"combo_items": {
113+
"0": "Auto detect delay",
114+
"1": "GitHub",
115+
"2": "ghfast",
116+
"3": "gh-proxy",
117+
},
113118
},
114119
"force_check": {"name": "Force check for updates"},
115120
"already_downloaded_same_version": {

app/common/display/result_display.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,19 +467,25 @@ def create_student_label(
467467

468468
for i, (num, selected, exist) in enumerate(selected_students):
469469
current_image_path = None
470-
# 在小组模式下,尝试使用小组名称作为图片文件名
470+
# 根据settings_group确定图片目录
471471
if show_student_image:
472472
image_name = str(selected)
473+
# 根据settings_group选择不同的图片目录
474+
if settings_group == "lottery_settings":
475+
image_dir = "prize_images"
476+
else:
477+
image_dir = "student_images"
478+
473479
# 内存优化:使用生成器表达式减少内存分配
474480
for ext in (
475481
ext
476482
for ext in SUPPORTED_IMAGE_EXTENSIONS
477483
if file_exists(
478-
get_data_path("images", f"students/{image_name}{ext}")
484+
get_data_path("images", f"{image_dir}/{image_name}{ext}")
479485
)
480486
):
481487
current_image_path = str(
482-
get_data_path("images", f"students/{image_name}{ext}")
488+
get_data_path("images", f"{image_dir}/{image_name}{ext}")
483489
)
484490
break
485491

app/tools/settings_default_storage.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"half_repeat": {"default_value": 1},
128128
"draw_type": {"default_value": 0},
129129
"default_class": {"default_value": ""},
130-
"disable_after_click": {"default_value": 2},
130+
"disable_after_click": {"default_value": 1},
131131
"font_size": {"default_value": 50},
132132
"display_format": {"default_value": 0},
133133
"use_global_font": {"default_value": 0},
@@ -209,7 +209,7 @@
209209
"floating_window_position": {"default_value": 0},
210210
"floating_window_horizontal_offset": {"default_value": 0},
211211
"floating_window_vertical_offset": {"default_value": 0},
212-
"floating_window_transparency": {"default_value": 0.6},
212+
"floating_window_transparency": {"default_value": 0.8},
213213
"floating_window_auto_close_time": {"default_value": 5},
214214
"use_main_window_when_exceed_threshold": {"default_value": True},
215215
"main_window_display_threshold": {"default_value": 5},
@@ -234,7 +234,7 @@
234234
"floating_window_position": {"default_value": 0},
235235
"floating_window_horizontal_offset": {"default_value": 0},
236236
"floating_window_vertical_offset": {"default_value": 0},
237-
"floating_window_transparency": {"default_value": 0.6},
237+
"floating_window_transparency": {"default_value": 0.8},
238238
"floating_window_auto_close_time": {"default_value": 5},
239239
"notification_service_type": {"default_value": 0},
240240
"notification_display_duration": {"default_value": 5},
@@ -257,7 +257,7 @@
257257
"floating_window_position": {"default_value": 0},
258258
"floating_window_horizontal_offset": {"default_value": 0},
259259
"floating_window_vertical_offset": {"default_value": 0},
260-
"floating_window_transparency": {"default_value": 0.6},
260+
"floating_window_transparency": {"default_value": 0.8},
261261
"floating_window_auto_close_time": {"default_value": 5},
262262
"use_main_window_when_exceed_threshold": {"default_value": True},
263263
"main_window_display_threshold": {"default_value": 5},
@@ -476,7 +476,7 @@
476476
"title": {"default_value": None},
477477
"auto_update_mode": {"default_value": 3},
478478
"update_channel": {"default_value": 0},
479-
"update_source": {"default_value": 1},
479+
"update_source": {"default_value": 0},
480480
"last_check_time": {"default_value": "1970-01-01 08:00:00"},
481481
},
482482
"about": {

0 commit comments

Comments
 (0)