diff --git a/README.md b/README.md index 7fb94d6..c831107 100644 --- a/README.md +++ b/README.md @@ -52,8 +52,8 @@ game/ 你的开发应当遵循 Godot 引擎提供的[最佳实践](https://docs.godotengine.org/zh-cn/4.x/tutorials/best_practices/)及[GDScript 编写风格指南](https://docs.godotengine.org/zh-cn/4.x/tutorials/scripting/gdscript/gdscript_styleguide.html)。但下面提到的除外: -除 `autoload` 目录下的单例脚本使用大驼峰式命名,其余脚本均应使用小蛇形式命名。所有节点均应使用大驼峰式命名。 +- 除 `autoload` 目录下的单例脚本使用大驼峰式命名,其余脚本均应使用小蛇形式命名。所有节点均应使用大驼峰式命名。 -除连接了信号或 HTTPRequest、MultiplayerAPI 的函数外,任何函数都不应该以下划线(`_`)开头。 +- 除连接了信号或 HTTPRequest、MultiplayerAPI 的函数外,任何函数都不应该以下划线(`_`)开头。 -函数之间只需间隔一行,无需间隔两行。 +- 函数之间只需间隔一行,无需间隔两行。 diff --git a/assets/translation/trans.csv b/assets/translation/trans.csv index 68beaa9..9b1905a 100644 --- a/assets/translation/trans.csv +++ b/assets/translation/trans.csv @@ -29,6 +29,6 @@ SETTINGS_TIP_REQUESTERROR,Tip: Download failed. Failed to create a request,提 SETTINGS_TIP_LOADING,Tip: Loading Resources. do not close the settings page,提示:正在加载资源,请勿关闭设置页面 SETTINGS_TIP_LOADED,Tip: Finish Loading,提示:完成加载 SETTINGS_TIP_NOLOCALSOURCE,Tip: No local data or no selection,提示:无本地数据或未选择,无法加载 -GAMEUI_URNULL,Roome Running: You are XXX XXXX,啊啊啊啊啊:啊啊啊啊 +GAMEUI_URNULL,Room Running: You are XXX XXXX,啊啊啊啊啊:啊啊啊啊 GAMEUI_URHOST,Room Running: You are the Host,房间运行中:您是房主 GAMEUI_URGUEST,Room Running: You are a Guest,房间运行中:您是房客 \ No newline at end of file diff --git a/assets/translation/trans.en.translation b/assets/translation/trans.en.translation index 4f30705..a70e049 100644 Binary files a/assets/translation/trans.en.translation and b/assets/translation/trans.en.translation differ diff --git a/scripts/autoload/SceneManager.gd b/scripts/autoload/SceneManager.gd index 7183e43..c9cbd52 100644 --- a/scripts/autoload/SceneManager.gd +++ b/scripts/autoload/SceneManager.gd @@ -9,5 +9,6 @@ func _ready(): current_scene = root.get_child(root.get_child_count() - 1) func goto_scene(path: String): - current_scene = path - get_tree().change_scene_to_file("res://scenes/%s.tscn" % [path]) \ No newline at end of file + get_tree().change_scene_to_file("res://scenes/%s.tscn" % [path]) + var root = get_tree().root + current_scene = root.get_child(root.get_child_count() - 1) \ No newline at end of file