From 3efe09db221dd6f41474812659becb9ea6ca147f Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Tue, 17 Aug 2021 18:00:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/GameGM/GMRequestHandler.java | 2 +- .../src/main/java/com/ljsd/jieling/kefu/Cmd_addhero.java | 4 ++-- .../main/java/com/ljsd/jieling/logic/GlobalDataManaager.java | 4 ++-- .../java/com/ljsd/jieling/logic/dao/UserMissionManager.java | 2 ++ .../src/main/java/com/ljsd/jieling/logic/dao/root/User.java | 2 +- .../src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java | 3 ++- 6 files changed, 10 insertions(+), 7 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 440ae6058..9ff51de06 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 @@ -411,7 +411,7 @@ public class GMRequestHandler extends BaseHandler{ case 1: int bossId; if(!prarm3.isEmpty()){ - bossId = Integer.valueOf(prarm3); + bossId = Integer.parseInt(prarm3); }else{ int[] freeTravelBoss = travelConfig.getFreeTravelBoss(); bossId = MathUtils.randomFromArray(freeTravelBoss); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addhero.java b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addhero.java index 5020e6c06..ffb190e35 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addhero.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/kefu/Cmd_addhero.java @@ -21,8 +21,8 @@ public class Cmd_addhero extends GmRoleAbstract{ if(args.length!=2){ return true; } - int prarm1 = Integer.valueOf(args[0]); - int prarm2 = Integer.valueOf(args[1]); + int prarm1 = Integer.parseInt(args[0]); + int prarm2 = Integer.parseInt(args[1]); CommonProto.Drop.Builder drop = ItemUtil.drop(getUser(), new int[][]{{prarm1, 1}}, BIReason.GM_REWARD); CommonProto.Hero heroProto = drop.getHero(0); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java index 74e3be013..b72ab6120 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java @@ -122,7 +122,7 @@ public class GlobalDataManaager implements IManager { //开服几天后开启 if(getServerOpenTimeCompareSpecialTimeResult()){ int[]limitDay = sGlobalSystemConfig.getIfOpen(); - if(limitDay.length>0 && limitDay != null){ + if(limitDay != null && limitDay.length>0){ if( limitDay[0] == 2 ){ //此时是开服第几天 long day = TimeUtils.getGapDaysByTwoTime(GameApplication.serverConfig.getOpenTime(),TimeUtils.getTimeStamp2(TimeUtils.now()))+1; @@ -333,7 +333,7 @@ public class GlobalDataManaager implements IManager { //开服几天后开启 if(getServerOpenTimeCompareSpecialTimeResult()){ int[]limitDay = sGlobalSystemConfig.getIfOpen(); - if(limitDay.length>0 && limitDay != null){ + if(limitDay != null && limitDay.length>0){ if( limitDay[0] == 2 ){ //此时是开服第几天 long day = TimeUtils.getGapDaysByTwoTime(GameApplication.serverConfig.getOpenTime(),TimeUtils.getTimeStamp2(TimeUtils.now()))+1; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index c2bc2aed0..e43cbcc7a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -457,10 +457,12 @@ public class UserMissionManager extends MongoBase { case MISSING_ROOM_MISSION_REWARD:{ missingRoomMissionType.rewardMission((int)parm[0],missionTypeEnumListMap.get(GameMisionType.MISSINGROOMMISSION)); updateString("missingRoomMissionType",missingRoomMissionType); + break; } case COW_FLY_SKY_REWEARD:{ cowFlySkyMissionType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.COWFLYSKYMISSION)); updateString("cowFlySkyMissionType",cowFlySkyMissionType); + break; } case ENDLESS_MISSION_REWARD:{ endlessMissionType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.ENDLESS_MISSION)); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java index 280896a42..e46f9e637 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/root/User.java @@ -219,7 +219,7 @@ public class User { this.hardStageManager = new HardStageManager(); this.hardStageManager.init(id,MongoKey.hardStageManager); }else{ - if(this.hardStageManager.getMongoKey()== null || this.hardStageManager.getMongoKey() == ""){ + if(this.hardStageManager.getMongoKey()== null || this.hardStageManager.getMongoKey().isEmpty()){ this.hardStageManager.init(id,MongoKey.hardStageManager); try { MongoUtil.getInstence().getMyMongoTemplate().save(id,this); 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 9b9ded06c..0c7c638d0 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 @@ -381,7 +381,7 @@ public class HeroLogic{ builder.addAllDrawTimes(CBean2Proto.getRandomTypeNums(user)); MessageUtil.sendMessage(session, 1, MessageTypeProto.MessageType.HERO_RAND_RESPONSE_VALUE, builder.build(), true); - if(sLotterySetting.getLotteryType() == GlobalsDef.RANDOM_LOTTERY_TYPE && !user.getPlayerInfoManager().isHasRandomLotteryType()&sLotterySetting.getPerCount()!=1){ + if(sLotterySetting.getLotteryType() == GlobalsDef.RANDOM_LOTTERY_TYPE && !user.getPlayerInfoManager().isHasRandomLotteryType()&&sLotterySetting.getPerCount()!=1){ //首次神将召唤 10连抽 给个攻略邮件 String title = SErrorCodeEerverConfig.getI18NMessage("zhanneixin_title"); String content = SErrorCodeEerverConfig.getI18NMessageNeedConvert("zhanneixin_content",new Object[]{ user.getPlayerInfoManager().getNickName()},new int[]{0},"#"); @@ -745,6 +745,7 @@ public class HeroLogic{ case 11: eventEnum = ReportEventEnum.TREASURE_SUMMON; activityId = sLotterySetting.getActivityId(); + break; default: break;