diff --git a/MainGame.gd b/MainGame.gd index 7d66b9b..20095cd 100644 --- a/MainGame.gd +++ b/MainGame.gd @@ -387,7 +387,7 @@ func _handle_visit_player_response(data): # 保存当前玩家数据 if not is_visiting_mode: original_player_data = { - "user_name": user_name, + "玩家账号": user_name, "player_name": show_player_name.text.replace("玩家昵称：", ""), "farm_name": show_farm_name.text.replace("农场名称：", ""), "level": level, @@ -2016,7 +2016,7 @@ func _on_like_button_pressed() -> void: return # 获取被访问玩家的用户名 - var target_username = visited_player_data.get("user_name", "") + var target_username = visited_player_data.get("玩家账号", "") if target_username == "": Toast.show("无法获取目标玩家信息", Color.RED) return @@ -2873,7 +2873,7 @@ func _has_item_in_bag(item_name: String) -> bool: # 发送使用道具请求 func _send_use_item_request(lot_index: int, item_name: String, action_type: String, action_name: String): - var target_username = visited_player_data.get("user_name", "") if is_visiting_mode else "" + var target_username = visited_player_data.get("玩家账号", "") if is_visiting_mode else "" if tcp_network_manager_panel and tcp_network_manager_panel.has_method("sendUseItem"): if tcp_network_manager_panel.sendUseItem(lot_index, item_name, action_type, target_username): diff --git a/Script/BigPanel/LoginPanel.gd b/Script/BigPanel/LoginPanel.gd index 0d84344..6cb408a 100644 --- a/Script/BigPanel/LoginPanel.gd +++ b/Script/BigPanel/LoginPanel.gd @@ -336,13 +336,13 @@ func _on_forget_password_response_received(success: bool, message: String): # 登录信息文件操作 func _save_login_info(user_name: String, password: String): - _write_login_file({"user_name": user_name, "password": password}) + _write_login_file({"玩家账号": user_name, "password": password}) print("登录信息已保存" if user_name != "" else "登录信息已清除") func _load_login_info(): var login_data = _read_login_file() if login_data: - var saved_username = login_data.get("user_name", "") + var saved_username = login_data.get("玩家账号", "") var saved_password = login_data.get("password", "") if saved_username != "" and saved_password != "": @@ -367,7 +367,7 @@ func _write_login_file(data: Dictionary): func _read_login_file() -> Dictionary: var file = FileAccess.open("user://login.json", FileAccess.READ) if not file: - _write_login_file({"user_name": "", "password": ""}) + _write_login_file({"玩家账号": "", "password": ""}) return {} var json_text = file.get_as_text() @@ -387,7 +387,7 @@ func toggle_remember_password(): func has_saved_login_info() -> bool: var login_data = _read_login_file() - return login_data.get("user_name", "") != "" and login_data.get("password", "") != "" + return login_data.get("玩家账号", "") != "" and login_data.get("password", "") != "" func quick_login(): if has_saved_login_info(): @@ -403,7 +403,7 @@ func quick_login(): _set_status(status_label, "没有保存的登录信息", Color.ORANGE) func get_saved_username() -> String: - return _read_login_file().get("user_name", "") + return _read_login_file().get("玩家账号", "") # 显示版本信息 func _display_version_info(): diff --git a/Script/BigPanel/PlayerRankingPanel.gd b/Script/BigPanel/PlayerRankingPanel.gd index b050bd5..ae82007 100644 --- a/Script/BigPanel/PlayerRankingPanel.gd +++ b/Script/BigPanel/PlayerRankingPanel.gd @@ -210,7 +210,7 @@ func add_player_entry(player_data): var player_like_num = player_entry.get_node("HBox2/LikeNum") # 填充数据 - var username = player_data.get("user_name", "未知") + var username = player_data.get("玩家账号", "未知") var display_name = player_data.get("player_name", username) player_name.text = display_name #都是整数，不要乱用浮点数 diff --git a/Script/SmallPanel/LandPanel.gd b/Script/SmallPanel/LandPanel.gd index 76d06dc..c290bc2 100644 --- a/Script/SmallPanel/LandPanel.gd +++ b/Script/SmallPanel/LandPanel.gd @@ -206,7 +206,7 @@ func _on_water_button_pressed(): # 发送浇水请求到服务器 var target_username = "" if main_game.is_visiting_mode: - target_username = main_game.visited_player_data.get("user_name", "") + target_username = main_game.visited_player_data.get("玩家账号", "") if tcp_network_manager_panel and tcp_network_manager_panel.is_connected_to_server(): if tcp_network_manager_panel.sendWaterCrop(selected_lot_index, target_username): @@ -263,7 +263,7 @@ func _on_fertilize_button_pressed(): # 发送施肥请求到服务器 var target_username = "" if main_game.is_visiting_mode: - target_username = main_game.visited_player_data.get("user_name", "") + target_username = main_game.visited_player_data.get("玩家账号", "") if tcp_network_manager_panel and tcp_network_manager_panel.is_connected_to_server(): if tcp_network_manager_panel.sendFertilizeCrop(selected_lot_index, target_username): @@ -411,7 +411,7 @@ func _on_harvest_button_pressed(): # 发送收获请求到服务器 var target_username = "" if main_game.is_visiting_mode: - target_username = main_game.visited_player_data.get("user_name", "") + target_username = main_game.visited_player_data.get("玩家账号", "") if tcp_network_manager_panel and tcp_network_manager_panel.is_connected_to_server(): if tcp_network_manager_panel.sendHarvestCrop(selected_lot_index, target_username): diff --git a/Server/TCPGameServer.py b/Server/TCPGameServer.py index d978ef2..5cef0c1 100644 --- a/Server/TCPGameServer.py +++ b/Server/TCPGameServer.py @@ -1104,7 +1104,7 @@ class TCPGameServer(TCPServer): # 更新玩家数据 player_data.update({ - "user_name": username, + "玩家账号": username, "玩家密码": password, "farm_name": farm_name or "我的农场", "player_name": player_name or username, @@ -5949,8 +5949,8 @@ class TCPGameServer(TCPServer): current_stamina = stamina_system.get("当前体力值", 20) player_info = { - "user_name": player_data.get("user_name", account_id), - "player_name": player_data.get("player_name", player_data.get("user_name", account_id)), + "玩家账号": player_data.get("玩家账号", account_id), + "player_name": player_data.get("player_name", player_data.get("玩家账号", account_id)), "farm_name": player_data.get("farm_name", ""), "level": player_data.get("level", 1), "money": player_data.get("money", 0), @@ -6106,7 +6106,7 @@ class TCPGameServer(TCPServer): target_current_stamina = target_stamina_system.get("当前体力值", 20) safe_player_data = { - "user_name": target_player_data.get("user_name", target_username), + "玩家账号": target_player_data.get("玩家账号", target_username), "username": target_username, # 添加username字段，用于购买商品时标识卖家 "player_name": target_player_data.get("player_name", target_username), "farm_name": target_player_data.get("farm_name", ""), @@ -6179,7 +6179,7 @@ class TCPGameServer(TCPServer): "success": True, "message": "已返回自己的农场", "player_data": { - "user_name": player_data.get("user_name", username), + "玩家账号": player_data.get("玩家账号", username), "player_name": player_data.get("player_name", username), "farm_name": player_data.get("farm_name", ""), "level": player_data.get("level", 1), @@ -8076,7 +8076,7 @@ class TCPGameServer(TCPServer): # 只发送账户相关信息，不发送农场数据等 account_info = { - "user_name": player_data.get("user_name", ""), + "玩家账号": player_data.get("玩家账号", ""), "玩家密码": player_data.get("玩家密码", ""), "player_name": player_data.get("player_name", ""), "farm_name": player_data.get("farm_name", ""), diff --git a/Server/config/initial_player_data_template.json b/Server/config/initial_player_data_template.json index f65219d..73e6440 100644 --- a/Server/config/initial_player_data_template.json +++ b/Server/config/initial_player_data_template.json @@ -4,7 +4,7 @@ "money": 5000, "farm_name": "农场名称", "player_name": "玩家名称", - "user_name": "用户名", + "玩家账号": "用户名", "玩家密码": "密码", "最后登录时间": "2025年07月20日17时19分16秒", "总游玩时间": "0时0分0秒", diff --git a/Server/config/verification_codes.json b/Server/config/verification_codes.json index 415e8d5..9e26dfe 100644 --- a/Server/config/verification_codes.json +++ b/Server/config/verification_codes.json @@ -1,10 +1 @@ -{ - "3205788256": { - "code": "C2C8SK", - "expire_at": 1753063451.18584, - "code_type": "reset_password", - "created_at": 1753063151.1858408, - "used": true, - "used_at": 1753063206.7213008 - } -} \ No newline at end of file +{} \ No newline at end of file diff --git a/Server/game_saves/2143323382.json b/Server/game_saves/2143323382.json index c22a6aa..ab40151 100644 --- a/Server/game_saves/2143323382.json +++ b/Server/game_saves/2143323382.json @@ -4,10 +4,10 @@ "money": 200797815, "farm_name": "柚大青の小农场", "player_name": "柚大青", - "user_name": "2143323382", + "玩家账号": "2143323382", "玩家密码": "tyh@19900420", - "最后登录时间": "2025年07月21日10时00分34秒", - "总游玩时间": "6时47分10秒", + "最后登录时间": "2025年07月21日10时06分20秒", + "总游玩时间": "6时47分13秒", "农场土地": [ { "crop_type": "", diff --git a/Server/game_saves/2804775686.json b/Server/game_saves/2804775686.json index 07ae171..659155f 100644 --- a/Server/game_saves/2804775686.json +++ b/Server/game_saves/2804775686.json @@ -4,7 +4,7 @@ "money": 1231231120406, "farm_name": "123", "player_name": "123", - "user_name": "2804775686", + "玩家账号": "2804775686", "玩家密码": "123", "最后登录时间": "2025年07月21日09时27分44秒", "总游玩时间": "0时8分51秒", @@ -35,7 +35,7 @@ }, { "crop_type": "龙果", - "grow_time": 7240, + "grow_time": 8740, "is_dead": false, "is_diged": true, "is_planted": true, @@ -57,7 +57,7 @@ }, { "crop_type": "苹果", - "grow_time": 7110, + "grow_time": 8610, "is_dead": false, "is_diged": true, "is_planted": true, diff --git a/server/game_saves/3205788256.json b/server/game_saves/3205788256.json index eb2af7d..1a45ea2 100644 --- a/server/game_saves/3205788256.json +++ b/server/game_saves/3205788256.json @@ -13,7 +13,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 2730, + "grow_time": 4130, "is_dead": false, "is_diged": true, "is_planted": true, @@ -24,7 +24,7 @@ }, { "crop_type": "龙果", - "grow_time": 2750, + "grow_time": 4150, "is_dead": false, "is_diged": true, "is_planted": true, @@ -35,7 +35,7 @@ }, { "crop_type": "杂交树1", - "grow_time": 2770, + "grow_time": 4170, "is_dead": false, "is_diged": true, "is_planted": true, @@ -46,7 +46,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1180, + "grow_time": 1460, "is_dead": false, "is_diged": true, "is_planted": true, @@ -68,7 +68,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 3534, + "grow_time": 4374, "is_dead": false, "is_diged": true, "is_planted": true, @@ -79,7 +79,7 @@ }, { "crop_type": "小麦", - "grow_time": 244, + "grow_time": 304, "is_dead": false, "is_diged": true, "is_planted": true, @@ -90,7 +90,7 @@ }, { "crop_type": "小麦", - "grow_time": 244, + "grow_time": 304, "is_dead": false, "is_diged": true, "is_planted": true, @@ -101,7 +101,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 589, + "grow_time": 729, "is_dead": false, "is_diged": true, "is_planted": true, @@ -167,7 +167,7 @@ }, { "crop_type": "小麦", - "grow_time": 243, + "grow_time": 303, "is_dead": false, "is_diged": true, "is_planted": true, @@ -178,7 +178,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 587, + "grow_time": 727, "is_dead": false, "is_diged": true, "is_planted": true, @@ -189,7 +189,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 587, + "grow_time": 727, "is_dead": false, "is_diged": true, "is_planted": true, @@ -200,7 +200,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 587, + "grow_time": 727, "is_dead": false, "is_diged": true, "is_planted": true, @@ -233,7 +233,7 @@ }, { "crop_type": "小麦", - "grow_time": 243, + "grow_time": 303, "is_dead": false, "is_diged": true, "is_planted": true, @@ -244,7 +244,7 @@ }, { "crop_type": "小麦", - "grow_time": 243, + "grow_time": 303, "is_dead": false, "is_diged": true, "is_planted": true, @@ -255,7 +255,7 @@ }, { "crop_type": "小麦", - "grow_time": 243, + "grow_time": 303, "is_dead": false, "is_diged": true, "is_planted": true, @@ -277,7 +277,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 585, + "grow_time": 725, "is_dead": false, "is_diged": true, "is_planted": true, @@ -288,7 +288,7 @@ }, { "crop_type": "小麦", - "grow_time": 242, + "grow_time": 302, "is_dead": false, "is_diged": true, "is_planted": true, @@ -299,7 +299,7 @@ }, { "crop_type": "小麦", - "grow_time": 242, + "grow_time": 302, "is_dead": false, "is_diged": true, "is_planted": true, @@ -310,7 +310,7 @@ }, { "crop_type": "小麦", - "grow_time": 242, + "grow_time": 302, "is_dead": false, "is_diged": true, "is_planted": true, @@ -321,7 +321,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 584, + "grow_time": 724, "is_dead": false, "is_diged": true, "is_planted": true, @@ -568,9 +568,9 @@ "player_name": "树萌芽", "level": 64, "money": 615197025464, - "最后登录时间": "2025年07月21日10时00分08秒", - "总游玩时间": "162时54分5秒", - "user_name": "3205788256", + "最后登录时间": "2025年07月21日10时06分48秒", + "总游玩时间": "162时54分14秒", + "玩家账号": "3205788256", "玩家密码": "123456", "个人简介": "人生啊，就这样吧", "注册时间": "2025年05月21日15时00分00秒",