diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index f474f91fe..0c11d2c25 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -165,22 +165,15 @@ const ( ErrorCode_VikingBoosType ErrorCode = 2302 // BOSS 类型不对 ErrorCode_VikingBuyMaxCount ErrorCode = 2303 // 购买达到最大次数 // moonfantasy 月之秘境 -<<<<<<< HEAD - ErrorCode_MoonfantasyHasExpired ErrorCode = 2401 // boos 连接已失效 - ErrorCode_MoonfantasyJoinUp ErrorCode = 2402 // boos 参与人数已达上限 - ErrorCode_MoonfantasyDareUp ErrorCode = 2403 // boos 挑战次数已达上限 - ErrorCode_MoonfantasyBattleNoEnd ErrorCode = 2404 // boos 战斗未结束 - ErrorCode_MoonfantasyBattleNoWin ErrorCode = 2405 // boos 战斗魏未胜利 - ErrorCode_BattleNoFoundRecord ErrorCode = 2501 // 未找到记录 -======= - ErrorCode_MoonfantasyHasExpired ErrorCode = 2401 // boos 连接已失效 - ErrorCode_MoonfantasyJoinUp ErrorCode = 2402 // boos 参与人数已达上限 - ErrorCode_MoonfantasyDareUp ErrorCode = 2403 // boos 挑战次数已达上限 - // linestory - ErrorCode_LinestoryTaskNoFinished ErrorCode = 2501 //任务未完成 - ErrorCode_LinestorySubTaskNoFinished ErrorCode = 2502 //子任务未完成 - ErrorCode_LinestoryTaskDisabledEnter ErrorCode = 2503 //禁止进入 ->>>>>>> e241cbe (支线剧情任务) + ErrorCode_MoonfantasyHasExpired ErrorCode = 2401 // boos 连接已失效 + ErrorCode_MoonfantasyJoinUp ErrorCode = 2402 // boos 参与人数已达上限 + ErrorCode_MoonfantasyDareUp ErrorCode = 2403 // boos 挑战次数已达上限 + ErrorCode_MoonfantasyBattleNoEnd ErrorCode = 2404 // boos 战斗未结束 + ErrorCode_MoonfantasyBattleNoWin ErrorCode = 2405 // boos 战斗魏未胜利 + ErrorCode_BattleNoFoundRecord ErrorCode = 2501 // 未找到记录 + ErrorCode_LinestoryTaskNoFinished ErrorCode = 2601 //任务未完成 + ErrorCode_LinestorySubTaskNoFinished ErrorCode = 2602 //子任务未完成 + ErrorCode_LinestoryTaskDisabledEnter ErrorCode = 2603 //禁止进入 ) // Enum value maps for ErrorCode. @@ -316,149 +309,12 @@ var ( 2401: "MoonfantasyHasExpired", 2402: "MoonfantasyJoinUp", 2403: "MoonfantasyDareUp", -<<<<<<< HEAD 2404: "MoonfantasyBattleNoEnd", 2405: "MoonfantasyBattleNoWin", 2501: "BattleNoFoundRecord", - } - ErrorCode_value = map[string]int32{ - "Success": 0, - "NoFindService": 10, - "NoFindServiceHandleFunc": 11, - "RpcFuncExecutionError": 12, - "CacheReadError": 13, - "SqlExecutionError": 14, - "ReqParameterError": 15, - "SignError": 16, - "InsufficientPermissions": 17, - "NoLogin": 18, - "UserSessionNobeing": 19, - "StateInvalid": 20, - "DBError": 21, - "SystemError": 22, - "DecodeError": 23, - "TimestampTimeout": 24, - "PbError": 25, - "AgentUidEmpty": 26, - "Exception": 100, - "Unknown": 101, - "ResNoEnough": 102, - "ConfigurationException": 103, - "ConfigNoFound": 104, - "SecKeyInvalid": 1000, - "SecKey": 1001, - "BindUser": 1002, - "GoldNoEnough": 1003, - "DiamondNoEnough": 1004, - "RoleCreated": 1005, - "UserNickNameExist": 1006, - "VeriCodeNoValid": 1007, - "VeriCodeExpired": 1008, - "UserResetData": 1009, - "UserModiNameCount": 1010, - "UserNickNameEmpty": 1011, - "UserExpandNull": 1012, - "FriendNotSelf": 1100, - "FriendSelfMax": 1101, - "FriendTargetMax": 1102, - "FriendSelfNoData": 1103, - "FriendTargetNoData": 1104, - "FriendYet": 1105, - "FriendApplyYet": 1106, - "FriendSelfBlackYet": 1107, - "FriendTargetBlackYet": 1108, - "FriendApplyError": 1109, - "FriendBlackMax": 1110, - "FriendSearchNameEmpty": 1111, - "FriendZaned": 1112, - "FriendZanreceived": 1113, - "FriendZanSelf": 1114, - "FriendPointLimit": 1115, - "ItemsNoEnough": 1200, - "ItemsNoFoundGird": 1201, - "ItemsGridNumUpper": 1202, - "ItemsGirdAmountUpper": 1203, - "ItemsUseNotSupported": 1204, - "HeroNoExist": 1300, - "HeroNoEnough": 1301, - "HeroMaxLv": 1302, - "HeroInitCreat": 1303, - "HeroColorErr": 1304, - "HeroSkillUpErr": 1305, - "HeroMaxResonate": 1306, - "HeroNoResonate": 1307, - "HeroNotNeedResonate": 1308, - "HeroNoEnergy": 1309, - "HeroCreate": 1310, - "HeroEquipUpdate": 1311, - "HeroMaxAwaken": 1312, - "HeroIsLock": 1313, - "HeroMaxCount": 1314, - "HeroCostTypeErr": 1315, - "HeroStarErr": 1316, - "HeroTypeErr": 1317, - "HeroExpTypeErr": 1318, - "HeroAddMaxExp": 1319, - "HeroStarLvErr": 1320, - "HeroMaxStarLv": 1321, - "DrawCardTypeNotFound": 1322, - "HeroMaxSkillLv": 1323, - "HeroAlreadyKongFuStatus": 1324, - "EquipmentOnFoundEquipment": 1400, - "EquipmentLvlimitReached": 1401, - "EquipmentIsWorn": 1402, - "EquipmentNoCanSell": 1403, - "MainlineNotFindChapter": 1500, - "MainlineIDFailed": 1501, - "MainlineNotFound": 1502, - "MainlinePreNotFound": 1503, - "MainlineRepeatReward": 1504, - "MainlineCompleteReward": 1505, - "TaskInit": 1600, - "TaskReset": 1601, - "TaskHandle": 1602, - "TaskReceived": 1603, - "TaskActiveInit": 1604, - "TaskActiveNofound": 1605, - "TaskActiveNoenough": 1606, - "TaskNoFinished": 1607, - "TaskFinished": 1608, - "TaskTagEmpty": 1609, - "TaskIdEmpty": 1610, - "TaskNotFound": 1611, - "ShopGoodsIsSoldOut": 1700, - "ShopNoSurplusRefreshNum": 1701, - "MailErr": 1800, - "PagodaNotFound": 1900, - "PagodaLevlErr": 1901, - "PagodaGetRewardErr": 1902, - "PagodaConditionErr": 1903, - "MartialhallNotUnlocked": 2000, - "MartialhallInUse": 2001, - "MartialhallUnlocked": 2002, - "MartialhallNoUnlocked": 2003, - "GourmetMoreOrderTime": 2101, - "GourmetSkillMaxLv": 2102, - "RtaskFinished": 2201, - "RtaskUnFinished": 2202, - "RtaskNoRtask": 2203, - "RtaskRewarded": 2204, - "RtaskPreNoFinish": 2205, - "RtaskCondiNoReach": 2206, - "RtaskNoLastOne": 2207, - "VikingLvErr": 2301, - "VikingBoosType": 2302, - "VikingBuyMaxCount": 2303, - "MoonfantasyHasExpired": 2401, - "MoonfantasyJoinUp": 2402, - "MoonfantasyDareUp": 2403, - "MoonfantasyBattleNoEnd": 2404, - "MoonfantasyBattleNoWin": 2405, - "BattleNoFoundRecord": 2501, -======= - 2501: "LinestoryTaskNoFinished", - 2502: "LinestorySubTaskNoFinished", - 2503: "LinestoryTaskDisabledEnter", + 2601: "LinestoryTaskNoFinished", + 2602: "LinestorySubTaskNoFinished", + 2603: "LinestoryTaskDisabledEnter", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -591,10 +447,12 @@ var ( "MoonfantasyHasExpired": 2401, "MoonfantasyJoinUp": 2402, "MoonfantasyDareUp": 2403, - "LinestoryTaskNoFinished": 2501, - "LinestorySubTaskNoFinished": 2502, - "LinestoryTaskDisabledEnter": 2503, ->>>>>>> e241cbe (支线剧情任务) + "MoonfantasyBattleNoEnd": 2404, + "MoonfantasyBattleNoWin": 2405, + "BattleNoFoundRecord": 2501, + "LinestoryTaskNoFinished": 2601, + "LinestorySubTaskNoFinished": 2602, + "LinestoryTaskDisabledEnter": 2603, } ) @@ -629,11 +487,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, -<<<<<<< HEAD - 0x6f, 0x2a, 0xd3, 0x16, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, -======= - 0x6f, 0x2a, 0xdf, 0x16, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, ->>>>>>> e241cbe (支线剧情任务) + 0x6f, 0x2a, 0xb3, 0x17, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -809,24 +663,19 @@ var file_errorcode_proto_rawDesc = []byte{ 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, -<<<<<<< HEAD 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, - 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1c, 0x0a, 0x17, 0x4c, 0x69, 0x6e, 0x65, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, + 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, + 0x72, 0x79, 0x53, 0x75, 0x62, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, + 0x68, 0x65, 0x64, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, + 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -======= - 0x10, 0xe3, 0x12, 0x12, 0x1c, 0x0a, 0x17, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, - 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc5, - 0x13, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x53, 0x75, - 0x62, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, - 0xc6, 0x13, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, - 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, - 0x10, 0xc7, 0x13, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, ->>>>>>> e241cbe (支线剧情任务) } var (