HARD_STAGE_FIGHT_START_REQUEST 怪物职业赋值
parent
2d2dba9374
commit
f945915126
|
|
@ -1,8 +1,8 @@
|
||||||
package com.ljsd.jieling.handler.hardStage;
|
package com.ljsd.jieling.handler.hardStage;
|
||||||
|
|
||||||
|
import com.ljsd.fight.ArenaRecord;
|
||||||
import com.ljsd.fight.CheckFight;
|
import com.ljsd.fight.CheckFight;
|
||||||
import com.ljsd.fight.FightType;
|
import com.ljsd.fight.FightType;
|
||||||
import com.ljsd.jieling.core.GlobalsDef;
|
|
||||||
import com.ljsd.jieling.db.mongo.LjsdMongoTemplate;
|
import com.ljsd.jieling.db.mongo.LjsdMongoTemplate;
|
||||||
import com.ljsd.jieling.db.mongo.MongoUtil;
|
import com.ljsd.jieling.db.mongo.MongoUtil;
|
||||||
import com.ljsd.jieling.db.redis.RedisKey;
|
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.TeamEnum;
|
||||||
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
|
import com.ljsd.jieling.logic.dao.TeamPosHeroInfo;
|
||||||
import com.ljsd.jieling.logic.dao.UserManager;
|
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.dao.root.User;
|
||||||
import com.ljsd.jieling.logic.fight.FightRecordLogic;
|
import com.ljsd.jieling.logic.fight.FightRecordLogic;
|
||||||
import com.ljsd.jieling.logic.fight.FightUtil;
|
import com.ljsd.jieling.logic.fight.FightUtil;
|
||||||
import com.ljsd.jieling.logic.hardStage.HardStageChapter;
|
import com.ljsd.jieling.logic.hardStage.HardStageChapter;
|
||||||
import com.ljsd.jieling.logic.hardStage.HardStageLogic;
|
import com.ljsd.jieling.logic.hardStage.HardStageLogic;
|
||||||
import com.ljsd.jieling.logic.hardStage.HardStageNode;
|
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.logic.mission.GameEvent;
|
||||||
import com.ljsd.jieling.network.session.ISession;
|
import com.ljsd.jieling.network.session.ISession;
|
||||||
import com.ljsd.jieling.util.FightDataUtil;
|
import com.ljsd.jieling.util.FightDataUtil;
|
||||||
|
import com.ljsd.jieling.util.ItemUtil;
|
||||||
import com.ljsd.jieling.util.MessageUtil;
|
import com.ljsd.jieling.util.MessageUtil;
|
||||||
import com.ljsd.jieling.util.MonsterUtil;
|
import com.ljsd.jieling.util.MonsterUtil;
|
||||||
import config.SHardStage;
|
import config.SHardStage;
|
||||||
import org.luaj.vm2.LuaValue;
|
import org.luaj.vm2.LuaValue;
|
||||||
import org.springframework.data.mongodb.core.query.Criteria;
|
import rpc.protocols.CommonProto;
|
||||||
import org.springframework.data.mongodb.core.query.Query;
|
import rpc.protocols.MessageTypeProto;
|
||||||
import rpc.protocols.*;
|
import rpc.protocols.PlayerInfoProto;
|
||||||
import com.ljsd.fight.ArenaRecord;
|
|
||||||
import com.ljsd.jieling.util.*;
|
|
||||||
import util.TimeUtils;
|
import util.TimeUtils;
|
||||||
import com.ljsd.jieling.logic.hero.HeroLogic;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,6 @@ public class HardStageLogic {
|
||||||
if (nodeConfig.getHardStageBuff() != 0) {
|
if (nodeConfig.getHardStageBuff() != 0) {
|
||||||
buff = SHardStageBuff.getConfigMap().get(nodeConfig.getHardStageBuff());
|
buff = SHardStageBuff.getConfigMap().get(nodeConfig.getHardStageBuff());
|
||||||
if (buff != null && buff.getType() == hardStageBuffLimit) {
|
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())))) {
|
if (!Arrays.stream(buff.getVocation()).boxed().anyMatch(n -> n.equals(Integer.valueOf(hero.getPropertyId())))) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -234,9 +233,6 @@ public class HardStageLogic {
|
||||||
buff = SHardStageBuff.getConfigMap().get(nodeConfig.getHardStageBuff());
|
buff = SHardStageBuff.getConfigMap().get(nodeConfig.getHardStageBuff());
|
||||||
if (buff.getType() == 2 || buff.getType() == 3) {
|
if (buff.getType() == 2 || buff.getType() == 3) {
|
||||||
skillSb.append(buff.getPassiveSkillLogic()).append("#");
|
skillSb.append(buff.getPassiveSkillLogic()).append("#");
|
||||||
/*for (int passiveId:buff.getPassiveSkillLogic()) {
|
|
||||||
skillSb.append(passiveId).append("#");
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -757,6 +757,7 @@ public class CBean2Proto {
|
||||||
monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId()));
|
monsterBuilder.setUnitId(String.valueOf(sMonsterConfig.getId()));
|
||||||
monsterBuilder.setSkinId(sMonsterConfig.getSkinId());
|
monsterBuilder.setSkinId(sMonsterConfig.getSkinId());
|
||||||
monsterBuilder.setStar(sMonsterConfig.getStar());
|
monsterBuilder.setStar(sMonsterConfig.getStar());
|
||||||
|
monsterBuilder.setPropertyId(sMonsterConfig.getPropertyName());
|
||||||
return monsterBuilder;
|
return monsterBuilder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -135,16 +135,7 @@ public class MonsterUtil {
|
||||||
}else{
|
}else{
|
||||||
position++;
|
position++;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
// for (int monsterId : monsterIds) {
|
|
||||||
// if(monsterId!=0){
|
|
||||||
// monsterList.add(monsterMap.get(monsterId).setPosition(position++).build());
|
|
||||||
// }else{
|
|
||||||
// position++;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
map.put(i,monsterList);
|
map.put(i,monsterList);
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue