From 2b2ce7ea7f13d0b815d5cc091b3b6f3c1a608cb3 Mon Sep 17 00:00:00 2001 From: duhui Date: Wed, 30 Jun 2021 13:39:07 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=83=AD=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index 4ea8b4caa..cf5980860 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -128,6 +128,7 @@ public abstract class AbstractRank implements IRank { } protected void getOptional(int index,ZSetOperations.TypedTuple data,PlayerInfoProto.RankResponse.Builder builder) throws Exception { + LOGGER.info("获取排行榜信息===================玩家id:{}"+data.getValue()); User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); if (everyUser == null){ return; From 2991256a9c57c6b25667443ffc5438de2c0c2e49 Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Wed, 30 Jun 2021 19:10:17 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E9=A6=96=E5=86=B23=E5=A4=A9=20->=207?= =?UTF-8?q?=E5=A4=A9=20=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/activity/ActivityLogic.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 0cad7184c..cfc927f71 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -336,6 +336,30 @@ public class ActivityLogic implements IEventHandler{ } ActivityMission activityMission = activityManager.getActivityMissionMap().get(openActivityId); if (activityMission != null) { + if(openActivityId == ActivityType.RechargeTotal){ + //首冲3天 -> 7天 容错 + int chargeMoneyCount = 0; + List sActivityRewardConfigs = SActivityRewardConfig.getsActivityRewardConfigByActivityId(openActivityId); + if(sActivityRewardConfigs.size() != activityMission.getActivityMissionMap().size()){ + for(ActivityProgressInfo progressInfo:activityMission.getActivityMissionMap().values()){ + if(chargeMoneyCount != progressInfo.getProgrss()){ + chargeMoneyCount = progressInfo.getProgrss(); + } + } + } + for (SActivityRewardConfig Config:sActivityRewardConfigs) { + if(!activityMission.getActivityMissionMap().containsKey(Config.getId())){ + if(activityMission.getActivityState()==2){ + activityMission.setActivityState(1); + } + ActivityProgressInfo activityProgressInfo = new ActivityProgressInfo(); + activityProgressInfo.setProgrss(ActivityLogic.getInstance().getInitActivityMissionProgress(openActivityId)); + activityProgressInfo.setState(0); + activityProgressInfo.setProgrss(chargeMoneyCount); + activityMission.getActivityMissionMap().put(Config.getId(), activityProgressInfo); + } + } + } continue; } From 9e048deffea5e1369ada143c87605c257fe18a96 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 2 Jul 2021 10:33:15 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E5=B7=85=E5=B3=B0=E8=B5=9B=E5=88=86?= =?UTF-8?q?=E7=BB=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/championship/ChampionshipLogic.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java index fc8545527..648689d1d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/championship/ChampionshipLogic.java @@ -311,7 +311,8 @@ public class ChampionshipLogic { //获取竞技场排行榜 Set> arenaRankInfo = new HashSet<>(championshipPlayer); - Set> arenaRankInfoOne = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.ARENA_RANK, Integer.toString(curSeason), 0, championshipPlayer); + //start-end为0 127 才能拿到第128 不然会多拿到129 + Set> arenaRankInfoOne = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.ARENA_RANK, Integer.toString(curSeason), 0, championshipPlayer-1); if (arenaRankInfoOne != null && !arenaRankInfoOne.isEmpty()) { arenaRankInfo.addAll(arenaRankInfoOne); } From e9ec657bf7bf2d28bf07a74325985059f2005966 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 2 Jul 2021 13:58:00 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AF=BB=E6=89=BE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index a186b44c2..3686cc8dd 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -76,6 +76,7 @@ public class FriendLogic { List friends = friendManager.getFriends(); List friendList = new CopyOnWriteArrayList<>(); for (Integer friendId :friends){ + LOGGER.info("有问题的Uid:{}",friendId); CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); friendList.add(friend); } From 8b5ffb581a2b9fb65034e859272d46892b39af4f Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 2 Jul 2021 14:15:10 +0800 Subject: [PATCH 05/18] =?UTF-8?q?family=E6=9C=89=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9A=84log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 680a105b5..c3a2c7772 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -429,6 +429,7 @@ public class GuildLogic { Integer position = memberEntry.getKey(); Set value = memberEntry.getValue(); for(Integer uidTmp : value){ + LOGGER.info("family有问题的uid:{}",uidTmp); User userTmp = UserManager.getUser(uidTmp); builder.addFamilyUserInfo(CBean2Proto.getFamilyUserInfo(userTmp,position)); } From d67a15b22c7422948c766d6e1109faa4d5da600c Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 3 Jul 2021 11:28:34 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E6=97=A5=E5=BF=97=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/rank/rankImpl/AbstractRank.java | 1 + 1 file changed, 1 insertion(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index cf5980860..35ed53fce 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -103,6 +103,7 @@ public abstract class AbstractRank implements IRank { return builder; } ZSetOperations.TypedTuple data = rankByKey.iterator().next(); + LOGGER.info("有问题的ArenaId{}",Integer.parseInt(data.getValue())); User everyUser = UserManager.getUser(Integer.parseInt(data.getValue()), true); if (everyUser == null){ return builder; From f22e88f3277041c8335eec044134429c6c8e1afc Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 5 Jul 2021 11:08:54 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=85=85=E5=80=BCbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/thread/ThreadManager.java | 3 +++ .../main/java/com/ljsd/jieling/thread/task/RPCServerTask.java | 2 ++ 2 files changed, 5 insertions(+) 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 9ac0f2560..918d5fe8c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java @@ -157,4 +157,7 @@ public class ThreadManager implements IManager { executor.execute(task); } + public static ThreadPoolExecutor getExecutor() { + return executor; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java index 1670c0755..3e7a0d5cb 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/RPCServerTask.java @@ -4,6 +4,7 @@ import com.google.gson.Gson; import com.ljsd.CoreService; import com.ljsd.GameApplication; import com.ljsd.jieling.config.json.CoreSettings; +import com.ljsd.jieling.thread.ThreadManager; import com.ljsd.jieling.thrift.idl.RPCRequestIFace; import com.ljsd.jieling.util.ConfigurableApplicationContextManager; import org.apache.thrift.TProcessor; @@ -43,6 +44,7 @@ public class RPCServerTask extends Thread{ TBinaryProtocol.Factory proFactory = new TBinaryProtocol.Factory(true, true); trArgs.protocolFactory(proFactory); trArgs.maxWorkerThreads(16); + trArgs.executorService(ThreadManager.getExecutor()); LOGGER.info("run->RPC services is starting."); final TServer server = new TThreadPoolServer(trArgs); while (true) { From 9162b2928c2cf8ef7a8a1146d508f3378ae6b8c7 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 5 Jul 2021 11:09:07 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java index c9336921e..693193852 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/HandlerLogicThread.java @@ -110,10 +110,12 @@ public class HandlerLogicThread extends Thread{ try { AyyncWorker ayyncWorker =null; boolean hasAsyncWorker =false; + //这里检查是否有需要执行的其他线程给过来的任务 while ( (ayyncWorker = ayyncWorkerConcurrentLinkedQueue.poll())!=null){ hasAsyncWorker=true; ayyncWorker.work(ayyncWorker.getUser()); } + //这里判断是否有新的请求进来 PacketNetData packetNetData = handlerLinkedQueue.poll(); if(packetNetData == null){ if(hasAsyncWorker){ From 1ed8030f329eaee9e1fe6a86aa53df09fe1d8715 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 5 Jul 2021 11:26:24 +0800 Subject: [PATCH 09/18] =?UTF-8?q?Revert=20"=E6=8E=A8=E9=80=81=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E4=BC=98=E5=8C=96"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7ed896b78cc667ca72c3e4e43440f216ac22664d. --- .../jieling/logic/store/BuyGoodsNewLogic.java | 47 ++++++++++--------- .../newRechargeInfo/NewRechargeInfo.java | 5 ++ .../bean/AbstractWelfareBag.java | 3 -- .../newRechargeInfo/bean/PushWelfareBag.java | 12 +---- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index fe1fb2293..2249b8cf9 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -460,6 +460,10 @@ public class BuyGoodsNewLogic { result = true; } }else{ + if(bag.getType() == RechargeType.push.getType() && !bag.isOpen()){ + user.getPlayerInfoManager().getNewRechargeInfo().removePush((PushWelfareBag) bag); + return true; + } if(bag.getType() == RechargeType.timeLimit.getType()){ //活动类型特殊处理 for(String[] s : configById.getCondition()){ @@ -539,15 +543,6 @@ public class BuyGoodsNewLogic { return bag; } - /** - * setPush礼包初始化数据 - */ - public static void setInitPushInfo(PushWelfareBag bag,SRechargeCommodityNewConfig config){ - bag.setStartTime(System.currentTimeMillis()); - bag.setEndTime(System.currentTimeMillis() + bag.getTime() * TimeUtils.HOUR); - bag.setOpen(true); - } - /** * 礼包到时处理 */ @@ -556,7 +551,7 @@ public class BuyGoodsNewLogic { bag.setLastBuyTime(0); bag.setBuyTimes(0); if(bag.getType() == RechargeType.push.getType()){ - clearPushBag((PushWelfareBag) bag); + user.getPlayerInfoManager().getNewRechargeInfo().removePush((PushWelfareBag) bag); } } @@ -886,26 +881,36 @@ public class BuyGoodsNewLogic { }else{ info.getTempLimitMap().put(bagId,num); } - SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(bagId); - if(info.getPushMap().get(bagId) != null){ + if(isFiveStarBag(bagId) && info.getPushMap().get(bagId) != null){ AbstractWelfareBag bag = info.getPushMap().get(bagId); - setInitPushInfo((PushWelfareBag) bag,config); - if(isFiveStarBag(bagId)){ - bag.setLimit((bag.getLimit()+num)>info.FIVESTARLIMIT?info.FIVESTARLIMIT:(bag.getLimit()+num)); - } + bag.setLimit((bag.getLimit()+num)>info.FIVESTARLIMIT?info.FIVESTARLIMIT:(bag.getLimit()+num)); + bag.setStartTime(System.currentTimeMillis()); + bag.setEndTime(bag.getStartTime() + getTime(bag) * TimeUtils.HOUR); }else{ + SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(bagId); AbstractWelfareBag bag = initUnitWF(user,config); - if(isFiveStarBag(bagId)){ - bag.setLimit(num>info.FIVESTARLIMIT?info.FIVESTARLIMIT:num); + if(num != 0 && num+hasOpen > info.FIVESTARLIMIT){ + bag.setLimit(info.FIVESTARLIMIT-hasOpen); + }else{ + bag.setLimit(num); } } return true; } /** - * 消除推送礼包 + * 推送礼包的结束时间 + * @param bag + * @return */ - private static void clearPushBag(PushWelfareBag bag){ - bag.clear(); + private static int getTime(AbstractWelfareBag bag){ + int i = 2; + for(String[] s : bag.getCondition()){ + if(s[0].equals("6")){ + i = Integer.parseInt(s[1]); + break; + } + } + return i; } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java index 9cad636b9..7b62d31bf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/NewRechargeInfo.java @@ -184,6 +184,11 @@ public class NewRechargeInfo extends MongoBase { updateString("pushMap."+bag.getModId(),bag); } + public void removePush(PushWelfareBag bag){ + pushMap.remove(bag.getModId()); + removeString(getMongoKey() + ".pushMap."+bag.getModId()); + } + public int getMainLineLost() { return mainLineLost; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java index 60f460467..eb51d7f50 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java @@ -35,9 +35,6 @@ public class AbstractWelfareBag extends MongoBase{ setModId(config.getId()); setType(config.getOtype()); setLimit(config.getLimit()); - if(config.getOtype() == 4){ - setLimit(1); - } setTimeType(config.getTime()); setDailyUpdate(config.getDailyUpdate()); setContinueDays(config.getContiueDays()); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java index d2977eeae..8e30ead3b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java @@ -27,20 +27,12 @@ public class PushWelfareBag extends AbstractWelfareBag { public boolean buy() { setBuyTimes(getBuyTimes()+1); if(getLimit()<=getBuyTimes()){ - clear(); + setOpen(false); } return true; } - public void clear(){ - setOpen(false); - setLimit(1); - setBuyTimes(0); - setStartTime(0); - setEndTime(0); - } - - public int getTime(){ + private int getTime(){ int i = 2; for(String[] s : getCondition()){ if(s[0].equals("6")){ From f0a38deb24427e3d6858275c3029faad38e2cc40 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 5 Jul 2021 11:44:03 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 2249b8cf9..4aea97538 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -699,7 +699,9 @@ public class BuyGoodsNewLogic { int popup = 0; boolean push = false; for(SPackPushConfig con : list){ + LOGGER.info("判断的id:{}",con.getId()); int bagId = judgePushCondition(user,con); + LOGGER.info("判断结果为:{}",bagId); //条件成功 if(bagId > 0 && info.getNextPushTime() < System.currentTimeMillis()){ popup = bagId; @@ -732,21 +734,25 @@ public class BuyGoodsNewLogic { if(scope[0] == 1){//主线关卡 int mainLevel = user.getMainLevelManager().getFightId(); if(mainLevel < scope[1]){ + LOGGER.info("aaaa"); return -1; } }else if(scope[0] == 2){//爬塔 int towerLevel = con.getConditionId()[1]; if(towerLevel < scope[1]){ + LOGGER.info("bbbb"); return -1; } }else if(scope[0] == 3){//玩家等级 int level = user.getPlayerInfoManager().getLevel(); if(level < scope[1]){ + LOGGER.info("cccc"); return -1; } }else if(scope[0] == 7){ double mxr = user.getPlayerInfoManager().getNewRechargeInfo().getMaxSingleR(); if(mxr < scope[1]){ + LOGGER.info("dddd"); return -1; } } @@ -759,6 +765,7 @@ public class BuyGoodsNewLogic { } } if(con.getPersonas()[index] > rr){ + LOGGER.info("eeee"); return -1; } return con.getPacks()[index]; From c836a395ab4cc1cca280491cb318ad3e8289d59d Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 5 Jul 2021 11:50:06 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8F=B7uid=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/logic/dao/WishDrawCardInfo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WishDrawCardInfo.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WishDrawCardInfo.java index a99072339..e3a97c8f5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WishDrawCardInfo.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/WishDrawCardInfo.java @@ -10,7 +10,7 @@ import java.io.Serializable; */ public class WishDrawCardInfo implements Serializable { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = -4813948169695919232L; private int id; private int heroTid; From a160805f3aa0eed0493ad69df737a1b265e34507 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 5 Jul 2021 13:56:41 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BD=8D=E7=BD=AE?= =?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/store/BuyGoodsNewLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 4aea97538..27882341b 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -238,9 +238,9 @@ public class BuyGoodsNewLogic { } notifyPaySuccessFul(uid,goodsId,amount != -999); - MongoUtil.getLjsdMongoTemplate().lastUpdate(); sendGiftGoodsWithoutJudge(uid); openPush(session,user, PushRechargeType.point_recharge.getType(),goodsId,1); + MongoUtil.getLjsdMongoTemplate().lastUpdate(); // 扶持订单不需要上报 if(price>0 && !orderId.equals("support-order")){ // 以下为充值上报 From 3294d64d303872f6e752d285e01a4b3e2b62e971 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 8 Jul 2021 02:33:14 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E7=83=AD=E6=9B=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/config/SRechargeCommodityNewConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java index af5ab4357..8803be202 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java @@ -87,11 +87,11 @@ public class SRechargeCommodityNewConfig implements BaseConfig { tempConfigTypeMap.put(newConfig.getType(),list); } } - if(configMap == null){ +// if(configMap == null){ configMap = tempConfigMap; sdkconfigMap = tempSdkConfigMap; configTypeMap = tempConfigTypeMap; - } +// } } public static String[][] getConditon(int id){ From e086327b3e847d12a334e865ba4264fd3397be83 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 8 Jul 2021 02:37:27 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/config/SRechargeCommodityNewConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java index 8803be202..dc67fbf47 100644 --- a/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java +++ b/tablemanager/src/main/java/config/SRechargeCommodityNewConfig.java @@ -89,6 +89,7 @@ public class SRechargeCommodityNewConfig implements BaseConfig { } // if(configMap == null){ configMap = tempConfigMap; + System.out.println("重新加载Recharge"); sdkconfigMap = tempSdkConfigMap; configTypeMap = tempConfigTypeMap; // } From b472382f69f5b4dc09c1baadaf5f91a15a750837 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 8 Jul 2021 14:00:43 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/thread/task/MinuteTask.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) 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 7239a3dc5..fb4a56bd5 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 @@ -36,6 +36,8 @@ import com.ljsd.jieling.network.server.ProtocolsManager; import com.ljsd.jieling.thread.ThreadManager; import com.ljsd.jieling.util.AyyncWorker; import com.ljsd.jieling.util.MessageUtil; +import config.SChallengeMapConfig; +import config.SRechargeCommodityNewConfig; import manager.STableManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -141,6 +143,33 @@ public class MinuteTask extends Thread { try { ArenaLogic.getInstance().worldSendReward(); + if(STableManager.getConfig(SRechargeCommodityNewConfig.class).size()!= SRechargeCommodityNewConfig.configMap.size()){ + + Map config = STableManager.getConfig(SRechargeCommodityNewConfig.class); + Map tempConfigMap = new HashMap<>(); + Map tempSdkConfigMap = new HashMap<>(); + Map> tempConfigTypeMap = new HashMap<>(); + for(SRechargeCommodityNewConfig newConfig : config.values()){ + newConfig.setCondition(newConfig.initConditon(newConfig)); + tempConfigMap.put(newConfig.getId(),newConfig); + tempSdkConfigMap.put(newConfig.getRechargeId(),newConfig); + tempSdkConfigMap.put(newConfig.getRechargeId2(),newConfig); + tempSdkConfigMap.put(newConfig.getRechargeId3(),newConfig); + if(tempConfigTypeMap.containsKey(newConfig.getType())){ + tempConfigTypeMap.get(newConfig.getType()).add(newConfig.getId()); + }else{ + List list = new ArrayList<>(); + list.add(newConfig.getId()); + tempConfigTypeMap.put(newConfig.getType(),list); + } + } +// if(configMap == null){ + SRechargeCommodityNewConfig.configMap = tempConfigMap; + LOGGER.info("修复重新加载Recharge"); + SRechargeCommodityNewConfig.sdkconfigMap = tempSdkConfigMap; + SRechargeCommodityNewConfig.configTypeMap = tempConfigTypeMap; + + } }catch (Exception e){ e.printStackTrace(); LOGGER.error("Exception::=>{}",e.toString()); From 8cf5eb861f121cf32a00faf513f97265c7ab6c35 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 9 Jul 2021 14:30:28 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index f43a61675..3bba58642 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -2821,10 +2821,10 @@ public class MapLogic { // 获取玩家背包道具并消耗 Item item1 = user.getItemManager().getItem(item.getId()); if(item1!=null){ + System.out.println("======================清理无尽副本道具,玩家:{ " + uid + " },道具id:{ " + item1.getItemId() + " }"); int[][] cost= new int[1][]; cost[0] = new int[]{item1.getItemId(),(int)item1.getItemNum()}; ItemUtil.itemCost(user,cost,BIReason.ENDLESS_REASON_CHANGE,0); - System.out.println("======================清理无尽副本道具,玩家:{ " + uid + " },道具id:{ " + item1.getItemId() + " }"); } } } From 3400966b7d3fb5c6b9e4ef640f7ed48eab9d19f0 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 9 Jul 2021 16:40:17 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E5=AE=B9=E9=94=99=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/handler/map/MapLogic.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 3bba58642..8ef972d30 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -2820,6 +2820,10 @@ public class MapLogic { for (SItem item:itemList){ // 获取玩家背包道具并消耗 Item item1 = user.getItemManager().getItem(item.getId()); + if(item.getId()==0){ + user.getItemManager().removeItem(0); + continue; + } if(item1!=null){ System.out.println("======================清理无尽副本道具,玩家:{ " + uid + " },道具id:{ " + item1.getItemId() + " }"); int[][] cost= new int[1][]; From 287ef6b01b4801b9db6e5f258023f575d2d09253 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 10 Jul 2021 02:03:02 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ljsd/jieling/handler/map/MapLogic.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java index 8ef972d30..45b0f6676 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java @@ -2820,11 +2820,11 @@ public class MapLogic { for (SItem item:itemList){ // 获取玩家背包道具并消耗 Item item1 = user.getItemManager().getItem(item.getId()); - if(item.getId()==0){ - user.getItemManager().removeItem(0); - continue; - } if(item1!=null){ + if(item1.getItemId()==0){ + user.getItemManager().removeItem(0); + continue; + } System.out.println("======================清理无尽副本道具,玩家:{ " + uid + " },道具id:{ " + item1.getItemId() + " }"); int[][] cost= new int[1][]; cost[0] = new int[]{item1.getItemId(),(int)item1.getItemNum()};