From 37d7998748db7b05319acc15fa00d67ba0d81c87 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 13 Dec 2022 11:59:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=A1=8C=E8=AF=81=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/pagoda/api.go | 2 +- .../{api_passcheck.go => api_warorder.go} | 8 +-- pb/pagoda_msg.pb.go | 64 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-) rename modules/pagoda/{api_passcheck.go => api_warorder.go} (85%) diff --git a/modules/pagoda/api.go b/modules/pagoda/api.go index cafe8fea4..b0e356161 100644 --- a/modules/pagoda/api.go +++ b/modules/pagoda/api.go @@ -14,7 +14,7 @@ const ( PagodaGetRewardResp = "getreward" PagodaRankListResp = "ranklist" PagodaActivateResp = "activate" - PagodaPassCheckResp = "passcheck" + PagodaWarOrderResp = "warorder" ) type apiComp struct { diff --git a/modules/pagoda/api_passcheck.go b/modules/pagoda/api_warorder.go similarity index 85% rename from modules/pagoda/api_passcheck.go rename to modules/pagoda/api_warorder.go index fb6c85226..9f1cc087a 100644 --- a/modules/pagoda/api_passcheck.go +++ b/modules/pagoda/api_warorder.go @@ -9,13 +9,13 @@ import ( ) //参数校验 -func (this *apiComp) PassCheckCheck(session comm.IUserSession, req *pb.PagodaPassCheckReq) (code pb.ErrorCode) { +func (this *apiComp) WarOrderCheck(session comm.IUserSession, req *pb.PagodaWarOrderReq) (code pb.ErrorCode) { return } // 战令领取 -func (this *apiComp) PassCheck(session comm.IUserSession, req *pb.PagodaPassCheckReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) WarOrder(session comm.IUserSession, req *pb.PagodaWarOrderReq) (code pb.ErrorCode, data proto.Message) { var ( list *pb.DBPagoda resCfg []*cfg.Gameatn @@ -26,7 +26,7 @@ func (this *apiComp) PassCheck(session comm.IUserSession, req *pb.PagodaPassChec mapData map[string]interface{} ) mapData = make(map[string]interface{}, 0) - this.PassCheckCheck(session, req) + //this.WarOrderCheck(session, req) list, _ = this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId()) if list.Id == "" { @@ -90,7 +90,7 @@ func (this *apiComp) PassCheck(session comm.IUserSession, req *pb.PagodaPassChec }) } code = this.module.ModifySeasonPagodaData(session.GetUserId(), mapData) - session.SendMsg(string(this.module.GetType()), PagodaPassCheckResp, &pb.PagodaPassCheckResp{ + session.SendMsg(string(this.module.GetType()), PagodaWarOrderResp, &pb.PagodaWarOrderResp{ Data: list, Itmes: res, }) diff --git a/pb/pagoda_msg.pb.go b/pb/pagoda_msg.pb.go index 3ae29f5ac..ae4b3e089 100644 --- a/pb/pagoda_msg.pb.go +++ b/pb/pagoda_msg.pb.go @@ -715,14 +715,14 @@ func (x *PagodaActivateResp) GetData() *DBPagoda { } // 领取战令奖励 -type PagodaPassCheckReq struct { +type PagodaWarOrderReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields } -func (x *PagodaPassCheckReq) Reset() { - *x = PagodaPassCheckReq{} +func (x *PagodaWarOrderReq) Reset() { + *x = PagodaWarOrderReq{} if protoimpl.UnsafeEnabled { mi := &file_pagoda_pagoda_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -730,13 +730,13 @@ func (x *PagodaPassCheckReq) Reset() { } } -func (x *PagodaPassCheckReq) String() string { +func (x *PagodaWarOrderReq) String() string { return protoimpl.X.MessageStringOf(x) } -func (*PagodaPassCheckReq) ProtoMessage() {} +func (*PagodaWarOrderReq) ProtoMessage() {} -func (x *PagodaPassCheckReq) ProtoReflect() protoreflect.Message { +func (x *PagodaWarOrderReq) ProtoReflect() protoreflect.Message { mi := &file_pagoda_pagoda_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -748,12 +748,12 @@ func (x *PagodaPassCheckReq) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use PagodaPassCheckReq.ProtoReflect.Descriptor instead. -func (*PagodaPassCheckReq) Descriptor() ([]byte, []int) { +// Deprecated: Use PagodaWarOrderReq.ProtoReflect.Descriptor instead. +func (*PagodaWarOrderReq) Descriptor() ([]byte, []int) { return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{14} } -type PagodaPassCheckResp struct { +type PagodaWarOrderResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -762,8 +762,8 @@ type PagodaPassCheckResp struct { Itmes []*UserAssets `protobuf:"bytes,2,rep,name=itmes,proto3" json:"itmes"` // 获得的奖励 } -func (x *PagodaPassCheckResp) Reset() { - *x = PagodaPassCheckResp{} +func (x *PagodaWarOrderResp) Reset() { + *x = PagodaWarOrderResp{} if protoimpl.UnsafeEnabled { mi := &file_pagoda_pagoda_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -771,13 +771,13 @@ func (x *PagodaPassCheckResp) Reset() { } } -func (x *PagodaPassCheckResp) String() string { +func (x *PagodaWarOrderResp) String() string { return protoimpl.X.MessageStringOf(x) } -func (*PagodaPassCheckResp) ProtoMessage() {} +func (*PagodaWarOrderResp) ProtoMessage() {} -func (x *PagodaPassCheckResp) ProtoReflect() protoreflect.Message { +func (x *PagodaWarOrderResp) ProtoReflect() protoreflect.Message { mi := &file_pagoda_pagoda_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -789,19 +789,19 @@ func (x *PagodaPassCheckResp) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use PagodaPassCheckResp.ProtoReflect.Descriptor instead. -func (*PagodaPassCheckResp) Descriptor() ([]byte, []int) { +// Deprecated: Use PagodaWarOrderResp.ProtoReflect.Descriptor instead. +func (*PagodaWarOrderResp) Descriptor() ([]byte, []int) { return file_pagoda_pagoda_msg_proto_rawDescGZIP(), []int{15} } -func (x *PagodaPassCheckResp) GetData() *DBPagoda { +func (x *PagodaWarOrderResp) GetData() *DBPagoda { if x != nil { return x.Data } return nil } -func (x *PagodaPassCheckResp) GetItmes() []*UserAssets { +func (x *PagodaWarOrderResp) GetItmes() []*UserAssets { if x != nil { return x.Itmes } @@ -871,14 +871,14 @@ var file_pagoda_pagoda_msg_proto_rawDesc = []byte{ 0x67, 0x6f, 0x64, 0x61, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, - 0x14, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x50, 0x61, 0x73, 0x73, 0x43, 0x68, 0x65, - 0x63, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x57, 0x0a, 0x13, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x50, - 0x61, 0x73, 0x73, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, - 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x69, - 0x74, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x6d, 0x65, 0x73, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x13, 0x0a, 0x11, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x57, 0x61, 0x72, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x22, 0x56, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x57, 0x61, + 0x72, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, + 0x6f, 0x64, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x6d, + 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, + 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x6d, 0x65, 0x73, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -909,8 +909,8 @@ var file_pagoda_pagoda_msg_proto_goTypes = []interface{}{ (*PagodaQueryRecordResp)(nil), // 11: PagodaQueryRecordResp (*PagodaActivateReq)(nil), // 12: PagodaActivateReq (*PagodaActivateResp)(nil), // 13: PagodaActivateResp - (*PagodaPassCheckReq)(nil), // 14: PagodaPassCheckReq - (*PagodaPassCheckResp)(nil), // 15: PagodaPassCheckResp + (*PagodaWarOrderReq)(nil), // 14: PagodaWarOrderReq + (*PagodaWarOrderResp)(nil), // 15: PagodaWarOrderResp (*DBPagoda)(nil), // 16: DBPagoda (*BattleFormation)(nil), // 17: BattleFormation (*BattleInfo)(nil), // 18: BattleInfo @@ -928,8 +928,8 @@ var file_pagoda_pagoda_msg_proto_depIdxs = []int32{ 20, // 6: PagodaRankListResp.ranks:type_name -> DBPagodaRecord 20, // 7: PagodaQueryRecordResp.data:type_name -> DBPagodaRecord 16, // 8: PagodaActivateResp.data:type_name -> DBPagoda - 16, // 9: PagodaPassCheckResp.data:type_name -> DBPagoda - 21, // 10: PagodaPassCheckResp.itmes:type_name -> UserAssets + 16, // 9: PagodaWarOrderResp.data:type_name -> DBPagoda + 21, // 10: PagodaWarOrderResp.itmes:type_name -> UserAssets 11, // [11:11] is the sub-list for method output_type 11, // [11:11] is the sub-list for method input_type 11, // [11:11] is the sub-list for extension type_name @@ -1115,7 +1115,7 @@ func file_pagoda_pagoda_msg_proto_init() { } } file_pagoda_pagoda_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PagodaPassCheckReq); i { + switch v := v.(*PagodaWarOrderReq); i { case 0: return &v.state case 1: @@ -1127,7 +1127,7 @@ func file_pagoda_pagoda_msg_proto_init() { } } file_pagoda_pagoda_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PagodaPassCheckResp); i { + switch v := v.(*PagodaWarOrderResp); i { case 0: return &v.state case 1: