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

上传修复代码

Browse Source
This commit is contained in:
liwei1dao 2024-01-17 10:07:54 +08:00
parent 89606daced
commit 04118adbb2
22 changed files with 549 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
comm/imodule.go
View File

@ -46,12 +46,12 @@ type (
type (
ISys interface {
CheckOpenCond(session IUserSession, itype OpencondType, value int32)
// CheckOpenCond(session IUserSession, itype OpencondType, value int32)
// 查询opencond 配置
CheckOpenCondCfgById(uid string, id string) (bOpen bool, errdata *pb.ErrorData)
QueryOpenCondData(uid string) (data map[string]int32, errdata *pb.ErrorData) // 查询玩家当前已开启的功能
GMOpenAllCondition(uid string)
// // 查询opencond 配置
CheckOpenCondCfgById(session IUserSession, id string) (bOpen bool, errdata *pb.ErrorData)
QueryOpenCondData(session IUserSession) (data map[string]int32, errdata *pb.ErrorData) // 查询玩家当前已开启的功能
GMOpenAllCondition(session IUserSession) (errdata *pb.ErrorData)
}
//邮件业务模块对外接口定义 提供给其他模块使用的
@ -554,7 +554,7 @@ type (
//埋点中心
IBuried interface {
//完成任务埋点
CompleteCondition(session IUserSession, condiId int32) (err error)
CompleteCondition(session IUserSession, condiId ...int32) (err error)
//埋点中心触发
TriggerBuried(session IUserSession, burieds ...*pb.BuriedParam)
//校验条件是否达成 返回未完成列表

30
modules/buried/api_completecondi.go Normal file
View File

@ -0,0 +1,30 @@
package buried
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
)
// 参数校验
func (this *apiComp) CompleteCondiCheck(session comm.IUserSession, req *pb.BuriedCompleteCondiReq) (errdata *pb.ErrorData) {
return
}
// 主动完成任务条件
func (this *apiComp) CompleteCondi(session comm.IUserSession, req *pb.BuriedCompleteCondiReq) (errdata *pb.ErrorData) {
var (
err error
)
if errdata = this.CompleteCondiCheck(session, req); errdata != nil {
return
}
if err = this.module.CompleteCondition(session, req.CondiId...); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
}
session.SendMsg(string(this.module.GetType()), "completecondi", &pb.BuriedCompleteCondiResp{})
return
}

99
modules/buried/module.go
View File

@ -92,7 +92,7 @@ func (this *Buried) Rpc_ModuleBuriedTrigger(ctx context.Context, req *pb.Rpc_Mod
}
//完成任务
func (this *Buried) CompleteCondition(session comm.IUserSession, condiId int32) (err error) {
func (this *Buried) CompleteCondition(session comm.IUserSession, condiIds ...int32) (err error) {
var (
uid string
model *buriedModel
@ -110,7 +110,7 @@ func (this *Buried) CompleteCondition(session comm.IUserSession, condiId int32)
if bdatas, err = model.getSessionBuried(session); err != nil {
return
}
this.Debug("完成埋点!", log.Field{Key: "condiId", Value: condiId})
this.Debug("完成埋点!", log.Field{Key: "condiIds", Value: condiIds})
lock, _ := model.userlock(uid)
err = lock.Lock()
if err != nil {
@ -118,58 +118,61 @@ func (this *Buried) CompleteCondition(session comm.IUserSession, condiId int32)
return
}
defer lock.Unlock()
if conf, err = this.configure.getburiedcondidata(condiId); err != nil {
return
}
if bdata, ok = bdatas.Items[conf.Type]; ok {
ok = false
for _, v1 := range bdata.Condi {
if v1.Conid == condiId {
ok = true
if v1.Finish != pb.BuriedItemFinishState_buried_finish {
if conf.Ctype == ctype_once { //完成后自动锁定
v1.State = pb.BuriedItemState_Freeze
} else if conf.Ctype == ctype_repeat {
v1.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_daily {
v1.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_weekly {
v1.State = pb.BuriedItemState_Sleep
for _, condiId := range condiIds {
if conf, err = this.configure.getburiedcondidata(condiId); err != nil {
return
}
if bdata, ok = bdatas.Items[conf.Type]; ok {
ok = false
for _, v1 := range bdata.Condi {
if v1.Conid == condiId {
ok = true
if v1.Finish != pb.BuriedItemFinishState_buried_finish {
if conf.Ctype == ctype_once { //完成后自动锁定
v1.State = pb.BuriedItemState_Freeze
} else if conf.Ctype == ctype_repeat {
v1.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_daily {
v1.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_weekly {
v1.State = pb.BuriedItemState_Sleep
}
v1.Value = conf.Value
v1.Finish = pb.BuriedItemFinishState_buried_finish
progress = append(progress, comm.GetBuriedConIProgress(conf, v1))
}
v1.Value = conf.Value
v1.Finish = pb.BuriedItemFinishState_buried_finish
progress = append(progress, comm.GetBuriedConIProgress(conf, v1))
}
}
} else {
bdata = &pb.DBBuriedItem{
Btype: conf.Type,
Condi: make([]*pb.DBBuriedConItem, 0),
}
bdatas.Items[conf.Type] = bdata
}
} else {
bdata = &pb.DBBuriedItem{
Btype: conf.Type,
Condi: make([]*pb.DBBuriedConItem, 0),
if !ok { //未找到 初始化一个
bitem = &pb.DBBuriedConItem{
Conid: condiId,
State: pb.BuriedItemState_Activated,
Value: conf.Value,
Statistics: make([]string, 0),
Timestamp: time.Now().Unix(),
Finish: pb.BuriedItemFinishState_buried_finish,
}
if conf.Ctype == ctype_once { //完成后自动锁定
bitem.State = pb.BuriedItemState_Freeze
} else if conf.Ctype == ctype_repeat {
bitem.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_daily {
bitem.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_weekly {
bitem.State = pb.BuriedItemState_Sleep
}
bdata.Condi = append(bdata.Condi, bitem)
progress = append(progress, comm.GetBuriedConIProgress(conf, bitem))
}
bdatas.Items[conf.Type] = bdata
}
if !ok { //未找到 初始化一个
bitem = &pb.DBBuriedConItem{
Conid: condiId,
State: pb.BuriedItemState_Activated,
Value: conf.Value,
Statistics: make([]string, 0),
Timestamp: time.Now().Unix(),
Finish: pb.BuriedItemFinishState_buried_finish,
}
if conf.Ctype == ctype_once { //完成后自动锁定
bitem.State = pb.BuriedItemState_Freeze
} else if conf.Ctype == ctype_repeat {
bitem.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_daily {
bitem.State = pb.BuriedItemState_Sleep
} else if conf.Ctype == ctype_weekly {
bitem.State = pb.BuriedItemState_Sleep
}
bdata.Condi = append(bdata.Condi, bitem)
progress = append(progress, comm.GetBuriedConIProgress(conf, bitem))
}
if err = model.updateUserBurieds(uid, bdatas); err != nil {
this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()})
return

1
modules/friend/api_cross_agree.go
View File

@ -185,7 +185,6 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.FriendAgreeReq) (e
session.SendMsg(string(this.module.GetType()), FriendSubTypeAgree, resp)
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeFriend, int32(len(self.FriendIds)))
this.module.maincity.AddMainCityFriends(session.GetUserId(), req.FriendIds)
if len(tasks) > 0 {
this.module.ModuleBuried.TriggerBuried(session, tasks...)

6
modules/friend/api_cross_del.go
View File

@ -79,8 +79,8 @@ func (this *apiComp) Del(session comm.IUserSession, req *pb.FriendDelReq) (errda
return
}
session.SendMsg(string(this.module.GetType()), FriendSubTypeDel, &pb.FriendDelResp{FriendId: req.FriendId, UserId: self.Uid})
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeFriend, int32(len(self.FriendIds)))
})
// go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
// this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeFriend, int32(len(self.FriendIds)))
// })
return
}

2
modules/gm/module.go
View File

@ -785,7 +785,7 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (errdata *pb.Er
return
}
module1.(comm.ISys).GMOpenAllCondition(session.GetUserId())
errdata = module1.(comm.ISys).GMOpenAllCondition(session)
this.Debug("使用bingo命令:uid = %s ",
log.Field{Key: "uid", Value: session.GetUserId()},

2
modules/mainline/api_challengeover.go
View File

@ -196,7 +196,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleBuried.TriggerBuried(session, tasks...)
this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypeMaxmapid, req.Level)
// this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypeMaxmapid, req.Level)
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineChallengeOverReq", atno)
})
return

2
modules/mainline/api_levelpass.go
View File

@ -144,7 +144,7 @@ func (this *apiComp) LevelPass(session comm.IUserSession, req *pb.MainlineLevelP
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleBuried.TriggerBuried(session, tasks...)
this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypeMaxmapid, req.Level)
// this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypeMaxmapid, req.Level)
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "MainlineLevelPassReq", aeward)
})
return

2
modules/moonlv/api_lvaward.go
View File

@ -93,7 +93,7 @@ func (this *apiComp) Award(session comm.IUserSession, req *pb.MoonlvAwardReq) (e
Res: atno,
})
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeMoonLv, list.Lv)
// this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeMoonLv, list.Lv)
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype242, list.Lv))
})
return

2
modules/pagoda/api_challengeover.go
View File

@ -196,7 +196,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PagodaChal
this.module.SetPagodaRankList("pagodaList"+strconv.Itoa(int(newData.PagodaId)), pagoda.PagodaId, newData.Id)
}
this.chat.SendSysChatToWorld(session, comm.ChatSystem4, nil, pagoda.PagodaId, 0, user.Name)
this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypePagoda, conf.Key)
// this.module.ModuleSys.CheckOpenCond(session, comm.OpencondTypePagoda, conf.Key)
this.module.ModuleBuried.TriggerBuried(session, comm.GetBuriedParam(comm.Rtype168, pagoda.Data[conf.Tab], conf.Tab))
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PagodaChallengeOverReq", conf.Reward)
})

2
modules/practice/api_info.go
View File

@ -62,7 +62,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.PracticeInfoReq) (e
}
if room.Npcstate == -1 { //未开启 检查是否开启
if open, errdata = this.module.ModuleSys.CheckOpenCondCfgById(session.GetUserId(), "pavilion_kick"); errdata != nil {
if open, errdata = this.module.ModuleSys.CheckOpenCondCfgById(session, "pavilion_kick"); errdata != nil {
return
}
if open {

190
modules/sys/module.go
View File

@ -59,116 +59,132 @@ func (this *ModuleSys) Start() (err error) {
return
}
func (this *ModuleSys) CheckOpenCond(session comm.IUserSession, itype comm.OpencondType, value int32) {
var (
list *pb.DBOpenCond
err error
update map[string]interface{}
)
if list, err = this.modelSys.GetOpenCondList(session.GetUserId()); err != nil {
return
}
// func (this *ModuleSys) CheckOpenCond(session comm.IUserSession, itype comm.OpencondType, value int32) {
// var (
// list *pb.DBOpenCond
// err error
// update map[string]interface{}
// )
// if list, err = this.modelSys.GetOpenCondList(session.GetUserId()); err != nil {
// return
// }
update = make(map[string]interface{})
switch itype {
case comm.OpencondTypePlatlv:
if list.Lv != value {
list.Lv = value
update["lv"] = list.Lv
}
case comm.OpencondTypeMaxmapid:
list.Mline[value] = 1
update["mline"] = list.Mline
case comm.OpencondTypeWorldtaskid:
list.Wtask[value] = 1
update["wtask"] = list.Wtask
case comm.OpencondTypeFriend:
if list.Friend != value {
list.Friend = value
update["friend"] = list.Friend
}
case comm.OpencondTypePagoda:
list.Pagoda[value] = 1
update["pagoda"] = list.Pagoda
case comm.OpencondTypeSociaty:
if list.Sociaty != value {
list.Sociaty = value
update["friend"] = list.Friend
}
case comm.OpencondTypeMoonLv:
if list.Moonlv != value {
list.Moonlv = value
update["moonlv"] = list.Moonlv
}
default:
return
}
if err = this.modelSys.ChangeOpenCondData(session.GetUserId(), update); err != nil {
this.Errorf("ChangeOpenCondData error: %v", err)
}
// update = make(map[string]interface{})
// switch itype {
// case comm.OpencondTypePlatlv:
// if list.Lv != value {
// list.Lv = value
// update["lv"] = list.Lv
// }
// case comm.OpencondTypeMaxmapid:
// list.Mline[value] = 1
// update["mline"] = list.Mline
// case comm.OpencondTypeWorldtaskid:
// list.Wtask[value] = 1
// update["wtask"] = list.Wtask
// case comm.OpencondTypeFriend:
// if list.Friend != value {
// list.Friend = value
// update["friend"] = list.Friend
// }
// case comm.OpencondTypePagoda:
// list.Pagoda[value] = 1
// update["pagoda"] = list.Pagoda
// case comm.OpencondTypeSociaty:
// if list.Sociaty != value {
// list.Sociaty = value
// update["friend"] = list.Friend
// }
// case comm.OpencondTypeMoonLv:
// if list.Moonlv != value {
// list.Moonlv = value
// update["moonlv"] = list.Moonlv
// }
// default:
// return
// }
// if err = this.modelSys.ChangeOpenCondData(session.GetUserId(), update); err != nil {
// this.Errorf("ChangeOpenCondData error: %v", err)
// }
}
// }
// 功能开启条件校验
func (this *ModuleSys) CheckOpenCondCfgById(uid string, id string) (bOpen bool, errdata *pb.ErrorData) {
func (this *ModuleSys) CheckOpenCondCfgById(session comm.IUserSession, id string) (bOpen bool, errdata *pb.ErrorData) {
var (
list *pb.DBOpenCond
conf *cfg.GameOpencondData
err error
)
if list, err = this.modelSys.GetOpenCondList(uid); err != nil {
return
}
if _, ok := list.Cond[id]; ok { // 数据过滤
if list.Cond[id] > 0 {
bOpen = true
return
}
}
return
}
func (this *ModuleSys) QueryOpenCondData(uid string) (data map[string]int32, errdata *pb.ErrorData) {
data = make(map[string]int32, 0)
list, err := this.modelSys.GetOpenCondList(uid)
if err != nil {
if conf, err = this.configure.GetOpenCondCfgById(id); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_SystemError,
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
for k, v := range list.Cond {
if v == 2 { // 已经开启的功能
data[k] = v
}
}
bOpen, _, _ = this.ModuleBuried.CheckCondition(session, conf.Opencondi...)
return
}
func (this *ModuleSys) GMOpenAllCondition(uid string) {
func (this *ModuleSys) QueryOpenCondData(session comm.IUserSession) (data map[string]int32, errdata *pb.ErrorData) {
var (
list *pb.DBOpenCond
conf *cfg.GameOpencond
condlids []int32
condis []*pb.ConIProgress
condisMap map[int32]*pb.ConIProgress = make(map[int32]*pb.ConIProgress)
progress *pb.ConIProgress
err error
ok bool
)
opencfg, err := this.configure.getOpencondCfg()
if err != nil {
if conf, err = this.configure.getOpencondCfg(); err != nil {
return
}
if list, err = this.modelSys.GetOpenCondList(uid); err != nil {
for _, v := range conf.GetDataList() {
condlids = append(condlids, v.Opencondi...)
}
if _, condis, err = this.ModuleBuried.CheckCondition(session, condlids...); err != nil {
return
}
for _, v := range opencfg.GetDataList() {
if !v.ActivateType { // 跳过手动激活类型
list.Cond[v.Id] = 2
for _, v := range condis {
condisMap[v.Conid] = v
}
for _, v := range conf.GetDataList() {
ok = true
for _, condi := range v.Opencondi {
if progress, ok = condisMap[condi]; !ok || progress.State != pb.BuriedItemFinishState_buried_finish {
ok = false
break
}
}
if ok {
data[v.Id] = 2
}
}
return
}
func (this *ModuleSys) GMOpenAllCondition(session comm.IUserSession) (errdata *pb.ErrorData) {
var (
conf *cfg.GameOpencond
condlids []int32
err error
)
if conf, err = this.configure.getOpencondCfg(); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
}
return
}
for _, v := range conf.GetDataList() {
condlids = append(condlids, v.Opencondi...)
}
if err = this.ModuleBuried.CompleteCondition(session, condlids...); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ExternalModule,
Message: err.Error(),
}
}
this.modelSys.ChangeOpenCondData(uid, map[string]interface{}{
"cond": list.Cond,
})
return
}

2
modules/user/model_user.go
View File

@ -306,7 +306,7 @@ func (this *ModelUser) changelv(session comm.IUserSession, lv int32, exp int64,
}
this.module.chat.SendSysChatToUser(session, comm.ChatSystem12, lv, 0, name)
this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv)
// this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypePlatlv, lv)
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype20, lv))
this.module.ModuleBuried.TriggerBuried(session, tasks...)
})

2
modules/user/module.go
View File

@ -1068,7 +1068,7 @@ func (this *User) BingoSetUserLv(session comm.IUserSession, lv int32) error {
)
}
}
this.ModuleSys.CheckOpenCond(session, comm.OpencondTypePlatlv, lv)
// this.ModuleSys.CheckOpenCond(session, comm.OpencondTypePlatlv, lv)
// 触发埋点
return nil
}

4
modules/weektask/api_Info.go
View File

@ -28,7 +28,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WeekTaskInfoReq) (e
return
}
if info, err = this.module.modelWeektask.getUserDTasks(session.GetUserId()); err != nil {
if info, err = this.module.modelWeektask.getUserDTasks(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@ -42,7 +42,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.WeekTaskInfoReq) (e
info.Acomplete = make(map[int32]bool)
info.Activity = 0
info.Rtime = configure.Now().Unix()
if opencmd, errdata = this.module.sys.QueryOpenCondData(session.GetUserId()); errdata != nil {
if opencmd, errdata = this.module.sys.QueryOpenCondData(session); errdata != nil {
return
} else {
if err = this.module.modelWeektask.inquireActivations(info, opencmd); err != nil {

2
modules/weektask/api_activityreceive.go
View File

@ -25,7 +25,7 @@ func (this *apiComp) ActivityReceive(session comm.IUserSession, req *pb.WeekTask
return
}
if info, err = this.module.modelWeektask.getUserDTasks(session.GetUserId()); err != nil {
if info, err = this.module.modelWeektask.getUserDTasks(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),

4
modules/weektask/api_receive.go
View File

@ -26,7 +26,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WeekTaskReceiveR
return
}
if info, err = this.module.modelWeektask.getUserDTasks(session.GetUserId()); err != nil {
if info, err = this.module.modelWeektask.getUserDTasks(session); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(),
@ -67,7 +67,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WeekTaskReceiveR
info.Activity += conf.Active
info.Tcomplete[req.Tid] = true
if opencmd, errdata = this.module.sys.QueryOpenCondData(session.GetUserId()); errdata != nil {
if opencmd, errdata = this.module.sys.QueryOpenCondData(session); errdata != nil {
return
} else {
if err = this.module.modelWeektask.inquireActivations(info, opencmd); err != nil {

10
modules/weektask/modelWeeltask.go
View File

@ -31,23 +31,23 @@ func (this *ModelWeektask) Init(service core.IService, module core.IModule, comp
}
// 获取用户全部的埋点数据
func (this *ModelWeektask) getUserDTasks(uid string) (results *pb.DBWeektask, err error) {
func (this *ModelWeektask) getUserDTasks(session comm.IUserSession) (results *pb.DBWeektask, err error) {
results = &pb.DBWeektask{}
if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil {
if err = this.Get(session.GetUserId(), results); err != nil && err != mgo.MongodbNil {
this.module.Errorln(err)
return
}
if err == mgo.MongodbNil {
results = &pb.DBWeektask{
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Uid: session.GetUserId(),
Activity: 0,
Tasks: make([]int32, 0),
Tcomplete: make(map[int32]bool),
Acomplete: make(map[int32]bool),
Rtime: configure.Now().Unix(),
}
if opencmd, errdata := this.module.sys.QueryOpenCondData(uid); errdata != nil {
if opencmd, errdata := this.module.sys.QueryOpenCondData(session); errdata != nil {
err = fmt.Errorf("sys.QueryOpenCondData err:%s", errdata.Message)
return
} else {
@ -55,7 +55,7 @@ func (this *ModelWeektask) getUserDTasks(uid string) (results *pb.DBWeektask, er
return
}
}
err = this.Add(uid, results)
err = this.Add(session.GetUserId(), results)
}
return
}

1
modules/wtask/api_finish.go
View File

@ -156,7 +156,6 @@ func (this *apiComp) Finish(session comm.IUserSession, req *pb.WTaskFinishReq) (
this.module.caravan.TaskComplete(session, req.Tid)
}
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
this.module.ModuleSys.CheckOpenCond(session.Clone(), comm.OpencondTypeWorldtaskid, req.Tid)
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "WTaskFinishReq", award)
this.module.WriteUserLog(session.GetUserId(), req, comm.GMResDelType, "WTaskFinishReq", conf.TaskendRemoveitem)
this.module.ModuleBuried.TriggerBuried(session, tasks...)

141
pb/battle_struct.pb.go
View File

@ -1997,6 +1997,62 @@ func (x *ComExtraEffect) GetTarget() []int32 {
return nil
}
//触发被动飘字
type ComTriggerPassive struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
From int32 `protobuf:"varint,1,opt,name=from,proto3" json:"from"` //发起者
Id int32 `protobuf:"varint,2,opt,name=id,proto3" json:"id"` //被动ID
}
func (x *ComTriggerPassive) Reset() {
*x = ComTriggerPassive{}
if protoimpl.UnsafeEnabled {
mi := &file_battle_battle_struct_proto_msgTypes[28]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *ComTriggerPassive) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*ComTriggerPassive) ProtoMessage() {}
func (x *ComTriggerPassive) ProtoReflect() protoreflect.Message {
mi := &file_battle_battle_struct_proto_msgTypes[28]
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 ComTriggerPassive.ProtoReflect.Descriptor instead.
func (*ComTriggerPassive) Descriptor() ([]byte, []int) {
return file_battle_battle_struct_proto_rawDescGZIP(), []int{28}
}
func (x *ComTriggerPassive) GetFrom() int32 {
if x != nil {
return x.From
}
return 0
}
func (x *ComTriggerPassive) GetId() int32 {
if x != nil {
return x.Id
}
return 0
}
var File_battle_battle_struct_proto protoreflect.FileDescriptor
var file_battle_battle_struct_proto_rawDesc = []byte{
@ -2177,33 +2233,37 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61,
0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e,
0x69, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x2a, 0x88, 0x03,
0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65,
0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10,
0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73,
0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02,
0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08,
0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f,
0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e,
0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50,
0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a,
0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47,
0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41,
0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b,
0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a,
0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55,
0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f,
0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f,
0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c,
0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08,
0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f,
0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65,
0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69,
0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53,
0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68,
0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52,
0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10, 0x18, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x37, 0x0a,
0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, 0x61, 0x73, 0x73, 0x69,
0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x2a, 0x88, 0x03, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63,
0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66,
0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f,
0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49,
0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73,
0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69,
0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72,
0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69,
0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61,
0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72,
0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75,
0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72,
0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65,
0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f,
0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d,
0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09,
0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63,
0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42,
0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65,
0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10,
0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10,
0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69,
0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69,
0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75,
0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10,
0x18, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x33,
}
var (
@ -2219,7 +2279,7 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte {
}
var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 29)
var file_battle_battle_struct_proto_goTypes = []interface{}{
(EffectTipsType)(0), // 0: EffectTipsType
(*ComModifyOperate)(nil), // 1: ComModifyOperate
@ -2250,17 +2310,18 @@ var file_battle_battle_struct_proto_goTypes = []interface{}{
(*ComSwitchScene)(nil), // 26: ComSwitchScene
(*ComReplaceSkill)(nil), // 27: ComReplaceSkill
(*ComExtraEffect)(nil), // 28: ComExtraEffect
(*BattleRole)(nil), // 29: BattleRole
(*BattleCmd)(nil), // 30: BattleCmd
(*ComTriggerPassive)(nil), // 29: ComTriggerPassive
(*BattleRole)(nil), // 30: BattleRole
(*BattleCmd)(nil), // 31: BattleCmd
}
var file_battle_battle_struct_proto_depIdxs = []int32{
29, // 0: ComInitFight.roles:type_name -> BattleRole
30, // 0: ComInitFight.roles:type_name -> BattleRole
6, // 1: ComStartAction.skillInfo:type_name -> ComSkillInfo
6, // 2: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo
12, // 3: ComSkillAtk.comList:type_name -> ComSkillAfterAtk
30, // 4: ComSkillAfterAtk.comList:type_name -> BattleCmd
31, // 4: ComSkillAfterAtk.comList:type_name -> BattleCmd
0, // 5: ComModifyHealth.tips:type_name -> EffectTipsType
29, // 6: ComCreateRoles.roles:type_name -> BattleRole
30, // 6: ComCreateRoles.roles:type_name -> BattleRole
0, // 7: ComEffectTips.type:type_name -> EffectTipsType
6, // 8: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo
9, // [9:9] is the sub-list for method output_type
@ -2614,6 +2675,18 @@ func file_battle_battle_struct_proto_init() {
return nil
}
}
file_battle_battle_struct_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*ComTriggerPassive); 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{
@ -2621,7 +2694,7 @@ func file_battle_battle_struct_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_battle_battle_struct_proto_rawDesc,
NumEnums: 1,
NumMessages: 28,
NumMessages: 29,
NumExtensions: 0,
NumServices: 0,
},

218
pb/buried_msg.pb.go
View File

@ -202,6 +202,93 @@ func (x *BuriedInquireProgressResp) GetConditions() []*ConIProgress {
return nil
}
//完成埋点请求
type BuriedCompleteCondiReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
CondiId []int32 `protobuf:"varint,2,rep,packed,name=condiId,proto3" json:"condiId"`
}
func (x *BuriedCompleteCondiReq) Reset() {
*x = BuriedCompleteCondiReq{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_msg_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *BuriedCompleteCondiReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*BuriedCompleteCondiReq) ProtoMessage() {}
func (x *BuriedCompleteCondiReq) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_msg_proto_msgTypes[4]
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 BuriedCompleteCondiReq.ProtoReflect.Descriptor instead.
func (*BuriedCompleteCondiReq) Descriptor() ([]byte, []int) {
return file_buried_buried_msg_proto_rawDescGZIP(), []int{4}
}
func (x *BuriedCompleteCondiReq) GetCondiId() []int32 {
if x != nil {
return x.CondiId
}
return nil
}
//完成埋点
type BuriedCompleteCondiResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *BuriedCompleteCondiResp) Reset() {
*x = BuriedCompleteCondiResp{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_msg_proto_msgTypes[5]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *BuriedCompleteCondiResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*BuriedCompleteCondiResp) ProtoMessage() {}
func (x *BuriedCompleteCondiResp) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_msg_proto_msgTypes[5]
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 BuriedCompleteCondiResp.ProtoReflect.Descriptor instead.
func (*BuriedCompleteCondiResp) Descriptor() ([]byte, []int) {
return file_buried_buried_msg_proto_rawDescGZIP(), []int{5}
}
//埋点进度变化推送
type BuriedChangePush struct {
state protoimpl.MessageState
@ -214,7 +301,7 @@ type BuriedChangePush struct {
func (x *BuriedChangePush) Reset() {
*x = BuriedChangePush{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_msg_proto_msgTypes[4]
mi := &file_buried_buried_msg_proto_msgTypes[6]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -227,7 +314,7 @@ func (x *BuriedChangePush) String() string {
func (*BuriedChangePush) ProtoMessage() {}
func (x *BuriedChangePush) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_msg_proto_msgTypes[4]
mi := &file_buried_buried_msg_proto_msgTypes[6]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -240,7 +327,7 @@ func (x *BuriedChangePush) ProtoReflect() protoreflect.Message {
// Deprecated: Use BuriedChangePush.ProtoReflect.Descriptor instead.
func (*BuriedChangePush) Descriptor() ([]byte, []int) {
return file_buried_buried_msg_proto_rawDescGZIP(), []int{4}
return file_buried_buried_msg_proto_rawDescGZIP(), []int{6}
}
func (x *BuriedChangePush) GetConitems() []*ConIProgress {
@ -268,7 +355,7 @@ type Rpc_ModuleBuriedTriggerReq struct {
func (x *Rpc_ModuleBuriedTriggerReq) Reset() {
*x = Rpc_ModuleBuriedTriggerReq{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_msg_proto_msgTypes[5]
mi := &file_buried_buried_msg_proto_msgTypes[7]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -281,7 +368,7 @@ func (x *Rpc_ModuleBuriedTriggerReq) String() string {
func (*Rpc_ModuleBuriedTriggerReq) ProtoMessage() {}
func (x *Rpc_ModuleBuriedTriggerReq) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_msg_proto_msgTypes[5]
mi := &file_buried_buried_msg_proto_msgTypes[7]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -294,7 +381,7 @@ func (x *Rpc_ModuleBuriedTriggerReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use Rpc_ModuleBuriedTriggerReq.ProtoReflect.Descriptor instead.
func (*Rpc_ModuleBuriedTriggerReq) Descriptor() ([]byte, []int) {
return file_buried_buried_msg_proto_rawDescGZIP(), []int{5}
return file_buried_buried_msg_proto_rawDescGZIP(), []int{7}
}
func (x *Rpc_ModuleBuriedTriggerReq) GetIp() string {
@ -355,7 +442,7 @@ type Rpc_ModuleBuriedTriggerResp struct {
func (x *Rpc_ModuleBuriedTriggerResp) Reset() {
*x = Rpc_ModuleBuriedTriggerResp{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_msg_proto_msgTypes[6]
mi := &file_buried_buried_msg_proto_msgTypes[8]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -368,7 +455,7 @@ func (x *Rpc_ModuleBuriedTriggerResp) String() string {
func (*Rpc_ModuleBuriedTriggerResp) ProtoMessage() {}
func (x *Rpc_ModuleBuriedTriggerResp) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_msg_proto_msgTypes[6]
mi := &file_buried_buried_msg_proto_msgTypes[8]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -381,7 +468,7 @@ func (x *Rpc_ModuleBuriedTriggerResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use Rpc_ModuleBuriedTriggerResp.ProtoReflect.Descriptor instead.
func (*Rpc_ModuleBuriedTriggerResp) Descriptor() ([]byte, []int) {
return file_buried_buried_msg_proto_rawDescGZIP(), []int{6}
return file_buried_buried_msg_proto_rawDescGZIP(), []int{8}
}
var File_buried_buried_msg_proto protoreflect.FileDescriptor
@ -403,29 +490,34 @@ var file_buried_buried_msg_proto_rawDesc = []byte{
0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x2d, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x64,
0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43,
0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0a, 0x63, 0x6f, 0x6e,
0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x3d, 0x0a, 0x10, 0x42, 0x75, 0x72, 0x69, 0x65,
0x64, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x29, 0x0a, 0x08, 0x63,
0x6f, 0x6e, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
0x43, 0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x08, 0x63, 0x6f,
0x6e, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0xf4, 0x01, 0x0a, 0x1a, 0x52, 0x70, 0x63, 0x5f, 0x4d,
0x6f, 0x64, 0x75, 0x6c, 0x65, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x54, 0x72, 0x69, 0x67, 0x67,
0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73,
0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73,
0x65, 0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55,
0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65,
0x72, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61,
0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
0x54, 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65,
0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47,
0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x73,
0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x50,
0x61, 0x72, 0x61, 0x6d, 0x52, 0x07, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x73, 0x22, 0x1d, 0x0a,
0x1b, 0x52, 0x70, 0x63, 0x5f, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x42, 0x75, 0x72, 0x69, 0x65,
0x64, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x32, 0x0a, 0x16, 0x42, 0x75, 0x72, 0x69, 0x65,
0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x52, 0x65,
0x71, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x18, 0x02, 0x20, 0x03,
0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x42,
0x75, 0x72, 0x69, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6e,
0x64, 0x69, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x10, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64,
0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x29, 0x0a, 0x08, 0x63, 0x6f,
0x6e, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43,
0x6f, 0x6e, 0x49, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x08, 0x63, 0x6f, 0x6e,
0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0xf4, 0x01, 0x0a, 0x1a, 0x52, 0x70, 0x63, 0x5f, 0x4d, 0x6f,
0x64, 0x75, 0x6c, 0x65, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65,
0x72, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x02, 0x49, 0x70, 0x12, 0x24, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x73, 0x73,
0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x55, 0x73, 0x65,
0x72, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x55, 0x73,
0x65, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x55, 0x73, 0x65, 0x72,
0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67,
0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54,
0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72,
0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61,
0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x14,
0x0a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x47,
0x72, 0x6f, 0x75, 0x70, 0x12, 0x26, 0x0a, 0x07, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x73, 0x18,
0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x50, 0x61,
0x72, 0x61, 0x6d, 0x52, 0x07, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x73, 0x22, 0x1d, 0x0a, 0x1b,
0x52, 0x70, 0x63, 0x5f, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64,
0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -440,28 +532,30 @@ func file_buried_buried_msg_proto_rawDescGZIP() []byte {
return file_buried_buried_msg_proto_rawDescData
}
var file_buried_buried_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
var file_buried_buried_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9)
var file_buried_buried_msg_proto_goTypes = []interface{}{
(*BuriedInfoReq)(nil), // 0: BuriedInfoReq
(*BuriedInfoResp)(nil), // 1: BuriedInfoResp
(*BuriedInquireProgressReq)(nil), // 2: BuriedInquireProgressReq
(*BuriedInquireProgressResp)(nil), // 3: BuriedInquireProgressResp
(*BuriedChangePush)(nil), // 4: BuriedChangePush
(*Rpc_ModuleBuriedTriggerReq)(nil), // 5: Rpc_ModuleBuriedTriggerReq
(*Rpc_ModuleBuriedTriggerResp)(nil), // 6: Rpc_ModuleBuriedTriggerResp
(*ConIProgress)(nil), // 7: ConIProgress
(*BuriedParam)(nil), // 8: BuriedParam
(*BuriedCompleteCondiReq)(nil), // 4: BuriedCompleteCondiReq
(*BuriedCompleteCondiResp)(nil), // 5: BuriedCompleteCondiResp
(*BuriedChangePush)(nil), // 6: BuriedChangePush
(*Rpc_ModuleBuriedTriggerReq)(nil), // 7: Rpc_ModuleBuriedTriggerReq
(*Rpc_ModuleBuriedTriggerResp)(nil), // 8: Rpc_ModuleBuriedTriggerResp
(*ConIProgress)(nil), // 9: ConIProgress
(*BuriedParam)(nil), // 10: BuriedParam
}
var file_buried_buried_msg_proto_depIdxs = []int32{
7, // 0: BuriedInfoResp.conitems:type_name -> ConIProgress
7, // 1: BuriedInquireProgressResp.conditions:type_name -> ConIProgress
7, // 2: BuriedChangePush.conitems:type_name -> ConIProgress
8, // 3: Rpc_ModuleBuriedTriggerReq.Burieds:type_name -> BuriedParam
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
9, // 0: BuriedInfoResp.conitems:type_name -> ConIProgress
9, // 1: BuriedInquireProgressResp.conditions:type_name -> ConIProgress
9, // 2: BuriedChangePush.conitems:type_name -> ConIProgress
10, // 3: Rpc_ModuleBuriedTriggerReq.Burieds:type_name -> BuriedParam
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_buried_buried_msg_proto_init() }
@ -520,7 +614,7 @@ func file_buried_buried_msg_proto_init() {
}
}
file_buried_buried_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*BuriedChangePush); i {
switch v := v.(*BuriedCompleteCondiReq); i {
case 0:
return &v.state
case 1:
@ -532,7 +626,7 @@ func file_buried_buried_msg_proto_init() {
}
}
file_buried_buried_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Rpc_ModuleBuriedTriggerReq); i {
switch v := v.(*BuriedCompleteCondiResp); i {
case 0:
return &v.state
case 1:
@ -544,6 +638,30 @@ func file_buried_buried_msg_proto_init() {
}
}
file_buried_buried_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*BuriedChangePush); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_buried_buried_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Rpc_ModuleBuriedTriggerReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_buried_buried_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*Rpc_ModuleBuriedTriggerResp); i {
case 0:
return &v.state
@ -562,7 +680,7 @@ func file_buried_buried_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_buried_buried_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 7,
NumMessages: 9,
NumExtensions: 0,
NumServices: 0,
},

116
pb/user_db.pb.go
View File

@ -174,6 +174,7 @@ type DBUser struct {
Moonlv int32 `protobuf:"varint,54,opt,name=moonlv,proto3" json:"moonlv"` // 月明度等级
Resreplies map[int32]int64 `protobuf:"bytes,55,rep,name=resreplies,proto3" json:"resreplies" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //资源恢复时间记录表
Group int32 `protobuf:"varint,56,opt,name=group,proto3" json:"group"` //用户组
Plunder int32 `protobuf:"varint,57,opt,name=plunder,proto3" json:"plunder"` // 掠夺积分
}
func (x *DBUser) Reset() {
@ -579,6 +580,13 @@ func (x *DBUser) GetGroup() int32 {
return 0
}
func (x *DBUser) GetPlunder() int32 {
if x != nil {
return x.Plunder
}
return 0
}
type DBUserSetting struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@ -914,7 +922,7 @@ var file_user_user_db_proto_rawDesc = []byte{
0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67,
0x72, 0x6f, 0x75, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
0x6d, 0x70, 0x22, 0x9e, 0x0b, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a,
0x6d, 0x70, 0x22, 0xb8, 0x0b, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 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, 0x75, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75,
@ -1000,58 +1008,60 @@ var file_user_user_db_proto_rawDesc = []byte{
0x65, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x65, 0x73, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x52, 0x0a, 0x72, 0x65, 0x73, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x65, 0x73, 0x12, 0x14,
0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x38, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67,
0x72, 0x6f, 0x75, 0x70, 0x1a, 0x3d, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x72, 0x65, 0x70, 0x6c, 0x69,
0x65, 0x73, 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, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0xd2, 0x03, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65,
0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68,
0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12,
0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01,
0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a,
0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c,
0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a,
0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75,
0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20,
0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67,
0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a,
0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08,
0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75,
0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12,
0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08,
0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61,
0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75,
0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69,
0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x12, 0x47, 0x0a,
0x0d, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 0x18, 0x0f,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74,
0x74, 0x69, 0x6e, 0x67, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61,
0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0d, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 0x1a, 0x40, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 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, 0x09, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb8, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53,
0x69, 0x67, 0x6e, 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, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d,
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d,
0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04,
0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x06, 0x20, 0x01,
0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c,
0x65, 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x12,
0x12, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74,
0x69, 0x70, 0x73, 0x22, 0x57, 0x0a, 0x0c, 0x44, 0x42, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e,
0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6e, 0x12, 0x16, 0x0a, 0x06,
0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65,
0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x72, 0x6f, 0x75, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x18,
0x39, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x1a, 0x3d,
0x0a, 0x0f, 0x52, 0x65, 0x73, 0x72, 0x65, 0x70, 0x6c, 0x69, 0x65, 0x73, 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, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xd2, 0x03,
0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12,
0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28,
0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e,
0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61,
0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75,
0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75,
0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28,
0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63,
0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a,
0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65,
0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09,
0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66,
0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65,
0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28,
0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f,
0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64,
0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67,
0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e,
0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08,
0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x12, 0x47, 0x0a, 0x0d, 0x62, 0x61, 0x74, 0x74, 0x6c,
0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21,
0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x2e, 0x42,
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x0d, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x73,
0x1a, 0x40, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
0x73, 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, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
0x38, 0x01, 0x22, 0xb8, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 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,
0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73,
0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f,
0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12,
0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61,
0x79, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x03, 0x28,
0x05, 0x52, 0x06, 0x70, 0x75, 0x7a, 0x7a, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x70,
0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x57, 0x0a,
0x0c, 0x44, 0x42, 0x52, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x17, 0x0a,
0x07, 0x6e, 0x61, 0x6d, 0x65, 0x5f, 0x63, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16,
0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (