From 1436f647ff5a650ced7e27215e294dd7740b001e Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Fri, 6 Mar 2020 23:16:13 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=AD=96=E5=88=92=E8=A1=A8=E6=8F=90?= =?UTF-8?q?=E9=94=99=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/config/SRewardItem.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tablemanager/src/main/java/config/SRewardItem.java b/tablemanager/src/main/java/config/SRewardItem.java index eaa784868..6377b038f 100644 --- a/tablemanager/src/main/java/config/SRewardItem.java +++ b/tablemanager/src/main/java/config/SRewardItem.java @@ -14,6 +14,9 @@ public class SRewardItem implements BaseConfig { private float growChance; //成长概率 针对特殊处理,如果不获取,则获取概率增加 private int randomMin; //获取数量最小值 private int randomMax; //获取数量最大值 + private int[] addition; + + private int[] chanceAddition; @Override public void init() throws Exception { @@ -48,4 +51,20 @@ public class SRewardItem implements BaseConfig { public int getRandomMax() { return randomMax; } + + public int[] getAddition() { + return addition; + } + + public void setAddition(int[] addition) { + this.addition = addition; + } + + public int[] getChanceAddition() { + return chanceAddition; + } + + public void setChanceAddition(int[] chanceAddition) { + this.chanceAddition = chanceAddition; + } } From 674d88210eb78406abfc8eafa65f7259ae6a1b6d Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Mon, 9 Mar 2020 11:02:06 +0800 Subject: [PATCH 2/8] =?UTF-8?q?cdk=E5=85=A8=E6=B8=A0=E9=81=93=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/core/ExchangeCdkHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java index 858705aaa..4d30d99b5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java @@ -68,10 +68,10 @@ public class ExchangeCdkHandler extends BaseHandler Date: Mon, 9 Mar 2020 11:31:28 +0800 Subject: [PATCH 3/8] =?UTF-8?q?cdk=E5=85=A8=E6=B8=A0=E9=81=93=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java index 4d30d99b5..836a684a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java @@ -68,7 +68,7 @@ public class ExchangeCdkHandler extends BaseHandler Date: Mon, 9 Mar 2020 12:39:30 +0800 Subject: [PATCH 4/8] =?UTF-8?q?cdk=E5=85=A8=E6=B8=A0=E9=81=93=E9=9C=80?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/kefu/Cmd_join_gm.java | 4 ++-- .../main/java/com/ljsd/jieling/thread/task/MinuteTask.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_join_gm.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_join_gm.java index c74a2e16c..481ae80cd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_join_gm.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_join_gm.java @@ -2,7 +2,7 @@ package com.ljsd.jieling.kefu; import com.ljsd.jieling.db.redis.RedisKey; import com.ljsd.jieling.db.redis.RedisUtil; - +import com.ljsd.jieling.hotfix.HotfixUtil; public class Cmd_join_gm extends GmAbstract { @Override public boolean exec(String[] args) throws Exception { @@ -11,7 +11,7 @@ public class Cmd_join_gm extends GmAbstract { // String key = RedisKey.getKey(RedisKey.FORCE_RANK, "", false); // RedisUtil.getInstence().zsetAddOne(key, String.valueOf(10000+i), 10000+i); // } - + HotfixUtil.getInstance(); return true; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java index f3703fcfd..c67f11b38 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java @@ -53,6 +53,7 @@ public class MinuteTask extends Thread { LOGGER.info("MinuteTask start..."); LOGGER.info("online use num::"+ OnlineUserManager.sessionMap.entrySet().size()); //TODO 每分钟逻辑通过监听事件处理 已经迁移活动和热更新 + HotfixUtil.getInstance(); Poster.getPoster().dispatchEvent(new MinuteTaskEvent()); MessageUtil.checkAndSendMsg(); From 0601a3d74624ef846fbd5dc49f308b9d92d12cbf Mon Sep 17 00:00:00 2001 From: wangyuan Date: Mon, 9 Mar 2020 17:07:53 +0800 Subject: [PATCH 5/8] =?UTF-8?q?'=E5=95=86=E5=93=81type=E6=94=B9=E6=88=90id?= =?UTF-8?q?'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index cc5bfaa3e..9cd2fedb4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -113,9 +113,10 @@ public class GetPlayerInfoHandler extends BaseHandler{ List goodsTypeDurations = new ArrayList<>(3); for(Map.Entry entry : goodsTypeDurationMap.entrySet()){ Integer goodsId = entry.getKey(); - SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId); Integer goodsEndTime = entry.getValue(); - goodsTypeDurations.add(CommonProto.GoodsTypeDuration.newBuilder().setGoodsType(sRechargeCommodityConfig.getType()).setEndTime(goodsEndTime).build()); +// SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId); + + goodsTypeDurations.add(CommonProto.GoodsTypeDuration.newBuilder().setGoodsType(goodsId).setEndTime(goodsEndTime).build()); } //问卷状态 int questState =-1; From ae294080a69ffa76f2494bdf7ca7cfff7730af16 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 12 Mar 2020 10:40:25 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=9C=E6=B5=B7=E5=AF=BB=E4=BB=99bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 91a0f9c4a..979226c65 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -189,16 +189,13 @@ public class HeroLogic{ } if(sLotterySetting.getLotteryType()==3){ //活动抽卡校验 - Object[] activityStatusByType = ActivityLogic.getInstance().getActivityStatusByType(user, sLotterySetting.getActivityId()); - if(activityStatusByType.length!=1){ + if(!user.getActivityManager().getActivityMissionMap().containsKey(sLotterySetting.getActivityId())){ throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); } - if(activityStatusByType[0] instanceof SGlobalActivity){ - SGlobalActivity activity = (SGlobalActivity)activityStatusByType[0]; - long endTimeLong = ToolsUtil.getEndTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), user.getPlayerInfoManager().getCreateTime(), activity.getGapTime()); - if(TimeUtils.now()>endTimeLong){ - throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); - } + SGlobalActivity activity = SGlobalActivity.getsGlobalActivityMap().get(sLotterySetting.getActivityId()); + long endTimeLong = ToolsUtil.getEndTimeLong(activity.getStartTimeLong(), activity.getEndTimeLong(), activity.getTime(), user.getPlayerInfoManager().getCreateTime(), activity.getGapTime()); + if(TimeUtils.now()>endTimeLong){ + throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); } } //筛选卡池 From 13b83b1050de33ca5695c68990db43c29958d691 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 10 Mar 2020 16:54:17 +0800 Subject: [PATCH 7/8] fix indication --- .../com/ljsd/jieling/thread/task/RetrySendIndicationThread.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java index 8ab6f4c4c..0187abeae 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java @@ -34,7 +34,7 @@ public class RetrySendIndicationThread extends Thread{ } private void doWork() throws InterruptedException { - Map sessionMap = OnlineUserManager.sessionMap; + Map sessionMap = new ConcurrentHashMap<>(OnlineUserManager.sessionMap); if(sessionMap == null){ return; } From c7a280108d7f44b07605d653b3ea7c8d0bdb0dd7 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 10 Mar 2020 16:56:21 +0800 Subject: [PATCH 8/8] fix indication --- .../ljsd/jieling/thread/task/RetrySendIndicationThread.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java index 0187abeae..882d575fb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RetrySendIndicationThread.java @@ -41,6 +41,9 @@ public class RetrySendIndicationThread extends Thread{ long now = TimeUtils.now(); Set removeIds = new HashSet<>(); for(ISession session : sessionMap.values()){ + if(session == null){ + continue; + } if(!session.getChannel().isClosed()&&session.getChannel().isConnected()){