From e5b63f835e12866c572c84eb1cc7cdcc8f7c4dc3 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 24 Jul 2019 19:45:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/config/SBlessingConfig.java | 14 +++++++++----- .../jieling/handler/map/MapMissionManager.java | 3 ++- .../ljsd/jieling/logic/activity/ActivityLogic.java | 14 ++++++++++---- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SBlessingConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SBlessingConfig.java index c515c4c29..62fdb47b5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SBlessingConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SBlessingConfig.java @@ -14,7 +14,9 @@ public class SBlessingConfig implements BaseConfig { private int[][] cost; - private int dailyRefreshTimes; + private int refreshCd; + + private int isRefresh; private int randomPoolId; @@ -58,10 +60,6 @@ public class SBlessingConfig implements BaseConfig { return cost; } - public int getDailyRefreshTimes() { - return dailyRefreshTimes; - } - public int getRandomPoolId() { return randomPoolId; } @@ -106,5 +104,11 @@ public class SBlessingConfig implements BaseConfig { return countsNum; } + public int getIsRefresh() { + return isRefresh; + } + public int getRefreshCd() { + return refreshCd; + } } \ No newline at end of file diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java index a2375a7f9..2971ef66f 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapMissionManager.java @@ -329,8 +329,9 @@ public class MapMissionManager { } if(copyMissionUpdate){ + Set takeCopyMisionRewards = mapManager.getTakeCopyMisionRewards(); for(Map.Entry entry :mapMission.getAllMissionProgress().entrySet()){ - if(entry.getValue() == -1){ + if(entry.getValue() == -1 && !takeCopyMisionRewards.contains(entry.getKey())){ MissionStateChangeInfo missionStateChangeInfo = new MissionStateChangeInfo(entry.getKey(), MissionState.FINISH,1); readySendCopyMission(missionStateChangeInfo); } 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 3399d28bd..861f4dcc2 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 @@ -801,6 +801,7 @@ public class ActivityLogic { } } + response.setLastRefreshTime(activityMission.getOpenType()); return response; } public void blessSaveOptionalReward(ISession session, int[] rewardIds, MessageTypeProto.MessageType messageType) throws Exception { @@ -923,16 +924,21 @@ public class ActivityLogic { */ public void blessRefreshReward(ISession session, MessageTypeProto.MessageType messageType) throws Exception { User user = UserManager.getUser(session.getUid()); - boolean check = user.getPlayerInfoManager().check(SBlessingConfig.sBlessingConfig.getDailyRefreshTimes(), 1); - if(!check){ - MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"无刷新次数"); + if(SBlessingConfig.sBlessingConfig.getIsRefresh()==0){ + MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"活动不可刷新"); return; } - user.getPlayerInfoManager().updateVipPrivilage(SBlessingConfig.sBlessingConfig.getDailyRefreshTimes(),1); +// boolean check = user.getPlayerInfoManager().check(SBlessingConfig.sBlessingConfig.getDailyRefreshTimes(), 1); +// if(!check){ +// MessageUtil.sendErrorResponse(session,0,messageType.getNumber(),"无刷新次数"); +// return; +// } +// user.getPlayerInfoManager().updateVipPrivilage(SBlessingConfig.sBlessingConfig.getDailyRefreshTimes(),1); ActivityManager activityManager = user.getActivityManager(); ActivityMission activityMission = activityManager.getActivityMissionMap().get(SBlessingConfig.sBlessingConfig.getActivityId()); activityMission.initMissionInfo(SBlessingConfig.sBlessingConfig.getActivityId()); activityMission.updateActivityState(0); + activityMission.setOpenType((int)(TimeUtils.now()/1000)); blessInfoInit(activityManager); PlayerInfoProto.blessRefresh res = PlayerInfoProto.blessRefresh.newBuilder().setReward(getBlessInfoResponse(activityMission).build()).build(); MessageUtil.sendMessage(session,1,messageType.getNumber(),res,true);