diff --git a/modules/battle/modelBattle.go b/modules/battle/modelBattle.go index acdea1c33..d4224fdd8 100644 --- a/modules/battle/modelBattle.go +++ b/modules/battle/modelBattle.go @@ -481,8 +481,11 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt CaptainSkill: hero.CaptainSkill, NormalSkill: hero.NormalSkill, Property: hero.Property, - Isboos: v.IsBoss, } + if v.IsBoss == 1 { + roles[i].Boosid = v.Monster + } + for i, v := range roles[i].NormalSkill { if i == 0 { v.SkillLv = monst.Skill1 diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go index ca11fbd95..274e14864 100644 --- a/pb/arena_msg.pb.go +++ b/pb/arena_msg.pb.go @@ -1298,8 +1298,9 @@ type ArenaRTimePvpPush struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - RoomId string `protobuf:"bytes,1,opt,name=RoomId,proto3" json:"RoomId"` - Info *BattleInfo `protobuf:"bytes,2,opt,name=info,proto3" json:"info"` + RoomId string `protobuf:"bytes,1,opt,name=RoomId,proto3" json:"RoomId"` + ServicePath string `protobuf:"bytes,2,opt,name=servicePath,proto3" json:"servicePath"` + Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` } func (x *ArenaRTimePvpPush) Reset() { @@ -1341,6 +1342,13 @@ func (x *ArenaRTimePvpPush) GetRoomId() string { return "" } +func (x *ArenaRTimePvpPush) GetServicePath() string { + if x != nil { + return x.ServicePath + } + return "" +} + func (x *ArenaRTimePvpPush) GetInfo() *BattleInfo { if x != nil { return x.Info @@ -1462,12 +1470,15 @@ var file_arena_arena_msg_proto_rawDesc = []byte{ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, - 0x01, 0x22, 0x4c, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x54, 0x69, 0x6d, 0x65, 0x50, + 0x01, 0x22, 0x6e, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x54, 0x69, 0x6d, 0x65, 0x50, 0x76, 0x70, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x1f, - 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x20, + 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, + 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go index 6a75d67da..26577a806 100644 --- a/pb/battle_db.pb.go +++ b/pb/battle_db.pb.go @@ -270,7 +270,7 @@ type BattleRole struct { EquipSkill []*SkillData `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"normalSkill"` //普通技能 Property map[string]int32 `protobuf:"bytes,12,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关 Ishelp bool `protobuf:"varint,13,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄 - Isboos int32 `protobuf:"varint,14,opt,name=isboos,proto3" json:"isboos"` //是否是boos + Boosid int32 `protobuf:"varint,14,opt,name=boosid,proto3" json:"boosid"` //是否是boos } func (x *BattleRole) Reset() { @@ -396,9 +396,9 @@ func (x *BattleRole) GetIshelp() bool { return false } -func (x *BattleRole) GetIsboos() int32 { +func (x *BattleRole) GetBoosid() int32 { if x != nil { - return x.Isboos + return x.Boosid } return 0 } @@ -650,8 +650,8 @@ var file_battle_battle_db_proto_rawDesc = []byte{ 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x12, 0x16, 0x0a, 0x06, - 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x73, - 0x62, 0x6f, 0x6f, 0x73, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, + 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, + 0x6f, 0x73, 0x69, 0x64, 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, 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, diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 8389c7583..bd439f32f 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -86,7 +86,7 @@ type UserMessage struct { MainType string `protobuf:"bytes,1,opt,name=MainType,proto3" json:"MainType"` //用户消息处理 模块名 例如:user 对应项目中 user的模块 SubType string `protobuf:"bytes,2,opt,name=SubType,proto3" json:"SubType"` //用户消息处理函数名 例如:login 对应项目中 user的模块中 // api_login 的处理函数 - ServicePath string `protobuf:"bytes,3,opt,name=servicePath,proto3" json:"servicePath"` // 消息路由地址 部分消息前端确定转发给谁 + ServicePath string `protobuf:"bytes,3,opt,name=servicePath,proto3" json:"servicePath"` // 消息路由地址 部分消息前端确定转发给谁 \worker\worker0 Data *anypb.Any `protobuf:"bytes,4,opt,name=data,proto3" json:"data"` Sec string `protobuf:"bytes,5,opt,name=sec,proto3" json:"sec"` //密文 }