From 98de447cb979a1582dc01d3bbe249096dcaff580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A0=91=E8=90=8C=E8=8A=BD?= <3205788256@qq.com> Date: Sat, 12 Jul 2025 23:03:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9C=A8=E7=BA=BF=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E7=82=B9=E8=B5=9E=EF=BC=8C=E6=96=B0=E6=89=8B?= =?UTF-8?q?=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MainGame.gd | 108 +++-- Network/TCPNetworkManager.gd | 10 + Script/BigPanel/LoginPanel.gd | 3 + Script/SmallPanel/OnlineGiftPanel.gd | 96 ++--- Server/TCPGameServer.py | 577 ++++++++++++++++---------- Server/config/new_player_config.json | 30 ++ Server/config/online_gift_config.json | 96 +++++ Server/game_saves/2143323382.json | 265 ++++++------ server/game_saves/3205788256.json | 14 +- 9 files changed, 709 insertions(+), 490 deletions(-) create mode 100644 Server/config/new_player_config.json create mode 100644 Server/config/online_gift_config.json diff --git a/MainGame.gd b/MainGame.gd index 9a3fd05..8d68cfb 100644 --- a/MainGame.gd +++ b/MainGame.gd @@ -123,6 +123,7 @@ var login_data : Dictionary = {} #var data : Dictionary = {} var start_game : bool = false +var remaining_likes : int = 10 # 今日剩余点赞次数 # 种子背包数据 var player_bag : Array = [] # 作物仓库数据 @@ -416,7 +417,7 @@ func _handle_visit_player_response(data): show_farm_name.text = "农场名称：" + target_player_data.get("farm_name", "未知农场") # 显示被访问玩家的点赞数 - var target_likes = target_player_data.get("total_likes", 0) + var target_likes = target_player_data.get("点赞数", 0) show_like.text = "点赞数：" + str(int(target_likes)) _update_ui() @@ -493,8 +494,8 @@ func _handle_return_my_farm_response(data): show_farm_name.text = "农场名称：" + player_data.get("farm_name", "我的农场") # 显示自己的点赞数 - var my_likes = player_data.get("total_likes", 0) - show_like.text = "总赞数：" + str(int(my_likes)) + var my_likes = player_data.get("点赞数", 0) + show_like.text = "点赞数：" + str(int(my_likes)) # 退出访问模式 is_visiting_mode = false @@ -680,7 +681,6 @@ func handle_login_success(player_data: Dictionary): - #创建作物按钮 func _create_crop_button(crop_name: String, crop_quality: String) -> Button: # 根据品质选择相应的进度条 @@ -728,6 +728,7 @@ func _create_farm_buttons(): grid_container.add_child(button) + # 更新农场地块状态 func _update_farm_lots_state(): var digged_count = 0 @@ -851,7 +852,7 @@ func _update_ui(): show_level.text = "等级：" + str(level) + " 级" show_hunger_value.text = "体力值：" + str(stamina) # 显示点赞数 - var my_likes = login_data.get("total_likes", 0) + var my_likes = login_data.get("点赞数", 0) show_like.text = "点赞数：" + str(int(my_likes)) @@ -2181,6 +2182,11 @@ func _on_like_button_pressed() -> void: Toast.show("只能在访问其他玩家农场时点赞", Color.ORANGE) return + # 检查剩余点赞次数 + if remaining_likes <= 0: + Toast.show("今日点赞次数已用完，明天再来吧！", Color.ORANGE) + return + # 获取被访问玩家的用户名 var target_username = visited_player_data.get("user_name", "") if target_username == "": @@ -2190,7 +2196,7 @@ func _on_like_button_pressed() -> void: # 发送点赞请求 var success = tcp_network_manager_panel.sendLikePlayer(target_username) if success: - print("已发送点赞请求给玩家：", target_username) + print("已发送点赞请求给玩家：", target_username, "，剩余点赞次数：", remaining_likes) else: Toast.show("网络未连接，无法点赞", Color.RED) print("发送点赞请求失败，网络未连接") @@ -2202,13 +2208,24 @@ func _handle_like_player_response(data): if success: var target_likes = data.get("target_likes", 0) + var remaining_likes_from_server = data.get("remaining_likes", 0) + + # 更新本地剩余点赞次数 + remaining_likes = remaining_likes_from_server + + # 显示成功消息，包含剩余次数 Toast.show(message, Color.PINK) # 更新被访问玩家的点赞数显示 - visited_player_data["total_likes"] = target_likes + visited_player_data["点赞数"] = target_likes show_like.text = "点赞数：" + str(int(target_likes)) - print("点赞成功，目标玩家总赞数：", target_likes) + # 显示剩余点赞次数提示 + if remaining_likes > 0: + print("点赞成功，目标玩家点赞数：", target_likes, "，您今日还可点赞", remaining_likes, "次") + else: + print("点赞成功，目标玩家点赞数：", target_likes, "，您今日点赞次数已用完") + Toast.show("今日点赞次数已用完，明天再来吧！", Color.ORANGE) else: Toast.show(message, Color.RED) print("点赞失败：", message) @@ -2315,21 +2332,28 @@ func _handle_new_player_gift_response(data): if success: # 更新玩家数据 - money = updated_data["money"] - experience = updated_data["experience"] - level = updated_data["level"] - player_bag = updated_data["player_bag"] - new_player_gift_claimed = updated_data["new_player_gift_claimed"] - pet_bag = updated_data["宠物背包"] + money = updated_data.get("money", money) + experience = updated_data.get("experience", experience) + level = updated_data.get("level", level) - # 隐藏新手大礼包按钮 - new_player_gift_button.hide() + # 安全更新背包数据 + if updated_data.has("player_bag"): + player_bag = updated_data["player_bag"] + if updated_data.has("宠物背包"): + pet_bag = updated_data["宠物背包"] + + # 获取新手礼包状态 + var new_player_gift_data = updated_data.get("新手礼包", {}) + if new_player_gift_data.get("已领取", false): + new_player_gift_claimed = true + new_player_gift_button.hide() # 更新UI _update_ui() # 更新宠物背包UI - pet_bag_panel.update_pet_bag_ui() + if updated_data.has("宠物背包"): + pet_bag_panel.update_pet_bag_ui() # 显示成功消息 Toast.show(message, Color.GOLD, 3.0, 1.0) @@ -2575,13 +2599,10 @@ func _handle_claim_online_gift_response(data: Dictionary): experience = updated_data["experience"] level = updated_data["level"] player_bag = updated_data["player_bag"] - pet_bag = updated_data["宠物背包"] # 更新UI _update_ui() player_bag_panel.update_player_bag_ui() - # 更新宠物背包UI - pet_bag_panel.update_pet_bag_ui() # 将响应传递给在线礼包面板处理UI更新 online_gift_panel.handle_claim_online_gift_response(data) @@ -2633,17 +2654,19 @@ func _handle_use_pet_item_response(data: Dictionary): var updated_data = data.get("updated_data", {}) if success: - # 更新宠物背包数据 - pet_bag = updated_data["宠物背包"] - - # 更新宠物背包UI - pet_bag_panel.update_pet_bag_ui() + # 安全更新宠物背包数据 + if updated_data.has("宠物背包"): + pet_bag = updated_data["宠物背包"] + # 更新宠物背包UI + if pet_bag_panel and pet_bag_panel.has_method("update_pet_bag_ui"): + pet_bag_panel.update_pet_bag_ui() - # 更新道具背包数据 - item_bag = updated_data["道具背包"] - - # 更新道具背包UI - item_bag_panel.update_item_bag_ui() + # 安全更新道具背包数据 + if updated_data.has("道具背包"): + item_bag = updated_data["道具背包"] + # 更新道具背包UI + if item_bag_panel and item_bag_panel.has_method("update_item_bag_ui"): + item_bag_panel.update_item_bag_ui() # 刷新宠物信息面板（如果当前有显示的宠物） var pet_inform_panel = get_node_or_null("UI/SmallPanel/PetInformPanel") @@ -2669,16 +2692,21 @@ func _handle_use_farm_item_response(data: Dictionary): var updated_data = data.get("updated_data", {}) if success: - # 更新金币 - money = updated_data["money"] - # 更新经验 - experience = updated_data["experience"] - # 更新等级 - level = updated_data["level"] - # 更新道具背包数据 - item_bag = updated_data["道具背包"] - # 更新道具背包UI - item_bag_panel.update_item_bag_ui() + # 安全更新金币 + if updated_data.has("money"): + money = updated_data["money"] + # 安全更新经验 + if updated_data.has("experience"): + experience = updated_data["experience"] + # 安全更新等级 + if updated_data.has("level"): + level = updated_data["level"] + # 安全更新道具背包数据 + if updated_data.has("道具背包"): + item_bag = updated_data["道具背包"] + # 更新道具背包UI + if item_bag_panel and item_bag_panel.has_method("update_item_bag_ui"): + item_bag_panel.update_item_bag_ui() # 更新UI显示 _update_ui() diff --git a/Network/TCPNetworkManager.gd b/Network/TCPNetworkManager.gd index b7ae8e0..6112569 100644 --- a/Network/TCPNetworkManager.gd +++ b/Network/TCPNetworkManager.gd @@ -214,6 +214,16 @@ func _on_data_received(data): var status = data.get("status", "") var message = data.get("message", "") var player_data = data.get("player_data", {}) + var remaining_likes = data.get("remaining_likes", 10) + + # 在登录成功时显示剩余点赞次数并更新主游戏数据 + if status == "success": + var likes_message = "今日剩余点赞次数：" + str(remaining_likes) + Toast.show(likes_message, Color.CYAN) + + # 更新主游戏中的剩余点赞次数 + main_game.remaining_likes = remaining_likes + login_panel._on_login_response_received(status == "success", message, player_data) return diff --git a/Script/BigPanel/LoginPanel.gd b/Script/BigPanel/LoginPanel.gd index ffc1f09..fe83a7d 100644 --- a/Script/BigPanel/LoginPanel.gd +++ b/Script/BigPanel/LoginPanel.gd @@ -315,6 +315,9 @@ func _on_login_response_received(success: bool, message: String, user_data: Dict # 保存登录数据到主游戏 main_game.login_data = user_data.duplicate() + # 保存剩余点赞次数 + main_game.remaining_likes = user_data.get("今日剩余点赞次数", 10) + # 更新主游戏数据 main_game.experience = user_data.get("experience", 0) main_game.farm_lots = user_data.get("farm_lots", []) diff --git a/Script/SmallPanel/OnlineGiftPanel.gd b/Script/SmallPanel/OnlineGiftPanel.gd index 17de1c9..bb96ea5 100644 --- a/Script/SmallPanel/OnlineGiftPanel.gd +++ b/Script/SmallPanel/OnlineGiftPanel.gd @@ -22,73 +22,17 @@ extends Panel -# 在线礼包数据结构 -var online_gift_config = { - "1分钟": { - "time_seconds": 60, - "rewards": { - "money": 100, - "experience": 50, - "seeds": [{"name": "小麦", "count": 5}, {"name": "胡萝卜", "count": 3}] - } - }, - "3分钟": { - "time_seconds": 180, - "rewards": { - "money": 250, - "experience": 150, - "seeds": [{"name": "胡萝卜", "count": 5}, {"name": "玉米", "count": 3}] - } - }, - "5分钟": { - "time_seconds": 300, - "rewards": { - "money": 500, - "experience": 250, - "seeds": [{"name": "玉米", "count": 3}, {"name": "番茄", "count": 2}] - } - }, - - "10分钟": { - "time_seconds": 600, - "rewards": { - "money": 500, - "experience": 200, - "seeds": [{"name": "玉米", "count": 3}, {"name": "番茄", "count": 2}] - } - }, - "30分钟": { - "time_seconds": 1800, - "rewards": { - "money": 1200, - "experience": 500, - "seeds": [{"name": "草莓", "count": 2}, {"name": "花椰菜", "count": 1}] - } - }, - "1小时": { - "time_seconds": 3600, - "rewards": { - "money": 2500, - "experience": 1000, - "seeds": [{"name": "葡萄", "count": 1}, {"name": "南瓜", "count": 1}, {"name": "咖啡豆", "count": 1}] - } - }, - "3小时": { - "time_seconds": 10800, - "rewards": { - "money": 6000, - "experience": 2500, - "seeds": [{"name": "人参", "count": 1}, {"name": "藏红花", "count": 1}] - } - }, - "5小时": { - "time_seconds": 18000, - "rewards": { - "money": 12000, - "experience": 5000, - "seeds": [{"name": "龙果", "count": 1}, {"name": "松露", "count": 1}, {"name": "月光草", "count": 1}] - } - } +# 在线礼包配置（从服务器动态获取） +var online_gift_config = {} +var gift_time_config = { + "1分钟": 60, + "3分钟": 180, + "5分钟": 300, + "10分钟": 600, + "30分钟": 1800, + "1小时": 3600, + "3小时": 10800, + "5小时": 18000 } # 按钮映射 @@ -136,14 +80,12 @@ func disable_all_buttons(): #更新按钮状态 func update_button_status(): - for gift_name in online_gift_config.keys(): - var config = online_gift_config[gift_name] - var button = button_mapping[gift_name] - + for gift_name in gift_time_config.keys(): + var button = button_mapping.get(gift_name) if not button: continue - var required_time = config["time_seconds"] + var required_time = gift_time_config[gift_name] var is_claimed = gift_claimed_status.get(gift_name, false) if is_claimed: @@ -218,6 +160,16 @@ func handle_claim_online_gift_response(data: Dictionary): var rewards = data.get("rewards", {}) var reward_text = "获得奖励: " + # 处理中文配置格式的奖励 + if rewards.has("金币"): + reward_text += "金币+" + str(rewards["金币"]) + " " + if rewards.has("经验"): + reward_text += "经验+" + str(rewards["经验"]) + " " + if rewards.has("种子"): + for seed in rewards["种子"]: + reward_text += seed["名称"] + "x" + str(seed["数量"]) + " " + + # 兼容老格式 if rewards.has("money"): reward_text += "金币+" + str(rewards["money"]) + " " if rewards.has("experience"): diff --git a/Server/TCPGameServer.py b/Server/TCPGameServer.py index 48334ea..c94eec8 100644 --- a/Server/TCPGameServer.py +++ b/Server/TCPGameServer.py @@ -81,6 +81,9 @@ class TCPGameServer(TCPServer): self.crop_timer = None # 作物生长计时器 self.weed_timer = None # 杂草生长计时器 + # 配置文件目录 + self.config_dir = "config" # 配置文件存储目录 + # 性能优化相关配置 self._init_performance_settings() @@ -402,14 +405,7 @@ class TCPGameServer(TCPServer): # 更新总游玩时间 self._update_total_play_time(player_data, play_time_seconds) - # 更新今日在线礼包累计时间 - current_date = datetime.datetime.now().strftime("%Y-%m-%d") - online_gift_data = player_data.get("online_gift", {}) - - if current_date in online_gift_data: - today_data = online_gift_data[current_date] - today_data["total_online_time"] = today_data.get("total_online_time", 0.0) + play_time_seconds - player_data["online_gift"] = online_gift_data + # 注意：在线礼包时间累计现在由新系统管理，此处不再需要更新旧格式 self.save_player_data(username, player_data) self.log('INFO', f"用户 {username} 本次游玩时间: {play_time_seconds} 秒，总游玩时间: {player_data['total_login_time']}", 'SERVER') @@ -465,6 +461,7 @@ class TCPGameServer(TCPServer): #=================================数据管理方法==================================== + #================================作物系统管理========================================= #优化的作物生长更新系统 def update_crops_growth_optimized(self): @@ -854,24 +851,26 @@ class TCPGameServer(TCPServer): if stamina_updated: self.log('INFO', f"玩家 {username} 体力值已更新：{player_data.get('体力值', 20)}", 'SERVER') + # 检查并更新每日点赞次数 + likes_updated = self._check_and_update_daily_likes(player_data) + if likes_updated: + like_system = player_data.get("点赞系统", {}) + remaining_likes = like_system.get("今日剩余点赞次数", 10) + self.log('INFO', f"玩家 {username} 每日点赞次数已重置：{remaining_likes}", 'SERVER') + + # 检查并清理在线礼包历史数据 + self._cleanup_online_gift_history(player_data) + + # 检查并清理新手礼包历史数据 + self._cleanup_new_player_gift_history(player_data) + # 检查并更新已存在玩家的注册时间 self._check_and_update_register_time(player_data, username) # 检查并修复智慧树配置 self._check_and_fix_wisdom_tree_config(player_data, username) - # 初始化今日在线礼包数据 - current_date = datetime.datetime.now().strftime("%Y-%m-%d") - if "online_gift" not in player_data: - player_data["online_gift"] = {} - - online_gift_data = player_data["online_gift"] - if current_date not in online_gift_data: - online_gift_data[current_date] = { - "start_time": time.time(), - "claimed_gifts": {} - } - self.log('INFO', f"玩家 {username} 初始化今日在线礼包数据", 'SERVER') + # 注意：在线礼包数据已改为中文系统管理，不再需要初始化英文格式数据 # 保存用户会话信息 self.user_data[client_id] = { @@ -893,11 +892,16 @@ class TCPGameServer(TCPServer): response_player_data["巡逻宠物"] = self._convert_patrol_pets_to_full_data(player_data) response_player_data["出战宠物"] = self._convert_battle_pets_to_full_data(player_data) + # 获取点赞系统信息 + like_system = player_data.get("点赞系统", {}) + remaining_likes = like_system.get("今日剩余点赞次数", 10) + response = { "type": "login_response", "status": "success", "message": "登录成功", - "player_data": response_player_data + "player_data": response_player_data, + "remaining_likes": remaining_likes } else: # 登录失败 @@ -1812,6 +1816,7 @@ class TCPGameServer(TCPServer): #==========================杂草生长处理========================== + #==========================种植作物处理========================== #处理种植作物请求 def _handle_plant_crop(self, client_id, message): @@ -2104,6 +2109,7 @@ class TCPGameServer(TCPServer): #==========================购买道具处理========================== + #==========================购买宠物处理========================== #处理购买宠物请求 def _handle_buy_pet(self, client_id, message): @@ -4607,7 +4613,9 @@ class TCPGameServer(TCPServer): #==========================宠物使用道具处理========================== - #==========================农场道具使用处理========================== + + +#==========================农场道具使用处理========================== def _handle_use_farm_item(self, client_id, message): """处理农场道具使用请求""" # 检查用户是否已登录 @@ -4732,7 +4740,7 @@ class TCPGameServer(TCPServer): self.log('ERROR', f"处理农场道具效果失败: {str(e)}", 'FARM_ITEM') return False, "道具效果处理失败", {} - #==========================农场道具使用处理========================== +#==========================农场道具使用处理========================== @@ -4958,22 +4966,17 @@ class TCPGameServer(TCPServer): "message": "不能给自己点赞" }) - # 检查今天是否已经给这个玩家点过赞 - current_date = datetime.datetime.now().strftime("%Y-%m-%d") + # 检查并更新每日点赞次数 + self._check_and_update_daily_likes(player_data) - # 初始化点赞记录 - if "daily_likes" not in player_data: - player_data["daily_likes"] = {} - - # 检查今天的点赞记录 - if current_date not in player_data["daily_likes"]: - player_data["daily_likes"][current_date] = [] - - if target_username in player_data["daily_likes"][current_date]: + # 检查今日剩余点赞次数 + like_system = player_data.get("点赞系统", {}) + remaining_likes = like_system.get("今日剩余点赞次数", 10) + if remaining_likes <= 0: return self.send_data(client_id, { "type": "like_player_response", "success": False, - "message": f"今天已经给 {target_username} 点过赞了" + "message": "今日点赞次数已用完，明天再来吧！" }) # 加载目标玩家数据 @@ -4986,25 +4989,120 @@ class TCPGameServer(TCPServer): "message": f"无法找到玩家 {target_username} 的数据" }) - # 记录点赞 - player_data["daily_likes"][current_date].append(target_username) + # 扣除点赞次数 + player_data["点赞系统"]["今日剩余点赞次数"] = remaining_likes - 1 # 更新目标玩家的点赞数量 - target_player_data["total_likes"] = target_player_data.get("total_likes", 0) + 1 + target_player_data["点赞数"] = target_player_data.get("点赞数", 0) + 1 # 保存两个玩家的数据 self.save_player_data(username, player_data) self.save_player_data(target_username, target_player_data) - self.log('INFO', f"玩家 {username} 点赞了玩家 {target_username}，目标玩家总赞数：{target_player_data['total_likes']}", 'SERVER') + self.log('INFO', f"玩家 {username} 点赞了玩家 {target_username}，目标玩家点赞数：{target_player_data['点赞数']}，剩余点赞次数：{player_data['点赞系统']['今日剩余点赞次数']}", 'SERVER') return self.send_data(client_id, { "type": "like_player_response", "success": True, - "message": f"成功点赞玩家 {target_username}！", - "target_likes": target_player_data["total_likes"] + "message": f"成功点赞玩家 {target_username}！剩余点赞次数：{player_data['点赞系统']['今日剩余点赞次数']}", + "target_likes": target_player_data["点赞数"], + "remaining_likes": player_data["点赞系统"]["今日剩余点赞次数"] }) + #检查并更新每日点赞次数 + def _check_and_update_daily_likes(self, player_data): + """检查并更新每日点赞次数（每天重置为10次）""" + import datetime + + current_date = datetime.datetime.now().strftime("%Y-%m-%d") + + # 初始化点赞系统 + if "点赞系统" not in player_data: + player_data["点赞系统"] = { + "今日剩余点赞次数": 10, + "点赞上次刷新时间": current_date + } + return True # 发生了初始化 + + like_system = player_data["点赞系统"] + + # 确保必要字段存在 + if "今日剩余点赞次数" not in like_system: + like_system["今日剩余点赞次数"] = 10 + if "点赞上次刷新时间" not in like_system: + like_system["点赞上次刷新时间"] = current_date + + # 检查是否需要每日重置 + last_refresh_date = like_system.get("点赞上次刷新时间", "") + if last_refresh_date != current_date: + # 新的一天，重置点赞次数 + like_system["今日剩余点赞次数"] = 10 + like_system["点赞上次刷新时间"] = current_date + return True # 发生了重置 + + return False # 没有重置 + + #清理在线礼包历史数据 + def _cleanup_online_gift_history(self, player_data): + """清理过期的在线礼包数据（只保留当天的数据）并删除旧的英文格式""" + import datetime + + current_date = datetime.datetime.now().strftime("%Y-%m-%d") + + # 清理旧的英文格式数据 + if "online_gift" in player_data: + del player_data["online_gift"] + self.log('INFO', f"已清理玩家数据中的旧英文在线礼包格式", 'SERVER') + + # 初始化在线礼包数据 + if "在线礼包" not in player_data: + player_data["在线礼包"] = { + "当前日期": current_date, + "今日在线时长": 0.0, + "已领取礼包": [], + "登录时间": time.time() + } + return + + online_gift_data = player_data["在线礼包"] + + # 检查是否是新的一天 + last_date = online_gift_data.get("当前日期", "") + if last_date != current_date: + # 新的一天，重置所有数据 + player_data["在线礼包"] = { + "当前日期": current_date, + "今日在线时长": 0.0, + "已领取礼包": [], + "登录时间": time.time() + } + self.log('INFO', f"在线礼包数据已重置到新日期：{current_date}", 'SERVER') + #清理新手礼包历史数据 + def _cleanup_new_player_gift_history(self, player_data): + """清理旧的英文新手礼包数据并转换为中文格式""" + import datetime + + # 检查是否有旧的英文数据 + old_claimed = player_data.get("new_player_gift_claimed", False) + old_time = player_data.get("new_player_gift_time", "") + + if old_claimed or old_time: + # 转换为中文格式 + if "新手礼包" not in player_data: + player_data["新手礼包"] = {} + + if old_claimed: + player_data["新手礼包"]["已领取"] = True + player_data["新手礼包"]["领取时间"] = old_time if old_time else datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + + # 删除旧的英文字段 + if "new_player_gift_claimed" in player_data: + del player_data["new_player_gift_claimed"] + if "new_player_gift_time" in player_data: + del player_data["new_player_gift_time"] + + self.log('INFO', f"已清理玩家数据中的旧英文新手礼包格式", 'SERVER') + #==========================点赞玩家处理========================== @@ -5352,7 +5450,7 @@ class TCPGameServer(TCPServer): "last_login_timestamp": last_login_timestamp, "total_login_time": total_time_str, "total_time_seconds": total_time_seconds, - "like_num": player_data.get("total_likes", 0), + "like_num": player_data.get("点赞数", 0), "is_online": is_online } @@ -5596,42 +5694,30 @@ class TCPGameServer(TCPServer): if not player_data: return self.send_data(client_id, response) - # 获取今日在线礼包数据 - current_date = datetime.datetime.now().strftime("%Y-%m-%d") - online_gift_data = player_data.get("online_gift", {}) + # 确保在线礼包数据已初始化 + self._cleanup_online_gift_history(player_data) - # 检查是否是新的一天，如果是则重置领取状态和在线时间 - if current_date not in online_gift_data: - online_gift_data[current_date] = { - "total_online_time": 0.0, # 累计在线时间（秒） - "last_login_time": time.time(), # 最后登录时间 - "claimed_gifts": {} - } - player_data["online_gift"] = online_gift_data - self.save_player_data(username, player_data) + online_gift_data = player_data["在线礼包"] - today_data = online_gift_data[current_date] - - # 更新在线时间 - 只有当前用户在线时才累加时间 + # 更新在线时间 current_time = time.time() - if client_id in self.user_data and self.user_data[client_id].get("logged_in", False): - # 计算本次登录的在线时间并累加 - login_time = self.user_data[client_id].get("login_timestamp", current_time) - session_online_time = current_time - login_time - # 更新最后登录时间为当前时间，以便下次计算 - today_data["last_login_time"] = current_time - else: - session_online_time = 0 + login_time = online_gift_data.get("登录时间", current_time) - # 获取总在线时长 - online_duration = today_data.get("total_online_time", 0.0) + session_online_time + # 计算本次登录的在线时间并累加 + if client_id in self.user_data and self.user_data[client_id].get("logged_in", False): + session_online_time = current_time - self.user_data[client_id].get("login_timestamp", current_time) + online_gift_data["今日在线时长"] += session_online_time + # 重置登录时间戳 + self.user_data[client_id]["login_timestamp"] = current_time + + # 保存数据 + self.save_player_data(username, player_data) return self.send_data(client_id, { "type": "online_gift_data_response", "success": True, - "online_start_time": today_data.get("last_login_time", current_time), - "current_online_duration": online_duration, - "claimed_gifts": today_data.get("claimed_gifts", {}) + "current_online_duration": online_gift_data["今日在线时长"], + "claimed_gifts": {gift: True for gift in online_gift_data["已领取礼包"]} }) #处理领取在线礼包请求 @@ -5655,132 +5741,55 @@ class TCPGameServer(TCPServer): "message": "礼包名称不能为空" }) - # 定义在线礼包配置 - online_gift_config = { - "1分钟": { - "time_seconds": 60, - "rewards": { - "money": 100, - "experience": 50, - "seeds": [{"name": "小麦", "count": 5}, {"name": "胡萝卜", "count": 3}] - } - }, - "3分钟": { - "time_seconds": 180, - "rewards": { - "money": 250, - "experience": 150, - "seeds": [{"name": "胡萝卜", "count": 5}, {"name": "玉米", "count": 3}] - } - }, - "5分钟": { - "time_seconds": 300, - "rewards": { - "money": 500, - "experience": 250, - "seeds": [{"name": "玉米", "count": 3}, {"name": "番茄", "count": 2}] - } - }, - "10分钟": { - "time_seconds": 600, - "rewards": { - "money": 500, - "experience": 200, - "seeds": [{"name": "玉米", "count": 3}, {"name": "番茄", "count": 2}] - } - }, - "30分钟": { - "time_seconds": 1800, - "rewards": { - "money": 1200, - "experience": 500, - "seeds": [{"name": "草莓", "count": 2}, {"name": "花椰菜", "count": 1}] - } - }, - "1小时": { - "time_seconds": 3600, - "rewards": { - "money": 2500, - "experience": 1000, - "seeds": [{"name": "葡萄", "count": 1}, {"name": "南瓜", "count": 1}, {"name": "咖啡豆", "count": 1}] - } - }, - "3小时": { - "time_seconds": 10800, - "rewards": { - "money": 6000, - "experience": 2500, - "seeds": [{"name": "人参", "count": 1}, {"name": "藏红花", "count": 1}] - } - }, - "5小时": { - "time_seconds": 18000, - "rewards": { - "money": 12000, - "experience": 5000, - "seeds": [{"name": "龙果", "count": 1}, {"name": "松露", "count": 1}, {"name": "月光草", "count": 1}] - } - } - } + # 加载在线礼包配置 + config = self._load_online_gift_config() + gift_config = config.get("在线礼包配置", {}) - if gift_name not in online_gift_config: + if gift_name not in gift_config: return self.send_data(client_id, { "type": "claim_online_gift_response", "success": False, "message": "无效的礼包名称" }) - # 获取今日在线礼包数据 - current_date = datetime.datetime.now().strftime("%Y-%m-%d") - online_gift_data = player_data.get("online_gift", {}) - - if current_date not in online_gift_data: - return self.send_data(client_id, { - "type": "claim_online_gift_response", - "success": False, - "message": "在线礼包数据异常，请重新登录" - }) - - today_data = online_gift_data[current_date] + # 确保在线礼包数据已初始化 + self._cleanup_online_gift_history(player_data) + online_gift_data = player_data["在线礼包"] # 检查是否已领取 - if gift_name in today_data.get("claimed_gifts", {}): + if gift_name in online_gift_data["已领取礼包"]: return self.send_data(client_id, { "type": "claim_online_gift_response", "success": False, "message": "该礼包今日已领取" }) - # 更新当前在线时间并检查是否满足条件 + # 更新在线时间 current_time = time.time() - - # 计算本次登录的在线时间 if client_id in self.user_data and self.user_data[client_id].get("logged_in", False): - login_time = self.user_data[client_id].get("login_timestamp", current_time) - session_online_time = current_time - login_time - # 更新累计在线时间 - today_data["total_online_time"] = today_data.get("total_online_time", 0.0) + session_online_time - # 重置登录时间 + session_online_time = current_time - self.user_data[client_id].get("login_timestamp", current_time) + online_gift_data["今日在线时长"] += session_online_time + # 重置登录时间戳 self.user_data[client_id]["login_timestamp"] = current_time - online_duration = today_data.get("total_online_time", 0.0) - required_time = online_gift_config[gift_name]["time_seconds"] + # 检查在线时长是否满足条件 + gift_info = gift_config[gift_name] + required_time = gift_info["时长秒数"] + current_duration = online_gift_data["今日在线时长"] - if online_duration < required_time: + if current_duration < required_time: return self.send_data(client_id, { "type": "claim_online_gift_response", "success": False, - "message": f"在线时间不足，还需要 {self._format_time(required_time - online_duration)}" + "message": f"在线时间不足，还需要 {self._format_time(required_time - current_duration)}" }) # 发放奖励 - rewards = online_gift_config[gift_name]["rewards"] - self._apply_online_gift_rewards(player_data, rewards) + rewards = gift_info["奖励"] + self._apply_online_gift_rewards_new(player_data, rewards) # 记录领取状态 - if "claimed_gifts" not in today_data: - today_data["claimed_gifts"] = {} - today_data["claimed_gifts"][gift_name] = time.time() + online_gift_data["已领取礼包"].append(gift_name) # 保存数据 self.save_player_data(username, player_data) @@ -5790,7 +5799,7 @@ class TCPGameServer(TCPServer): return self.send_data(client_id, { "type": "claim_online_gift_response", "success": True, - "message": f"成功领取{gift_name}在线礼包！", + "message": f"成功领取 {gift_name} 礼包！", "gift_name": gift_name, "rewards": rewards, "updated_data": { @@ -5801,7 +5810,54 @@ class TCPGameServer(TCPServer): } }) - #发放在线礼包奖励 + #发放在线礼包奖励（新版本 - 支持中文配置） + def _apply_online_gift_rewards_new(self, player_data, rewards): + """发放在线礼包奖励（中文配置格式）""" + # 发放金币 + if "金币" in rewards: + player_data["money"] = player_data.get("money", 0) + rewards["金币"] + + # 发放经验 + if "经验" in rewards: + old_experience = player_data.get("experience", 0) + player_data["experience"] = old_experience + rewards["经验"] + + # 检查是否升级 + self._check_level_up(player_data) + + # 发放种子 + if "种子" in rewards: + player_bag = player_data.get("player_bag", []) + crop_data = self._load_crop_data() + + for seed_info in rewards["种子"]: + seed_name = seed_info["名称"] + seed_count = seed_info["数量"] + + # 从作物数据中获取品质信息 + quality = "普通" # 默认品质 + if crop_data and seed_name in crop_data: + quality = crop_data[seed_name].get("品质", "普通") + + # 查找是否已有该种子 + found = False + for item in player_bag: + if item.get("name") == seed_name: + item["count"] += seed_count + found = True + break + + # 如果没有找到，添加新种子 + if not found: + player_bag.append({ + "name": seed_name, + "quality": quality, + "count": seed_count + }) + + player_data["player_bag"] = player_bag + + #发放在线礼包奖励（旧版本） def _apply_online_gift_rewards(self, player_data, rewards): """发放在线礼包奖励""" # 发放金币 @@ -5869,35 +5925,28 @@ class TCPGameServer(TCPServer): #更新玩家今日在线时间 def _update_daily_online_time(self, client_id, player_data): - """更新玩家今日在线时间""" + """更新玩家今日在线时间（现在由中文在线礼包系统管理）""" if client_id not in self.user_data or not self.user_data[client_id].get("logged_in", False): - return + return 0 - current_date = datetime.datetime.now().strftime("%Y-%m-%d") - online_gift_data = player_data.get("online_gift", {}) - - # 确保今日数据存在 - if current_date not in online_gift_data: - online_gift_data[current_date] = { - "total_online_time": 0.0, - "last_login_time": time.time(), - "claimed_gifts": {} - } - player_data["online_gift"] = online_gift_data - - today_data = online_gift_data[current_date] + # 使用新的中文在线礼包系统 current_time = time.time() login_time = self.user_data[client_id].get("login_timestamp", current_time) session_online_time = current_time - login_time - # 更新累计在线时间 - today_data["total_online_time"] = today_data.get("total_online_time", 0.0) + session_online_time - today_data["last_login_time"] = current_time - # 重置用户登录时间戳 self.user_data[client_id]["login_timestamp"] = current_time - return today_data["total_online_time"] + # 确保在线礼包数据存在 + self._cleanup_online_gift_history(player_data) + online_gift_data = player_data.get("在线礼包", {}) + + if online_gift_data: + # 更新中文在线礼包系统的在线时长 + online_gift_data["今日在线时长"] = online_gift_data.get("今日在线时长", 0.0) + session_online_time + return online_gift_data["今日在线时长"] + + return session_online_time #格式化时间显示 def _format_time(self, seconds): @@ -6587,33 +6636,30 @@ class TCPGameServer(TCPServer): if not player_data: return self.send_data(client_id, response) + # 加载新手礼包配置 + config = self._load_new_player_config() + gift_config = config.get("新手礼包配置", {}) + # 检查是否已经领取过新手大礼包 - if player_data.get("new_player_gift_claimed", False): + new_player_gift_data = player_data.get("新手礼包", {}) + if new_player_gift_data.get("已领取", False): return self.send_data(client_id, { "type": "new_player_gift_response", "success": False, - "message": "新手大礼包已经领取过了" + "message": gift_config.get("提示消息", {}).get("已领取", "新手大礼包已经领取过了") }) - # 新手大礼包内容 - gift_contents = { - "coins": 6000, - "experience": 1000, - "seeds": [ - {"name": "龙果", "quality": "传奇", "count": 1}, - {"name": "杂交树1", "quality": "传奇", "count": 1}, - {"name": "杂交树2", "quality": "传奇", "count": 1} - ] - } + # 获取新手大礼包内容 + reward_content = gift_config.get("奖励内容", {}) # 应用奖励 - self._apply_new_player_gift_rewards(player_data, gift_contents) + self._apply_new_player_gift_rewards_new(player_data, reward_content) # 标记已领取 - player_data["new_player_gift_claimed"] = True - - # 记录领取时间 - player_data["new_player_gift_time"] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + player_data["新手礼包"] = { + "已领取": True, + "领取时间": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S") + } # 保存玩家数据 self.save_player_data(username, player_data) @@ -6623,14 +6669,15 @@ class TCPGameServer(TCPServer): return self.send_data(client_id, { "type": "new_player_gift_response", "success": True, - "message": "新手大礼包领取成功！获得6000金币、1000经验和3个传奇种子", - "gift_contents": gift_contents, + "message": gift_config.get("提示消息", {}).get("成功", "新手大礼包领取成功！"), + "gift_contents": reward_content, "updated_data": { "money": player_data["money"], "experience": player_data["experience"], "level": player_data["level"], "player_bag": player_data.get("player_bag", []), - "new_player_gift_claimed": True + "宠物背包": player_data.get("宠物背包", []), + "新手礼包": player_data["新手礼包"] } }) @@ -6638,12 +6685,6 @@ class TCPGameServer(TCPServer): # 捕获所有异常，防止服务器崩溃 self.log('ERROR', f"处理新手大礼包请求时出错: {str(e)}", 'SERVER') - # 尝试获取用户名 - try: - username = self.user_data[client_id].get("username", "未知用户") - except: - username = "未知用户" - # 发送错误响应 return self.send_data(client_id, { "type": "new_player_gift_response", @@ -6653,7 +6694,7 @@ class TCPGameServer(TCPServer): #应用新手大礼包奖励到玩家数据 def _apply_new_player_gift_rewards(self, player_data, gift_contents): - """应用新手大礼包奖励到玩家数据""" + """应用新手大礼包奖励到玩家数据（旧格式，保留兼容性）""" # 应用金币奖励 if "coins" in gift_contents: player_data["money"] = player_data.get("money", 0) + gift_contents["coins"] @@ -6694,6 +6735,52 @@ class TCPGameServer(TCPServer): "quality": quality, "count": quantity }) + + #应用新手大礼包奖励到玩家数据（新中文格式） + def _apply_new_player_gift_rewards_new(self, player_data, reward_content): + """应用新手大礼包奖励到玩家数据（新中文格式）""" + # 应用金币奖励 + if "金币" in reward_content: + player_data["money"] = player_data.get("money", 0) + reward_content["金币"] + + # 应用经验奖励 + if "经验" in reward_content: + player_data["experience"] = player_data.get("experience", 0) + reward_content["经验"] + + # 检查升级 + while True: + level_up_experience = 100 * player_data.get("level", 1) + if player_data.get("experience", 0) >= level_up_experience: + player_data["level"] = player_data.get("level", 1) + 1 + player_data["experience"] -= level_up_experience + else: + break + + # 应用种子奖励 + if "种子" in reward_content: + if "player_bag" not in player_data: + player_data["player_bag"] = [] + + for seed_reward in reward_content["种子"]: + seed_name = seed_reward["名称"] + quantity = seed_reward["数量"] + quality = seed_reward["品质"] + + # 查找背包中是否已有该种子 + found = False + for item in player_data["player_bag"]: + if item.get("name") == seed_name: + item["count"] += quantity + found = True + break + + # 如果背包中没有，添加新条目 + if not found: + player_data["player_bag"].append({ + "name": seed_name, + "quality": quality, + "count": quantity + }) #==========================新手大礼包处理========================== @@ -6812,6 +6899,59 @@ class TCPGameServer(TCPServer): "空奖": {"概率": 0.15, "提示语": ["谢谢惠顾", "下次再来", "再试一次", "继续努力"]} } } + + #加载在线礼包配置 + def _load_online_gift_config(self): + """加载在线礼包配置""" + try: + config_path = os.path.join(self.config_dir, "online_gift_config.json") + if os.path.exists(config_path): + with open(config_path, 'r', encoding='utf-8') as f: + return json.load(f) + except Exception as e: + self.log('ERROR', f"加载在线礼包配置失败: {str(e)}", 'SERVER') + pass + + # 默认配置 + return { + "在线礼包配置": { + "1分钟": {"时长秒数": 60, "奖励": {"金币": 100, "经验": 50, "种子": [{"名称": "小麦", "数量": 5}]}}, + "5分钟": {"时长秒数": 300, "奖励": {"金币": 500, "经验": 250, "种子": [{"名称": "玉米", "数量": 3}]}}, + "30分钟": {"时长秒数": 1800, "奖励": {"金币": 1500, "经验": 750, "种子": [{"名称": "草莓", "数量": 2}]}}, + "1小时": {"时长秒数": 3600, "奖励": {"金币": 3000, "经验": 1500, "种子": [{"名称": "葡萄", "数量": 2}]}} + }, + "每日重置": True + } + + #加载新手礼包配置 + def _load_new_player_config(self): + """加载新手礼包配置""" + try: + config_path = os.path.join(self.config_dir, "new_player_config.json") + if os.path.exists(config_path): + with open(config_path, 'r', encoding='utf-8') as f: + return json.load(f) + except Exception as e: + self.log('ERROR', f"加载新手礼包配置失败: {str(e)}", 'SERVER') + + # 默认配置 + return { + "新手礼包配置": { + "奖励内容": { + "金币": 6000, + "经验": 1000, + "种子": [ + {"名称": "龙果", "品质": "传奇", "数量": 1}, + {"名称": "杂交树1", "品质": "传奇", "数量": 1}, + {"名称": "杂交树2", "品质": "传奇", "数量": 1} + ] + }, + "提示消息": { + "成功": "新手大礼包领取成功！获得6000金币、1000经验和3个传奇种子", + "已领取": "新手大礼包已经领取过了" + } + } + } #生成幸运抽奖奖励 def _generate_lucky_draw_rewards(self, count: int, draw_type: str, config: dict): @@ -8277,9 +8417,6 @@ class TCPGameServer(TCPServer): #==========================智慧树系统处理========================== - -# ================================账户设置处理方法================================ - # 控制台命令系统 class ConsoleCommands: """控制台命令处理类""" diff --git a/Server/config/new_player_config.json b/Server/config/new_player_config.json new file mode 100644 index 0000000..5ed4229 --- /dev/null +++ b/Server/config/new_player_config.json @@ -0,0 +1,30 @@ +{ + "新手礼包配置": { + "礼包说明": "每个账号仅可领取一次的新手大礼包", + "奖励内容": { + "金币": 6000, + "经验": 1000, + "种子": [ + { + "名称": "龙果", + "品质": "传奇", + "数量": 1 + }, + { + "名称": "杂交树1", + "品质": "传奇", + "数量": 1 + }, + { + "名称": "杂交树2", + "品质": "传奇", + "数量": 1 + } + ] + }, + "提示消息": { + "成功": "新手大礼包领取成功！获得6000金币、1000经验和3个传奇种子", + "已领取": "新手大礼包已经领取过了" + } + } +} diff --git a/Server/config/online_gift_config.json b/Server/config/online_gift_config.json new file mode 100644 index 0000000..a35e6f7 --- /dev/null +++ b/Server/config/online_gift_config.json @@ -0,0 +1,96 @@ +{ + "在线礼包配置": { + "1分钟": { + "时长秒数": 60, + "奖励": { + "金币": 100, + "经验": 50, + "种子": [ + {"名称": "小麦", "数量": 5}, + {"名称": "胡萝卜", "数量": 3} + ] + } + }, + "3分钟": { + "时长秒数": 180, + "奖励": { + "金币": 250, + "经验": 150, + "种子": [ + {"名称": "胡萝卜", "数量": 5}, + {"名称": "玉米", "数量": 3} + ] + } + }, + "5分钟": { + "时长秒数": 300, + "奖励": { + "金币": 500, + "经验": 250, + "种子": [ + {"名称": "玉米", "数量": 3}, + {"名称": "番茄", "数量": 2} + ] + } + }, + "10分钟": { + "时长秒数": 600, + "奖励": { + "金币": 800, + "经验": 400, + "种子": [ + {"名称": "番茄", "数量": 3}, + {"名称": "辣椒", "数量": 2} + ] + } + }, + "30分钟": { + "时长秒数": 1800, + "奖励": { + "金币": 1500, + "经验": 750, + "种子": [ + {"名称": "草莓", "数量": 2}, + {"名称": "花椰菜", "数量": 2} + ] + } + }, + "1小时": { + "时长秒数": 3600, + "奖励": { + "金币": 3000, + "经验": 1500, + "种子": [ + {"名称": "葡萄", "数量": 2}, + {"名称": "南瓜", "数量": 1}, + {"名称": "咖啡豆", "数量": 1} + ] + } + }, + "3小时": { + "时长秒数": 10800, + "奖励": { + "金币": 8000, + "经验": 4000, + "种子": [ + {"名称": "人参", "数量": 1}, + {"名称": "藏红花", "数量": 1} + ] + } + }, + "5小时": { + "时长秒数": 18000, + "奖励": { + "金币": 15000, + "经验": 7500, + "种子": [ + {"名称": "龙果", "数量": 1}, + {"名称": "松露", "数量": 1}, + {"名称": "月光草", "数量": 1} + ] + } + } + }, + "每日重置": true, + "在线时长记录保留天数": 1 +} diff --git a/Server/game_saves/2143323382.json b/Server/game_saves/2143323382.json index 1498153..3ec126d 100644 --- a/Server/game_saves/2143323382.json +++ b/Server/game_saves/2143323382.json @@ -1,13 +1,13 @@ { - "experience": 1826, - "level": 27, - "money": 1214966, + "experience": 2926, + "level": 32, + "money": 1250116, "farm_name": "柚大青の小农场", "player_name": "柚大青", "user_name": "2143323382", "user_password": "tyh@19900420", - "last_login_time": "2025年07月12日21时05分43秒", - "total_login_time": "5时10分30秒", + "last_login_time": "2025年07月12日23时02分19秒", + "total_login_time": "5时14分13秒", "farm_lots": [ { "crop_type": "", @@ -570,151 +570,97 @@ "name": "土豆", "quality": "普通", "count": 3 + }, + { + "name": "小麦", + "quality": "普通", + "count": 5 + }, + { + "name": "胡萝卜", + "quality": "普通", + "count": 5 + }, + { + "name": "玉米", + "quality": "优良", + "count": 6 + }, + { + "name": "番茄", + "quality": "普通", + "count": 5 + }, + { + "name": "辣椒", + "quality": "普通", + "count": 2 + }, + { + "name": "草莓", + "quality": "稀有", + "count": 2 + }, + { + "name": "花椰菜", + "quality": "优良", + "count": 2 + }, + { + "name": "葡萄", + "quality": "普通", + "count": 2 + }, + { + "name": "南瓜", + "quality": "普通", + "count": 1 + }, + { + "name": "咖啡豆", + "quality": "稀有", + "count": 1 + }, + { + "name": "人参", + "quality": "史诗", + "count": 1 + }, + { + "name": "藏红花", + "quality": "稀有", + "count": 1 + }, + { + "name": "龙果", + "quality": "稀有", + "count": 2 + }, + { + "name": "松露", + "quality": "史诗", + "count": 1 + }, + { + "name": "月光草", + "quality": "传奇", + "count": 1 + }, + { + "name": "杂交树1", + "quality": "传奇", + "count": 1 + }, + { + "name": "杂交树2", + "quality": "传奇", + "count": 1 } ], - "total_likes": 3, "last_water_reset_date": "2025-06-05", "体力值": 20, "体力上次刷新时间": "2025-07-12", "体力上次恢复时间": 1752323298.9468062, - "new_player_gift_claimed": true, - "new_player_gift_time": "2025-06-08 20:58:40", - "daily_likes": { - "2025-06-08": [ - "3205788256" - ], - "2025-06-19": [ - "2973419538" - ] - }, - "online_gift": { - "2025-06-15": { - "start_time": 1749994806.033348, - "claimed_gifts": { - "1分钟": 1749997525.6353114, - "10分钟": 1749997526.8762546, - "30分钟": 1749997528.1967597, - "1小时": 1749998971.9923694 - } - }, - "2025-06-16": { - "start_time": 1750048179.8969615, - "claimed_gifts": { - "1分钟": 1750048313.4611192, - "10分钟": 1750050580.5225677, - "30分钟": 1750050580.769819, - "1小时": 1750064802.2532392, - "3小时": 1750064802.9733548 - } - }, - "2025-06-17": { - "start_time": 1750171229.5381422, - "claimed_gifts": { - "1分钟": 1750171292.2183993, - "10分钟": 1750171919.3392045 - } - }, - "2025-06-19": { - "start_time": 1750313555.3165672, - "claimed_gifts": { - "1分钟": 1750313616.1958554, - "10分钟": 1750341382.3730462, - "30分钟": 1750341382.61995, - "1小时": 1750341382.880238, - "3小时": 1750341383.0264854, - "5小时": 1750341383.3938982 - } - }, - "2025-06-20": { - "start_time": 1750391071.6735287, - "claimed_gifts": { - "1分钟": 1750391912.7143624, - "10分钟": 1750391912.9116397 - } - }, - "2025-06-21": { - "start_time": 1750474630.1757886, - "claimed_gifts": {} - }, - "2025-06-22": { - "start_time": 1750595650.1403966, - "claimed_gifts": { - "1分钟": 1750602278.1127577, - "3分钟": 1750602278.3627682, - "5分钟": 1750602278.542827 - }, - "total_online_time": 409.0429630279541, - "last_login_time": 1750602277.3224318 - }, - "2025-06-23": { - "start_time": 1750608132.891424, - "claimed_gifts": { - "1分钟": 1750608269.0062823, - "3分钟": 1750645226.2449498 - }, - "last_login_time": 1750645221.9068704, - "total_online_time": 796.5319685935974 - }, - "2025-06-25": { - "start_time": 1750782020.5398943, - "claimed_gifts": { - "1分钟": 1750782151.8276432, - "3分钟": 1750812743.9859421, - "5分钟": 1750812744.246103, - "10分钟": 1750812744.4461489 - }, - "last_login_time": 1750843285.627927, - "total_online_time": 1027.647186756134 - }, - "2025-06-26": { - "start_time": 1750893531.8644083, - "claimed_gifts": {}, - "total_online_time": 21.0 - }, - "2025-06-27": { - "start_time": 1750985048.186332, - "claimed_gifts": { - "1分钟": 1751027285.606688, - "3分钟": 1751027353.2067118 - }, - "total_online_time": 329.2799735069275, - "last_login_time": 1751027459.5583248 - }, - "2025-06-29": { - "start_time": 1751209075.6939642, - "claimed_gifts": {}, - "total_online_time": 1601.0 - }, - "2025-07-05": { - "start_time": 1751715212.5978978, - "claimed_gifts": {}, - "total_online_time": 498.0 - }, - "2025-07-06": { - "start_time": 1751817047.2534895, - "claimed_gifts": {} - }, - "2025-07-07": { - "start_time": 1751900348.6906254, - "claimed_gifts": {}, - "total_online_time": 33.0 - }, - "2025-07-08": { - "start_time": 1751938810.9531775, - "claimed_gifts": {}, - "total_online_time": 427.0 - }, - "2025-07-09": { - "start_time": 1752023968.623608, - "claimed_gifts": {}, - "total_online_time": 1282.0 - }, - "2025-07-12": { - "start_time": 1752323298.9470074, - "claimed_gifts": {}, - "total_online_time": 623.0 - } - }, "注册时间": "2025年05月21日15时00分00秒", "个人简介": "其实我是一个梨子，真的，不骗你", "作物仓库": [], @@ -825,8 +771,12 @@ } } ], - "巡逻宠物": ["1751716398095"], - "出战宠物": ["1751716398095"], + "巡逻宠物": [ + "1751716398095" + ], + "出战宠物": [ + "1751716398095" + ], "稻草人配置": { "已拥有稻草人类型": [ "稻草人1" @@ -867,5 +817,28 @@ }, "签到历史": { "2025年07月12日21时05分47秒": "金币249 经验75 土豆x3" + }, + "在线礼包": { + "当前日期": "2025-07-12", + "今日在线时长": 100008.91207242012, + "已领取礼包": [ + "1分钟", + "3分钟", + "5分钟", + "10分钟", + "30分钟", + "1小时", + "3小时", + "5小时" + ], + "登录时间": 1752329209.0102558 + }, + "点赞系统": { + "今日剩余点赞次数": 0, + "点赞上次刷新时间": "2025-07-12" + }, + "新手礼包": { + "已领取": true, + "领取时间": "2025-07-12 23:02:25" } } \ No newline at end of file diff --git a/server/game_saves/3205788256.json b/server/game_saves/3205788256.json index 70b9ac0..5a9c8c0 100644 --- a/server/game_saves/3205788256.json +++ b/server/game_saves/3205788256.json @@ -562,22 +562,11 @@ "user_name": "3205788256", "user_password": "tyh@19900420", "last_water_reset_date": "2025-06-06", - "daily_likes": {}, "last_check_in_date": "2025-06-01", - "total_likes": 1, "体力值": 20, "体力上次刷新时间": "2025-07-12", "体力上次恢复时间": 1752300733.1589873, - "new_player_gift_claimed": true, - "new_player_gift_time": "2025-06-08 19:22:41", "session_start_time": 1749878790.288913, - "online_gift": { - "2025-07-12": { - "start_time": 1752319030.8083963, - "claimed_gifts": {}, - "total_online_time": 433.0 - } - }, "个人简介": "人生啊，就这样吧", "注册时间": "2025年05月21日15时00分00秒", "作物仓库": [], @@ -977,5 +966,6 @@ "当前生命值": 110, "高度": 53, "上次护理时间": 1752051799 - } + }, + "点赞数": 32 } \ No newline at end of file