Merge branch 'master' of http://60.1.1.230/backend/jieling_server
commit
007a926278
|
|
@ -72,6 +72,7 @@ public class HandlerLogicThread extends Thread{
|
||||||
|
|
||||||
whiteMsg.add(MessageTypeProto.MessageType.GET_MISSION_REQUEST_VALUE);
|
whiteMsg.add(MessageTypeProto.MessageType.GET_MISSION_REQUEST_VALUE);
|
||||||
whiteMsg.add(MessageTypeProto.MessageType.REFRESH_ITEM_NUM_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);
|
whiteMsg.add(MessageTypeProto.MessageType.GET_CHAT_MESSAGE_REQUEST_VALUE);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,12 @@ public class ActivityLogic {
|
||||||
|
|
||||||
//跟新签到天数
|
//跟新签到天数
|
||||||
if (user.getPlayerInfoManager().getSignTotay() == 1) {
|
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);
|
user.getPlayerInfoManager().setSignTotay(0);
|
||||||
}
|
}
|
||||||
//更新每日充值
|
//更新每日充值
|
||||||
|
|
|
||||||
|
|
@ -48,10 +48,12 @@ public class DefaultEmptyActivity extends AbstractActivity{
|
||||||
sevenHappyMissionType.getRewardedMissionIds().set(sTreasureTaskConfig.getId());
|
sevenHappyMissionType.getRewardedMissionIds().set(sTreasureTaskConfig.getId());
|
||||||
user.getUserMissionManager().setSevenHappyMissionType(sevenHappyMissionType);
|
user.getUserMissionManager().setSevenHappyMissionType(sevenHappyMissionType);
|
||||||
SSevenDaysScore sSevenDaysScore = SSevenDaysScore.SSevenDaysScoreByActivityIdAndScoreMap.get(id).get(senvenScores);
|
SSevenDaysScore sSevenDaysScore = SSevenDaysScore.SSevenDaysScoreByActivityIdAndScoreMap.get(id).get(senvenScores);
|
||||||
String mailReward = ItemUtil.getMailReward(sSevenDaysScore.getReward());
|
if(sSevenDaysScore!=null){
|
||||||
String title=SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_title");
|
String mailReward = ItemUtil.getMailReward(sSevenDaysScore.getReward());
|
||||||
String content = SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_txt");
|
String title=SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_title");
|
||||||
MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME);
|
String content = SErrorCodeEerverConfig.getI18NMessage("opencarnival_activity_"+id+"_txt");
|
||||||
|
MailLogic.getInstance().sendMail(user.getId(),title,content,mailReward,(int)(System.currentTimeMillis()/1000), Global.MAIL_EFFECTIVE_TIME);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -127,6 +127,11 @@ public class MissionLoigc {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(takeTimes == null){
|
||||||
|
takeTimes=0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
missionList.add(CommonProto.UserMissionInfo.newBuilder().setMissionId(missionId).setState(state).setType(treasuremissionType).setProgress(sendProgress).setTakeTimes(takeTimes).build());
|
missionList.add(CommonProto.UserMissionInfo.newBuilder().setMissionId(missionId).setState(state).setType(treasuremissionType).setProgress(sendProgress).setTakeTimes(takeTimes).build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue