From 28d8564f2b55f956e604f0626de2d51fd42c1137 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 8 Feb 2023 16:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BB=E5=AE=9D=E6=B4=BB=E5=8A=A8=E8=A1=A5?= =?UTF-8?q?=E5=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/GetPlayerInfoHandler.java | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index 1c2acb7c9..1edf640d1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -162,17 +162,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ } // 临时代码,处理活动bug, 只有在1月24号当天开服得玩家需要优化 - if (GameApplication.serverConfig.getOpenTime().equals("2023-01-24 00:00:00")){ - if (playerInfoManager.getJadeActivityUpdateMark() == 0){ - Map missionMap = user.getActivityManager().getActivityMissionMap(); - missionMap.remove(80000); - missionMap.remove(8710); - missionMap.remove(8203); - user.getStoreManager().removeStoreInfo(83); - playerInfoManager.setJadeActivityUpdateMark(1); - } - } - + xunbaoActivityHandler(user); //临时处理返利活动 gmRechargeBackHandler(user); @@ -684,6 +674,41 @@ public class GetPlayerInfoHandler extends BaseHandler{ player.setSeniorTurntableBottomNumber(0); } + private void xunbaoActivityHandler(User user){ + // 临时代码,处理活动bug, 只有在1月24号当天开服得玩家需要优化 + PlayerManager playerInfoManager = user.getPlayerInfoManager(); + long createTime = playerInfoManager.getCreateTime(); + // 2023-02-08 16:00:00 + long time = 1675843200000L; + if (GameApplication.serverConfig.getOpenTime().equals("2023-01-24 00:00:00") && createTime <= time){ + LOGGER.info("寻宝活动重置进入,玩家id:{},创角时间:{}",user.getId(),createTime); + Map missionMap = user.getActivityManager().getActivityMissionMap(); + // 第一次清理 + if (playerInfoManager.getJadeActivityUpdateMark() == 0){ + missionMap.remove(80000); + missionMap.remove(8203); + user.getStoreManager().removeStoreInfo(83); + playerInfoManager.setJadeActivityUpdateMark(1); + LOGGER.info("寻宝活动第一次重置,玩家id:{}",user.getId()); + } + // 第二次清理 + if (playerInfoManager.getJadeActivityUpdateMark() == 1){ + missionMap.remove(8710); + Map shopMap = SThemeActivityShop.themeMap.getOrDefault(8710, new HashMap<>()); + for (SThemeActivityShop shop : shopMap.values()) { + RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(2); + AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(shop.getGoodId()); + bag.setRefreshTime(TimeUtils.getTodayZero()); + bag.setBuyTimes(0); + bag.setLastBuyTime(0); + } + List list = shopMap.values().stream().mapToInt(SThemeActivityShop::getGoodId).boxed().collect(Collectors.toList()); + playerInfoManager.setJadeActivityUpdateMark(2); + LOGGER.info("寻宝活动第二次重置,玩家id:{},礼包id:{}",user.getId(),list); + } + } + } + private void gmRechargeBackHandler(User user){ PlayerManager playerInfoManager = user.getPlayerInfoManager(); if (playerInfoManager.getGmRechargeBackMark() == 1){ @@ -703,6 +728,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ // 2.7下午五点到2.8凌晨充值过的玩家不用补偿,没有问题 long count = rechargeList.keySet().stream().filter(v -> v > lastUpdateTime && v < todayUpdateTime).count(); if (count > 0){ + LOGGER.info("返利活动补偿,uid:{},2.7下午五点到2.8凌晨充值过的玩家不用补偿",user.getId()); return; } @@ -729,6 +755,7 @@ public class GetPlayerInfoHandler extends BaseHandler{ .collect(Collectors.toList()); if (collect.isEmpty()){ + LOGGER.info("返利活动补偿,uid:{},玩家从2.8零点到2.8下午4点没有充值记录:{}",user.getId(),collect); return; }