diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java index 71e913c4a..ddd636535 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/hardStage/StartHardStageRequestHandler.java @@ -1,8 +1,8 @@ package com.ljsd.jieling.handler.hardStage; +import com.ljsd.fight.ArenaRecord; import com.ljsd.fight.CheckFight; import com.ljsd.fight.FightType; -import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.db.mongo.LjsdMongoTemplate; import com.ljsd.jieling.db.mongo.MongoUtil; import com.ljsd.jieling.db.redis.RedisKey; @@ -20,28 +20,25 @@ import com.ljsd.jieling.logic.activity.event.ShanHeSheJiTuStarEvent; import com.ljsd.jieling.logic.dao.TeamEnum; import com.ljsd.jieling.logic.dao.TeamPosHeroInfo; import com.ljsd.jieling.logic.dao.UserManager; -import com.ljsd.jieling.logic.dao.root.GlobalSystemControl; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.FightRecordLogic; import com.ljsd.jieling.logic.fight.FightUtil; import com.ljsd.jieling.logic.hardStage.HardStageChapter; import com.ljsd.jieling.logic.hardStage.HardStageLogic; import com.ljsd.jieling.logic.hardStage.HardStageNode; -import com.ljsd.jieling.logic.item.ItemLog; +import com.ljsd.jieling.logic.hero.HeroLogic; import com.ljsd.jieling.logic.mission.GameEvent; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.FightDataUtil; +import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; import com.ljsd.jieling.util.MonsterUtil; import config.SHardStage; import org.luaj.vm2.LuaValue; -import org.springframework.data.mongodb.core.query.Criteria; -import org.springframework.data.mongodb.core.query.Query; -import rpc.protocols.*; -import com.ljsd.fight.ArenaRecord; -import com.ljsd.jieling.util.*; +import rpc.protocols.CommonProto; +import rpc.protocols.MessageTypeProto; +import rpc.protocols.PlayerInfoProto; import util.TimeUtils; -import com.ljsd.jieling.logic.hero.HeroLogic; import java.util.ArrayList; import java.util.List; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java index 40b84718e..36d2755c9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hardStage/HardStageLogic.java @@ -219,7 +219,6 @@ public class HardStageLogic { if (nodeConfig.getHardStageBuff() != 0) { buff = SHardStageBuff.getConfigMap().get(nodeConfig.getHardStageBuff()); if (buff != null && buff.getType() == hardStageBuffLimit) { - SCHero scHero = SCHero.getsCHero().get(hero.getTemplateId()); if (!Arrays.stream(buff.getVocation()).boxed().anyMatch(n -> n.equals(Integer.valueOf(hero.getPropertyId())))) { continue; } @@ -234,9 +233,6 @@ public class HardStageLogic { buff = SHardStageBuff.getConfigMap().get(nodeConfig.getHardStageBuff()); if (buff.getType() == 2 || buff.getType() == 3) { skillSb.append(buff.getPassiveSkillLogic()).append("#"); - /*for (int passiveId:buff.getPassiveSkillLogic()) { - skillSb.append(passiveId).append("#"); - }*/ } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index 5e3b45a5f..7f0681430 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -757,6 +757,7 @@ public class CBean2Proto { monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId())); monsterBuilder.setSkinId(sMonsterConfig.getSkinId()); monsterBuilder.setStar(sMonsterConfig.getStar()); + monsterBuilder.setPropertyId(sMonsterConfig.getPropertyName()); return monsterBuilder; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java index da3887770..fbb829175 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MonsterUtil.java @@ -135,16 +135,7 @@ public class MonsterUtil { }else{ position++; } - } -// for (int monsterId : monsterIds) { -// if(monsterId!=0){ -// monsterList.add(monsterMap.get(monsterId).setPosition(position++).build()); -// }else{ -// position++; -// } -// -// } map.put(i,monsterList); } return map;