修改森罗环境卡牌被分解不能战斗
parent
612a407006
commit
d37d1176ed
|
@ -216,7 +216,7 @@ public class FightUtil {
|
||||||
* 获取FightUnitInfo
|
* 获取FightUnitInfo
|
||||||
*/
|
*/
|
||||||
public static CommonProto.FightTeamInfo getFightTeamInfo(User user, int teamId) {
|
public static CommonProto.FightTeamInfo getFightTeamInfo(User user, int teamId) {
|
||||||
//无尽副本使用镜像来战斗
|
//森罗幻境使用镜像来战斗
|
||||||
if(teamId!= GlobalsDef.TRIAL_TEAM){
|
if(teamId!= GlobalsDef.TRIAL_TEAM){
|
||||||
return BehaviorUtil.getFightTeamInfo(user,teamId,true);
|
return BehaviorUtil.getFightTeamInfo(user,teamId,true);
|
||||||
}
|
}
|
||||||
|
|
|
@ -595,12 +595,14 @@ public class HeroLogic{
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}else {
|
}else if(teamId==GlobalsDef.TRIAL_TEAM){
|
||||||
|
if(heroIds.size()!=1){
|
||||||
|
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
||||||
|
}
|
||||||
|
heroIds.forEach(heroId->set.add(user.getMapManager().getTrialInfo().getHeroInfo().get(heroId.getHeroId()).getTmpId()));
|
||||||
|
} else {
|
||||||
heroIds.forEach(heroId->set.add(heroManager.getHero(heroId.getHeroId()).getTemplateId()));
|
heroIds.forEach(heroId->set.add(heroManager.getHero(heroId.getHeroId()).getTemplateId()));
|
||||||
}
|
}
|
||||||
if(teamId==GlobalsDef.TRIAL_TEAM&&heroIds.size()!=1){
|
|
||||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(set.size()!=heroIds.size()){
|
if(set.size()!=heroIds.size()){
|
||||||
throw new ErrorCodeException(ErrorCode.NO_USE_SAME_HERO);
|
throw new ErrorCodeException(ErrorCode.NO_USE_SAME_HERO);
|
||||||
|
@ -677,7 +679,11 @@ public class HeroLogic{
|
||||||
// 卡牌不存在
|
// 卡牌不存在
|
||||||
return "card not exists";
|
return "card not exists";
|
||||||
}
|
}
|
||||||
}else {
|
}if(teamId==GlobalsDef.TRIAL_TEAM){
|
||||||
|
if(!user.getMapManager().getTrialInfo().getHeroInfo().containsKey(heroId)){
|
||||||
|
return "card not exists";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
if(user.getHeroManager().getHero(heroId) == null) {
|
if(user.getHeroManager().getHero(heroId) == null) {
|
||||||
// 卡牌不存在
|
// 卡牌不存在
|
||||||
return "card not exists";
|
return "card not exists";
|
||||||
|
|
Loading…
Reference in New Issue