pb 同步
This commit is contained in:
parent
5dedb95ca4
commit
6308da3bcc
@ -209,10 +209,7 @@ const (
|
||||
ErrorCode_TalentRepeatLearn ErrorCode = 3201 // 天赋已学习
|
||||
ErrorCode_TalentErrData ErrorCode = 3202 /// 天赋不存在
|
||||
ErrorCode_TalentUnLockerBefore ErrorCode = 3203 //先解锁前置天赋
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
ErrorCode_TalentResetState ErrorCode = 3204 //当前天赋已经是重置状态
|
||||
>>>>>>> bdc162616c093452fa61f4a055657a4898086725
|
||||
)
|
||||
|
||||
// Enum value maps for ErrorCode.
|
||||
@ -383,10 +380,7 @@ var (
|
||||
3201: "TalentRepeatLearn",
|
||||
3202: "TalentErrData",
|
||||
3203: "TalentUnLockerBefore",
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
3204: "TalentResetState",
|
||||
>>>>>>> bdc162616c093452fa61f4a055657a4898086725
|
||||
}
|
||||
ErrorCode_value = map[string]int32{
|
||||
"Success": 0,
|
||||
@ -554,10 +548,7 @@ var (
|
||||
"TalentRepeatLearn": 3201,
|
||||
"TalentErrData": 3202,
|
||||
"TalentUnLockerBefore": 3203,
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
"TalentResetState": 3204,
|
||||
>>>>>>> bdc162616c093452fa61f4a055657a4898086725
|
||||
}
|
||||
)
|
||||
|
||||
@ -592,11 +583,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, 0xb7, 0x1c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
=======
|
||||
0x6f, 0x2a, 0xf8, 0x1c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
>>>>>>> bdc162616c093452fa61f4a055657a4898086725
|
||||
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,
|
||||
@ -817,16 +804,6 @@ var file_errorcode_proto_rawDesc = []byte{
|
||||
0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a,
|
||||
0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e,
|
||||
0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f,
|
||||
<<<<<<< HEAD
|
||||
0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xbb, 0x17, 0x12, 0x15, 0x0a,
|
||||
0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55,
|
||||
0x70, 0x10, 0x9d, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65,
|
||||
0x70, 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d,
|
||||
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19,
|
||||
0x12, 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b,
|
||||
0x65, 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e,
|
||||
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
=======
|
||||
0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a,
|
||||
0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10,
|
||||
0xbc, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41,
|
||||
@ -839,7 +816,6 @@ var file_errorcode_proto_rawDesc = []byte{
|
||||
0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52,
|
||||
0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, 0x19, 0x42, 0x06, 0x5a, 0x04,
|
||||
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
>>>>>>> bdc162616c093452fa61f4a055657a4898086725
|
||||
}
|
||||
|
||||
var (
|
||||
|
@ -2063,7 +2063,7 @@ type HeroTalentResetResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Telnet []*DBHeroTalent `protobuf:"bytes,1,rep,name=telnet,proto3" json:"telnet"`
|
||||
Telnet *DBHeroTalent `protobuf:"bytes,1,opt,name=telnet,proto3" json:"telnet"`
|
||||
}
|
||||
|
||||
func (x *HeroTalentResetResp) Reset() {
|
||||
@ -2098,7 +2098,7 @@ func (*HeroTalentResetResp) Descriptor() ([]byte, []int) {
|
||||
return file_hero_hero_msg_proto_rawDescGZIP(), []int{39}
|
||||
}
|
||||
|
||||
func (x *HeroTalentResetResp) GetTelnet() []*DBHeroTalent {
|
||||
func (x *HeroTalentResetResp) GetTelnet() *DBHeroTalent {
|
||||
if x != nil {
|
||||
return x.Telnet
|
||||
}
|
||||
@ -2290,11 +2290,7 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
|
||||
0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x62, 0x6a,
|
||||
0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
|
||||
0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c,
|
||||
<<<<<<< HEAD
|
||||
0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65,
|
||||
=======
|
||||
0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65,
|
||||
>>>>>>> bdc162616c093452fa61f4a055657a4898086725
|
||||
0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74,
|
||||
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user