diff --git a/gui/gui_app.py b/gui/gui_app.py index cb61f26..48ca0a9 100644 --- a/gui/gui_app.py +++ b/gui/gui_app.py @@ -664,37 +664,7 @@ def main(): status_var = tk.StringVar(value="就绪") def get_params() -> RunParams: - return _get_params_impl({ - "infinite_loop_var": infinite_loop_var, - "wait_minutes_var": wait_minutes_var, - "device_var": device_var, - "y_var": y_var, - "needswitch_var": needswitch_var, - "skip_gt_seconds_var": skip_gt_seconds_var, - "reset_after_swipes_enabled_var": reset_after_swipes_enabled_var, - "reset_after_swipes_var": reset_after_swipes_var, - "min_value_var": min_value_var, - "min_participants_var": min_participants_var, - "max_participants_var": max_participants_var, - "auto_join_var": auto_join_var, - "fansclub_action_var": fansclub_action_var, - "high_value_room_revisit_enabled_var": high_value_room_revisit_enabled_var, - "high_value_room_revisit_only_current_run_var": high_value_room_revisit_only_current_run_var, - "high_value_room_revisit_min_interval_seconds_var": high_value_room_revisit_min_interval_seconds_var, - "high_value_room_revisit_max_per_run_var": high_value_room_revisit_max_per_run_var, - "high_value_room_revisit_min_prize_value_var": high_value_room_revisit_min_prize_value_var, - "high_value_room_revisit_max_age_days_var": high_value_room_revisit_max_age_days_var, - "high_value_fudai_poll_before_seconds_var": high_value_fudai_poll_before_seconds_var, - "reservation_back_verify_enabled_var": reservation_back_verify_enabled_var, - "reservation_back_swipe_delay_var": reservation_back_swipe_delay_var, - "fudai_find_max_attempts_var": fudai_find_max_attempts_var, - "enable_ocr_mode1_var": enable_ocr_mode1_var, - "fudai_template_match_enabled_var": fudai_template_match_enabled_var, - "fudai_template_match_threshold_var": fudai_template_match_threshold_var, - "yg_only_var": yg_only_var, - "yg_recommend_duration_var": yg_recommend_duration_var, - "enable_back_on_misses_var": enable_back_on_misses_var, - }) + return _get_params_impl({**_vars_, "device_var": device_var}) # 先打包 actions 到底部(不 expand,固定在底部) actions.pack(fill=X, pady=(10, 0), padx=12, side="bottom") # 然后打包 notebook 填充剩余空间(在 actions 之上)