From 2fbc3c80cf2eab71ce9c5bf79eeb4e7ebd036fbb Mon Sep 17 00:00:00 2001 From: Tiger Date: Wed, 1 Apr 2026 13:29:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- assets/translation/trans.csv | 2 +- assets/translation/trans.en.translation | Bin 1972 -> 1972 bytes scripts/autoload/SceneManager.gd | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) 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 4f307051c5389514a29e2bb7c8be56946ea326e7..a70e04976dc62962b1aeeaa112d7ea45841e9fbb 100644 GIT binary patch delta 45 zcmdnOzlDE801Ko1=0Fx^W~re3{9J{g(!9LPymTvt$ox`;#G+J%h=>S<$$9K<06vfn A_5c6? delta 45 zcmdnOzlDE801KnS=0Fx^W~qNcY?HbF1wG(&`)9@QFEU!P@IO;TL Date: Thu, 2 Apr 2026 09:15:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84=EF=BC=8C=E6=9B=B4=E6=96=B0=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 +++++----- {prefabs => scenes}/game/card.tscn | 0 scenes/{ => game}/game.tscn | 0 scenes/{ => menus}/main_menu.tscn | 0 scenes/{ => menus}/settings.tscn | 0 scripts/game/game.gd | 2 +- scripts/main_menu/create_game_ui.gd | 2 +- scripts/main_menu/join_game_ui.gd | 2 +- scripts/main_menu/main_menu.gd | 2 +- scripts/settings/settings.gd | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename {prefabs => scenes}/game/card.tscn (100%) rename scenes/{ => game}/game.tscn (100%) rename scenes/{ => menus}/main_menu.tscn (100%) rename scenes/{ => menus}/settings.tscn (100%) diff --git a/README.md b/README.md index c831107..2103c97 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,11 @@ game/ - translation/ - trans.csv - scenes/ - - main_menu.tscn - - game.tscn - - settings.tscn -- prefabs/ + - menus/ + - main_menu.tscn + - settings.tscn - game/ + - game.tscn - card.tscn - scripts/ - autoload/ @@ -48,7 +48,7 @@ game/ ## 最佳实践 -本项目目前正在使用 Godot 4.6.1 进行开发。开发用语言为 GDScript。 +本项目目前正在使用 Godot 4.6.2 进行开发。开发用语言为 GDScript。 你的开发应当遵循 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)。但下面提到的除外： diff --git a/prefabs/game/card.tscn b/scenes/game/card.tscn similarity index 100% rename from prefabs/game/card.tscn rename to scenes/game/card.tscn diff --git a/scenes/game.tscn b/scenes/game/game.tscn similarity index 100% rename from scenes/game.tscn rename to scenes/game/game.tscn diff --git a/scenes/main_menu.tscn b/scenes/menus/main_menu.tscn similarity index 100% rename from scenes/main_menu.tscn rename to scenes/menus/main_menu.tscn diff --git a/scenes/settings.tscn b/scenes/menus/settings.tscn similarity index 100% rename from scenes/settings.tscn rename to scenes/menus/settings.tscn diff --git a/scripts/game/game.gd b/scripts/game/game.gd index 4882882..c240936 100644 --- a/scripts/game/game.gd +++ b/scripts/game/game.gd @@ -1,6 +1,6 @@ extends Node2D -var CardScene = preload("res://prefabs/game/card.tscn") +var CardScene = preload("res://scenes/game/card.tscn") var card_list: Array diff --git a/scripts/main_menu/create_game_ui.gd b/scripts/main_menu/create_game_ui.gd index 454b46f..e56477b 100644 --- a/scripts/main_menu/create_game_ui.gd +++ b/scripts/main_menu/create_game_ui.gd @@ -5,7 +5,7 @@ func _on_create_game_button_pressed() -> void: if 2 <= player_num and player_num <= 4: MultiGame.create_server(int(player_num)) $".".hide() - SceneManager.goto_scene("game") + SceneManager.goto_scene("game/game") else: $Warn.show() diff --git a/scripts/main_menu/join_game_ui.gd b/scripts/main_menu/join_game_ui.gd index 54324a3..7b78a49 100644 --- a/scripts/main_menu/join_game_ui.gd +++ b/scripts/main_menu/join_game_ui.gd @@ -5,4 +5,4 @@ func _on_join_game_button_pressed() -> void: var ip: String = $JoinGameEdit.text MultiGame.create_client(ip) $".".hide() - SceneManager.goto_scene("game") + SceneManager.goto_scene("game/game") diff --git a/scripts/main_menu/main_menu.gd b/scripts/main_menu/main_menu.gd index ea5c96c..8978e02 100644 --- a/scripts/main_menu/main_menu.gd +++ b/scripts/main_menu/main_menu.gd @@ -8,7 +8,7 @@ func _on_start_game_pressed() -> void: $CreateGameUI.show() func _on_setting_button_pressed() -> void: - SceneManager.goto_scene("settings") + SceneManager.goto_scene("menus/settings") func _on_quit_game_pressed() -> void: get_tree().quit() diff --git a/scripts/settings/settings.gd b/scripts/settings/settings.gd index cd99d79..b1c7b0e 100644 --- a/scripts/settings/settings.gd +++ b/scripts/settings/settings.gd @@ -25,7 +25,7 @@ func _on_save_button_pressed() -> void: func _on_cancel_button_pressed() -> void: - SceneManager.goto_scene("main_menu") + SceneManager.goto_scene("menus/main_menu") func _on_download_button_pressed() -> void: