From 1b059030536b4856c566bf336b642b1203cae5f0 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 9 Apr 2019 20:28:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=83=8C=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/handler/GameGM/GMRequestHandler.java | 15 ++++++++++++++- .../main/java/com/ljsd/jieling/util/ItemUtil.java | 5 +---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index cac84658e..32e4b58ef 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -121,9 +121,22 @@ public class GMRequestHandler extends BaseHandler{ case GlobalGm.ONE_KEY_ITEM_OR_HERO:{ //道具 Map sItemMap = SItem.getsItemMap(); - int[][] gmDrop = new int[sItemMap.size()][]; int i=0; + int length = 0; for(SItem sItem : sItemMap.values()){ + int ifopen = sItem.getIfopen(); + if(ifopen == 0){ + continue; + } + length++; + } + int[][] gmDrop = new int[length][]; + for(SItem sItem : sItemMap.values()){ + int ifopen = sItem.getIfopen(); + if(ifopen == 0){ + continue; + } + length++; int itemId = sItem.getId(); int itemType = sItem.getItemType(); int itemNum = 999; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java index 6624a8d12..d1e97abb5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1,9 +1,6 @@ package com.ljsd.jieling.util; -import com.ljsd.jieling.config.SEquipConfig; -import com.ljsd.jieling.config.SItem; -import com.ljsd.jieling.config.SRewardGroup; -import com.ljsd.jieling.config.SRewardItem; +import com.ljsd.jieling.config.*; import com.ljsd.jieling.globals.GlobalItemType; import com.ljsd.jieling.handler.map.MapManager; import com.ljsd.jieling.handler.map.TemporaryItems; From a17ef696d3cf17ebd355c8c26060c683ca009799 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 10 Apr 2019 10:19:02 +0800 Subject: [PATCH 2/4] fix --- serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java b/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java index 610063f9b..eb67df6c9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/SItem.java @@ -21,6 +21,7 @@ public class SItem implements BaseConfig { private boolean isopen; private int isSave; private int[] heroStar; + private int ifopen; @Override public void init() throws Exception { @@ -78,4 +79,8 @@ public class SItem implements BaseConfig { public int[] getHeroStar() { return heroStar; } + + public int getIfopen() { + return ifopen; + } } From 5fd58a3472e566f6da46b6240331d0c42156bc26 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 10 Apr 2019 15:59:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=95=B4=E7=82=B9=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/thread/ThreadManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java index bd2572cc4..12c1f973e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java @@ -59,12 +59,13 @@ public class ThreadManager { public void go() { - + long now = System.currentTimeMillis(); scheduledExecutor = new ScheduledThreadPoolExecutor(16, new ScheduleThreadFactory()); // testTask 已秒为单位 延迟10s, 间隔30s为周期执行 scheduledExecutor.scheduleAtFixedRate(platConfigureTask, 10, PlatConfigureTask.SLEEP_INTEVAL_TIME, TimeUnit.SECONDS); - scheduledExecutor.scheduleAtFixedRate(new MinuteJob(), 0, 60, TimeUnit.SECONDS); + long diff = now/1000 % 60 ; + scheduledExecutor.scheduleAtFixedRate(new MinuteJob(), 60 - diff, 60, TimeUnit.SECONDS); LOGGER.info("All Task running ..."); } From 1b02fb59354feb6fed06950b0d18273acc5cdda4 Mon Sep 17 00:00:00 2001 From: wangyuan Date: Wed, 10 Apr 2019 18:26:14 +0800 Subject: [PATCH 4/4] fix gm --- .../java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java index 73f4002e6..83956c2c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java @@ -58,6 +58,8 @@ public class GMRequestHandler extends BaseHandler{ prarm1 = Integer.parseInt(commandArray[1]); if (prarm1 ==1){ prarm3 = commandArray[2].replace(",","#"); + }else{ + prarm2 = Integer.parseInt(commandArray[2]); } } User cUser = UserManager.getUser(uid);