From 1e6ab3dfa48cd16bf5b8743a4c20cc6cf060eb5d Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 23:22:54 +0800 Subject: [PATCH 1/4] fix map null --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- 1 file changed, 1 insertion(+), 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 22b761296..af576cd82 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 @@ -2331,7 +2331,7 @@ public class MapLogic { User user = UserManager.getUser(uid); String fightKey = RedisKey.getKey(RedisKey.CHALLENGE_MONSTER_INFO, String.valueOf(uid), false); String fightInfos = (String) RedisUtil.getInstence().get(fightKey); - if (fightInfos.isEmpty()) { + if (fightInfos == null|| fightInfos.isEmpty()) { LOGGER.info("endFight() uid=>{} fightKey={},fightId={} fightInfos == null", uid, fightKey); MessageUtil.sendErrorResponse(session, 0, messageType.getNumber(), ""); return; From 1c7dbd7b4d3a8f254625556cbf155a8afac79693 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 14:02:24 +0800 Subject: [PATCH 2/4] close activity --- .../java/com/ljsd/jieling/logic/activity/ActivityLogic.java | 5 ++++- 1 file changed, 4 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 d48bf60a7..42be17850 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 @@ -198,8 +198,11 @@ public class ActivityLogic { if (null==abstractActivity) { continue; } - abstractActivity .onActivityEndSelfWithDealReward(user); + abstractActivity.onActivityEndSelfWithDealReward(user); activityManager.removeActivity(activityId); + if(sGlobalActivity.getShopId()!=0){ + user.getStoreManager().removeStoreInfo(sGlobalActivity.getShopId()); + } LOGGER.info("the uid={},remove the activity id ={}", user.getId(), activityId); if (builder != null) { builder.addCloseActivityId(activityId); From c0aa602e21e8a513fea573884d26aa94380b5234 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 17:04:52 +0800 Subject: [PATCH 3/4] fix force --- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index faf497314..3ae671239 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -271,7 +271,7 @@ public class PlayerLogic { int uid = iSession.getUid(); User user = UserManager.getUser(uid); if(user.getTeamPosManager().getTeamPosForHero().containsKey(teamId)){ - int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, true); + int teamForce = HeroLogic.getInstance().calTeamTotalForce(user, teamId, false); if(user.getPlayerInfoManager().getMaxForce() < teamForce){ user.getPlayerInfoManager().setMaxForce(teamForce); String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false); From 6296f1e1eda7c8607618ea14d56659d9f58f4d2d Mon Sep 17 00:00:00 2001 From: wangyuan Date: Fri, 20 Sep 2019 17:11:44 +0800 Subject: [PATCH 4/4] fix herologic --- .../main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 a1c80166d..57751a267 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 @@ -1301,11 +1301,7 @@ public class HeroLogic { public int calHeoForce(User user, Hero hero,boolean isMyself){ Map heroAllAttribute; - if(!isMyself || user.getMapManager().getCurMapId() == 0){ - heroAllAttribute=calHeroNotBufferAttribute(user, hero,true,0); - }else{ - heroAllAttribute = calHeroFinalAttributeWhenInMap(user, hero,true,0); - } + heroAllAttribute = calHeroFinalAttributeWhenInMap(user, hero,true,0); //战力保存 int force = calForce(heroAllAttribute); return force + heroAllAttribute.get(HeroAttributeEnum.EquipForce.getPropertyId());