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

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-09-18 17:49:35 +08:00
commit b622edae29
16 changed files with 363 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bin/json/game_battleready.json
View File

@ -1776,7 +1776,7 @@
"disableAiCamera": 1, "disableAiCamera": 1,
"ChoseCamp": [], "ChoseCamp": [],
"DisableCamp": [], "DisableCamp": [],
"DefaultHero": 0, "DefaultHero": 14003,
"ChoseHero": [], "ChoseHero": [],
"DisableHero": [], "DisableHero": [],
"LockSlots": [ "LockSlots": [
@ -2081,6 +2081,45 @@
"key": "", "key": "",
"text": "" "text": ""
}, },
"battleEvents": [
111,
114
],
"ScoreGroupID": 0,
"disableAiCamera": 0,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 0,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
"HeroCheck": [
"24004",
"24001"
],
"RedAssistTeam": 0,
"BlueAssistTeam": 720016,
"CanFriendHelp": 0,
"Numrounds": 0
},
{
"id": 10400001,
"PlayType": 4,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_spinymandrilla_02"
],
"LoadingId": 0,
"HideAlienSpace": 0,
"RuleTips": {
"key": "",
"text": ""
},
"BattleTips": {
"key": "",
"text": ""
},
"battleEvents": [], "battleEvents": [],
"ScoreGroupID": 0, "ScoreGroupID": 0,
"disableAiCamera": 0, "disableAiCamera": 0,

12
bin/json/game_buriedcondi.json
View File

@ -21280,7 +21280,11 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_724", "key": "buried_buried_condi_tasktxt_724",
<<<<<<< HEAD
"text": "调查喷泉花园处的恐惧灵气息" "text": "调查喷泉花园处的恐惧灵气息"
=======
"text": "调查左侧恐惧灵气息"
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
}, },
"type": 20001, "type": 20001,
"valid": 1, "valid": 1,
@ -21305,7 +21309,11 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_725", "key": "buried_buried_condi_tasktxt_725",
<<<<<<< HEAD
"text": "调查圣桃树前的恐惧灵气息" "text": "调查圣桃树前的恐惧灵气息"
=======
"text": "调查未知恐惧灵气息"
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
}, },
"type": 20001, "type": 20001,
"valid": 1, "valid": 1,
@ -21330,7 +21338,11 @@
"type_sp": 1, "type_sp": 1,
"tasktxt": { "tasktxt": {
"key": "buried_buried_condi_tasktxt_726", "key": "buried_buried_condi_tasktxt_726",
<<<<<<< HEAD
"text": "调查擂台旁的恐惧灵气息" "text": "调查擂台旁的恐惧灵气息"
=======
"text": "调查右侧恐惧灵气息"
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
}, },
"type": 20001, "type": 20001,
"valid": 1, "valid": 1,

224
bin/json/game_mainstage.json
View File

@ -224,7 +224,7 @@
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"stroyshow": 0, "stroyshow": 0,
"frontstoryid": 200050, "frontstoryid": 200040,
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -1707,7 +1707,11 @@
"destroy": 1, "destroy": 1,
"progress": 1, "progress": 1,
"stroyshow": 0, "stroyshow": 0,
<<<<<<< HEAD
"frontstoryid": 200240, "frontstoryid": 200240,
=======
"frontstoryid": 0,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"afterstoryid": 0, "afterstoryid": 0,
"maingroupName": { "maingroupName": {
"key": "", "key": "",
@ -1787,6 +1791,8 @@
"text": "" "text": ""
}, },
"mainlineName": { "mainlineName": {
<<<<<<< HEAD
=======
"key": "", "key": "",
"text": "" "text": ""
}, },
@ -1824,6 +1830,89 @@
"previoustage": 0, "previoustage": 0,
"Episodetype": 3, "Episodetype": 3,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0,
"venturemodelspeed": 9,
"venturemodelscale": 2,
"move_type": 1,
"venturemodel": "Person/mount/54021_q.prefab",
"bubbletalk": {
"key": "",
"text": ""
},
"venturetype": 2,
"ventureavatar": [
"player",
"sbkp_js_24004",
"sbkp_js_35002"
],
"scene_effect": [
"miwu"
],
"scene_effectfilter": "",
"is_near": 0,
"openlevel": 1,
"EditorStage": 0,
"herocolor": 0,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
},
"animation": [],
"hide": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 0,
"afterstoryid": 0,
"maingroupName": {
"key": "",
"text": ""
},
"mainlineName": {
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"key": "",
"text": ""
},
"title": {
"key": "",
"text": ""
},
"desc": {
"key": "",
"text": ""
},
"exp": 0,
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
"FormatList": [],
"helphero": [],
"banhero": [],
"star": [],
"star_type": [],
"star_value": [],
"challengeward": 0
},
{
"id": 1100121,
"chapterid": 11001,
"group_id": 100119,
"previous_group_id": [
100118
],
"previoustage": 0,
<<<<<<< HEAD
"Episodetype": 3,
"stage_param": 0,
=======
"Episodetype": 5,
"stage_param": 10001,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"battle_fail": 0, "battle_fail": 0,
"venturemodelspeed": 9, "venturemodelspeed": 9,
"venturemodelscale": 2, "venturemodelscale": 2,
@ -2332,6 +2421,8 @@
}, },
{ {
"id": 1100126, "id": 1100126,
<<<<<<< HEAD
=======
"chapterid": 11001, "chapterid": 11001,
"group_id": 100124, "group_id": 100124,
"previous_group_id": [ "previous_group_id": [
@ -2403,12 +2494,90 @@
}, },
{ {
"id": 1100127, "id": 1100127,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"chapterid": 11001, "chapterid": 11001,
"group_id": 100125, "group_id": 100125,
"previous_group_id": [ "previous_group_id": [
100124 100124
], ],
"previoustage": 0, "previoustage": 0,
<<<<<<< HEAD
"Episodetype": 2,
"stage_param": 1,
=======
"Episodetype": 3,
"stage_param": 0,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"battle_fail": 0,
"venturemodelspeed": 0,
"venturemodelscale": 0,
"move_type": 0,
"venturemodel": "",
"bubbletalk": {
"key": "",
"text": ""
},
"venturetype": 0,
"ventureavatar": [],
"scene_effect": [],
"scene_effectfilter": "",
"is_near": 0,
"openlevel": 1,
"EditorStage": 0,
"herocolor": 0,
"heroimg": "zxgq_qp_icon_gth",
"bubbletext": {
"key": "",
"text": ""
},
"animation": [],
"hide": 0,
"destroy": 1,
"progress": 1,
"stroyshow": 0,
"frontstoryid": 200330,
"afterstoryid": 0,
"maingroupName": {
"key": "",
"text": ""
},
"mainlineName": {
"key": "",
"text": ""
},
"title": {
"key": "",
"text": ""
},
"desc": {
"key": "",
"text": ""
},
"exp": 0,
"hero_exp": 0,
"ps_consume": [],
"ps_mg": [],
"firstaward": [],
"lotteryward": 0,
"commonaward": [],
"BattleReadyID": 0,
"FormatList": [],
"helphero": [],
"banhero": [],
"star": [],
"star_type": [],
"star_value": [],
"challengeward": 0
},
{
"id": 1100128,
"chapterid": 11001,
"group_id": 100126,
"previous_group_id": [
100125
],
"previoustage": 0,
<<<<<<< HEAD
"Episodetype": 3, "Episodetype": 3,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
@ -2483,6 +2652,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
=======
"Episodetype": 1,
"stage_param": 0,
"battle_fail": 0,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelspeed": 0, "venturemodelspeed": 0,
"venturemodelscale": 0, "venturemodelscale": 0,
"move_type": 0, "move_type": 0,
@ -2558,7 +2732,11 @@
"n": 6000 "n": 6000
} }
], ],
<<<<<<< HEAD
"BattleReadyID": 10100001, "BattleReadyID": 10100001,
=======
"BattleReadyID": 10103001,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"FormatList": [ "FormatList": [
102041, 102041,
102042, 102042,
@ -11510,7 +11688,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 9, "venturemodelspeed": 9,
=======
"venturemodelspeed": 6,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/yacht/yacht.prefab", "venturemodel": "Person/yacht/yacht.prefab",
@ -11629,7 +11811,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -11748,7 +11934,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -11867,7 +12057,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -11986,7 +12180,11 @@
"Episodetype": 7, "Episodetype": 7,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -12057,7 +12255,11 @@
"Episodetype": 7, "Episodetype": 7,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -12128,7 +12330,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -12247,7 +12453,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -12366,7 +12576,11 @@
"Episodetype": 7, "Episodetype": 7,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -12437,7 +12651,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",
@ -12556,7 +12774,11 @@
"Episodetype": 1, "Episodetype": 1,
"stage_param": 0, "stage_param": 0,
"battle_fail": 0, "battle_fail": 0,
<<<<<<< HEAD
"venturemodelspeed": 12, "venturemodelspeed": 12,
=======
"venturemodelspeed": 10,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"venturemodelscale": 1, "venturemodelscale": 1,
"move_type": 0, "move_type": 0,
"venturemodel": "Person/badcar/badcar.prefab", "venturemodel": "Person/badcar/badcar.prefab",

4
bin/json/game_monsterformat.json
View File

@ -1831,7 +1831,11 @@
"newskill": [], "newskill": [],
"lv": 4, "lv": 4,
"hppro": 1.21, "hppro": 1.21,
<<<<<<< HEAD
"atkpro": 0.5, "atkpro": 0.5,
=======
"atkpro": 1,
>>>>>>> 5019a65824bf4eab9fc526a8a4eb27755b17e7b8
"defpro": 0.5, "defpro": 0.5,
"skill1": 1, "skill1": 1,
"skill2": 1, "skill2": 1,

7
modules/battle/configure.go
View File

@ -2,6 +2,7 @@ package battle
import ( import (
"fmt" "fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
@ -74,7 +75,8 @@ func (this *configureComp) GetBattleReady(id int32) (conf *cfg.GameBattleReadyDa
return return
} else { } else {
if conf, ok = v.(*cfg.GameBattleReady).GetDataMap()[id]; !ok { if conf, ok = v.(*cfg.GameBattleReady).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%d ", id) // err = fmt.Errorf("not found:%d ", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_battleready, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
@ -125,7 +127,8 @@ func (this *configureComp) getPandamasBuff(id int32) (configure *cfg.GamePandama
return return
} else { } else {
if configure, ok = v.(*cfg.GamePandamasBuff).GetDataMap()[id]; !ok { if configure, ok = v.(*cfg.GamePandamasBuff).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%d ", id) // err = fmt.Errorf("not found:%d ", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_pandamasbuff, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }

22
modules/battle/modelBattle.go
View File

@ -145,7 +145,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
} }
} }
if conf.DefaultHero != 0 { if conf.DefaultHero != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.DefaultHero); errdata != nil { if captain, masters, errdata = this.createMasterRoles(1100, 0, conf.DefaultHero); errdata != nil {
return return
} }
record.Redflist[0].Systeam = masters record.Redflist[0].Systeam = masters
@ -154,7 +154,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
} }
} }
if conf.RedAssistTeam != 0 { if conf.RedAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil { if captain, masters, errdata = this.createMasterRoles(1200, 0, conf.RedAssistTeam); errdata != nil {
return return
} }
record.Redflist[0].Backupteam = masters record.Redflist[0].Backupteam = masters
@ -162,7 +162,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
} else { } else {
record.Redflist = make([]*pb.DBBattleFormt, len(req.Sysformat)) record.Redflist = make([]*pb.DBBattleFormt, len(req.Sysformat))
for i, v := range req.Sysformat { for i, v := range req.Sysformat {
if captain, masters, errdata = this.createMasterRoles(100, i, v); errdata != nil { if captain, masters, errdata = this.createMasterRoles(1100, i, v); errdata != nil {
return return
} }
record.Redflist[i] = &pb.DBBattleFormt{ record.Redflist[i] = &pb.DBBattleFormt{
@ -172,7 +172,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
} }
if req.Backupformat != nil && len(req.Backupformat) > 0 { if req.Backupformat != nil && len(req.Backupformat) > 0 {
for i, v := range req.Backupformat { for i, v := range req.Backupformat {
if captain, masters, errdata = this.createMasterRoles(100, i, v); errdata != nil { if captain, masters, errdata = this.createMasterRoles(1200, i, v); errdata != nil {
return return
} }
record.Redflist[i].Backupteam = masters record.Redflist[i].Backupteam = masters
@ -181,7 +181,7 @@ func (this *modelBattleComp) createeve(session comm.IUserSession, conn *db.DBCon
} }
for i, v := range req.Buleformat { for i, v := range req.Buleformat {
if captain, masters, errdata = this.createMasterRoles(200, i, v); errdata != nil { if captain, masters, errdata = this.createMasterRoles(2100, i, v); errdata != nil {
return return
} }
record.Buleflist[i] = &pb.DBBattleFormt{ record.Buleflist[i] = &pb.DBBattleFormt{
@ -289,7 +289,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
} }
if conf.DefaultHero != 0 { if conf.DefaultHero != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.DefaultHero); errdata != nil { if captain, masters, errdata = this.createMasterRoles(1100, 0, conf.DefaultHero); errdata != nil {
return return
} }
record.Redflist[0].Systeam = masters record.Redflist[0].Systeam = masters
@ -298,7 +298,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
} }
} }
if conf.RedAssistTeam != 0 { if conf.RedAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(100, 0, conf.RedAssistTeam); errdata != nil { if captain, masters, errdata = this.createMasterRoles(1200, 0, conf.RedAssistTeam); errdata != nil {
return return
} }
record.Redflist[0].Backupteam = masters record.Redflist[0].Backupteam = masters
@ -313,7 +313,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
// } // }
for i, v := range req.Mformat { for i, v := range req.Mformat {
if captain, masters, errdata = this.createMasterRoles(200, i, v); errdata != nil { if captain, masters, errdata = this.createMasterRoles(2100, i, v); errdata != nil {
return return
} }
record.Buleflist[i] = &pb.DBBattleFormt{ record.Buleflist[i] = &pb.DBBattleFormt{
@ -323,7 +323,7 @@ func (this *modelBattleComp) createpve(session comm.IUserSession, conn *db.DBCon
} }
if conf.BlueAssistTeam != 0 { if conf.BlueAssistTeam != 0 {
if captain, masters, errdata = this.createMasterRoles(200, 0, conf.BlueAssistTeam); errdata != nil { if captain, masters, errdata = this.createMasterRoles(2200, 0, conf.BlueAssistTeam); errdata != nil {
return return
} }
record.Buleflist[0].Backupteam = masters record.Buleflist[0].Backupteam = masters
@ -448,7 +448,7 @@ func (this *modelBattleComp) createpvb(session comm.IUserSession, conn *db.DBCon
masters []*pb.BattleRole masters []*pb.BattleRole
) )
for i, v := range req.Mformat { for i, v := range req.Mformat {
if captain, masters, errdata = this.createMasterRoles(200, i, v); errdata != nil { if captain, masters, errdata = this.createMasterRoles(2100, i, v); errdata != nil {
return return
} }
record.Buleflist[i] = &pb.DBBattleFormt{ record.Buleflist[i] = &pb.DBBattleFormt{
@ -1064,7 +1064,7 @@ func (this *modelBattleComp) creatStoneBattle(session comm.IUserSession, stoneBa
masters []*pb.BattleRole masters []*pb.BattleRole
) )
for i, v := range stoneBattle.Format { for i, v := range stoneBattle.Format {
if captain, masters, errdata = this.createMasterRoles(200, i, v); errdata != nil { if captain, masters, errdata = this.createMasterRoles(2100, i, v); errdata != nil {
return return
} }
for _, v1 := range masters { for _, v1 := range masters {

1
modules/capturesheep/api_matche.go
View File

@ -69,6 +69,7 @@ func (this *apiComp) Matche(session comm.IUserSession, req *pb.CapturesheepMatch
Sex: info.Sex, Sex: info.Sex,
Skin: info.Skin, Skin: info.Skin,
Mount: dragon.Dragonid, Mount: dragon.Dragonid,
Mlv: dragon.Lv,
Maxhp: dragon.Property[comm.Dhp], Maxhp: dragon.Property[comm.Dhp],
Currhp: dragon.Property[comm.Dhp], Currhp: dragon.Property[comm.Dhp],
Isai: false, Isai: false,

1
modules/capturesheep/modelCaptureSheep.go
View File

@ -111,6 +111,7 @@ func (this *ModelCaptureSheep) matcheAI(dan, num int32) (results []*pb.CaptureSh
Sex: v.Sex, Sex: v.Sex,
Skin: v.Showid, Skin: v.Showid,
Mount: dragon.Dragonid, Mount: dragon.Dragonid,
Mlv: dragon.Lv,
Maxhp: dragon.Property[comm.Dhp], Maxhp: dragon.Property[comm.Dhp],
Currhp: dragon.Property[comm.Dhp], Currhp: dragon.Property[comm.Dhp],
Isai: true, Isai: true,

3
modules/equipment/configure.go
View File

@ -114,7 +114,8 @@ func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (config
return return
} else { } else {
if configure, ok = v.(*cfg.GameEquip).GetDataMap()[equipmentId]; !ok { if configure, ok = v.(*cfg.GameEquip).GetDataMap()[equipmentId]; !ok {
err = fmt.Errorf("EquipmentConfigure not found:%s ", equipmentId) // err = fmt.Errorf("EquipmentConfigure not found:%s ", equipmentId)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_equip, equipmentId)
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
} }

3
modules/hero/configure_comp.go
View File

@ -388,7 +388,8 @@ func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.GameSho
return return
} else { } else {
if result, ok = v.(*cfg.GameShopitem).GetDataMap()[key]; !ok { if result, ok = v.(*cfg.GameShopitem).GetDataMap()[key]; !ok {
err = fmt.Errorf("ShopConfigure not found:%d ", key) // err = fmt.Errorf("ShopConfigure not found:%d ", key)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_shopitem, key)
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
} }

2
modules/mainline/api_challengeover.go
View File

@ -70,7 +70,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MainlineCh
return return
} }
if !isWin && conf.BattleFail == 1 { //战斗失败特殊处理 if req.Report != nil && !isWin && conf.BattleFail == 1 { //战斗失败特殊处理
isWin = true isWin = true
} }

6
modules/moonfantasy/configure.go
View File

@ -1,7 +1,6 @@
package moonfantasy package moonfantasy
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/modules" "go_dreamfactory/modules"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
@ -64,7 +63,7 @@ func (this *configureComp) GetMonsterById(id string) (result *cfg.GameDreamlandB
return return
} else { } else {
if result, ok = v.(*cfg.GameDreamlandBoos).GetDataMap()[id]; !ok { if result, ok = v.(*cfg.GameDreamlandBoos).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%s ", id) err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_dreamlandboos, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
@ -83,7 +82,8 @@ func (this *configureComp) GettriggerData(ptypes int32) (result *cfg.GameDreamla
return return
} else { } else {
if result, ok = v.(*cfg.GameDreamlandTrigger).GetDataMap()[ptypes]; !ok { if result, ok = v.(*cfg.GameDreamlandTrigger).GetDataMap()[ptypes]; !ok {
err = fmt.Errorf("not found:%d ", ptypes) // err = fmt.Errorf("not found:%d ", ptypes)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_dreamlandtrigger, ptypes)
// this.module.Errorln(err) // this.module.Errorln(err)
return return
} }

4
modules/parkour/configure.go
View File

@ -2,6 +2,7 @@ package parkour
import ( import (
"fmt" "fmt"
"go_dreamfactory/comm"
"go_dreamfactory/lego/core" "go_dreamfactory/lego/core"
"go_dreamfactory/modules" "go_dreamfactory/modules"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
@ -66,7 +67,8 @@ func (this *configureComp) getGameBuzkashiReward(id int32) (configure *cfg.GameB
if v, err := this.GetConfigure(game_buzkashireward); err == nil { if v, err := this.GetConfigure(game_buzkashireward); err == nil {
var ok bool var ok bool
if configure, ok = v.(*cfg.GameBuzkashiReward).GetDataMap()[id]; !ok { if configure, ok = v.(*cfg.GameBuzkashiReward).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%d ", id) // err = fmt.Errorf("not found:%d ", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_buzkashireward, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }

15
modules/practice/configure.go
View File

@ -82,7 +82,8 @@ func (this *configureComp) getGamePandamasMz(lv int32) (configure *cfg.GamePanda
return return
} else { } else {
if configure, ok = v.(*cfg.GamePandamasMz).GetDataMap()[lv]; !ok { if configure, ok = v.(*cfg.GamePandamasMz).GetDataMap()[lv]; !ok {
err = fmt.Errorf("not found:%d ", lv) // err = fmt.Errorf("not found:%d ", lv)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_pandamasmz, lv)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
@ -113,7 +114,8 @@ func (this *configureComp) getGamePandamasJx(id string) (configure *cfg.GamePand
return return
} else { } else {
if configure, ok = v.(*cfg.GamePandamasJx).GetDataMap()[id]; !ok { if configure, ok = v.(*cfg.GamePandamasJx).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%s ", id) // err = fmt.Errorf("not found:%s ", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_pandamasjx, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
@ -131,7 +133,8 @@ func (this *configureComp) getGamePandamasYxjx(id int32) (configure *cfg.GamePan
return return
} else { } else {
if configure, ok = v.(*cfg.GamePandamasYxjx).GetDataMap()[id]; !ok { if configure, ok = v.(*cfg.GamePandamasYxjx).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%d", id) // err = fmt.Errorf("not found:%d", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_pandamasyxjx, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
@ -162,7 +165,8 @@ func (this *configureComp) getPandamasMryl(id int32) (configure *cfg.GamePandama
return return
} else { } else {
if configure, ok = v.(*cfg.GamePandamasMryl).GetDataMap()[id]; !ok { if configure, ok = v.(*cfg.GamePandamasMryl).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%d ", id) // err = fmt.Errorf("not found:%d ", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_pandamasmryl, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }
@ -220,7 +224,8 @@ func (this *configureComp) getDispatchBattleData(id int32) (configure *cfg.GameD
return return
} else { } else {
if configure, ok = v.(*cfg.GameDispatch_Battle).GetDataMap()[id]; !ok { if configure, ok = v.(*cfg.GameDispatch_Battle).GetDataMap()[id]; !ok {
err = fmt.Errorf("not found:%d ", id) // err = fmt.Errorf("not found:%d ", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_dispatch_battle, id)
this.module.Errorln(err) this.module.Errorln(err)
return return
} }

6
modules/shop/configure.go
View File

@ -44,7 +44,8 @@ func (this *configureComp) GetShopConfigure(id int32) (configure *cfg.GameShopDa
return return
} else { } else {
if configure, ok = v.(*cfg.GameShop).GetDataMap()[id]; !ok { if configure, ok = v.(*cfg.GameShop).GetDataMap()[id]; !ok {
err = fmt.Errorf("ShopConfigure not found:%d ", id) // err = fmt.Errorf("ShopConfigure not found:%d ", id)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_shop, id)
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
} }
@ -63,7 +64,8 @@ func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.GameSho
return return
} else { } else {
if result, ok = v.(*cfg.GameShopitem).GetDataMap()[key]; !ok { if result, ok = v.(*cfg.GameShopitem).GetDataMap()[key]; !ok {
err = fmt.Errorf("ShopConfigure not found:%d ", key) // err = fmt.Errorf("ShopConfigure not found:%d ", key)
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_shopitem, key)
this.module.Errorf("err:%v", err) this.module.Errorf("err:%v", err)
return return
} }

73
pb/capturesheep_db.pb.go
View File

@ -192,11 +192,12 @@ type CaptureSheepRaceMember struct {
Changeintegral int32 `protobuf:"varint,7,opt,name=changeintegral,proto3" json:"changeintegral"` //变化积分 Changeintegral int32 `protobuf:"varint,7,opt,name=changeintegral,proto3" json:"changeintegral"` //变化积分
Isai bool `protobuf:"varint,8,opt,name=isai,proto3" json:"isai"` //是否是ai数据 Isai bool `protobuf:"varint,8,opt,name=isai,proto3" json:"isai"` //是否是ai数据
Mount string `protobuf:"bytes,9,opt,name=mount,proto3" json:"mount"` //上阵坐骑 配置id Mount string `protobuf:"bytes,9,opt,name=mount,proto3" json:"mount"` //上阵坐骑 配置id
Maxhp int32 `protobuf:"varint,10,opt,name=maxhp,proto3" json:"maxhp"` //初始血量 Mlv int32 `protobuf:"varint,10,opt,name=mlv,proto3" json:"mlv"` //坐骑等级
Currhp int32 `protobuf:"varint,11,opt,name=currhp,proto3" json:"currhp"` //当前血量 Maxhp int32 `protobuf:"varint,11,opt,name=maxhp,proto3" json:"maxhp"` //初始血量
Scores int32 `protobuf:"varint,12,opt,name=scores,proto3" json:"scores"` //当前分数 Currhp int32 `protobuf:"varint,12,opt,name=currhp,proto3" json:"currhp"` //当前血量
Showscores int32 `protobuf:"varint,13,opt,name=showscores,proto3" json:"showscores"` //表现分数 Scores int32 `protobuf:"varint,13,opt,name=scores,proto3" json:"scores"` //当前分数
Dodge int32 `protobuf:"varint,14,opt,name=dodge,proto3" json:"dodge"` //闪避次数 Showscores int32 `protobuf:"varint,14,opt,name=showscores,proto3" json:"showscores"` //表现分数
Dodge int32 `protobuf:"varint,15,opt,name=dodge,proto3" json:"dodge"` //闪避次数
} }
func (x *CaptureSheepRaceMember) Reset() { func (x *CaptureSheepRaceMember) Reset() {
@ -294,6 +295,13 @@ func (x *CaptureSheepRaceMember) GetMount() string {
return "" return ""
} }
func (x *CaptureSheepRaceMember) GetMlv() int32 {
if x != nil {
return x.Mlv
}
return 0
}
func (x *CaptureSheepRaceMember) GetMaxhp() int32 { func (x *CaptureSheepRaceMember) GetMaxhp() int32 {
if x != nil { if x != nil {
return x.Maxhp return x.Maxhp
@ -426,7 +434,7 @@ var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{
0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
0x6c, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28,
0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x63, 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x63,
0x18, 0x09, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22, 0xe0, 0x02, 0x0a, 0x16, 0x18, 0x09, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22, 0xf2, 0x02, 0x0a, 0x16,
0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65,
0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 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, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
@ -441,32 +449,33 @@ var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69,
0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05,
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75,
0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x6c, 0x76, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x03, 0x6d, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x18, 0x0b, 0x20,
0x68, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75,
0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x72, 0x72, 0x68, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72,
0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0d, 0x20, 0x01,
0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x68, 0x28, 0x05, 0x52, 0x06, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68,
0x6f, 0x77, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x6f, 0x77, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65, 0x22, 0xdb, 0x73, 0x68, 0x6f, 0x77, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x6f,
0x01, 0x0a, 0x12, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x64, 0x67, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x6f, 0x64, 0x67, 0x65,
0x70, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x22, 0xdb, 0x01, 0x0a, 0x12, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68,
0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2b, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x15, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65,
0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18, 0x04, 0x20, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x72,
0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35, 0x0a, 0x09, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x18,
0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x12, 0x35,
0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28,
0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d, 0x65, 0x6d, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70,
0x62, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x64, 0x6d,
0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x37, 0x0a, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d,
0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x62, 0x65, 0x72, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x43, 0x61, 0x70, 0x74,
0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d, 0x0a, 0x14, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62,
0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x65, 0x72, 0x52, 0x0a, 0x62, 0x75, 0x6c, 0x65, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x2a, 0x2d,
0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61,
0x0a, 0x0a, 0x06, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x09, 0x0a, 0x05, 0x74, 0x72, 0x61, 0x69, 0x6e, 0x10,
0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x72, 0x61, 0x6e, 0x6b, 0x65, 0x64, 0x10, 0x01, 0x42, 0x06, 0x5a,
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (