上传梦工厂协议接口优化测试

comm/usersession.go

@@ -93,24 +93,13 @@ func (this *UserSession) UnBind() (err error) {
 
 //向用户发送消息
 func (this *UserSession) SendMsg(mainType, subType string, msg proto.Message) (err error) {
-	log.Debugf("SendMsg to SessionId:[%s] UserId:[%s] Data: %v", this.UserId, msg)
+	log.Debugf("SendMsg to UserId:[%s] Data: %v", this.UserId, msg)
 	data, _ := anypb.New(msg)
 	this.msgqueue = append(this.msgqueue, &pb.UserMessage{
 		MainType: mainType,
 		SubType:  subType,
 		Data:     data,
 	})
-	// reply := &pb.RPCMessageReply{}
-	// data, _ := anypb.New(msg)
-	// log.Debugf("SendMsg to SessionId:[%s] UserId:[%s] Data: %v", this.UserId, msg)
-	// if err := this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentSendMsg), &pb.AgentSendMessageReq{
-	// 	UserSessionId: this.SessionId,
-	// 	MainType:      mainType,
-	// 	SubType:       subType,
-	// 	Data:          data,
-	// }, reply); err != nil {
-	// 	log.Errorf("SendMsg:%s UserSession:%s UserId:%s  err:%v", mainType, this.SessionId, this.UserId, err)
-	// }
 	return
 }
 
@@ -120,7 +109,7 @@ func (this *UserSession) Close() (err error) {
 	if err := this.service.RpcCall(context.Background(), fmt.Sprintf("%s/%s", Service_Gateway, this.GatewayServiceId), string(Rpc_GatewayAgentSendMsg), &pb.AgentCloseeReq{
 		UserSessionId: this.SessionId,
 	}, reply); err != nil {
-		log.Errorf("Close UserSession:%s UserId:%d err:%v", this.SessionId, this.UserId, err)
+		log.Errorf("Close UserSession:%s UserId:%s err:%v", this.SessionId, this.UserId, err)
 	}
 	return
 }

lego/sys/redis/cluster/hash.go

@@ -136,6 +136,10 @@ func (this *Redis) HMGet(key string, v interface{}, fields ...string) (err error
 	this.client.Process(this.getContext(), cmd)
 	var _result map[string]string
 	if _result, err = cmd.Result(); err == nil {
+		if len(_result) == 0 {
+			err = redis.Nil
+			return
+		}
 		err = this.decode.DecoderMapString(_result, v)
 	}
 	return

lego/sys/redis/cluster/list.go

@@ -12,6 +12,10 @@ func (this *Redis) Lindex(key string, v interface{}) (err error) {
 	this.client.Process(this.getContext(), cmd)
 	var _result string
 	if _result, err = cmd.Result(); err == nil {
+		if len(_result) == 0 {
+			err = redis.Nil
+			return
+		}
 		err = this.decode.DecoderString(_result, v)
 	}
 	return

lego/sys/redis/single/hash.go

@@ -68,6 +68,9 @@ func (this *Redis) HGetAll(key string, v interface{}) (err error) {
 	this.client.Process(this.getContext(), cmd)
 	var _result map[string]string
 	if _result, err = cmd.Result(); err == nil {
+		if len(_result) == 0 {
+			return redis.Nil
+		}
 		err = this.decode.DecoderMapString(_result, v)
 	}
 	return

lego/utils/codec/decoder.go

@@ -307,17 +307,10 @@ func (this *Decoder) DecoderMapString(data map[string]string, v interface{}) err
 			}
 			if value, ok := data[name]; ok {
 				v := reflect.New(fieldInfo.Type).Elem()
-				if fieldInfo.Type.Kind() != reflect.Ptr {
+				if err := this.DecoderString(value, v.Addr().Interface()); err != nil {
-					if err := this.DecoderString(value, v.Addr().Interface()); err != nil {
+					return fmt.Errorf("Decoder: Decoder(non-pointer %T) err:%v", value, err)
-						return fmt.Errorf("Decoder: Decoder(non-pointer %T) err:%v", value, err)
-					}
-					elem.FieldByName(fieldInfo.Name).Set(v)
-				} else {
-					if err := this.DecoderString(value, v); err != nil {
-						return fmt.Errorf("Decoder: Decoder(non-pointer %T) err:%v", value, err)
-					}
-					elem.FieldByName(fieldInfo.Name).Set(v)
 				}
+				elem.FieldByName(fieldInfo.Name).Set(v)
 			}
 		}
 	}

modules/equipment/api_equip.go

@@ -56,6 +56,12 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{
 		hero           *pb.DBHero
 	)
 
+	defer func() {
+		if code == pb.ErrorCode_Success {
+			session.SendMsg(string(this.module.GetType()), "equip", &pb.EquipmentEquipResp{Equipments: equipments})
+		}
+	}()
+
 	confs = agrs["conf"].([]*cfg.Game_equipData)
 	equipments = agrs["equipment"].([]*pb.DB_Equipment)
 	updatequipment = make([]*pb.DB_Equipment, 0)

modules/equipment/api_upgrade.go

@@ -51,17 +51,18 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp
 ///英雄挂在装备
 func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interface{}, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode) {
 	var (
-		err        error
+		err              error
-		conf       *cfg.Game_equipData
+		conf             *cfg.Game_equipData
-		intensify  *cfg.Game_equipIntensifyData
+		intensify        *cfg.Game_equipIntensifyData
-		equipment  *pb.DB_Equipment
+		equipment        *pb.DB_Equipment
-		hero       *pb.DBHero
+		modifyequipments []*pb.DB_Equipment
-		equipments []*pb.DB_Equipment
+		hero             *pb.DBHero
-		issucc     bool
+		equipments       []*pb.DB_Equipment
+		issucc           bool
 	)
 	defer func() {
 		if code == pb.ErrorCode_Success {
-			session.SendMsg(string(this.module.GetType()), "", &pb.EquipmentUpgradeResp{})
+			session.SendMsg(string(this.module.GetType()), "upgrade", &pb.EquipmentUpgradeResp{IsSucc: issucc, Equipment: modifyequipments})
 		}
 	}()
 	conf = agrs["conf"].(*cfg.Game_equipData)
@@ -78,10 +79,10 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac
 		}
 	}
 	if issucc {
-		if code = this.module.CheckConsumeRes(session.GetUserId(), intensify.Need); err != nil {
+		if code = this.module.CheckConsumeRes(session.GetUserId(), intensify.Need); code != pb.ErrorCode_Success {
 			return
 		}
-
+		modifyequipments = make([]*pb.DB_Equipment, 0)
 		//叠加装备 拆分处理
 		if equipment.IsInitialState && equipment.OverlayNum > 1 {
 			equipment.OverlayNum--
@@ -93,10 +94,12 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac
 				code = pb.ErrorCode_SystemError
 				return
 			}
+			modifyequipments = append(modifyequipments, equipment)
 			equipment = CloneEquipment(equipment)
 			equipment.Id = primitive.NewObjectID().Hex()
 			equipment.IsInitialState = false
 			equipment.OverlayNum = 1
+			modifyequipments = append(modifyequipments, equipment)
 			if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil {
 				code = pb.ErrorCode_SystemError
 				log.Errorf("Upgrade err:%v", err)
@@ -109,6 +112,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, agrs map[string]interfac
 			}
 		} else {
 			equipment.IsInitialState = false
+			modifyequipments = append(modifyequipments, equipment)
 			if err = this.module.modelEquipment.upgradeEquipment(equipment, conf, intensify); err != nil {
 				code = pb.ErrorCode_SystemError
 				log.Errorf("Upgrade err:%v", err)

modules/equipment/configure.go

@@ -26,6 +26,8 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
 	this.ModuleCompBase.Init(service, module, comp, options)
 	this.LoadConfigure(game_equip, cfg.NewGame_equip)
 	this.LoadConfigure(equip_attrlibrary, cfg.NewGame_equipAttrlibrary)
+	this.LoadConfigure(equip_intensify, cfg.NewGame_equipIntensify)
+	this.LoadConfigure(equip_suit, cfg.NewGame_equipSuit)
 	return
 }
 

modules/equipment/model_equipment.go

@@ -187,7 +187,7 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.Game_equipDat
 func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equip *cfg.Game_equipData, intensify *cfg.Game_equipIntensifyData) (err error) {
 	equipment.Lv++
 	equipment.MainEntry.Lv++
-	equipment.MainEntry.Value += equipment.MainEntry.Value * (intensify.Bonus / 1000.0)
+	equipment.MainEntry.Value += int32(float64(equipment.MainEntry.Value) * float64(intensify.Bonus) / 1000.0)
 	if !intensify.Activation { //不触发副词条变化
 		return
 	}
@@ -227,7 +227,7 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
 		if attrlibrary, err = this.module.configure.GetEquipmentAttrlibraryConfigureByKey(equipment.AdverbEntry[index].Id); err != nil {
 			return
 		}
-		equipment.AdverbEntry[index].Value += attrlibrary.Addition[equipment.AdverbEntry[index].Lv-1] / 1000.0 * attrlibrary.Attrvar
+		equipment.AdverbEntry[index].Value += int32(float64(attrlibrary.Addition[equipment.AdverbEntry[index].Lv-1]) / 1000.0 * float64(attrlibrary.Attrvar))
 		equipment.AdverbEntry[index].Lv++
 	}
 	return

modules/equipment/module.go

@@ -63,9 +63,14 @@ func (this *Equipment) OnInstallComp() {
 
 //IEquipment-------------------------------------------------------------------------------------------------------------------------------
 //查询武器信息
-func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, Id string) (equipment *pb.DB_Equipment, code pb.ErrorCode) {
+func (this *Equipment) QueryEquipment(source *comm.ModuleCallSource, uid string, id string) (equipment *pb.DB_Equipment, code pb.ErrorCode) {
 	var err error
-	if equipment, err = this.modelEquipment.QueryUserEquipmentsById(uid, Id); err != nil {
+	if uid == "" || id == "" {
+		log.Errorf("请求参数错误 uid:%s Id:%s", uid, id)
+		code = pb.ErrorCode_ReqParameterError
+		return
+	}
+	if equipment, err = this.modelEquipment.QueryUserEquipmentsById(uid, id); err != nil {
 		if err == redis.Nil {
 			code = pb.ErrorCode_EquipmentOnFoundEquipment
 		} else {

modules/equipment/module_test.go

@@ -1,6 +1,7 @@
 package equipment_test
 
 import (
+	"context"
 	"fmt"
 	"go_dreamfactory/comm"
 	"go_dreamfactory/lego"
@@ -9,6 +10,9 @@ import (
 	"go_dreamfactory/lego/sys/log"
 	"go_dreamfactory/modules/equipment"
 	"go_dreamfactory/modules/hero"
+	"go_dreamfactory/modules/items"
+	"go_dreamfactory/modules/user"
+	"go_dreamfactory/pb"
 	"go_dreamfactory/services"
 	"go_dreamfactory/sys/cache"
 	"go_dreamfactory/sys/configure"
@@ -16,6 +20,8 @@ import (
 	"os"
 	"testing"
 	"time"
+
+	"github.com/golang/protobuf/ptypes"
 )
 
 func newService(ops ...rpcx.Option) core.IService {
@@ -66,13 +72,32 @@ func TestMain(m *testing.M) {
 		lego.Run(service, //运行模块
 			module,
 			hero.NewModule(),
+			user.NewModule(),
+			items.NewModule(),
 		)
 	}()
 	time.Sleep(time.Second * 3)
 	defer os.Exit(m.Run())
 }
 
-func Test_Module(t *testing.T) {
+//测试协议 查询武器
+func Test_Modules_EquipmentGetListReq(t *testing.T) {
+	data, _ := ptypes.MarshalAny(&pb.EquipmentGetListReq{})
+	reply := &pb.RPCMessageReply{}
+	s_gateComp.ReceiveMsg(context.Background(), &pb.AgentMessage{UserId: "0_62b16dda909b2f8faeff788d", MainType: "equipment", SubType: "getlist", Message: data}, reply)
+	log.Debugf("Test_Modules_Proro reply:%v", reply)
+}
+
+//测试协议 武器升级
+func Test_Modules_EquipmentUpgradeReq(t *testing.T) {
+	data, _ := ptypes.MarshalAny(&pb.EquipmentUpgradeReq{EquipmentId: "62bd82860863ffbf2eb67f3a"})
+	reply := &pb.RPCMessageReply{}
+	s_gateComp.ReceiveMsg(context.Background(), &pb.AgentMessage{UserId: "0_62b16dda909b2f8faeff788d", MainType: "equipment", SubType: "upgrade", Message: data}, reply)
+	log.Debugf("Test_Modules_Proro reply:%v", reply)
+}
+
+//添加武器测试
+func Test_Module_AddNewEquipments(t *testing.T) {
 	code := module.AddNewEquipments(&comm.ModuleCallSource{
 		Module:   "Test",
 		FuncName: "Test_Module",
@@ -80,3 +105,13 @@ func Test_Module(t *testing.T) {
 	}, "0_62b16dda909b2f8faeff788d", map[int32]uint32{10001: 1})
 	log.Debugf("Test_Module Code:%d", code)
 }
+
+//查询武器信息
+func Test_Module_QueryEquipment(t *testing.T) {
+	equipment, code := module.QueryEquipment(&comm.ModuleCallSource{
+		Module:   "Test",
+		FuncName: "Test_Module",
+		Describe: "摸底测试",
+	}, "0_62b16dda909b2f8faeff788d", "62bd82860863ffbf2eb67f3a")
+	log.Debugf("Test_Module equipment:%v code:%d", equipment, code)
+}

modules/modulebase.go

@@ -89,15 +89,18 @@ func (this *ModuleBase) CheckConsumeRes(uid string, res []*cfg.Game_atn) (code p
 		hero   comm.IHero  //英雄模块
 		// equipment comm.IEquipment //装备模块
 	)
-	if module, err = this.service.GetModule(comm.ModuleUser); err == nil {
+	if module, err = this.service.GetModule(comm.ModuleUser); err != nil {
+		code = pb.ErrorCode_SystemError
 		return
 	}
 	user = module.(comm.IUser)
-	if module, err = this.service.GetModule(comm.ModuleItems); err == nil {
+	if module, err = this.service.GetModule(comm.ModuleItems); err != nil {
+		code = pb.ErrorCode_SystemError
 		return
 	}
 	items = module.(comm.IItems)
-	if module, err = this.service.GetModule(comm.ModuleHero); err == nil {
+	if module, err = this.service.GetModule(comm.ModuleHero); err != nil {
+		code = pb.ErrorCode_SystemError
 		return
 	}
 	hero = module.(comm.IHero)
@@ -179,19 +182,23 @@ func (this *ModuleBase) DispenseRes(uid string, res []*cfg.Game_atn) (code pb.Er
 		hero      comm.IHero      //英雄模块
 		equipment comm.IEquipment //装备模块
 	)
-	if module, err = this.service.GetModule(comm.ModuleUser); err == nil {
+	if module, err = this.service.GetModule(comm.ModuleUser); err != nil {
+		code = pb.ErrorCode_SystemError
 		return
 	}
 	user = module.(comm.IUser)
-	if module, err = this.service.GetModule(comm.ModuleItems); err == nil {
+	if module, err = this.service.GetModule(comm.ModuleItems); err != nil {
+		code = pb.ErrorCode_SystemError
 		return
 	}
 	items = module.(comm.IItems)
-	if module, err = this.service.GetModule(comm.ModuleHero); err == nil {
+	if module, err = this.service.GetModule(comm.ModuleHero); err != nil {
+		code = pb.ErrorCode_SystemError
 		return
 	}
 	hero = module.(comm.IHero)
-	if module, err = this.service.GetModule(comm.ModuleEquipment); err == nil {
+	if module, err = this.service.GetModule(comm.ModuleEquipment); err != nil {
+		code = pb.ErrorCode_SystemError
 		return
 	}
 	equipment = module.(comm.IEquipment)

pb/equipment_msg.pb.go

@@ -168,6 +168,8 @@ type EquipmentEquipResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	Equipments []*DB_Equipment `protobuf:"bytes,1,rep,name=Equipments,proto3" json:"Equipments"` //挂在装备列表
 }
 
 func (x *EquipmentEquipResp) Reset() {
@@ -202,6 +204,13 @@ func (*EquipmentEquipResp) Descriptor() ([]byte, []int) {
 	return file_equipment_equipment_msg_proto_rawDescGZIP(), []int{3}
 }
 
+func (x *EquipmentEquipResp) GetEquipments() []*DB_Equipment {
+	if x != nil {
+		return x.Equipments
+	}
+	return nil
+}
+
 //装备升级
 type EquipmentUpgradeReq struct {
 	state         protoimpl.MessageState
@@ -255,6 +264,9 @@ type EquipmentUpgradeResp struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
+
+	IsSucc    bool            `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"`
+	Equipment []*DB_Equipment `protobuf:"bytes,2,rep,name=Equipment,proto3" json:"Equipment"` //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
 }
 
 func (x *EquipmentUpgradeResp) Reset() {
@@ -289,6 +301,20 @@ func (*EquipmentUpgradeResp) Descriptor() ([]byte, []int) {
 	return file_equipment_equipment_msg_proto_rawDescGZIP(), []int{5}
 }
 
+func (x *EquipmentUpgradeResp) GetIsSucc() bool {
+	if x != nil {
+		return x.IsSucc
+	}
+	return false
+}
+
+func (x *EquipmentUpgradeResp) GetEquipment() []*DB_Equipment {
+	if x != nil {
+		return x.Equipment
+	}
+	return nil
+}
+
 var File_equipment_equipment_msg_proto protoreflect.FileDescriptor
 
 var file_equipment_equipment_msg_proto_rawDesc = []byte{
@@ -307,14 +333,21 @@ var file_equipment_equipment_msg_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x61, 0x72, 0x64, 0x49, 0x64,
 	0x12, 0x20, 0x0a, 0x0b, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18,
 	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74,
-	0x49, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x45,
+	0x49, 0x64, 0x22, 0x43, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x45,
-	0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x22, 0x37, 0x0a, 0x13, 0x45, 0x71, 0x75, 0x69,
+	0x71, 0x75, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x0a, 0x45, 0x71, 0x75, 0x69,
-	0x70, 0x6d, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12,
+	0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44,
-	0x20, 0x0a, 0x0b, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01,
+	0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x45, 0x71, 0x75,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49,
+	0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x37, 0x0a, 0x13, 0x45, 0x71, 0x75, 0x69, 0x70,
-	0x64, 0x22, 0x16, 0x0a, 0x14, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x55, 0x70,
+	0x6d, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x20,
-	0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
+	0x0a, 0x0b, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20,
-	0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64,
+	0x22, 0x5b, 0x0a, 0x14, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x55, 0x70, 0x67,
+	0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75,
+	0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63,
+	0x12, 0x2b, 0x0a, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x5f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65,
+	0x6e, 0x74, 0x52, 0x09, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x06, 0x5a,
+	0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -341,11 +374,13 @@ var file_equipment_equipment_msg_proto_goTypes = []interface{}{
 }
 var file_equipment_equipment_msg_proto_depIdxs = []int32{
 	6, // 0: EquipmentGetListResp.Equipments:type_name -> DB_Equipment
-	1, // [1:1] is the sub-list for method output_type
+	6, // 1: EquipmentEquipResp.Equipments:type_name -> DB_Equipment
-	1, // [1:1] is the sub-list for method input_type
+	6, // 2: EquipmentUpgradeResp.Equipment:type_name -> DB_Equipment
-	1, // [1:1] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for method output_type
-	1, // [1:1] is the sub-list for extension extendee
+	3, // [3:3] is the sub-list for method input_type
-	0, // [0:1] is the sub-list for field type_name
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_equipment_equipment_msg_proto_init() }

pb/hero_msg.pb.go

@@ -1275,87 +1275,85 @@ var file_hero_hero_msg_proto_rawDesc = []byte{
 	0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74,
 	0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x29,
 	0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x10, 0x2e, 0x70, 0x62, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61,
+	0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52,
-	0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x3a, 0x0a, 0x18,
+	0x08, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 0x0a, 0x18, 0x48, 0x65, 0x72,
-	0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70,
+	0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61,
-	0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f,
+	0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65,
+	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65,
-	0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f,
+	0x72, 0x6f, 0x22, 0x5a, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67,
-	0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c,
+	0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c,
-	0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49,
+	0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b,
-	0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62,
+	0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x6a, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72,
+	0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x22, 0x38,
-	0x64, 0x4f, 0x62, 0x6a, 0x22, 0x3b, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65,
+	0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e,
-	0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73,
+	0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68,
-	0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65,
-	0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72,
+	0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x66, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f,
-	0x6f, 0x22, 0x66, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e,
+	0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09,
-	0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
+	0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62,
+	0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f,
-	0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44,
+	0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49,
+	0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x44, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x77, 0x0a, 0x11, 0x48, 0x65, 0x72,
+	0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63,
-	0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
+	0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20,
-	0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70,
+	0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65,
-	0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16,
+	0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01,
-	0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
+	0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x27, 0x0a, 0x0a, 0x75, 0x70,
-	0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x2a, 0x0a, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72,
+	0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07,
-	0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e,
+	0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61,
+	0x61, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e,
-	0x72, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61,
+	0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09,
-	0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68,
+	0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x4d, 0x0a, 0x16, 0x48, 0x65,
-	0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x50, 0x0a, 0x16, 0x48, 0x65, 0x72,
+	0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74,
-	0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01,
-	0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72,
-	0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68,
+	0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20,
+	0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x71, 0x0a, 0x19, 0x48, 0x65, 0x72,
-	0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x71, 0x0a, 0x19, 0x48,
+	0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65,
-	0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45,
+	0x72, 0x67, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62,
-	0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f,
+	0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f,
+	0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67,
+	0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72,
+	0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x39, 0x0a, 0x1a,
+	0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65,
+	0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65,
+	0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
+	0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41,
+	0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f,
 	0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72,
-	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e, 0x65,
+	0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77,
-	0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, 0x73, 0x65, 0x45, 0x6e,
+	0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f,
-	0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52,
-	0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, 0x70, 0x65, 0x22, 0x3c,
+	0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f,
-	0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x55,
+	0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
-	0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73,
-	0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e,
+	0x22, 0x31, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d,
+	0x73, 0x70, 0x12, 0x1f, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
+	0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72,
-	0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x6f, 0x65, 0x73, 0x22, 0x9e, 0x02, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70,
-	0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x30, 0x0a, 0x0e, 0x48,
+	0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01,
-	0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x37, 0x0a, 0x08,
-	0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62,
+	0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b,
-	0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x29, 0x0a,
+	0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x50, 0x72,
-	0x0d, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x71, 0x12, 0x18,
+	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f,
-	0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52,
+	0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x40, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70,
-	0x07, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x22, 0x34, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f,
+	0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x48, 0x65, 0x72,
-	0x43, 0x68, 0x6f, 0x75, 0x6b, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x06, 0x68, 0x65,
+	0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f,
-	0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x70, 0x62, 0x2e,
+	0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50,
-	0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, 0x22, 0xa4,
+	0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65,
-	0x02, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12,
+	0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x70, 0x62, 0x2e, 0x48,
+	0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65,
-	0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x50, 0x72, 0x6f, 0x70,
+	0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
-	0x72, 0x74, 0x79, 0x12, 0x43, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x70, 0x62, 0x2e, 0x48, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
-	0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
-	0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64,
-	0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70,
-	0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1372,49 +1370,49 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte {
 
 var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25)
 var file_hero_hero_msg_proto_goTypes = []interface{}{
-	(*HeroInfoReq)(nil),                // 0: pb.HeroInfoReq
+	(*HeroInfoReq)(nil),                // 0: HeroInfoReq
-	(*HeroInfoRsp)(nil),                // 1: pb.HeroInfoRsp
+	(*HeroInfoRsp)(nil),                // 1: HeroInfoRsp
-	(*HeroListReq)(nil),                // 2: pb.HeroListReq
+	(*HeroListReq)(nil),                // 2: HeroListReq
-	(*HeroListRsp)(nil),                // 3: pb.HeroListRsp
+	(*HeroListRsp)(nil),                // 3: HeroListRsp
-	(*ItemData)(nil),                   // 4: pb.ItemData
+	(*ItemData)(nil),                   // 4: ItemData
-	(*HeroStrengthenUplvReq)(nil),      // 5: pb.HeroStrengthenUplvReq
+	(*HeroStrengthenUplvReq)(nil),      // 5: HeroStrengthenUplvReq
-	(*HeroStrengthenUplvResp)(nil),     // 6: pb.HeroStrengthenUplvResp
+	(*HeroStrengthenUplvResp)(nil),     // 6: HeroStrengthenUplvResp
-	(*CostCardData)(nil),               // 7: pb.CostCardData
+	(*CostCardData)(nil),               // 7: CostCardData
-	(*HeroStrengthenUpStarReq)(nil),    // 8: pb.HeroStrengthenUpStarReq
+	(*HeroStrengthenUpStarReq)(nil),    // 8: HeroStrengthenUpStarReq
-	(*HeroStrengthenUpStarResp)(nil),   // 9: pb.HeroStrengthenUpStarResp
+	(*HeroStrengthenUpStarResp)(nil),   // 9: HeroStrengthenUpStarResp
-	(*HeroStrengthenUpSkillReq)(nil),   // 10: pb.HeroStrengthenUpSkillReq
+	(*HeroStrengthenUpSkillReq)(nil),   // 10: HeroStrengthenUpSkillReq
-	(*HeroStrengthenUpSkillResp)(nil),  // 11: pb.HeroStrengthenUpSkillResp
+	(*HeroStrengthenUpSkillResp)(nil),  // 11: HeroStrengthenUpSkillResp
-	(*HeroResonanceReq)(nil),           // 12: pb.HeroResonanceReq
+	(*HeroResonanceReq)(nil),           // 12: HeroResonanceReq
-	(*HeroResonanceResp)(nil),          // 13: pb.HeroResonanceResp
+	(*HeroResonanceResp)(nil),          // 13: HeroResonanceResp
-	(*HeroResonanceResetReq)(nil),      // 14: pb.HeroResonanceResetReq
+	(*HeroResonanceResetReq)(nil),      // 14: HeroResonanceResetReq
-	(*HeroResonanceResetResp)(nil),     // 15: pb.HeroResonanceResetResp
+	(*HeroResonanceResetResp)(nil),     // 15: HeroResonanceResetResp
-	(*HeroResonanceUseEnergyReq)(nil),  // 16: pb.HeroResonanceUseEnergyReq
+	(*HeroResonanceUseEnergyReq)(nil),  // 16: HeroResonanceUseEnergyReq
-	(*HeroResonanceUseEnergyResp)(nil), // 17: pb.HeroResonanceUseEnergyResp
+	(*HeroResonanceUseEnergyResp)(nil), // 17: HeroResonanceUseEnergyResp
-	(*HeroAwakenReq)(nil),              // 18: pb.HeroAwakenReq
+	(*HeroAwakenReq)(nil),              // 18: HeroAwakenReq
-	(*HeroAwakenResp)(nil),             // 19: pb.HeroAwakenResp
+	(*HeroAwakenResp)(nil),             // 19: HeroAwakenResp
-	(*HeroChoukaReq)(nil),              // 20: pb.HeroChoukaReq
+	(*HeroChoukaReq)(nil),              // 20: HeroChoukaReq
-	(*HeroChoukaResp)(nil),             // 21: pb.HeroChoukaResp
+	(*HeroChoukaResp)(nil),             // 21: HeroChoukaResp
-	(*HeroProperty)(nil),               // 22: pb.HeroProperty
+	(*HeroProperty)(nil),               // 22: HeroProperty
-	nil,                                // 23: pb.HeroProperty.PropertyEntry
+	nil,                                // 23: HeroProperty.PropertyEntry
-	nil,                                // 24: pb.HeroProperty.AddPropertyEntry
+	nil,                                // 24: HeroProperty.AddPropertyEntry
-	(*DBHero)(nil),                     // 25: pb.DBHero
+	(*DBHero)(nil),                     // 25: DBHero
 }
 var file_hero_hero_msg_proto_depIdxs = []int32{
-	25, // 0: pb.HeroInfoRsp.base:type_name -> pb.DBHero
+	25, // 0: HeroInfoRsp.base:type_name -> DBHero
-	25, // 1: pb.HeroListRsp.list:type_name -> pb.DBHero
+	25, // 1: HeroListRsp.list:type_name -> DBHero
-	25, // 2: pb.HeroStrengthenUplvResp.hero:type_name -> pb.DBHero
+	25, // 2: HeroStrengthenUplvResp.hero:type_name -> DBHero
-	7,  // 3: pb.HeroStrengthenUpStarReq.hero:type_name -> pb.CostCardData
+	7,  // 3: HeroStrengthenUpStarReq.hero:type_name -> CostCardData
-	7,  // 4: pb.HeroStrengthenUpStarReq.heroRace:type_name -> pb.CostCardData
+	7,  // 4: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData
-	25, // 5: pb.HeroStrengthenUpStarResp.hero:type_name -> pb.DBHero
+	25, // 5: HeroStrengthenUpStarResp.hero:type_name -> DBHero
-	25, // 6: pb.HeroStrengthenUpSkillResp.hero:type_name -> pb.DBHero
+	25, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero
-	25, // 7: pb.HeroResonanceResp.hero:type_name -> pb.DBHero
+	25, // 7: HeroResonanceResp.hero:type_name -> DBHero
-	25, // 8: pb.HeroResonanceResp.upStarCard:type_name -> pb.DBHero
+	25, // 8: HeroResonanceResp.upStarCard:type_name -> DBHero
-	25, // 9: pb.HeroResonanceResetResp.hero:type_name -> pb.DBHero
+	25, // 9: HeroResonanceResetResp.hero:type_name -> DBHero
-	25, // 10: pb.HeroResonanceUseEnergyResp.hero:type_name -> pb.DBHero
+	25, // 10: HeroResonanceUseEnergyResp.hero:type_name -> DBHero
-	25, // 11: pb.HeroAwakenResp.hero:type_name -> pb.DBHero
+	25, // 11: HeroAwakenResp.hero:type_name -> DBHero
-	25, // 12: pb.HeroChoukaResp.heroes:type_name -> pb.DBHero
+	25, // 12: HeroChoukaResp.heroes:type_name -> DBHero
-	23, // 13: pb.HeroProperty.property:type_name -> pb.HeroProperty.PropertyEntry
+	23, // 13: HeroProperty.property:type_name -> HeroProperty.PropertyEntry
-	24, // 14: pb.HeroProperty.addProperty:type_name -> pb.HeroProperty.AddPropertyEntry
+	24, // 14: HeroProperty.addProperty:type_name -> HeroProperty.AddPropertyEntry
 	15, // [15:15] is the sub-list for method output_type
 	15, // [15:15] is the sub-list for method input_type
 	15, // [15:15] is the sub-list for extension type_name

pb/proto/equipment/equipment_msg.proto

@@ -19,7 +19,7 @@ message EquipmentEquipReq{
 
 //装备挂在到英雄上 回应
 message EquipmentEquipResp{
-
+    repeated DB_Equipment Equipments = 1;        //挂在装备列表
 }
 
 //装备升级
@@ -29,5 +29,6 @@ message EquipmentUpgradeReq{
 
 //装备升级 回应
 message EquipmentUpgradeResp{
-    
+    bool IsSucc = 1;
+    repeated DB_Equipment Equipment = 2;             //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
 }

services/worker/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"go_dreamfactory/modules/equipment"
 	"go_dreamfactory/modules/friend"
 	"go_dreamfactory/modules/hero"
 	"go_dreamfactory/modules/items"
@@ -42,8 +43,8 @@ func main() {
 		mail.NewModule(),
 		friend.NewModule(),
 		hero.NewModule(),
+		equipment.NewModule(),
 	)
-
 }
 
 func NewService(ops ...rpcx.Option) core.IService {