From 5c9168607dfe7ecfcb8b63a138226081b98f8685 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Sat, 24 Aug 2019 20:20:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=9B=E8=B4=A2=E7=8C=AB=2022=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E5=90=8E=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/GameGM/GMRequestHandler.java | 5 +++++ .../java/com/ljsd/jieling/logic/GlobalDataManaager.java | 3 ++- .../ljsd/jieling/logic/activity/LuckyCatActivity.java | 9 ++++----- .../java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 +++ .../java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java | 2 +- 5 files changed, 15 insertions(+), 7 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 b7c2d6fda..4dbe34865 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 @@ -9,6 +9,8 @@ import com.ljsd.jieling.globals.GlobalGm; import com.ljsd.jieling.globals.GlobalItemType; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.handler.map.MapLogic; +import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.logic.activity.ActivityType; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.CombatLogic; @@ -200,6 +202,9 @@ 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: PlayerLogic.getInstance().resetUserName(iSession,prarm3,1,0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 3ca96fa57..001f2f305 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -249,7 +249,6 @@ public class GlobalDataManaager { public static void checkNeedReFlush(ISession session,User user,PlayerInfoProto.FivePlayerUpdateIndication.Builder fBuilder) throws Exception { // 需要隔天刷新的字段统一在这里处理 if (TimeUtils.isOverTime(5,user.getPlayerInfoManager().getLoginTime())) { - user.getPlayerInfoManager().setIsdayFirst(0); //活动刷新 ActivityLogic.getInstance().flushEveryDay(user,fBuilder); PlayerLogic.getInstance().vipflushEveryDay(user,fBuilder); @@ -276,6 +275,8 @@ public class GlobalDataManaager { byte[] byteBuf = MessageUtil.wrappedBuffer(session.getUid(), session.getToken(), indicationIndex,1, MessageTypeProto.MessageType.FIVE_PLAYER_REFLUSH_INDICATION_VALUE, fBuilder.build()); session.setFiveByteBuf(byteBuf); } + }else { + user.getPlayerInfoManager().setIsdayFirst(0); } } } 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 ed1415bda..567d299ff 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,11 +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 831c02d55..9ef81a837 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 @@ -209,6 +209,9 @@ 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 026681773..1c796de7c 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 @@ -175,7 +175,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());