From 2ae86f760108b3a2a37249b9908dedf356a7fd1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A0=91=E8=90=8C=E8=8A=BD?= <3205788256@qq.com> Date: Mon, 21 Jul 2025 10:40:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E5=86=9C?= =?UTF-8?q?=E5=9C=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainGame.gd | 12 ++++---- Network/TCPNetworkManager.gd | 2 +- Script/BigPanel/LoginPanel.gd | 4 +-- Script/SmallPanel/AccountSettingPanel.gd | 6 ++-- Server/TCPGameServer.py | 18 +++++------ Server/chat/2025-07-21.log | 2 ++ .../config/initial_player_data_template.json | 2 +- Server/game_saves/2143323382.json | 2 +- Server/game_saves/2804775686.json | 4 +-- server/game_saves/3205788256.json | 30 +++++++++---------- 10 files changed, 42 insertions(+), 40 deletions(-) diff --git a/MainGame.gd b/MainGame.gd index 626ce33..c53aa1d 100644 --- a/MainGame.gd +++ b/MainGame.gd @@ -389,7 +389,7 @@ func _handle_visit_player_response(data): original_player_data = { "玩家账号": user_name, "玩家昵称": show_player_name.text.replace("玩家昵称：", ""), - "farm_name": show_farm_name.text.replace("农场名称：", ""), + "农场名称": show_farm_name.text.replace("农场名称：", ""), "level": level, "money": money, "experience": experience, @@ -416,7 +416,7 @@ func _handle_visit_player_response(data): # 更新UI显示 show_player_name.text = "玩家昵称：" + target_player_data.get("玩家昵称", "未知") - show_farm_name.text = "农场名称：" + target_player_data.get("farm_name", "未知农场") + show_farm_name.text = "农场名称：" + target_player_data.get("农场名称", "未知农场") # 显示被访问玩家的点赞数 var target_likes = target_player_data.get("点赞数", 0) @@ -493,7 +493,7 @@ func _handle_return_my_farm_response(data): # 恢复UI显示 show_player_name.text = "玩家昵称：" + player_data.get("玩家昵称", "未知") - show_farm_name.text = "农场名称：" + player_data.get("farm_name", "我的农场") + show_farm_name.text = "农场名称：" + player_data.get("农场名称", "我的农场") # 显示自己的点赞数 var my_likes = player_data.get("点赞数", 0) @@ -2447,7 +2447,7 @@ func _handle_account_setting_response(data: Dictionary): # 只更新账户相关信息，不影响农场和背包数据 user_password = account_info["玩家密码"] - show_farm_name.text = "农场名称：" + account_info.get("farm_name", "") + show_farm_name.text = "农场名称：" + account_info.get("农场名称", "") show_player_name.text = "玩家昵称：" + account_info.get("玩家昵称", "") # 更新基本游戏状态显示 @@ -2459,13 +2459,13 @@ func _handle_account_setting_response(data: Dictionary): if login_data.size() > 0: login_data["玩家密码"] = account_info.get("玩家密码", "") login_data["玩家昵称"] = account_info.get("玩家昵称", "") - login_data["farm_name"] = account_info.get("farm_name", "") + login_data["农场名称"] = account_info.get("农场名称", "") login_data["个人简介"] = account_info.get("个人简介", "") if data.size() > 0: data["玩家密码"] = account_info.get("玩家密码", "") data["玩家昵称"] = account_info.get("玩家昵称", "") - data["farm_name"] = account_info.get("farm_name", "") + data["农场名称"] = account_info.get("农场名称", "") data["个人简介"] = account_info.get("个人简介", "") # 更新UI显示 diff --git a/Network/TCPNetworkManager.gd b/Network/TCPNetworkManager.gd index d5c5953..ae40d42 100644 --- a/Network/TCPNetworkManager.gd +++ b/Network/TCPNetworkManager.gd @@ -677,7 +677,7 @@ func sendRegisterInfo(username, password, farmname, player_name="", verification "type": "register", "username": username, "password": password, - "farm_name": farmname, + "农场名称": farmname, "玩家昵称": player_name, "verification_code": verification_code, "client_version": main_game.client_version diff --git a/Script/BigPanel/LoginPanel.gd b/Script/BigPanel/LoginPanel.gd index df7c50f..f3277ba 100644 --- a/Script/BigPanel/LoginPanel.gd +++ b/Script/BigPanel/LoginPanel.gd @@ -423,9 +423,9 @@ func _handle_login_success(user_data: Dictionary): main_game.level = user_data.get("level", 1) main_game.money = user_data.get("money", 0) main_game.stamina = user_data.get("体力值", 20) - main_game.show_farm_name.text = "农场名称：" + user_data.get("farm_name", "") + main_game.show_farm_name.text = "农场名称：" + user_data.get("农场名称", "") main_game.show_player_name.text = "玩家昵称：" + user_data.get("玩家昵称", "") - farmname_input.text = user_data.get("farm_name", "") + farmname_input.text = user_data.get("农场名称", "") # 加载各种背包数据 main_game.player_bag = user_data.get("种子仓库", []) diff --git a/Script/SmallPanel/AccountSettingPanel.gd b/Script/SmallPanel/AccountSettingPanel.gd index 35dda75..2cfcb2b 100644 --- a/Script/SmallPanel/AccountSettingPanel.gd +++ b/Script/SmallPanel/AccountSettingPanel.gd @@ -191,7 +191,7 @@ func _refresh_player_info(): var player_data = main_game.login_data #if main_game.login_data.size() > 0 else main_game.data player_name_input.text = player_data.get("玩家昵称", "") - farm_name_input.text = player_data.get("farm_name", "") + farm_name_input.text = player_data.get("农场名称", "") personal_profile_input.text = player_data.get("个人简介", "") @@ -218,8 +218,8 @@ func handle_account_response(response_data: Dictionary): if main_game: if updated_data.has("玩家昵称"): main_game.login_data["玩家昵称"] = updated_data["玩家昵称"] - if updated_data.has("farm_name"): - main_game.login_data["farm_name"] = updated_data["farm_name"] + if updated_data.has("农场名称"): + main_game.login_data["农场名称"] = updated_data["农场名称"] if updated_data.has("个人简介"): main_game.login_data["个人简介"] = updated_data["个人简介"] if updated_data.has("玩家密码"): diff --git a/Server/TCPGameServer.py b/Server/TCPGameServer.py index 4ac9c45..5f5e265 100644 --- a/Server/TCPGameServer.py +++ b/Server/TCPGameServer.py @@ -1037,7 +1037,7 @@ class TCPGameServer(TCPServer): """处理注册消息""" username = message.get("username", "") password = message.get("password", "") - farm_name = message.get("farm_name", "") + farm_name = message.get("农场名称", "") player_name = message.get("玩家昵称", "") verification_code = message.get("verification_code", "") client_version = message.get("client_version", "") @@ -1106,7 +1106,7 @@ class TCPGameServer(TCPServer): player_data.update({ "玩家账号": username, "玩家密码": password, - "farm_name": farm_name or "我的农场", + "农场名称": farm_name or "我的农场", "玩家昵称": player_name or username, "个人简介": "", # 新增个人简介字段，默认为空 "experience": player_data.get("experience", 0), @@ -5951,7 +5951,7 @@ class TCPGameServer(TCPServer): player_info = { "玩家账号": player_data.get("玩家账号", account_id), "玩家昵称": player_data.get("玩家昵称", player_data.get("玩家账号", account_id)), - "farm_name": player_data.get("farm_name", ""), + "农场名称": player_data.get("农场名称", ""), "level": player_data.get("level", 1), "money": player_data.get("money", 0), "experience": player_data.get("experience", 0), @@ -6109,7 +6109,7 @@ class TCPGameServer(TCPServer): "玩家账号": target_player_data.get("玩家账号", target_username), "username": target_username, # 添加username字段，用于购买商品时标识卖家 "玩家昵称": target_player_data.get("玩家昵称", target_username), - "farm_name": target_player_data.get("farm_name", ""), + "农场名称": target_player_data.get("农场名称", ""), "level": target_player_data.get("level", 1), "money": target_player_data.get("money", 0), "experience": target_player_data.get("experience", 0), @@ -6181,7 +6181,7 @@ class TCPGameServer(TCPServer): "player_data": { "玩家账号": player_data.get("玩家账号", username), "玩家昵称": player_data.get("玩家昵称", username), - "farm_name": player_data.get("farm_name", ""), + "农场名称": player_data.get("农场名称", ""), "level": player_data.get("level", 1), "money": player_data.get("money", 0), "experience": player_data.get("experience", 0), @@ -7974,7 +7974,7 @@ class TCPGameServer(TCPServer): # 更新玩家数据 player_data[""] = new_password player_data["玩家昵称"] = new_player_name - player_data["farm_name"] = new_farm_name + player_data["农场名称"] = new_farm_name player_data["个人简介"] = new_personal_profile # 保存到缓存和文件 @@ -7992,7 +7992,7 @@ class TCPGameServer(TCPServer): "updated_data": { "玩家密码": new_password, "玩家昵称": new_player_name, - "farm_name": new_farm_name, + "农场名称": new_farm_name, "个人简介": new_personal_profile } }) @@ -8079,7 +8079,7 @@ class TCPGameServer(TCPServer): "玩家账号": player_data.get("玩家账号", ""), "玩家密码": player_data.get("玩家密码", ""), "玩家昵称": player_data.get("玩家昵称", ""), - "farm_name": player_data.get("farm_name", ""), + "农场名称": player_data.get("农场名称", ""), "个人简介": player_data.get("个人简介", ""), "level": player_data.get("level", 1), "experience": player_data.get("experience", 0), @@ -9767,7 +9767,7 @@ class ConsoleCommands: print(f"👤 玩家信息: {qq_number}") print("=" * 50) print(f"昵称: {player_data.get('玩家昵称', '未设置')}") - print(f"农场名: {player_data.get('farm_name', '未设置')}") + print(f"农场名: {player_data.get('农场名称', '未设置')}") print(f"等级: {player_data.get('level', 1)}") print(f"经验: {player_data.get('experience', 0)}") print(f"金币: {player_data.get('money', 0)}") diff --git a/Server/chat/2025-07-21.log b/Server/chat/2025-07-21.log index 4d87cf8..ba180a6 100644 --- a/Server/chat/2025-07-21.log +++ b/Server/chat/2025-07-21.log @@ -1,3 +1,5 @@ [2025年07月21日 10:20:26] 树萌芽(3205788256): 你好啊 [2025年07月21日 10:22:05] 树萌芽(3205788256): 哈哈哈 [2025年07月21日 10:23:53] 树萌芽(3205788256): 测试聊天 +[2025年07月21日 10:26:42] 3205788256(3205788256): 123213 +[2025年07月21日 10:37:22] 树萌芽(3205788256): 你好 diff --git a/Server/config/initial_player_data_template.json b/Server/config/initial_player_data_template.json index b32d4bc..6f5d911 100644 --- a/Server/config/initial_player_data_template.json +++ b/Server/config/initial_player_data_template.json @@ -2,7 +2,7 @@ "experience": 0, "level": 1, "money": 5000, - "farm_name": "农场名称", + "农场名称": "农场名称", "玩家昵称": "玩家名称", "玩家账号": "用户名", "玩家密码": "密码", diff --git a/Server/game_saves/2143323382.json b/Server/game_saves/2143323382.json index 8e04418..7569429 100644 --- a/Server/game_saves/2143323382.json +++ b/Server/game_saves/2143323382.json @@ -2,7 +2,7 @@ "experience": 455, "level": 36, "money": 200797815, - "farm_name": "柚大青の小农场", + "农场名称": "柚大青の小农场", "玩家昵称": "柚大青", "玩家账号": "2143323382", "玩家密码": "tyh@19900420", diff --git a/Server/game_saves/2804775686.json b/Server/game_saves/2804775686.json index 50113bb..f09bf46 100644 --- a/Server/game_saves/2804775686.json +++ b/Server/game_saves/2804775686.json @@ -2,8 +2,8 @@ "experience": 869, "level": 15, "money": 1231231120406, - "farm_name": "123", - "player_name": "123", + "农场名称": "123", + "玩家昵称": "123", "玩家账号": "2804775686", "玩家密码": "123", "最后登录时间": "2025年07月21日09时27分44秒", diff --git a/server/game_saves/3205788256.json b/server/game_saves/3205788256.json index c9592c5..414882c 100644 --- a/server/game_saves/3205788256.json +++ b/server/game_saves/3205788256.json @@ -13,7 +13,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 15120, + "grow_time": 16020, "is_dead": false, "is_diged": true, "is_planted": true, @@ -24,7 +24,7 @@ }, { "crop_type": "龙果", - "grow_time": 14400, + "grow_time": 14450, "is_dead": false, "is_diged": true, "is_planted": true, @@ -35,7 +35,7 @@ }, { "crop_type": "杂交树1", - "grow_time": 15160, + "grow_time": 16060, "is_dead": false, "is_diged": true, "is_planted": true, @@ -46,7 +46,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 3658, + "grow_time": 3838, "is_dead": false, "is_diged": true, "is_planted": true, @@ -68,7 +68,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 10968, + "grow_time": 11508, "is_dead": false, "is_diged": true, "is_planted": true, @@ -101,7 +101,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1828, + "grow_time": 1918, "is_dead": false, "is_diged": true, "is_planted": true, @@ -178,7 +178,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1826, + "grow_time": 1916, "is_dead": false, "is_diged": true, "is_planted": true, @@ -189,7 +189,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1826, + "grow_time": 1916, "is_dead": false, "is_diged": true, "is_planted": true, @@ -200,7 +200,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1826, + "grow_time": 1916, "is_dead": false, "is_diged": true, "is_planted": true, @@ -277,7 +277,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1824, + "grow_time": 1914, "is_dead": false, "is_diged": true, "is_planted": true, @@ -321,7 +321,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1823, + "grow_time": 1913, "is_dead": false, "is_diged": true, "is_planted": true, @@ -564,12 +564,12 @@ } ], "experience": 1963, - "farm_name": "树萌芽の狗窝", - "player_name": "树萌芽", + "农场名称": "树萌芽の狗窝", + "玩家昵称": "树萌芽", "level": 64, "money": 615197025464, - "最后登录时间": "2025年07月21日10时20分08秒", - "总游玩时间": "162时54分14秒", + "最后登录时间": "2025年07月21日10时37分11秒", + "总游玩时间": "162时54分56秒", "玩家账号": "3205788256", "玩家密码": "123456", "个人简介": "人生啊，就这样吧",