From 155dfbd651921c850c8f9e8e0112b9c093b0a1de Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Tue, 26 Oct 2021 11:11:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A3=98=E6=B8=BA=E4=B9=8B=E6=97=85?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=9D=E5=AF=B9=E6=97=A5=E6=9C=9F=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E5=BC=80=E6=9C=8D=E4=B8=A4=E7=A7=8D=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/activity/MistyTripActivity.java | 5 +++++ 1 file changed, 5 insertions(+) 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); } From 1ed3adec43f962b99331ca4df4f7cbcf2135aa23 Mon Sep 17 00:00:00 2001 From: yuanshuai <243578945@qq.com> Date: Tue, 26 Oct 2021 15:11:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E6=96=97=E6=B3=95?= =?UTF-8?q?=E6=8A=A2=E5=A4=BA=E6=88=98=E6=96=97=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/fight/GameFightType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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), From e6ea0e54514db3cee1a556ad2d840006de3d3eb2 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Sat, 6 Nov 2021 01:17:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=9F=E5=B8=85=E8=B7=A8=E6=9C=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gtw/GetWorldArenaChallengeRequestHandler.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 {