diff --git a/pb.bat b/pb.bat index 1f12a60ee..444be98a9 100644 --- a/pb.bat +++ b/pb.bat @@ -1,12 +1,18 @@ @echo off - -set PROJECT_ROOT=.\ +set PROJECT_ROOT=. set SRC=%PROJECT_ROOT%\pb\proto set TAR=%PROJECT_ROOT%\pb - -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=source_relative %SRC%\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=source_relative %SRC%\*.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/comm.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/errorcode.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/friend/friend_db.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/friend/friend_msg.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/mail/mail_db.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/mail/mail_msg.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/pack/pack_db.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/pack/pack_msg.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/user/user_db.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import ./pb/proto/user/user_msg.proto pause \ No newline at end of file diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go index c961ac9aa..7f9263249 100644 --- a/pb/friend_db.pb.go +++ b/pb/friend_db.pb.go @@ -25,7 +25,7 @@ type Cache_FriendData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty" bson:"_id"` //tags:{bson:"_id"}用户Id + UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` //tags:{bson:"_id"}用户Id FriendId []string `protobuf:"bytes,2,rep,name=friendId,proto3" json:"friendId,omitempty"` } diff --git a/pb/mail_db.pb.go b/pb/mail_db.pb.go index 1172f18d5..be7ff2453 100644 --- a/pb/mail_db.pb.go +++ b/pb/mail_db.pb.go @@ -80,7 +80,7 @@ type DB_MailData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ObjId string `protobuf:"bytes,1,opt,name=ObjId,proto3" json:"ObjId,omitempty" bson:"_id"` // tags:{bson:"_id"} + ObjId string `protobuf:"bytes,1,opt,name=ObjId,proto3" json:"ObjId,omitempty"` // tags:{bson:"_id"} UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId,omitempty"` Title string `protobuf:"bytes,3,opt,name=Title,proto3" json:"Title,omitempty"` // 邮件标题 Contex string `protobuf:"bytes,4,opt,name=Contex,proto3" json:"Contex,omitempty"` // 邮件内容 diff --git a/pb/pack_db.pb.go b/pb/pack_db.pb.go index 73460579a..94bb4aa55 100644 --- a/pb/pack_db.pb.go +++ b/pb/pack_db.pb.go @@ -106,7 +106,7 @@ type DB_UserPackData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty" bson:"_id"` //tags:{bson:"_id"}用户Id + UserId string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty"` //tags:{bson:"_id"}用户Id Pack []*DB_GridData `protobuf:"bytes,2,rep,name=Pack,proto3" json:"Pack,omitempty"` //背包列表 } diff --git a/pb/pack_msg.pb.go b/pb/pack_msg.pb.go index 92d88648a..cd1be6dad 100644 --- a/pb/pack_msg.pb.go +++ b/pb/pack_msg.pb.go @@ -219,7 +219,7 @@ func (*UseItemResp) Descriptor() ([]byte, []int) { return file_pack_pack_msg_proto_rawDescGZIP(), []int{3} } -//出售道具请求 +//出售道具请求sailitem type SellItemReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 8d954cb8b..1ea0a64fc 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -88,7 +88,7 @@ type DB_UserData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty" bson:"_id"` //tags:{bson:"_id"}动态Id + UserId string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty"` //tags:{bson:"_id"}动态Id Account string `protobuf:"bytes,2,opt,name=Account,proto3" json:"Account,omitempty"` NiceName string `protobuf:"bytes,3,opt,name=NiceName,proto3" json:"NiceName,omitempty"` ServerId int32 `protobuf:"varint,4,opt,name=ServerId,proto3" json:"ServerId,omitempty"`