diff --git a/modules/integral/api_achieve.go b/modules/integral/api_achieve.go index 75813500e..6db3be76b 100644 --- a/modules/integral/api_achieve.go +++ b/modules/integral/api_achieve.go @@ -40,8 +40,8 @@ func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAc } if _, ok := list.Achieve[req.Id]; ok { // 重复激活 errdata = &pb.ErrorData{ - Code: pb.ErrorCode_TntegralRepleteAchive, - Title: pb.ErrorCode_TntegralRepleteAchive.ToString(), + Code: pb.ErrorCode_TntegralRepeatedAchive, + Title: pb.ErrorCode_TntegralRepeatedAchive.ToString(), Message: err.Error(), } return @@ -65,6 +65,9 @@ func (this *apiComp) GetAchieve(session comm.IUserSession, req *pb.IntegralGetAc } return } + if errdata, atno = this.module.DispenseAtno(session, conf.Reward, true); err != nil { + return + } session.SendMsg(string(this.module.GetType()), "getachieve", &pb.IntegralGetAchieveResp{ Achieve: list.Achieve, Award: atno, diff --git a/modules/plunder/api_reach.go b/modules/plunder/api_reach.go index eebe03bec..2eae71df3 100644 --- a/modules/plunder/api_reach.go +++ b/modules/plunder/api_reach.go @@ -72,8 +72,8 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) ( } else { if land.Ship[oid].Line.Etime > configure.Now().Unix() { // 还没到时间 船没到达 errdata = &pb.ErrorData{ - Code: pb.ErrorCode_TntegralShipUnReach, - Title: pb.ErrorCode_TntegralShipUnReach.ToString(), + Code: pb.ErrorCode_PlundeShipUnReach, + Title: pb.ErrorCode_PlundeShipUnReach.ToString(), } return } diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 7d9fed95c..9f0c9e822 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -473,7 +473,6 @@ const ( // integral ErrorCode_TntegralDayMaxChallenge ErrorCode = 5301 // 当日挑战达上限 ErrorCode_TntegralRepeatedAchive ErrorCode = 5302 // 重复激活 - ErrorCode_TntegralShipUnReach ErrorCode = 5303 // 船 未到达 //plunder ErrorCode_PlunderNotFoundShip ErrorCode = 5401 // pvp 没找到数据 ErrorCode_PlunderLineUnlock ErrorCode = 5402 // 队列没解锁 @@ -484,6 +483,7 @@ const ( ErrorCode_PlundeShipRunning ErrorCode = 5407 //运输中 ErrorCode_PlundeUnlock ErrorCode = 5408 //已解锁 ErrorCode_PlundeAlreadyLearn ErrorCode = 5409 //重复学习 + ErrorCode_PlundeShipUnReach ErrorCode = 5410 // 船 未到达 ) // Enum value maps for ErrorCode. @@ -893,7 +893,6 @@ var ( 5212: "EntertainNoSkillCard", 5301: "TntegralDayMaxChallenge", 5302: "TntegralRepeatedAchive", - 5303: "TntegralShipUnReach", 5401: "PlunderNotFoundShip", 5402: "PlunderLineUnlock", 5403: "PlundeRepleteRecive", @@ -903,6 +902,7 @@ var ( 5407: "PlundeShipRunning", 5408: "PlundeUnlock", 5409: "PlundeAlreadyLearn", + 5410: "PlundeShipUnReach", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -1309,7 +1309,6 @@ var ( "EntertainNoSkillCard": 5212, "TntegralDayMaxChallenge": 5301, "TntegralRepeatedAchive": 5302, - "TntegralShipUnReach": 5303, "PlunderNotFoundShip": 5401, "PlunderLineUnlock": 5402, "PlundeRepleteRecive": 5403, @@ -1319,6 +1318,7 @@ var ( "PlundeShipRunning": 5407, "PlundeUnlock": 5408, "PlundeAlreadyLearn": 5409, + "PlundeShipUnReach": 5410, } ) @@ -1353,7 +1353,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, - 0x6f, 0x2a, 0x9d, 0x4d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0x9b, 0x4d, 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, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1956,23 +1956,22 @@ var file_errorcode_proto_rawDesc = []byte{ 0x65, 0x67, 0x72, 0x61, 0x6c, 0x44, 0x61, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x10, 0xb5, 0x29, 0x12, 0x1b, 0x0a, 0x16, 0x54, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x63, 0x68, 0x69, 0x76, - 0x65, 0x10, 0xb6, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, - 0x53, 0x68, 0x69, 0x70, 0x55, 0x6e, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0xb7, 0x29, 0x12, 0x18, - 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, - 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, - 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0x9a, 0x2a, - 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74, - 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, - 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9c, 0x2a, - 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, - 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, - 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a, - 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69, - 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, - 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, - 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, - 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x10, 0xb6, 0x29, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4e, + 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x53, 0x68, 0x69, 0x70, 0x10, 0x99, 0x2a, 0x12, 0x16, + 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x6e, 0x6c, + 0x6f, 0x63, 0x6b, 0x10, 0x9a, 0x2a, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, + 0x52, 0x65, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x63, 0x69, 0x76, 0x65, 0x10, 0x9b, 0x2a, + 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x65, + 0x61, 0x63, 0x68, 0x10, 0x9c, 0x2a, 0x12, 0x15, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, + 0x4e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x68, 0x69, 0x70, 0x10, 0x9d, 0x2a, 0x12, 0x14, 0x0a, + 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, + 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, + 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, + 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, + 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, + 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, + 0x65, 0x53, 0x68, 0x69, 0x70, 0x55, 0x6e, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0xa2, 0x2a, 0x42, + 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (