Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
a11a644dca
|
@ -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:
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
@ -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());
|
||||
|
|
Loading…
Reference in New Issue