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

Merge remote-tracking branch 'origin/demo'

Browse Source
This commit is contained in:
cakipaul 2025-07-29 16:18:29 +08:00
commit 4d5ceaadc9
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scene/entity/closeup.gd
View File

@ -35,7 +35,7 @@ func display() -> void:
return return
if packed_scene: if packed_scene:
if on_display_hide_hud and SceneManager.get_ground().display_hud: if on_display_hide_hud and SceneManager.get_ground().display_hud:
SceneManager.get_prop_hud().hide_hud() SceneManager.toggle_hud_display(false)
if on_display_change_volumn: if on_display_change_volumn:
get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX, "change_volumn_db" , on_display_changed_volumn_db) get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX, "change_volumn_db" , on_display_changed_volumn_db)
get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX2D, "change_volumn_db" , on_display_changed_volumn_db) get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX2D, "change_volumn_db" , on_display_changed_volumn_db)
@ -53,7 +53,7 @@ func display() -> void:
func _exit(arg = null): func _exit(arg = null):
if current_child: if current_child:
if on_display_hide_hud and SceneManager.get_ground().display_hud: if on_display_hide_hud and SceneManager.get_ground().display_hud:
SceneManager.get_prop_hud().display_hud() SceneManager.toggle_hud_display(true)
if on_display_change_volumn: if on_display_change_volumn:
get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX, "reset_volumn_to_default") get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX, "reset_volumn_to_default")
get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX2D, "reset_volumn_to_default") get_tree().call_group(GlobalConfig.GROUP_GROUND_SFX2D, "reset_volumn_to_default")

4
scene/little_game/八音盒/八音盒.gd
View File

@ -264,7 +264,7 @@ func _chechout_stage(s: int, play_sfx := true) -> void:
var display_handle_outline = false var display_handle_outline = false
if s >= 3: if s >= 3:
# 隐藏道具栏 # 隐藏道具栏
SceneManager.get_prop_hud().hide_hud() SceneManager.toggle_hud_display(false)
# 禁止退出特写 # 禁止退出特写
var closeup = get_parent() as Closeup2D var closeup = get_parent() as Closeup2D
if closeup: if closeup:
@ -336,7 +336,7 @@ func _unhandled_input(event: InputEvent) -> void:
if stage == 3: if stage == 3:
# 摇把手阶段不可退出 # 摇把手阶段不可退出
return return
SceneManager.get_prop_hud().display_hud() SceneManager.toggle_hud_display(true)
exit.emit(false) exit.emit(false)

4
scene/little_game/弹珠游戏/弹珠游戏.gd
View File

@ -75,7 +75,7 @@ var shooting = false
func checkout_round(r: int): func checkout_round(r: int):
if r == 0: if r == 0:
# 游戏开始，隐藏 hud # 游戏开始，隐藏 hud
SceneManager.get_prop_hud().hide_hud() SceneManager.toggle_hud_display(false)
round_id = r round_id = r
# 关闭所有碰撞 # 关闭所有碰撞
for i in range(3): for i in range(3):
@ -263,7 +263,7 @@ func game_win() -> void:
var scene = DialogueManager.show_dialogue_balloon_scene(dialog_balloon_scene, dialogue_c02, "c02_弹珠游戏4") var scene = DialogueManager.show_dialogue_balloon_scene(dialog_balloon_scene, dialogue_c02, "c02_弹珠游戏4")
await scene.ball_dialogue_ended await scene.ball_dialogue_ended
await Util.wait(3.0) await Util.wait(3.0)
SceneManager.get_prop_hud().display_hud() SceneManager.toggle_hud_display(true)
exit.emit(true) exit.emit(true)