From 11376e12b1604e82d59df79ce703863403d5bf3a Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 10 Sep 2019 12:01:05 +0800 Subject: [PATCH 1/4] fix map team --- .../ljsd/jieling/handler/map/MapLogic.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 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 1a4d1365d..ad0d99645 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 @@ -1540,25 +1540,32 @@ public class MapLogic { } int teamId = mapManager.getTeamId(); List team = user.getTeamPosManager().getTeamPosForHero().get(teamId); - for (TeamPosHeroInfo teamPosHeroInfo : team) { - mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]); - } - if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){ + if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){ mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1); + Set cacheRemove = new HashSet<>(); for (int i = 0 ; i heroAllAttribute = HeroLogic.getInstance().calHeroNotBufferAttribute(user, hero,false,teamId); int per =(int) (checkResult[i+2] / (double) heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId())*10000); mapManager.updateEndlessHeroHp(team.get(i).getHeroId(),per); - Map currAttrMap = mapManager.getHeroAllAttributeMap().get(hero.getId()); - if(currAttrMap==null){ - continue; + mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]); + if(per<=0){ + cacheRemove.add(hero.getId()); } - if(currAttrMap.get(HeroAttributeEnum.CurHP.getPropertyId())==0){ - mapManager.removeOneHeroAttribute(hero.getId()); - }else{ - mapManager.updateHeroOneAttribute(team.get(i).getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[i+2]); + } + if(!cacheRemove.isEmpty()){ + Iterator iterator = team.iterator(); + while (iterator.hasNext()){ + TeamPosHeroInfo next = iterator.next(); + if(cacheRemove.contains(next.getHeroId())){ + iterator.remove(); + } } + user.getTeamPosManager().updateTeamPosByTeamId(teamId,team); + } + }else{ + for (TeamPosHeroInfo teamPosHeroInfo : team) { + mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition()+1]); } } CommonProto.Drop.Builder drop = ItemUtil.drop(user, sMonsterGroup.getRewardgroup(), 1, 1, BIReason.MAP_GENERAL_FIGHT_REWARD); From 5633e399e974bbb52a78ddacbdedf4987ab19334 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 10 Sep 2019 13:50:38 +0800 Subject: [PATCH 2/4] fix --- .../java/com/ljsd/jieling/handler/map/MapLogic.java | 10 ---------- 1 file changed, 10 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 75ad6df8d..ad7a874fb 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 @@ -1540,17 +1540,7 @@ public class MapLogic { } int teamId = mapManager.getTeamId(); List team = user.getTeamPosManager().getTeamPosForHero().get(teamId); -<<<<<<< HEAD - if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4){ -======= - for (TeamPosHeroInfo teamPosHeroInfo : team) { - Map heroAttr = mapManager.getHeroAllAttributeMap().get(teamPosHeroInfo.getHeroId()); - if(heroAttr!=null) { - mapManager.updateHeroOneAttribute(teamPosHeroInfo.getHeroId(), HeroAttributeEnum.CurHP.getPropertyId(), checkResult[teamPosHeroInfo.getPosition() + 1]); - } - } if(SChallengeConfig.sChallengeConfigs.get(mapManager.getCurMapId()).getType()==4&&teamId==401){ ->>>>>>> abd7ebd8754c1471b2b50e9478087bae40f0ad8f mapManager.updateEndlessFightCount(mapManager.getEndlessMapInfo().getFightCount()+1); Set cacheRemove = new HashSet<>(); for (int i = 0 ; i Date: Tue, 10 Sep 2019 14:03:51 +0800 Subject: [PATCH 3/4] fix table --- .../src/main/java/com/ljsd/jieling/config/SGameSetting.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java index 8b36e1fa9..e9d023292 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGameSetting.java @@ -108,6 +108,8 @@ public class SGameSetting implements BaseConfig { private int[] equipTalismanaUnlock; + private int[] equipSignUnlock; + private static SGameSetting gameSetting; From 28106837139c8f2e252e4dd71769e29d06116207 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 10 Sep 2019 14:14:32 +0800 Subject: [PATCH 4/4] fix time --- .../java/com/ljsd/jieling/config/SGlobalSystemConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java index ddd76da7d..04d79da22 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SGlobalSystemConfig.java @@ -58,8 +58,8 @@ public class SGlobalSystemConfig implements BaseConfig { } if(2 == sGlobalSystemConfig.getType()){ long cacheOpenTime = GameApplication.serverConfig.getCacheOpenTime(); - sGlobalSystemConfig.setSeasonOpenLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonOpen())); - sGlobalSystemConfig.setSeasonEndLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonEnd())); + sGlobalSystemConfig.setSeasonOpenLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonOpen())*1000); + sGlobalSystemConfig.setSeasonEndLong(cacheOpenTime +Integer.parseInt(sGlobalSystemConfig.getSeasonEnd())*1000); }else{ sGlobalSystemConfig.setSeasonOpenLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSeasonOpen(), TimeUtils.Stand_CeHua_Data_format)); sGlobalSystemConfig.setSeasonEndLong(TimeUtils.parseTimeToMiles(sGlobalSystemConfig.getSeasonEnd(), TimeUtils.Stand_CeHua_Data_format));