From 75ee0fe3f4ee0f0156226d85a2d0d9cf5d126c60 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:49:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E7=BB=8F?= =?UTF-8?q?=E9=AA=8C=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainGame.gd | 20 +-- Network/TCPNetworkManager.gd | 12 +- Script/BigPanel/LoginPanel.gd | 2 +- Script/SmallPanel/OnlineGiftPanel.gd | 4 +- Server/TCPGameServer.py | 160 ++++++++--------- .../config/initial_player_data_template.json | 2 +- Server/game_saves/2143323382.json | 2 +- Server/game_saves/2804775686.json | 2 +- server/game_saves/3205788256.json | 166 +++++++++--------- 9 files changed, 189 insertions(+), 181 deletions(-) diff --git a/MainGame.gd b/MainGame.gd index c53aa1d..be03425 100644 --- a/MainGame.gd +++ b/MainGame.gd @@ -392,7 +392,7 @@ func _handle_visit_player_response(data): "农场名称": show_farm_name.text.replace("农场名称：", ""), "level": level, "money": money, - "experience": experience, + "经验值": experience, "stamina": stamina, "农场土地": farm_lots.duplicate(true), "种子仓库": player_bag.duplicate(true) @@ -404,7 +404,7 @@ func _handle_visit_player_response(data): # 更新显示数据 money = target_player_data.get("money", 0) - experience = target_player_data.get("experience", 0) + experience = target_player_data.get("经验值", 0) level = target_player_data.get("level", 1) stamina = target_player_data.get("体力值", 20) farm_lots = target_player_data.get("农场土地", []) @@ -481,7 +481,7 @@ func _handle_return_my_farm_response(data): # 恢复玩家数据 money = player_data.get("money", 500) - experience = player_data.get("experience", 0) + experience = player_data.get("经验值", 0) level = player_data.get("level", 1) stamina = player_data.get("体力值", 20) farm_lots = player_data.get("农场土地", []) @@ -1802,7 +1802,7 @@ func _handle_daily_check_in_response(response: Dictionary) -> void: var updated_data = response.get("updated_data", {}) money = updated_data["money"] - experience = updated_data["experience"] + experience = updated_data["经验值"] level = updated_data["level"] player_bag = updated_data["种子仓库"] @@ -1941,7 +1941,7 @@ func _handle_lucky_draw_response(response: Dictionary) -> void: # 更新玩家数据 var updated_data = response.get("updated_data", {}) money = updated_data["money"] - experience = updated_data["experience"] + experience = updated_data["经验值"] level = updated_data["level"] player_bag = updated_data["种子仓库"] @@ -2161,7 +2161,7 @@ func _handle_new_player_gift_response(data): if success: # 更新玩家数据 money = updated_data.get("money", money) - experience = updated_data.get("experience", experience) + experience = updated_data.get("经验值", experience) level = updated_data.get("level", level) # 安全更新背包数据 @@ -2423,7 +2423,7 @@ func _handle_claim_online_gift_response(data: Dictionary): if success: # 更新玩家数据 money = updated_data["money"] - experience = updated_data["experience"] + experience = updated_data["经验值"] level = updated_data["level"] player_bag = updated_data["种子仓库"] @@ -2451,7 +2451,7 @@ func _handle_account_setting_response(data: Dictionary): show_player_name.text = "玩家昵称：" + account_info.get("玩家昵称", "") # 更新基本游戏状态显示 - experience = account_info.get("experience", 0) + experience = account_info.get("经验值", 0) level = account_info.get("level", 1) money = account_info.get("money", 0) @@ -2523,8 +2523,8 @@ func _handle_use_farm_item_response(data: Dictionary): if updated_data.has("money"): money = updated_data["money"] # 安全更新经验 - if updated_data.has("experience"): - experience = updated_data["experience"] + if updated_data.has("经验值"): + experience = updated_data["经验值"] # 安全更新等级 if updated_data.has("level"): level = updated_data["level"] diff --git a/Network/TCPNetworkManager.gd b/Network/TCPNetworkManager.gd index ae40d42..cbcca41 100644 --- a/Network/TCPNetworkManager.gd +++ b/Network/TCPNetworkManager.gd @@ -273,7 +273,7 @@ func _on_data_received(data): if action_type == "harvest_crop": if success: main_game.money = updated_data["money"] - main_game.experience = updated_data["experience"] + main_game.experience = updated_data["经验值"] main_game.level = updated_data["level"] # 只有偷菜时才会返回体力值，正常收获不会返回 if updated_data.has("体力值"): @@ -356,7 +356,7 @@ func _on_data_received(data): if success: main_game.item_bag = updated_data["道具背包"] main_game.farm_lots = updated_data["农场土地"] - main_game.experience = updated_data["experience"] + main_game.experience = updated_data["经验值"] main_game.level = updated_data["level"] main_game._update_ui() main_game._update_farm_lots_state() @@ -369,7 +369,7 @@ func _on_data_received(data): elif action_type == "dig_ground": if success: main_game.money = updated_data["money"] - main_game.experience = updated_data["experience"] + main_game.experience = updated_data["经验值"] main_game.level = updated_data["level"] main_game.farm_lots = updated_data["农场土地"] main_game.player_bag = updated_data["种子仓库"] @@ -396,7 +396,7 @@ func _on_data_received(data): if success: main_game.money = updated_data["money"] main_game.farm_lots = updated_data["农场土地"] - main_game.experience = updated_data["experience"] + main_game.experience = updated_data["经验值"] main_game.level = updated_data["level"] main_game._update_ui() main_game._update_farm_lots_state() @@ -409,7 +409,7 @@ func _on_data_received(data): if success: main_game.money = updated_data["money"] main_game.farm_lots = updated_data["农场土地"] - main_game.experience = updated_data["experience"] + main_game.experience = updated_data["经验值"] main_game.level = updated_data["level"] main_game._update_ui() main_game._update_farm_lots_state() @@ -445,7 +445,7 @@ func _on_data_received(data): if success: main_game.money = updated_data["money"] main_game.crop_warehouse = updated_data["作物仓库"] - main_game.experience = updated_data.get("experience", main_game.experience) + main_game.experience = updated_data.get("经验值", main_game.experience) main_game.level = updated_data.get("level", main_game.level) main_game._update_ui() main_game.crop_warehouse_panel.update_crop_warehouse_ui() diff --git a/Script/BigPanel/LoginPanel.gd b/Script/BigPanel/LoginPanel.gd index f3277ba..a160d43 100644 --- a/Script/BigPanel/LoginPanel.gd +++ b/Script/BigPanel/LoginPanel.gd @@ -418,7 +418,7 @@ func _handle_login_success(user_data: Dictionary): main_game.remaining_likes = user_data.get("今日剩余点赞次数", 10) # 更新主游戏数据 - main_game.experience = user_data.get("experience", 0) + main_game.experience = user_data.get("经验值", 0) main_game.farm_lots = user_data.get("农场土地", []) main_game.level = user_data.get("level", 1) main_game.money = user_data.get("money", 0) diff --git a/Script/SmallPanel/OnlineGiftPanel.gd b/Script/SmallPanel/OnlineGiftPanel.gd index bb96ea5..0f503e1 100644 --- a/Script/SmallPanel/OnlineGiftPanel.gd +++ b/Script/SmallPanel/OnlineGiftPanel.gd @@ -172,8 +172,8 @@ func handle_claim_online_gift_response(data: Dictionary): # 兼容老格式 if rewards.has("money"): reward_text += "金币+" + str(rewards["money"]) + " " - if rewards.has("experience"): - reward_text += "经验+" + str(rewards["experience"]) + " " + if rewards.has("经验值"): + reward_text += "经验+" + str(rewards["经验值"]) + " " if rewards.has("seeds"): for seed in rewards["seeds"]: reward_text += seed["name"] + "x" + str(seed["count"]) + " " diff --git a/Server/TCPGameServer.py b/Server/TCPGameServer.py index 5f5e265..25de808 100644 --- a/Server/TCPGameServer.py +++ b/Server/TCPGameServer.py @@ -1109,7 +1109,7 @@ class TCPGameServer(TCPServer): "农场名称": farm_name or "我的农场", "玩家昵称": player_name or username, "个人简介": "", # 新增个人简介字段，默认为空 - "experience": player_data.get("experience", 0), + "经验值": player_data.get("经验值", 0), "level": player_data.get("level", 1), "money": player_data.get("money", 1000) }) @@ -1435,7 +1435,7 @@ class TCPGameServer(TCPServer): "message": f"已帮助 {target_username} 清理死亡的作物", "updated_data": { "money": current_player_data["money"], - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"] } }) @@ -1473,7 +1473,7 @@ class TCPGameServer(TCPServer): "message": "已铲除死亡的作物", "updated_data": { "money": current_player_data["money"], - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"] } }) @@ -1517,7 +1517,7 @@ class TCPGameServer(TCPServer): } # 更新玩家经验 - player_data["experience"] += crop_exp + player_data["经验值"] += crop_exp # 检查是否会获得成熟物 mature_name = crop_info.get("成熟物名称") @@ -1534,9 +1534,9 @@ class TCPGameServer(TCPServer): # 检查升级 level_up_experience = 100 * player_data["level"] - if player_data["experience"] >= level_up_experience: + if player_data["经验值"] >= level_up_experience: player_data["level"] += 1 - player_data["experience"] -= level_up_experience + player_data["经验值"] -= level_up_experience self.log('INFO', f"玩家 {username} 升级到 {player_data['level']} 级", 'SERVER') # 清理地块（批量更新） @@ -1576,7 +1576,7 @@ class TCPGameServer(TCPServer): "message": message, "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "种子仓库": player_data.get("种子仓库", []), "作物仓库": player_data.get("作物仓库", []) @@ -1643,7 +1643,7 @@ class TCPGameServer(TCPServer): return self._send_action_error(client_id, "harvest_crop", stamina_message) # 更新当前玩家数据（获得经验） - current_player_data["experience"] += crop_exp + current_player_data["经验值"] += crop_exp # 检查是否会获得成熟物 mature_name = crop_info.get("成熟物名称") @@ -1660,9 +1660,9 @@ class TCPGameServer(TCPServer): # 检查当前玩家升级 level_up_experience = 100 * current_player_data["level"] - if current_player_data["experience"] >= level_up_experience: + if current_player_data["经验值"] >= level_up_experience: current_player_data["level"] += 1 - current_player_data["experience"] -= level_up_experience + current_player_data["经验值"] -= level_up_experience self.log('INFO', f"玩家 {current_username} 升级到 {current_player_data['level']} 级", 'SERVER') # 清理目标玩家的地块（批量更新） @@ -1703,7 +1703,7 @@ class TCPGameServer(TCPServer): "message": message, "updated_data": { "money": current_player_data["money"], - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"], "体力值": current_player_data["体力值"], "种子仓库": current_player_data.get("种子仓库", []), @@ -3210,7 +3210,7 @@ class TCPGameServer(TCPServer): # 应用奖励 player_data["money"] += rewards["money"] - player_data["experience"] += rewards["experience"] + player_data["经验值"] += rewards["经验值"] # 添加种子到背包 if "种子仓库" not in player_data: @@ -3256,7 +3256,7 @@ class TCPGameServer(TCPServer): "message": f"成功开垦地块，花费 {dig_money} 金钱！{reward_message}", "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "农场土地": player_data["农场土地"], "种子仓库": player_data["种子仓库"] @@ -3269,7 +3269,7 @@ class TCPGameServer(TCPServer): rewards = { "money": 0, - "experience": 0, + "经验值": 0, "seeds": {} } @@ -3277,7 +3277,7 @@ class TCPGameServer(TCPServer): rewards["money"] = random.randint(200, 500) # 随机经验：300-600经验 - rewards["experience"] = random.randint(300, 600) + rewards["经验值"] = random.randint(300, 600) # 随机种子：0-3种种子 seed_types_count = random.randint(0, 3) @@ -3466,7 +3466,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励（100-300） experience_reward = random.randint(100, 300) - player_data["experience"] += experience_reward + player_data["经验值"] += experience_reward # 检查是否升级 self._check_level_up(player_data) @@ -3507,7 +3507,7 @@ class TCPGameServer(TCPServer): "message": message, "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "农场土地": player_data["农场土地"] } @@ -3547,7 +3547,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励（100-300）给当前玩家 experience_reward = random.randint(100, 300) - current_player_data["experience"] += experience_reward + current_player_data["经验值"] += experience_reward # 检查当前玩家是否升级 self._check_level_up(current_player_data) @@ -3589,7 +3589,7 @@ class TCPGameServer(TCPServer): "message": message, "updated_data": { "money": current_player_data["money"], - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"] } }) @@ -3676,7 +3676,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励（100-300）给当前玩家 experience_reward = random.randint(100, 300) - current_player_data["experience"] += experience_reward + current_player_data["经验值"] += experience_reward # 检查当前玩家是否升级 self._check_level_up(current_player_data) @@ -3705,7 +3705,7 @@ class TCPGameServer(TCPServer): "message": f"帮助施肥成功！{target_username} 的 {crop_type} 将在10分钟内以双倍速度生长，获得 {experience_reward} 经验", "updated_data": { "money": current_player_data["money"], - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"] } }) @@ -3737,7 +3737,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励（100-300） experience_reward = random.randint(100, 300) - player_data["experience"] += experience_reward + player_data["经验值"] += experience_reward # 检查是否升级 self._check_level_up(player_data) @@ -3765,7 +3765,7 @@ class TCPGameServer(TCPServer): "message": f"施肥成功！{crop_type} 将在10分钟内以双倍速度生长，获得 {experience_reward} 经验", "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "农场土地": player_data["农场土地"] } @@ -4044,7 +4044,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励 experience_reward = random.randint(50, 150) - player_data["experience"] += experience_reward + player_data["经验值"] += experience_reward # 检查是否升级 self._check_level_up(player_data) @@ -4094,7 +4094,7 @@ class TCPGameServer(TCPServer): "success": True, "message": f"{message}，获得 {experience_reward} 经验", "updated_data": { - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "农场土地": player_data["农场土地"], "道具背包": player_data["道具背包"] @@ -4109,7 +4109,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励 experience_reward = random.randint(30, 100) - player_data["experience"] += experience_reward + player_data["经验值"] += experience_reward # 检查是否升级 self._check_level_up(player_data) @@ -4159,7 +4159,7 @@ class TCPGameServer(TCPServer): "success": True, "message": final_message, "updated_data": { - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "农场土地": player_data["农场土地"], "道具背包": player_data["道具背包"] @@ -4178,7 +4178,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励给当前玩家 experience_reward = random.randint(50, 150) - current_player_data["experience"] += experience_reward + current_player_data["经验值"] += experience_reward # 检查当前玩家是否升级 self._check_level_up(current_player_data) @@ -4229,7 +4229,7 @@ class TCPGameServer(TCPServer): "success": True, "message": f"{message}，获得 {experience_reward} 经验", "updated_data": { - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"], "道具背包": current_player_data["道具背包"] } @@ -4243,7 +4243,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励给当前玩家 experience_reward = random.randint(30, 100) - current_player_data["experience"] += experience_reward + current_player_data["经验值"] += experience_reward # 检查当前玩家是否升级 self._check_level_up(current_player_data) @@ -4294,7 +4294,7 @@ class TCPGameServer(TCPServer): "success": True, "message": final_message, "updated_data": { - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"], "道具背包": current_player_data["道具背包"] } @@ -4312,7 +4312,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励 experience_reward = random.randint(20, 60) - player_data["experience"] += experience_reward + player_data["经验值"] += experience_reward # 检查是否升级 self._check_level_up(player_data) @@ -4342,7 +4342,7 @@ class TCPGameServer(TCPServer): "success": True, "message": f"使用 {item_name} 成功铲除作物 {crop_type}，获得 {experience_reward} 经验", "updated_data": { - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "农场土地": player_data["农场土地"], "道具背包": player_data["道具背包"] @@ -4372,7 +4372,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励 experience_reward = random.randint(15, 50) - player_data["experience"] += experience_reward + player_data["经验值"] += experience_reward # 检查是否升级 self._check_level_up(player_data) @@ -4399,7 +4399,7 @@ class TCPGameServer(TCPServer): "success": True, "message": f"使用 {item_name} 成功清除杂草 {crop_type}，获得 {experience_reward} 经验", "updated_data": { - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "农场土地": player_data["农场土地"], "道具背包": player_data["道具背包"] @@ -4418,7 +4418,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励给当前玩家 experience_reward = random.randint(20, 60) - current_player_data["experience"] += experience_reward + current_player_data["经验值"] += experience_reward # 检查当前玩家是否升级 self._check_level_up(current_player_data) @@ -4449,7 +4449,7 @@ class TCPGameServer(TCPServer): "success": True, "message": f"帮助 {target_username} 铲除作物 {crop_type} 成功，获得 {experience_reward} 经验", "updated_data": { - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"], "道具背包": current_player_data["道具背包"] } @@ -4478,7 +4478,7 @@ class TCPGameServer(TCPServer): # 生成随机经验奖励给当前玩家 experience_reward = random.randint(15, 50) - current_player_data["experience"] += experience_reward + current_player_data["经验值"] += experience_reward # 检查当前玩家是否升级 self._check_level_up(current_player_data) @@ -4506,7 +4506,7 @@ class TCPGameServer(TCPServer): "success": True, "message": f"帮助 {target_username} 清除杂草 {crop_type} 成功，获得 {experience_reward} 经验", "updated_data": { - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"], "道具背包": current_player_data["道具背包"] } @@ -4581,7 +4581,7 @@ class TCPGameServer(TCPServer): } # 更新玩家经验 - player_data["experience"] += crop_exp + player_data["经验值"] += crop_exp # 检查是否升级 self._check_level_up(player_data) @@ -4640,7 +4640,7 @@ class TCPGameServer(TCPServer): "success": True, "message": message, "updated_data": { - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "种子仓库": player_data.get("种子仓库", []), "作物仓库": player_data.get("作物仓库", []), @@ -4717,7 +4717,7 @@ class TCPGameServer(TCPServer): } # 更新当前玩家经验 - current_player_data["experience"] += crop_exp + current_player_data["经验值"] += crop_exp # 检查当前玩家是否升级 self._check_level_up(current_player_data) @@ -4777,7 +4777,7 @@ class TCPGameServer(TCPServer): "success": True, "message": message, "updated_data": { - "experience": current_player_data["experience"], + "经验值": current_player_data["经验值"], "level": current_player_data["level"], "种子仓库": current_player_data.get("种子仓库", []), "作物仓库": current_player_data.get("作物仓库", []), @@ -5015,8 +5015,8 @@ class TCPGameServer(TCPServer): # 应用奖励 if "money" in rewards: player_data["money"] += rewards["money"] - if "experience" in rewards: - player_data["experience"] += rewards["experience"] + if "经验值" in rewards: + player_data["经验值"] += rewards["经验值"] # 检查是否升级 self._check_level_up(player_data) @@ -5031,7 +5031,7 @@ class TCPGameServer(TCPServer): "message": result_message, "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "道具背包": item_bag } @@ -5064,7 +5064,7 @@ class TCPGameServer(TCPServer): if item_name == "小额经验卡": # 给玩家增加500经验 - rewards["experience"] = 500 + rewards["经验值"] = 500 return True, f"使用 {item_name} 成功！获得了500经验值", rewards elif item_name == "小额金币卡": @@ -5954,7 +5954,7 @@ class TCPGameServer(TCPServer): "农场名称": player_data.get("农场名称", ""), "level": player_data.get("level", 1), "money": player_data.get("money", 0), - "experience": player_data.get("experience", 0), + "经验值": player_data.get("经验值", 0), "体力值": current_stamina, "seed_count": seed_count, "最后登录时间": last_login_str, @@ -6112,7 +6112,7 @@ class TCPGameServer(TCPServer): "农场名称": 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), + "经验值": target_player_data.get("经验值", 0), "体力值": target_current_stamina, "农场土地": target_player_data.get("农场土地", []), "种子仓库": target_player_data.get("种子仓库", []), @@ -6184,7 +6184,7 @@ class TCPGameServer(TCPServer): "农场名称": player_data.get("农场名称", ""), "level": player_data.get("level", 1), "money": player_data.get("money", 0), - "experience": player_data.get("experience", 0), + "经验值": player_data.get("经验值", 0), "体力值": my_current_stamina, "农场土地": player_data.get("农场土地", []), "种子仓库": player_data.get("种子仓库", []), @@ -6325,7 +6325,7 @@ class TCPGameServer(TCPServer): "rewards": rewards, "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "种子仓库": player_data.get("种子仓库", []) } @@ -6340,8 +6340,8 @@ class TCPGameServer(TCPServer): # 发放经验 if "经验" in rewards: - old_experience = player_data.get("experience", 0) - player_data["experience"] = old_experience + rewards["经验"] + old_experience = player_data.get("经验值", 0) + player_data["经验值"] = old_experience + rewards["经验"] # 检查是否升级 self._check_level_up(player_data) @@ -6386,9 +6386,9 @@ class TCPGameServer(TCPServer): player_data["money"] = player_data.get("money", 0) + rewards["money"] # 发放经验 - if "experience" in rewards: - old_experience = player_data.get("experience", 0) - player_data["experience"] = old_experience + rewards["experience"] + if "经验值" in rewards: + old_experience = player_data.get("经验值", 0) + player_data["经验值"] = old_experience + rewards["经验值"] # 检查是否升级 self._check_level_up(player_data) @@ -6430,7 +6430,7 @@ class TCPGameServer(TCPServer): def _check_level_up(self, player_data): """检查玩家是否升级""" current_level = player_data.get("level", 1) - current_experience = player_data.get("experience", 0) + current_experience = player_data.get("经验值", 0) # 计算升级所需经验 (每级需要的经验递增) experience_needed = current_level * 100 @@ -6442,7 +6442,7 @@ class TCPGameServer(TCPServer): experience_needed = current_level * 100 player_data["level"] = current_level - player_data["experience"] = current_experience + player_data["经验值"] = current_experience #更新玩家今日在线时间 def _update_daily_online_time(self, client_id, player_data): @@ -6907,7 +6907,7 @@ class TCPGameServer(TCPServer): "consecutive_days": consecutive_days, "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "种子仓库": player_data.get("种子仓库", []) } @@ -7133,16 +7133,16 @@ class TCPGameServer(TCPServer): # 应用经验奖励 if "exp" in rewards: - player_data["experience"] = player_data.get("experience", 0) + rewards["exp"] + player_data["经验值"] = player_data.get("经验值", 0) + rewards["exp"] if "bonus_exp" in rewards: - player_data["experience"] = player_data.get("experience", 0) + rewards["bonus_exp"] + player_data["经验值"] = player_data.get("经验值", 0) + rewards["bonus_exp"] # 检查升级 level_up_experience = 100 * player_data.get("level", 1) - while player_data.get("experience", 0) >= level_up_experience: + while player_data.get("经验值", 0) >= level_up_experience: player_data["level"] = player_data.get("level", 1) + 1 - player_data["experience"] -= level_up_experience + player_data["经验值"] -= level_up_experience level_up_experience = 100 * player_data["level"] # 应用种子奖励 @@ -7229,7 +7229,7 @@ class TCPGameServer(TCPServer): "gift_contents": reward_content, "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "种子仓库": player_data.get("种子仓库", []), "宠物背包": player_data.get("宠物背包", []), @@ -7256,14 +7256,14 @@ class TCPGameServer(TCPServer): player_data["money"] = player_data.get("money", 0) + gift_contents["coins"] # 应用经验奖励 - if "experience" in gift_contents: - player_data["experience"] = player_data.get("experience", 0) + gift_contents["experience"] + if "经验值" in gift_contents: + player_data["经验值"] = player_data.get("经验值", 0) + gift_contents["经验值"] # 检查升级 level_up_experience = 100 * player_data.get("level", 1) - while player_data.get("experience", 0) >= level_up_experience: + while player_data.get("经验值", 0) >= level_up_experience: player_data["level"] = player_data.get("level", 1) + 1 - player_data["experience"] -= level_up_experience + player_data["经验值"] -= level_up_experience level_up_experience = 100 * player_data["level"] # 应用种子奖励 @@ -7301,14 +7301,14 @@ class TCPGameServer(TCPServer): # 应用经验奖励 if "经验" in reward_content: - player_data["experience"] = player_data.get("experience", 0) + reward_content["经验"] + player_data["经验值"] = player_data.get("经验值", 0) + reward_content["经验"] # 检查升级 while True: level_up_experience = 100 * player_data.get("level", 1) - if player_data.get("experience", 0) >= level_up_experience: + if player_data.get("经验值", 0) >= level_up_experience: player_data["level"] = player_data.get("level", 1) + 1 - player_data["experience"] -= level_up_experience + player_data["经验值"] -= level_up_experience else: break @@ -7417,7 +7417,7 @@ class TCPGameServer(TCPServer): "rewards": rewards, "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "种子仓库": player_data.get("种子仓库", []) } @@ -7770,13 +7770,13 @@ class TCPGameServer(TCPServer): player_data["money"] = player_data.get("money", 0) + reward.get("amount", 0) elif reward_type == "exp": - player_data["experience"] = player_data.get("experience", 0) + reward.get("amount", 0) + player_data["经验值"] = player_data.get("经验值", 0) + reward.get("amount", 0) # 检查升级 level_up_experience = 100 * player_data.get("level", 1) - while player_data.get("experience", 0) >= level_up_experience: + while player_data.get("经验值", 0) >= level_up_experience: player_data["level"] = player_data.get("level", 1) + 1 - player_data["experience"] -= level_up_experience + player_data["经验值"] -= level_up_experience level_up_experience = 100 * player_data["level"] elif reward_type == "seed": @@ -8082,7 +8082,7 @@ class TCPGameServer(TCPServer): "农场名称": player_data.get("农场名称", ""), "个人简介": player_data.get("个人简介", ""), "level": player_data.get("level", 1), - "experience": player_data.get("experience", 0), + "经验值": player_data.get("经验值", 0), "money": player_data.get("money", 0) } @@ -9160,7 +9160,7 @@ class TCPGameServer(TCPServer): # 给予少量出售经验 sell_experience = max(1, sell_count // 5) # 每5个作物给1点经验 - player_data["experience"] += sell_experience + player_data["经验值"] += sell_experience # 检查是否升级 self._check_level_up(player_data) @@ -9186,7 +9186,7 @@ class TCPGameServer(TCPServer): "message": f"成功出售 {sell_count} 个 {display_name}，获得 {total_income} 金币和 {sell_experience} 经验", "updated_data": { "money": player_data["money"], - "experience": player_data["experience"], + "经验值": player_data["经验值"], "level": player_data["level"], "作物仓库": player_data["作物仓库"] } @@ -9631,8 +9631,8 @@ class ConsoleCommands: return # 修改经验 - old_exp = player_data.get("experience", 0) - player_data["experience"] = old_exp + amount + old_exp = player_data.get("经验值", 0) + player_data["经验值"] = old_exp + amount # 检查是否升级 old_level = player_data.get("level", 1) diff --git a/Server/config/initial_player_data_template.json b/Server/config/initial_player_data_template.json index 6f5d911..75b7b95 100644 --- a/Server/config/initial_player_data_template.json +++ b/Server/config/initial_player_data_template.json @@ -1,5 +1,5 @@ { - "experience": 0, + "经验值": 0, "level": 1, "money": 5000, "农场名称": "农场名称", diff --git a/Server/game_saves/2143323382.json b/Server/game_saves/2143323382.json index 7569429..1aa3a67 100644 --- a/Server/game_saves/2143323382.json +++ b/Server/game_saves/2143323382.json @@ -1,5 +1,5 @@ { - "experience": 455, + "经验值": 455, "level": 36, "money": 200797815, "农场名称": "柚大青の小农场", diff --git a/Server/game_saves/2804775686.json b/Server/game_saves/2804775686.json index f09bf46..08399a5 100644 --- a/Server/game_saves/2804775686.json +++ b/Server/game_saves/2804775686.json @@ -1,5 +1,5 @@ { - "experience": 869, + "经验值": 869, "level": 15, "money": 1231231120406, "农场名称": "123", diff --git a/server/game_saves/3205788256.json b/server/game_saves/3205788256.json index 414882c..5e526c6 100644 --- a/server/game_saves/3205788256.json +++ b/server/game_saves/3205788256.json @@ -1,11 +1,11 @@ { "农场土地": [ { - "crop_type": "小麦", - "grow_time": 300, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, @@ -13,7 +13,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 16020, + "grow_time": 17030, "is_dead": false, "is_diged": true, "is_planted": true, @@ -23,11 +23,11 @@ "土地等级": 4 }, { - "crop_type": "龙果", - "grow_time": 14450, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 14400, "已浇水": false, "已施肥": false, @@ -35,7 +35,7 @@ }, { "crop_type": "杂交树1", - "grow_time": 16060, + "grow_time": 17070, "is_dead": false, "is_diged": true, "is_planted": true, @@ -46,7 +46,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 3838, + "grow_time": 4040, "is_dead": false, "is_diged": true, "is_planted": true, @@ -56,11 +56,11 @@ "土地等级": 1 }, { - "crop_type": "小麦", - "grow_time": 300, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, @@ -68,7 +68,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 11508, + "grow_time": 12114, "is_dead": false, "is_diged": true, "is_planted": true, @@ -78,22 +78,22 @@ "土地等级": 3 }, { - "crop_type": "小麦", - "grow_time": 304, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 304, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, @@ -101,7 +101,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1918, + "grow_time": 2019, "is_dead": false, "is_diged": true, "is_planted": true, @@ -111,66 +111,66 @@ "土地等级": 0 }, { - "crop_type": "土豆", - "grow_time": 480, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 480, "已浇水": false, "已施肥": false, "土地等级": 4 }, { - "crop_type": "土豆", - "grow_time": 480, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 480, "已浇水": false, "已施肥": false, "土地等级": 4 }, { - "crop_type": "小麦", - "grow_time": 300, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 4 }, { - "crop_type": "小麦", - "grow_time": 300, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 4 }, { - "crop_type": "土豆", - "grow_time": 489, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 480, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 303, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, @@ -178,7 +178,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1916, + "grow_time": 2017, "is_dead": false, "is_diged": true, "is_planted": true, @@ -189,7 +189,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1916, + "grow_time": 2017, "is_dead": false, "is_diged": true, "is_planted": true, @@ -200,7 +200,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1916, + "grow_time": 2017, "is_dead": false, "is_diged": true, "is_planted": true, @@ -210,66 +210,66 @@ "土地等级": 0 }, { - "crop_type": "土豆", - "grow_time": 487, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 480, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "土豆", - "grow_time": 487, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 480, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 303, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 303, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 303, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "土豆", - "grow_time": 486, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 480, "已浇水": false, "已施肥": false, @@ -277,7 +277,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1914, + "grow_time": 2015, "is_dead": false, "is_diged": true, "is_planted": true, @@ -287,33 +287,33 @@ "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 302, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 302, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, "土地等级": 0 }, { - "crop_type": "小麦", - "grow_time": 302, + "crop_type": "", + "grow_time": 0, "is_dead": false, "is_diged": true, - "is_planted": true, + "is_planted": false, "max_grow_time": 300, "已浇水": false, "已施肥": false, @@ -321,7 +321,7 @@ }, { "crop_type": "杂交树2", - "grow_time": 1913, + "grow_time": 2014, "is_dead": false, "is_diged": true, "is_planted": true, @@ -555,21 +555,26 @@ { "name": "小麦", "quality": "普通", - "count": 5 + "count": 14 }, { "name": "胡萝卜", "quality": "普通", "count": 3 + }, + { + "name": "土豆", + "quality": "普通", + "count": 7 } ], - "experience": 1963, + "经验值": 2384, "农场名称": "树萌芽の狗窝", "玩家昵称": "树萌芽", "level": 64, - "money": 615197025464, - "最后登录时间": "2025年07月21日10时37分11秒", - "总游玩时间": "162时54分56秒", + "money": 615197025903, + "最后登录时间": "2025年07月21日10时47分21秒", + "总游玩时间": "162时56分4秒", "玩家账号": "3205788256", "玩家密码": "123456", "个人简介": "人生啊，就这样吧", @@ -623,7 +628,7 @@ { "name": "小麦", "quality": "普通", - "count": 37 + "count": 77 }, { "name": "山葵", @@ -683,12 +688,12 @@ { "name": "马铃薯", "quality": "普通", - "count": 16 + "count": 29 }, { "name": "火龙果", "quality": "稀有", - "count": 3 + "count": 5 } ], "道具背包": [ @@ -1100,7 +1105,7 @@ }, "在线礼包": { "当前日期": "2025-07-21", - "今日在线时长": 71.67846703529358, + "今日在线时长": 94.40529680252075, "已领取礼包": [ "1分钟" ], @@ -1134,5 +1139,8 @@ "新手礼包": { "已领取": true, "领取时间": "2025-07-21 09:30:48" + }, + "签到历史": { + "2025年07月21日10时47分55秒": "金币439 经验57 小麦x5 土豆x3" } } \ No newline at end of file