From 2a24bf37dfbf0f4278fe8a47e95fc31561524cbc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 17 Oct 2023 16:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/fight/CombatLogic.java | 43 ++++++++----------- .../ljsd/jieling/logic/hero/HeroLogic.java | 3 +- 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java index 6dc6d7471..6c3ab6ce3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/CombatLogic.java @@ -121,7 +121,7 @@ public class CombatLogic { } return value; } - public Map> bufferAddByEatFoodOrEventTrigger(int foodIdOrEventId, Map> heroAllAttributeMap ) throws Exception { + public Map> bufferAddByEatFoodOrEventTrigger(int foodIdOrEventId, Map> heroAllAttributeMap ) { SFoodsConfig sFoodsConfig = STableManager.getConfig(SFoodsConfig.class).get(foodIdOrEventId); int typeTmp = sFoodsConfig.getType(); int targetTmp = sFoodsConfig.getTarget(); @@ -151,7 +151,7 @@ public class CombatLogic { mapManager.eatFood(foodIdOrEventId,contiue); } - public void updateHeroAttributeJustOne(User user,List teamPosHeroInfoList,SFoodsConfig sFoodsConfig, Map> heroAllAttributeMap,boolean isRecory){ +// public void updateHeroAttributeJustOne(User user,List teamPosHeroInfoList,SFoodsConfig sFoodsConfig, Map> heroAllAttributeMap,boolean isRecory){ // Map foodAddMap = new HashMap<>(); // getFoodAttributeAdd(GlobalsDef.FOOD_ADDITION_BATTLE_TYPE, GlobalsDef.FOOD_EAT_AFFECT_PERSON, foodAddMap, sFoodsConfig); // for (TeamPosHeroInfo heroInfo : teamPosHeroInfoList) { @@ -173,7 +173,7 @@ public class CombatLogic { // heroAllAttributeMap.put(hero.getId(), heroAllAttribute); // } // user.getMapManager().setHeroAllAttributeMap(heroAllAttributeMap); - } +// } public Map attributeByEatFood( User user,int type,int target){ Map foddAddResult = new HashMap<>(); @@ -214,7 +214,7 @@ public class CombatLogic { public void takeNewAdventureReward(ISession session,int type,int position) throws Exception { int uid = session.getUid(); User user = UserManager.getUser(uid); - Map adventureFastReward =null; + Map adventureFastReward; if(type == 2){ adventureFastReward = getNewAdventureReward(user,false,(int)(TimeUtils.now()/1000)); if(adventureFastReward.get(1).getItemlistCount()==0){ @@ -582,7 +582,7 @@ public class CombatLogic { break; } hps.put(0,adventureBoss.getRemainHps()); - monsterByGroup = MonsterUtil.getMonsterByGroup(bossGroupId,hps); + MonsterUtil.getMonsterByGroup(bossGroupId, hps); // monsterGroupList = BehaviorUtil.getFightTeamInfos(bossGroupId,monsterByGroup, Global.MONSTER_1); //设置战斗随机种子 seed = (int)(System.currentTimeMillis()/1000); @@ -608,7 +608,7 @@ public class CombatLogic { MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.ADVENTURE_BOSS_CHALLENGE_RESPONSE_VALUE,build,true); user.getUserMissionManager().onGameEvent(user,GameEvent.PlAY_STORY,999,i); }catch (Exception e){ - LOGGER.error("the exception={}",e); + LOGGER.error("the exception=",e); }finally { KtEventUtils.onKtEvent(user, ParamEventBean.UserGameType,KTGameType.CHALLENGE_SECURE.getIndex(),bossGroupId); RedisUtil.getInstence().releaseDistributedLock(RedisKey.ADVENTRUEN_BOSS_CHALLENGE_LOCK_KEY,bossId, Integer.toString(uid)); @@ -662,7 +662,7 @@ public class CombatLogic { } List result = fight.getRemainHp(); for (int i = 0; i < oldRemainHp.size(); i++) { - hurt += (oldRemainHp.get(i) - result.get(i)); + hurt += (int) (oldRemainHp.get(i) - result.get(i)); } adventureBoss.setRemainHp(adventureBoss.getRemainHp() - hurt); adventureBoss.setRemainHps(result); @@ -710,7 +710,6 @@ public class CombatLogic { /** * 发送结算奖励 - * @throws Exception */ public void sendReward() throws Exception { String title=SErrorCodeEerverConfig.getI18NMessage("adventure_boss_reward_title"); @@ -885,13 +884,13 @@ public class CombatLogic { public static > Map sortByValueDescending(Map map) { - List> list = new LinkedList>(map.entrySet()); + List> list = new LinkedList<>(map.entrySet()); list.sort((o1, o2) -> { int compare = (o1.getValue()).compareTo(o2.getValue()); return -compare; }); - Map result = new LinkedHashMap(); + Map result = new LinkedHashMap<>(); for (Map.Entry entry : list) { result.put(entry.getKey(), entry.getValue()); } @@ -985,7 +984,7 @@ public class CombatLogic { String randomReward = ItemUtil.getReward(itemRandom); String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("adventuren_reward_of_viplevel_content",new Object[]{vipLevel},new int[0],"#"); - if(randomReward.length()!=0){ + if(!randomReward.isEmpty()){ reward = reward + "|" + randomReward; MailLogic.getInstance().sendMail(user.getId(),title,content,reward,time, Global.MAIL_EFFECTIVE_TIME); mainLevelManager.afterTakeStateReward(true,0,time); @@ -1006,7 +1005,7 @@ public class CombatLogic { private static void removeNoUseItem(User user,Map itemMap){ Map config = STableManager.getConfig(SExchangeActivityConfig.class); - if(config.size()<1){ + if(config.isEmpty()){ return; } Set removeItem = new HashSet<>(); @@ -1034,45 +1033,39 @@ public class CombatLogic { /** * 将挂机和急速探索的装备合成起来 - * @param equipMap - * @return */ private static Map equipAutoCombine(Map equipMap){ if(equipMap.isEmpty()) return equipMap; Map config = STableManager.getConfig(SEquipConfig.class); Map tempMap = new ConcurrentHashMap<>(); - for(Map.Entry entry:equipMap.entrySet()) { - tempMap.put(entry.getKey(),entry.getValue()); - } + tempMap.putAll(equipMap); boolean isOver; int count = 0; do { isOver = true; - Iterator> it = tempMap.entrySet().iterator(); - while(it.hasNext()){ - Map.Entry entry = it.next(); + for (Map.Entry entry : tempMap.entrySet()) { int key = entry.getKey(); int value = entry.getValue(); SEquipConfig sEquipConfig = config.get(key); - if(sEquipConfig==null) + if (sEquipConfig == null) continue; int star = sEquipConfig.getStar(); SEquipStarsConfig sEquipStarsConfig = STableManager.getConfig(SEquipStarsConfig.class).get(star); int createCount = value / sEquipStarsConfig.getRankupCount(); - if(createCount==0){ + if (createCount == 0) { continue; } int position = sEquipConfig.getPosition(); - tempMap.put(key, value%sEquipStarsConfig.getRankupCount()); + tempMap.put(key, value % sEquipStarsConfig.getRankupCount()); SEquipConfig createConfig = SEquipConfig.positionStarMap.get(position).get(star + 1); - if(createConfig==null) + if (createConfig == null) continue; int createId = createConfig.getId(); - tempMap.put(createId,tempMap.getOrDefault(createId, 0)+createCount); + tempMap.put(createId, tempMap.getOrDefault(createId, 0) + createCount); isOver = false; } count++; 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 7ae6dd746..b70be3f0f 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 @@ -3465,6 +3465,7 @@ public class HeroLogic { public int calForce(Map heroAllAttribute) { double forceNum = 0;//基础值 double forceAdd = 0;//加成值 +// LOGGER.error("总属性=============> {}",heroAllAttribute); //战力计算 for(Map.Entry item : heroAllAttribute.entrySet()){ Integer propertyId = item.getKey(); @@ -3487,7 +3488,7 @@ public class HeroLogic { // BigDecimal bg = new BigDecimal(forceAdd).setScale(4, RoundingMode.UP); // float v = bg.floatValue(); double result = (forceAdd + 1) * forceNum; -// LOGGER.info("战力总结果==============={},{},{}",forceNum,forceAdd,result); +// LOGGER.error("战力总结果==============={},{},{}",forceNum,forceAdd,result); return (int)result; }