代码回滚
parent
c8722e9047
commit
62d5f5af73
|
@ -524,17 +524,6 @@ public class HeroLogic{
|
||||||
User user = UserManager.getUser(iSession.getUid());
|
User user = UserManager.getUser(iSession.getUid());
|
||||||
HeroManager heroManager = user.getHeroManager();
|
HeroManager heroManager = user.getHeroManager();
|
||||||
Set<Integer> set = new HashSet<>();
|
Set<Integer> set = new HashSet<>();
|
||||||
if(teamId==GlobalsDef.TRIAL_TEAM&&heroIds.size()!=1){
|
|
||||||
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(set.size()!=heroIds.size()){
|
|
||||||
throw new ErrorCodeException(ErrorCode.NO_USE_SAME_HERO);
|
|
||||||
}
|
|
||||||
String err = checkTeamPos(user, teamId,heroIds,pokemonoIds);
|
|
||||||
if(!"".equals(err)){
|
|
||||||
throw new ErrorCodeException(ErrorCode.newDefineCode(err));
|
|
||||||
}
|
|
||||||
if(teamId==GlobalsDef.EXPEDITION_TEAM){
|
if(teamId==GlobalsDef.EXPEDITION_TEAM){
|
||||||
|
|
||||||
heroIds.forEach(heroId->{
|
heroIds.forEach(heroId->{
|
||||||
|
@ -549,7 +538,17 @@ public class HeroLogic{
|
||||||
}else {
|
}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()){
|
||||||
|
throw new ErrorCodeException(ErrorCode.NO_USE_SAME_HERO);
|
||||||
|
}
|
||||||
|
String err = checkTeamPos(user, teamId,heroIds,pokemonoIds);
|
||||||
|
if(!"".equals(err)){
|
||||||
|
throw new ErrorCodeException(ErrorCode.newDefineCode(err));
|
||||||
|
}
|
||||||
user.getTeamPosManager().changeTeamInfo(teamId,heroIds,pokemonoIds);
|
user.getTeamPosManager().changeTeamInfo(teamId,heroIds,pokemonoIds);
|
||||||
//401图内可以更改编队
|
//401图内可以更改编队
|
||||||
if(teamId == GlobalsDef.ENDLESS_TEAM){
|
if(teamId == GlobalsDef.ENDLESS_TEAM){
|
||||||
|
@ -2421,7 +2420,9 @@ public class HeroLogic{
|
||||||
resultDrop[index] = new int[]{entry.getKey(),entry.getValue()};
|
resultDrop[index] = new int[]{entry.getKey(),entry.getValue()};
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
return ItemUtil.drop(user, resultDrop, reason);
|
|
||||||
|
CommonProto.Drop.Builder drop = ItemUtil.drop(user, resultDrop, reason);
|
||||||
|
return drop;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue