diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java index 946ed17c7..8ba5bbf66 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/ToBeStrongerHandler.java @@ -2,20 +2,21 @@ package com.ljsd.jieling.handler.activity; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.activity.ActivityLogic; +import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.protocols.PlayerInfoProto; import org.springframework.stereotype.Component; @Component -public class ToBeStrongerHandler extends BaseHandler{ +public class ToBeStrongerHandler extends BaseHandler{ @Override public MessageTypeProto.MessageType getMessageCode() { return MessageTypeProto.MessageType.TO_BE_STRONGER_REQUEST; } @Override - public void processWithProto(ISession iSession, PlayerInfoProto.GetToBeStrongerRequest proto){ - ActivityLogic.getInstance().toBeStronger(iSession,proto.getTempId(),MessageTypeProto.MessageType.TO_BE_STRONGER_RESPONSE); + public void process(ISession iSession, PacketNetData netData) throws Exception { + ActivityLogic.getInstance().toBeStronger(iSession,MessageTypeProto.MessageType.TO_BE_STRONGER_RESPONSE); } } 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 dca5fe3d2..2ad6a5ed3 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 @@ -1053,12 +1053,14 @@ public class ActivityLogic { * @param session * @param messageType */ - public void toBeStronger(ISession session, int tempId,MessageTypeProto.MessageType messageType){ - PlayerInfoProto.GetToBeStrongerResponse.Builder response = PlayerInfoProto.GetToBeStrongerResponse.newBuilder(); - for(int i = 0 ; i <6;i++){ - CommonProto.StrongerInfo.Builder info = CommonProto.StrongerInfo.newBuilder().setCurScore(1000).setMaxScore(6000); - response.addInfos(info.build()); - } - MessageUtil.sendMessage(session,1,messageType.getNumber(),response.build(),true); + public void toBeStronger(ISession session,MessageTypeProto.MessageType messageType) throws Exception { + User user = UserManager.getUser(session.getUid()); + user.getUserMissionManager().onGameEvent(user,GameEvent.TO_BE_STRONGER); +// PlayerInfoProto.GetToBeStrongerResponse.Builder response = PlayerInfoProto.GetToBeStrongerResponse.newBuilder(); +// for(int i = 0 ; i <6;i++){ +// CommonProto.StrongerInfo.Builder info = CommonProto.StrongerInfo.newBuilder().setCurScore(1000).setMaxScore(6000); +// response.addInfos(info.build()); +// } + MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java index f18700065..308642124 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/CumulationData.java @@ -90,6 +90,7 @@ public class CumulationData { public int takeSenvenLoinRewardTimes;// 领取七日登录奖励次数达到 public int takeDailyBoxTimes;// 领取日常任务宝箱奖励次数达到 public int wearEquipTimes;// 妖灵师穿戴装备件数达到 + public int toBeStronger; public Map synthesisHeroStarTimesMap = new HashMap<>();// 碎片合成%s星妖灵师次数达到 public Map heroUpStarTimesMap = new HashMap<>();//将妖灵师%s进阶次数达到 @@ -156,6 +157,7 @@ public class CumulationData { givePresents=0; friendNums=0; monsterAttackTimes = 0; + toBeStronger = 0; } private void clearArray(int[] source){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java index e1b4ef1cd..82222ae31 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/GameEvent.java @@ -52,4 +52,6 @@ public enum GameEvent { MONSTER_ATTACK_PLAY,//参与兽潮来袭 MONSTER_ATTACK_LEVEL, // 兽潮来袭到达层 + TO_BE_STRONGER,//我要变强 + } 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 2f3eb9cd5..c7d1daa24 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 @@ -584,6 +584,9 @@ public class MissionLoigc { case MONSTER_ATTACK_LEVEL: count = user.getMapManager().getLastMonsterAttack() - 1; break; + case TO_BE_STRONGER: + count = cumulationData.toBeStronger; + break; default: count = 0; break; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java index 3a1a724a0..041904e9a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/MissionType.java @@ -76,7 +76,7 @@ public enum MissionType { JOIN_MONSTER_ATTACK_TIMES(56),//参与兽潮来袭的次数 MONSTER_ATTACK_LEVEL(57),//兽潮来袭到达x层 - + TO_BE_STRONGER(58) ; @@ -206,6 +206,8 @@ public enum MissionType { return JOIN_MONSTER_ATTACK_TIMES;//参与兽潮来袭的次数 case 57: return MONSTER_ATTACK_LEVEL;//兽潮来袭到达x层 + case 58: + return TO_BE_STRONGER; default: return null; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java index 212391602..a50327a89 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/DataManagerDistributor.java @@ -97,6 +97,7 @@ public class DataManagerDistributor { judges.put(MissionType.JOIN_MONSTER_ATTACK_TIMES,new JoinMonsterAttackManager()); judges.put(MissionType.MONSTER_ATTACK_LEVEL,new DefaultDataManager()); + judges.put(MissionType.TO_BE_STRONGER,new StrongerManager()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/StrongerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/StrongerManager.java new file mode 100644 index 000000000..7007ef9bd --- /dev/null +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/StrongerManager.java @@ -0,0 +1,12 @@ +package com.ljsd.jieling.logic.mission.data; + +import com.ljsd.jieling.logic.dao.CumulationData; +import com.ljsd.jieling.logic.mission.MissionType; + +public class StrongerManager implements BaseDataManager { + @Override + public CumulationData.Result updateData(CumulationData data, MissionType missionType, Object... parm) { + data.toBeStronger++; + return new CumulationData.Result(missionType); + } +} diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java index 5b2198b03..c5e430d03 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/event/MissionEventDistributor.java @@ -241,6 +241,11 @@ public class MissionEventDistributor { eventEnumListMap.put(GameEvent.MONSTER_ATTACK_LEVEL,typeList); eventProcessor.put(GameEvent.MONSTER_ATTACK_LEVEL,new CumulationDataEventProcessor()); + typeList = new ArrayList<>(); + typeList.add(MissionType.TO_BE_STRONGER); + eventEnumListMap.put(GameEvent.TO_BE_STRONGER,typeList); + eventProcessor.put(GameEvent.TO_BE_STRONGER,new CumulationDataEventProcessor()); + } private static final ThreadLocal>> threadMissionChangeList =