back_recharge
parent
60bd86264b
commit
eac6670f19
|
@ -129,9 +129,10 @@ public class GlobalDataManaager {
|
||||||
|
|
||||||
public void openAction(List<Integer> ids){
|
public void openAction(List<Integer> ids){
|
||||||
for(Integer openId : ids){
|
for(Integer openId : ids){
|
||||||
|
FunctionIdEnum type = FunctionIdEnum.getFunctionIdEnumById(openId);
|
||||||
TimeControllerOfFunction timeControllerOfFunction = openTimeOfFuntionCache.get(openId);
|
TimeControllerOfFunction timeControllerOfFunction = openTimeOfFuntionCache.get(openId);
|
||||||
switch (openId){
|
switch (type){
|
||||||
case 8:
|
case Arena:
|
||||||
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
|
ArenaLogic.getInstance().updateArenaSeason(timeControllerOfFunction.getTimes());
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -139,28 +139,12 @@ public class ArenaLogic {
|
||||||
}
|
}
|
||||||
int uid = session.getUid();
|
int uid = session.getUid();
|
||||||
User user = UserManager.getUser(uid);
|
User user = UserManager.getUser(uid);
|
||||||
if(skipFight == 0){
|
|
||||||
boolean allowed = user.getPlayerInfoManager().checkFunctionIsAllowed(VipPrivilegeType.UNLOCK_SKIP_FIGHT);
|
|
||||||
if(!allowed){
|
|
||||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,"not allowed");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
String err = checkChallenge(user);
|
|
||||||
if(!"".equals(err)){
|
|
||||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,err);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ArenaManager arenaManager = user.getArenaManager();
|
ArenaManager arenaManager = user.getArenaManager();
|
||||||
List<ArenaEnemy> arenaEnemies = arenaManager.getArenaEnemies();
|
List<ArenaEnemy> arenaEnemies = arenaManager.getArenaEnemies();
|
||||||
ArenaEnemy enemyInfo = getEnemyInList(challengeUid, arenaEnemies);
|
ArenaEnemy enemyInfo = getEnemyInList(challengeUid, arenaEnemies);
|
||||||
if( null == enemyInfo ){
|
String err = checkChallenge(user,skipFight,enemyInfo );
|
||||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,"对手错误");
|
if(!"".equals(err)){
|
||||||
return;
|
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,err);
|
||||||
}
|
|
||||||
if(!user.getTeamPosManager().getTeamPosForHero().containsKey(GlobalsDef.TEAM_ARENA_DEFENSE)){
|
|
||||||
MessageUtil.sendErrorResponse(session,0, MessageTypeProto.MessageType.ARENA_CHALLENGE_RESPONSE_VALUE,"未设置防守阵容");
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
int fightResult=0;
|
int fightResult=0;
|
||||||
|
@ -279,7 +263,19 @@ public class ArenaLogic {
|
||||||
return checkResult[0];
|
return checkResult[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
private String checkChallenge(User user) throws Exception {
|
private String checkChallenge(User user,int skipFight, ArenaEnemy enemyInfo) throws Exception {
|
||||||
|
if( null == enemyInfo ){
|
||||||
|
return "对手错误";
|
||||||
|
}
|
||||||
|
if(skipFight == 0){
|
||||||
|
boolean allowed = user.getPlayerInfoManager().checkFunctionIsAllowed(VipPrivilegeType.UNLOCK_SKIP_FIGHT);
|
||||||
|
if(!allowed){
|
||||||
|
return "not allowed";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(!user.getTeamPosManager().getTeamPosForHero().containsKey(GlobalsDef.TEAM_ARENA_DEFENSE)){
|
||||||
|
return "未设置防守阵容";
|
||||||
|
}
|
||||||
ArenaManager arenaManager = user.getArenaManager();
|
ArenaManager arenaManager = user.getArenaManager();
|
||||||
SArenaSetting sArenaSetting = SArenaSetting.getSArenaSetting();
|
SArenaSetting sArenaSetting = SArenaSetting.getSArenaSetting();
|
||||||
int useFreeTimes = arenaManager.getUseFreeTimes();
|
int useFreeTimes = arenaManager.getUseFreeTimes();
|
||||||
|
|
Loading…
Reference in New Issue