From 01810351bb929991ff41febe08e566f8c398a043 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 20 Sep 2019 19:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=B4=A2=E7=8C=AB=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/GameGM/GMRequestHandler.java | 2 -- .../com/ljsd/jieling/logic/activity/LuckyCatActivity.java | 8 ++++---- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 --- .../java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index b2c56a184..d89080fd1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -204,8 +204,6 @@ public class GMRequestHandler extends BaseHandler{ vipMissionIdsType.getFinishMissionIds().addAll(vipMissionIdsType.getDoingMissionIds()); vipMissionIdsType.getDoingMissionIds().clear(); cUser.getUserMissionManager().setVipMissionIdsType(vipMissionIdsType); - //TODO 22测试后回退 - ActivityLogic.getInstance().updateActivityMissionProgress(cUser, ActivityType.LUCKYCAT,prarm1); break; case GlobalGm.RESET_USER_NAME: diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java index 567d299ff..6403c0f3c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/LuckyCatActivity.java @@ -79,10 +79,10 @@ public class LuckyCatActivity extends AbstractActivity { return; } -// if (activityMission.getValue() < sLuckyRewardConfig.getRmbValue()) { -// MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "value illegality"); -// return; -// } + if (activityMission.getValue() < sLuckyRewardConfig.getRmbValue()) { + MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "value illegality"); + return; + } if (activityProgressInfo.getProgrss() >= SLuckyCatConfig.getMiss2time(missionId)) { MessageUtil.sendErrorResponse(session, 0, rewardResponseValue, "had taked"); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 5f2798559..1d20b3ae1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -234,9 +234,6 @@ public class PlayerLogic { .setVipLevel(playerInfoManager.getVipLevel()).build(); PlayerInfoProto.VipLevelUpResponse.Builder builder = PlayerInfoProto.VipLevelUpResponse.newBuilder().addAllUserMissionInfo(missionList); builder.setVipBaseInfo(vipInfoProto); - //TODO 22测试后回退 - ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,vipLevel+1); - MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.VIP_LEVELUP_RESPONSE_VALUE,builder.build(),true); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index e49bb671a..e7dcc0933 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -182,7 +182,7 @@ public class BuyGoodsLogic { user.getPlayerInfoManager().addRechargedaily(price); //TODO 用事件分发 ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt()); - //ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price); + ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.LUCKYCAT,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.DAILY_RECHARGE,price); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,rechargeInfo.getSaveAmt()); ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_SUM_DAY, user.getPlayerInfoManager().getRechargedaily());