diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json
index 75160c462..6fcccacf9 100644
--- a/bin/json/game_vikingboss.json
+++ b/bin/json/game_vikingboss.json
@@ -1,7 +1,8 @@
[
{
"id": 1001,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -43,7 +44,8 @@
},
{
"id": 1002,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -90,7 +92,8 @@
},
{
"id": 1003,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -142,7 +145,8 @@
},
{
"id": 1004,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -194,7 +198,8 @@
},
{
"id": 1005,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -246,7 +251,8 @@
},
{
"id": 1006,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -298,7 +304,8 @@
},
{
"id": 1007,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -350,7 +357,8 @@
},
{
"id": 1008,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -402,7 +410,8 @@
},
{
"id": 1009,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -454,7 +463,8 @@
},
{
"id": 1010,
- "type": 1,
+ "copytype": 1,
+ "bossid": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -506,7 +516,8 @@
},
{
"id": 2001,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -548,7 +559,8 @@
},
{
"id": 2002,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -595,7 +607,8 @@
},
{
"id": 2003,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -647,7 +660,8 @@
},
{
"id": 2004,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -699,7 +713,8 @@
},
{
"id": 2005,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -751,7 +766,8 @@
},
{
"id": 2006,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -803,7 +819,8 @@
},
{
"id": 2007,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -855,7 +872,8 @@
},
{
"id": 2008,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -907,7 +925,8 @@
},
{
"id": 2009,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -959,7 +978,8 @@
},
{
"id": 2010,
- "type": 2,
+ "copytype": 1,
+ "bossid": 2,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -1011,7 +1031,8 @@
},
{
"id": 3001,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1053,7 +1074,8 @@
},
{
"id": 3002,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1100,7 +1122,8 @@
},
{
"id": 3003,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1152,7 +1175,8 @@
},
{
"id": 3004,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1204,7 +1228,8 @@
},
{
"id": 3005,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1256,7 +1281,8 @@
},
{
"id": 3006,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1308,7 +1334,8 @@
},
{
"id": 3007,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1360,7 +1387,8 @@
},
{
"id": 3008,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1412,7 +1440,8 @@
},
{
"id": 3009,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1464,7 +1493,8 @@
},
{
"id": 3010,
- "type": 3,
+ "copytype": 1,
+ "bossid": 3,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -1513,5 +1543,1035 @@
303039,
303040
]
+ },
+ {
+ "id": 11001,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 1,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "drop": 1001,
+ "bossmodel": 11009,
+ "boss": [
+ 301011,
+ 301012,
+ 301013
+ ]
+ },
+ {
+ "id": 11002,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 2,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ }
+ ],
+ "drop": 1002,
+ "bossmodel": 11009,
+ "boss": [
+ 301014,
+ 301015,
+ 301016
+ ]
+ },
+ {
+ "id": 11003,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 3,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1003,
+ "bossmodel": 11009,
+ "boss": [
+ 301017,
+ 301018,
+ 301019
+ ]
+ },
+ {
+ "id": 11004,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 4,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1004,
+ "bossmodel": 11009,
+ "boss": [
+ 301020,
+ 301021,
+ 301022
+ ]
+ },
+ {
+ "id": 11005,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 5,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1005,
+ "bossmodel": 11009,
+ "boss": [
+ 301023,
+ 301024,
+ 301025
+ ]
+ },
+ {
+ "id": 11006,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 6,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1006,
+ "bossmodel": 11009,
+ "boss": [
+ 301026,
+ 301027,
+ 301028
+ ]
+ },
+ {
+ "id": 11007,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 7,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1007,
+ "bossmodel": 11009,
+ "boss": [
+ 301029,
+ 301030,
+ 301031
+ ]
+ },
+ {
+ "id": 11008,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 8,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1008,
+ "bossmodel": 11009,
+ "boss": [
+ 301032,
+ 301033,
+ 301034
+ ]
+ },
+ {
+ "id": 11009,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 9,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1009,
+ "bossmodel": 11009,
+ "boss": [
+ 301035,
+ 301036,
+ 301037
+ ]
+ },
+ {
+ "id": 11010,
+ "copytype": 2,
+ "bossid": 11,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "武器BOSS"
+ },
+ "difficulty": 10,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1010,
+ "bossmodel": 11009,
+ "boss": [
+ 301038,
+ 301039,
+ 301040
+ ]
+ },
+ {
+ "id": 21001,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 1,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ }
+ ],
+ "drop": 1001,
+ "bossmodel": 11009,
+ "boss": [
+ 301011,
+ 301012,
+ 301013
+ ]
+ },
+ {
+ "id": 21002,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 2,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ }
+ ],
+ "drop": 1002,
+ "bossmodel": 11009,
+ "boss": [
+ 301014,
+ 301015,
+ 301016
+ ]
+ },
+ {
+ "id": 21003,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 3,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1003,
+ "bossmodel": 11009,
+ "boss": [
+ 301017,
+ 301018,
+ 301019
+ ]
+ },
+ {
+ "id": 21004,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 4,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1004,
+ "bossmodel": 11009,
+ "boss": [
+ 301020,
+ 301021,
+ 301022
+ ]
+ },
+ {
+ "id": 21005,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 5,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1005,
+ "bossmodel": 11009,
+ "boss": [
+ 301023,
+ 301024,
+ 301025
+ ]
+ },
+ {
+ "id": 21006,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 6,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1006,
+ "bossmodel": 11009,
+ "boss": [
+ 301026,
+ 301027,
+ 301028
+ ]
+ },
+ {
+ "id": 21007,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 7,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1007,
+ "bossmodel": 11009,
+ "boss": [
+ 301029,
+ 301030,
+ 301031
+ ]
+ },
+ {
+ "id": 21008,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 8,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1008,
+ "bossmodel": 11009,
+ "boss": [
+ 301032,
+ 301033,
+ 301034
+ ]
+ },
+ {
+ "id": 21009,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 9,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1009,
+ "bossmodel": 11009,
+ "boss": [
+ 301035,
+ 301036,
+ 301037
+ ]
+ },
+ {
+ "id": 21010,
+ "copytype": 3,
+ "bossid": 21,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "饰品BOSS"
+ },
+ "difficulty": 10,
+ "captionrecommend": [
+ 25001,
+ 25004,
+ 34006,
+ 35001,
+ 35002
+ ],
+ "firstprize": [
+ {
+ "a": "attr",
+ "t": "diamond",
+ "n": 100
+ }
+ ],
+ "dropshow": [
+ {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ }
+ ],
+ "drop": 1010,
+ "bossmodel": 11009,
+ "boss": [
+ 301038,
+ 301039,
+ 301040
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json
index d3265de83..81bbe44fe 100644
--- a/bin/json/game_vikingbossskill.json
+++ b/bin/json/game_vikingbossskill.json
@@ -1,6 +1,7 @@
[
{
- "type": 1,
+ "bossid": 1,
+ "copytype": 1,
"name": {
"key": "viking_boss_1001",
"text": "火焰泰坦"
@@ -16,7 +17,8 @@
]
},
{
- "type": 2,
+ "bossid": 2,
+ "copytype": 1,
"name": {
"key": "viking_boss_1002",
"text": "冰之泰坦"
@@ -32,7 +34,8 @@
]
},
{
- "type": 3,
+ "bossid": 3,
+ "copytype": 1,
"name": {
"key": "viking_boss_1003",
"text": "森林泰坦"
@@ -46,5 +49,39 @@
124004111,
144005111
]
+ },
+ {
+ "bossid": 11,
+ "copytype": 2,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "introduce": {
+ "key": "viking_boss_10001",
+ "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
+ },
+ "icon": "wjyz_img012",
+ "guardskill": [
+ 124004111,
+ 144005111
+ ]
+ },
+ {
+ "bossid": 12,
+ "copytype": 3,
+ "name": {
+ "key": "viking_boss_1001",
+ "text": "火焰泰坦"
+ },
+ "introduce": {
+ "key": "viking_boss_20001",
+ "text": "熔岩泰坦巨人来自于遥远的火山，它的火焰属性使得所到之处，一片荒芜"
+ },
+ "icon": "wjyz_img012",
+ "guardskill": [
+ 124004111,
+ 144005111
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_vikinglineup.json b/bin/json/game_vikinglineup.json
new file mode 100644
index 000000000..48b2dfec6
--- /dev/null
+++ b/bin/json/game_vikinglineup.json
@@ -0,0 +1,302 @@
+[
+ {
+ "id": 1001,
+ "robotid": 10001,
+ "difficulty": 1,
+ "time": 30
+ },
+ {
+ "id": 1002,
+ "robotid": 10002,
+ "difficulty": 2,
+ "time": 31
+ },
+ {
+ "id": 1003,
+ "robotid": 10003,
+ "difficulty": 3,
+ "time": 32
+ },
+ {
+ "id": 1004,
+ "robotid": 10004,
+ "difficulty": 4,
+ "time": 33
+ },
+ {
+ "id": 1005,
+ "robotid": 10005,
+ "difficulty": 5,
+ "time": 34
+ },
+ {
+ "id": 1006,
+ "robotid": 10006,
+ "difficulty": 6,
+ "time": 35
+ },
+ {
+ "id": 1007,
+ "robotid": 10007,
+ "difficulty": 7,
+ "time": 36
+ },
+ {
+ "id": 1008,
+ "robotid": 10008,
+ "difficulty": 8,
+ "time": 37
+ },
+ {
+ "id": 1009,
+ "robotid": 10009,
+ "difficulty": 9,
+ "time": 38
+ },
+ {
+ "id": 1010,
+ "robotid": 10010,
+ "difficulty": 10,
+ "time": 39
+ },
+ {
+ "id": 2001,
+ "robotid": 10011,
+ "difficulty": 1,
+ "time": 40
+ },
+ {
+ "id": 2002,
+ "robotid": 10012,
+ "difficulty": 2,
+ "time": 41
+ },
+ {
+ "id": 2003,
+ "robotid": 10013,
+ "difficulty": 3,
+ "time": 42
+ },
+ {
+ "id": 2004,
+ "robotid": 10014,
+ "difficulty": 4,
+ "time": 43
+ },
+ {
+ "id": 2005,
+ "robotid": 10015,
+ "difficulty": 5,
+ "time": 44
+ },
+ {
+ "id": 2006,
+ "robotid": 10016,
+ "difficulty": 6,
+ "time": 45
+ },
+ {
+ "id": 2007,
+ "robotid": 10017,
+ "difficulty": 7,
+ "time": 46
+ },
+ {
+ "id": 2008,
+ "robotid": 10018,
+ "difficulty": 8,
+ "time": 47
+ },
+ {
+ "id": 2009,
+ "robotid": 10019,
+ "difficulty": 9,
+ "time": 48
+ },
+ {
+ "id": 2010,
+ "robotid": 10020,
+ "difficulty": 10,
+ "time": 49
+ },
+ {
+ "id": 3001,
+ "robotid": 10021,
+ "difficulty": 1,
+ "time": 50
+ },
+ {
+ "id": 3002,
+ "robotid": 10022,
+ "difficulty": 2,
+ "time": 51
+ },
+ {
+ "id": 3003,
+ "robotid": 10023,
+ "difficulty": 3,
+ "time": 52
+ },
+ {
+ "id": 3004,
+ "robotid": 10024,
+ "difficulty": 4,
+ "time": 53
+ },
+ {
+ "id": 3005,
+ "robotid": 10025,
+ "difficulty": 5,
+ "time": 54
+ },
+ {
+ "id": 3006,
+ "robotid": 10026,
+ "difficulty": 6,
+ "time": 55
+ },
+ {
+ "id": 3007,
+ "robotid": 10027,
+ "difficulty": 7,
+ "time": 56
+ },
+ {
+ "id": 3008,
+ "robotid": 10028,
+ "difficulty": 8,
+ "time": 57
+ },
+ {
+ "id": 3009,
+ "robotid": 10029,
+ "difficulty": 9,
+ "time": 58
+ },
+ {
+ "id": 3010,
+ "robotid": 10030,
+ "difficulty": 10,
+ "time": 59
+ },
+ {
+ "id": 11001,
+ "robotid": 10031,
+ "difficulty": 1,
+ "time": 60
+ },
+ {
+ "id": 11002,
+ "robotid": 10032,
+ "difficulty": 2,
+ "time": 61
+ },
+ {
+ "id": 11003,
+ "robotid": 10033,
+ "difficulty": 3,
+ "time": 62
+ },
+ {
+ "id": 11004,
+ "robotid": 10034,
+ "difficulty": 4,
+ "time": 63
+ },
+ {
+ "id": 11005,
+ "robotid": 10035,
+ "difficulty": 5,
+ "time": 64
+ },
+ {
+ "id": 11006,
+ "robotid": 10036,
+ "difficulty": 6,
+ "time": 65
+ },
+ {
+ "id": 11007,
+ "robotid": 10037,
+ "difficulty": 7,
+ "time": 66
+ },
+ {
+ "id": 11008,
+ "robotid": 10038,
+ "difficulty": 8,
+ "time": 67
+ },
+ {
+ "id": 11009,
+ "robotid": 10039,
+ "difficulty": 9,
+ "time": 68
+ },
+ {
+ "id": 11010,
+ "robotid": 10040,
+ "difficulty": 10,
+ "time": 69
+ },
+ {
+ "id": 21001,
+ "robotid": 10041,
+ "difficulty": 1,
+ "time": 70
+ },
+ {
+ "id": 21002,
+ "robotid": 10042,
+ "difficulty": 2,
+ "time": 71
+ },
+ {
+ "id": 21003,
+ "robotid": 10043,
+ "difficulty": 3,
+ "time": 72
+ },
+ {
+ "id": 21004,
+ "robotid": 10044,
+ "difficulty": 4,
+ "time": 73
+ },
+ {
+ "id": 21005,
+ "robotid": 10045,
+ "difficulty": 5,
+ "time": 74
+ },
+ {
+ "id": 21006,
+ "robotid": 10046,
+ "difficulty": 6,
+ "time": 75
+ },
+ {
+ "id": 21007,
+ "robotid": 10047,
+ "difficulty": 7,
+ "time": 76
+ },
+ {
+ "id": 21008,
+ "robotid": 10048,
+ "difficulty": 8,
+ "time": 77
+ },
+ {
+ "id": 21009,
+ "robotid": 10049,
+ "difficulty": 9,
+ "time": 78
+ },
+ {
+ "id": 21010,
+ "robotid": 10050,
+ "difficulty": 10,
+ "time": 79
+ }
+]
\ No newline at end of file
diff --git a/modules/viking/api_challenge.go b/modules/viking/api_challenge.go
index e3af48bbe..97b44537b 100644
--- a/modules/viking/api_challenge.go
+++ b/modules/viking/api_challenge.go
@@ -9,7 +9,7 @@ import (
//参数校验
func (this *apiComp) ChallengeCheck(session comm.IUserSession, req *pb.VikingChallengeReq) (code pb.ErrorCode) {
- if req.BossType <= 0 && req.Difficulty > 0 || req.Leadpos >= 5 || len(req.Teamids) != 5 || req.Leadpos < 0 {
+ if req.BossId <= 0 && req.Difficulty > 0 || req.Leadpos >= 5 || len(req.Teamids) != 5 || req.Leadpos < 0 {
code = pb.ErrorCode_ReqParameterError
return
}
@@ -32,15 +32,15 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
code = pb.ErrorCode_VikingMaxChallengeCount
return
}
- cfgData := this.module.configure.GetVikingBossConfigData(req.BossType, req.Difficulty)
+ cfgData := this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty)
if cfgData == nil {
code = pb.ErrorCode_ConfigNoFound
return
}
- value, ok := viking.Boss[req.BossType]
+ value, ok := viking.Boss[req.BossId]
if !ok { // 类型校验
- viking.Boss[req.BossType] = 0
+ viking.Boss[req.BossId] = 0
}
if value < req.Difficulty {
if value+1 != req.Difficulty {
@@ -63,7 +63,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.VikingChalleng
}
session.SendMsg(string(this.module.GetType()), VikingChallengeResp, &pb.VikingChallengeResp{
Info: &pb.BattleInfo{Id: record.Id, Title: record.Title, Btype: record.Btype, Ptype: record.Ptype, RedCompId: record.RedCompId, Redflist: record.Redflist, BlueCompId: record.BlueCompId, Buleflist: record.Buleflist},
- BossType: req.BossType,
+ BossId: req.BossId,
Difficulty: req.Difficulty,
})
return
diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go
index 166566e6d..a41dacc9d 100644
--- a/modules/viking/api_challengeover.go
+++ b/modules/viking/api_challengeover.go
@@ -10,7 +10,7 @@ import (
//参数校验
func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.VikingChallengeOverReq) (code pb.ErrorCode) {
- if req.BossType <= 0 && req.Difficulty > 0 {
+ if req.BossId <= 0 && req.Difficulty > 0 {
code = pb.ErrorCode_ReqParameterError
return
}
@@ -41,15 +41,15 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
code = pb.ErrorCode_VikingMaxChallengeCount
return
}
- cfg := this.module.configure.GetVikingBossConfigData(req.BossType, req.Difficulty)
+ cfg := this.module.configure.GetVikingBossConfigData(req.BossId, req.Difficulty)
if cfg == nil {
code = pb.ErrorCode_ConfigNoFound
return
}
- value, ok := viking.Boss[req.BossType]
+ value, ok := viking.Boss[req.BossId]
if !ok { // 类型校验
- viking.Boss[req.BossType] = 0
+ viking.Boss[req.BossId] = 0
}
if value < req.Difficulty {
if value+1 != req.Difficulty {
@@ -62,7 +62,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
if code = this.module.DispenseRes(session, cfg.Firstprize, true); code != pb.ErrorCode_Success {
return
}
- viking.Boss[req.BossType] += 1
+ viking.Boss[req.BossId] += 1
mapData["boss"] = viking.Boss
}
if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 && value == req.Difficulty {
@@ -77,7 +77,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
}
}
// 刷新难度最高的记录
- this.module.modulerank.updateVikingRankList(session, req.Difficulty, req.BossType, req.Report.Info.Redflist[0].Leadpos, sz, req.Report.Costtime)
+ this.module.modulerank.updateVikingRankList(session, req.Difficulty, req.BossId, req.Report.Info.Redflist[0].Leadpos, sz, req.Report.Costtime)
}
// 耗时校验 当前战斗胜利时间消耗小于之前刷新数据
code, _ = this.module.battle.CheckBattleReport(session, req.Report)
diff --git a/modules/viking/comp_configure.go b/modules/viking/comp_configure.go
index 586b6ad42..29725bfe6 100644
--- a/modules/viking/comp_configure.go
+++ b/modules/viking/comp_configure.go
@@ -32,7 +32,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
this.hlock.Lock()
defer this.hlock.Unlock()
for _, value := range configure.GetDataList() {
- this._vikingMap[int64(value.Type<<16)+int64(value.Difficulty)] = value
+ this._vikingMap[int64(value.Bossid<<16)+int64(value.Difficulty)] = value
}
return
}
@@ -48,9 +48,9 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
}
// 参数: boss类型 难度
-func (this *configureComp) GetVikingBossConfigData(bossType int32, difficulty int32) (data *cfg.GameVikingBossData) {
+func (this *configureComp) GetVikingBossConfigData(bossId int32, difficulty int32) (data *cfg.GameVikingBossData) {
- return this._vikingMap[int64(bossType<<16)+int64(difficulty)]
+ return this._vikingMap[int64(bossId<<16)+int64(difficulty)]
}
//加载多个配置文件
@@ -79,8 +79,8 @@ func (this *configureComp) GetVikingBossTypeConfigData() map[int32]struct{} {
this.hlock.Lock()
defer this.hlock.Unlock()
for _, value := range configure.GetDataList() {
- if _, ok := mapType[value.Type]; !ok {
- ipos := value.Type
+ if _, ok := mapType[value.Bossid]; !ok {
+ ipos := value.Bossid
mapType[ipos] = struct{}{}
}
}
diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go
index 5193b2131..604d55590 100644
--- a/pb/battle_db.pb.go
+++ b/pb/battle_db.pb.go
@@ -249,9 +249,8 @@ type BattleRole struct {
MainSuitSkill int32 `protobuf:"varint,8,opt,name=mainSuitSkill,proto3" json:"mainSuitSkill" bson:"mainSuitSkill"` /// 主套装技能
SubSuitSkill int32 `protobuf:"varint,9,opt,name=subSuitSkill,proto3" json:"subSuitSkill" bson:"subSuitSkill"` /// 副套装技能
NormalSkill []*SkillData `protobuf:"bytes,10,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能
- EquipSkill []*SkillData `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"normalSkill"` //普通技能
- Property map[string]int32 `protobuf:"bytes,12,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
- Ishelp bool `protobuf:"varint,13,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄
+ Property map[string]int32 `protobuf:"bytes,11,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
+ Ishelp bool `protobuf:"varint,12,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄
}
func (x *BattleRole) Reset() {
@@ -356,13 +355,6 @@ func (x *BattleRole) GetNormalSkill() []*SkillData {
return nil
}
-func (x *BattleRole) GetEquipSkill() []*SkillData {
- if x != nil {
- return x.EquipSkill
- }
- return nil
-}
-
func (x *BattleRole) GetProperty() map[string]int32 {
if x != nil {
return x.Property
@@ -573,84 +565,82 @@ var File_battle_battle_db_proto protoreflect.FileDescriptor
var file_battle_battle_db_proto_rawDesc = []byte{
0x0a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f,
- 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70,
- 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd2, 0x03, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
- 0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72,
- 0x6f, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49,
- 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e,
- 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70,
- 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x69,
- 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05,
- 0x52, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12,
- 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18,
- 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b,
- 0x69, 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69,
- 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
- 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c,
- 0x6c, 0x12, 0x2a, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18,
- 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74,
- 0x61, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x35, 0x0a,
- 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x19, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f,
- 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70,
- 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x0d,
- 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x1a, 0x3b, 0x0a, 0x0d,
- 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, 0x22, 0x4a, 0x0a, 0x0d, 0x44, 0x42, 0x42,
- 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65,
- 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61,
- 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52,
- 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xa7, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74,
- 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c,
- 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21,
- 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e,
- 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70,
- 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e,
- 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79,
- 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x74,
- 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12,
- 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a,
- 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32,
- 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52,
- 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75,
- 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62,
- 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c,
- 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44,
- 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75,
- 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64,
- 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44,
- 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f, 0x75,
- 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75,
- 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
- 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2a,
- 0x30, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a,
- 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12,
- 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10,
- 0x03, 0x2a, 0x6e, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a,
- 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c,
- 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10,
- 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07,
- 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b,
- 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e,
- 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10,
- 0x07, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74,
- 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64,
- 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f,
- 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03,
- 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42,
- 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x68, 0x65, 0x72, 0x6f, 0x2f, 0x68,
+ 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa6, 0x03, 0x0a,
+ 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a,
+ 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12,
+ 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f,
+ 0x73, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61,
+ 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a,
+ 0x02, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a,
+ 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c,
+ 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69,
+ 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x75,
+ 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x53, 0x75,
+ 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x73,
+ 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x0b, 0x6e,
+ 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f,
+ 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x35, 0x0a, 0x08, 0x70, 0x72, 0x6f,
+ 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x42, 0x61,
+ 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
+ 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
+ 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08,
+ 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, 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, 0x22, 0x4a, 0x0a, 0x0d, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c,
+ 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f,
+ 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
+ 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
+ 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x74, 0x65, 0x61,
+ 0x6d, 0x22, 0xa7, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,
+ 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74,
+ 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
+ 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a,
+ 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50,
+ 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16,
+ 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+ 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18,
+ 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53,
+ 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72,
+ 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+ 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64,
+ 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42,
+ 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64,
+ 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d,
+ 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43,
+ 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69,
+ 0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c,
+ 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75,
+ 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65,
+ 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c,
+ 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
+ 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x2a, 0x30, 0x0a, 0x0a, 0x42,
+ 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c,
+ 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70,
+ 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x2a, 0x6e, 0x0a,
+ 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c,
+ 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10,
+ 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a,
+ 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74,
+ 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10,
+ 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79,
+ 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x2a, 0x1f, 0x0a,
+ 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a,
+ 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b,
+ 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08,
+ 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10,
+ 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e,
+ 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -680,21 +670,20 @@ var file_battle_battle_db_proto_goTypes = []interface{}{
}
var file_battle_battle_db_proto_depIdxs = []int32{
8, // 0: BattleRole.normalSkill:type_name -> SkillData
- 8, // 1: BattleRole.equipSkill:type_name -> SkillData
- 7, // 2: BattleRole.property:type_name -> BattleRole.PropertyEntry
- 4, // 3: DBBattleFormt.team:type_name -> BattleRole
- 0, // 4: DBBattleRecord.btype:type_name -> BattleType
- 1, // 5: DBBattleRecord.ptype:type_name -> PlayType
- 2, // 6: DBBattleRecord.state:type_name -> BBattleState
- 5, // 7: DBBattleRecord.redflist:type_name -> DBBattleFormt
- 5, // 8: DBBattleRecord.buleflist:type_name -> DBBattleFormt
- 3, // 9: DBBattleRecord.roundresult:type_name -> DBBattleComp
- 3, // 10: DBBattleRecord.result:type_name -> DBBattleComp
- 11, // [11:11] is the sub-list for method output_type
- 11, // [11:11] is the sub-list for method input_type
- 11, // [11:11] is the sub-list for extension type_name
- 11, // [11:11] is the sub-list for extension extendee
- 0, // [0:11] is the sub-list for field type_name
+ 7, // 1: BattleRole.property:type_name -> BattleRole.PropertyEntry
+ 4, // 2: DBBattleFormt.team:type_name -> BattleRole
+ 0, // 3: DBBattleRecord.btype:type_name -> BattleType
+ 1, // 4: DBBattleRecord.ptype:type_name -> PlayType
+ 2, // 5: DBBattleRecord.state:type_name -> BBattleState
+ 5, // 6: DBBattleRecord.redflist:type_name -> DBBattleFormt
+ 5, // 7: DBBattleRecord.buleflist:type_name -> DBBattleFormt
+ 3, // 8: DBBattleRecord.roundresult:type_name -> DBBattleComp
+ 3, // 9: DBBattleRecord.result:type_name -> DBBattleComp
+ 10, // [10:10] is the sub-list for method output_type
+ 10, // [10:10] is the sub-list for method input_type
+ 10, // [10:10] is the sub-list for extension type_name
+ 10, // [10:10] is the sub-list for extension extendee
+ 0, // [0:10] is the sub-list for field type_name
}
func init() { file_battle_battle_db_proto_init() }
@@ -702,7 +691,7 @@ func file_battle_battle_db_proto_init() {
if File_battle_battle_db_proto != nil {
return
}
- file_comm_proto_init()
+ file_hero_hero_db_proto_init()
if !protoimpl.UnsafeEnabled {
file_battle_battle_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*BattleRole); i {
diff --git a/pb/comm.pb.go b/pb/comm.pb.go
index a38888ecd..7409dc5c4 100644
--- a/pb/comm.pb.go
+++ b/pb/comm.pb.go
@@ -838,61 +838,6 @@ func (x *NoticeUserCloseReq) GetGatewayServiceId() string {
return ""
}
-type SkillData struct {
- state protoimpl.MessageState
- sizeCache protoimpl.SizeCache
- unknownFields protoimpl.UnknownFields
-
- SkillID int32 `protobuf:"varint,1,opt,name=skillID,proto3" json:"skillID"`
- SkillLv int32 `protobuf:"varint,2,opt,name=skillLv,proto3" json:"skillLv"`
-}
-
-func (x *SkillData) Reset() {
- *x = SkillData{}
- if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[11]
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- ms.StoreMessageInfo(mi)
- }
-}
-
-func (x *SkillData) String() string {
- return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SkillData) ProtoMessage() {}
-
-func (x *SkillData) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[11]
- if protoimpl.UnsafeEnabled && x != nil {
- ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
- if ms.LoadMessageInfo() == nil {
- ms.StoreMessageInfo(mi)
- }
- return ms
- }
- return mi.MessageOf(x)
-}
-
-// Deprecated: Use SkillData.ProtoReflect.Descriptor instead.
-func (*SkillData) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *SkillData) GetSkillID() int32 {
- if x != nil {
- return x.SkillID
- }
- return 0
-}
-
-func (x *SkillData) GetSkillLv() int32 {
- if x != nil {
- return x.SkillLv
- }
- return 0
-}
-
//用户资产数据 对标*cfg.Game_atn 数据结构
type UserAssets struct {
state protoimpl.MessageState
@@ -907,7 +852,7 @@ type UserAssets struct {
func (x *UserAssets) Reset() {
*x = UserAssets{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[12]
+ mi := &file_comm_proto_msgTypes[11]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -920,7 +865,7 @@ func (x *UserAssets) String() string {
func (*UserAssets) ProtoMessage() {}
func (x *UserAssets) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[12]
+ mi := &file_comm_proto_msgTypes[11]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -933,7 +878,7 @@ func (x *UserAssets) ProtoReflect() protoreflect.Message {
// Deprecated: Use UserAssets.ProtoReflect.Descriptor instead.
func (*UserAssets) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{12}
+ return file_comm_proto_rawDescGZIP(), []int{11}
}
func (x *UserAssets) GetA() string {
@@ -969,7 +914,7 @@ type TaskParam struct {
func (x *TaskParam) Reset() {
*x = TaskParam{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[13]
+ mi := &file_comm_proto_msgTypes[12]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -982,7 +927,7 @@ func (x *TaskParam) String() string {
func (*TaskParam) ProtoMessage() {}
func (x *TaskParam) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[13]
+ mi := &file_comm_proto_msgTypes[12]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -995,7 +940,7 @@ func (x *TaskParam) ProtoReflect() protoreflect.Message {
// Deprecated: Use TaskParam.ProtoReflect.Descriptor instead.
func (*TaskParam) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{13}
+ return file_comm_proto_rawDescGZIP(), []int{12}
}
func (x *TaskParam) GetFirst() int32 {
@@ -1025,7 +970,7 @@ type RtaskParam struct {
func (x *RtaskParam) Reset() {
*x = RtaskParam{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[14]
+ mi := &file_comm_proto_msgTypes[13]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1038,7 +983,7 @@ func (x *RtaskParam) String() string {
func (*RtaskParam) ProtoMessage() {}
func (x *RtaskParam) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[14]
+ mi := &file_comm_proto_msgTypes[13]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1051,7 +996,7 @@ func (x *RtaskParam) ProtoReflect() protoreflect.Message {
// Deprecated: Use RtaskParam.ProtoReflect.Descriptor instead.
func (*RtaskParam) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{14}
+ return file_comm_proto_rawDescGZIP(), []int{13}
}
func (x *RtaskParam) GetParam1() int32 {
@@ -1086,7 +1031,7 @@ type UIdReq struct {
func (x *UIdReq) Reset() {
*x = UIdReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[15]
+ mi := &file_comm_proto_msgTypes[14]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1099,7 +1044,7 @@ func (x *UIdReq) String() string {
func (*UIdReq) ProtoMessage() {}
func (x *UIdReq) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[15]
+ mi := &file_comm_proto_msgTypes[14]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1112,7 +1057,7 @@ func (x *UIdReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use UIdReq.ProtoReflect.Descriptor instead.
func (*UIdReq) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{15}
+ return file_comm_proto_rawDescGZIP(), []int{14}
}
func (x *UIdReq) GetUid() string {
@@ -1133,7 +1078,7 @@ type NameReq struct {
func (x *NameReq) Reset() {
*x = NameReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[16]
+ mi := &file_comm_proto_msgTypes[15]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1146,7 +1091,7 @@ func (x *NameReq) String() string {
func (*NameReq) ProtoMessage() {}
func (x *NameReq) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[16]
+ mi := &file_comm_proto_msgTypes[15]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1159,7 +1104,7 @@ func (x *NameReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use NameReq.ProtoReflect.Descriptor instead.
func (*NameReq) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{16}
+ return file_comm_proto_rawDescGZIP(), []int{15}
}
func (x *NameReq) GetName() string {
@@ -1178,7 +1123,7 @@ type EmptyReq struct {
func (x *EmptyReq) Reset() {
*x = EmptyReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[17]
+ mi := &file_comm_proto_msgTypes[16]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1191,7 +1136,7 @@ func (x *EmptyReq) String() string {
func (*EmptyReq) ProtoMessage() {}
func (x *EmptyReq) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[17]
+ mi := &file_comm_proto_msgTypes[16]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1204,7 +1149,7 @@ func (x *EmptyReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use EmptyReq.ProtoReflect.Descriptor instead.
func (*EmptyReq) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{17}
+ return file_comm_proto_rawDescGZIP(), []int{16}
}
type EmptyResp struct {
@@ -1216,7 +1161,7 @@ type EmptyResp struct {
func (x *EmptyResp) Reset() {
*x = EmptyResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[18]
+ mi := &file_comm_proto_msgTypes[17]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1229,7 +1174,7 @@ func (x *EmptyResp) String() string {
func (*EmptyResp) ProtoMessage() {}
func (x *EmptyResp) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[18]
+ mi := &file_comm_proto_msgTypes[17]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1242,7 +1187,7 @@ func (x *EmptyResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use EmptyResp.ProtoReflect.Descriptor instead.
func (*EmptyResp) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{18}
+ return file_comm_proto_rawDescGZIP(), []int{17}
}
// rpc 通用请求消息 1
@@ -1257,7 +1202,7 @@ type RPCGeneralReqA1 struct {
func (x *RPCGeneralReqA1) Reset() {
*x = RPCGeneralReqA1{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[19]
+ mi := &file_comm_proto_msgTypes[18]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1270,7 +1215,7 @@ func (x *RPCGeneralReqA1) String() string {
func (*RPCGeneralReqA1) ProtoMessage() {}
func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[19]
+ mi := &file_comm_proto_msgTypes[18]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1283,7 +1228,7 @@ func (x *RPCGeneralReqA1) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCGeneralReqA1.ProtoReflect.Descriptor instead.
func (*RPCGeneralReqA1) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{19}
+ return file_comm_proto_rawDescGZIP(), []int{18}
}
func (x *RPCGeneralReqA1) GetParam1() string {
@@ -1306,7 +1251,7 @@ type RPCGeneralReqA2 struct {
func (x *RPCGeneralReqA2) Reset() {
*x = RPCGeneralReqA2{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[20]
+ mi := &file_comm_proto_msgTypes[19]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1319,7 +1264,7 @@ func (x *RPCGeneralReqA2) String() string {
func (*RPCGeneralReqA2) ProtoMessage() {}
func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[20]
+ mi := &file_comm_proto_msgTypes[19]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1332,7 +1277,7 @@ func (x *RPCGeneralReqA2) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCGeneralReqA2.ProtoReflect.Descriptor instead.
func (*RPCGeneralReqA2) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{20}
+ return file_comm_proto_rawDescGZIP(), []int{19}
}
func (x *RPCGeneralReqA2) GetParam1() string {
@@ -1363,7 +1308,7 @@ type RPCGeneralReqA3 struct {
func (x *RPCGeneralReqA3) Reset() {
*x = RPCGeneralReqA3{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[21]
+ mi := &file_comm_proto_msgTypes[20]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1376,7 +1321,7 @@ func (x *RPCGeneralReqA3) String() string {
func (*RPCGeneralReqA3) ProtoMessage() {}
func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[21]
+ mi := &file_comm_proto_msgTypes[20]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1389,7 +1334,7 @@ func (x *RPCGeneralReqA3) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCGeneralReqA3.ProtoReflect.Descriptor instead.
func (*RPCGeneralReqA3) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{21}
+ return file_comm_proto_rawDescGZIP(), []int{20}
}
func (x *RPCGeneralReqA3) GetParam1() string {
@@ -1428,7 +1373,7 @@ type RPCGeneralReqA4 struct {
func (x *RPCGeneralReqA4) Reset() {
*x = RPCGeneralReqA4{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[22]
+ mi := &file_comm_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1441,7 +1386,7 @@ func (x *RPCGeneralReqA4) String() string {
func (*RPCGeneralReqA4) ProtoMessage() {}
func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[22]
+ mi := &file_comm_proto_msgTypes[21]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1454,7 +1399,7 @@ func (x *RPCGeneralReqA4) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCGeneralReqA4.ProtoReflect.Descriptor instead.
func (*RPCGeneralReqA4) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{22}
+ return file_comm_proto_rawDescGZIP(), []int{21}
}
func (x *RPCGeneralReqA4) GetParam1() string {
@@ -1499,7 +1444,7 @@ type RPCRTaskReq struct {
func (x *RPCRTaskReq) Reset() {
*x = RPCRTaskReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_comm_proto_msgTypes[23]
+ mi := &file_comm_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1512,7 +1457,7 @@ func (x *RPCRTaskReq) String() string {
func (*RPCRTaskReq) ProtoMessage() {}
func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message {
- mi := &file_comm_proto_msgTypes[23]
+ mi := &file_comm_proto_msgTypes[22]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1525,7 +1470,7 @@ func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCRTaskReq.ProtoReflect.Descriptor instead.
func (*RPCRTaskReq) Descriptor() ([]byte, []int) {
- return file_comm_proto_rawDescGZIP(), []int{23}
+ return file_comm_proto_rawDescGZIP(), []int{22}
}
func (x *RPCRTaskReq) GetUid() string {
@@ -1650,59 +1595,55 @@ var file_comm_proto_rawDesc = []byte{
0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61, 0x67,
0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69,
0x63, 0x65, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65,
- 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x3f, 0x0a, 0x09,
- 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69,
- 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c,
- 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0x36, 0x0a,
- 0x0a, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02,
- 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01,
- 0x28, 0x05, 0x52, 0x01, 0x4e, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72,
- 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f,
- 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64,
- 0x22, 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16,
- 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32,
- 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16,
- 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71,
- 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
- 0x69, 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a,
- 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
- 0x65, 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a,
- 0x09, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50,
- 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a,
- 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
- 0x61, 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65,
- 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61,
- 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31,
- 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47,
- 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70,
- 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
- 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70,
- 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72,
- 0x61, 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61,
- 0x6c, 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16,
- 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16,
- 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
- 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61,
- 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
- 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54,
- 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54,
- 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03,
- 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72,
- 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12,
- 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01,
- 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65,
- 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06,
- 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x22, 0x36, 0x0a, 0x0a,
+ 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x12, 0x0c, 0x0a, 0x01, 0x41, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x01, 0x41, 0x12, 0x0c, 0x0a, 0x01, 0x54, 0x18, 0x02, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x01, 0x54, 0x12, 0x0c, 0x0a, 0x01, 0x4e, 0x18, 0x03, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x01, 0x4e, 0x22, 0x39, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61,
+ 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e,
+ 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x63, 0x6f, 0x6e, 0x64, 0x22,
+ 0x54, 0x0a, 0x0a, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70,
+ 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70,
+ 0x61, 0x72, 0x61, 0x6d, 0x33, 0x22, 0x1a, 0x0a, 0x06, 0x55, 0x49, 0x64, 0x52, 0x65, 0x71, 0x12,
+ 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+ 0x64, 0x22, 0x1d, 0x0a, 0x07, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04,
+ 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65,
+ 0x22, 0x0a, 0x0a, 0x08, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x71, 0x22, 0x0b, 0x0a, 0x09,
+ 0x45, 0x6d, 0x70, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x29, 0x0a, 0x0f, 0x52, 0x50, 0x43,
+ 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x31, 0x12, 0x16, 0x0a, 0x06,
+ 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61,
+ 0x72, 0x61, 0x6d, 0x31, 0x22, 0x41, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72,
+ 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d,
+ 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12,
+ 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x22, 0x59, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65,
+ 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x41, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61,
+ 0x72, 0x61, 0x6d, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61,
+ 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61,
+ 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61,
+ 0x6d, 0x33, 0x22, 0x71, 0x0a, 0x0f, 0x52, 0x50, 0x43, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c,
+ 0x52, 0x65, 0x71, 0x41, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
+ 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18,
+ 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a,
+ 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70,
+ 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x51, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, 0x73,
+ 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79,
+ 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79,
+ 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28,
+ 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f,
+ 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06,
+ 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12,
+ 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65,
+ 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a,
+ 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1718,7 +1659,7 @@ func file_comm_proto_rawDescGZIP() []byte {
}
var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 24)
+var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
var file_comm_proto_goTypes = []interface{}{
(HeroAttributesType)(0), // 0: HeroAttributesType
(*UserMessage)(nil), // 1: UserMessage
@@ -1732,31 +1673,30 @@ var file_comm_proto_goTypes = []interface{}{
(*AgentCloseeReq)(nil), // 9: AgentCloseeReq
(*NoticeUserLoginReq)(nil), // 10: NoticeUserLoginReq
(*NoticeUserCloseReq)(nil), // 11: NoticeUserCloseReq
- (*SkillData)(nil), // 12: SkillData
- (*UserAssets)(nil), // 13: UserAssets
- (*TaskParam)(nil), // 14: TaskParam
- (*RtaskParam)(nil), // 15: RtaskParam
- (*UIdReq)(nil), // 16: UIdReq
- (*NameReq)(nil), // 17: NameReq
- (*EmptyReq)(nil), // 18: EmptyReq
- (*EmptyResp)(nil), // 19: EmptyResp
- (*RPCGeneralReqA1)(nil), // 20: RPCGeneralReqA1
- (*RPCGeneralReqA2)(nil), // 21: RPCGeneralReqA2
- (*RPCGeneralReqA3)(nil), // 22: RPCGeneralReqA3
- (*RPCGeneralReqA4)(nil), // 23: RPCGeneralReqA4
- (*RPCRTaskReq)(nil), // 24: RPCRTaskReq
- (*anypb.Any)(nil), // 25: google.protobuf.Any
- (ErrorCode)(0), // 26: ErrorCode
+ (*UserAssets)(nil), // 12: UserAssets
+ (*TaskParam)(nil), // 13: TaskParam
+ (*RtaskParam)(nil), // 14: RtaskParam
+ (*UIdReq)(nil), // 15: UIdReq
+ (*NameReq)(nil), // 16: NameReq
+ (*EmptyReq)(nil), // 17: EmptyReq
+ (*EmptyResp)(nil), // 18: EmptyResp
+ (*RPCGeneralReqA1)(nil), // 19: RPCGeneralReqA1
+ (*RPCGeneralReqA2)(nil), // 20: RPCGeneralReqA2
+ (*RPCGeneralReqA3)(nil), // 21: RPCGeneralReqA3
+ (*RPCGeneralReqA4)(nil), // 22: RPCGeneralReqA4
+ (*RPCRTaskReq)(nil), // 23: RPCRTaskReq
+ (*anypb.Any)(nil), // 24: google.protobuf.Any
+ (ErrorCode)(0), // 25: ErrorCode
}
var file_comm_proto_depIdxs = []int32{
- 25, // 0: UserMessage.data:type_name -> google.protobuf.Any
- 25, // 1: AgentMessage.Message:type_name -> google.protobuf.Any
- 26, // 2: RPCMessageReply.Code:type_name -> ErrorCode
- 25, // 3: RPCMessageReply.ErrorData:type_name -> google.protobuf.Any
+ 24, // 0: UserMessage.data:type_name -> google.protobuf.Any
+ 24, // 1: AgentMessage.Message:type_name -> google.protobuf.Any
+ 25, // 2: RPCMessageReply.Code:type_name -> ErrorCode
+ 24, // 3: RPCMessageReply.ErrorData:type_name -> google.protobuf.Any
1, // 4: RPCMessageReply.Reply:type_name -> UserMessage
1, // 5: AgentSendMessageReq.Reply:type_name -> UserMessage
- 25, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any
- 25, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any
+ 24, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any
+ 24, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any
8, // [8:8] is the sub-list for method output_type
8, // [8:8] is the sub-list for method input_type
8, // [8:8] is the sub-list for extension type_name
@@ -1904,18 +1844,6 @@ func file_comm_proto_init() {
}
}
file_comm_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*SkillData); i {
- case 0:
- return &v.state
- case 1:
- return &v.sizeCache
- case 2:
- return &v.unknownFields
- default:
- return nil
- }
- }
- file_comm_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UserAssets); i {
case 0:
return &v.state
@@ -1927,7 +1855,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*TaskParam); i {
case 0:
return &v.state
@@ -1939,7 +1867,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RtaskParam); i {
case 0:
return &v.state
@@ -1951,7 +1879,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*UIdReq); i {
case 0:
return &v.state
@@ -1963,7 +1891,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*NameReq); i {
case 0:
return &v.state
@@ -1975,7 +1903,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EmptyReq); i {
case 0:
return &v.state
@@ -1987,7 +1915,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EmptyResp); i {
case 0:
return &v.state
@@ -1999,7 +1927,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCGeneralReqA1); i {
case 0:
return &v.state
@@ -2011,7 +1939,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCGeneralReqA2); i {
case 0:
return &v.state
@@ -2023,7 +1951,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCGeneralReqA3); i {
case 0:
return &v.state
@@ -2035,7 +1963,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCGeneralReqA4); i {
case 0:
return &v.state
@@ -2047,7 +1975,7 @@ func file_comm_proto_init() {
return nil
}
}
- file_comm_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+ file_comm_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPCRTaskReq); i {
case 0:
return &v.state
@@ -2066,7 +1994,7 @@ func file_comm_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_comm_proto_rawDesc,
NumEnums: 1,
- NumMessages: 24,
+ NumMessages: 23,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index adfb59ace..a8f8076ef 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -66,6 +66,61 @@ func (HeroType) EnumDescriptor() ([]byte, []int) {
return file_hero_hero_db_proto_rawDescGZIP(), []int{0}
}
+type SkillData struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ SkillID int32 `protobuf:"varint,1,opt,name=skillID,proto3" json:"skillID"`
+ SkillLv int32 `protobuf:"varint,2,opt,name=skillLv,proto3" json:"skillLv"`
+}
+
+func (x *SkillData) Reset() {
+ *x = SkillData{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_hero_hero_db_proto_msgTypes[0]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *SkillData) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SkillData) ProtoMessage() {}
+
+func (x *SkillData) ProtoReflect() protoreflect.Message {
+ mi := &file_hero_hero_db_proto_msgTypes[0]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use SkillData.ProtoReflect.Descriptor instead.
+func (*SkillData) Descriptor() ([]byte, []int) {
+ return file_hero_hero_db_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *SkillData) GetSkillID() int32 {
+ if x != nil {
+ return x.SkillID
+ }
+ return 0
+}
+
+func (x *SkillData) GetSkillLv() int32 {
+ if x != nil {
+ return x.SkillLv
+ }
+ return 0
+}
+
type DBHero struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
@@ -73,31 +128,31 @@ type DBHero struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
- HeroID string `protobuf:"bytes,3,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` // 英雄的配置表ID
- Star int32 `protobuf:"varint,4,opt,name=star,proto3" json:"star"` // 英雄星级
- Lv int32 `protobuf:"varint,5,opt,name=lv,proto3" json:"lv"` // 英雄等级
- Exp int32 `protobuf:"varint,6,opt,name=exp,proto3" json:"exp"` // 英雄经验
- JuexingLv int32 `protobuf:"varint,7,opt,name=juexingLv,proto3" json:"juexingLv" bson:"juexingLv"` //觉醒等级
- CaptainSkill int32 `protobuf:"varint,8,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能
- NormalSkill []*SkillData `protobuf:"bytes,9,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能
- Property map[string]int32 `protobuf:"bytes,10,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
- AddProperty map[string]int32 `protobuf:"bytes,11,rep,name=addProperty,proto3" json:"addProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"addProperty"` //附加属性相关
- CardType int32 `protobuf:"varint,12,opt,name=cardType,proto3" json:"cardType" bson:"cardType"` //卡片类型(升星卡、经验卡、技能升级卡)
- CurSkin int32 `protobuf:"varint,13,opt,name=curSkin,proto3" json:"curSkin" bson:"curSkin"` //当前装备的皮肤ID
- Skins []int32 `protobuf:"varint,14,rep,packed,name=skins,proto3" json:"skins"` // 所有皮肤ID
- Block bool `protobuf:"varint,15,opt,name=block,proto3" json:"block"` // 锁定
- EquipID []string `protobuf:"bytes,16,rep,name=equipID,proto3" json:"equipID" bson:"equipID"` //装备 objID
- ResonateNum int32 `protobuf:"varint,17,opt,name=resonateNum,proto3" json:"resonateNum" bson:"resonateNum"` //共鸣次数
- DistributionResonate int32 `protobuf:"varint,18,opt,name=distributionResonate,proto3" json:"distributionResonate" bson:"distributionResonate"` //分配的共鸣能量
- Energy map[string]int32 `protobuf:"bytes,19,rep,name=energy,proto3" json:"energy" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // @go_tags(`bson:"energy"`)能量分配到哪里[hppro:0,atkpro:0,defpro:20]
- SameCount int32 `protobuf:"varint,20,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` // 卡片叠加数量
- SuiteId int32 `protobuf:"varint,21,opt,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id
- SuiteExtId int32 `protobuf:"varint,22,opt,name=suiteExtId,proto3" json:"suiteExtId"` // go_tags(`bson:"suiteExtId"`) 扩展套装Id
- IsOverlying bool `protobuf:"varint,23,opt,name=isOverlying,proto3" json:"isOverlying"` // go_tags(`bson:"isOverlying"`) 是否允许叠加 默认true
- EnergyProperty map[string]int32 `protobuf:"bytes,24,rep,name=energyProperty,proto3" json:"energyProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"energyProperty"`
- JuexProperty map[string]int32 `protobuf:"bytes,25,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////hp
- Status HeroType `protobuf:"varint,26,opt,name=status,proto3,enum=HeroType" json:"status" bson:"status"` //状态 (1 练功)
- Suite1Star int32 `protobuf:"varint,27,opt,name=suite1Star,proto3" json:"suite1Star" bson:"suite1Star"`
+ HeroID string `protobuf:"bytes,3,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` // 英雄的配置表ID
+ Star int32 `protobuf:"varint,4,opt,name=star,proto3" json:"star"` // 英雄星级
+ Lv int32 `protobuf:"varint,5,opt,name=lv,proto3" json:"lv"` // 英雄等级
+ Exp int32 `protobuf:"varint,6,opt,name=exp,proto3" json:"exp"` // 英雄经验
+ JuexingLv int32 `protobuf:"varint,7,opt,name=juexingLv,proto3" json:"juexingLv" bson:"juexingLv"` //觉醒等级
+ CaptainSkill int32 `protobuf:"varint,8,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能
+ NormalSkill []*SkillData `protobuf:"bytes,9,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能
+ Property map[string]int32 `protobuf:"bytes,10,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
+ AddProperty map[string]int32 `protobuf:"bytes,11,rep,name=addProperty,proto3" json:"addProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"addProperty"` //附加属性相关
+ CardType int32 `protobuf:"varint,12,opt,name=cardType,proto3" json:"cardType" bson:"cardType"` //卡片类型(升星卡、经验卡、技能升级卡)
+ CurSkin int32 `protobuf:"varint,13,opt,name=curSkin,proto3" json:"curSkin" bson:"curSkin"` //当前装备的皮肤ID
+ Skins []int32 `protobuf:"varint,14,rep,packed,name=skins,proto3" json:"skins"` // 所有皮肤ID
+ Block bool `protobuf:"varint,15,opt,name=block,proto3" json:"block"` // 锁定
+ EquipID []string `protobuf:"bytes,16,rep,name=equipID,proto3" json:"equipID" bson:"equipID"` //装备 objID
+ ResonateNum int32 `protobuf:"varint,17,opt,name=resonateNum,proto3" json:"resonateNum" bson:"resonateNum"` //共鸣次数
+ DistributionResonate int32 `protobuf:"varint,18,opt,name=distributionResonate,proto3" json:"distributionResonate" bson:"distributionResonate"` //分配的共鸣能量
+ Energy map[string]int32 `protobuf:"bytes,19,rep,name=energy,proto3" json:"energy" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // @go_tags(`bson:"energy"`)能量分配到哪里[hppro:0,atkpro:0,defpro:20]
+ SameCount int32 `protobuf:"varint,20,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` // 卡片叠加数量
+ SuiteId int32 `protobuf:"varint,21,opt,name=suiteId,proto3" json:"suiteId" bson:"suiteId"` // 套装Id
+ SuiteExtId int32 `protobuf:"varint,22,opt,name=suiteExtId,proto3" json:"suiteExtId"` // go_tags(`bson:"suiteExtId"`) 扩展套装Id
+ IsOverlying bool `protobuf:"varint,23,opt,name=isOverlying,proto3" json:"isOverlying"` // go_tags(`bson:"isOverlying"`) 是否允许叠加 默认true
+ EnergyProperty map[string]int32 `protobuf:"bytes,24,rep,name=energyProperty,proto3" json:"energyProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"energyProperty"` //
+ JuexProperty map[string]int32 `protobuf:"bytes,25,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////hp
+ Status HeroType `protobuf:"varint,26,opt,name=status,proto3,enum=HeroType" json:"status" bson:"status"` //状态 (1 练功)
+ Suite1Star int32 `protobuf:"varint,27,opt,name=suite1Star,proto3" json:"suite1Star" bson:"suite1Star"` //
Suite2Star int32 `protobuf:"varint,28,opt,name=suite2Star,proto3" json:"suite2Star" bson:"suite2Star"`
Suite1Lv int32 `protobuf:"varint,29,opt,name=suite1Lv,proto3" json:"suite1Lv" bson:"suite1Lv"`
Suite2Lv int32 `protobuf:"varint,30,opt,name=suite2Lv,proto3" json:"suite2Lv" bson:"suite2Lv"`
@@ -108,7 +163,7 @@ type DBHero struct {
func (x *DBHero) Reset() {
*x = DBHero{}
if protoimpl.UnsafeEnabled {
- mi := &file_hero_hero_db_proto_msgTypes[0]
+ mi := &file_hero_hero_db_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -121,7 +176,7 @@ func (x *DBHero) String() string {
func (*DBHero) ProtoMessage() {}
func (x *DBHero) ProtoReflect() protoreflect.Message {
- mi := &file_hero_hero_db_proto_msgTypes[0]
+ mi := &file_hero_hero_db_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -134,7 +189,7 @@ func (x *DBHero) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBHero.ProtoReflect.Descriptor instead.
func (*DBHero) Descriptor() ([]byte, []int) {
- return file_hero_hero_db_proto_rawDescGZIP(), []int{0}
+ return file_hero_hero_db_proto_rawDescGZIP(), []int{1}
}
func (x *DBHero) GetId() string {
@@ -373,7 +428,7 @@ type Floor struct {
func (x *Floor) Reset() {
*x = Floor{}
if protoimpl.UnsafeEnabled {
- mi := &file_hero_hero_db_proto_msgTypes[1]
+ mi := &file_hero_hero_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -386,7 +441,7 @@ func (x *Floor) String() string {
func (*Floor) ProtoMessage() {}
func (x *Floor) ProtoReflect() protoreflect.Message {
- mi := &file_hero_hero_db_proto_msgTypes[1]
+ mi := &file_hero_hero_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -399,7 +454,7 @@ func (x *Floor) ProtoReflect() protoreflect.Message {
// Deprecated: Use Floor.ProtoReflect.Descriptor instead.
func (*Floor) Descriptor() ([]byte, []int) {
- return file_hero_hero_db_proto_rawDescGZIP(), []int{1}
+ return file_hero_hero_db_proto_rawDescGZIP(), []int{2}
}
func (x *Floor) GetH4() int32 {
@@ -433,7 +488,7 @@ type DBHeroRecord struct {
func (x *DBHeroRecord) Reset() {
*x = DBHeroRecord{}
if protoimpl.UnsafeEnabled {
- mi := &file_hero_hero_db_proto_msgTypes[2]
+ mi := &file_hero_hero_db_proto_msgTypes[3]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -446,7 +501,7 @@ func (x *DBHeroRecord) String() string {
func (*DBHeroRecord) ProtoMessage() {}
func (x *DBHeroRecord) ProtoReflect() protoreflect.Message {
- mi := &file_hero_hero_db_proto_msgTypes[2]
+ mi := &file_hero_hero_db_proto_msgTypes[3]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -459,7 +514,7 @@ func (x *DBHeroRecord) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBHeroRecord.ProtoReflect.Descriptor instead.
func (*DBHeroRecord) Descriptor() ([]byte, []int) {
- return file_hero_hero_db_proto_rawDescGZIP(), []int{2}
+ return file_hero_hero_db_proto_rawDescGZIP(), []int{3}
}
func (x *DBHeroRecord) GetId() string {
@@ -519,7 +574,7 @@ type DBHeroTalent struct {
func (x *DBHeroTalent) Reset() {
*x = DBHeroTalent{}
if protoimpl.UnsafeEnabled {
- mi := &file_hero_hero_db_proto_msgTypes[3]
+ mi := &file_hero_hero_db_proto_msgTypes[4]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -532,7 +587,7 @@ func (x *DBHeroTalent) String() string {
func (*DBHeroTalent) ProtoMessage() {}
func (x *DBHeroTalent) ProtoReflect() protoreflect.Message {
- mi := &file_hero_hero_db_proto_msgTypes[3]
+ mi := &file_hero_hero_db_proto_msgTypes[4]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -545,7 +600,7 @@ func (x *DBHeroTalent) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBHeroTalent.ProtoReflect.Descriptor instead.
func (*DBHeroTalent) Descriptor() ([]byte, []int) {
- return file_hero_hero_db_proto_rawDescGZIP(), []int{3}
+ return file_hero_hero_db_proto_rawDescGZIP(), []int{4}
}
func (x *DBHeroTalent) GetId() string {
@@ -580,129 +635,132 @@ var File_hero_hero_db_proto protoreflect.FileDescriptor
var file_hero_hero_db_proto_rawDesc = []byte{
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,
- 0x22, 0xdf, 0x0b, 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, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a,
- 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68,
- 0x65, 0x72, 0x6f, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18,
- 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70,
- 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x6a,
- 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09,
- 0x6a, 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x70,
- 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52,
- 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2c, 0x0a,
- 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x09, 0x20, 0x03,
- 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b,
- 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x31, 0x0a, 0x08, 0x70,
- 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e,
- 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x3a,
- 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0b, 0x20,
- 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x41, 0x64, 0x64,
- 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61,
- 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61,
- 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x61,
- 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69,
- 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e,
- 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x05, 0x52,
- 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x18,
- 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07,
- 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x44, 0x18, 0x10, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x65,
- 0x71, 0x75, 0x69, 0x70, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x72, 0x65, 0x73, 0x6f, 0x6e, 0x61,
- 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x73,
- 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x32, 0x0a, 0x14, 0x64, 0x69, 0x73, 0x74,
- 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65,
- 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75,
- 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x12, 0x2b, 0x0a, 0x06,
- 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x13, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44,
- 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x45, 0x6e, 0x74, 0x72,
- 0x79, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x61, 0x6d,
- 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x61,
- 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65,
- 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x75, 0x69, 0x74, 0x65, 0x49,
- 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x45, 0x78, 0x74, 0x49, 0x64, 0x18,
- 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x45, 0x78, 0x74, 0x49,
- 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x79, 0x69, 0x6e, 0x67,
- 0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x4f, 0x76, 0x65, 0x72, 0x6c, 0x79,
- 0x69, 0x6e, 0x67, 0x12, 0x43, 0x0a, 0x0e, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x50, 0x72, 0x6f,
- 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42,
- 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x50, 0x72, 0x6f, 0x70, 0x65,
- 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79,
- 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x3d, 0x0a, 0x0c, 0x6a, 0x75, 0x65, 0x78,
- 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x19, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
- 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70,
- 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50,
- 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x21, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
- 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79,
- 0x70, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75,
- 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
- 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75,
- 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
- 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x75,
- 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x75,
- 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32,
- 0x4c, 0x76, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32,
- 0x4c, 0x76, 0x12, 0x43, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70,
- 0x65, 0x72, 0x74, 0x79, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x48,
- 0x65, 0x72, 0x6f, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
- 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50,
- 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x2a, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70,
- 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x20, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b,
- 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b,
- 0x69, 0x6c, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
+ 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3f, 0x0a, 0x09, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74,
+ 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x73,
+ 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b,
+ 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x22, 0xdf, 0x0b, 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, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75,
+ 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74,
+ 0x61, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e,
+ 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10,
+ 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70,
+ 0x12, 0x1c, 0x0a, 0x09, 0x6a, 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x18, 0x07, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x09, 0x6a, 0x75, 0x65, 0x78, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x12, 0x22,
+ 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x08,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69,
+ 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c,
+ 0x6c, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44,
+ 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
+ 0x12, 0x31, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0a, 0x20, 0x03,
+ 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x50, 0x72, 0x6f, 0x70,
+ 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65,
+ 0x72, 0x74, 0x79, 0x12, 0x3a, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
+ 0x74, 0x79, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
+ 0x6f, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74,
+ 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12,
+ 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x08, 0x63, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63,
+ 0x75, 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x75,
+ 0x72, 0x53, 0x6b, 0x69, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x18, 0x0e,
+ 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x62,
+ 0x6c, 0x6f, 0x63, 0x6b, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x6c, 0x6f, 0x63,
+ 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x44, 0x18, 0x10, 0x20, 0x03,
+ 0x28, 0x09, 0x52, 0x07, 0x65, 0x71, 0x75, 0x69, 0x70, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x72,
+ 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x0b, 0x72, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x4e, 0x75, 0x6d, 0x12, 0x32, 0x0a,
+ 0x14, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+ 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x64, 0x69, 0x73,
+ 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74,
+ 0x65, 0x12, 0x2b, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x13, 0x20, 0x03, 0x28,
+ 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x45, 0x6e, 0x65, 0x72, 0x67,
+ 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x1c,
+ 0x0a, 0x09, 0x73, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x09, 0x73, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07,
+ 0x73, 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73,
+ 0x75, 0x69, 0x74, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x45,
+ 0x78, 0x74, 0x49, 0x64, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74,
+ 0x65, 0x45, 0x78, 0x74, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x73, 0x4f, 0x76, 0x65, 0x72,
+ 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x18, 0x17, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x4f,
+ 0x76, 0x65, 0x72, 0x6c, 0x79, 0x69, 0x6e, 0x67, 0x12, 0x43, 0x0a, 0x0e, 0x65, 0x6e, 0x65, 0x72,
+ 0x67, 0x79, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x18, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x1b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79,
+ 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x65,
+ 0x6e, 0x65, 0x72, 0x67, 0x79, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x3d, 0x0a,
+ 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x19, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x4a, 0x75, 0x65,
+ 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c,
+ 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x21, 0x0a, 0x06,
+ 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x48,
+ 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
+ 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1b, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x53, 0x74, 0x61, 0x72, 0x12,
+ 0x1e, 0x0a, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, 0x18, 0x1c, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x0a, 0x73, 0x75, 0x69, 0x74, 0x65, 0x32, 0x53, 0x74, 0x61, 0x72, 0x12,
+ 0x1a, 0x0a, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x18, 0x1d, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x08, 0x73, 0x75, 0x69, 0x74, 0x65, 0x31, 0x4c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x73,
+ 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x73,
+ 0x75, 0x69, 0x74, 0x65, 0x32, 0x4c, 0x76, 0x12, 0x43, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e,
+ 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x1f, 0x20, 0x03, 0x28, 0x0b, 0x32,
+ 0x1b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50,
+ 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0e, 0x74, 0x61,
+ 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x2a, 0x0a, 0x0a,
+ 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x20, 0x20, 0x03, 0x28, 0x0b,
+ 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0a, 0x65, 0x71,
+ 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 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, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 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, 0x39, 0x0a, 0x0b, 0x45, 0x6e, 0x65, 0x72, 0x67, 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, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 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, 0x39, 0x0a, 0x0b, 0x45, 0x6e, 0x65, 0x72, 0x67, 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, 0x41, 0x0a, 0x13, 0x45,
- 0x6e, 0x65, 0x72, 0x67, 0x79, 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, 0x3f,
- 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 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,
- 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, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x68,
- 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34, 0x12, 0x0e, 0x0a, 0x02, 0x68,
- 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35, 0x22, 0x90, 0x01, 0x0a, 0x0c,
- 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03,
- 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14,
- 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
- 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74,
- 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65,
- 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xb6,
- 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12,
- 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
- 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
- 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c,
- 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65,
- 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45,
- 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b,
- 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
- 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
+ 0x1a, 0x41, 0x0a, 0x13, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 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, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 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, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54,
- 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 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,
+ 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f, 0x72,
+ 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x34,
+ 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x35,
+ 0x22, 0x90, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72,
+ 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69,
+ 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
+ 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61,
+ 0x72, 0x35, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12,
+ 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
+ 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75,
+ 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f,
+ 0x75, 0x6e, 0x74, 0x22, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61,
+ 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+ 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64,
+ 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31,
+ 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
+ 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61,
+ 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e,
+ 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79,
+ 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
+ 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x2a, 0x2f, 0x0a, 0x08,
+ 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x48, 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 (
@@ -718,33 +776,33 @@ func file_hero_hero_db_proto_rawDescGZIP() []byte {
}
var file_hero_hero_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_hero_hero_db_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
var file_hero_hero_db_proto_goTypes = []interface{}{
(HeroType)(0), // 0: HeroType
- (*DBHero)(nil), // 1: DBHero
- (*Floor)(nil), // 2: Floor
- (*DBHeroRecord)(nil), // 3: DBHeroRecord
- (*DBHeroTalent)(nil), // 4: DBHeroTalent
- nil, // 5: DBHero.PropertyEntry
- nil, // 6: DBHero.AddPropertyEntry
- nil, // 7: DBHero.EnergyEntry
- nil, // 8: DBHero.EnergyPropertyEntry
- nil, // 9: DBHero.JuexPropertyEntry
- nil, // 10: DBHero.TalentPropertyEntry
- nil, // 11: DBHeroTalent.TalentEntry
- (*SkillData)(nil), // 12: SkillData
+ (*SkillData)(nil), // 1: SkillData
+ (*DBHero)(nil), // 2: DBHero
+ (*Floor)(nil), // 3: Floor
+ (*DBHeroRecord)(nil), // 4: DBHeroRecord
+ (*DBHeroTalent)(nil), // 5: DBHeroTalent
+ nil, // 6: DBHero.PropertyEntry
+ nil, // 7: DBHero.AddPropertyEntry
+ nil, // 8: DBHero.EnergyEntry
+ nil, // 9: DBHero.EnergyPropertyEntry
+ nil, // 10: DBHero.JuexPropertyEntry
+ nil, // 11: DBHero.TalentPropertyEntry
+ nil, // 12: DBHeroTalent.TalentEntry
}
var file_hero_hero_db_proto_depIdxs = []int32{
- 12, // 0: DBHero.normalSkill:type_name -> SkillData
- 5, // 1: DBHero.property:type_name -> DBHero.PropertyEntry
- 6, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
- 7, // 3: DBHero.energy:type_name -> DBHero.EnergyEntry
- 8, // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry
- 9, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
+ 1, // 0: DBHero.normalSkill:type_name -> SkillData
+ 6, // 1: DBHero.property:type_name -> DBHero.PropertyEntry
+ 7, // 2: DBHero.addProperty:type_name -> DBHero.AddPropertyEntry
+ 8, // 3: DBHero.energy:type_name -> DBHero.EnergyEntry
+ 9, // 4: DBHero.energyProperty:type_name -> DBHero.EnergyPropertyEntry
+ 10, // 5: DBHero.juexProperty:type_name -> DBHero.JuexPropertyEntry
0, // 6: DBHero.status:type_name -> HeroType
- 10, // 7: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
- 12, // 8: DBHero.equipSkill:type_name -> SkillData
- 11, // 9: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
+ 11, // 7: DBHero.talentProperty:type_name -> DBHero.TalentPropertyEntry
+ 1, // 8: DBHero.equipSkill:type_name -> SkillData
+ 12, // 9: DBHeroTalent.talent:type_name -> DBHeroTalent.TalentEntry
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
@@ -757,10 +815,9 @@ func file_hero_hero_db_proto_init() {
if File_hero_hero_db_proto != nil {
return
}
- file_comm_proto_init()
if !protoimpl.UnsafeEnabled {
file_hero_hero_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBHero); i {
+ switch v := v.(*SkillData); i {
case 0:
return &v.state
case 1:
@@ -772,7 +829,7 @@ func file_hero_hero_db_proto_init() {
}
}
file_hero_hero_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*Floor); i {
+ switch v := v.(*DBHero); i {
case 0:
return &v.state
case 1:
@@ -784,7 +841,7 @@ func file_hero_hero_db_proto_init() {
}
}
file_hero_hero_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*DBHeroRecord); i {
+ switch v := v.(*Floor); i {
case 0:
return &v.state
case 1:
@@ -796,6 +853,18 @@ func file_hero_hero_db_proto_init() {
}
}
file_hero_hero_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*DBHeroRecord); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_hero_hero_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBHeroTalent); i {
case 0:
return &v.state
@@ -814,7 +883,7 @@ func file_hero_hero_db_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_hero_hero_db_proto_rawDesc,
NumEnums: 1,
- NumMessages: 11,
+ NumMessages: 12,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/pb/viking_msg.pb.go b/pb/viking_msg.pb.go
index b417a98d1..8054dc8d7 100644
--- a/pb/viking_msg.pb.go
+++ b/pb/viking_msg.pb.go
@@ -111,7 +111,7 @@ type VikingChallengeReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- BossType int32 `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"` // boos 类型
+ BossId int32 `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"` // boos 类型
Difficulty int32 `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
Leadpos int32 `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"` //队长位置
Teamids []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"` //阵容信息
@@ -149,9 +149,9 @@ func (*VikingChallengeReq) Descriptor() ([]byte, []int) {
return file_viking_viking_msg_proto_rawDescGZIP(), []int{2}
}
-func (x *VikingChallengeReq) GetBossType() int32 {
+func (x *VikingChallengeReq) GetBossId() int32 {
if x != nil {
- return x.BossType
+ return x.BossId
}
return 0
}
@@ -183,7 +183,7 @@ type VikingChallengeResp struct {
unknownFields protoimpl.UnknownFields
Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
- BossType int32 `protobuf:"varint,2,opt,name=bossType,proto3" json:"bossType"` // boos 类型
+ BossId int32 `protobuf:"varint,2,opt,name=bossId,proto3" json:"bossId"` // boos 类型
Difficulty int32 `protobuf:"varint,3,opt,name=difficulty,proto3" json:"difficulty"` // 难度
}
@@ -226,9 +226,9 @@ func (x *VikingChallengeResp) GetInfo() *BattleInfo {
return nil
}
-func (x *VikingChallengeResp) GetBossType() int32 {
+func (x *VikingChallengeResp) GetBossId() int32 {
if x != nil {
- return x.BossType
+ return x.BossId
}
return 0
}
@@ -245,7 +245,7 @@ type VikingChallengeOverReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- BossType int32 `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"` // boos 类型
+ BossId int32 `protobuf:"varint,1,opt,name=bossId,proto3" json:"bossId"` // boos 类型
Difficulty int32 `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度
Report *BattleReport `protobuf:"bytes,3,opt,name=report,proto3" json:"report"` //战报
}
@@ -282,9 +282,9 @@ func (*VikingChallengeOverReq) Descriptor() ([]byte, []int) {
return file_viking_viking_msg_proto_rawDescGZIP(), []int{4}
}
-func (x *VikingChallengeOverReq) GetBossType() int32 {
+func (x *VikingChallengeOverReq) GetBossId() int32 {
if x != nil {
- return x.BossType
+ return x.BossId
}
return 0
}
@@ -561,48 +561,48 @@ var file_viking_viking_msg_proto_rawDesc = []byte{
0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52,
0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61,
- 0x74, 0x61, 0x22, 0x84, 0x01, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61,
- 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73,
- 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73,
- 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
- 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69,
- 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
- 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12,
- 0x18, 0x0a, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09,
- 0x52, 0x07, 0x74, 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x72, 0x0a, 0x13, 0x56, 0x69, 0x6b,
- 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70,
- 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
- 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66,
- 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a,
- 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x7b, 0x0a,
- 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
- 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54,
- 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x73, 0x73, 0x54,
- 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
- 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
- 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f,
- 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x38, 0x0a, 0x17, 0x56, 0x69,
- 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
- 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04,
- 0x64, 0x61, 0x74, 0x61, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75,
- 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20,
- 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e, 0x0a, 0x0d, 0x56, 0x69,
- 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64,
- 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69,
- 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47, 0x0a, 0x11, 0x56, 0x69,
- 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12,
- 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66,
- 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x66, 0x72, 0x69,
- 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e,
- 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x05, 0x72, 0x61, 0x6e,
- 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b,
- 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x42, 0x06,
- 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x74, 0x61, 0x22, 0x80, 0x01, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61,
+ 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73,
+ 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49,
+ 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74,
+ 0x79, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74,
+ 0x65, 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65,
+ 0x61, 0x6d, 0x69, 0x64, 0x73, 0x22, 0x6e, 0x0a, 0x13, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43,
+ 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04,
+ 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74,
+ 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a,
+ 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
+ 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63, 0x75,
+ 0x6c, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69,
+ 0x63, 0x75, 0x6c, 0x74, 0x79, 0x22, 0x77, 0x0a, 0x16, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43,
+ 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12,
+ 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+ 0x06, 0x62, 0x6f, 0x73, 0x73, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x69, 0x66, 0x66, 0x69,
+ 0x63, 0x75, 0x6c, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x64, 0x69, 0x66,
+ 0x66, 0x69, 0x63, 0x75, 0x6c, 0x74, 0x79, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
+ 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
+ 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x38,
+ 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
+ 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74,
+ 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69,
+ 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x24, 0x0a, 0x0c, 0x56, 0x69, 0x6b, 0x69,
+ 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e,
+ 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2e,
+ 0x0a, 0x0d, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12,
+ 0x1d, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e,
+ 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x47,
+ 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74,
+ 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12,
+ 0x16, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+ 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x39, 0x0a, 0x12, 0x56, 0x69, 0x6b, 0x69, 0x6e,
+ 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
+ 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44,
+ 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e,
+ 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
+ 0x6f, 0x33,
}
var (
diff --git a/sys/configure/structs/Game.VikingBossData.go b/sys/configure/structs/Game.VikingBossData.go
index f33f0eebc..c721cbacb 100644
--- a/sys/configure/structs/Game.VikingBossData.go
+++ b/sys/configure/structs/Game.VikingBossData.go
@@ -12,7 +12,8 @@ import "errors"
type GameVikingBossData struct {
Id int32
- Type int32
+ Copytype int32
+ Bossid int32
Name string
Difficulty int32
Captionrecommend []int32
@@ -31,7 +32,8 @@ func (*GameVikingBossData) GetTypeId() int32 {
func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["copytype"].(float64); !_ok_ { err = errors.New("copytype error"); return }; _v.Copytype = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
{
diff --git a/sys/configure/structs/Game.VikingBossSkill.go b/sys/configure/structs/Game.VikingBossSkill.go
index fc41f99ff..68bd944de 100644
--- a/sys/configure/structs/Game.VikingBossSkill.go
+++ b/sys/configure/structs/Game.VikingBossSkill.go
@@ -21,7 +21,7 @@ func NewGameVikingBossSkill(_buf []map[string]interface{}) (*GameVikingBossSkill
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Type] = _v
+ dataMap[_v.Bossid] = _v
}
}
return &GameVikingBossSkill{_dataList:_dataList, _dataMap:dataMap}, nil
diff --git a/sys/configure/structs/Game.VikingBossSkillData.go b/sys/configure/structs/Game.VikingBossSkillData.go
index 3b91b0cc1..8463bc9b1 100644
--- a/sys/configure/structs/Game.VikingBossSkillData.go
+++ b/sys/configure/structs/Game.VikingBossSkillData.go
@@ -11,7 +11,8 @@ package cfg
import "errors"
type GameVikingBossSkillData struct {
- Type int32
+ Bossid int32
+ Copytype int32
Name string
Introduce string
Icon string
@@ -25,7 +26,8 @@ func (*GameVikingBossSkillData) GetTypeId() int32 {
}
func (_v *GameVikingBossSkillData)Deserialize(_buf map[string]interface{}) (err error) {
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["copytype"].(float64); !_ok_ { err = errors.New("copytype error"); return }; _v.Copytype = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
diff --git a/sys/configure/structs/Game.VikingLineup.go b/sys/configure/structs/Game.VikingLineup.go
new file mode 100644
index 000000000..402333301
--- /dev/null
+++ b/sys/configure/structs/Game.VikingLineup.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GameVikingLineup struct {
+ _dataMap map[int32]*GameVikingLineupData
+ _dataList []*GameVikingLineupData
+}
+
+func NewGameVikingLineup(_buf []map[string]interface{}) (*GameVikingLineup, error) {
+ _dataList := make([]*GameVikingLineupData, 0, len(_buf))
+ dataMap := make(map[int32]*GameVikingLineupData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGameVikingLineupData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Id] = _v
+ }
+ }
+ return &GameVikingLineup{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GameVikingLineup) GetDataMap() map[int32]*GameVikingLineupData {
+ return table._dataMap
+}
+
+func (table *GameVikingLineup) GetDataList() []*GameVikingLineupData {
+ return table._dataList
+}
+
+func (table *GameVikingLineup) Get(key int32) *GameVikingLineupData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.VikingLineupData.go b/sys/configure/structs/Game.VikingLineupData.go
new file mode 100644
index 000000000..ecf699195
--- /dev/null
+++ b/sys/configure/structs/Game.VikingLineupData.go
@@ -0,0 +1,41 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GameVikingLineupData struct {
+ Id int32
+ Robotid int32
+ Difficulty int32
+ Time int32
+}
+
+const TypeId_GameVikingLineupData = -1718713153
+
+func (*GameVikingLineupData) GetTypeId() int32 {
+ return -1718713153
+}
+
+func (_v *GameVikingLineupData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["robotid"].(float64); !_ok_ { err = errors.New("robotid error"); return }; _v.Robotid = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) }
+ return
+}
+
+func DeserializeGameVikingLineupData(_buf map[string]interface{}) (*GameVikingLineupData, error) {
+ v := &GameVikingLineupData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}