diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java index c460e8f48..5540d6791 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/gtw/GetWorldArenaChallengeRequestHandler.java @@ -22,6 +22,7 @@ import com.ljsd.jieling.logic.dao.CrossArenaEnemy; import com.ljsd.jieling.logic.dao.ServerConfig; import com.ljsd.jieling.logic.dao.TimeControllerOfFunction; import com.ljsd.jieling.logic.dao.UserManager; +import com.ljsd.jieling.logic.dao.cross.CSPlayer; import com.ljsd.jieling.logic.dao.gm.ArenaOfUser; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.fight.FightUtil; @@ -34,6 +35,7 @@ import com.ljsd.jieling.logic.rank.rankImpl.AbstractRank; import com.ljsd.jieling.network.server.GlobalidHelper; import com.ljsd.jieling.network.server.WorldHelper; import com.ljsd.jieling.network.session.ISession; +import com.ljsd.jieling.thrift.idl.CrossArenaManager; import com.ljsd.jieling.util.*; import config.SArenaRobotConfig; import config.SArenaSetting; @@ -159,8 +161,11 @@ public class GetWorldArenaChallengeRequestHandler extends BaseHandler1000) { ArenaOfUser arenaOfUser = CrossServiceLogic.getInstance().query(proto.getChallengeUid()); - defendForce = arenaOfUser.getHeroManager().getTotalForceByTeam().get(proto.getTeamId()); - teamInfo = FightUtil.makeCrossPersonData(arenaOfUser,proto.getTeamId(),defendForce); + //defendForce = arenaOfUser.getHeroManager().getTotalForceByTeam().get(proto.getTeamId()); + //teamInfo = FightUtil.makeCrossPersonData(arenaOfUser,proto.getTeamId(),defendForce); + CSPlayer csPlayer = CrossServiceLogic.getPlayerByRedis(user.getId()); + CrossArenaManager crossArenaManager = PlayerLogic.getInstance().getCrossArenaManagerData(csPlayer); + teamInfo = FightUtil.makeCrossPersonData(csPlayer, proto.getTeamId(), null, crossArenaManager); arenaEnemys =ArenaLogic.getInstance().getUserCrossArenaEnemy(crossGroup,arenaOfUser,proto.getChallengeRank(),false).build(); } else { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MistyTripActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MistyTripActivity.java index d00f7a1a1..debec50ad 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MistyTripActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/MistyTripActivity.java @@ -1,5 +1,6 @@ package com.ljsd.jieling.logic.activity; +import com.ljsd.GameApplication; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.jbean.ActivityProgressInfo; @@ -68,6 +69,10 @@ public class MistyTripActivity extends AbstractActivity { } @Override public void initActivity(User user) throws Exception { + boolean open = SGlobalActivity.checkActivityIfOpen(id, user.getPlayerInfoManager().getCreateTime(), GameApplication.serverConfig.getCacheOpenTime()); + if (!open){ + return; + } //初始化所有事件 主线关卡 心魔试炼 山河社稷 大闹天宫 最高战力 user.getUserMissionManager().onGameEvent(user, GameEvent.MISTY_TRIP_REFRESH); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java index 8538de850..1fa6f6047 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java @@ -43,7 +43,7 @@ public enum GameFightType { DeathPathChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null), CarBossChallenge(FightType.CarBossFight,new DefaultWithoutHandFightHandler(),null), - CarPersonChallenge(FightType.CarBossFight,new PVPFightHandler(),null), + CarPersonChallenge(FightType.CarPersonFight,new PVPFightHandler(),null), GuildChallenge(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null), NewGeneral(FightType.GuildChallenge,new DefaultWithoutHandFightHandler(),null), TowerMap(FightType.TowerMap,new DefaultWithoutHandFightHandler(),null),