diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java index 0f8df0b58..a378292be 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java @@ -72,6 +72,7 @@ public class HandlerLogicThread extends Thread{ whiteMsg.add(MessageTypeProto.MessageType.GET_MISSION_REQUEST_VALUE); whiteMsg.add(MessageTypeProto.MessageType.REFRESH_ITEM_NUM_REQUEST_VALUE); + whiteMsg.add(MessageTypeProto.MessageType.STORE_GOODS_REFRESH_REQUEST_VALUE); //日后删除 whiteMsg.add(MessageTypeProto.MessageType.GET_CHAT_MESSAGE_REQUEST_VALUE); 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 8867a0e82..1f17bd23b 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 @@ -42,7 +42,12 @@ public class ActivityLogic { //跟新签到天数 if (user.getPlayerInfoManager().getSignTotay() == 1) { - user.getPlayerInfoManager().setSign(user.getPlayerInfoManager().getSign() + 1); + Calendar cale = Calendar.getInstance(); + int first = cale.getActualMinimum(Calendar.DAY_OF_MONTH); + if (first == 1) + user.getPlayerInfoManager().setSign(1); + else + user.getPlayerInfoManager().setSign(user.getPlayerInfoManager().getSign() + 1); user.getPlayerInfoManager().setSignTotay(0); } //更新每日充值 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java index 7fb6a73d6..84feedaee 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/DefaultEmptyActivity.java @@ -48,10 +48,12 @@ public class DefaultEmptyActivity extends AbstractActivity{ sevenHappyMissionType.getRewardedMissionIds().set(sTreasureTaskConfig.getId()); user.getUserMissionManager().setSevenHappyMissionType(sevenHappyMissionType); SSevenDaysScore sSevenDaysScore = SSevenDaysScore.SSevenDaysScoreByActivityIdAndScoreMap.get(id).get(senvenScores); - String mailReward = ItemUtil.getMailReward(sSevenDaysScore.getReward()); - String title=SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_title"); - String content = SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_txt"); - MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME); + if(sSevenDaysScore!=null){ + String mailReward = ItemUtil.getMailReward(sSevenDaysScore.getReward()); + String title=SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_title"); + String content = SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_txt"); + MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME); + } } } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java index 43e4732c4..91184f0d6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionLoigc.java @@ -126,6 +126,11 @@ public class MissionLoigc { state =0; } } + + if(takeTimes == null){ + takeTimes=0; + } + missionList.add(CommonProto.UserMissionInfo.newBuilder().setMissionId(missionId).setState(state).setType(treasuremissionType).setProgress(sendProgress).setTakeTimes(takeTimes).build()); }