From 888c11dde2a2b29ac3f682e3dc036afdce77d582 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Fri, 19 Mar 2021 16:43:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E6=9C=8D=E8=AE=BE=E7=BD=AE=E7=AC=AC?= =?UTF-8?q?=E5=8D=81=E5=9B=9B=E5=A4=A9=E5=90=8E=E5=BC=80=E5=90=AF=E5=A4=A9?= =?UTF-8?q?=E5=AE=AB=E7=A7=98=E5=AE=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/expedition/ExpeditionLogic.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java index 0b88b4ee9..d2559a6c7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/expedition/ExpeditionLogic.java @@ -529,8 +529,8 @@ public class ExpeditionLogic { SExpeditionSetting sExpeditionSetting = STableManager.getConfig(SExpeditionSetting.class).get(1); int openRule = sExpeditionSetting.getOpenRules()[0]; if(openRule == type && sExpeditionSetting.getOpenRules()[1] == parm){ - //设置第一次七天后开启 - user.getExpeditionManager().getWorldTreasureReward().setFirstStartTime((int)((TimeUtils.now()+7*TimeUtils.ONE_DAY)/1000)); + //国服设置第十四天后开启 + user.getExpeditionManager().getWorldTreasureReward().setFirstStartTime((int)((TimeUtils.now()+14*TimeUtils.ONE_DAY)/1000)); // user.getExpeditionManager().resetTreasureReward(1); // sendAllTreasureInfo(user); } @@ -595,10 +595,8 @@ public class ExpeditionLogic { if (scHero == null) { throw new ErrorCodeException(ErrorCode.CFG_NULL,"英雄表id不存在:"+heroTid); } - // 最高等级 + // 等级上限验证 level = level>scHero.getMaxLevel()?scHero.getMaxLevel():level; - // 最低20级 - level = level<20?20:level; //创建新的英雄 Hero newHero = new Hero(hero,user.getId(),heroTid,level); // 魂宝灵宝,魂印需要走表 @@ -845,9 +843,6 @@ public class ExpeditionLogic { * 处理圣物英雄技能 */ private static void disposeWithHeroHoly(User user,Hero hero,StringBuilder skillSb){ - if(!user.getExpeditionManager().getHeroItems().containsKey(hero.getTemplateId())){ - return; - } int holyId = user.getExpeditionManager().getHeroItems().get(hero.getTemplateId()); SExpeditionHolyConfig con = STableManager.getConfig(SExpeditionHolyConfig.class).get(holyId); if( con != null ){