From fa2f9a71ce707c3a5a2d9416bf15bc7ad3483750 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 7 Aug 2019 19:38:35 +0800 Subject: [PATCH 1/6] maplogic --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 16fb1419c..fdefc4beb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -102,11 +102,12 @@ public class MapLogic { user.setMapManager(mapManager); }*/ MapInfoProto.MapEnterResponse.Builder mapEnterResponse = MapInfoProto.MapEnterResponse.newBuilder(); - SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapManager.getCurMapId()); + // 进入新地图 SChallengeConfig sChallengeConfig = SChallengeConfig.sChallengeConfigs.get(mapId); int type = sChallengeConfig.getType(); if (mapManager.getCurMapId() == 0) { + SChallengeMapConfig sChallengeMapConfig = SChallengeMapConfig.integerSChallengeMapConfigMap.get(mapId); mapEnterResponse.setCurXY(CellUtil.xy2Pos(sChallengeMapConfig.getPosition()[0],sChallengeMapConfig.getPosition()[1])); Map scMap = SCMap.sCMap.get(mapId); if (scMap == null) { From ee127cfa06e7bbe54f045ea004b7c0034d62b629 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 7 Aug 2019 20:30:55 +0800 Subject: [PATCH 2/6] recharge --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 4 +--- .../main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) 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..8867a0e82 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 @@ -54,6 +54,7 @@ public class ActivityLogic { user.getPlayerInfoManager().setRechargedaily(0); updateActivityMissionProgress(user, ActivityType.SevenLogin, 1); upFivePlayerActivity(user, ActivityType.SevenLogin, fBuilder); + upFivePlayerActivity(user, ActivityType.DAILY_RECHARGE, fBuilder); } public void flushForLogin(User user) throws Exception { @@ -322,9 +323,6 @@ public class ActivityLogic { continue; } - if (fBuilder == null) { - return; - } long createTime = user.getPlayerInfoManager().getCreateTime(); int startTime = (int) (sGlobalActivity.getTimeLong(createTime, 1) / 1000); int endTime = (int) (sGlobalActivity.getTimeLong(createTime, 2) / 1000); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java index 89fb97102..ce2eb70b3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/RechargeInfo.java @@ -81,7 +81,7 @@ public class RechargeInfo extends MongoBase{ } public void setDailyFirst(int first) { - updateString("isFirst",first); + updateString("isDayFirst",first); isDayFirst = first; } From 1d90144fdc61ab04211b46b6578c37471cd51ec3 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 7 Aug 2019 20:55:47 +0800 Subject: [PATCH 3/6] fix map position --- .../java/com/ljsd/jieling/handler/map/MapLogic.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index fdefc4beb..998f87527 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -189,8 +189,11 @@ public class MapLogic { user.getUserMissionManager().onGameEvent(user,GameEvent.PlAY_STORY,SChallengeConfig.sChallengeConfigs.get(mapId).getType(),1); Poster.getPoster().dispatchEvent(new StoryEvent(user.getId())); } else if (mapManager.getCurMapId() != mapId) { + MessageUtil.sendErrorResponse(iSession, 0, messageType.getNumber(), "地图错误,应进入" + mapManager.getCurMapId()); return; + }else{ + mapEnterResponse.setCurXY(mapManager.getCurXY()); } @@ -203,7 +206,12 @@ public class MapLogic { } if(mapManager.getEndlessMapInfo().getCurCell()!=0){ if(mapManager.getEndlessMapInfo().getCurMapId()==mapId) { - mapEnterResponse.setCurXY(mapManager.getEndlessMapInfo().getCurCell()); + if(mapManager.getCurXY()!=0){ + mapEnterResponse.setCurXY(mapManager.getCurXY()); + }else{ + mapEnterResponse.setCurXY(mapManager.getEndlessMapInfo().getCurCell()); + } + } } @@ -565,7 +573,7 @@ public class MapLogic { // LOGGER.info("updateMap() uid=>{} mapId =>{} eventId=>{}", uid, mapManager.getCurMapId(), cell.getEventId()); mapManager.updateFoodBufferByStep(cells.size()); if(!cells.isEmpty()){ - if(cells.size() >2){ + if(cells.size() >1){ lastXY = cells.get(cells.size()-2); } } From 80400ef5213075de353b8367b021ee90cb3361d3 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 7 Aug 2019 21:37:37 +0800 Subject: [PATCH 4/6] 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 e857c313056f5a6325073005e660e51d055d3ea7 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 9 Aug 2019 22:01:09 +0800 Subject: [PATCH 5/6] 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 6/6] 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); + } } } }