From 40d339793cdb173713fcb4e69111cc39ae24774c Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 16 Jan 2020 11:00:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9&=E6=96=B0?= =?UTF-8?q?=E6=89=8B=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 4 ++-- .../ljsd/jieling/logic/activity/FightMainEventHandler.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) 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 b0d6ce9d1..ebe6b7fe5 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 @@ -120,8 +120,8 @@ public class ActivityLogic implements IEventHandler{ if (time == ActivityType.OPEN_TYPE_ROLE) { continue; } - long startTime = sGlobalActivity.getStartTimeLong(); - long endTime =sGlobalActivity.getEndTimeLong(); + long startTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 1); + long endTime = ToolsUtil.getTimeLong(sGlobalActivity.getStartTimeLong(),sGlobalActivity.getEndTimeLong(),sGlobalActivity.getTime(),0, 2); if (now < startTime) { continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java index 13df49f25..60291aead 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/FightMainEventHandler.java @@ -36,6 +36,9 @@ public class FightMainEventHandler implements IEventHandler{ int uid = fightMainEvent.getUid(); User user = UserManager.getUser(uid); + if(fightId == 1151){ + user.getPlayerInfoManager().updateGuidePoint(1,-1); + } //检测更新vip是否有新开 user.getPlayerInfoManager().updateVipInfo(GlobalsDef.MAIN_LEVEL_UNLOCK_PRIVILEGE,10_000_000 * (fightId % 10) + fightId); for(SGlobalActivity sGlobalActivity : SGlobalActivity.getsGlobalActivityMap().values()){