上传任务系统代码

This commit is contained in:
liwei1dao 2023-05-30 21:25:29 +08:00
parent 9d16c57768
commit c67b911d54
20 changed files with 4939 additions and 4430 deletions

View File

@ -5430,7 +5430,7 @@
"type_sp": 1,
"tasktxt": {
"key": "taskcond_rdtask_condi_tasktxt_370",
"text": "为1名英雄穿戴完整3星6件套"
"text": "1名英雄穿戴3星无极神功套装"
},
"type": 46,
"valid": 0,
@ -10013,6 +10013,7 @@
"NPC": 0,
"value": 1,
"filter": [
1,
1
]
},
@ -10063,7 +10064,8 @@
"value": 1,
"filter": [
1,
30
30,
1
]
},
{

View File

@ -288,7 +288,7 @@
},
{
"id": 46,
"insert": 4,
"insert": 2,
"filter": [
"eq",
"eq"
@ -407,8 +407,7 @@
"id": 65,
"insert": 2,
"filter": [
"eq",
"gte"
"eq"
]
},
{

File diff suppressed because it is too large Load Diff

View File

@ -2172,9 +2172,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"hpgrow": 18000,
"atkgrow": 4200,
"defgrow": 2000,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2194,9 +2194,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"hpgrow": 8500,
"atkgrow": 4200,
"defgrow": 1500,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2216,9 +2216,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2250,
"hpgrow": 8000,
"atkgrow": 4200,
"defgrow": 1500,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2238,9 +2238,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"hpgrow": 8000,
"atkgrow": 4200,
"defgrow": 2000,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2260,9 +2260,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2000,
"hpgrow": 8000,
"atkgrow": 4200,
"defgrow": 1500,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2282,9 +2282,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 2250,
"atkgrow": 1500,
"defgrow": 1500,
"hpgrow": 8000,
"atkgrow": 4200,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2304,9 +2304,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 1250,
"atkgrow": 2000,
"defgrow": 1250,
"hpgrow": 8000,
"atkgrow": 4200,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2326,9 +2326,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 1000,
"hpgrow": 8000,
"atkgrow": 4200,
"defgrow": 1250,
"defgrow": 1100,
"speedgrow": 0
},
{
@ -2348,9 +2348,9 @@
"treadd": 0,
"betreadd": 0,
"suckblood": 0,
"hpgrow": 1900,
"atkgrow": 1700,
"defgrow": 1700,
"hpgrow": 8000,
"atkgrow": 4200,
"defgrow": 1100,
"speedgrow": 0
}
]

File diff suppressed because it is too large Load Diff

View File

@ -4176,7 +4176,7 @@
"key": "item_item_name_139",
"text": "体力药剂"
},
"usetype": 10,
"usetype": 1,
"color": 3,
"bagtype": 1,
"index": 7,

View File

@ -5,7 +5,7 @@
"parameter": 5,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_1",
"text": "passcheck_10001"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -25,7 +25,7 @@
"parameter": 10,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_2",
"text": "passcheck_10002"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -45,7 +45,7 @@
"parameter": 15,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_3",
"text": "passcheck_10003"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -65,7 +65,7 @@
"parameter": 20,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_4",
"text": "passcheck_10004"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -85,7 +85,7 @@
"parameter": 25,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_5",
"text": "passcheck_10005"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -105,7 +105,7 @@
"parameter": 30,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_6",
"text": "passcheck_10006"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -125,7 +125,7 @@
"parameter": 35,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_7",
"text": "passcheck_10007"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -145,7 +145,7 @@
"parameter": 40,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_8",
"text": "passcheck_10008"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -165,7 +165,7 @@
"parameter": 45,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_9",
"text": "passcheck_10009"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",
@ -185,7 +185,7 @@
"parameter": 50,
"unlock_text": {
"key": "passcheck_passcheck_unlock_text_10",
"text": "passcheck_10010"
"text": "等级{0}"
},
"free_reward": {
"a": "attr",

View File

@ -8091,7 +8091,7 @@
"Type": 5,
"Argu": [
2,
1,
2,
350
],
"FollowSK": [],
@ -8190,7 +8190,7 @@
"Type": 5,
"Argu": [
2,
1,
2,
280
],
"FollowSK": [],
@ -8213,7 +8213,7 @@
"Type": 5,
"Argu": [
2,
1,
2,
310
],
"FollowSK": [],
@ -8236,7 +8236,7 @@
"Type": 5,
"Argu": [
2,
1,
2,
350
],
"FollowSK": [],
@ -13597,7 +13597,7 @@
"Argu": [
1,
4,
5000
6000
],
"FollowSK": [],
"SucFollowSK": [
@ -20672,6 +20672,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255004213,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001451,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255004311,
"EmitPR": 1000,
@ -21049,6 +21073,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255003213,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001451,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255003311,
"EmitPR": 1000,
@ -21191,6 +21239,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255001213,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001451,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255001311,
"EmitPR": 1000,
@ -21252,7 +21324,7 @@
"Argu": [
1,
4,
6000
15000
],
"FollowSK": [
255005112
@ -21380,6 +21452,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255005215,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001451,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255005311,
"EmitPR": 1000,
@ -21392,7 +21488,7 @@
"Argu": [
1,
4,
12000
9000
],
"FollowSK": [
255005312
@ -21419,7 +21515,7 @@
"Argu": [
1,
4,
20000
13000
],
"FollowSK": [
255005313
@ -21626,6 +21722,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255006216,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001451,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255006311,
"EmitPR": 1000,
@ -21773,6 +21893,29 @@
{
"Id": 255007111,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
455007112,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255007112,
"EmitPR": 1000,
"From": 2,
"Where": [],
"Order": "",
@ -21800,7 +21943,7 @@
]
},
{
"Id": 255007112,
"Id": 255007113,
"EmitPR": 1000,
"From": 2,
"Where": [],
@ -21824,7 +21967,7 @@
"RevisiParams": []
},
{
"Id": 255007113,
"Id": 255007114,
"EmitPR": 1000,
"From": 2,
"Where": [
@ -21942,6 +22085,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255007215,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001451,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255007311,
"EmitPR": 1000,
@ -22847,6 +23014,30 @@
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255002218,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 10,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
390001451,
1000,
1,
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255002311,
"EmitPR": 1000,
@ -25692,7 +25883,7 @@
"Argu": [
1,
4,
360
900
],
"FollowSK": [
215003212,
@ -25765,7 +25956,7 @@
"Argu": [
1,
4,
380
1880
],
"FollowSK": [
215003312

View File

@ -12287,7 +12287,8 @@
"Target": 2,
"ChildSkill": {
"Id": [
255004211
255004211,
255004213
]
},
"Desc": {
@ -12463,7 +12464,8 @@
"Target": 1,
"ChildSkill": {
"Id": [
255003211
255003211,
255003213
]
},
"Desc": {
@ -12550,7 +12552,8 @@
"Target": 1,
"ChildSkill": {
"Id": [
255001211
255001211,
255001213
]
},
"Desc": {
@ -12639,7 +12642,8 @@
"Id": [
255002211,
255002212,
255002213
255002213,
255002218
]
},
"Desc": {
@ -12727,7 +12731,8 @@
"ChildSkill": {
"Id": [
255005211,
255005213
255005213,
255005215
]
},
"Desc": {
@ -12815,7 +12820,8 @@
"Target": 2,
"ChildSkill": {
"Id": [
255006211
255006211,
255006216
]
},
"Desc": {
@ -12905,7 +12911,7 @@
"ChildSkill": {
"Id": [
255007111,
255007113
255007112
]
},
"Desc": {
@ -12937,7 +12943,8 @@
"ChildSkill": {
"Id": [
255007211,
255007213
255007213,
25507215
]
},
"Desc": {

View File

@ -621,7 +621,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
1
1,
5
],
"AddEffect": false,
"RemoveType": true,
@ -649,7 +650,8 @@
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
0
0,
5
],
"AddEffect": false,
"RemoveType": true,
@ -4049,5 +4051,35 @@
"buffIcon": "ty_zd_buff_z006",
"buffeffect": "",
"buffpos": "根节点"
},
{
"Id": 390001451,
"Name": {
"key": "skill_skill_buff_Name_135",
"text": "BOSS专用免疫控制效果"
},
"Desc": {
"key": "skill_skill_buff_Desc_135",
"text": "无法被附加任何控制效果"
},
"BuffType": 37,
"EffectArgu": [
5
],
"BufParNum": 1,
"RelyCheckArgu": [],
"CoexistCheckArgu": [],
"Effect": [
3
],
"AddEffect": false,
"RemoveType": false,
"NotOverlay": 0,
"OverlayTimes": 1,
"SameID": false,
"golbalbufficon": "",
"buffIcon": "",
"buffeffect": "",
"buffpos": "根节点"
}
]

View File

@ -1608,11 +1608,11 @@
]
},
{
"Id": 455007111,
"Id": 455007112,
"When": 15,
"FromCheck": "",
"TargetCheck": "Target=2",
"MainSkillCheck": "",
"MainSkillCheck": "MainSkillID=155007111",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
@ -1620,7 +1620,7 @@
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255007112
255007116
]
},
{
@ -2547,5 +2547,117 @@
"Callback": [
255007116
]
},
{
"Id": 455001111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255001112
]
},
{
"Id": 455002111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255002112
]
},
{
"Id": 455003111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255003112
]
},
{
"Id": 455004111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255004112
]
},
{
"Id": 455005111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255005112
]
},
{
"Id": 455006111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255006112
]
},
{
"Id": 455007111,
"When": 2,
"FromCheck": "Target=3",
"TargetCheck": "",
"MainSkillCheck": "",
"AfterSkillCheck": "",
"BuffCheck": "",
"AddCon": [],
"PasPr": 1000,
"Type": "CallSkillPas",
"MaxEmitTimes": 1,
"Callback": [
255007112
]
}
]

View File

@ -531,7 +531,7 @@ const (
Rtype41 TaskType = 41 //任意一名英雄穿戴xx件xx星级的装备
Rtype42 TaskType = 42 //任意一名英雄穿戴xx件xx等级的装备
Rtype43 TaskType = 43 //将xx件装备强化至xx级
Rtype44 TaskType = 44 //任意装备强化到xx级
// Rtype44 TaskType = 44 //任意装备强化到xx级 合并到43
Rtype45 TaskType = 45 //将xx件xx星【xx】套装装备强化至xx级
Rtype46 TaskType = 46 //为xx名英雄穿戴完整xx星【xx】套装装备
Rtype47 TaskType = 47 //累计强化装备成功xx次

View File

@ -1,6 +1,7 @@
package buried
import (
"fmt"
"go_dreamfactory/lego/sys/log"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
@ -73,6 +74,7 @@ func checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTypeData, conf *cf
}
if !efficient { //校验不过
log.Debug("校验不通!", log.Field{Key: "埋点id", Value: buried.TaskType}, log.Field{Key: "条件id", Value: conf.Id}, log.Field{Key: "判断公式", Value: fmt.Sprintf("%d %s %d", value, symbol, target)})
return
}
}

View File

@ -9,6 +9,7 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/x/bsonx"
)
@ -30,26 +31,29 @@ func (this *modelBuried) Init(service core.IService, module core.IModule, comp c
}
//获取用户全部的埋点数据
func (this *modelBuried) getUserBurieds(uid string) (results map[int32]*pb.DBBuried, err error) {
temp := make([]*pb.DBBuried, 0)
if err = this.GetList(uid, &temp); err != nil && err != mgo.MongodbNil {
func (this *modelBuried) getUserBurieds(uid string) (results *pb.DBBuried, err error) {
results = &pb.DBBuried{}
if err = this.Get(uid, results); err != nil && err != mgo.MongodbNil {
this.module.Errorln(err)
return
}
results = make(map[int32]*pb.DBBuried)
for _, v := range temp {
results[v.Btype] = v
if err == mgo.MongodbNil {
err = nil
results = &pb.DBBuried{
Id: primitive.NewObjectID().Hex(),
Uid: uid,
Items: make(map[int32]*pb.DBBuriedItem),
}
err = this.Add(uid, results)
}
return
}
//更新用户数据
func (this *modelBuried) updateUserBurieds(uid string, bdatas []*pb.DBBuried) (err error) {
data := make(map[string]interface{})
for _, v := range bdatas {
data[v.Id] = v
}
err = this.ChangeLists(uid, data)
func (this *modelBuried) updateUserBurieds(uid string, data *pb.DBBuried) (err error) {
err = this.Change(uid, map[string]interface{}{
"items": data.Items,
})
return
}

View File

@ -13,8 +13,6 @@ import (
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"time"
"go.mongodb.org/mongo-driver/bson/primitive"
)
/*
@ -71,41 +69,45 @@ func (this *Buried) Rpc_ModuleBuriedTrigger(ctx context.Context, args *pb.Rpc_Mo
func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
var (
conf *cfg.GameBuriedCondiData
bdatas map[int32]*pb.DBBuried
chanage []*pb.DBBuried //变化埋点
bdatas *pb.DBBuried
chanage bool
)
if bdatas, err = this.modelBuried.getUserBurieds(uid); err != nil {
return
}
chanage = make([]*pb.DBBuried, 0)
for _, v := range condiIds {
if conf, err = this.configure.getburiedcondidata(v); err != nil {
return
}
if bdata, ok := bdatas[conf.Type]; ok {
if bdata, ok := bdatas.Items[conf.Type]; ok {
if conf.Rtype == rtype2 {
if item, ok := bdata.Items[v]; !ok {
bdata.Items[v] = &pb.DBBuriedItem{
ok = false
for _, v1 := range bdata.Condi {
if v1.Conid == v {
ok = true
v1.Value = 0
v1.Statistics = make([]string, 0)
v1.Timestamp = time.Now().Unix()
v1.State = pb.BuriedItemState_Activated
break
}
}
if !ok {
bdata.Condi = append(bdata.Condi, &pb.DBBuriedConItem{
Conid: v,
State: pb.BuriedItemState_Activated,
Value: 0,
Statistics: make([]string, 0),
Timestamp: time.Now().Unix(),
}
chanage = append(chanage, bdata)
} else {
item.Value = 0
item.Statistics = make([]string, 0)
item.Timestamp = time.Now().Unix()
item.State = pb.BuriedItemState_Activated
chanage = append(chanage, bdata)
})
}
chanage = true
}
}
}
if len(chanage) > 0 {
err = this.modelBuried.updateUserBurieds(uid, chanage)
if chanage {
err = this.modelBuried.updateUserBurieds(uid, bdatas)
}
return
}
@ -113,7 +115,7 @@ func (this *Buried) ActiveCondition(uid string, condiIds ...int32) (err error) {
//激活数据采集点
func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condIds []int32, err error) {
var (
bdatas map[int32]*pb.DBBuried
bdatas *pb.DBBuried
conf *cfg.GameBuriedCondiData
)
if bdatas, err = this.modelBuried.getUserBurieds(uid); err != nil {
@ -124,10 +126,12 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condIds []int
if conf, err = this.configure.getburiedcondidata(v); err != nil {
return
}
if bdata, ok := bdatas[conf.Type]; ok {
if data, ok := bdata.Items[v]; ok {
if data.Value >= conf.Value {
condIds = append(condIds, v)
if bdata, ok := bdatas.Items[conf.Type]; ok {
for _, v1 := range bdata.Condi {
if v1.Conid == v {
if v1.Value >= conf.Value {
condIds = append(condIds, v)
}
}
}
}
@ -138,48 +142,53 @@ func (this *Buried) CheckCondition(uid string, condiIds ...int32) (condIds []int
//校验同时激活
func (this *Buried) CheckAndActiveCondition(uid string, condiIds ...int32) (condIds []int32, err error) {
var (
bdatas map[int32]*pb.DBBuried
bdatas *pb.DBBuried
conf *cfg.GameBuriedCondiData
chanage []*pb.DBBuried //变化埋点
chanage bool //变化埋点
)
if bdatas, err = this.modelBuried.getUserBurieds(uid); err != nil {
return
}
condIds = make([]int32, 0)
chanage = make([]*pb.DBBuried, 0)
for _, v := range condiIds {
if conf, err = this.configure.getburiedcondidata(v); err != nil {
return
}
if bdata, ok := bdatas[conf.Type]; ok {
if data, ok := bdata.Items[v]; ok {
if data.Value >= conf.Value {
condIds = append(condIds, v)
if bdata, ok := bdatas.Items[conf.Type]; ok {
ok = false
for _, v1 := range bdata.Condi {
if v1.Conid == v {
ok = true
if v1.Value >= conf.Value {
condIds = append(condIds, v)
}
if conf.Rtype == rtype2 {
chanage = true
v1.Value = 0
v1.Statistics = make([]string, 0)
v1.Timestamp = time.Now().Unix()
v1.State = pb.BuriedItemState_Activated
}
}
}
if conf.Rtype == rtype2 {
if item, ok := bdata.Items[v]; !ok {
bdata.Items[v] = &pb.DBBuriedItem{
chanage = true
if !ok {
bdata.Condi = append(bdata.Condi, &pb.DBBuriedConItem{
Conid: v,
State: pb.BuriedItemState_Activated,
Value: 0,
Statistics: make([]string, 0),
Timestamp: time.Now().Unix(),
}
chanage = append(chanage, bdata)
} else {
item.Value = 0
item.Statistics = make([]string, 0)
item.Timestamp = time.Now().Unix()
item.State = pb.BuriedItemState_Activated
chanage = append(chanage, bdata)
})
}
}
}
}
if len(chanage) > 0 {
err = this.modelBuried.updateUserBurieds(uid, chanage)
if chanage {
err = this.modelBuried.updateUserBurieds(uid, bdatas)
}
return
}
@ -218,11 +227,11 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
var (
pass map[*pb.BuriedParam][]*cfg.GameBuriedCondiData = make(map[*pb.BuriedParam][]*cfg.GameBuriedCondiData)
bconf *cfg.GameBuriedTypeData
bdatas map[int32]*pb.DBBuried
change []*pb.DBBuried
bdata *pb.DBBuried
bdatas *pb.DBBuried
bdata *pb.DBBuriedItem
ok bool
complete bool
change bool
completeConIds []int32 //完成id列表
err error
)
@ -248,6 +257,7 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
pass[buried] = make([]*cfg.GameBuriedCondiData, 0)
}
pass[buried] = append(pass[buried], cond)
log.Debug("校验通过埋点条件!", log.Field{Key: "埋点id", Value: buried.TaskType}, log.Field{Key: "条件id", Value: cond.Id})
}
}
}
@ -257,23 +267,22 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
}
}
completeConIds = make([]int32, 0)
change = make([]*pb.DBBuried, 0)
//处理校验通过埋点数据
for buried, conds := range pass {
this.Debug("更新埋点数据", log.Field{Key: "埋点类型", Value: buried.TaskType})
if bconf, err = this.configure.getburiedtypedata(buried.TaskType); err != nil {
this.Error("未找到目标埋点类型配置", log.Field{Key: "type", Value: buried.TaskType})
continue
}
if bdata, ok = bdatas[int32(buried.TaskType)]; !ok {
bdatas[int32(buried.TaskType)] = &pb.DBBuried{
Id: primitive.NewObjectID().Hex(),
Uid: uid,
if bdata, ok = bdatas.Items[int32(buried.TaskType)]; !ok {
bdatas.Items[int32(buried.TaskType)] = &pb.DBBuriedItem{
Btype: int32(buried.TaskType),
Items: make(map[int32]*pb.DBBuriedItem),
Condi: make([]*pb.DBBuriedConItem, 0),
}
bdata = bdatas[int32(buried.TaskType)]
bdata = bdatas.Items[int32(buried.TaskType)]
}
for _, cond := range conds {
this.Debug("更新埋点数据", log.Field{Key: "埋点类型", Value: buried.TaskType}, log.Field{Key: "条件类型", Value: cond.Id})
if cond.Rtype == rtype1 { //创号后入录
if complete, err = this.updateAndCheckBuried(bconf, bdata, buried, cond, true); complete {
completeConIds = append(completeConIds, cond.Id)
@ -282,13 +291,15 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
if complete, err = this.updateAndCheckBuried(bconf, bdata, buried, cond, false); complete {
completeConIds = append(completeConIds, cond.Id)
}
} else {
this.Error("未知的任务类型", log.Field{Key: "埋点类型", Value: buried.TaskType}, log.Field{Key: "条件Id", Value: cond.Id}, log.Field{Key: "条件类型", Value: cond.Rtype})
}
}
change = append(change, bdatas[bdata.Btype])
change = true
}
if len(change) > 0 { //同步数据
if err = this.modelBuried.updateUserBurieds(uid, change); err != nil {
if change { //同步数据
if err = this.modelBuried.updateUserBurieds(uid, bdatas); err != nil {
this.Error("更新用户埋点数据错误!", log.Field{Key: "err", Value: err.Error()})
return
}
@ -302,28 +313,37 @@ func (this *Buried) trigger(uid string, burieds ...*pb.BuriedParam) {
}
//更新并校验完成
func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *pb.DBBuried, collec *pb.BuriedParam, cond *cfg.GameBuriedCondiData, autoActivated bool) (complete bool, err error) {
func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *pb.DBBuriedItem, collec *pb.BuriedParam, cond *cfg.GameBuriedCondiData, autoActivated bool) (complete bool, err error) {
var (
ok bool
bitem *pb.DBBuriedItem
bitem *pb.DBBuriedConItem
)
if bitem, ok = bdata.Items[int32(cond.Id)]; !ok {
for _, v := range bdata.Condi {
if v.Conid == cond.Id {
bitem = v
ok = true
break
}
}
if !ok {
if autoActivated { //自动激活
bdata.Items[int32(cond.Id)] = &pb.DBBuriedItem{
bitem = &pb.DBBuriedConItem{
Conid: cond.Id,
State: pb.BuriedItemState_Activated,
Value: 0,
Statistics: make([]string, 0),
Timestamp: time.Now().Unix(),
}
bitem = bdata.Items[int32(cond.Id)]
bdata.Condi = append(bdata.Condi, bitem)
} else {
this.Debug("任务需激活才可写入!", log.Field{Key: "埋点Id", Value: bdata.Btype}, log.Field{Key: "条件Id", Value: cond.Id})
return
}
}
if bitem.State == pb.BuriedItemState_Inactivated || bitem.State == pb.BuriedItemState_Freeze { //未激活和冻结 不在处理
this.Debug("检测到任务状态不可写入!", log.Field{Key: "埋点Id", Value: bdata.Btype}, log.Field{Key: "条件Id", Value: bitem.Conid}, log.Field{Key: "State", Value: bitem.State})
return
}
@ -345,11 +365,14 @@ func (this *Buried) updateAndCheckBuried(bconf *cfg.GameBuriedTypeData, bdata *p
}
default:
err = fmt.Errorf("未知的埋点数据处理类型:%d", bconf.Insert)
this.Error("未知的埋点数据处理类型!", log.Field{Key: "Insert", Value: bconf.Insert})
return
}
if bitem.Value >= cond.Value { //完成进度
complete = true
} else {
this.Debug("完成条件未达成!", log.Field{Key: "埋点Id", Value: bdata.Btype}, log.Field{Key: "条件Id", Value: bitem.Conid}, log.Field{Key: "当前进度", Value: bitem.Value}, log.Field{Key: "目标进度", Value: cond.Value})
}
return
}

View File

@ -191,6 +191,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
// // this.module.ModuleRtask.SendToRtask(session, comm.Rtype42, utils.ToInt32(hero.HeroID), v, k)
// }
if hero.SuiteId != 0 {
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype46, 1, hero.Suite1Star, hero.SuiteId))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype49, 1, hero.Suite1Star, hero.Suite1Lv))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype98, 1, hero.Suite1Lv))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype169, hero.SuiteId))
@ -198,6 +199,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype98, 1, hero.Suite1Lv)
}
if hero.SuiteExtId != 0 {
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype46, 1, hero.Suite2Star, hero.SuiteExtId))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype48, 1, hero.Suite2Star, hero.Suite2Lv))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype98, 1, hero.Suite1Lv))
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype48, 1, hero.Suite2Star, hero.Suite2Lv)

View File

@ -182,7 +182,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgrade
}
//随机任务触发
tasks = append(tasks, comm.GetBuriedParam2(comm.Rtype43, equipment.Id, equipment.Lv))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype44, 1, equipment.Lv))
// tasks = append(tasks, comm.GetBuriedParam(comm.Rtype44, 1, equipment.Lv))
tasks = append(tasks, comm.GetBuriedParam(comm.Rtype47, 1))
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype43, 1, equipment.Lv)
// this.module.ModuleRtask.SendToRtask(session, comm.Rtype44, equipment.Lv)

View File

@ -168,12 +168,12 @@ func (this *Hero) SendRdTask(session comm.IUserSession) {
}
}
var szTask []*pb.BuriedParam
for k, v := range equipmap {
for k1, v1 := range v {
szTask = append(szTask, comm.GetBuriedParam(comm.Rtype46, v1, k1, k))
//this.ModuleBuried.SendToRtask(session, comm.Rtype46, v1, k1, k)
}
}
// for k, v := range equipmap {
// for k1, v1 := range v {
// szTask = append(szTask, comm.GetBuriedParam(comm.Rtype46, v1, k1, k))
// //this.ModuleBuried.SendToRtask(session, comm.Rtype46, v1, k1, k)
// }
// }
go this.ModuleBuried.TriggerBuried(session.GetUserId(), szTask...)
}

View File

@ -59,7 +59,6 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
N: ps,
}
if code = this.module.ConsumeRes(session, []*cfg.Gameatn{psAnt}, true); code != pb.ErrorCode_Success {
return
}

View File

@ -74,7 +74,7 @@ func (BuriedItemState) EnumDescriptor() ([]byte, []int) {
}
//埋点对应的条件数据
type DBBuriedItem struct {
type DBBuriedConItem struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
@ -86,10 +86,86 @@ type DBBuriedItem struct {
Timestamp int64 `protobuf:"varint,5,opt,name=timestamp,proto3" json:"timestamp" bson:"timestamp"` //最后一次操作时间
}
func (x *DBBuriedConItem) Reset() {
*x = DBBuriedConItem{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_db_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBBuriedConItem) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBBuriedConItem) ProtoMessage() {}
func (x *DBBuriedConItem) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_db_proto_msgTypes[0]
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 DBBuriedConItem.ProtoReflect.Descriptor instead.
func (*DBBuriedConItem) Descriptor() ([]byte, []int) {
return file_buried_buried_db_proto_rawDescGZIP(), []int{0}
}
func (x *DBBuriedConItem) GetConid() int32 {
if x != nil {
return x.Conid
}
return 0
}
func (x *DBBuriedConItem) GetState() BuriedItemState {
if x != nil {
return x.State
}
return BuriedItemState_Inactivated
}
func (x *DBBuriedConItem) GetValue() int32 {
if x != nil {
return x.Value
}
return 0
}
func (x *DBBuriedConItem) GetStatistics() []string {
if x != nil {
return x.Statistics
}
return nil
}
func (x *DBBuriedConItem) GetTimestamp() int64 {
if x != nil {
return x.Timestamp
}
return 0
}
type DBBuriedItem struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Btype int32 `protobuf:"varint,1,opt,name=btype,proto3" json:"btype"` //@go_tags(`bson:"btype"`)埋点类型
Condi []*DBBuriedConItem `protobuf:"bytes,2,rep,name=condi,proto3" json:"condi"` //@go_tags(`bson:"btype"`)条件列表
}
func (x *DBBuriedItem) Reset() {
*x = DBBuriedItem{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_db_proto_msgTypes[0]
mi := &file_buried_buried_db_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -102,7 +178,7 @@ func (x *DBBuriedItem) String() string {
func (*DBBuriedItem) ProtoMessage() {}
func (x *DBBuriedItem) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_db_proto_msgTypes[0]
mi := &file_buried_buried_db_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -115,44 +191,23 @@ func (x *DBBuriedItem) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBBuriedItem.ProtoReflect.Descriptor instead.
func (*DBBuriedItem) Descriptor() ([]byte, []int) {
return file_buried_buried_db_proto_rawDescGZIP(), []int{0}
return file_buried_buried_db_proto_rawDescGZIP(), []int{1}
}
func (x *DBBuriedItem) GetConid() int32 {
func (x *DBBuriedItem) GetBtype() int32 {
if x != nil {
return x.Conid
return x.Btype
}
return 0
}
func (x *DBBuriedItem) GetState() BuriedItemState {
func (x *DBBuriedItem) GetCondi() []*DBBuriedConItem {
if x != nil {
return x.State
}
return BuriedItemState_Inactivated
}
func (x *DBBuriedItem) GetValue() int32 {
if x != nil {
return x.Value
}
return 0
}
func (x *DBBuriedItem) GetStatistics() []string {
if x != nil {
return x.Statistics
return x.Condi
}
return nil
}
func (x *DBBuriedItem) GetTimestamp() int64 {
if x != nil {
return x.Timestamp
}
return 0
}
//DB埋点数据
type DBBuried struct {
state protoimpl.MessageState
@ -161,14 +216,13 @@ type DBBuried 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" bson:"uid"` //用户ID
Btype int32 `protobuf:"varint,3,opt,name=btype,proto3" json:"btype"` //@go_tags(`bson:"btype"`)埋点类型
Items map[int32]*DBBuriedItem `protobuf:"bytes,4,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"burieds"` //埋点数据 key条件id
}
func (x *DBBuried) Reset() {
*x = DBBuried{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_db_proto_msgTypes[1]
mi := &file_buried_buried_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -181,7 +235,7 @@ func (x *DBBuried) String() string {
func (*DBBuried) ProtoMessage() {}
func (x *DBBuried) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_db_proto_msgTypes[1]
mi := &file_buried_buried_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -194,7 +248,7 @@ func (x *DBBuried) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBBuried.ProtoReflect.Descriptor instead.
func (*DBBuried) Descriptor() ([]byte, []int) {
return file_buried_buried_db_proto_rawDescGZIP(), []int{1}
return file_buried_buried_db_proto_rawDescGZIP(), []int{2}
}
func (x *DBBuried) GetId() string {
@ -211,13 +265,6 @@ func (x *DBBuried) GetUid() string {
return ""
}
func (x *DBBuried) GetBtype() int32 {
if x != nil {
return x.Btype
}
return 0
}
func (x *DBBuried) GetItems() map[int32]*DBBuriedItem {
if x != nil {
return x.Items
@ -230,16 +277,16 @@ type BuriedParam struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
TaskType int32 `protobuf:"varint,1,opt,name=taskType,proto3" json:"taskType"` //埋点类型
TaskType int32 `protobuf:"varint,1,opt,name=taskType,proto3" json:"taskType"`
Value int32 `protobuf:"varint,2,opt,name=value,proto3" json:"value"` //累加或者覆盖参数
Statistics string `protobuf:"bytes,3,opt,name=statistics,proto3" json:"statistics"` //统计类型 传递参数
Filter []int32 `protobuf:"varint,4,rep,packed,name=filter,proto3" json:"filter"` //埋点过滤参数
Filter []int32 `protobuf:"varint,4,rep,packed,name=filter,proto3" json:"filter"` //马、
}
func (x *BuriedParam) Reset() {
*x = BuriedParam{}
if protoimpl.UnsafeEnabled {
mi := &file_buried_buried_db_proto_msgTypes[2]
mi := &file_buried_buried_db_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -252,7 +299,7 @@ func (x *BuriedParam) String() string {
func (*BuriedParam) ProtoMessage() {}
func (x *BuriedParam) ProtoReflect() protoreflect.Message {
mi := &file_buried_buried_db_proto_msgTypes[2]
mi := &file_buried_buried_db_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -265,7 +312,7 @@ func (x *BuriedParam) ProtoReflect() protoreflect.Message {
// Deprecated: Use BuriedParam.ProtoReflect.Descriptor instead.
func (*BuriedParam) Descriptor() ([]byte, []int) {
return file_buried_buried_db_proto_rawDescGZIP(), []int{2}
return file_buried_buried_db_proto_rawDescGZIP(), []int{3}
}
func (x *BuriedParam) GetTaskType() int32 {
@ -300,42 +347,46 @@ var File_buried_buried_db_proto protoreflect.FileDescriptor
var file_buried_buried_db_proto_rawDesc = []byte{
0x0a, 0x16, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2f, 0x62, 0x75, 0x72, 0x69, 0x65, 0x64, 0x5f,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa0, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x42,
0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x6e,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x69, 0x64, 0x12,
0x26, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10,
0x2e, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65,
0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1e, 0x0a,
0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x12, 0x1c, 0x0a,
0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0xb7, 0x01, 0x0a, 0x08,
0x44, 0x42, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 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, 0x14, 0x0a, 0x05, 0x62, 0x74,
0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65,
0x12, 0x2a, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x14, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, 0x0a,
0x49, 0x74, 0x65, 0x6d, 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, 0x23, 0x0a, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x77, 0x0a, 0x0b, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x50,
0x61, 0x72, 0x61, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65,
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73,
0x74, 0x69, 0x63, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74,
0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2a, 0x48,
0x0a, 0x0f, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74,
0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64,
0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x10,
0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x10, 0x02, 0x12, 0x09, 0x0a,
0x05, 0x53, 0x6c, 0x65, 0x65, 0x70, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa3, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x42,
0x75, 0x72, 0x69, 0x65, 0x64, 0x43, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05,
0x63, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x6e,
0x69, 0x64, 0x12, 0x26, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0e, 0x32, 0x10, 0x2e, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x53, 0x74,
0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x18, 0x04,
0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73,
0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x05, 0x20,
0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22, 0x4c,
0x0a, 0x0c, 0x44, 0x42, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14,
0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62,
0x74, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x18, 0x02, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x43, 0x6f,
0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x22, 0xa1, 0x01, 0x0a,
0x08, 0x44, 0x42, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 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, 0x2a, 0x0a, 0x05, 0x69,
0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x42,
0x75, 0x72, 0x69, 0x65, 0x64, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 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, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x75, 0x72, 0x69, 0x65,
0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x22, 0x77, 0x0a, 0x0b, 0x42, 0x75, 0x72, 0x69, 0x65, 0x64, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12,
0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x18,
0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63,
0x73, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x03, 0x28,
0x05, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x2a, 0x48, 0x0a, 0x0f, 0x42, 0x75, 0x72,
0x69, 0x65, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0f, 0x0a, 0x0b,
0x49, 0x6e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x10, 0x00, 0x12, 0x0d, 0x0a,
0x09, 0x41, 0x63, 0x74, 0x69, 0x76, 0x61, 0x74, 0x65, 0x64, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06,
0x46, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x6c, 0x65, 0x65,
0x70, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
}
var (
@ -351,23 +402,25 @@ func file_buried_buried_db_proto_rawDescGZIP() []byte {
}
var file_buried_buried_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
var file_buried_buried_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
var file_buried_buried_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
var file_buried_buried_db_proto_goTypes = []interface{}{
(BuriedItemState)(0), // 0: BuriedItemState
(*DBBuriedItem)(nil), // 1: DBBuriedItem
(*DBBuried)(nil), // 2: DBBuried
(*BuriedParam)(nil), // 3: BuriedParam
nil, // 4: DBBuried.ItemsEntry
(BuriedItemState)(0), // 0: BuriedItemState
(*DBBuriedConItem)(nil), // 1: DBBuriedConItem
(*DBBuriedItem)(nil), // 2: DBBuriedItem
(*DBBuried)(nil), // 3: DBBuried
(*BuriedParam)(nil), // 4: BuriedParam
nil, // 5: DBBuried.ItemsEntry
}
var file_buried_buried_db_proto_depIdxs = []int32{
0, // 0: DBBuriedItem.state:type_name -> BuriedItemState
4, // 1: DBBuried.items:type_name -> DBBuried.ItemsEntry
1, // 2: DBBuried.ItemsEntry.value:type_name -> DBBuriedItem
3, // [3:3] is the sub-list for method output_type
3, // [3:3] is the sub-list for method input_type
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
0, // 0: DBBuriedConItem.state:type_name -> BuriedItemState
1, // 1: DBBuriedItem.condi:type_name -> DBBuriedConItem
5, // 2: DBBuried.items:type_name -> DBBuried.ItemsEntry
2, // 3: DBBuried.ItemsEntry.value:type_name -> DBBuriedItem
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_db_proto_init() }
@ -377,7 +430,7 @@ func file_buried_buried_db_proto_init() {
}
if !protoimpl.UnsafeEnabled {
file_buried_buried_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBBuriedItem); i {
switch v := v.(*DBBuriedConItem); i {
case 0:
return &v.state
case 1:
@ -389,7 +442,7 @@ func file_buried_buried_db_proto_init() {
}
}
file_buried_buried_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBBuried); i {
switch v := v.(*DBBuriedItem); i {
case 0:
return &v.state
case 1:
@ -401,6 +454,18 @@ func file_buried_buried_db_proto_init() {
}
}
file_buried_buried_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBBuried); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_buried_buried_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*BuriedParam); i {
case 0:
return &v.state
@ -419,7 +484,7 @@ func file_buried_buried_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_buried_buried_db_proto_rawDesc,
NumEnums: 1,
NumMessages: 4,
NumMessages: 5,
NumExtensions: 0,
NumServices: 0,
},