diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/comparenum/CompareNumRewardHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/comparenum/CompareNumRewardHandler.java index 75f2c43a7..dbca74cc4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/comparenum/CompareNumRewardHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/comparenum/CompareNumRewardHandler.java @@ -2,12 +2,12 @@ package com.ljsd.jieling.handler.comparenum; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.exception.ErrorTableException; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.PlayerManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.logic.fight.DuoduiTowerLogic; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.util.ItemUtil; import com.ljsd.jieling.util.MessageUtil; @@ -15,7 +15,6 @@ import config.SCompareNumSetting; import config.SSpecialConfig; import org.springframework.stereotype.Component; import rpc.protocols.CommonProto; -import rpc.protocols.FightInfoProto; import rpc.protocols.MessageTypeProto; import rpc.protocols.PlayerInfoProto; import util.TimeUtils; @@ -42,6 +41,9 @@ public class CompareNumRewardHandler extends BaseHandler { @Override public MessageTypeProto.MessageType getMessageCode() { diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/DuoduiTowerLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/DuoduiTowerLogic.java index e0aa1c1d7..d794d3685 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/DuoduiTowerLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/fight/DuoduiTowerLogic.java @@ -5,6 +5,7 @@ import com.ljsd.jieling.core.FunctionIdEnum; import com.ljsd.jieling.core.VipPrivilegeType; import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; +import com.ljsd.jieling.exception.ErrorTableException; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.logic.GlobleSystemLogic; import com.ljsd.jieling.logic.dao.TeamEnum; @@ -156,10 +157,6 @@ public class DuoduiTowerLogic { /** * 多队塔挂机奖励 - * @param iSession - * @param type - * @param operate - * @throws Exception */ public void duoduiReward(ISession iSession, int type, int operate) throws Exception { User user = UserManager.getUser(iSession.getUid()); @@ -169,9 +166,8 @@ public class DuoduiTowerLogic { int[] tower = user.getPlayerInfoManager().getDuoduiTower(type); int tier = tower[0]; int time = tower[1]; - if (tier == 0 || time ==0){ - String format = MessageFormat.format("多队获取奖励失败,类型:{0},当前层数:{1},time:{2},uid:{3}", type, tier, time, user.getId()); - throw new ErrorCodeException(format); + if (tier == 0 || time == 0){ + throw new ErrorTableException(179);//挑战关卡后可领取 } List towers = SDuoDuiTower.duoduiMap.get(type).get(tier); if (towers == null || towers.isEmpty() || towers.get(0).getIncome() == null || towers.get(0).getIncome().length == 0){