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

上传传功系统通知

Browse Source
This commit is contained in:
liwei 2023-07-06 17:56:00 +08:00
parent 3b45e361bc
commit 5a191218dc
4 changed files with 137 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
modules/passon/module.go
View File

@ -55,6 +55,8 @@ func (this *Passon) HeroUpLv(session comm.IUserSession, heroid string, lv int32)
var (
passon *pb.DBPasson
heros []*pb.DBHero
change map[string]bool = make(map[string]bool)
errdata *pb.ErrorData
err error
)
if passon, err = this.modelPasson.getUserPasson(session.GetUserId()); err != nil {
@ -82,4 +84,38 @@ func (this *Passon) HeroUpLv(session comm.IUserSession, heroid string, lv int32)
return heros[i].Lv < heros[j].Lv
})
for i := 0; i < 5; i++ {
if heros[i].Ispasson {
change[heros[i].Id] = false
for ii, v := range passon.Student {
if v == heros[ii].Id {
passon.Student[ii] = ""
}
}
}
passon.Teacher[i] = heros[i].Id
}
if len(change) > 0 {
if errdata = this.ModuleHero.PassonHero(session, change); errdata != nil {
return
}
}
if passon.Passonlv != heros[4].Lv {
passon.Passonlv = heros[4].Lv
this.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
"passonlv": passon.Passonlv,
})
session.SendMsg(string(this.GetType()), "lvchange", &pb.PassonLvChangePush{Lv: passon.Passonlv})
}
if err = this.modelPasson.Change(session.GetUserId(), map[string]interface{}{
"passonlv": passon.Passonlv,
"teacher": passon.Teacher,
"student": passon.Student,
}); err != nil {
this.Errorln(err)
}
}

22
pb/activity_db.pb.go
View File

@ -329,7 +329,7 @@ type DBActivityData struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
Hdid int32 `protobuf:"varint,3,opt,name=hdid,proto3" json:"hdid"`
Hid int32 `protobuf:"varint,3,opt,name=hid,proto3" json:"hid"`
Gotarr []int32 `protobuf:"varint,4,rep,packed,name=gotarr,proto3" json:"gotarr"`
Lasttime int64 `protobuf:"varint,5,opt,name=lasttime,proto3" json:"lasttime"`
Val int32 `protobuf:"varint,6,opt,name=val,proto3" json:"val"`
@ -381,9 +381,9 @@ func (x *DBActivityData) GetUid() string {
return ""
}
func (x *DBActivityData) GetHdid() int32 {
func (x *DBActivityData) GetHid() int32 {
if x != nil {
return x.Hdid
return x.Hid
}
return 0
}
@ -450,16 +450,16 @@ var file_activity_activity_db_proto_rawDesc = []byte{
0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x74, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x04,
0x64, 0x61, 0x74, 0x61, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x63, 0x74,
0x69, 0x76, 0x69, 0x74, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22,
0x8c, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61,
0x8a, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x44, 0x61,
0x74, 0x61, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
0x28, 0x05, 0x52, 0x04, 0x68, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61,
0x72, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72,
0x12, 0x1a, 0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
0x28, 0x03, 0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03,
0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x68, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
0x05, 0x52, 0x03, 0x68, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72,
0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x67, 0x6f, 0x74, 0x61, 0x72, 0x72, 0x12, 0x1a,
0x0a, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
0x52, 0x08, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x61,
0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x76, 0x61, 0x6c, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (

70
pb/passon_msg.pb.go
View File

@ -116,6 +116,54 @@ func (x *PassonInRoomResp) GetHeroid() string {
return ""
}
//传功等级变化推送
type PassonLvChangePush struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Lv int32 `protobuf:"varint,1,opt,name=lv,proto3" json:"lv"`
}
func (x *PassonLvChangePush) Reset() {
*x = PassonLvChangePush{}
if protoimpl.UnsafeEnabled {
mi := &file_passon_passon_msg_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *PassonLvChangePush) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*PassonLvChangePush) ProtoMessage() {}
func (x *PassonLvChangePush) ProtoReflect() protoreflect.Message {
mi := &file_passon_passon_msg_proto_msgTypes[2]
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 PassonLvChangePush.ProtoReflect.Descriptor instead.
func (*PassonLvChangePush) Descriptor() ([]byte, []int) {
return file_passon_passon_msg_proto_rawDescGZIP(), []int{2}
}
func (x *PassonLvChangePush) GetLv() int32 {
if x != nil {
return x.Lv
}
return 0
}
var File_passon_passon_msg_proto protoreflect.FileDescriptor
var file_passon_passon_msg_proto_rawDesc = []byte{
@ -126,7 +174,10 @@ var file_passon_passon_msg_proto_rawDesc = []byte{
0x72, 0x6f, 0x69, 0x64, 0x22, 0x2a, 0x0a, 0x10, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x49, 0x6e,
0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x22, 0x24, 0x0a, 0x12, 0x50, 0x61, 0x73, 0x73, 0x6f, 0x6e, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e,
0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x01, 0x20, 0x01,
0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -141,10 +192,11 @@ func file_passon_passon_msg_proto_rawDescGZIP() []byte {
return file_passon_passon_msg_proto_rawDescData
}
var file_passon_passon_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
var file_passon_passon_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
var file_passon_passon_msg_proto_goTypes = []interface{}{
(*PassonInRoomReq)(nil), // 0: PassonInRoomReq
(*PassonInRoomResp)(nil), // 1: PassonInRoomResp
(*PassonLvChangePush)(nil), // 2: PassonLvChangePush
}
var file_passon_passon_msg_proto_depIdxs = []int32{
0, // [0:0] is the sub-list for method output_type
@ -184,6 +236,18 @@ func file_passon_passon_msg_proto_init() {
return nil
}
}
file_passon_passon_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*PassonLvChangePush); 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{
@ -191,7 +255,7 @@ func file_passon_passon_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_passon_passon_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 2,
NumMessages: 3,
NumExtensions: 0,
NumServices: 0,
},

182
pb/viking_db.pb.go
View File

@ -220,126 +220,6 @@ func (x *DBVikingRank) GetCostTime() int32 {
return 0
}
// 装备副本DBVSeasonRank
type DBVSeasonRank struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度
Bosstype int32 `protobuf:"varint,4,opt,name=bosstype,proto3" json:"bosstype"` // boss类型塔类型
Nickname string `protobuf:"bytes,5,opt,name=nickname,proto3" json:"nickname"` // 昵称
Icon string `protobuf:"bytes,6,opt,name=icon,proto3" json:"icon"` // 玩家头像
Lv int32 `protobuf:"varint,7,opt,name=lv,proto3" json:"lv"` // 玩家等级
Leadpos int32 `protobuf:"varint,8,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
Line []*LineUp `protobuf:"bytes,9,rep,name=line,proto3" json:"line"` // 阵容数据
Huihe int32 `protobuf:"varint,10,opt,name=huihe,proto3" json:"huihe"` // 平均回合数 建议*10
}
func (x *DBVSeasonRank) Reset() {
*x = DBVSeasonRank{}
if protoimpl.UnsafeEnabled {
mi := &file_viking_viking_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBVSeasonRank) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBVSeasonRank) ProtoMessage() {}
func (x *DBVSeasonRank) ProtoReflect() protoreflect.Message {
mi := &file_viking_viking_db_proto_msgTypes[2]
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 DBVSeasonRank.ProtoReflect.Descriptor instead.
func (*DBVSeasonRank) Descriptor() ([]byte, []int) {
return file_viking_viking_db_proto_rawDescGZIP(), []int{2}
}
func (x *DBVSeasonRank) GetId() string {
if x != nil {
return x.Id
}
return ""
}
func (x *DBVSeasonRank) GetUid() string {
if x != nil {
return x.Uid
}
return ""
}
func (x *DBVSeasonRank) GetDifficulty() int32 {
if x != nil {
return x.Difficulty
}
return 0
}
func (x *DBVSeasonRank) GetBosstype() int32 {
if x != nil {
return x.Bosstype
}
return 0
}
func (x *DBVSeasonRank) GetNickname() string {
if x != nil {
return x.Nickname
}
return ""
}
func (x *DBVSeasonRank) GetIcon() string {
if x != nil {
return x.Icon
}
return ""
}
func (x *DBVSeasonRank) GetLv() int32 {
if x != nil {
return x.Lv
}
return 0
}
func (x *DBVSeasonRank) GetLeadpos() int32 {
if x != nil {
return x.Leadpos
}
return 0
}
func (x *DBVSeasonRank) GetLine() []*LineUp {
if x != nil {
return x.Line
}
return nil
}
func (x *DBVSeasonRank) GetHuihe() int32 {
if x != nil {
return x.Huihe
}
return 0
}
var File_viking_viking_db_proto protoreflect.FileDescriptor
var file_viking_viking_db_proto_rawDesc = []byte{
@ -384,23 +264,7 @@ var file_viking_viking_db_proto_rawDesc = []byte{
0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55, 0x70, 0x52, 0x04,
0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x6f, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65,
0x22, 0xfa, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x56, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x52, 0x61,
0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c,
0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
0x75, 0x6c, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65,
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x74, 0x79, 0x70, 0x65,
0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04,
0x69, 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e,
0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76,
0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28,
0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69,
0x6e, 0x65, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x4c, 0x69, 0x6e, 0x65, 0x55,
0x70, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x68, 0x75, 0x69, 0x68, 0x65, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -415,27 +279,25 @@ func file_viking_viking_db_proto_rawDescGZIP() []byte {
return file_viking_viking_db_proto_rawDescData
}
var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_viking_viking_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
var file_viking_viking_db_proto_goTypes = []interface{}{
(*DBViking)(nil), // 0: DBViking
(*DBVikingRank)(nil), // 1: DBVikingRank
(*DBVSeasonRank)(nil), // 2: DBVSeasonRank
nil, // 3: DBViking.BossEntry
nil, // 4: DBViking.BossTimeEntry
nil, // 5: DBViking.PsEntry
(*LineUp)(nil), // 6: LineUp
nil, // 2: DBViking.BossEntry
nil, // 3: DBViking.BossTimeEntry
nil, // 4: DBViking.PsEntry
(*LineUp)(nil), // 5: LineUp
}
var file_viking_viking_db_proto_depIdxs = []int32{
3, // 0: DBViking.boss:type_name -> DBViking.BossEntry
4, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry
5, // 2: DBViking.ps:type_name -> DBViking.PsEntry
6, // 3: DBVikingRank.line:type_name -> LineUp
6, // 4: DBVSeasonRank.line:type_name -> LineUp
5, // [5:5] is the sub-list for method output_type
5, // [5:5] is the sub-list for method input_type
5, // [5:5] is the sub-list for extension type_name
5, // [5:5] is the sub-list for extension extendee
0, // [0:5] is the sub-list for field type_name
2, // 0: DBViking.boss:type_name -> DBViking.BossEntry
3, // 1: DBViking.bossTime:type_name -> DBViking.BossTimeEntry
4, // 2: DBViking.ps:type_name -> DBViking.PsEntry
5, // 3: DBVikingRank.line:type_name -> LineUp
4, // [4:4] is the sub-list for method output_type
4, // [4:4] is the sub-list for method input_type
4, // [4:4] is the sub-list for extension type_name
4, // [4:4] is the sub-list for extension extendee
0, // [0:4] is the sub-list for field type_name
}
func init() { file_viking_viking_db_proto_init() }
@ -469,18 +331,6 @@ func file_viking_viking_db_proto_init() {
return nil
}
}
file_viking_viking_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBVSeasonRank); 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{
@ -488,7 +338,7 @@ func file_viking_viking_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_viking_viking_db_proto_rawDesc,
NumEnums: 0,
NumMessages: 6,
NumMessages: 5,
NumExtensions: 0,
NumServices: 0,
},