From 80400ef5213075de353b8367b021ee90cb3361d3 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 7 Aug 2019 21:37:37 +0800 Subject: [PATCH 1/4] fix taketimes --- .../java/com/ljsd/jieling/logic/mission/MissionLoigc.java | 5 +++++ 1 file changed, 5 insertions(+) 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()); } From fcc7db592bcad7f4d2f278a198840f51209c971d Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 8 Aug 2019 10:24:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/ActivityLogic.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 acd17cb0e..3b411af07 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); } //更新每日充值 From e857c313056f5a6325073005e660e51d055d3ea7 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 9 Aug 2019 22:01:09 +0800 Subject: [PATCH 3/4] add white --- .../src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java | 1 + 1 file changed, 1 insertion(+) 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); From ea1c8e921f9e65f870cf7c23be7b202f1c2223e3 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Sat, 10 Aug 2019 09:51:38 +0800 Subject: [PATCH 4/4] default activity --- .../jieling/logic/activity/DefaultEmptyActivity.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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); + } } } }