From aa9fee7c60b9d7038ed3622b0c992e60d8a36cc3 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Tue, 16 Mar 2021 17:43:22 +0800 Subject: [PATCH] =?UTF-8?q?buff=E7=B1=BB=E5=9E=8B=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/map/MapLogic.java | 8 ++++---- .../com/ljsd/jieling/handler/map/MapManager.java | 2 +- .../com/ljsd/jieling/handler/map/TrialInfo.java | 6 +++--- .../handler/map/behavior/FiftyOneBehavior.java | 4 ++-- .../com/ljsd/jieling/logic/SituationLogic.java | 6 +++--- .../jieling/logic/family/GuildChallengeLogic.java | 4 ++-- .../com/ljsd/jieling/logic/fight/CombatLogic.java | 15 ++++++++------- .../com/ljsd/jieling/logic/fight/FightEvent.java | 6 +++--- .../com/ljsd/jieling/logic/fight/FightUtil.java | 8 ++++---- .../main/java/com/ljsd/jieling/util/ItemUtil.java | 4 ++-- 10 files changed, 32 insertions(+), 31 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 186fe5ae1..49336f1c6 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 @@ -2894,11 +2894,11 @@ public class MapLogic { trialInfo.setQuitMapId(0); trialInfo.setEnergy(0); trialInfo.setTimes(openTimeOfFuntionCacheByType.getTimes()); - List initBuff = new ArrayList<>(); + List initBuff = new ArrayList<>(); //先出奖励层 trialInfo.setFloor(trialInfo.getFloor()%10000); if(trialInfo.getHighestTower()!=0&&trialInfo.getFloor()<=trialInfo.getHighestTower()){ - initBuff.add((long) STrialSetting.sTrialSetting.getBaseBuff()); + initBuff.add(STrialSetting.sTrialSetting.getBaseBuff()); } trialInfo.setBuffIds(initBuff); trialInfo.setFloor(trialInfo.getHighestTower()-7>1?trialInfo.getHighestTower()-7:1); @@ -3284,9 +3284,9 @@ public class MapLogic { } int optionId = STableManager.getConfig(SEventPointConfig.class).get(cell.getEventId()).getOption()[0]; SOptionConfig sOptionConfig = SOptionConfig.sOptionConfigMap.get(optionId); - List buffIds = mapManager.getTrialInfo().getBuffIds(); + List buffIds = mapManager.getTrialInfo().getBuffIds(); for(int[] values:sOptionConfig.getBehaviorTypeValues()){ - for(long value:values){ + for(int value:values){ buffIds.add(value); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java index 448da150a..3ebf36375 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapManager.java @@ -813,7 +813,7 @@ public class MapManager extends MongoBase { updateString("trialInfo.killCount",count); } - public void updateTrialBuffIds(List ids){ + public void updateTrialBuffIds(List ids){ trialInfo.setBuffIds(ids); updateString("trialInfo.buffIds",ids); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java index ed65dcd6e..f837b51d5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/TrialInfo.java @@ -33,7 +33,7 @@ public class TrialInfo extends MongoBase { private Set towerReceivedReward = new HashSet<>(); - private List buffIds = new ArrayList<>(); + private List buffIds = new ArrayList<>(); private MapGameInfo mapGameInfo = new MapGameInfo(); @@ -131,11 +131,11 @@ public class TrialInfo extends MongoBase { this.killCount = killCount; } - public List getBuffIds() { + public List getBuffIds() { return buffIds; } - public void setBuffIds(List buffIds) { + public void setBuffIds(List buffIds) { this.buffIds = buffIds; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyOneBehavior.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyOneBehavior.java index 70610fe7d..59a8750d7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyOneBehavior.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/behavior/FiftyOneBehavior.java @@ -23,9 +23,9 @@ public class FiftyOneBehavior extends BaseBehavior { @Override public boolean process(int optionId, User user, int[][] behaviorTypeValues, MapInfoProto.EventUpdateResponse.Builder eventUpdateResponse) throws Exception { MapManager mapManager = user.getMapManager(); - List buffIds = mapManager.getTrialInfo().getBuffIds(); + List buffIds = mapManager.getTrialInfo().getBuffIds(); for(int[] values:behaviorTypeValues){ - for(long value:values){ + for(int value:values){ buffIds.add(value); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java index 7541ed21b..4799234c6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/SituationLogic.java @@ -240,9 +240,9 @@ public class SituationLogic { throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } } - Map> buffMap = new HashMap<>(); + Map> buffMap = new HashMap<>(); for(int[] buffid:sRaceTowerConfig.getAttribute()){ - buffMap.computeIfAbsent(buffid[0],n->new ArrayList<>()).add((long) buffid[1]); + buffMap.computeIfAbsent(buffid[0],n->new ArrayList<>()).add(buffid[1]); } //组装战斗数据 PVEFightEvent pveFightEvent = new PVEFightEvent(user.getId(), formation, 20, "", GameFightType.DailyChallenge, sRaceTowerConfig.getMonsterId(), 3); @@ -294,7 +294,7 @@ public class SituationLogic { // user.getUserMissionManager().onGameEvent(user, GameEvent.DAILY_CHALLENGE,sDailyChallengeConfig.getType()); MessageUtil.sendMessage(session,1,messageType.getNumber(),builder.build()); } - public static FightResult getFightForSituation(FightEvent fightEvent,Map> buffInfo){ + public static FightResult getFightForSituation(FightEvent fightEvent,Map> buffInfo){ PVEFightEvent pveFightEvent = (PVEFightEvent)fightEvent; User userInMem = UserManager.getUserInMem(pveFightEvent.getAttackUid()); CommonProto.FightTeamInfo fightTeamInfo = FightUtil.getFightTeamInfoWithSomeBuff(userInMem, pveFightEvent.getTeamId(),pveFightEvent.getAttackBloodMap(),buffInfo); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index 6206e64e8..fc4a3f955 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -179,8 +179,8 @@ public class GuildChallengeLogic { int buffIndex = guildInfo.getBuffIndex(); int buffOverTime = guildInfo.getBuffOverTime(); if(buffOverTime>TimeUtils.nowInt()&&buffIndex!=0){ - List buffList = new ArrayList<>(); - buffList.add((long) config.getAttributePromote()[buffIndex-1]); + List buffList = new ArrayList<>(); + buffList.add(config.getAttributePromote()[buffIndex-1]); pveFightEvent.setBuffIds(buffList); } if(guildInfo.getBossHpRemain()!=0&&guildInfo.getBossHpRemain()!=-1){ 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 cf7b34581..a24cee0f6 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 @@ -67,11 +67,11 @@ public class CombatLogic { public Map bufferOneHeroAttrAfterEat(Map value,int foodId) { - List foodIds = new ArrayList<>(); - foodIds.add((long) foodId); + List foodIds = new ArrayList<>(); + foodIds.add(foodId); return bufferOneHeroAttrAfterEat(value,foodIds); } - public Map bufferOneHeroAttrAfterEat(Map value,List foodIds){ + public Map bufferOneHeroAttrAfterEat(Map value,List foodIds){ Map effectValueMap = new HashMap<>(); for(long foodId:foodIds){ SFoodsConfig sFoodsConfig = STableManager.getConfig(SFoodsConfig.class).get(foodId); @@ -253,6 +253,7 @@ public class CombatLogic { int adventureRefresh = gameSetting.getAdventureRefresh(); int times = timeDuration / adventureRefresh; ItemMap itemObj = new ItemMap(); + ItemMap itemRandomObj = new ItemMap(); CommonProto.Drop.Builder baseBuilder = CommonProto.Drop.newBuilder(); CommonProto.Drop.Builder randomBuilder = CommonProto.Drop.newBuilder(); int fightId = mainLevelManager.getFightId(); @@ -267,12 +268,12 @@ public class CombatLogic { } int[] randomRewardMin = targetMainLevelConfig.getRandomRewardMin(); ItemUtil.combineRewardByMainLine(user,false, true, randomRewardMin, times,itemObj,BIReason.ADVENTURE_BASE_REWARD); - ItemUtil.combineRewardByMainLine(user,true, false,targetMainLevelConfig.getRandomReward(), times,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD); - itemObj.setEquipMap(equipAutoCombine(itemObj.getEquipMap())); + ItemUtil.combineRewardByMainLine(user,true, false,targetMainLevelConfig.getRandomReward(), times,itemRandomObj,BIReason.ADVENTURE_RANDOM_REWARDD); + itemRandomObj.setEquipMap(equipAutoCombine(itemRandomObj.getEquipMap())); //清除无用活动道具 - removeNoUseItem(user,itemObj.getItemMap()); + removeNoUseItem(user,itemRandomObj.getItemMap()); ItemUtil.drop(user,baseBuilder,itemObj,BIReason.ADVENTURE_BASE_REWARD); - ItemUtil.drop(user,randomBuilder,itemObj,BIReason.ADVENTURE_RANDOM_REWARDD); + ItemUtil.drop(user,randomBuilder,itemRandomObj,BIReason.ADVENTURE_RANDOM_REWARDD); Map result = new HashMap<>(2); result.put(1,baseBuilder.build()); result.put(2,randomBuilder.build()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightEvent.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightEvent.java index 040e2d4c2..4944ee7d4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightEvent.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightEvent.java @@ -11,7 +11,7 @@ public class FightEvent { private GameFightType fightType; private Map attackBloodMap; private List monsterRemainHp; - private List buffIds; + private List buffIds; public FightEvent(int attackUid, int teamId,int mostTime,String frams, GameFightType fightType) { this.attackUid = attackUid; @@ -57,11 +57,11 @@ public class FightEvent { this.monsterRemainHp = monsterRemainHp; } - public List getBuffIds() { + public List getBuffIds() { return buffIds; } - public void setBuffIds(List buffIds) { + public void setBuffIds(List buffIds) { this.buffIds = buffIds; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java index 4c41b0833..723552be0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/FightUtil.java @@ -39,9 +39,9 @@ import java.util.Map; public class FightUtil { - public static CommonProto.FightTeamInfo makePersonFightData(User player,int teamId,Map attackBloodMap,List buffIds){ + public static CommonProto.FightTeamInfo makePersonFightData(User player,int teamId,Map attackBloodMap,List buffIds){ if(buffIds!=null){ - Map> map = new HashMap<>(); + Map> map = new HashMap<>(); for(int i = 1;i <=4;i++){ map.put(i,buffIds); } @@ -256,7 +256,7 @@ public class FightUtil { List heroFightInfos = new ArrayList<>(); List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); Map heroInfo = user.getMapManager().getTrialInfo().getHeroInfo(); - List buffIds = user.getMapManager().getTrialInfo().getBuffIds(); + List buffIds = user.getMapManager().getTrialInfo().getBuffIds(); for (TeamPosHeroInfo teamPosHeroInfo : teamPosHeroInfos) { if (heroInfo.isEmpty()||!heroInfo.containsKey(teamPosHeroInfo.getHeroId())) { continue; @@ -336,7 +336,7 @@ public class FightUtil { .build(); } // - public static CommonProto.FightTeamInfo getFightTeamInfoWithSomeBuff(User user, int teamId, Map attackBloodMap,Map> buffInfo) { + public static CommonProto.FightTeamInfo getFightTeamInfoWithSomeBuff(User user, int teamId, Map attackBloodMap,Map> buffInfo) { user.getTeamPosManager().setCurTeamPosId(teamId); List heroFightInfos = new ArrayList<>(); List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index df8d402c0..29b4e68ad 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -640,8 +640,8 @@ public class ItemUtil { sendToFront.add(CBean2Proto.getItem(item,-1)); if(sItem.getItemType()==GlobalItemType.EQUIP){ if(reason!=BIReason.EQUIP_UNLOAD_REWARD&&reason!=BIReason.DECOMPOS_HERO_REWARD&&reason!=BIReason.UPHERO_DECOMPOS_HERO_REWARD){ - user.getUserMissionManager().onGameEvent(user,GameEvent.GET_EQUIP,sItem.getId(),itemNum); - ReportUtil.onReportEvent(user,ReportEventEnum.GET_EQUIP.getType(),sItem.getId(),itemNum,reason); + user.getUserMissionManager().onGameEvent(user,GameEvent.GET_EQUIP,sItem.getId(),(int)itemNum); + ReportUtil.onReportEvent(user,ReportEventEnum.GET_EQUIP.getType(),sItem.getId(),(int)itemNum,reason); } } else if (sItem.getItemType() == GlobalItemType.SOUL_MARK) { user.getUserMissionManager().onGameEvent(user, GameEvent.GOT_SOUL_MARK, sItem.getId(), itemNum);