Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
32ac84f90a
@ -31618,6 +31618,666 @@
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000054,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1010",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000055,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1011",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000056,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1012",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000057,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1013",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000058,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1014",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000059,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1015",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000060,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1016",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000061,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1017",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000062,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1018",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000063,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1019",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000064,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1020",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000065,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1021",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000066,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1022",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000067,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1023",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000068,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1024",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000069,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1025",
|
||||
"text": "主角等级达到3级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000070,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1026",
|
||||
"text": "主角等级达到4级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 4,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000071,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1027",
|
||||
"text": "主角等级达到4级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 4,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000072,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1028",
|
||||
"text": "主角等级达到4级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 4,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000073,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1029",
|
||||
"text": "主角等级达到4级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 4,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000074,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1030",
|
||||
"text": "主角等级达到4级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 4,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000075,
|
||||
"refresh": 0,
|
||||
"rtype": 1,
|
||||
"ctype": 1,
|
||||
"notify": [
|
||||
"sys"
|
||||
],
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1031",
|
||||
"text": "主角等级达到4级开启"
|
||||
},
|
||||
"type": 20,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": 0,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 4,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
"id": 18000076,
|
||||
"refresh": 0,
|
||||
|
||||
@ -451,6 +451,9 @@ const (
|
||||
TableAssist = "assist"
|
||||
TablePlunder = "plunder" // 掠夺
|
||||
TablePlunderLand = "plunderland" // 掠夺岛
|
||||
|
||||
///工会远征
|
||||
TableExpedition = "expedition"
|
||||
)
|
||||
|
||||
// RPC服务接口定义处
|
||||
|
||||
@ -592,19 +592,21 @@ func (this *Buried) TriggerBuried(session comm.IUserSession, burieds ...*pb.Buri
|
||||
|
||||
func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedParam) {
|
||||
var (
|
||||
model *buriedModel
|
||||
pass map[*pb.BuriedParam][]*cfg.GameBuriedCondiData = make(map[*pb.BuriedParam][]*cfg.GameBuriedCondiData)
|
||||
bconf *cfg.GameBuriedTypeData
|
||||
bdatas *pb.DBBuried
|
||||
bdata *pb.DBBuriedItem
|
||||
bitem *pb.DBBuriedConItem
|
||||
ok bool
|
||||
change bool
|
||||
changes []*pb.ConIProgress
|
||||
notify map[string][]*pb.ConIProgress
|
||||
module core.IModule
|
||||
nmodule comm.IBuriedUpdateNotify
|
||||
err error
|
||||
model *buriedModel
|
||||
pass map[*pb.BuriedParam][]*cfg.GameBuriedCondiData = make(map[*pb.BuriedParam][]*cfg.GameBuriedCondiData)
|
||||
bconf *cfg.GameBuriedTypeData
|
||||
resetconf *cfg.GameBuriedCondiData
|
||||
bdatas *pb.DBBuried
|
||||
bdata *pb.DBBuriedItem
|
||||
bitem *pb.DBBuriedConItem
|
||||
resetitem *pb.DBBuriedConItem
|
||||
ok bool
|
||||
change bool
|
||||
changes []*pb.ConIProgress
|
||||
notify map[string][]*pb.ConIProgress
|
||||
module core.IModule
|
||||
nmodule comm.IBuriedUpdateNotify
|
||||
err error
|
||||
)
|
||||
if model, err = this.modelBuried.getburiedModel(session.GetUserId()); err != nil {
|
||||
return
|
||||
@ -679,7 +681,6 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
|
||||
cp.Value = bitem.Value
|
||||
cp.Target = cond.Value
|
||||
cp.State = bitem.Finish
|
||||
|
||||
changes = append(changes, cp)
|
||||
if len(cond.Notify) > 0 {
|
||||
for _, mname := range cond.Notify {
|
||||
@ -694,6 +695,22 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
|
||||
}
|
||||
notify[string(comm.ModuleWtask)] = append(notify[string(comm.ModuleWtask)], cp)
|
||||
}
|
||||
//完成 重置埋点
|
||||
if cp.State == pb.BuriedItemFinishState_buried_finish {
|
||||
if cond.Refresh > 0 { //重置埋点
|
||||
if resetitem, resetconf, err = this.resetburied(bdatas, cond.Refresh); err != nil {
|
||||
this.Error("重置埋点错误!", log.Field{Key: "err", Value: err.Error()})
|
||||
return
|
||||
}
|
||||
cp := comm.GetBuriedConIProgress2()
|
||||
cp.Btype = resetconf.Type
|
||||
cp.Conid = cond.Refresh
|
||||
cp.Value = resetitem.Value
|
||||
cp.Target = resetconf.Value
|
||||
cp.State = resetitem.Finish
|
||||
changes = append(changes, cp)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -883,6 +900,40 @@ func (this *Buried) checkburied(buried *pb.BuriedParam, bconf *cfg.GameBuriedTyp
|
||||
return
|
||||
}
|
||||
|
||||
func (this *Buried) resetburied(bdatas *pb.DBBuried, cid int32) (item *pb.DBBuriedConItem, conf *cfg.GameBuriedCondiData, err error) {
|
||||
var (
|
||||
bdata *pb.DBBuriedItem
|
||||
ok bool
|
||||
)
|
||||
if conf, err = this.configure.getCondiData(cid); err != nil {
|
||||
this.Errorln(err)
|
||||
return
|
||||
}
|
||||
if bdata, ok = bdatas.Items[conf.Type]; ok {
|
||||
ok = false
|
||||
for _, v := range bdata.Condi {
|
||||
if v.Conid == cid {
|
||||
v.Finish = pb.BuriedItemFinishState_buried_unfinish
|
||||
v.Value = 0
|
||||
item = v
|
||||
ok = true
|
||||
}
|
||||
}
|
||||
}
|
||||
if ok {
|
||||
item = &pb.DBBuriedConItem{
|
||||
Conid: cid,
|
||||
State: pb.BuriedItemState_Activated,
|
||||
Value: 0,
|
||||
Statistics: make([]string, 0),
|
||||
Finish: pb.BuriedItemFinishState_buried_unfinish,
|
||||
Timestamp: time.Now().Unix(),
|
||||
}
|
||||
bdata.Condi = append(bdata.Condi, item)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
//获取埋点数据
|
||||
func (this *Buried) getburied(session comm.IUserSession) (bdatas *pb.DBBuried, err error) {
|
||||
if ok, mate := session.GetMate(comm.Session_Buried); ok {
|
||||
|
||||
@ -24,7 +24,7 @@ type ModelExpedition struct {
|
||||
|
||||
func (this *ModelExpedition) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
|
||||
err = this.MCompModel.Init(service, module, comp, options)
|
||||
this.TableName = comm.TableGuildgve
|
||||
this.TableName = comm.TableExpedition
|
||||
this.module = module.(*Expedition)
|
||||
return
|
||||
}
|
||||
@ -124,6 +124,7 @@ func (this *ModelExpedition) settlementboos(info *pb.DBExpedition, boos *pb.DBEx
|
||||
}
|
||||
boos.Hp -= fightingValue
|
||||
if boos.Hp < 0 {
|
||||
boos.Killtime = configure.Now().Unix()
|
||||
if info.Indexboos < int32(len(info.Boos))-1 {
|
||||
info.Indexboos++
|
||||
} else {
|
||||
|
||||
@ -46,7 +46,7 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
|
||||
if errdata, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
|
||||
return
|
||||
}
|
||||
if score, err = this.module.configure.getguildbossscore(conf.Group, req.Report.Score); err != nil {
|
||||
if score, err = this.module.configure.getguildbossscore(conf.Group, req.Report.Grade); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
@ -119,10 +119,10 @@ func (this *apiComp) ChallengeFinish(session comm.IUserSession, req *pb.GuildGve
|
||||
FightId: req.Report.Info.Id,
|
||||
FightTime: req.Report.Costtime,
|
||||
Rating: score.Id,
|
||||
Harm: req.Report.Harm,
|
||||
Harm: req.Report.Score,
|
||||
}
|
||||
member.Record[req.Boosid] = record
|
||||
go this.module.modelbattlerank.updateRank(req.Boosid, req.Report.Harm, record.User.Uid)
|
||||
go this.module.modelbattlerank.updateRank(req.Boosid, req.Report.Score, record.User.Uid)
|
||||
for i, v := range req.Report.Info.Redflist[0].Team {
|
||||
if int32(i) == req.Report.Info.Redflist[0].Leadpos && v.Oid != "" {
|
||||
record.CaptainHeroId = v.HeroID
|
||||
|
||||
@ -31,7 +31,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
|
||||
atno []*pb.UserAtno // atno 类型
|
||||
)
|
||||
changExp = make(map[string]int32)
|
||||
harm = req.Report.Harm
|
||||
harm = req.Report.Score
|
||||
update = make(map[string]interface{}, 0)
|
||||
if errdata = this.ChallengeOverCheck(session, req); errdata != nil {
|
||||
return // 参数校验失败直接返回
|
||||
|
||||
@ -68,7 +68,7 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
|
||||
if errdata, _ = this.module.battle.CheckBattleReport(session, req.Report); errdata != nil {
|
||||
return
|
||||
}
|
||||
if sconf, err = this.module.configure.getGamePuggsyScoreDatas(item.Level[req.Level], req.Report.Score); err != nil {
|
||||
if sconf, err = this.module.configure.getGamePuggsyScoreDatas(item.Level[req.Level], req.Report.Grade); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
@ -76,7 +76,7 @@ func (this *apiComp) Complete(session comm.IUserSession, req *pb.IsLandCompleteR
|
||||
}
|
||||
return
|
||||
}
|
||||
item.Level[req.Level] = req.Report.Harm
|
||||
item.Level[req.Level] = req.Report.Grade
|
||||
reward := []*cfg.Gameatn{}
|
||||
for _, v := range sconf {
|
||||
reward = append(reward, v.Reward...)
|
||||
|
||||
@ -87,7 +87,7 @@ const (
|
||||
ChatType_ItemShare ChatType = 5 //道具分享
|
||||
ChatType_Parkour ChatType = 6 //捕羊大赛邀请
|
||||
ChatType_Questionnaire ChatType = 7 //问答分享
|
||||
ChatType_XxlRoom ChatType = 8 // 三消房间分享类型
|
||||
ChatType_XxlRoom ChatType = 8 //三消房间分享类型
|
||||
)
|
||||
|
||||
// Enum value maps for ChatType.
|
||||
|
||||
@ -108,7 +108,8 @@ type DBExpeditionBoos struct {
|
||||
Boosid int32 `protobuf:"varint,1,opt,name=boosid,proto3" json:"boosid"`
|
||||
Hp int32 `protobuf:"varint,2,opt,name=hp,proto3" json:"hp"`
|
||||
Crusaded bool `protobuf:"varint,3,opt,name=crusaded,proto3" json:"crusaded"` //是否讨伐完毕
|
||||
Members map[string]*DBExpeditionMember `protobuf:"bytes,4,rep,name=members,proto3" json:"members" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
|
||||
Killtime int64 `protobuf:"varint,4,opt,name=killtime,proto3" json:"killtime"` //击杀时间
|
||||
Members map[string]*DBExpeditionMember `protobuf:"bytes,5,rep,name=members,proto3" json:"members" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
|
||||
}
|
||||
|
||||
func (x *DBExpeditionBoos) Reset() {
|
||||
@ -164,6 +165,13 @@ func (x *DBExpeditionBoos) GetCrusaded() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (x *DBExpeditionBoos) GetKilltime() int64 {
|
||||
if x != nil {
|
||||
return x.Killtime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBExpeditionBoos) GetMembers() map[string]*DBExpeditionMember {
|
||||
if x != nil {
|
||||
return x.Members
|
||||
@ -257,30 +265,31 @@ var file_expedition_expedition_db_proto_rawDesc = []byte{
|
||||
0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x62,
|
||||
0x6f, 0x6f, 0x73, 0x12, 0x25, 0x0a, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x45, 0x78, 0x70, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x42, 0x6f, 0x6f, 0x73, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x22, 0xe1, 0x01, 0x0a, 0x10, 0x44,
|
||||
0x42, 0x6f, 0x6f, 0x73, 0x52, 0x04, 0x62, 0x6f, 0x6f, 0x73, 0x22, 0xfd, 0x01, 0x0a, 0x10, 0x44,
|
||||
0x42, 0x45, 0x78, 0x70, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x6f, 0x6f, 0x73, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x72, 0x75, 0x73, 0x61,
|
||||
0x64, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x72, 0x75, 0x73, 0x61,
|
||||
0x64, 0x65, 0x64, 0x12, 0x38, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x04,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x44, 0x42, 0x45, 0x78, 0x70, 0x65, 0x64, 0x69, 0x74,
|
||||
0x69, 0x6f, 0x6e, 0x42, 0x6f, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x1a, 0x4f, 0x0a,
|
||||
0x0c, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
||||
0x29, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13,
|
||||
0x2e, 0x44, 0x42, 0x45, 0x78, 0x70, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d,
|
||||
0x62, 0x65, 0x72, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x72,
|
||||
0x0a, 0x12, 0x44, 0x42, 0x45, 0x78, 0x70, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65,
|
||||
0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18,
|
||||
0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x1e, 0x0a, 0x0a,
|
||||
0x74, 0x6f, 0x74, 0x61, 0x6c, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61,
|
||||
0x74, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x33,
|
||||
0x64, 0x65, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6b, 0x69, 0x6c, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x18,
|
||||
0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6b, 0x69, 0x6c, 0x6c, 0x74, 0x69, 0x6d, 0x65, 0x12,
|
||||
0x38, 0x0a, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x1e, 0x2e, 0x44, 0x42, 0x45, 0x78, 0x70, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42,
|
||||
0x6f, 0x6f, 0x73, 0x2e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x07, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x1a, 0x4f, 0x0a, 0x0c, 0x4d, 0x65, 0x6d,
|
||||
0x62, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x29, 0x0a, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x45,
|
||||
0x78, 0x70, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x72, 0x0a, 0x12, 0x44, 0x42,
|
||||
0x45, 0x78, 0x70, 0x65, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72,
|
||||
0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
|
||||
0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
|
||||
0x09, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61,
|
||||
0x6c, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f,
|
||||
0x74, 0x61, 0x6c, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74,
|
||||
0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x42, 0x06,
|
||||
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -26,6 +26,7 @@ import (
|
||||
"go_dreamfactory/modules/enchant"
|
||||
"go_dreamfactory/modules/entertainment"
|
||||
"go_dreamfactory/modules/equipment"
|
||||
"go_dreamfactory/modules/expedition"
|
||||
"go_dreamfactory/modules/forum"
|
||||
"go_dreamfactory/modules/friend"
|
||||
"go_dreamfactory/modules/gameinvite"
|
||||
@ -197,6 +198,7 @@ func main() {
|
||||
monkey.NewModule(),
|
||||
integral.NewModule(),
|
||||
plunder.NewModule(),
|
||||
expedition.NewModule(),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user