From de8524d70ab84d2244e4fa67fdfd8601a4edd450 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 19 Sep 2020 08:14:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=BF=AE=E6=94=B9=E5=B7=A5?= =?UTF-8?q?=E4=BC=9A=E5=89=AF=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/GlobalDataManaager.java | 2 +- .../jieling/logic/family/GuildChallengeLogic.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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 0c6fd88e2..9bf988773 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -335,7 +335,7 @@ public class GlobalDataManaager implements IManager { FriendLogic.getInstance().refreshState(session); PlayerLogic.getInstance().sendTimingMail(user); user.getGuildMyInfo().setLastHurt(0); - GuildChallengeLogic.getInstance().resetBossDamage(user); +// GuildChallengeLogic.getInstance().resetBossDamage(user); if(TimeUtils.isSpanTime(user.getPlayerInfoManager().getLoginTime(),TimeUtils.now(),1,5)){ user.getPlayerInfoManager().updateSituationPass(new HashMap<>()); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index da6d07f47..58fa2fcd6 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -446,11 +446,11 @@ public class GuildChallengeLogic { } } - public void resetBossDamage(User user){ - if(user.getPlayerInfoManager().getGuildId()!=0){ - user.getGuildMyInfo().setGuildChallengeDamage(0); - } - MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1, MessageTypeProto.MessageType.GUILD_CHALLENGE_FIVE_INDICATION_VALUE,null,true); - } +// public void resetBossDamage(User user){ +// if(user.getPlayerInfoManager().getGuildId()!=0){ +// user.getGuildMyInfo().setGuildChallengeDamage(0); +// } +// MessageUtil.sendIndicationMessage(OnlineUserManager.getSessionByUid(user.getId()),1, MessageTypeProto.MessageType.GUILD_CHALLENGE_FIVE_INDICATION_VALUE,null,true); +// } }