diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index a27c5da82..fee7b1768 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -267,7 +267,6 @@ public class UserMissionManager extends MongoBase { dailyMissionIdsType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION)); if(!missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).isEmpty()){ calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]); - calCumulationDataResult(user,MissionType.DAILY_TASK_FINISH,missionTypeEnumListMap,(int)parm[0]); updateString("dailyMissionIdsType",dailyMissionIdsType); } 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 723aa648a..90e65a841 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 @@ -20,6 +20,9 @@ import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.hero.HeroLogic; +import com.ljsd.jieling.logic.mission.data.AbstractDataManager; +import com.ljsd.jieling.logic.mission.data.BaseDataManager; +import com.ljsd.jieling.logic.mission.data.DataManagerDistributor; import com.ljsd.jieling.logic.mission.main.*; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; @@ -438,6 +441,7 @@ public class MissionLoigc { if(missionStateChangeInfos!=null && !missionStateChangeInfos.isEmpty()){ CommonProto.Drop.Builder drop = ItemUtil.drop(user, missionStateChangeInfos.get(0).getRewwardGroups(), BIReason.TAKE_MISSION_REWARD); + user.getUserMissionManager().onGameEvent(user,GameEvent.DAILY_TASK_TYPE,missionId); PlayerInfoProto.TakeMissionRewardResponse build = PlayerInfoProto.TakeMissionRewardResponse.newBuilder().setDrop(drop).build(); MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.TAKE_MISSION_REWARD_RESPONSE_VALUE,build,true); KtEventUtils.onKtEvent(user, ParamEventBean.UserTaskEvent,type,missionId); @@ -459,6 +463,12 @@ public class MissionLoigc { if(missionType == null){ return 0; } + //tofix zsx + BaseDataManager missTypeData = DataManagerDistributor.getMissTypeData(MissionType.findByMissionId(missionTypeId)); + if(missTypeData instanceof AbstractDataManager){ + return ((AbstractDataManager) missTypeData).getprocess(user,user.getUserMissionManager().getCumulationData(),missionSubType); + } + Integer count =0; switch (missionType){ case RECRUITMENT_RANDOM_HEROES: diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java index 15722c2f4..8b0ff9d36 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DailyTaskManager.java @@ -1,9 +1,7 @@ package com.ljsd.jieling.logic.mission.data; import com.ljsd.jieling.globals.Global; -import com.ljsd.jieling.logic.dao.CumulationData; -import com.ljsd.jieling.logic.dao.Hero; -import com.ljsd.jieling.logic.dao.TeamPosHeroInfo; +import com.ljsd.jieling.logic.dao.*; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.mission.MissionType; @@ -29,7 +27,9 @@ public class DailyTaskManager extends AbstractDataManager{ @Override public boolean isFinish(User user,CumulationData data, int[][] cfgValue, Object... parm) { - return user.getItemManager().getItem(Global.DAILY_TASK_REMOVE_ITEM).getItemNum()>=cfgValue[1][0]; + ItemManager itemManager = user.getItemManager(); + Item item = itemManager.getItem(Global.DAILY_TASK_REMOVE_ITEM); + return item.getItemNum()>=cfgValue[1][0]; } @Override