From 0633b9ae1cdfdd2956e47009cab06316770e04bf Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 12 Feb 2021 14:34:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=94=AF=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/handler/activity/UpgradeGodTreeHandler.java | 4 ++-- .../jieling/handler/fourChallenge/FourChallengeDoHandler.java | 4 ++-- .../handler/fourChallenge/FourChallengeGetInfoHandler.java | 3 +-- .../src/main/java/com/ljsd/jieling/kefu/Cmd_fixequip.java | 2 -- .../main/java/com/ljsd/jieling/logic/player/PlayerLogic.java | 3 ++- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/UpgradeGodTreeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/UpgradeGodTreeHandler.java index 0154f99c9..edd16032a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/UpgradeGodTreeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/UpgradeGodTreeHandler.java @@ -10,12 +10,12 @@ import com.ljsd.jieling.logic.activity.event.UserMainTeamForceEvent; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.item.ItemLogic; -import com.ljsd.jieling.protocols.ActivityProto; -import com.ljsd.jieling.protocols.MessageTypeProto; import com.ljsd.jieling.util.ItemUtil; import config.SGodHoodTreeLevel; import manager.STableManager; import org.springframework.stereotype.Component; +import rpc.protocols.ActivityProto; +import rpc.protocols.MessageTypeProto; /*** * 升级建木神树 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeDoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeDoHandler.java index d6e5c6e3e..93cc63876 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeDoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeDoHandler.java @@ -3,9 +3,9 @@ package com.ljsd.jieling.handler.fourChallenge; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.network.session.ISession; -import com.ljsd.jieling.protocols.MessageTypeProto; -import com.ljsd.jieling.protocols.PlayerInfoProto; import org.springframework.stereotype.Component; +import rpc.protocols.MessageTypeProto; +import rpc.protocols.PlayerInfoProto; /** * @author lvxinran diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeGetInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeGetInfoHandler.java index 41e76f6bc..1c95190ae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeGetInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/fourChallenge/FourChallengeGetInfoHandler.java @@ -1,12 +1,11 @@ package com.ljsd.jieling.handler.fourChallenge; -import com.google.protobuf.GeneratedMessage; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.activity.fourChallenge.FourChallengeLogic; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.network.session.ISession; -import com.ljsd.jieling.protocols.MessageTypeProto; import org.springframework.stereotype.Component; +import rpc.protocols.MessageTypeProto; /** * @author lvxinran diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_fixequip.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_fixequip.java index 130bd6e55..a95fe88a3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_fixequip.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_fixequip.java @@ -1,7 +1,6 @@ package com.ljsd.jieling.kefu; import com.ljsd.jieling.db.mongo.MongoUtil; -import com.ljsd.jieling.logic.dao.Equip; import com.ljsd.jieling.logic.dao.PropertyItem; import com.ljsd.jieling.logic.dao.root.User; @@ -9,7 +8,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Stream; public class Cmd_fixequip extends GmAbstract{ @Override diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index bd3fa9d97..31a456b04 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -738,8 +738,9 @@ public class PlayerLogic { for (STestWelfare sTestWelfare : sTestWelfareMap.values()) { Set timingMailIds = user.getPlayerInfoManager().getSysMailIds(); - if (timingMailIds.contains(sTestWelfare.getId())) + if (timingMailIds.contains(sTestWelfare.getId())) { continue; + } long startTime = ToolsUtil.getTimeLong(sTestWelfare.getStartTimeLong(),sTestWelfare.getEndTimeLong(),sTestWelfare.getTime(), 0, 1); long endTime = ToolsUtil.getTimeLong(sTestWelfare.getStartTimeLong(),sTestWelfare.getEndTimeLong(),sTestWelfare.getTime(), 0, 2); if (now < startTime) {