分支合并

duhui 2021-02-12 14:34:48 +08:00
parent d887ff2d90
commit 0633b9ae1c
5 changed files with 7 additions and 9 deletions

View File

@ -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;
/***
*

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -738,8 +738,9 @@ public class PlayerLogic {
for (STestWelfare sTestWelfare : sTestWelfareMap.values()) {
Set<Integer> 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) {