From 86dbd884918a44dd332c95802a4d69d927c872f7 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:25:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E6=98=B5=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainGame.gd | 14 +++++----- Network/TCPNetworkManager.gd | 2 +- Script/BigPanel/LoginPanel.gd | 2 +- Script/BigPanel/PlayerRankingPanel.gd | 2 +- Script/BigPanel/PlayerStorePanel.gd | 2 +- Script/SmallPanel/AccountSettingPanel.gd | 6 ++--- .../SmallPanel/GlobalServerBroadcastPanel.gd | 6 ++--- Server/TCPGameServer.py | 26 +++++++++---------- Server/chat/2025-07-21.log | 3 +++ .../config/initial_player_data_template.json | 2 +- Server/game_saves/2143323382.json | 2 +- Server/game_saves/2804775686.json | 4 +-- server/game_saves/3205788256.json | 24 ++++++++--------- 13 files changed, 49 insertions(+), 46 deletions(-) create mode 100644 Server/chat/2025-07-21.log diff --git a/MainGame.gd b/MainGame.gd index 20095cd..626ce33 100644 --- a/MainGame.gd +++ b/MainGame.gd @@ -388,7 +388,7 @@ func _handle_visit_player_response(data): if not is_visiting_mode: original_player_data = { "玩家账号": user_name, - "player_name": show_player_name.text.replace("玩家昵称：", ""), + "玩家昵称": show_player_name.text.replace("玩家昵称：", ""), "farm_name": show_farm_name.text.replace("农场名称：", ""), "level": level, "money": money, @@ -415,7 +415,7 @@ func _handle_visit_player_response(data): patrol_pets = target_player_data.get("巡逻宠物", []) # 更新UI显示 - show_player_name.text = "玩家昵称：" + target_player_data.get("player_name", "未知") + show_player_name.text = "玩家昵称：" + target_player_data.get("玩家昵称", "未知") show_farm_name.text = "农场名称：" + target_player_data.get("farm_name", "未知农场") # 显示被访问玩家的点赞数 @@ -466,7 +466,7 @@ func _handle_visit_player_response(data): if player_ranking_panel: player_ranking_panel.hide() - Toast.show("正在访问 " + target_player_data.get("player_name", "未知") + " 的农场", Color.CYAN) + Toast.show("正在访问 " + target_player_data.get("玩家昵称", "未知") + " 的农场", Color.CYAN) else: Toast.show("访问失败：" + message, Color.RED) print("访问玩家失败：", message) @@ -492,7 +492,7 @@ func _handle_return_my_farm_response(data): patrol_pets = player_data.get("巡逻宠物", []) # 恢复UI显示 - show_player_name.text = "玩家昵称：" + player_data.get("player_name", "未知") + show_player_name.text = "玩家昵称：" + player_data.get("玩家昵称", "未知") show_farm_name.text = "农场名称：" + player_data.get("farm_name", "我的农场") # 显示自己的点赞数 @@ -2448,7 +2448,7 @@ func _handle_account_setting_response(data: Dictionary): # 只更新账户相关信息，不影响农场和背包数据 user_password = account_info["玩家密码"] show_farm_name.text = "农场名称：" + account_info.get("farm_name", "") - show_player_name.text = "玩家昵称：" + account_info.get("player_name", "") + show_player_name.text = "玩家昵称：" + account_info.get("玩家昵称", "") # 更新基本游戏状态显示 experience = account_info.get("experience", 0) @@ -2458,13 +2458,13 @@ func _handle_account_setting_response(data: Dictionary): # 同步更新login_data和data中的账户信息 if login_data.size() > 0: login_data["玩家密码"] = account_info.get("玩家密码", "") - login_data["player_name"] = account_info.get("player_name", "") + login_data["玩家昵称"] = account_info.get("玩家昵称", "") login_data["farm_name"] = account_info.get("farm_name", "") login_data["个人简介"] = account_info.get("个人简介", "") if data.size() > 0: data["玩家密码"] = account_info.get("玩家密码", "") - data["player_name"] = account_info.get("player_name", "") + data["玩家昵称"] = account_info.get("玩家昵称", "") data["farm_name"] = account_info.get("farm_name", "") data["个人简介"] = account_info.get("个人简介", "") diff --git a/Network/TCPNetworkManager.gd b/Network/TCPNetworkManager.gd index 2a7671f..d5c5953 100644 --- a/Network/TCPNetworkManager.gd +++ b/Network/TCPNetworkManager.gd @@ -678,7 +678,7 @@ func sendRegisterInfo(username, password, farmname, player_name="", verification "username": username, "password": password, "farm_name": farmname, - "player_name": player_name, + "玩家昵称": 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 6cb408a..df7c50f 100644 --- a/Script/BigPanel/LoginPanel.gd +++ b/Script/BigPanel/LoginPanel.gd @@ -424,7 +424,7 @@ func _handle_login_success(user_data: Dictionary): 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_player_name.text = "玩家昵称：" + user_data.get("player_name", "") + main_game.show_player_name.text = "玩家昵称：" + user_data.get("玩家昵称", "") farmname_input.text = user_data.get("farm_name", "") # 加载各种背包数据 diff --git a/Script/BigPanel/PlayerRankingPanel.gd b/Script/BigPanel/PlayerRankingPanel.gd index ae82007..ccbd823 100644 --- a/Script/BigPanel/PlayerRankingPanel.gd +++ b/Script/BigPanel/PlayerRankingPanel.gd @@ -211,7 +211,7 @@ func add_player_entry(player_data): # 填充数据 var username = player_data.get("玩家账号", "未知") - var display_name = player_data.get("player_name", username) + var display_name = player_data.get("玩家昵称", username) player_name.text = display_name #都是整数，不要乱用浮点数 player_level.text = "等级: " + str(int(player_data.get("level", 0))) diff --git a/Script/BigPanel/PlayerStorePanel.gd b/Script/BigPanel/PlayerStorePanel.gd index 5a024db..cd2c3a4 100644 --- a/Script/BigPanel/PlayerStorePanel.gd +++ b/Script/BigPanel/PlayerStorePanel.gd @@ -211,7 +211,7 @@ func _on_confirm_buy_store_product(product_name: String, unit_price: int, quanti # 发送购买请求到服务器 var tcp_network_manager = get_node_or_null("/root/main/UI/BigPanel/TCPNetworkManagerPanel") if tcp_network_manager and tcp_network_manager.has_method("send_message"): - var visited_player_name = main_game.visited_player_data.get("player_name", "") + var visited_player_name = main_game.visited_player_data.get("玩家昵称", "") var message = { "type": "buy_store_product", "seller_username": main_game.visited_player_data.get("username", ""), diff --git a/Script/SmallPanel/AccountSettingPanel.gd b/Script/SmallPanel/AccountSettingPanel.gd index 6bfa2e6..35dda75 100644 --- a/Script/SmallPanel/AccountSettingPanel.gd +++ b/Script/SmallPanel/AccountSettingPanel.gd @@ -190,7 +190,7 @@ func _refresh_player_info(): # 优先从 login_data 获取数据，如果没有则从 data 获取 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("player_name", "") + player_name_input.text = player_data.get("玩家昵称", "") farm_name_input.text = player_data.get("farm_name", "") personal_profile_input.text = player_data.get("个人简介", "") @@ -216,8 +216,8 @@ func handle_account_response(response_data: Dictionary): if response_data.has("updated_data"): var updated_data = response_data["updated_data"] if main_game: - if updated_data.has("player_name"): - main_game.login_data["player_name"] = updated_data["player_name"] + 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("个人简介"): diff --git a/Script/SmallPanel/GlobalServerBroadcastPanel.gd b/Script/SmallPanel/GlobalServerBroadcastPanel.gd index e8fc451..964ae5a 100644 --- a/Script/SmallPanel/GlobalServerBroadcastPanel.gd +++ b/Script/SmallPanel/GlobalServerBroadcastPanel.gd @@ -88,7 +88,7 @@ func send_broadcast_message(): # 接收全服大喇叭消息 func receive_broadcast_message(data: Dictionary): var username = data.get("username", "匿名") - var player_name = data.get("player_name", "") + var player_name = data.get("玩家昵称", "") var content = data.get("content", "") var timestamp = data.get("timestamp", Time.get_unix_time_from_system()) @@ -102,7 +102,7 @@ func receive_broadcast_message(data: Dictionary): # 创建消息记录 var message_record = { "username": username, - "player_name": player_name, + "玩家昵称": player_name, "content": content, "timestamp": timestamp, "time_str": time_str, @@ -236,7 +236,7 @@ func receive_history_messages(data: Dictionary): for msg in messages: var message_record = { "username": msg.get("username", "匿名"), - "player_name": msg.get("player_name", ""), + "玩家昵称": msg.get("玩家昵称", ""), "content": msg.get("content", ""), "timestamp": msg.get("timestamp", 0), "time_str": msg.get("time_str", ""), diff --git a/Server/TCPGameServer.py b/Server/TCPGameServer.py index 5cef0c1..4ac9c45 100644 --- a/Server/TCPGameServer.py +++ b/Server/TCPGameServer.py @@ -1038,7 +1038,7 @@ class TCPGameServer(TCPServer): username = message.get("username", "") password = message.get("password", "") farm_name = message.get("farm_name", "") - player_name = message.get("player_name", "") + player_name = message.get("玩家昵称", "") verification_code = message.get("verification_code", "") client_version = message.get("client_version", "") @@ -1107,7 +1107,7 @@ class TCPGameServer(TCPServer): "玩家账号": username, "玩家密码": password, "farm_name": farm_name or "我的农场", - "player_name": player_name or username, + "玩家昵称": player_name or username, "个人简介": "", # 新增个人简介字段，默认为空 "experience": player_data.get("experience", 0), "level": player_data.get("level", 1), @@ -5950,7 +5950,7 @@ class TCPGameServer(TCPServer): player_info = { "玩家账号": player_data.get("玩家账号", account_id), - "player_name": player_data.get("player_name", player_data.get("玩家账号", account_id)), + "玩家昵称": player_data.get("玩家昵称", player_data.get("玩家账号", account_id)), "farm_name": player_data.get("farm_name", ""), "level": player_data.get("level", 1), "money": player_data.get("money", 0), @@ -6108,7 +6108,7 @@ class TCPGameServer(TCPServer): safe_player_data = { "玩家账号": target_player_data.get("玩家账号", target_username), "username": target_username, # 添加username字段，用于购买商品时标识卖家 - "player_name": target_player_data.get("player_name", target_username), + "玩家昵称": target_player_data.get("玩家昵称", target_username), "farm_name": target_player_data.get("farm_name", ""), "level": target_player_data.get("level", 1), "money": target_player_data.get("money", 0), @@ -6180,7 +6180,7 @@ class TCPGameServer(TCPServer): "message": "已返回自己的农场", "player_data": { "玩家账号": player_data.get("玩家账号", username), - "player_name": player_data.get("player_name", username), + "玩家昵称": player_data.get("玩家昵称", username), "farm_name": player_data.get("farm_name", ""), "level": player_data.get("level", 1), "money": player_data.get("money", 0), @@ -6538,13 +6538,13 @@ class TCPGameServer(TCPServer): player_data = self.load_player_data(username) player_name = "" if player_data: - player_name = player_data.get("player_name", "") + player_name = player_data.get("玩家昵称", "") # 创建广播消息 broadcast_message = { "type": "global_broadcast_message", "username": username, - "player_name": player_name, + "玩家昵称": player_name, "content": content, "timestamp": time.time() } @@ -6722,7 +6722,7 @@ class TCPGameServer(TCPServer): return { "username": username, - "player_name": player_name, + "玩家昵称": player_name, "display_name": player_name if player_name else username, "content": content, "timestamp": timestamp, @@ -7973,7 +7973,7 @@ class TCPGameServer(TCPServer): try: # 更新玩家数据 player_data[""] = new_password - player_data["player_name"] = new_player_name + player_data["玩家昵称"] = new_player_name player_data["farm_name"] = new_farm_name player_data["个人简介"] = new_personal_profile @@ -7991,7 +7991,7 @@ class TCPGameServer(TCPServer): "message": "账号信息修改成功", "updated_data": { "玩家密码": new_password, - "player_name": new_player_name, + "玩家昵称": new_player_name, "farm_name": new_farm_name, "个人简介": new_personal_profile } @@ -8078,7 +8078,7 @@ class TCPGameServer(TCPServer): account_info = { "玩家账号": player_data.get("玩家账号", ""), "玩家密码": player_data.get("玩家密码", ""), - "player_name": player_data.get("player_name", ""), + "玩家昵称": player_data.get("玩家昵称", ""), "farm_name": player_data.get("farm_name", ""), "个人简介": player_data.get("个人简介", ""), "level": player_data.get("level", 1), @@ -9741,7 +9741,7 @@ class ConsoleCommands: try: player_data = self.server._load_player_data_from_file(qq_number) if player_data: - nickname = player_data.get("player_name", "未设置") + nickname = player_data.get("玩家昵称", "未设置") level = player_data.get("level", 1) money = player_data.get("money", 0) last_login = player_data.get("最后登录时间", "从未登录") @@ -9766,7 +9766,7 @@ class ConsoleCommands: print(f"👤 玩家信息: {qq_number}") print("=" * 50) - print(f"昵称: {player_data.get('player_name', '未设置')}") + print(f"昵称: {player_data.get('玩家昵称', '未设置')}") print(f"农场名: {player_data.get('farm_name', '未设置')}") print(f"等级: {player_data.get('level', 1)}") print(f"经验: {player_data.get('experience', 0)}") diff --git a/Server/chat/2025-07-21.log b/Server/chat/2025-07-21.log new file mode 100644 index 0000000..4d87cf8 --- /dev/null +++ b/Server/chat/2025-07-21.log @@ -0,0 +1,3 @@ +[2025年07月21日 10:20:26] 树萌芽(3205788256): 你好啊 +[2025年07月21日 10:22:05] 树萌芽(3205788256): 哈哈哈 +[2025年07月21日 10:23:53] 树萌芽(3205788256): 测试聊天 diff --git a/Server/config/initial_player_data_template.json b/Server/config/initial_player_data_template.json index 73e6440..b32d4bc 100644 --- a/Server/config/initial_player_data_template.json +++ b/Server/config/initial_player_data_template.json @@ -3,7 +3,7 @@ "level": 1, "money": 5000, "farm_name": "农场名称", - "player_name": "玩家名称", + "玩家昵称": "玩家名称", "玩家账号": "用户名", "玩家密码": "密码", "最后登录时间": "2025年07月20日17时19分16秒", diff --git a/Server/game_saves/2143323382.json b/Server/game_saves/2143323382.json index ab40151..8e04418 100644 --- a/Server/game_saves/2143323382.json +++ b/Server/game_saves/2143323382.json @@ -3,7 +3,7 @@ "level": 36, "money": 200797815, "farm_name": "柚大青の小农场", - "player_name": "柚大青", + "玩家昵称": "柚大青", "玩家账号": "2143323382", "玩家密码": "tyh@19900420", "最后登录时间": "2025年07月21日10时06分20秒", diff --git a/Server/game_saves/2804775686.json b/Server/game_saves/2804775686.json index 659155f..50113bb 100644 --- a/Server/game_saves/2804775686.json +++ b/Server/game_saves/2804775686.json @@ -35,7 +35,7 @@ }, { "crop_type": "龙果", - "grow_time": 8740, + "grow_time": 14440, "is_dead": false, "is_diged": true, "is_planted": true, @@ -57,7 +57,7 @@ }, { "crop_type": "苹果", - "grow_time": 8610, + "grow_time": 9610, "is_dead": false, "is_diged": true, "is_planted": true, diff --git a/server/game_saves/3205788256.json b/server/game_saves/3205788256.json index 1a45ea2..c9592c5 100644 --- a/server/game_saves/3205788256.json +++ b/server/game_saves/3205788256.json @@ -13,7 +13,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 4130, + "grow_time": 15120, "is_dead": false, "is_diged": true, "is_planted": true, @@ -24,7 +24,7 @@ }, { "crop_type": "龙果", - "grow_time": 4150, + "grow_time": 14400, "is_dead": false, "is_diged": true, "is_planted": true, @@ -35,7 +35,7 @@ }, { "crop_type": "杂交树1", - "grow_time": 4170, + "grow_time": 15160, "is_dead": false, "is_diged": true, "is_planted": true, @@ -46,7 +46,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1460, + "grow_time": 3658, "is_dead": false, "is_diged": true, "is_planted": true, @@ -68,7 +68,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 4374, + "grow_time": 10968, "is_dead": false, "is_diged": true, "is_planted": true, @@ -101,7 +101,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 729, + "grow_time": 1828, "is_dead": false, "is_diged": true, "is_planted": true, @@ -178,7 +178,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 727, + "grow_time": 1826, "is_dead": false, "is_diged": true, "is_planted": true, @@ -189,7 +189,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 727, + "grow_time": 1826, "is_dead": false, "is_diged": true, "is_planted": true, @@ -200,7 +200,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 727, + "grow_time": 1826, "is_dead": false, "is_diged": true, "is_planted": true, @@ -277,7 +277,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 725, + "grow_time": 1824, "is_dead": false, "is_diged": true, "is_planted": true, @@ -321,7 +321,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 724, + "grow_time": 1823, "is_dead": false, "is_diged": true, "is_planted": true, @@ -568,7 +568,7 @@ "player_name": "树萌芽", "level": 64, "money": 615197025464, - "最后登录时间": "2025年07月21日10时06分48秒", + "最后登录时间": "2025年07月21日10时20分08秒", "总游玩时间": "162时54分14秒", "玩家账号": "3205788256", "玩家密码": "123456",