From b5feff687e191d21b41b7e4b41363dddaf5785ce Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Fri, 4 Sep 2020 10:31:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E8=80=97=E5=A2=9E=E5=8A=A0=E8=B4=9F?= =?UTF-8?q?=E5=80=BC=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/family/FamilyFeteRequestHandler.java | 2 +- .../jieling/handler/map/mapType/EndlessMap.java | 4 ++-- .../ljsd/jieling/logic/activity/ActivityLogic.java | 8 ++++---- .../logic/championship/ChampionshipLogic.java | 2 +- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 13 +++++++++++-- .../jieling/thread/task/OnlineUserReportTask.java | 7 ++++++- .../main/java/com/ljsd/jieling/util/ItemUtil.java | 5 ++++- .../java/com/ljsd/jieling/util/MessageUtil.java | 4 ++-- 8 files changed, 31 insertions(+), 14 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java index 0334f87d4..c756225f5 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/family/FamilyFeteRequestHandler.java @@ -57,7 +57,7 @@ public class FamilyFeteRequestHandler extends BaseHandler{} 本次为第{}次抽取,消耗{}个数为{}", user.getId(), activityProgressInfoMap.get(BlessInfoConfig.BLESS_PROGRESS_STATUS).getProgrss(), temp[0], temp[1]); + boolean costResult = ItemUtil.itemCost(user, cost, BIReason.BLESS_CHOOSE_CONSUME, locationId); if (!costResult) { throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } @@ -930,7 +930,7 @@ public class ActivityLogic implements IEventHandler{ break; } } - LOGGER.info("本次抽取的Id为{}", resultRewardId); + LOGGER.info("blessChoose uid=>{}本次抽取的Id为{}", user.getId(), resultRewardId); Map poolMap = STableManager.getConfig(SBlessingRewardPool.class); int[][] dropItem = new int[1][]; for (Integer count : SBlessingConfig.blessingConfigMap.get(blessActivityId).getCounts()) { @@ -1266,7 +1266,7 @@ public class ActivityLogic implements IEventHandler{ int[][] costItems = new int[1][]; int[] costTemp = {cost[0][0],num}; costItems[0]=costTemp; - boolean result = ItemUtil.itemCost(user,costItems,BIReason.TREASURE_BUY_LEVEL_CONSUME,1); + boolean result = ItemUtil.itemCost(user,costItems,BIReason.TREASURE_BUY_LEVEL_CONSUME, level); if(result) { user.getPlayerInfoManager().setTreasureLevel(level); }else{ 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 ca5b7651b..ec171fcfc 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 @@ -411,7 +411,7 @@ public class ChampionshipLogic { costs[0] = new int[2]; costs[0][0] = arenaItemId; costs[0][1] = itemNum; - ItemUtil.itemCost(user, costs, BIReason.CHAMPIONM_EXCHANGE_CONSUME, 0); + ItemUtil.itemCost(user, costs, BIReason.CHAMPIONM_EXCHANGE_CONSUME, sendId); Map itemReward = new HashMap<>(1); itemReward.put(rewardItemId, itemNum / sChampionshipSetting.getExchangeItem()); ItemUtil.addItem(user, itemReward, null, BIReason.CHAMPIONM_EXCHANGE_REWARD); 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 349060fc7..e423521be 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 @@ -783,6 +783,9 @@ public class HeroLogic{ } for(;oldLevel= Integer.MAX_VALUE) { + throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); + } int composeNum = itemNum/sItem.getUsePerCount(); SGameSetting gameSetting = STableManager.getFigureConfig(CommonStaticConfig.class).getGameSetting(); if (composeNum <= 0 || composeNum > gameSetting.getHeroCompoundLimit()){ @@ -2019,7 +2028,7 @@ public class HeroLogic{ if (hasHeroNum + composeNum > gameSetting.getHeroNumlimit()){ throw new ErrorCodeException(ErrorCode.HERO_HERO_MAX); } - boolean result = ItemUtil.checkCost(user, sItem, itemNum,BIReason.COMPOS_HERO_CONSUME,0); + boolean result = ItemUtil.checkCost(user, sItem, itemNum,BIReason.COMPOS_HERO_CONSUME,itemId); if (!result){ throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java index afe1457ca..80f90a88d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/thread/task/OnlineUserReportTask.java @@ -6,6 +6,8 @@ import com.ljsd.jieling.ktbeans.sendbeans.ReportServerEvent; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Date; import java.util.HashMap; @@ -18,6 +20,9 @@ import java.util.Set; * @discribe */ public class OnlineUserReportTask extends Thread { + + private static final Logger LOGGER = LoggerFactory.getLogger(OnlineUserReportTask.class); + public OnlineUserReportTask(){ setName("OnlineUserReportTask"); } @@ -53,7 +58,7 @@ public class OnlineUserReportTask extends Thread { properties.put("platform","DEFAULT_platform"); properties.put("#time",new Date()); ReportServerEvent reportServerEvent = new ReportServerEvent("online_user_amount",properties); - System.out.println(reportServerEvent.toString()); + LOGGER.info("OnlineUserReportTask reportServerEvent=>{}", reportServerEvent.toString()); ReportUtil.doReport(reportServerEvent); }catch (Exception e){ e.printStackTrace(); 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 35f0379cb..5e858a363 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java @@ -1261,7 +1261,10 @@ public class ItemUtil { } return false; } - + if (entry.getValue() <= 0) { + LOGGER.info("checkCost uid=>{} use negative item itemId=>{} count=>{}", user.getId(), entry.getKey(), entry.getValue()); + return false; + } if (temporaryItem == null && item.getItemNum() < entry.getValue()) { return false; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java index 908a1d741..a76cca1e2 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java @@ -39,7 +39,7 @@ public class MessageUtil { } else { backMessage = generatedMessage.toByteArray(); if (backMessage.length != 0) - LOGGER.info("\r\n" + "uid:" + uid + ":\r\n" + JsonFormat.printToString(generatedMessage)); + LOGGER.info("wrappedBuffer uid=>{}, generatedMessage=>{}", uid, JsonFormat.printToString(generatedMessage)); } int length = PackageConstant.UID_FIELD_LEN + PackageConstant.TOKEN_LEN @@ -64,7 +64,7 @@ public class MessageUtil { int[] secretKey = Tea.KEY; byte[] bytes1 = Tea.encrypt2(bytes, secretKey); if (backMessage.length != 0) { - LOGGER.info("sendbyte"+bytes1.length); + LOGGER.info("wrappedBuffer uid=>{} sendbyte=>{}", uid, bytes1.length); } return bytes1; }