小调整,不影响逻辑
parent
1dce1ea964
commit
c1e1eecb53
|
@ -2,19 +2,19 @@ package com.ljsd.fight;
|
||||||
|
|
||||||
public enum FightType {
|
public enum FightType {
|
||||||
CrossLuofuFight(0),//跨服罗浮争锋
|
CrossLuofuFight(0),//跨服罗浮争锋
|
||||||
StoryFight(1), //故事副本
|
StoryFight(1), //故事副本(主线)
|
||||||
MapExploreFight(2), // 地图探索
|
MapExploreFight(2), // 地图探索
|
||||||
ArenaFight(3), //竞技场
|
ArenaFight(3), //竞技场
|
||||||
InvasionBossFight(4),//秘境boss
|
InvasionBossFight(4),//秘境boss
|
||||||
AdventureLock(5), // 解锁秘境
|
AdventureLock(5), // 解锁秘境
|
||||||
GuildFight(6), // 公会站
|
GuildFight(6), // 公会站
|
||||||
BloodyFight(7), // 血战
|
BloodyFight(7), // 血战
|
||||||
MonterFight(8), // 兽潮
|
MonterFight(8), // 兽潮(心魔试炼)
|
||||||
TOPFight(9), // 巅峰赛
|
TOPFight(9), // 巅峰赛
|
||||||
GuildBossFight(10), // 工会boss
|
GuildBossFight(10), // 工会boss
|
||||||
CarBossFight(11), // 车迟斗法挑战boss
|
CarBossFight(11), // 车迟斗法挑战boss
|
||||||
CarPersonFight(12), // 车迟斗法抢夺
|
CarPersonFight(12), // 车迟斗法抢夺
|
||||||
EXPEDITION(13), // 远征
|
EXPEDITION(13), // 远征(大闹天宫)
|
||||||
GuildChallenge(14), //公会副本
|
GuildChallenge(14), //公会副本
|
||||||
NewGeneral(15),//新将
|
NewGeneral(15),//新将
|
||||||
TenDespairArray(16),//十绝阵
|
TenDespairArray(16),//十绝阵
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class StartExpeditionBattleRequest extends BaseHandler<Expedition.StartEx
|
||||||
}
|
}
|
||||||
|
|
||||||
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
|
||||||
if (teamPosHeroInfos == null || teamPosHeroInfos.size() == 0) {
|
if (teamPosHeroInfos == null || teamPosHeroInfos.isEmpty()) {
|
||||||
throw new ErrorCodeException(ErrorCode.newDefineCode("阵容有误!!"));
|
throw new ErrorCodeException(ErrorCode.newDefineCode("阵容有误!!"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -108,13 +108,14 @@ public class StartExpeditionBattleRequest extends BaseHandler<Expedition.StartEx
|
||||||
|
|
||||||
|
|
||||||
FightInfoProto.FightStartResponse.Builder fightStartResponse = FightInfoProto.FightStartResponse.newBuilder();
|
FightInfoProto.FightStartResponse.Builder fightStartResponse = FightInfoProto.FightStartResponse.newBuilder();
|
||||||
|
int expeditionType = FightType.EXPEDITION.getType();
|
||||||
CommonProto.FightData fightData = CommonProto.FightData.newBuilder()
|
CommonProto.FightData fightData = CommonProto.FightData.newBuilder()
|
||||||
.setFightMaxTime(maxTime)
|
.setFightMaxTime(maxTime)
|
||||||
.setFightSeed(seed)
|
.setFightSeed(seed)
|
||||||
.setHeroFightInfos(fightTeamInfo)
|
.setHeroFightInfos(fightTeamInfo)
|
||||||
.addMonsterList(deffightTeamInfo)
|
.addMonsterList(deffightTeamInfo)
|
||||||
.setFightType(FightType.StoryFight.getType())
|
.setFightType(expeditionType)
|
||||||
.setFightId(FightUtil.getFightId(user.getId(), FightType.StoryFight.getType()))
|
.setFightId(FightUtil.getFightId(user.getId(), expeditionType))
|
||||||
.build();
|
.build();
|
||||||
fightStartResponse.setFightData(fightData);
|
fightStartResponse.setFightData(fightData);
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ import rpc.protocols.MessageTypeProto;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* 轩辕宝镜
|
||||||
* @author lvxinran
|
* @author lvxinran
|
||||||
* @date 2020/8/6
|
* @date 2020/8/6
|
||||||
* @discribe
|
* @discribe
|
||||||
|
|
|
@ -34,7 +34,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
*/
|
*/
|
||||||
public class MainLineOrInnerDemonFightHandler implements IFightEventProcesor {
|
public class MainLineOrInnerDemonFightHandler implements IFightEventProcesor {
|
||||||
|
|
||||||
private static final Logger LOGGER = LoggerFactory.getLogger(DuoduiTowerFightHandler.class);
|
private static final Logger LOGGER = LoggerFactory.getLogger(MainLineOrInnerDemonFightHandler.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public FightResult process(FightEvent fightEvent) throws Exception {
|
public FightResult process(FightEvent fightEvent) throws Exception {
|
||||||
|
|
Loading…
Reference in New Issue