bmq/xiandie
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge remote-tracking branch 'origin/demo'

Browse Source
This commit is contained in:
cakipaul 2025-07-14 12:44:15 +08:00
commit d204e8f894
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manager/archive_manager/archive_manager.gd
View File

@ -19,7 +19,7 @@ static var user_root_dir := "user://data/" # must end with "/"
static var archive_dir := "user://data/archives/"
static var archive_prefix := "save"
const CURRENT_VERSION = 5
const CURRENT_VERSION = 6
var archives := {}
var autosave_timer := Timer.new()

3
manager/config_manager/global_config_manager.gd
View File

@ -25,7 +25,8 @@ func _set_config(val: GlobalConfig) -> void:
print_rich("[color=orange]Debug mode enabled[/color]")
# set up window
if config.window_fullscreen:
get_window().mode = Window.MODE_FULLSCREEN
get_window().mode = Window.MODE_EXCLUSIVE_FULLSCREEN
# get_window().mode = Window.MODE_FULLSCREEN
else:
get_window().mode = Window.MODE_WINDOWED
get_window().always_on_top = config.window_top

9
scene/ground/scene/c02/s03_院子.gd
View File

@ -118,7 +118,7 @@ func _on_ground_ready() -> void:
bully_layer = $"../DeployLayer/霸凌"
burning_layer = $"../DeployLayer/火灾"
if EventManager.get_stage(&"c02_ball_game_stage") >= 3:
if EventManager.get_stage(&"c02_ball_game_stage") >= 3 and EventManager.get_chapter_stage() < 3:
_setup_bully_or_burning(true)
@ -203,10 +203,9 @@ func eavesdrop() -> void:
func _setup_bully_or_burning(reenter_scene := false):
if not ArchiveManager.get_global_value(&"c02_eavesdrop_finished"):
# 弹珠游戏结束后就开始霸凌，此时禁止偷听。第一章结束后（火灾结束），第二章再偷听
$"../DeployLayer/Ambush偷听对话".enabled = false
eavesdrop_window.visible = false
# 弹珠游戏结束后就开始霸凌，此时禁止偷听。第一章结束后（火灾结束），第二章再偷听
$"../DeployLayer/Ambush偷听对话".enabled = false
eavesdrop_window.visible = false
if EventManager.get_stage(&"c02_burning_end_stage") == 2:
# 火灾演出完全结束
burning_layer.visible = false