From 2203e5437591fb0c0b7a65d652c36220799b8054 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Tue, 18 Jan 2022 16:31:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/GmService.java | 1 - .../clazzStaticCfg/CommonStaticConfig.java | 2 +- .../clazzStaticCfg/HeroStaticConfig.java | 2 +- .../core/function/EndlessFunction.java | 4 +- .../jieling/db/mongo/LjsdMongoTemplate.java | 2 +- .../db/mongo/MongoPropertyConverter.java | 2 +- .../ljsd/jieling/db/mongo/MongoUtiltest.java | 2 +- .../handler/activity/XunBaoMiZongHandler.java | 1 - .../CrossLingmaiSecretAreaRecordHandler.java | 2 +- .../CrossYuxulundaoChallengeHandler.java | 4 +- .../CrossYuxulundaoGetInfoHandler.java | 54 +++++++++---------- .../ljsd/jieling/handler/map/MapLogic.java | 4 +- .../com/ljsd/jieling/kefu/Cmd_skyeye.java | 2 +- .../logic/activity/XunBaoMiZongActivity.java | 6 --- .../ljsd/jieling/logic/arena/ArenaLogic.java | 2 +- .../logic/arenaworld/ArenaWorldLogic.java | 2 +- .../logic/championship/ChampionshipLogic.java | 6 +-- .../ljsd/jieling/logic/dao/PlayerManager.java | 2 +- .../logic/family/CrossDeathPathLogic.java | 2 +- .../ljsd/jieling/logic/hero/HeroLogic.java | 4 +- .../jieling/logic/item/WorkShopLogic.java | 36 ++++++------- .../ljsd/jieling/logic/mail/MailCache.java | 20 ------- .../jieling/logic/player/PlayerLogic.java | 5 +- .../logic/rank/rankImpl/CrossArenaRank.java | 2 +- .../rankImpl/CrossYuXuLunDaoPersonRank.java | 2 +- .../rank/rankImpl/CrossYuXuLunDaoRank.java | 2 +- .../rankImpl/DeathPathTotalGuildRank.java | 2 +- .../logic/ridingSward/RidingSwardLogic.java | 6 --- .../jieling/logic/store/BuyGoodsNewLogic.java | 2 +- .../network/server/SessionManager.java | 4 +- .../java/com/ljsd/jieling/util/ItemUtil.java | 4 +- 31 files changed, 80 insertions(+), 111 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/GmService.java b/serverlogic/src/main/java/com/ljsd/GmService.java index ee25c8022..cef6be6c3 100644 --- a/serverlogic/src/main/java/com/ljsd/GmService.java +++ b/serverlogic/src/main/java/com/ljsd/GmService.java @@ -120,7 +120,6 @@ public class GmService implements RPCRequestGMIFace.Iface { } catch (final Exception ex) { result.setResultMsg("Cmd Illegal"); LOGGER.error("e={}",ex.getMessage()); - ex.getMessage(); return result; } result.setResultCode(0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java index 74309ffd0..530db6aaf 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/CommonStaticConfig.java @@ -161,7 +161,7 @@ public class CommonStaticConfig extends AbstractClassStaticConfig { sGlobalSystemConfigMapByTypeAndConditionMap = sGlobalSystemConfigMapByTypeAndConditionMapTmp; } catch (Exception e) { - LOGGER.error("SGlobalSystemConfig init fail",e); + LOGGER.error("SGlobalSystemConfig init fail {}",e); } try { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java index f2efa9f4b..e8b681456 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/config/clazzStaticCfg/HeroStaticConfig.java @@ -79,7 +79,7 @@ public class HeroStaticConfig extends AbstractClassStaticConfig { sHeroSacrificeMap = sHeroSacrificeMapTemp; } catch (Exception e) { - LOGGER.error("SCHeroRankUpConfig init fail"); + LOGGER.error("SCHeroRankUpConfig init fail={}", e.toString()); } try { Set randomHeroIdTmp = new HashSet<>(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java b/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java index 3a03cbcaa..1237a53f3 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/function/EndlessFunction.java @@ -35,8 +35,8 @@ public class EndlessFunction implements FunctionManager { @Override public void startAction(TimeControllerOfFunction timeControllerOfFunction) throws Exception { - int times = timeControllerOfFunction.getTimes(); - int[] maps = new int[]{4001,4002}; +// int times = timeControllerOfFunction.getTimes(); +// int[] maps = new int[]{4001,4002}; // maps[times % maps.length]; int mapId = 4001; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java index 270c7c33b..9275c548e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/LjsdMongoTemplate.java @@ -246,7 +246,7 @@ public class LjsdMongoTemplate implements MongoUpdateImp { dbobj.append("$unset", removedbobj); flag = true; } - if (flag&&null!=otherMonogTemplate) { + if (flag) { DBCollection coll = otherMonogTemplate.getCollection(collection); coll.update(searchQuery, dbobj); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java index 6db1a5b07..086ba0f43 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoPropertyConverter.java @@ -23,7 +23,7 @@ public class MongoPropertyConverter implements Converter target = PropertyItem.class; + Class target; if(equipId.getItemType() == GlobalItemType.JEWEL){ target = Jewel.class; }else { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java index a39a26dc7..2d7eb7b83 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/db/mongo/MongoUtiltest.java @@ -52,7 +52,7 @@ public class MongoUtiltest { } }catch (Exception e){ - + LOGGER.info("MongoUtiltest e={}", e.toString()); } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/XunBaoMiZongHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/XunBaoMiZongHandler.java index 9ee6a5f53..11d38fb16 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/XunBaoMiZongHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/XunBaoMiZongHandler.java @@ -37,7 +37,6 @@ public class XunBaoMiZongHandler extends BaseHandler cost1 = new HashMap<>(1); cost1.put(cost[0], cost[1]); enoughCost = ItemUtil.checkCost(user, cost1); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaRecordHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaRecordHandler.java index d87dd50b9..3a478aeb7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaRecordHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossLingmaiSecretAreaRecordHandler.java @@ -34,8 +34,8 @@ public class CrossLingmaiSecretAreaRecordHandler extends BaseHandler list = redisUtil.lGet(RedisKey.CROSS_LINGMAISECRET_RECORD, String.valueOf(uid), 0, -1); - Collections.reverse(list); if (list != null) { + Collections.reverse(list); for (String s : list) { ArenaRecord arenaRecord = new Gson().fromJson(s, ArenaRecord.class); CommonProto.LingMaiSecretRecord record = CommonProto.LingMaiSecretRecord.newBuilder().setType(arenaRecord.getType()) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java index 5350272d7..1a60ce478 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/crossServer/CrossYuxulundaoChallengeHandler.java @@ -326,9 +326,7 @@ public class CrossYuxulundaoChallengeHandler extends BaseHandler 0) { enemyList.forEach(n -> builder.addArenaEnemys(CrossYuxulundaoLogic.getInstance().getMatchRivalInfo(n.getEnemyId(), 0))); } - if (csPlayer != null) { - int oldScore = csPlayer.getCrossYuxulundaoOldScore(); - int newScore = csPlayer.getCrossYuxulundaoNewScore(); - //被打后是否加分了 - if(oldScore < newScore){ - //被打后打赢加分 - int id = SMServerRankConfig.getIdByScore(newScore); - if (csPlayer.getCrossYxldMaxLevel() < id) { - //首次爬升到该位置发奖励 - int oldLevel = SMServerRankConfig.getIdByScore(oldScore); - for (int i = oldLevel + 1; i <= id; i++) { - if (SMServerRankConfig.serverRankConfig.containsKey(i)) { - SMServerRankConfig serverRankConfig = SMServerRankConfig.serverRankConfig.get(i); - CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, serverRankConfig.getFirstReward(), BIReason.CROSS_YUXULUNDAO_DAILYREWARD); - builder.addUpdrop(drop); - } + int oldScore = csPlayer.getCrossYuxulundaoOldScore(); + int newScore = csPlayer.getCrossYuxulundaoNewScore(); + //被打后是否加分了 + if (oldScore < newScore) { + //被打后打赢加分 + int id = SMServerRankConfig.getIdByScore(newScore); + if (csPlayer.getCrossYxldMaxLevel() < id) { + //首次爬升到该位置发奖励 + int oldLevel = SMServerRankConfig.getIdByScore(oldScore); + for (int i = oldLevel + 1; i <= id; i++) { + if (SMServerRankConfig.serverRankConfig.containsKey(i)) { + SMServerRankConfig serverRankConfig = SMServerRankConfig.serverRankConfig.get(i); + CommonProto.Drop.Builder drop = ItemUtil.dropPer(user, serverRankConfig.getFirstReward(), BIReason.CROSS_YUXULUNDAO_DAILYREWARD); + builder.addUpdrop(drop); } - csPlayer.setCrossYxldMaxLevel(id); - isNeedUpdate = true; - } - } - if(newSeason){ - builder.setOldMyscore(newSeasonBefore); - }else{ - builder.setOldMyscore(oldScore); - } - builder.setNewMyscore(newScore); - if (oldScore != newScore) { - csPlayer.setCrossYuxulundaoOldScore(newScore); + csPlayer.setCrossYxldMaxLevel(id); isNeedUpdate = true; + } } + if (newSeason) { + builder.setOldMyscore(newSeasonBefore); + } else { + builder.setOldMyscore(oldScore); + } + builder.setNewMyscore(newScore); + if (oldScore != newScore) { + csPlayer.setCrossYuxulundaoOldScore(newScore); + isNeedUpdate = true; + } if (isNeedUpdate) { //CrossServiceLogic.getInstance().update(myQuery); //CrossServiceLogic.getInstance().saveBasicPlayerToRedis(user); 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 2883bc2ed..9f1b08e0d 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 @@ -3336,7 +3336,9 @@ public class MapLogic { response = getBoxReward(sTrialConfig.getBoxPosition(), sTrialConfig.getBoxReward(), user, curXY, type); } //森罗幻境自动挂机奖励展示 - PlayerLogic.TowerGetRewardInfoShow(response.getBoxDrop(),user); + if (response != null) { + PlayerLogic.TowerGetRewardInfoShow(response.getBoxDrop(),user); + } if (response == null) { throw new ErrorCodeException(ErrorCode.SERVER_SELF_DEFINE); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_skyeye.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_skyeye.java index 2db66289e..e1ce2e931 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_skyeye.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_skyeye.java @@ -33,7 +33,7 @@ public class Cmd_skyeye extends GmRoleAbstract { PlayerManager playerManager = user.getPlayerInfoManager(); // 默认封禁 - int time = Integer.valueOf(args[1]); + int time = Integer.parseInt(args[1]); playerManager.setSkyEyeBanTime(System.currentTimeMillis() + time * TimeUtils.ONE_MINUTE); int type = Integer.parseInt(args[0]); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/XunBaoMiZongActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/XunBaoMiZongActivity.java index 70b717dce..52d4a0658 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/XunBaoMiZongActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/XunBaoMiZongActivity.java @@ -25,16 +25,10 @@ public class XunBaoMiZongActivity extends AbstractActivity { return; } if (activityMission.getV() == 1 && xunBaoMiZongEvent.getType() == 0) { - if (null == activityMission) { - return; - } activityMission.setV(0); ActivityLogic.getInstance().sendActivityInfo(user, id); } if (activityMission.getV() == 0 && xunBaoMiZongEvent.getType() == 1) { - if (null == activityMission) { - return; - } //最大伤害更新 activityMission.setV(1); ActivityLogic.getInstance().sendActivityInfo(user, id); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java index 631381dc6..d7e390b08 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arena/ArenaLogic.java @@ -777,7 +777,7 @@ public class ArenaLogic { while (iterator.hasNext()){ index++; ZSetOperations.TypedTuple next = iterator.next(); - int uid = Integer.valueOf(next.getValue()); + int uid = Integer.parseInt(next.getValue()); if (uid<1000) { continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java index 9dacbb9b6..5ec2c48e1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/arenaworld/ArenaWorldLogic.java @@ -58,7 +58,7 @@ public class ArenaWorldLogic { public static boolean checkOpen(String uid) throws Exception{ SGlobalSystemConfig sGlobalSystemConfig = STableManager.getConfig(SGlobalSystemConfig.class).get(FunctionIdEnum.World_Arena.getFunctionType()); - return HandlerLogicThread.checkOpen(UserManager.getUser(Integer.valueOf(uid)),sGlobalSystemConfig); + return HandlerLogicThread.checkOpen(UserManager.getUser(Integer.parseInt(uid)),sGlobalSystemConfig); } 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 1bfdbf073..8dbb987cf 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 @@ -85,7 +85,7 @@ public class ChampionshipLogic { String key = RedisUtil.getInstence().getKey(RedisKey.CHAMPION_SCHEDULE, ""); Object result = RedisUtil.getInstence().get(key); if (result != null) { - schedule = Integer.valueOf((String) result); + schedule = Integer.parseInt((String) result); } }catch (Exception e){ LOGGER.info("Exception the init={}"); @@ -398,7 +398,7 @@ public class ChampionshipLogic { Set> arenaRankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.CHAMPION_RANK, "", 0, -1); Map robotConfigMap = STableManager.getConfig(SArenaRobotConfig.class); int nowTime = (int) (TimeUtils.now() / 1000); - Set joinUids = new HashSet<>(128); +// Set joinUids = new HashSet<>(128); try { for (ZSetOperations.TypedTuple item : arenaRankInfo) { String uidStr = item.getValue(); @@ -407,7 +407,7 @@ public class ChampionshipLogic { rank++; continue; } - joinUids.add(uid); +// joinUids.add(uid); User user = UserManager.getUser(uid); SChampionshipReward sChampionshipReward = rewardsMap.get(rank); if (user.getArenaManager().getTopMaxRank() == 0 || user.getArenaManager().getTopMaxRank() > rank) { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java index 139e9a531..4a38be038 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/PlayerManager.java @@ -1327,7 +1327,7 @@ public class PlayerManager extends MongoBase { int count = 0; for (Integer value : getSevenWorldOpenTier().values()) { SQijieStage stage = STableManager.getConfig(SQijieStage.class).get(value); - if (value == null){ + if (stage == null){ System.out.printf("SQijieStage,配置表读取不到,关卡id:{%d}\n",value); continue; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java index 62ee7d4b7..8262d7874 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/CrossDeathPathLogic.java @@ -149,7 +149,7 @@ public class CrossDeathPathLogic { int rank =0; for(ZSetOperations.TypedTuple value:values){ rank++; - int guildId = Integer.valueOf(value.getValue()); + int guildId = Integer.parseInt(value.getValue()); GuildCache guild = getCrossGuild(guildId); if(guild==null||guild.getServerId()!=serverId){ continue; 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 4dd6eddee..31a0ccff2 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 @@ -1206,7 +1206,7 @@ public class HeroLogic { if (teamId == TeamEnum.ENDLESS_TEAM.getTeamId()) { List teamPosHeroInfos = user.getTeamPosManager().getTeamPosForHero().get(teamId); if (teamPosHeroInfos != null) { - List heroes = new ArrayList<>(teamPosHeroInfos.size()); +// List heroes = new ArrayList<>(teamPosHeroInfos.size()); Map> heroAllAttributeMap = new HashMap<>(teamPosHeroInfos.size()); List indiHeros = new ArrayList<>(); for (TeamPosHeroInfo heroInfo : teamPosHeroInfos) { @@ -1232,7 +1232,7 @@ public class HeroLogic { heroAllAttribute.put(HeroAttributeEnum.CurHP.getPropertyId(), 10000L); } heroAllAttributeMap.put(hero.getId(), heroAllAttribute); - heroes.add(heroInfo.getHeroId()); +// heroes.add(heroInfo.getHeroId()); MapInfoProto.HeroInfo indiInfo = MapInfoProto.HeroInfo.newBuilder().setHeroId(heroInfo.getHeroId()) .setHeroHp(heroAllAttribute.get(HeroAttributeEnum.CurHP.getPropertyId())) .setHeroMaxHp(heroAllAttribute.get(HeroAttributeEnum.Hp.getPropertyId())) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java index df1c4cb8e..ca89e9c52 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/item/WorkShopLogic.java @@ -132,24 +132,24 @@ public class WorkShopLogic { //基础打造 - public void createMaterialByUser(ISession session, int materialId, int nums) throws Exception { - int uid = session.getUid(); - User user = UserManager.getUser(uid); - SWorkShopFoundationConfig sWorkShopFoundationConfig = SWorkShopFoundationConfig.getShopFoundationConfigMap().get(materialId); - if(!checkIsUnlock(GlobalsDef.WORK_BASE_TYPE,sWorkShopFoundationConfig.getType(),user.getWorkShopController(),sWorkShopFoundationConfig.getOpenRules(),sWorkShopFoundationConfig.getId())){ - throw new ErrorCodeException(ErrorCode.newDefineCode("未开")); - } - int[][] cost = sWorkShopFoundationConfig.getCost(); - int[][] reallyCost = times2Array(cost, nums); - if( !ItemUtil.itemCost(user, reallyCost,BIReason.WORKSHOP_CREATEMATERIAL_CONSUME,materialId)){ - throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); - } - Map finalMaterial = new HashMap<>(); - finalMaterial.put(materialId, (long) (nums*sWorkShopFoundationConfig.getNum())); - ItemUtil.addItem(user,finalMaterial,null, BIReason.WORKSHOP_CREATEMATERIAL); - - MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,null,true); - } +// public void createMaterialByUser(ISession session, int materialId, int nums) throws Exception { +// int uid = session.getUid(); +// User user = UserManager.getUser(uid); +// SWorkShopFoundationConfig sWorkShopFoundationConfig = SWorkShopFoundationConfig.getShopFoundationConfigMap().get(materialId); +// if(!checkIsUnlock(GlobalsDef.WORK_BASE_TYPE,sWorkShopFoundationConfig.getType(),user.getWorkShopController(),sWorkShopFoundationConfig.getOpenRules(),sWorkShopFoundationConfig.getId())){ +// throw new ErrorCodeException(ErrorCode.newDefineCode("未开")); +// } +// int[][] cost = sWorkShopFoundationConfig.getCost(); +// int[][] reallyCost = times2Array(cost, nums); +// if( !ItemUtil.itemCost(user, reallyCost,BIReason.WORKSHOP_CREATEMATERIAL_CONSUME,materialId)){ +// throw new ErrorCodeException(ErrorCode.ITEM_NOT_ENOUGH); +// } +// Map finalMaterial = new HashMap<>(); +// finalMaterial.put(materialId, (long) (nums*sWorkShopFoundationConfig.getNum())); +// ItemUtil.addItem(user,finalMaterial,null, BIReason.WORKSHOP_CREATEMATERIAL); +// +// MessageUtil.sendMessage(session,1, MessageTypeProto.MessageType.WORKSHOP_FOUNDATION_RESPONSE_VALUE,null,true); +// } //装备打造 TODO //装备重铸 diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailCache.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailCache.java index c25914725..d3b857226 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailCache.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/mail/MailCache.java @@ -60,24 +60,4 @@ public class MailCache { public void setValidTime(int validTime) { this.validTime = validTime; } - - public static void main(String[] args) { - Gson gson = new Gson(); - Map uidReward = new HashMap<>(); - //todo uid 奖励 - uidReward.put(1,"2#3"); - MailCache mailCache = new MailCache(); - mailCache.setTime((int)(System.currentTimeMillis()/1000)); - mailCache.setContent("充值返利"); - mailCache.setTitle("充值返利"); - - mailCache.setFrom("system"); - uidReward.forEach((k,v)->{ - mailCache.setReward(v); - System.out.println("HSET 10001:READY_TO_USER_MAIL: " + k + " "+ gson.toJson(gson.toJson(mailCache))); - }); - System.out.println(gson.toJson(mailCache)); - String s = gson.toJson(mailCache); - System.out.println(gson.toJson(s)); - } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java index 0d47a8015..f5fcf0e40 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java @@ -710,7 +710,10 @@ public class PlayerLogic { }*/ } //PlayerInfoProto.GetPlayerCrossYxldOneTeamInfoResponse.Builder playerTeamInfo = PlayerInfoProto.GetPlayerCrossYxldOneTeamInfoResponse.newBuilder().setTeamInfo(oneInfo); - return oneInfo.build(); + if (oneInfo != null) { + return oneInfo.build(); + } + return null; } //玉虚论道 private CommonProto.TeamOneInfo.Builder getYuxuRobotOneInfo(SArenaRobotConfig sArenaRobotConfig,CrossArenaEnemy info,List crossTeamId){ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java index 6e89f5539..f2efa3b3a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossArenaRank.java @@ -72,7 +72,7 @@ public class CrossArenaRank extends AbstractRank { .setSex(0); builder.addRanks(everyRank); }else{ - CSPlayer query = CrossServiceLogic.getPlayerByRedis(Integer.valueOf(data.getValue())); + CSPlayer query = CrossServiceLogic.getPlayerByRedis(Integer.parseInt(data.getValue())); if (query == null){ return; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoPersonRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoPersonRank.java index 61baa9ebe..dd7f55d47 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoPersonRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoPersonRank.java @@ -35,7 +35,7 @@ public class CrossYuXuLunDaoPersonRank extends CrossYuXuLunDaoRank{ @Override protected void getCrossOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { if(Integer.parseInt(data.getValue()) >= 1000){ - CSPlayer cPlayer = CrossServiceLogic.getPlayerByRedis(Integer.valueOf(data.getValue())); + CSPlayer cPlayer = CrossServiceLogic.getPlayerByRedis(Integer.parseInt(data.getValue())); if (cPlayer == null){ return; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java index 475284c2f..8d18f0631 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/CrossYuXuLunDaoRank.java @@ -77,7 +77,7 @@ public class CrossYuXuLunDaoRank extends AbstractRank{ .setSex(0).setCrossScore(mapEntry.getEnemyStatus()); builder.addRanks(everyRank); }else{ - CSPlayer cPlayer = CrossServiceLogic.getPlayerByRedis(Integer.valueOf(data.getValue())); + CSPlayer cPlayer = CrossServiceLogic.getPlayerByRedis(Integer.parseInt(data.getValue())); if (cPlayer == null){ return; } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java index 835f49f5c..064f7cebe 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/DeathPathTotalGuildRank.java @@ -60,7 +60,7 @@ public class DeathPathTotalGuildRank extends CrossGuildForceRank{ @Override protected void getCrossOptional(int index, ZSetOperations.TypedTuple data, PlayerInfoProto.RankResponse.Builder builder) throws Exception { - GuildCache mapEntry = CrossDeathPathLogic.getCrossGuild(Integer.valueOf(data.getValue())); + GuildCache mapEntry = CrossDeathPathLogic.getCrossGuild(Integer.parseInt(data.getValue())); DeathChallengeCount countInfo = DeathPathLogic.getInstance().getDeathChallengeCount(Integer.valueOf(data.getValue())); CommonProto.RankInfo.Builder everyRankInfo = CommonProto.RankInfo.newBuilder() .setRank(index) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java index adba088f0..a1d842042 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/ridingSward/RidingSwardLogic.java @@ -536,9 +536,6 @@ public class RidingSwardLogic{ public static Map getRankMap(String subKey){ Map map = RedisUtil.getInstence().getMapValues(RedisKey.RIDING_SWARD_RANK, subKey, Integer.class, RidingSwardRank.class); - if (map == null){ - return new HashMap<>(); - } return map; } @@ -569,9 +566,6 @@ public class RidingSwardLogic{ public static Map> getRecordList(int uid){ Type valueType = new TypeToken>(){}.getType(); Map> map = RedisUtil.getInstence().getMapValues(RedisKey.RIDING_SWARD_RECORD, String.valueOf(uid), int.class, valueType); - if (map == null){ - map = new HashMap<>(); - } return map; } 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 97a07d681..4da5280be 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 @@ -123,7 +123,7 @@ public class BuyGoodsNewLogic { * 测试购买物品 */ public static void testBuyGoods(ISession session,String goodsId) throws Exception { - SRechargeCommodityNewConfig sRechargeCommodityConfig = SRechargeCommodityNewConfig.getConfigById(Integer.valueOf(goodsId)); + SRechargeCommodityNewConfig sRechargeCommodityConfig = SRechargeCommodityNewConfig.getConfigById(Integer.parseInt(goodsId)); int uid = session.getUid(); if(sRechargeCommodityConfig == null){ throw new ErrorCodeException(ErrorCode.CFG_NULL); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java index ed3a5cb71..0a157fe49 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/network/server/SessionManager.java @@ -272,7 +272,9 @@ public class SessionManager implements INetSession, INetReceived