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:
liwei1dao 2023-06-14 09:13:53 +08:00
commit 3814c6fd32
31 changed files with 18044 additions and 12719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bin/json/game_battleready.json
View File

@ -398,5 +398,21 @@
"AssistTeam": 0, "AssistTeam": 0,
"CanFriendHelp": 0, "CanFriendHelp": 0,
"Numrounds": 0 "Numrounds": 0
},
{
"id": 125,
"PlayType": 0,
"HeroCount": 5,
"readyScene": "scenesfight_role_interface_02",
"battleScenes": [
"bossfight_chef_02"
],
"disableAiCamera": 1,
"DefaultHero": 0,
"DisableHero": [],
"LockSlots": [],
"AssistTeam": 0,
"CanFriendHelp": 0,
"Numrounds": 0
} }
] ]

566
bin/json/game_buriedcondi.json
View File

File diff suppressed because it is too large Load Diff

2
bin/json/game_buriedtype.json
View File

@ -253,7 +253,7 @@
"id": 41, "id": 41,
"insert": 1, "insert": 1,
"filter": [ "filter": [
"eq" "gte"
] ]
}, },
{ {

4368
bin/json/game_equipattrlibrarys.json
View File

File diff suppressed because it is too large Load Diff

38
bin/json/game_equipenchanting.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"item": "40001", "item": "19001001",
"suittype": 1, "suittype": 1,
"attrkey": "atk", "attrkey": "atk",
"attr_mini": 300, "attr_mini": 300,
@ -14,7 +14,7 @@
] ]
}, },
{ {
"item": "40002", "item": "19002001",
"suittype": 1, "suittype": 1,
"attrkey": "hppro", "attrkey": "hppro",
"attr_mini": 300, "attr_mini": 300,
@ -28,7 +28,7 @@
] ]
}, },
{ {
"item": "40003", "item": "19003001",
"suittype": 1, "suittype": 1,
"attrkey": "def", "attrkey": "def",
"attr_mini": 50, "attr_mini": 50,
@ -42,7 +42,7 @@
] ]
}, },
{ {
"item": "40004", "item": "19004001",
"suittype": 1, "suittype": 1,
"attrkey": "hp", "attrkey": "hp",
"attr_mini": 1000, "attr_mini": 1000,
@ -56,7 +56,7 @@
] ]
}, },
{ {
"item": "40005", "item": "19005001",
"suittype": 1, "suittype": 1,
"attrkey": "atkpro", "attrkey": "atkpro",
"attr_mini": 300, "attr_mini": 300,
@ -70,7 +70,7 @@
] ]
}, },
{ {
"item": "40006", "item": "19001002",
"suittype": 1, "suittype": 1,
"attrkey": "defpro", "attrkey": "defpro",
"attr_mini": 300, "attr_mini": 300,
@ -84,7 +84,7 @@
] ]
}, },
{ {
"item": "40007", "item": "19002002",
"suittype": 1, "suittype": 1,
"attrkey": "speed", "attrkey": "speed",
"attr_mini": 10, "attr_mini": 10,
@ -98,7 +98,7 @@
] ]
}, },
{ {
"item": "40008", "item": "19003002",
"suittype": 1, "suittype": 1,
"attrkey": "cri", "attrkey": "cri",
"attr_mini": 300, "attr_mini": 300,
@ -112,7 +112,7 @@
] ]
}, },
{ {
"item": "40009", "item": "19004002",
"suittype": 1, "suittype": 1,
"attrkey": "cridam", "attrkey": "cridam",
"attr_mini": 300, "attr_mini": 300,
@ -126,7 +126,7 @@
] ]
}, },
{ {
"item": "40010", "item": "19005002",
"suittype": 1, "suittype": 1,
"attrkey": "effhit", "attrkey": "effhit",
"attr_mini": 300, "attr_mini": 300,
@ -140,7 +140,7 @@
] ]
}, },
{ {
"item": "40011", "item": "19001003",
"suittype": 1, "suittype": 1,
"attrkey": "effre", "attrkey": "effre",
"attr_mini": 300, "attr_mini": 300,
@ -154,7 +154,7 @@
] ]
}, },
{ {
"item": "40012", "item": "19002003",
"suittype": 1, "suittype": 1,
"attrkey": "atk", "attrkey": "atk",
"attr_mini": 300, "attr_mini": 300,
@ -168,7 +168,7 @@
] ]
}, },
{ {
"item": "40013", "item": "19003003",
"suittype": 1, "suittype": 1,
"attrkey": "hppro", "attrkey": "hppro",
"attr_mini": 300, "attr_mini": 300,
@ -182,7 +182,7 @@
] ]
}, },
{ {
"item": "40014", "item": "19004003",
"suittype": 1, "suittype": 1,
"attrkey": "def", "attrkey": "def",
"attr_mini": 300, "attr_mini": 300,
@ -196,7 +196,7 @@
] ]
}, },
{ {
"item": "40015", "item": "19005003",
"suittype": 1, "suittype": 1,
"attrkey": "hp", "attrkey": "hp",
"attr_mini": 50, "attr_mini": 50,
@ -210,7 +210,7 @@
] ]
}, },
{ {
"item": "40016", "item": "19001004",
"suittype": 1, "suittype": 1,
"attrkey": "atkpro", "attrkey": "atkpro",
"attr_mini": 1000, "attr_mini": 1000,
@ -224,7 +224,7 @@
] ]
}, },
{ {
"item": "40017", "item": "19002004",
"suittype": 1, "suittype": 1,
"attrkey": "defpro", "attrkey": "defpro",
"attr_mini": 300, "attr_mini": 300,
@ -238,7 +238,7 @@
] ]
}, },
{ {
"item": "40018", "item": "19003004",
"suittype": 1, "suittype": 1,
"attrkey": "speed", "attrkey": "speed",
"attr_mini": 300, "attr_mini": 300,
@ -252,7 +252,7 @@
] ]
}, },
{ {
"item": "40019", "item": "19004004",
"suittype": 1, "suittype": 1,
"attrkey": "cri", "attrkey": "cri",
"attr_mini": 10, "attr_mini": 10,

789
bin/json/game_hero.json
View File

File diff suppressed because it is too large Load Diff

762
bin/json/game_herolevelgrow.json
View File

File diff suppressed because it is too large Load Diff

7245
bin/json/game_horoscope.json
View File

File diff suppressed because it is too large Load Diff

14501
bin/json/game_item.json
View File

File diff suppressed because it is too large Load Diff

794
bin/json/game_mainstage.json
View File

File diff suppressed because it is too large Load Diff

187
bin/json/game_model.json
View File

@ -4236,9 +4236,9 @@
}, },
{ {
"id": "51015", "id": "51015",
"preson": "51004", "preson": "51015",
"presonshow": "51004_exhibition", "presonshow": "51015_exhibition",
"presonstory": "51004", "presonstory": "51015",
"presondraw": "", "presondraw": "",
"height": 1, "height": 1,
"weight": 1, "weight": 1,
@ -4271,9 +4271,9 @@
}, },
{ {
"id": "51016", "id": "51016",
"preson": "51004", "preson": "51016",
"presonshow": "51004_exhibition", "presonshow": "51016_exhibition",
"presonstory": "51004", "presonstory": "51016",
"presondraw": "", "presondraw": "",
"height": 1, "height": 1,
"weight": 1, "weight": 1,
@ -4723,5 +4723,180 @@
"y": 1, "y": 1,
"z": 1 "z": 1
} }
},
{
"id": "51029",
"preson": "53003",
"presonshow": "53003_exhibition",
"presonstory": "53003",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51029",
"fight": "ytx_js_51029",
"img": "sbkp_js_51029",
"heroimg": "hbkp_js_51029",
"portrait": "portrait_51029",
"bust": "bust_51029",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{
"id": "51030",
"preson": "53003",
"presonshow": "53003_exhibition",
"presonstory": "53003",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51030",
"fight": "ytx_js_51030",
"img": "sbkp_js_51030",
"heroimg": "hbkp_js_51030",
"portrait": "portrait_51030",
"bust": "bust_51030",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{
"id": "51031",
"preson": "53003",
"presonshow": "53003_exhibition",
"presonstory": "53003",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51031",
"fight": "ytx_js_51031",
"img": "sbkp_js_51031",
"heroimg": "hbkp_js_51031",
"portrait": "portrait_51031",
"bust": "bust_51031",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{
"id": "51032",
"preson": "53003",
"presonshow": "53003_exhibition",
"presonstory": "53003",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51032",
"fight": "ytx_js_51032",
"img": "sbkp_js_51032",
"heroimg": "hbkp_js_51032",
"portrait": "portrait_51032",
"bust": "bust_51032",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
},
{
"id": "51033",
"preson": "53003",
"presonshow": "53003_exhibition",
"presonstory": "53003",
"presondraw": "",
"height": 1,
"weight": 1,
"ico": "tx_js_51033",
"fight": "ytx_js_51033",
"img": "sbkp_js_51033",
"heroimg": "hbkp_js_51033",
"portrait": "portrait_51033",
"bust": "bust_51033",
"postxyz": [
0,
0,
0
],
"rotation": {
"x": 0,
"y": 180,
"z": 0
},
"boxPos": {
"x": 0,
"y": 0.5,
"z": 0
},
"boxSize": {
"x": 1,
"y": 1,
"z": 1
}
} }
] ]

212
bin/json/game_rdtasknpc.json
View File

@ -344,8 +344,8 @@
"901" "901"
], ],
"event": [ "event": [
1, 2,
101 10050
], ],
"goto": 0 "goto": 0
}, },
@ -386,8 +386,8 @@
"901" "901"
], ],
"event": [ "event": [
1, 2,
102 10080
], ],
"goto": 0 "goto": 0
}, },
@ -426,8 +426,8 @@
"901" "901"
], ],
"event": [ "event": [
1, 2,
103 10100
], ],
"goto": 0 "goto": 0
}, },
@ -466,8 +466,8 @@
"901" "901"
], ],
"event": [ "event": [
1, 2,
104 10120
], ],
"goto": 0 "goto": 0
}, },
@ -546,8 +546,8 @@
"137" "137"
], ],
"event": [ "event": [
1, 2,
105 10160
], ],
"goto": 0 "goto": 0
}, },
@ -721,7 +721,7 @@
], ],
"event": [ "event": [
2, 2,
10240 10244
], ],
"goto": 0 "goto": 0
}, },
@ -759,7 +759,7 @@
], ],
"event": [ "event": [
2, 2,
10250 10245
], ],
"goto": 0 "goto": 0
}, },
@ -972,8 +972,8 @@
"905" "905"
], ],
"event": [ "event": [
2, 10,
10330 166
], ],
"goto": 0 "goto": 0
}, },
@ -999,7 +999,7 @@
], ],
"event": [ "event": [
2, 2,
10340 10330
], ],
"goto": 0 "goto": 0
}, },
@ -1037,7 +1037,7 @@
], ],
"event": [ "event": [
2, 2,
10350 10340
], ],
"goto": 0 "goto": 0
}, },
@ -1075,7 +1075,7 @@
], ],
"event": [ "event": [
2, 2,
10360 10350
], ],
"goto": 0 "goto": 0
}, },
@ -1088,8 +1088,8 @@
"901" "901"
], ],
"event": [ "event": [
1, 2,
106 10351
], ],
"goto": 0 "goto": 0
}, },
@ -1115,7 +1115,7 @@
], ],
"event": [ "event": [
2, 2,
10370 10360
], ],
"goto": 0 "goto": 0
}, },
@ -1128,8 +1128,8 @@
"901" "901"
], ],
"event": [ "event": [
1, 2,
107 10361
], ],
"goto": 0 "goto": 0
}, },
@ -1170,8 +1170,8 @@
"137" "137"
], ],
"event": [ "event": [
1, 2,
108 10390
], ],
"goto": 0 "goto": 0
}, },
@ -1193,13 +1193,13 @@
"id": 10230, "id": 10230,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "WuGuanScene",
"20030_邦尼兔", "阿宝",
"901" "137"
], ],
"event": [ "event": [
2, 2,
10030 10410
], ],
"goto": 0 "goto": 0
}, },
@ -1207,13 +1207,13 @@
"id": 10234, "id": 10234,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "WuGuanScene",
"20030_熊猫", "木桩2",
"901" "137"
], ],
"event": [ "event": [
2, 2,
10030 10200
], ],
"goto": 0 "goto": 0
}, },
@ -1222,12 +1222,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_邦尼兔",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1235,13 +1233,13 @@
"id": 10240, "id": 10240,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "WuGuanScene",
"20030_熊猫", "总教习",
"901" "137"
], ],
"event": [ "event": [
2, 2,
10030 10420
], ],
"goto": 0 "goto": 0
}, },
@ -1249,13 +1247,13 @@
"id": 10244, "id": 10244,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "WuGuanScene",
"20030_邦尼兔", "总教习",
"901" "137"
], ],
"event": [ "event": [
2, 10,
10030 10004
], ],
"goto": 0 "goto": 0
}, },
@ -1264,12 +1262,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_熊猫",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1278,12 +1274,12 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_邦尼兔", "20030_熊猫",
"901" "901"
], ],
"event": [ "event": [
2, 2,
10030 10430
], ],
"goto": 0 "goto": 0
}, },
@ -1292,12 +1288,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_熊猫",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1306,12 +1300,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_熊猫",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1319,13 +1311,13 @@
"id": 10260, "id": 10260,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "CommandScene",
"20030_邦尼兔", "20010_骇客蛛_1",
"901" "905"
], ],
"event": [ "event": [
2, 2,
10030 10440
], ],
"goto": 0 "goto": 0
}, },
@ -1334,12 +1326,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_熊猫",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1348,12 +1338,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_邦尼兔",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1361,13 +1349,13 @@
"id": 10270, "id": 10270,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "CommandScene",
"20030_熊猫", "20010_骇客蛛_1",
"901" "905"
], ],
"event": [ "event": [
2, 2,
10030 10450
], ],
"goto": 0 "goto": 0
}, },
@ -1376,12 +1364,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_邦尼兔",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1390,12 +1376,10 @@
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "GameMain",
"20030_熊猫",
"901" "901"
], ],
"event": [ "event": [
2, 0
10030
], ],
"goto": 0 "goto": 0
}, },
@ -1403,13 +1387,13 @@
"id": 10280, "id": 10280,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "CommandScene",
"20030_熊猫", "20010_骇客蛛_1",
"901" "905"
], ],
"event": [ "event": [
2, 2,
10030 10460
], ],
"goto": 0 "goto": 0
}, },
@ -1417,13 +1401,13 @@
"id": 10284, "id": 10284,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "CommandScene",
"20030_邦尼兔", "20010_骇客蛛_1",
"901" "905"
], ],
"event": [ "event": [
2, 10,
10030 166
], ],
"goto": 0 "goto": 0
}, },
@ -1431,13 +1415,13 @@
"id": 10288, "id": 10288,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "CommandScene",
"20030_熊猫", "20010_骇客蛛_1",
"901" "905"
], ],
"event": [ "event": [
2, 2,
10030 10470
], ],
"goto": 0 "goto": 0
}, },
@ -1445,13 +1429,13 @@
"id": 10290, "id": 10290,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "CommandScene",
"20030_邦尼兔", "20010_骇客蛛_1",
"901" "905"
], ],
"event": [ "event": [
2, 2,
10030 10480
], ],
"goto": 0 "goto": 0
}, },
@ -1459,13 +1443,41 @@
"id": 10294, "id": 10294,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "WuGuanScene",
"20030_熊猫", "阿宝",
"901" "137"
], ],
"event": [ "event": [
2, 2,
10030 10490
],
"goto": 0
},
{
"id": 10295,
"heroid": 0,
"datas": [
"SmithyScene",
"打造",
"139"
],
"event": [
2,
10500
],
"goto": 0
},
{
"id": 10296,
"heroid": 0,
"datas": [
"GuildScene",
"工会签到",
"11005"
],
"event": [
2,
10520
], ],
"goto": 0 "goto": 0
}, },
@ -1473,13 +1485,13 @@
"id": 10298, "id": 10298,
"heroid": 0, "heroid": 0,
"datas": [ "datas": [
"GameMain", "CommandScene",
"20030_邦尼兔", "20010_骇客蛛_1",
"901" "905"
], ],
"event": [ "event": [
2, 2,
10030 10520
], ],
"goto": 0 "goto": 0
}, },

169
bin/json/game_skillafteratk.json
View File

@ -7910,8 +7910,8 @@
"From": 1, "From": 1,
"Where": [], "Where": [],
"Order": "PropertyUp=20", "Order": "PropertyUp=20",
"Limit": 2, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 2,
"Type": 5, "Type": 5,
"Argu": [ "Argu": [
1, 1,
@ -18260,7 +18260,9 @@
"Id": 243003211, "Id": 243003211,
"EmitPR": 1000, "EmitPR": 1000,
"From": 3, "From": 3,
"Where": [], "Where": [
"HpproCreater=250"
],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
@ -20032,10 +20034,10 @@
{ {
"Id": 255004111, "Id": 255004111,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -20057,10 +20059,10 @@
{ {
"Id": 255004112, "Id": 255004112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
@ -20431,7 +20433,7 @@
{ {
"Id": 255003111, "Id": 255003111,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -20456,7 +20458,7 @@
{ {
"Id": 255003112, "Id": 255003112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -20595,10 +20597,10 @@
{ {
"Id": 255001111, "Id": 255001111,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -20620,10 +20622,10 @@
{ {
"Id": 255001112, "Id": 255001112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
@ -21047,7 +21049,7 @@
{ {
"Id": 255006211, "Id": 255006211,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
@ -21074,12 +21076,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 5,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
13000 2600
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [ "SucFollowSK": [
@ -21125,16 +21127,16 @@
"From": 2, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 41, "Type": 41,
"Argu": [ "Argu": [
1 1
], ],
"FollowSK": [], "FollowSK": [
"SucFollowSK": [
255006215 255006215
], ],
"SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
"DpsRevisiType": 0, "DpsRevisiType": 0,
@ -21154,7 +21156,7 @@
"Argu": [ "Argu": [
2, 2,
2, 2,
50 10
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -21200,13 +21202,10 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
455006311, 455006311,
1, -1,
0 -1
],
"FollowSK": [
255006312,
255006313
], ],
"FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -21228,7 +21227,7 @@
390001447, 390001447,
1000, 1000,
1, 1,
1 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -21250,8 +21249,8 @@
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
455006312, 455006312,
1, -1,
0 -1
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -21294,35 +21293,11 @@
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 3, "Type": 8,
"Argu": [ "Argu": [
390001413, 390001447,
1000, -1,
1, 1000
-1
],
"FollowSK": [],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 255006316,
"EmitPR": 1000,
"From": 3,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 2,
"Argu": [
455006312,
1,
0
], ],
"FollowSK": [], "FollowSK": [],
"SucFollowSK": [], "SucFollowSK": [],
@ -22192,10 +22167,10 @@
{ {
"Id": 255002111, "Id": 255002111,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
@ -22217,10 +22192,10 @@
{ {
"Id": 255002112, "Id": 255002112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
@ -23843,19 +23818,20 @@
{ {
"Id": 223004311, "Id": 223004311,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 10,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
1000 4000
], ],
"FollowSK": [ "FollowSK": [
223004312 223004312,
223004313
], ],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
@ -23868,15 +23844,15 @@
{ {
"Id": 223004312, "Id": 223004312,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 8, "Type": 8,
"Argu": [ "Argu": [
3,
-1, -1,
1000,
1000 1000
], ],
"FollowSK": [], "FollowSK": [],
@ -23891,32 +23867,7 @@
{ {
"Id": 223004313, "Id": 223004313,
"EmitPR": 1000, "EmitPR": 1000,
"From": 4, "From": 2,
"Where": [],
"Order": "",
"Limit": 1,
"ExecuteCnt": 1,
"Type": 1,
"Argu": [
1,
1,
100
],
"FollowSK": [
223004314
],
"SucFollowSK": [],
"FailFollowSK": [],
"MustHit": false,
"DpsRevisiType": 0,
"DpsCondition": "",
"RevisiCondition": "",
"RevisiParams": []
},
{
"Id": 223004314,
"EmitPR": 1000,
"From": 4,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
@ -25088,12 +25039,12 @@
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 10, "Limit": 10,
"ExecuteCnt": 2, "ExecuteCnt": 4,
"Type": 1, "Type": 1,
"Argu": [ "Argu": [
1, 1,
4, 4,
3000 1000
], ],
"FollowSK": [ "FollowSK": [
215003312 215003312
@ -28692,16 +28643,16 @@
{ {
"Id": 251017112, "Id": 251017112,
"EmitPR": 1000, "EmitPR": 1000,
"From": 2, "From": 3,
"Where": [], "Where": [],
"Order": "", "Order": "",
"Limit": 1, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 2, "Type": 2,
"Argu": [ "Argu": [
411021111, 451017111,
-1, -1,
1 -1
], ],
"FollowSK": [ "FollowSK": [
251017113 251017113
@ -28725,7 +28676,7 @@
"Type": 3, "Type": 3,
"Argu": [ "Argu": [
390001105, 390001105,
1000, 600,
1, 1,
1 1
], ],
@ -28898,7 +28849,9 @@
1, 1,
2 2
], ],
"FollowSK": [], "FollowSK": [
251022112
],
"SucFollowSK": [], "SucFollowSK": [],
"FailFollowSK": [], "FailFollowSK": [],
"MustHit": false, "MustHit": false,
@ -28934,10 +28887,10 @@
{ {
"Id": 251023111, "Id": 251023111,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "PropertyDown=2", "Order": "PropertyDown=2",
"Limit": 10, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 5, "Type": 5,
"Argu": [ "Argu": [
@ -28957,10 +28910,10 @@
{ {
"Id": 251023121, "Id": 251023121,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "PropertyDown=2", "Order": "PropertyDown=2",
"Limit": 10, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 5, "Type": 5,
"Argu": [ "Argu": [
@ -28980,10 +28933,10 @@
{ {
"Id": 251023131, "Id": 251023131,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "PropertyDown=2", "Order": "PropertyDown=2",
"Limit": 10, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 5, "Type": 5,
"Argu": [ "Argu": [
@ -29003,10 +28956,10 @@
{ {
"Id": 251023141, "Id": 251023141,
"EmitPR": 1000, "EmitPR": 1000,
"From": 1, "From": 4,
"Where": [], "Where": [],
"Order": "PropertyDown=2", "Order": "PropertyDown=2",
"Limit": 10, "Limit": 1,
"ExecuteCnt": 1, "ExecuteCnt": 1,
"Type": 5, "Type": 5,
"Argu": [ "Argu": [

631
bin/json/game_skillatk.json
View File

File diff suppressed because it is too large Load Diff

6
bin/json/game_skillbuff.json
View File

@ -879,7 +879,7 @@
"RelyCheckArgu": [], "RelyCheckArgu": [],
"CoexistCheckArgu": [], "CoexistCheckArgu": [],
"Effect": [ "Effect": [
3 2
], ],
"AddEffect": false, "AddEffect": false,
"RemoveType": false, "RemoveType": false,
@ -1167,7 +1167,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001128", "key": "skill_skill_buff_Desc_390001128",
"text": "" "text": "无法被选中"
}, },
"BuffType": 0, "BuffType": 0,
"EffectArgu": [], "EffectArgu": [],
@ -1469,7 +1469,7 @@
}, },
"Desc": { "Desc": {
"key": "skill_skill_buff_Desc_390001209", "key": "skill_skill_buff_Desc_390001209",
"text": "" "text": "每次受到攻击提升20%的防御，最多叠加5层"
}, },
"BuffType": 39, "BuffType": 39,
"EffectArgu": [], "EffectArgu": [],

15
bin/json/game_skillpassive.json
View File

@ -1594,8 +1594,8 @@
}, },
{ {
"Id": 455006312, "Id": 455006312,
"When": 16, "When": 19,
"FromCheck": "Target=2", "FromCheck": "",
"TargetCheck": "Target=3,HasBuff=390001447,OverlayNum=8", "TargetCheck": "Target=3,HasBuff=390001447,OverlayNum=8",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
@ -1605,7 +1605,8 @@
"Type": "CallSkillPas", "Type": "CallSkillPas",
"MaxEmitTimes": 1, "MaxEmitTimes": 1,
"Callback": [ "Callback": [
255006212 255006212,
255006315
] ]
}, },
{ {
@ -1745,7 +1746,7 @@
"Id": 455006214, "Id": 455006214,
"When": 16, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "", "TargetCheck": "Target=2",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "SkillID=255006212", "AfterSkillCheck": "SkillID=255006212",
"BuffCheck": "", "BuffCheck": "",
@ -1755,7 +1756,7 @@
"MaxEmitTimes": 1, "MaxEmitTimes": 1,
"Callback": [ "Callback": [
390001401, 390001401,
8 99
] ]
}, },
{ {
@ -2438,10 +2439,10 @@
"Id": 451017111, "Id": 451017111,
"When": 16, "When": 16,
"FromCheck": "Target=3", "FromCheck": "Target=3",
"TargetCheck": "Target=2", "TargetCheck": "Target=2,HasBuff=390001401",
"MainSkillCheck": "", "MainSkillCheck": "",
"AfterSkillCheck": "", "AfterSkillCheck": "",
"BuffCheck": "BuffType=POISON,Succ=1", "BuffCheck": "",
"AddCon": [], "AddCon": [],
"PasPr": 1000, "PasPr": 1000,
"Type": "CallSkillPas", "Type": "CallSkillPas",

142
bin/json/game_worldtask.json
View File

@ -916,11 +916,11 @@
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_26", "key": "worldtask_world_task_task_details_26",
"text": "穿戴6件3星装备" "text": "穿戴6件SR装备"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_26", "key": "worldtask_world_task_npctxt_26",
"text": "穿戴6件3星装备" "text": "穿戴6件SR装备"
}, },
"npc": 10260, "npc": 10260,
"completetask": [ "completetask": [
@ -1032,7 +1032,9 @@
}, },
"npc": 10290, "npc": 10290,
"completetask": [ "completetask": [
12070310 12070310,
12070311,
12070312
], ],
"deliver_npc": 10298, "deliver_npc": 10298,
"auto_accept": 0, "auto_accept": 0,
@ -1380,15 +1382,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_39", "key": "worldtask_world_task_task_name_39",
"text": "回响1次" "text": "星座图1次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_39", "key": "worldtask_world_task_task_details_39",
"text": "回响1次" "text": "星座图1次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_39", "key": "worldtask_world_task_npctxt_39",
"text": "回响1次" "text": "星座图1次"
}, },
"npc": 10390, "npc": 10390,
"completetask": [ "completetask": [
@ -1424,7 +1426,7 @@
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_40", "key": "worldtask_world_task_npctxt_40",
"text": "维京远征boss1难度2" "text": "维京远征boss2难度6"
}, },
"npc": 10400, "npc": 10400,
"completetask": [ "completetask": [
@ -1560,15 +1562,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_44", "key": "worldtask_world_task_task_name_44",
"text": "战斗17" "text": "战斗16"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_44", "key": "worldtask_world_task_task_details_44",
"text": "战斗17" "text": "战斗16"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_44", "key": "worldtask_world_task_npctxt_44",
"text": "战斗17" "text": "战斗16"
}, },
"npc": 10440, "npc": 10440,
"completetask": [ "completetask": [
@ -1668,15 +1670,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_47", "key": "worldtask_world_task_task_name_47",
"text": "强化装备套装" "text": "强化装备"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_47", "key": "worldtask_world_task_task_details_47",
"text": "强化装备套装" "text": "强化装备"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_47", "key": "worldtask_world_task_npctxt_47",
"text": "强化装备套装" "text": "强化装备"
}, },
"npc": 10470, "npc": 10470,
"completetask": [ "completetask": [
@ -1740,15 +1742,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_49", "key": "worldtask_world_task_task_name_49",
"text": "装备副本boss1难度2刷1次、装备穿戴、升级" "text": "装备副本boss2难度2刷1次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_49", "key": "worldtask_world_task_task_details_49",
"text": "装备副本boss1难度2刷1次、装备穿戴、升级" "text": "装备副本boss2难度2刷1次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_49", "key": "worldtask_world_task_npctxt_49",
"text": "装备副本boss1难度2刷1次、装备穿戴、升级" "text": "装备副本boss2难度2刷1次"
}, },
"npc": 10490, "npc": 10490,
"completetask": [ "completetask": [
@ -1920,15 +1922,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_54", "key": "worldtask_world_task_task_name_54",
"text": "战斗18" "text": "战斗17"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_54", "key": "worldtask_world_task_task_details_54",
"text": "战斗18" "text": "战斗17"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_54", "key": "worldtask_world_task_npctxt_54",
"text": "战斗18" "text": "战斗17"
}, },
"npc": 10540, "npc": 10540,
"completetask": [ "completetask": [
@ -1956,15 +1958,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_55", "key": "worldtask_world_task_task_name_55",
"text": "战斗19" "text": "战斗18"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_55", "key": "worldtask_world_task_task_details_55",
"text": "战斗19" "text": "战斗18"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_55", "key": "worldtask_world_task_npctxt_55",
"text": "战斗19" "text": "战斗18"
}, },
"npc": 10550, "npc": 10550,
"completetask": [ "completetask": [
@ -1992,15 +1994,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_56", "key": "worldtask_world_task_task_name_56",
"text": "战斗20" "text": "战斗19"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_56", "key": "worldtask_world_task_task_details_56",
"text": "战斗20" "text": "战斗19"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_56", "key": "worldtask_world_task_npctxt_56",
"text": "战斗20" "text": "战斗19"
}, },
"npc": 10560, "npc": 10560,
"completetask": [ "completetask": [
@ -2028,15 +2030,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_57", "key": "worldtask_world_task_task_name_57",
"text": "通关觉醒副本boss1难度2" "text": "装备副本boss3难度1(开支线，打狩猎)"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_57", "key": "worldtask_world_task_task_details_57",
"text": "通关觉醒副本boss1难度2" "text": "装备副本boss3难度1(开支线，打狩猎)"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_57", "key": "worldtask_world_task_npctxt_57",
"text": "通关觉醒副本boss1难度2" "text": "装备副本boss3难度1(开支线，打狩猎)"
}, },
"npc": 10570, "npc": 10570,
"completetask": [ "completetask": [
@ -2064,15 +2066,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_58", "key": "worldtask_world_task_task_name_58",
"text": "守护者觉醒1次" "text": "主角星座觉醒3次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_58", "key": "worldtask_world_task_task_details_58",
"text": "守护者觉醒1次" "text": "主角星座觉醒3次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_58", "key": "worldtask_world_task_npctxt_58",
"text": "守护者觉醒1次" "text": "主角星座觉醒3次"
}, },
"npc": 10580, "npc": 10580,
"completetask": [ "completetask": [
@ -2136,15 +2138,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_60", "key": "worldtask_world_task_task_name_60",
"text": "战斗21" "text": "战斗20"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_60", "key": "worldtask_world_task_task_details_60",
"text": "战斗21" "text": "战斗20"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_60", "key": "worldtask_world_task_npctxt_60",
"text": "战斗21" "text": "战斗20"
}, },
"npc": 10600, "npc": 10600,
"completetask": [ "completetask": [
@ -2172,15 +2174,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_61", "key": "worldtask_world_task_task_name_61",
"text": "战斗22" "text": "战斗21"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_61", "key": "worldtask_world_task_task_details_61",
"text": "战斗22" "text": "战斗21"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_61", "key": "worldtask_world_task_npctxt_61",
"text": "战斗22" "text": "战斗21"
}, },
"npc": 10610, "npc": 10610,
"completetask": [ "completetask": [
@ -2280,15 +2282,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_64", "key": "worldtask_world_task_task_name_64",
"text": "装备副本boss2难度2刷1次" "text": "装备副本boss3难度1刷1次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_64", "key": "worldtask_world_task_task_details_64",
"text": "装备副本boss2难度2刷1次" "text": "装备副本boss3难度1刷1次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_64", "key": "worldtask_world_task_npctxt_64",
"text": "装备副本boss2难度2刷1次" "text": "装备副本boss3难度1刷1次"
}, },
"npc": 10640, "npc": 10640,
"completetask": [ "completetask": [
@ -2460,15 +2462,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_69", "key": "worldtask_world_task_task_name_69",
"text": "战斗23" "text": "战斗22"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_69", "key": "worldtask_world_task_task_details_69",
"text": "战斗23" "text": "战斗22"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_69", "key": "worldtask_world_task_npctxt_69",
"text": "战斗23" "text": "战斗22"
}, },
"npc": 10690, "npc": 10690,
"completetask": [ "completetask": [
@ -2496,15 +2498,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_70", "key": "worldtask_world_task_task_name_70",
"text": "战斗24" "text": "战斗23"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_70", "key": "worldtask_world_task_task_details_70",
"text": "战斗24" "text": "战斗23"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_70", "key": "worldtask_world_task_npctxt_70",
"text": "战斗24" "text": "战斗23"
}, },
"npc": 10700, "npc": 10700,
"completetask": [ "completetask": [
@ -2640,15 +2642,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_74", "key": "worldtask_world_task_task_name_74",
"text": "通关觉醒boss2通关难度2" "text": "装备副本boss3难度5刷2次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_74", "key": "worldtask_world_task_task_details_74",
"text": "通关觉醒boss2通关难度2" "text": "装备副本boss3难度5刷2次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_74", "key": "worldtask_world_task_npctxt_74",
"text": "通关觉醒boss2通关难度2" "text": "装备副本boss3难度5刷2次"
}, },
"npc": 10740, "npc": 10740,
"completetask": [ "completetask": [
@ -2676,15 +2678,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_75", "key": "worldtask_world_task_task_name_75",
"text": "收集25个觉醒材料" "text": "守护者星座图解锁次数10次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_75", "key": "worldtask_world_task_task_details_75",
"text": "收集25个觉醒材料" "text": "守护者星座图解锁次数10次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_75", "key": "worldtask_world_task_npctxt_75",
"text": "收集25个觉醒材料" "text": "守护者星座图解锁次数10次"
}, },
"npc": 10750, "npc": 10750,
"completetask": [ "completetask": [
@ -2712,15 +2714,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_76", "key": "worldtask_world_task_task_name_76",
"text": "1个守护者觉醒到3阶段" "text": "守护者星座图解锁次数15次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_76", "key": "worldtask_world_task_task_details_76",
"text": "1个守护者觉醒到3阶段" "text": "守护者星座图解锁次数15次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_76", "key": "worldtask_world_task_npctxt_76",
"text": "1个守护者觉醒到3阶段" "text": "守护者星座图解锁次数15次"
}, },
"npc": 10760, "npc": 10760,
"completetask": [ "completetask": [
@ -2856,15 +2858,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_80", "key": "worldtask_world_task_task_name_80",
"text": "通关觉醒boss3通关难度2" "text": "装备副本boss4难度2刷1次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_80", "key": "worldtask_world_task_task_details_80",
"text": "通关觉醒boss3通关难度2" "text": "装备副本boss4难度2刷1次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_80", "key": "worldtask_world_task_npctxt_80",
"text": "通关觉醒boss3通关难度2" "text": "装备副本boss4难度2刷1次"
}, },
"npc": 10800, "npc": 10800,
"completetask": [ "completetask": [
@ -2892,15 +2894,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_81", "key": "worldtask_world_task_task_name_81",
"text": "3个守护者觉醒3阶" "text": "守护者星座图解锁解锁30次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_81", "key": "worldtask_world_task_task_details_81",
"text": "3个守护者觉醒3阶" "text": "守护者星座图解锁解锁30次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_81", "key": "worldtask_world_task_npctxt_81",
"text": "3个守护者觉醒3阶" "text": "守护者星座图解锁解锁30次"
}, },
"npc": 10810, "npc": 10810,
"completetask": [ "completetask": [
@ -3072,15 +3074,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_86", "key": "worldtask_world_task_task_name_86",
"text": "装备副本boss3难度2刷1次" "text": "装备副本boss4难度4刷1次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_86", "key": "worldtask_world_task_task_details_86",
"text": "装备副本boss3难度2刷1次" "text": "装备副本boss4难度4刷1次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_86", "key": "worldtask_world_task_npctxt_86",
"text": "装备副本boss3难度2刷1次" "text": "装备副本boss4难度4刷1次"
}, },
"npc": 10860, "npc": 10860,
"completetask": [ "completetask": [
@ -3180,15 +3182,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_89", "key": "worldtask_world_task_task_name_89",
"text": "4个守护者觉醒3阶段" "text": "守护者星座图解锁50次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_89", "key": "worldtask_world_task_task_details_89",
"text": "4个守护者觉醒3阶段" "text": "守护者星座图解锁50次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_89", "key": "worldtask_world_task_npctxt_89",
"text": "4个守护者觉醒3阶段" "text": "守护者星座图解锁50次"
}, },
"npc": 10890, "npc": 10890,
"completetask": [ "completetask": [
@ -3252,15 +3254,15 @@
"icon": "", "icon": "",
"task_name": { "task_name": {
"key": "worldtask_world_task_task_name_91", "key": "worldtask_world_task_task_name_91",
"text": "装备副本boss4难度2刷1次" "text": "装备副本boss4难度6刷1次"
}, },
"task_details": { "task_details": {
"key": "worldtask_world_task_task_details_91", "key": "worldtask_world_task_task_details_91",
"text": "装备副本boss4难度2刷1次" "text": "装备副本boss4难度6刷1次"
}, },
"npctxt": { "npctxt": {
"key": "worldtask_world_task_npctxt_91", "key": "worldtask_world_task_npctxt_91",
"text": "装备副本boss4难度2刷1次" "text": "装备副本boss4难度6刷1次"
}, },
"npc": 10910, "npc": 10910,
"completetask": [ "completetask": [

24
modules/hero/api_drawCard.go
View File

@ -321,27 +321,25 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq
rsp := &pb.HeroDrawCardResp{ rsp := &pb.HeroDrawCardResp{
Data: []*pb.AtnoData{}, Data: []*pb.AtnoData{},
} }
var addRes []*cfg.Gameatn
for _, heroId := range szCards { for _, heroId := range szCards {
addRes = append(addRes, &cfg.Gameatn{
if errdata, atno = this.module.DispenseAtno(session, []*cfg.Gameatn{{
A: "hero", A: "hero",
T: heroId, T: heroId,
N: 1, N: 1,
}) }}, true); errdata == nil {
}
if errdata, atno = this.module.DispenseAtno(session, addRes, true); errdata == nil { rsp.Data = append(rsp.Data, &pb.AtnoData{Atno: atno})
for _, v := range atno {
rsp.Data = append(rsp.Data, &pb.AtnoData{Atno: atno}) if v.A == "hero" && v.N == 1 {
for _, v := range atno { if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { // 广播 首次获得英雄
if v.A == "hero" && v.N == 1 { this.chat.SendSysChatToWorld(comm.ChatSystem13, nil, 0, 0, user.Name, v.T)
if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { // 广播 首次获得英雄 }
this.chat.SendSysChatToWorld(comm.ChatSystem13, nil, 0, 0, user.Name, v.T)
} }
} }
} else {
return
} }
} else {
return
} }
session.SendMsg(string(this.module.GetType()), DrawCard, rsp) session.SendMsg(string(this.module.GetType()), DrawCard, rsp)

6
modules/hero/api_fusion.go
View File

@ -53,7 +53,7 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e
for k, v := range req.Heros { for k, v := range req.Heros {
// 校验英雄是否存在 // 校验英雄是否存在
_obj, c := this.module.GetHeroByObjID(session.GetUserId(), k) _obj, c := this.module.GetHeroByObjID(session.GetUserId(), k)
if c != nil || _obj.SameCount < v { if c != nil {
errdata = c errdata = c
return return
} }
@ -80,9 +80,9 @@ func (this *apiComp) Fusion(session comm.IUserSession, req *pb.HeroFusionReq) (e
return return
} }
} }
for k, v := range req.Heros { for k, _ := range req.Heros {
//mapHero[_costMaphero[k].HeroID] //mapHero[_costMaphero[k].HeroID]
if errdata = this.module.DelCard(session.GetUserId(), _costMaphero[k], v); errdata != nil { if errdata = this.module.DelCard(session.GetUserId(), _costMaphero[k]); errdata != nil {
return return
} }
ChangeList = append(ChangeList, _costMaphero[k]) ChangeList = append(ChangeList, _costMaphero[k])

27
modules/hero/model_hero.go
View File

@ -55,7 +55,6 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
CardType: heroCfg.Type, //卡片类型 CardType: heroCfg.Type, //卡片类型
Skins: []int32{}, Skins: []int32{},
EquipID: make([]string, 8), //初始装备 EquipID: make([]string, 8), //初始装备
SameCount: 1, //默认叠加数量
AddProperty: make(map[string]int32), AddProperty: make(map[string]int32),
Property: make(map[string]int32), Property: make(map[string]int32),
JuexProperty: make(map[string]int32), JuexProperty: make(map[string]int32),
@ -140,7 +139,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int
) )
hero = this.InitHero(uid, heroCfgId) hero = this.InitHero(uid, heroCfgId)
if hero != nil { if hero != nil {
hero.SameCount = 1 // 新需求 不需要判断叠加
if this.module.IsCross() { if this.module.IsCross() {
if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil { if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
@ -170,32 +169,17 @@ func (this *ModelHero) getOneHero(uid, heroId string) *pb.DBHero {
} }
//消耗英雄卡 //消耗英雄卡
func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero, count int32) (err error) { func (this *ModelHero) consumeHeroCard(uid string, hero *pb.DBHero) (err error) {
if count == 0 {
return
}
if hero == nil { if hero == nil {
err = errors.New("hero no exist") err = errors.New("hero no exist")
return return
} }
if hero.SameCount < count { if err := this.DelListlds(uid, []string{hero.Id}); err != nil {
err = errors.New("hero card no enough") this.module.Errorf("%v", err)
return
} }
hero.SameCount -= count // 数量-1 this.module.Debugf("删除卡牌uid:%s,卡牌ID:%s", uid, hero.Id)
if hero.SameCount == 0 {
if err := this.DelListlds(uid, []string{hero.Id}); err != nil {
this.module.Errorf("%v", err)
}
} else {
update := map[string]interface{}{
"sameCount": hero.SameCount,
}
err = this.ChangeList(uid, hero.Id, update)
}
this.module.Debugf("删除%d张卡牌uid:%s,卡牌ID:%s", count, uid, hero.Id)
return return
} }
@ -661,7 +645,6 @@ func (this *ModelHero) InitMonsterHero(heroCfgId string, star, lv int32) *pb.DBH
CardType: heroCfg.Type, //卡片类型 CardType: heroCfg.Type, //卡片类型
Skins: []int32{}, Skins: []int32{},
EquipID: make([]string, 8), //初始装备 EquipID: make([]string, 8), //初始装备
SameCount: 1, //默认叠加数量
AddProperty: make(map[string]int32), AddProperty: make(map[string]int32),
Property: make(map[string]int32), Property: make(map[string]int32),
JuexProperty: make(map[string]int32), JuexProperty: make(map[string]int32),

6
modules/hero/module.go
View File

@ -172,8 +172,8 @@ func (this *Hero) QueryHeroByConfId(uId string, heroCfgId string) (hero *pb.DBHe
} }
// 删除指定卡牌 // 删除指定卡牌
func (this *Hero) DelCard(udi string, hero *pb.DBHero, amount int32) (errdata *pb.ErrorData) { func (this *Hero) DelCard(udi string, hero *pb.DBHero) (errdata *pb.ErrorData) {
err := this.modelHero.consumeHeroCard(udi, hero, amount) err := this.modelHero.consumeHeroCard(udi, hero)
if err != nil { if err != nil {
errdata = &pb.ErrorData{ errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, Code: pb.ErrorCode_DBError,
@ -239,7 +239,6 @@ func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string,
} }
hero.Lv = lv hero.Lv = lv
hero.Star = star hero.Star = star
hero.SameCount = 1
_heroMap := map[string]interface{}{ _heroMap := map[string]interface{}{
"lv": hero.Lv, "lv": hero.Lv,
"star": hero.Star, "star": hero.Star,
@ -700,7 +699,6 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (errdata *pb.ErrorDat
hero.Lv = maxLv hero.Lv = maxLv
hero.Star = maxStar hero.Star = maxStar
hero.JuexingLv = int32(maxJux) hero.JuexingLv = int32(maxJux)
hero.SameCount = 1
this.modelHero.PropertyCompute(hero) // 重新计算属性 this.modelHero.PropertyCompute(hero) // 重新计算属性
_heroMap := map[string]interface{}{ _heroMap := map[string]interface{}{
"lv": hero.Lv, "lv": hero.Lv,

2
modules/hunting/api_challenge.go
View File

@ -47,7 +47,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen
return return
} }
if v1, ok := hunting.Ps[req.BossType]; ok && v1 == 0 { if v1, ok := hunting.Ps[req.BossType]; ok && v1 != 0 {
if errdata = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 if errdata = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点

10
modules/hunting/api_challengeover.go
View File

@ -1,7 +1,6 @@
package hunting package hunting
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
@ -75,14 +74,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
} }
errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report) errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report)
if v, ok := hunting.Ps[req.BossType]; !ok || v == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_HuntingLvErr,
Title: pb.ErrorCode_HuntingLvErr.ToString(),
Message: fmt.Sprintf("关卡体力参数异常:%s,预扣体力:%d", session.GetUserId(), v),
}
return
}
hunting.Ps[req.BossType] = 0 // 清空预扣体力值 hunting.Ps[req.BossType] = 0 // 清空预扣体力值
mapData["ps"] = hunting.Ps mapData["ps"] = hunting.Ps

2
modules/mline/api_challenge.go
View File

@ -80,7 +80,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MlineChallenge
} }
} }
if v1, ok := curChapter.Ps[req.StageId]; ok && v1 == 0 { if v1, ok := curChapter.Ps[req.StageId]; ok && v1 != 0 {
if errdata = this.module.ConsumeRes(session, stageConf.PsMg, true); errdata != nil { // 扣1点 if errdata = this.module.ConsumeRes(session, stageConf.PsMg, true); errdata != nil { // 扣1点
return return
} }

17
modules/mline/api_challengeover.go
View File

@ -1,7 +1,6 @@
package mline package mline
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
@ -67,14 +66,14 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall
if errdata != nil { if errdata != nil {
return return
} }
if v, ok := curChapter.Ps[req.StageId]; !ok || v == 0 { // if v, ok := curChapter.Ps[req.StageId]; !ok || v == 0 {
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_HuntingLvErr, // Code: pb.ErrorCode_HuntingLvErr,
Title: pb.ErrorCode_HuntingLvErr.ToString(), // Title: pb.ErrorCode_HuntingLvErr.ToString(),
Message: fmt.Sprintf("关卡体力参数异常,uid:%s,预扣体力:%d", session.GetUserId(), v), // Message: fmt.Sprintf("关卡体力参数异常,uid:%s,预扣体力:%d", session.GetUserId(), v),
} // }
return // return
} // }
curChapter.Ps[req.StageId] = 0 // 清空预扣体力值 curChapter.Ps[req.StageId] = 0 // 清空预扣体力值
update["ps"] = curChapter.Ps update["ps"] = curChapter.Ps
if !isWin { // 战斗失败返还扣除的体力 if !isWin { // 战斗失败返还扣除的体力

33
modules/mline/module.go
View File

@ -114,26 +114,25 @@ func (this *Mline) ModifyMlineDataByNanduID(session comm.IUserSession, id int32)
// 清除 // 清除
this.modelMline.cleanChapterDataById(session.GetUserId(), del...) this.modelMline.cleanChapterDataById(session.GetUserId(), del...)
_data := this.configure.GetAllChapterID() _data := this.configure.GetAllStageByChapterID(connf.Chapterid)
newData := &pb.DBMline{
Id: primitive.NewObjectID().Hex(),
Uid: session.GetUserId(),
CType: connf.Episodetype,
ChapterId: connf.Chapterid,
StageId: id,
Star: map[int32]int32{},
Award: map[int32]bool{},
Ps: map[int32]int32{},
}
for _, v := range _data { for _, v := range _data {
if v <= connf.Chapterid { if v <= id {
newData := &pb.DBMline{ newData.Star[v] = 3
Id: primitive.NewObjectID().Hex(),
Uid: session.GetUserId(),
CType: connf.Episodetype,
ChapterId: v,
StageId: id,
Star: map[int32]int32{},
Award: map[int32]bool{},
Ps: map[int32]int32{},
}
stageConf := this.configure.GetAllStageByChapterID(v)
for _, v := range stageConf {
newData.Star[v] = 3
}
this.modelMline.addNewChapter(session.GetUserId(), newData)
} }
} }
this.modelMline.addNewChapter(session.GetUserId(), newData)
// 修改扩展数据 // 修改扩展数据
if rst, err := this.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 统计主线进度 if rst, err := this.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 统计主线进度
_mp := rst.Mline _mp := rst.Mline

2
modules/viking/api_challenge.go
View File

@ -38,7 +38,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
return return
} }
if v1, ok := viking.Ps[req.BossId]; ok && v1 == 0 { if v1, ok := viking.Ps[req.BossId]; ok && v1 != 0 {
if errdata = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点 if errdata = this.module.ConsumeRes(session, cfgData.PsMg, true); errdata != nil { // 扣1点
return return
} }

10
modules/viking/api_challengeover.go
View File

@ -1,7 +1,6 @@
package viking package viking
import ( import (
"fmt"
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
@ -78,14 +77,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
} }
errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report) errdata, bWin = this.module.battle.CheckBattleReport(session, req.Report)
if v, ok := viking.Ps[req.BossId]; !ok || v == 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_VikingStagePsErr,
Title: pb.ErrorCode_VikingStagePsErr.ToString(),
Message: fmt.Sprintf("关卡体力参数异常,uid:%s,预扣体力:%d", session.GetUserId(), v),
}
return
}
viking.Ps[req.BossId] = 0 // 清空预扣体力值 viking.Ps[req.BossId] = 0 // 清空预扣体力值
mapData["ps"] = viking.Ps mapData["ps"] = viking.Ps
if !bWin { // 战斗失败了 直接返回 if !bWin { // 战斗失败了 直接返回

4
modules/worldtask/api_trigger.go
View File

@ -31,15 +31,19 @@ func (this *apiComp) Trigger(session comm.IUserSession, req *pb.WorldtaskTrigger
conds := []int32{} conds := []int32{}
switch len(req.Params) { switch len(req.Params) {
case 2: case 2:
conds = make([]int32, 1)
conds[0] = req.Params[1] conds[0] = req.Params[1]
case 3: case 3:
conds = make([]int32, 2)
conds[0] = req.Params[1] conds[0] = req.Params[1]
conds[1] = req.Params[2] conds[1] = req.Params[2]
case 4: case 4:
conds = make([]int32, 3)
conds[0] = req.Params[1] conds[0] = req.Params[1]
conds[1] = req.Params[2] conds[1] = req.Params[2]
conds[2] = req.Params[3] conds[2] = req.Params[3]
case 5: case 5:
conds = make([]int32, 4)
conds[0] = req.Params[1] conds[0] = req.Params[1]
conds[1] = req.Params[2] conds[1] = req.Params[2]
conds[2] = req.Params[3] conds[2] = req.Params[3]

10
pb/battle_struct.pb.go
View File

@ -31,6 +31,7 @@ const (
EffectTipsType_Not_Control EffectTipsType = 5 //免疫控制 EffectTipsType_Not_Control EffectTipsType = 5 //免疫控制
EffectTipsType_Not_Action EffectTipsType = 6 //无法行动 EffectTipsType_Not_Action EffectTipsType = 6 //无法行动
EffectTipsType_Purification EffectTipsType = 7 //净化 EffectTipsType_Purification EffectTipsType = 7 //净化
EffectTipsType_Disperse EffectTipsType = 8 //驱散
) )
// Enum value maps for EffectTipsType. // Enum value maps for EffectTipsType.
@ -44,6 +45,7 @@ var (
5: "Not_Control", 5: "Not_Control",
6: "Not_Action", 6: "Not_Action",
7: "Purification", 7: "Purification",
8: "Disperse",
} }
EffectTipsType_value = map[string]int32{ EffectTipsType_value = map[string]int32{
"Eff_Success": 0, "Eff_Success": 0,
@ -54,6 +56,7 @@ var (
"Not_Control": 5, "Not_Control": 5,
"Not_Action": 6, "Not_Action": 6,
"Purification": 7, "Purification": 7,
"Disperse": 8,
} }
) )
@ -1821,7 +1824,7 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a,
0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x8d, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2a, 0x9b, 0x01, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74,
0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f,
0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74,
0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d,
@ -1830,8 +1833,9 @@ var file_battle_battle_struct_proto_rawDesc = []byte{
0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f,
0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f,
0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
0x69, 0x6f, 0x6e, 0x10, 0x07, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73,
0x72, 0x6f, 0x74, 0x6f, 0x33, 0x65, 0x10, 0x08, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
} }
var ( var (

167
pb/hero_db.pb.go
View File

@ -96,7 +96,6 @@ type DBHero struct {
Fulllvenr int32 `protobuf:"varint,23,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用 Fulllvenr int32 `protobuf:"varint,23,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用
KongfuUid string `protobuf:"bytes,24,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功 KongfuUid string `protobuf:"bytes,24,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功
Fetters map[string]int32 `protobuf:"bytes,25,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成 Fetters map[string]int32 `protobuf:"bytes,25,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成
SameCount int32 `protobuf:"varint,26,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` ////叠加数
} }
func (x *DBHero) Reset() { func (x *DBHero) Reset() {
@ -306,13 +305,6 @@ func (x *DBHero) GetFetters() map[string]int32 {
return nil return nil
} }
func (x *DBHero) GetSameCount() int32 {
if x != nil {
return x.SameCount
}
return 0
}
//英雄扩展数据 //英雄扩展数据
type DBHeroRecord struct { type DBHeroRecord struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -551,7 +543,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x0a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x0a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69, 0x1a, 0x1c, 0x65, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x65, 0x71, 0x75, 0x69,
0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaa, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8c,
0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x0a, 0x0a, 0x06, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 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, 0x16, 0x0a, 0x06, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68,
@ -608,90 +600,89 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x09, 0x6b, 0x6f, 0x6e, 0x67, 0x66, 0x75, 0x55, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x07, 0x66, 0x65, 0x09, 0x6b, 0x6f, 0x6e, 0x67, 0x66, 0x75, 0x55, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x07, 0x66, 0x65,
0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42,
0x48, 0x65, 0x72, 0x6f, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x61, 0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72,
0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72,
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50,
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72,
0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 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, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05, 0x0a, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48,
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x98, 0x05,
0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e,
0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10,
0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18,
0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05,
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69,
0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74,
0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20,
0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f,
0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72,
0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09,
0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53,
0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73,
0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61,
0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f,
0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63,
0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63,
0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b,
0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06,
0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65,
0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62,
0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74,
0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62,
0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69,
0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63,
0x6f, 0x72, 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72,
0x61, 0x63, 0x65, 0x1a, 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
0x3c, 0x0a, 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48,
0x09, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72,
0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20,
0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06,
0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74,
0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x01, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75,
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x6f, 0x33,
0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e,
0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x10, 0x01,
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (