From a8d396021bcd270f5122c675c6f7089f8b8263fc Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 15 Jul 2020 14:08:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/exception/ErrorCode.java | 9 ++++++++- .../jieling/exception/ErrorCodeException.java | 6 ++++++ .../activity/GetLuckWheelRandHandler.java | 8 ++++++++ .../jieling/logic/activity/ActivityLogic.java | 1 + .../ljsd/jieling/logic/dao/PlayerManager.java | 11 ++++++++++ .../com/ljsd/jieling/util/FightDataUtil.java | 20 +++++++++---------- 6 files changed, 44 insertions(+), 11 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java index 802fdcabc..f9c58e20d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java @@ -150,9 +150,11 @@ public enum ErrorCode implements IErrorCode { NO_USE_SAME_HERO(116,"不可上阵重复英雄"), DAILY_ALREADY_PASS(117,"已通关,不可重复挑战"), DAILY_NO_OPEN(118,"进入副本条件不足"), - HAD_TAKE_REWARD(124,"奖励已领取") + HAD_TAKE_REWARD(124,"奖励已领取"), + SERVER_DEFINE_SELF(20000,"操作失败") + ; private static final Set CodeSet = new HashSet<>(); @@ -188,6 +190,10 @@ public enum ErrorCode implements IErrorCode { return codeId; } + public void setErrMsg(String errMsg) { + this.errMsg = errMsg; + } + @Override public String message() { return errMsg; @@ -196,4 +202,5 @@ public enum ErrorCode implements IErrorCode { public static String newDefineCode(String errMsg) { return errMsg; } + } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCodeException.java b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCodeException.java index b75458c3e..7c2576314 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCodeException.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCodeException.java @@ -14,6 +14,12 @@ public class ErrorCodeException extends Exception { this.errorCode = errorCode; } + public ErrorCodeException(ErrorCode errorCode,String newdefine) { + super(newdefine); + errorCode.setErrMsg(newdefine); + this.errorCode = errorCode; + } + public ErrorCodeException(String message) { super(message); errorCode = ErrorCode.SERVER_DEFINE; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java index a8b95715c..a6303a76d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/activity/GetLuckWheelRandHandler.java @@ -56,6 +56,7 @@ public class GetLuckWheelRandHandler extends BaseHandler100){ + throw new ErrorCodeException( ErrorCode.SERVER_DEFINE_SELF,"不可超出每日探宝上限次数!"); + } + user.getPlayerInfoManager().setLuckWheelLimitTime(luckWheelLimitTime+time); + int luckId; int lastpos=1; Set posSet = new HashSet<>(); 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 be07ed6d1..40b354fdc 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 @@ -88,6 +88,7 @@ public class ActivityLogic implements IEventHandler{ //更新累计充值天数 ActivityLogic.getInstance().resumeActivity(user, ActivityType.RECHARGE_SUM_DAY); user.getPlayerInfoManager().setRechargedaily(0); + user.getPlayerInfoManager().setLuckWheelLimitTime(0); updateActivityMissionProgress(user, ActivityType.SevenLogin, 1); Poster.getPoster().dispatchEvent(new NewWelfareEvent(user, NewWelfareTypeEnum.LOGIN_TIMES.getType(),1)); 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 d688dd672..f685d37f4 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 @@ -105,6 +105,8 @@ public class PlayerManager extends MongoBase { private Set proudInfo = new HashSet<>(); + private int luckWheelLimitTime; + public PlayerManager(){ this.setRootCollection(User._COLLECTION_NAME); } @@ -705,4 +707,13 @@ public class PlayerManager extends MongoBase { this.proudInfo = proudInfo; updateString("proudInfo",proudInfo); } + + public int getLuckWheelLimitTime() { + return luckWheelLimitTime; + } + + public void setLuckWheelLimitTime(int luckWheelLimitTime) { + updateString("luckWheelLimitTime",luckWheelLimitTime); + this.luckWheelLimitTime = luckWheelLimitTime; + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java index c2a433a15..fcebb6da1 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/FightDataUtil.java @@ -286,11 +286,19 @@ public class FightDataUtil { // cd+=Integer.parseInt(args[0]); // } skill.rawset(1, LuaValue.valueOf(skillId)); + int skillDisplay =sSkillLogicVo.getSkillDisplay(); + SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay); + int KeyFrame = sCombatControl.getKeyFrame(); + int SkillDuration = sCombatControl.getSkillDuration(); + int SkillNumber = sCombatControl.getSkillNumber(); + skill.rawset(2, LuaValue.valueOf(KeyFrame/1000f)); + skill.rawset(3, LuaValue.valueOf(SkillDuration/1000f)); + skill.rawset(4, LuaValue.valueOf(SkillNumber)); List effectList = getEffect(sSkillLogicVo); int size = effectList.size(); if (size > 0) { for (int i = 0; i < size; i++) { - skill.rawset(i + 2, effectList.get(i)); + skill.rawset(i + 5, effectList.get(i)); } } } @@ -301,20 +309,12 @@ public class FightDataUtil { List effectList = new ArrayList<>(); for (SkillTargetVo skillTargetVos : sSkillLogicVo.getSkillTargetVoList()) { LuaValue effect = new LuaTable(); - int skillDisplay =sSkillLogicVo.getSkillDisplay(); - SCombatControl sCombatControl = STableManager.getConfig(SCombatControl.class).get(skillDisplay); - int KeyFrame = sCombatControl.getKeyFrame(); - int SkillDuration = sCombatControl.getSkillDuration(); - int SkillNumber = sCombatControl.getSkillNumber(); effect.rawset(1, LuaValue.valueOf(skillTargetVos.getTargetId())); - effect.rawset(2, LuaValue.valueOf(KeyFrame/1000f)); - effect.rawset(3, LuaValue.valueOf(SkillDuration/1000f)); - effect.rawset(4, LuaValue.valueOf(SkillNumber)); List effectValueList = getEffectArgs(skillTargetVos.getEffectVale()); int size = effectValueList.size(); if (size > 0) { for (int i = 0; i < size; i++) { - effect.rawset(i + 5, effectValueList.get(i)); + effect.rawset(i + 2, effectValueList.get(i)); } } effectList.add(effect);