From d872a55549d53d323b5827154b6a06d385906084 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 30 Dec 2020 00:26:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java | 1 + .../src/main/java/com/ljsd/jieling/exception/ErrorCode.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java index e1db01ed3..c7604d393 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java @@ -63,6 +63,7 @@ public enum FunctionIdEnum { DeathPath(72,null), Car_Delay(73,new CarDelayFunction()), Situation_challenge(74,null), + Pokemon(79,null), World_Arena(82,new WorldArenaFunction()), ; 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 578044a05..c26643aa8 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java @@ -50,7 +50,6 @@ public enum ErrorCode implements IErrorCode { ADVENTURE_CALL_BOSS_TIMES(17,"召唤秘境boss 次数不足"), UNLOCK_SKIP_FIGHT(18,"vip跳过战斗功能未解锁"), ADVENTURE_BOSS_CHALLENGE_IN(19,"外地入侵挑战 正在战斗中"), - ADVENTURE_BOSS_CHALLENGE_BOSS_KILL(19,"外地入侵挑战 外敌已被击杀"), CDK_FAIL(20,"兑换码无效"), CDK_USED(21,"兑换码已使用"), @@ -163,7 +162,8 @@ public enum ErrorCode implements IErrorCode { SERVER_DEFINE_SELF(20000,"操作失败"), - + CHALLENGE_MISS(136,"挑战时间已过,请重新进入"), + GAIN_MISS(137,"抢夺时间已过,请重新进入"), BAG_FULL(135,"背包内存储空间不足,无法领取附件"),