From 5b977ec2ae26f96692ea37bcd5cd9dc296ae873a Mon Sep 17 00:00:00 2001 From: wangyuan Date: Thu, 30 May 2019 12:01:33 +0800 Subject: [PATCH] fix vip mission --- .../java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- .../com/ljsd/jieling/logic/dao/PlayerManager.java | 2 ++ .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 13 ++++++++----- .../logic/mission/data/HeroLevelUpManager.java | 2 +- 4 files changed, 12 insertions(+), 7 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 851c44e30..65e0e48f7 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 @@ -1830,7 +1830,7 @@ public class MapLogic { crossInfo.getStars().add(STAR_3); crossInfoMap.put(i, crossInfo); mapManager.updateCrossInfoMap(i, crossInfo); - user.getUserMissionManager().onGameEvent(user,GameEvent.STORY_FIGHT,mapManager.getCurMapId(),1); + user.getUserMissionManager().onGameEvent(user,GameEvent.STORY_FIGHT,i,1); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 31e4c1360..c1cb20536 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -222,7 +222,9 @@ public class PlayerManager extends MongoBase { } updateString("vipInfo", vipInfo); updateString("vipLevel", vipLevel); + updateString("hadTakeLevelBoxVip", 0); this.vipLevel = vipLevel; + this.hadTakeLevelBoxVip = 0; user.getUserMissionManager().onGameEvent(user,GameEvent.VIP_LEVLUP,vipLevel); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index dcd3e9bca..4b1033768 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -1214,11 +1214,12 @@ public class HeroLogic { MessageUtil.sendErrorResponse(session,0,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,"道具不足"); return; } - if(pokemon.getAllStage() == 0){ - user.getUserMissionManager().onGameEvent(user,GameEvent.POKEMON_ADVANCED,pokemonId); - } + pokemon.setAllStage(pokemon.getAllStage()+1); + if(pokemon.getAllStage() == 1){ + user.getUserMissionManager().onGameEvent(user,GameEvent.POKEMON_ADVANCED,pokemonId); + } //发送成功消息 MessageUtil.sendMessage(session,1,MessageTypeProto.MessageType.POKEMON_ADVANCED_RESPONSE_VALUE,null,true); @@ -1322,8 +1323,10 @@ public class HeroLogic { SDifferDemonsComonpentsConfig sDifferDemonsComonpentsConfig = sDifferDemonsComonpentsConfigMap.get(comonpentLevel); Map> extraAddMap = sDifferDemonsComonpentsConfig.getExtraAddMap(); combinedAttribute(sDifferDemonsComonpentsConfig.getBaseAttribute(),pokemonAttributeMap); - for(Map item : extraAddMap.values()){ - combinedAttribute(sDifferDemonsComonpentsConfig.getBaseAttribute(),item); + if(extraAddMap!=null){ + for(Map item : extraAddMap.values()){ + combinedAttribute(item,pokemonAttributeMap); + } } } return calForce(pokemonAttributeMap); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/HeroLevelUpManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/HeroLevelUpManager.java index ddf2183fd..db0449926 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/HeroLevelUpManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mission/data/HeroLevelUpManager.java @@ -11,7 +11,7 @@ public class HeroLevelUpManager implements BaseDataManager{ int oldLevle = (int)parm[0]; int newLevle = (int)parm[1]; Map heroLevleCountMap = data.getHeroLevleCountMap(); - for(;oldLevle