From 692e3858c80a6b78a9b97ae16a4c0b16226e89c3 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 3 Nov 2021 16:33:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=8C=85bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/SevenWorldActivity.java | 2 ++ .../logic/sevenworld/SevenWorldLogic.java | 5 ----- .../bean/ReceiveWelfareBag.java | 20 ++++++++++--------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java index a338fff80..d2fea53f7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/SevenWorldActivity.java @@ -67,6 +67,8 @@ public class SevenWorldActivity extends AbstractActivity { ActivityProgressInfo info = new ActivityProgressInfo(); info.setState(1); mission.getActivityMissionMap().put(-1, info); + // 状态推送 + sendActivityProgress(user, mission, null); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java index a341a71b4..493bc7e11 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/sevenworld/SevenWorldLogic.java @@ -2,9 +2,7 @@ package com.ljsd.jieling.logic.sevenworld; import com.ljsd.GameApplication; import com.ljsd.jieling.core.FunctionIdEnum; -import com.ljsd.jieling.core.GlobalsDef; import com.ljsd.jieling.core.HandlerLogicThread; -import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; @@ -14,8 +12,6 @@ import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; import com.ljsd.jieling.logic.GlobleSystemLogic; import com.ljsd.jieling.logic.activity.crossService.CrossServiceLogic; -import com.ljsd.jieling.logic.activity.event.Poster; -import com.ljsd.jieling.logic.activity.event.SevenWorldIntegralEvent; import com.ljsd.jieling.logic.dao.Hero; import com.ljsd.jieling.logic.dao.TeamEnum; import com.ljsd.jieling.logic.dao.TeamPosHeroInfo; @@ -44,7 +40,6 @@ import org.springframework.stereotype.Component; import rpc.protocols.CommonProto; import rpc.protocols.MessageTypeProto; import rpc.protocols.PlayerInfoProto; -import util.MathUtils; import util.StringUtil; import util.TimeUtils; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java index 2550cec48..ef43567ef 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/ReceiveWelfareBag.java @@ -62,17 +62,19 @@ public class ReceiveWelfareBag extends AbstractWelfareBag { if(bought){ LOGGER.error("礼包:{}已经购买",getModId()); return false; + }else { + setBought(true); + setStartTime(TimeUtils.getTodayZero()); + if(getDailyUpdate()>0){ + setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY); + } + if(getEndTime()!=0){ + setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY); + } + return true; } } - setBought(true); - setStartTime(TimeUtils.getTodayZero()); - if(getDailyUpdate()>0){ - setRefreshTime(getStartTime() + getDailyUpdate() * TimeUtils.DAY); - } - if(getEndTime()!=0){ - setEndTime(TimeUtils.getTodayZero() + getContinueDays() * TimeUtils.DAY); - } - return true; + return false; } @Override