back_recharge
zhangshanxue 2020-02-24 18:06:02 +08:00
commit 9ee9d9f2e8
4 changed files with 6 additions and 5 deletions

View File

@ -86,7 +86,6 @@ public interface GlobalsDef {
int TEAM_ARENA_ATTACH =201;//竞技场进攻编队
int BLOODY_TEAM =701; //血战队伍
int CHAMPION_ATTACK_TEAM =801; //
int GUILD_BOSS_TEAM =901; //工会boss队伍
//特权解锁类型
int LEVEL_UNLOCK_PRIVILEGE = 1;

View File

@ -66,7 +66,7 @@ public class StartFightRequestHandler extends BaseHandler<FightInfoProto.FightSt
}else if(type == 6){
MapLogic.getInstance().startMainLevelFight(iSession,fightId,teamId, MessageTypeProto.MessageType.FIGHT_START_RESPONSE);
} else if(type == 7){
GuildFightLogic.startBossFight(iSession, MessageTypeProto.MessageType.FIGHT_START_RESPONSE);
GuildFightLogic.startBossFight(iSession, teamId,MessageTypeProto.MessageType.FIGHT_START_RESPONSE);
}else {
throw new ErrorCodeException(ErrorCode.newDefineCode("type is wrong:" + type));
}

View File

@ -322,7 +322,6 @@ public class GlobalDataManaager implements IManager {
user.getUserMissionManager().onGameEvent(user, GameEvent.DAILY_REFRESH,0);
user.getUserMissionManager().onGameEvent(user, GameEvent.BLOODY_REFRESH,0);
FriendLogic.getInstance().refreshState(session);
flushGoodsTimes(user);
PlayerLogic.getInstance().sendTimingMail(user);
user.getGuildMyInfo().setLastHurt(0);
@ -345,6 +344,10 @@ public class GlobalDataManaager implements IManager {
user.getPlayerInfoManager().setIsdayFirst(0);
}
}
if (TimeUtils.isOverTime(0,user.getPlayerInfoManager().getLoginTime())) {
flushGoodsTimes(user);
}
}
public static void flushGoodsTimes(User user){

View File

@ -1046,13 +1046,12 @@ public class GuildFightLogic {
}
public static void startBossFight(ISession session, MessageTypeProto.MessageType messageType) throws Exception {
public static void startBossFight(ISession session,int teamId, MessageTypeProto.MessageType messageType) throws Exception {
if(curSGuildBossConfig == null){
throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE);
}
int uid = session.getUid();
User user = UserManager.getUser(uid);
int teamId = GlobalsDef.GUILD_BOSS_TEAM;
List<TeamPosHeroInfo> teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId);
if (teamPosHeroInfos == null || teamPosHeroInfos.size() == 0) {
throw new ErrorCodeException(ErrorCode.newDefineCode("阵容有误!!"));