From 257de4422f1932a6f5068844a427225d342abd14 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 24 Feb 2020 16:21:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E6=88=98=E7=BC=96=E9=98=9Fid=E5=8F=AF=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/core/GlobalsDef.java | 1 - .../handler/map/mapHandler/StartFightRequestHandler.java | 2 +- .../java/com/ljsd/jieling/logic/family/GuildFightLogic.java | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java index d2876ae45..f3c1bffa3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/GlobalsDef.java @@ -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; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/StartFightRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/StartFightRequestHandler.java index 4bd1f18de..24859165e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/StartFightRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/mapHandler/StartFightRequestHandler.java @@ -66,7 +66,7 @@ public class StartFightRequestHandler extends BaseHandler teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); if (teamPosHeroInfos == null || teamPosHeroInfos.size() == 0) { throw new ErrorCodeException(ErrorCode.newDefineCode("阵容有误!!")); From 85a1947791f86931ac24d8c7c7b58ea708a39f12 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 24 Feb 2020 17:14:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=85=85=E5=80=BC?= =?UTF-8?q?=E7=A4=BC=E5=8C=85=E6=94=B9=E4=B8=BA0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/GlobalDataManaager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index da6f50d9b..7bab033b1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -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){