liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2024-02-02 17:17:18 +08:00
commit 3e268abbfa
5 changed files with 290 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comm/const.go
View File

@ -129,7 +129,7 @@ const (
ModuleIntegral core.M_Modules = "integral" // 积分boss
ModulePlunder core.M_Modules = "plunder" //掠夺
ModuleMergeGroup core.M_Modules = "mergegroup" //合区模块
ModuleExpedition core.M_Modules = "expedition" //合区模块
ModuleExpedition core.M_Modules = "expedition" //工会战
)
// 数据表名定义处
@ -454,6 +454,8 @@ const (
TablePlunderRecord = "plunderrecord" // 掠夺岛记录
///工会远征
TableExpedition = "expedition"
///服务器组
TableServerGroup = "servergroup"
)
// RPC服务接口定义处

87
modules/equipment/api_wash.go
View File

@ -22,9 +22,12 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
var (
equip *pb.DB_Equipment
conf *cfg.GameEquipData
equipatt *cfg.GameEquipAttributeData
attrlibrarys []*cfg.GameEquipAttrlibrarySData
adverbEntry []*pb.EquipmentAttributeEntry
err error
adverbSkill []*pb.EquipmentSkillEntry
err error
)
if errdata = this.WashCheck(session, req); errdata != nil {
return
@ -51,35 +54,67 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
if errdata = this.module.ConsumeRes(session, []*cfg.Gameatn{{A: comm.AttrType, T: comm.ResGold, N: gole}}, true); errdata != nil {
return
}
if attrlibrarys, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(attrlibrarys) == 0 {
this.module.Errorf("升级服务错误 读取副词条配置错误!")
return
}
for i, v := range attrlibrarys { //移除主属性
if v.Attr.A == equip.MainEntry.AttrName {
attrlibrarys = append(attrlibrarys[0:i], attrlibrarys[i+1:]...)
break
}
}
adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry))
for i, v := range comm.RandShuffle(len(attrlibrarys)) {
if i < len(equip.AdverbEntry) {
adverbEntry[i] = &pb.EquipmentAttributeEntry{
Id: attrlibrarys[v].Key,
Libraryid: attrlibrarys[v].Libraryid,
Lv: equip.AdverbEntry[i].Lv,
AttrName: attrlibrarys[v].Attr.A,
BaseValue: attrlibrarys[v].Attr.N,
Value: attrlibrarys[v].Attr.N + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attr.N)),
if conf.EquipId == 1 {
if attrlibrarys, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(attrlibrarys) == 0 {
this.module.Errorf("升级服务错误 读取副词条配置错误!")
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
for i, v := range attrlibrarys { //移除主属性
if v.Attr.A == equip.MainEntry.AttrName {
attrlibrarys = append(attrlibrarys[0:i], attrlibrarys[i+1:]...)
break
}
}
adverbEntry = make([]*pb.EquipmentAttributeEntry, len(equip.AdverbEntry))
for i, v := range comm.RandShuffle(len(attrlibrarys)) {
if i < len(equip.AdverbEntry) {
adverbEntry[i] = &pb.EquipmentAttributeEntry{
Id: attrlibrarys[v].Key,
Libraryid: attrlibrarys[v].Libraryid,
Lv: equip.AdverbEntry[i].Lv,
AttrName: attrlibrarys[v].Attr.A,
BaseValue: attrlibrarys[v].Attr.N,
Value: attrlibrarys[v].Attr.N + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attr.N)),
}
} else {
break
}
}
} else {
if attrlibrarys, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(attrlibrarys) == 0 {
this.module.Errorf("升级服务错误 读取副词条配置错误!")
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
adverbSkill = make([]*pb.EquipmentSkillEntry, len(equip.Adverbskill))
for i, v := range comm.RandShuffle(len(adverbSkill)) {
if i < len(equip.Adverbskill) {
if equipatt, err = this.module.configure.getEquipAttribute(attrlibrarys[v].Skill); err != nil {
return
}
adverbSkill[i] = &pb.EquipmentSkillEntry{
Id: attrlibrarys[v].Key,
Libraryid: attrlibrarys[v].Libraryid,
Lv: equip.Adverbskill[i].Lv,
AttrName: attrlibrarys[v].Skill,
SkillId: equipatt.SkillId,
}
} else {
break
}
} else {
break
}
}
session.SendMsg(string(this.module.GetType()), "wash", &pb.EquipmentWashResp{Eid: req.Eid, AdverbEntry: adverbEntry})
session.SendMsg(string(this.module.GetType()), "wash", &pb.EquipmentWashResp{Eid: req.Eid, AdverbEntry: adverbEntry, AdverbSkill: adverbSkill})
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype95, 1))

89
modules/equipment/api_washconfirm.go
View File

@ -23,6 +23,8 @@ func (this *apiComp) WashConfirmCheck(session comm.IUserSession, req *pb.Equipme
func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWashConfirmReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
conf *cfg.GameEquipData
equipatt *cfg.GameEquipAttributeData
attrlibrary *cfg.GameEquipAttrlibrarySData
hero *pb.DBHero
equipments []*pb.DB_Equipment
@ -47,9 +49,39 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
}
return
}
for i, v := range equip.AdverbEntry {
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
if conf, err = this.module.configure.GetEquipmentConfigureById(equip.CId); err != nil {
this.module.Errorf("Equip_Check err:%v", err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if conf.EquipId == 1 {
for i, v := range equip.AdverbEntry {
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
}
return
}
equip.AdverbEntry[i] = &pb.EquipmentAttributeEntry{
Id: attrlibrary.Key,
Libraryid: attrlibrary.Libraryid,
Lv: v.Lv,
AttrName: attrlibrary.Attr.A,
BaseValue: attrlibrary.Attr.N,
Value: attrlibrary.Attr.N + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.Attr.N)),
}
}
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
"adverbEntry": equip.AdverbEntry,
"adverbskill": equip.Adverbskill,
}); err != nil {
log.Errorf("Upgrade err:%v", err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
@ -57,25 +89,41 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
}
return
}
equip.AdverbEntry[i] = &pb.EquipmentAttributeEntry{
Id: attrlibrary.Key,
Libraryid: attrlibrary.Libraryid,
Lv: v.Lv,
AttrName: attrlibrary.Attr.A,
BaseValue: attrlibrary.Attr.N,
Value: attrlibrary.Attr.N + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.Attr.N)),
} else {
for i, v := range equip.Adverbskill {
if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(req.Pids[i]); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
if equipatt, err = this.module.configure.getEquipAttribute(attrlibrary.Skill); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
equip.Adverbskill[i] = &pb.EquipmentSkillEntry{
Id: attrlibrary.Key,
Libraryid: attrlibrary.Libraryid,
Lv: v.Lv,
AttrName: attrlibrary.Skill,
SkillId: equipatt.SkillId,
}
}
}
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
"adverbEntry": equip.AdverbEntry,
}); err != nil {
log.Errorf("Upgrade err:%v", err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Title: pb.ErrorCode_SystemError.ToString(),
Message: err.Error(),
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
"adverbEntry": equip.AdverbEntry,
"adverbskill": equip.Adverbskill,
}); err != nil {
log.Errorf("Upgrade err:%v", err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
return
}
return
}
if equip.HeroId != "" {
@ -89,7 +137,6 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: fmt.Sprintf("装备唯一 id:%s", v),
}
return

130
pb/comm.pb.go
View File

@ -2507,6 +2507,78 @@ func (x *SweepResult) GetHeroexp() map[string]int32 {
return nil
}
//服务组数据
type DBServiceGroup struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"`
Group int32 `protobuf:"varint,2,opt,name=group,proto3" json:"group"` //分组
Create int64 `protobuf:"varint,3,opt,name=create,proto3" json:"create"` //创建时间
Playernum int32 `protobuf:"varint,4,opt,name=playernum,proto3" json:"playernum"` //玩家数量
}
func (x *DBServiceGroup) Reset() {
*x = DBServiceGroup{}
if protoimpl.UnsafeEnabled {
mi := &file_comm_proto_msgTypes[36]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBServiceGroup) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBServiceGroup) ProtoMessage() {}
func (x *DBServiceGroup) ProtoReflect() protoreflect.Message {
mi := &file_comm_proto_msgTypes[36]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DBServiceGroup.ProtoReflect.Descriptor instead.
func (*DBServiceGroup) Descriptor() ([]byte, []int) {
return file_comm_proto_rawDescGZIP(), []int{36}
}
func (x *DBServiceGroup) GetId() string {
if x != nil {
return x.Id
}
return ""
}
func (x *DBServiceGroup) GetGroup() int32 {
if x != nil {
return x.Group
}
return 0
}
func (x *DBServiceGroup) GetCreate() int64 {
if x != nil {
return x.Create
}
return 0
}
func (x *DBServiceGroup) GetPlayernum() int32 {
if x != nil {
return x.Playernum
}
return 0
}
var File_comm_proto protoreflect.FileDescriptor
var file_comm_proto_rawDesc = []byte{
@ -2769,13 +2841,20 @@ var file_comm_proto_rawDesc = []byte{
0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x43,
0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73,
0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03,
0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09,
0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69,
0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x6c,
0x0a, 0x0e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70,
0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64,
0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65,
0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x12, 0x1c,
0x0a, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28,
0x05, 0x52, 0x09, 0x70, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x6e, 0x75, 0x6d, 0x2a, 0x43, 0x0a, 0x12,
0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79,
0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74,
0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05,
0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10,
0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
}
var (
@ -2791,7 +2870,7 @@ func file_comm_proto_rawDescGZIP() []byte {
}
var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 37)
var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 38)
var file_comm_proto_goTypes = []interface{}{
(HeroAttributesType)(0), // 0: HeroAttributesType
(*ErrorData)(nil), // 1: ErrorData
@ -2830,25 +2909,26 @@ var file_comm_proto_goTypes = []interface{}{
(*ServiceDBInfo)(nil), // 34: ServiceDBInfo
(*DBVector3)(nil), // 35: DBVector3
(*SweepResult)(nil), // 36: SweepResult
nil, // 37: SweepResult.HeroexpEntry
(ErrorCode)(0), // 38: ErrorCode
(*anypb.Any)(nil), // 39: google.protobuf.Any
(*DBServiceGroup)(nil), // 37: DBServiceGroup
nil, // 38: SweepResult.HeroexpEntry
(ErrorCode)(0), // 39: ErrorCode
(*anypb.Any)(nil), // 40: google.protobuf.Any
}
var file_comm_proto_depIdxs = []int32{
38, // 0: ErrorData.code:type_name -> ErrorCode
39, // 0: ErrorData.code:type_name -> ErrorCode
18, // 1: ErrorData.atn:type_name -> UserAssets
3, // 2: MessagePackage.messages:type_name -> UserMessage
39, // 3: UserMessage.data:type_name -> google.protobuf.Any
39, // 4: AgentMessage.Message:type_name -> google.protobuf.Any
40, // 3: UserMessage.data:type_name -> google.protobuf.Any
40, // 4: AgentMessage.Message:type_name -> google.protobuf.Any
1, // 5: RPCMessageReply.ErrorData:type_name -> ErrorData
3, // 6: RPCMessageReply.Reply:type_name -> UserMessage
3, // 7: AgentSendMessageReq.Reply:type_name -> UserMessage
39, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any
39, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any
39, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any
40, // 8: BatchMessageReq.Data:type_name -> google.protobuf.Any
40, // 9: BatchUsersMessageReq.Data:type_name -> google.protobuf.Any
40, // 10: BroadCastMessageReq.Data:type_name -> google.protobuf.Any
18, // 11: SweepResult.consume:type_name -> UserAssets
19, // 12: SweepResult.award:type_name -> UserAtno
37, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry
38, // 13: SweepResult.heroexp:type_name -> SweepResult.HeroexpEntry
14, // [14:14] is the sub-list for method output_type
14, // [14:14] is the sub-list for method input_type
14, // [14:14] is the sub-list for extension type_name
@ -3295,6 +3375,18 @@ func file_comm_proto_init() {
return nil
}
}
file_comm_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBServiceGroup); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -3302,7 +3394,7 @@ func file_comm_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_comm_proto_rawDesc,
NumEnums: 1,
NumMessages: 37,
NumMessages: 38,
NumExtensions: 0,
NumServices: 0,
},

81
pb/equipment_msg.pb.go
View File

@ -771,6 +771,7 @@ type EquipmentWashResp struct {
Eid string `protobuf:"bytes,1,opt,name=eid,proto3" json:"eid"`
AdverbEntry []*EquipmentAttributeEntry `protobuf:"bytes,2,rep,name=adverbEntry,proto3" json:"adverbEntry"`
AdverbSkill []*EquipmentSkillEntry `protobuf:"bytes,3,rep,name=adverbSkill,proto3" json:"adverbSkill"`
}
func (x *EquipmentWashResp) Reset() {
@ -819,6 +820,13 @@ func (x *EquipmentWashResp) GetAdverbEntry() []*EquipmentAttributeEntry {
return nil
}
func (x *EquipmentWashResp) GetAdverbSkill() []*EquipmentSkillEntry {
if x != nil {
return x.AdverbSkill
}
return nil
}
//洗练确认
type EquipmentWashConfirmReq struct {
state protoimpl.MessageState
@ -1138,36 +1146,39 @@ var file_equipment_equipment_msg_proto_rawDesc = []byte{
0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72,
0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x24, 0x0a, 0x10, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
0x6e, 0x74, 0x57, 0x61, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x69, 0x64, 0x22, 0x61, 0x0a, 0x11, 0x45,
0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x57, 0x61, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x69, 0x64, 0x22, 0x99, 0x01, 0x0a, 0x11,
0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x57, 0x61, 0x73, 0x68, 0x52, 0x65, 0x73,
0x70, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x65, 0x69, 0x64, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70,
0x6d, 0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
0x36, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x03,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x76, 0x65,
0x72, 0x62, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x22, 0x3f, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70,
0x6d, 0x65, 0x6e, 0x74, 0x57, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52,
0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03,
0x28, 0x05, 0x52, 0x04, 0x70, 0x69, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x71, 0x75, 0x69,
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x57, 0x61, 0x73, 0x68, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d,
0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01,
0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x52, 0x0a, 0x10,
0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71,
0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65,
0x69, 0x64, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d,
0x65, 0x6e, 0x74, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x0b, 0x61, 0x64, 0x76, 0x65, 0x72, 0x62, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x22, 0x3f,
0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x57, 0x61, 0x73, 0x68, 0x43,
0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x70,
0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x70, 0x69, 0x64, 0x73, 0x22,
0x32, 0x0a, 0x18, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x57, 0x61, 0x73, 0x68,
0x43, 0x6f, 0x6e, 0x66, 0x69, 0x72, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
0x75, 0x63, 0x63, 0x22, 0x52, 0x0a, 0x10, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
0x45, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65,
0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x69,
0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x8b, 0x01, 0x0a, 0x11, 0x45, 0x71, 0x75, 0x69,
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12,
0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x06, 0x69, 0x74, 0x65, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1a, 0x0a,
0x08, 0x6f, 0x6c, 0x64, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
0x08, 0x6f, 0x6c, 0x64, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e,
0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
0x22, 0x8b, 0x01, 0x0a, 0x11, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x45, 0x6e,
0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d,
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x69, 0x64,
0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x6c, 0x64, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6f, 0x6c, 0x64, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05,
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x6e, 0x65, 0x77, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -1207,6 +1218,7 @@ var file_equipment_equipment_msg_proto_goTypes = []interface{}{
(*DB_EquipmentSuit)(nil), // 20: DB_EquipmentSuit
(*UserAtno)(nil), // 21: UserAtno
(*EquipmentAttributeEntry)(nil), // 22: EquipmentAttributeEntry
(*EquipmentSkillEntry)(nil), // 23: EquipmentSkillEntry
}
var file_equipment_equipment_msg_proto_depIdxs = []int32{
19, // 0: EquipmentGetListResp.Equipments:type_name -> DB_Equipment
@ -1218,11 +1230,12 @@ var file_equipment_equipment_msg_proto_depIdxs = []int32{
21, // 6: EquipmentSellResp.reward:type_name -> UserAtno
21, // 7: EquipmentForgResp.reward:type_name -> UserAtno
22, // 8: EquipmentWashResp.adverbEntry:type_name -> EquipmentAttributeEntry
9, // [9:9] is the sub-list for method output_type
9, // [9:9] is the sub-list for method input_type
9, // [9:9] is the sub-list for extension type_name
9, // [9:9] is the sub-list for extension extendee
0, // [0:9] is the sub-list for field type_name
23, // 9: EquipmentWashResp.adverbSkill:type_name -> EquipmentSkillEntry
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
10, // [10:10] is the sub-list for extension extendee
0, // [0:10] is the sub-list for field type_name
}
func init() { file_equipment_equipment_msg_proto_init() }