From 34796bc028e8696ccaa08eba06aa683be201e746 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:00:48 +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=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainGame.gd | 6 +-- Script/SmallPanel/AccountSettingPanel.gd | 4 +- Server/TCPGameServer.py | 12 ++--- .../config/initial_player_data_template.json | 2 +- Server/config/verification_codes.json | 10 ++++ Server/game_saves/2143323382.json | 20 +++---- Server/game_saves/2804775686.json | 6 +-- server/game_saves/3205788256.json | 54 +++++++++---------- 8 files changed, 62 insertions(+), 52 deletions(-) create mode 100644 Server/config/verification_codes.json diff --git a/MainGame.gd b/MainGame.gd index c72f5eb..7d66b9b 100644 --- a/MainGame.gd +++ b/MainGame.gd @@ -2446,7 +2446,7 @@ func _handle_account_setting_response(data: Dictionary): var account_info = data["account_info"] # 只更新账户相关信息，不影响农场和背包数据 - user_password = account_info["user_password"] + user_password = account_info["玩家密码"] show_farm_name.text = "农场名称：" + account_info.get("farm_name", "") show_player_name.text = "玩家昵称：" + account_info.get("player_name", "") @@ -2457,13 +2457,13 @@ func _handle_account_setting_response(data: Dictionary): # 同步更新login_data和data中的账户信息 if login_data.size() > 0: - login_data["user_password"] = account_info.get("user_password", "") + login_data["玩家密码"] = account_info.get("玩家密码", "") login_data["player_name"] = account_info.get("player_name", "") login_data["farm_name"] = account_info.get("farm_name", "") login_data["个人简介"] = account_info.get("个人简介", "") if data.size() > 0: - data["user_password"] = account_info.get("user_password", "") + data["玩家密码"] = account_info.get("玩家密码", "") data["player_name"] = account_info.get("player_name", "") data["farm_name"] = account_info.get("farm_name", "") data["个人简介"] = account_info.get("个人简介", "") diff --git a/Script/SmallPanel/AccountSettingPanel.gd b/Script/SmallPanel/AccountSettingPanel.gd index f3d303c..6bfa2e6 100644 --- a/Script/SmallPanel/AccountSettingPanel.gd +++ b/Script/SmallPanel/AccountSettingPanel.gd @@ -222,8 +222,8 @@ func handle_account_response(response_data: Dictionary): main_game.login_data["farm_name"] = updated_data["farm_name"] if updated_data.has("个人简介"): main_game.login_data["个人简介"] = updated_data["个人简介"] - if updated_data.has("user_password"): - main_game.user_password = updated_data["user_password"] + if updated_data.has("玩家密码"): + main_game.user_password = updated_data["玩家密码"] # 刷新显示 _refresh_player_info() diff --git a/Server/TCPGameServer.py b/Server/TCPGameServer.py index 59be22b..d978ef2 100644 --- a/Server/TCPGameServer.py +++ b/Server/TCPGameServer.py @@ -916,7 +916,7 @@ class TCPGameServer(TCPServer): # 读取玩家数据 player_data = self.load_player_data(username) - if player_data and player_data.get("user_password") == password: + if player_data and player_data.get("玩家密码") == password: # 登录成功 self.log('INFO', f"用户 {username} 登录成功", 'SERVER') @@ -1105,7 +1105,7 @@ class TCPGameServer(TCPServer): # 更新玩家数据 player_data.update({ "user_name": username, - "user_password": password, + "玩家密码": password, "farm_name": farm_name or "我的农场", "player_name": player_name or username, "个人简介": "", # 新增个人简介字段，默认为空 @@ -1343,7 +1343,7 @@ class TCPGameServer(TCPServer): # 更新密码 try: - player_data["user_password"] = new_password + player_data["玩家密码"] = new_password # 保存到缓存和文件 self.player_cache[username] = player_data @@ -7972,7 +7972,7 @@ class TCPGameServer(TCPServer): try: # 更新玩家数据 - player_data["user_password"] = new_password + player_data[""] = new_password player_data["player_name"] = new_player_name player_data["farm_name"] = new_farm_name player_data["个人简介"] = new_personal_profile @@ -7990,7 +7990,7 @@ class TCPGameServer(TCPServer): "success": True, "message": "账号信息修改成功", "updated_data": { - "user_password": new_password, + "玩家密码": new_password, "player_name": new_player_name, "farm_name": new_farm_name, "个人简介": new_personal_profile @@ -8077,7 +8077,7 @@ class TCPGameServer(TCPServer): # 只发送账户相关信息，不发送农场数据等 account_info = { "user_name": player_data.get("user_name", ""), - "user_password": player_data.get("user_password", ""), + "玩家密码": player_data.get("玩家密码", ""), "player_name": player_data.get("player_name", ""), "farm_name": player_data.get("farm_name", ""), "个人简介": player_data.get("个人简介", ""), diff --git a/Server/config/initial_player_data_template.json b/Server/config/initial_player_data_template.json index 41de1fd..f65219d 100644 --- a/Server/config/initial_player_data_template.json +++ b/Server/config/initial_player_data_template.json @@ -5,7 +5,7 @@ "farm_name": "农场名称", "player_name": "玩家名称", "user_name": "用户名", - "user_password": "密码", + "玩家密码": "密码", "最后登录时间": "2025年07月20日17时19分16秒", "总游玩时间": "0时0分0秒", "农场土地": [], diff --git a/Server/config/verification_codes.json b/Server/config/verification_codes.json new file mode 100644 index 0000000..415e8d5 --- /dev/null +++ b/Server/config/verification_codes.json @@ -0,0 +1,10 @@ +{ + "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 diff --git a/Server/game_saves/2143323382.json b/Server/game_saves/2143323382.json index 6dd705c..c22a6aa 100644 --- a/Server/game_saves/2143323382.json +++ b/Server/game_saves/2143323382.json @@ -5,9 +5,9 @@ "farm_name": "柚大青の小农场", "player_name": "柚大青", "user_name": "2143323382", - "user_password": "tyh@19900420", - "最后登录时间": "2025年07月20日22时15分13秒", - "总游玩时间": "6时47分9秒", + "玩家密码": "tyh@19900420", + "最后登录时间": "2025年07月21日10时00分34秒", + "总游玩时间": "6时47分10秒", "农场土地": [ { "crop_type": "", @@ -986,24 +986,24 @@ "2025年07月13日07时26分04秒": "金币302 经验63 土豆x5 小麦x3" }, "在线礼包": { - "当前日期": "2025-07-20", - "今日在线时长": 999999.2718074322, + "当前日期": "2025-07-21", + "今日在线时长": 0.0, "已领取礼包": [], - "登录时间": 1753003043.7163484 + "登录时间": 1753063234.6517925 }, "点赞系统": { "今日剩余点赞次数": 10, - "点赞上次刷新时间": "2025-07-20" + "点赞上次刷新时间": "2025-07-21" }, "新手礼包": { "已领取": true, "领取时间": "2025-07-20 20:21:04" }, "体力系统": { - "当前体力值": 24, + "当前体力值": 25, "最大体力值": 25, - "上次刷新时间": "2025-07-20", - "上次恢复时间": 1753018615.8492067 + "上次刷新时间": "2025-07-21", + "上次恢复时间": 1753063234.6496308 }, "道具背包": [ { diff --git a/Server/game_saves/2804775686.json b/Server/game_saves/2804775686.json index 01310c7..07ae171 100644 --- a/Server/game_saves/2804775686.json +++ b/Server/game_saves/2804775686.json @@ -5,7 +5,7 @@ "farm_name": "123", "player_name": "123", "user_name": "2804775686", - "user_password": "123", + "玩家密码": "123", "最后登录时间": "2025年07月21日09时27分44秒", "总游玩时间": "0时8分51秒", "注册时间": "2025年07月20日23时08分10秒", @@ -35,7 +35,7 @@ }, { "crop_type": "龙果", - "grow_time": 5840, + "grow_time": 7240, "is_dead": false, "is_diged": true, "is_planted": true, @@ -57,7 +57,7 @@ }, { "crop_type": "苹果", - "grow_time": 5710, + "grow_time": 7110, "is_dead": false, "is_diged": true, "is_planted": true, diff --git a/server/game_saves/3205788256.json b/server/game_saves/3205788256.json index 13fb02f..eb2af7d 100644 --- a/server/game_saves/3205788256.json +++ b/server/game_saves/3205788256.json @@ -13,7 +13,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1300, + "grow_time": 2730, "is_dead": false, "is_diged": true, "is_planted": true, @@ -24,7 +24,7 @@ }, { "crop_type": "龙果", - "grow_time": 1320, + "grow_time": 2750, "is_dead": false, "is_diged": true, "is_planted": true, @@ -35,7 +35,7 @@ }, { "crop_type": "杂交树1", - "grow_time": 1340, + "grow_time": 2770, "is_dead": false, "is_diged": true, "is_planted": true, @@ -46,7 +46,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 894, + "grow_time": 1180, "is_dead": false, "is_diged": true, "is_planted": true, @@ -68,7 +68,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 2676, + "grow_time": 3534, "is_dead": false, "is_diged": true, "is_planted": true, @@ -79,7 +79,7 @@ }, { "crop_type": "小麦", - "grow_time": 101, + "grow_time": 244, "is_dead": false, "is_diged": true, "is_planted": true, @@ -90,7 +90,7 @@ }, { "crop_type": "小麦", - "grow_time": 101, + "grow_time": 244, "is_dead": false, "is_diged": true, "is_planted": true, @@ -101,7 +101,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 446, + "grow_time": 589, "is_dead": false, "is_diged": true, "is_planted": true, @@ -156,7 +156,7 @@ }, { "crop_type": "土豆", - "grow_time": 445, + "grow_time": 489, "is_dead": false, "is_diged": true, "is_planted": true, @@ -167,7 +167,7 @@ }, { "crop_type": "小麦", - "grow_time": 100, + "grow_time": 243, "is_dead": false, "is_diged": true, "is_planted": true, @@ -178,7 +178,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 444, + "grow_time": 587, "is_dead": false, "is_diged": true, "is_planted": true, @@ -189,7 +189,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 444, + "grow_time": 587, "is_dead": false, "is_diged": true, "is_planted": true, @@ -200,7 +200,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 444, + "grow_time": 587, "is_dead": false, "is_diged": true, "is_planted": true, @@ -211,7 +211,7 @@ }, { "crop_type": "土豆", - "grow_time": 443, + "grow_time": 487, "is_dead": false, "is_diged": true, "is_planted": true, @@ -222,7 +222,7 @@ }, { "crop_type": "土豆", - "grow_time": 443, + "grow_time": 487, "is_dead": false, "is_diged": true, "is_planted": true, @@ -233,7 +233,7 @@ }, { "crop_type": "小麦", - "grow_time": 100, + "grow_time": 243, "is_dead": false, "is_diged": true, "is_planted": true, @@ -244,7 +244,7 @@ }, { "crop_type": "小麦", - "grow_time": 100, + "grow_time": 243, "is_dead": false, "is_diged": true, "is_planted": true, @@ -255,7 +255,7 @@ }, { "crop_type": "小麦", - "grow_time": 100, + "grow_time": 243, "is_dead": false, "is_diged": true, "is_planted": true, @@ -266,7 +266,7 @@ }, { "crop_type": "土豆", - "grow_time": 442, + "grow_time": 486, "is_dead": false, "is_diged": true, "is_planted": true, @@ -277,7 +277,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 442, + "grow_time": 585, "is_dead": false, "is_diged": true, "is_planted": true, @@ -288,7 +288,7 @@ }, { "crop_type": "小麦", - "grow_time": 99, + "grow_time": 242, "is_dead": false, "is_diged": true, "is_planted": true, @@ -299,7 +299,7 @@ }, { "crop_type": "小麦", - "grow_time": 99, + "grow_time": 242, "is_dead": false, "is_diged": true, "is_planted": true, @@ -310,7 +310,7 @@ }, { "crop_type": "小麦", - "grow_time": 99, + "grow_time": 242, "is_dead": false, "is_diged": true, "is_planted": true, @@ -321,7 +321,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 441, + "grow_time": 584, "is_dead": false, "is_diged": true, "is_planted": true, @@ -568,10 +568,10 @@ "player_name": "树萌芽", "level": 64, "money": 615197025464, - "最后登录时间": "2025年07月21日09时48分48秒", - "总游玩时间": "162时53分53秒", + "最后登录时间": "2025年07月21日10时00分08秒", + "总游玩时间": "162时54分5秒", "user_name": "3205788256", - "user_password": "tyh@19900420", + "玩家密码": "123456", "个人简介": "人生啊，就这样吧", "注册时间": "2025年05月21日15时00分00秒", "作物仓库": [