From 2f8b8d4c2a676ea2066f8dd6498a5a1a5cde86b4 Mon Sep 17 00:00:00 2001 From: duhui Date: Sun, 19 Feb 2023 16:29:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E9=97=AE=E9=A2=98=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=8C1=EF=BC=9B=E9=83=A8=E5=88=86=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=85=E5=80=BC=EF=BC=8C2=EF=BC=9A=E7=8E=89?= =?UTF-8?q?=E8=99=9A=E6=8C=91=E6=88=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/GetPlayerInfoHandler.java | 12 ++++++++++++ .../ljsd/jieling/logic/activity/ActivityLogic.java | 1 - .../com/ljsd/jieling/logic/dao/PlayerManager.java | 12 ++++++++++++ .../java/com/ljsd/jieling/logic/fight/FightUtil.java | 4 +--- 4 files changed, 25 insertions(+), 4 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 5848464da..c93957cc9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -160,6 +160,18 @@ public class GetPlayerInfoHandler extends BaseHandler{ } } + // 临时代码,处理活动bug, 只有在1月24号当天开服得玩家需要优化 + if (GameApplication.serverConfig.getOpenTime().equals("2023-01-24 00:00:00")){ + if (playerInfoManager.getJadeActivityUpdateMark() == 1){ + Map missionMap = user.getActivityManager().getActivityMissionMap(); + missionMap.remove(80000); + missionMap.remove(8710); + missionMap.remove(8203); + user.getStoreManager().removeStoreInfo(83); + playerInfoManager.setJadeActivityUpdateMark(1); + } + } + List goodsTypeDurations = BuyGoodsNewLogic.getGoodsTypeDurations(user); //问卷状态 int questState =-1; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index c36c77acd..74f24502e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -283,7 +283,6 @@ public class ActivityLogic implements IEventHandler{ return; } StoreLogic.initOnsStoereWithTime(user,storeId,startTime,endTime); - } public boolean initAllActivityMission(Map map, int activityId) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index c459ff32e..ce2323106 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -255,6 +255,18 @@ public class PlayerManager extends MongoBase { private int equipStrongMark;//摘星阁装备强化道具回退标记 + // 主题活动任务更新标记 + private int jadeActivityUpdateMark; + + public int getJadeActivityUpdateMark() { + return jadeActivityUpdateMark; + } + + public void setJadeActivityUpdateMark(int jadeActivityUpdateMark) { + this.jadeActivityUpdateMark = jadeActivityUpdateMark; + updateString("jadeActivityUpdateMark", jadeActivityUpdateMark); + } + /** * bt 特权等级,key:UnlockType, value:等级 */ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index f8edfafb0..8ef8cd6cd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -827,7 +827,7 @@ public class FightUtil { int teamId,Map attackBloodMap,ArenaRecord arenaRecord) { List heroFightInfos = new ArrayList<>(); if(arenaRecord != null){ - int addforcerpc = crossArenaManager.getTotalForceByTeam().get(teamId); + int addforcerpc = crossArenaManager.getTotalForceByTeam().getOrDefault(teamId,0); arenaRecord.getYxldDefForce().add(addforcerpc); arenaRecord.setAttackForce(arenaRecord.getAttackForce() + addforcerpc); } @@ -889,11 +889,9 @@ public class FightUtil { * @throws Exception */ public static CommonProto.FightTeamInfo makeYuxuCrossPersonData(CSPlayer csPlayer, int teamId, ArenaRecord arenaRecord, CrossArenaManager crossArenaManager) throws Exception { - //CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(uid); if (csPlayer == null) { return null;//throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } - List heroFightInfos = new ArrayList<>(); if (GameApplication.serverId == csPlayer.getServerId()) { //本服玩家 User user = UserManager.getUser(csPlayer.getUserId());