上传竞技场代码
This commit is contained in:
parent
9bada8a427
commit
5b3f3e0ac5
@ -3,7 +3,7 @@
|
||||
"id": 1001,
|
||||
"eventtype": 1,
|
||||
"mustdo": 1,
|
||||
"citystory": 50002010,
|
||||
"citystory": 50020010,
|
||||
"citynormal": 50020030,
|
||||
"cityabnormal": 50020020,
|
||||
"worldtask": 500,
|
||||
@ -31,7 +31,7 @@
|
||||
"id": 1002,
|
||||
"eventtype": 1,
|
||||
"mustdo": 2,
|
||||
"citystory": 50002010,
|
||||
"citystory": 50020011,
|
||||
"citynormal": 50020030,
|
||||
"cityabnormal": 50020020,
|
||||
"worldtask": 510,
|
||||
@ -59,7 +59,7 @@
|
||||
"id": 1003,
|
||||
"eventtype": 1,
|
||||
"mustdo": 1,
|
||||
"citystory": 50002010,
|
||||
"citystory": 50020012,
|
||||
"citynormal": 50020030,
|
||||
"cityabnormal": 50020020,
|
||||
"worldtask": 520,
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"t": "21000001",
|
||||
"n": 40
|
||||
},
|
||||
"moneynumtop": {
|
||||
@ -25,8 +25,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 45
|
||||
"t": "21000001",
|
||||
"n": 41
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -50,8 +50,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 50
|
||||
"t": "21000001",
|
||||
"n": 42
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -75,8 +75,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 55
|
||||
"t": "21000001",
|
||||
"n": 43
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -100,8 +100,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 60
|
||||
"t": "21000001",
|
||||
"n": 44
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -125,8 +125,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 65
|
||||
"t": "21000001",
|
||||
"n": 45
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -150,8 +150,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 70
|
||||
"t": "21000001",
|
||||
"n": 46
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -175,8 +175,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 75
|
||||
"t": "21000001",
|
||||
"n": 47
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -200,8 +200,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 80
|
||||
"t": "21000001",
|
||||
"n": 48
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -225,8 +225,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 85
|
||||
"t": "21000001",
|
||||
"n": 49
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -250,8 +250,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 90
|
||||
"t": "21000001",
|
||||
"n": 50
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -275,8 +275,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 95
|
||||
"t": "21000001",
|
||||
"n": 51
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
@ -300,8 +300,8 @@
|
||||
"bagtagnum": 100,
|
||||
"tickettop": {
|
||||
"a": "item",
|
||||
"t": "10000005",
|
||||
"n": 100
|
||||
"t": "21000001",
|
||||
"n": 52
|
||||
},
|
||||
"moneynumtop": {
|
||||
"a": "attr",
|
||||
|
||||
@ -12661,5 +12661,42 @@
|
||||
"text": "用于商城购买消耗的礼卷"
|
||||
},
|
||||
"sale": []
|
||||
},
|
||||
{
|
||||
"id": "21000001",
|
||||
"name": {
|
||||
"key": "item_item_name_348",
|
||||
"text": "巨怪魔法车票"
|
||||
},
|
||||
"usetype": 2,
|
||||
"color": 5,
|
||||
"bagtype": 1,
|
||||
"index": 1,
|
||||
"special_type": 0,
|
||||
"time": 0,
|
||||
"reddottype": 0,
|
||||
"effects": "",
|
||||
"modelName": "",
|
||||
"box_id": 0,
|
||||
"synthetize_num": 0,
|
||||
"synthetize_deplete": [],
|
||||
"synthetize_get": [],
|
||||
"decompose_deplete": [],
|
||||
"decompose_get": [],
|
||||
"access": [],
|
||||
"use_skip": 11001,
|
||||
"upper_limit": 0,
|
||||
"img": "icon_mcs",
|
||||
"intr": {
|
||||
"key": "item_item_intr_356",
|
||||
"text": "用于巨怪商队内移动列车的消耗品"
|
||||
},
|
||||
"sale": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 1000
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -1,322 +1,322 @@
|
||||
[
|
||||
{
|
||||
"robotid": 10001,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "激奋的布卢尔",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800002
|
||||
},
|
||||
{
|
||||
"robotid": 10002,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "快乐的艾丽莎",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800003
|
||||
},
|
||||
{
|
||||
"robotid": 10003,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "朴素的希伯来",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800004
|
||||
},
|
||||
{
|
||||
"robotid": 10004,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "庄重的布卢姆",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800005
|
||||
},
|
||||
{
|
||||
"robotid": 10005,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "和谐的哈莉特",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800006
|
||||
},
|
||||
{
|
||||
"robotid": 10006,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "坦然的乔伊斯",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800007
|
||||
},
|
||||
{
|
||||
"robotid": 10007,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "苗条的赫瑟尔",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800008
|
||||
},
|
||||
{
|
||||
"robotid": 10008,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "可人的博斯韦",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800009
|
||||
},
|
||||
{
|
||||
"robotid": 10009,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "青春的罗瑞尔",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800010
|
||||
},
|
||||
{
|
||||
"robotid": 10010,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "开心的茉莉",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801001
|
||||
},
|
||||
{
|
||||
"robotid": 10011,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "幸运的蒂安娜",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801002
|
||||
},
|
||||
{
|
||||
"robotid": 10012,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "踊跃的波伊尔",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801003
|
||||
},
|
||||
{
|
||||
"robotid": 10013,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "愉快的爱罗拉",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801004
|
||||
},
|
||||
{
|
||||
"robotid": 10014,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "神奇的塔利娅",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801005
|
||||
},
|
||||
{
|
||||
"robotid": 10015,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "不凡的埃达",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801006
|
||||
},
|
||||
{
|
||||
"robotid": 10016,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "进步的汉塞尔",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801007
|
||||
},
|
||||
{
|
||||
"robotid": 10017,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "业余的桃乐丝",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801008
|
||||
},
|
||||
{
|
||||
"robotid": 10018,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "整洁的薇薇安",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801009
|
||||
},
|
||||
{
|
||||
"robotid": 10019,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "认真的塞尔特",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801010
|
||||
},
|
||||
{
|
||||
"robotid": 10020,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "友爱的白雪",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802001
|
||||
},
|
||||
{
|
||||
"robotid": 10021,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "聪明的玛娅",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802002
|
||||
},
|
||||
{
|
||||
"robotid": 10022,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "细心的阿拉丁",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802003
|
||||
},
|
||||
{
|
||||
"robotid": 10023,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "娇美的布赖特",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802004
|
||||
},
|
||||
{
|
||||
"robotid": 10024,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "无知的伊凡",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802005
|
||||
},
|
||||
{
|
||||
"robotid": 10025,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "冷魅的梅根",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802006
|
||||
},
|
||||
{
|
||||
"robotid": 10026,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "雍容的布罗德",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802007
|
||||
},
|
||||
{
|
||||
"robotid": 10027,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "害羞的夏洛特",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802008
|
||||
},
|
||||
{
|
||||
"robotid": 10028,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "热情的海洛伊",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802009
|
||||
},
|
||||
{
|
||||
"robotid": 10029,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "开朗的克莱儿",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802010
|
||||
},
|
||||
{
|
||||
"robotid": 10030,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "唠叨的巴比特",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800001
|
||||
},
|
||||
{
|
||||
"robotid": 10031,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "娇媚的波比",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800009
|
||||
},
|
||||
{
|
||||
"robotid": 10032,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "绝美的艾薇",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 800010
|
||||
},
|
||||
{
|
||||
"robotid": 10033,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "职业的艾尔玛",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801001
|
||||
},
|
||||
{
|
||||
"robotid": 10034,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "佩服的布鲁克",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801002
|
||||
},
|
||||
{
|
||||
"robotid": 10035,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "迷茫的鲍德温",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801003
|
||||
},
|
||||
{
|
||||
"robotid": 10036,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "摩登的鲁思",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 801004
|
||||
},
|
||||
{
|
||||
"robotid": 10037,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "火红的巴纳德",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802003
|
||||
},
|
||||
{
|
||||
"robotid": 10038,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "好动的杰奎琳",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802004
|
||||
},
|
||||
{
|
||||
"robotid": 10039,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "娇艳的丝特勒",
|
||||
"sex": 0,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802005
|
||||
},
|
||||
{
|
||||
"robotid": 10040,
|
||||
"icon": "hbkp_js_24003",
|
||||
"lvshow": 60,
|
||||
"name": "欢闹的妮莉雅",
|
||||
"sex": 1,
|
||||
"showid": "16010101"
|
||||
"showid": "16010101",
|
||||
"betterid": 802006
|
||||
}
|
||||
]
|
||||
@ -8,7 +8,7 @@
|
||||
"key": "skill_skill_atk_Name_125004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0014",
|
||||
"ico": "dzj_buff_dkts_pink",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -477,7 +477,7 @@
|
||||
"key": "skill_skill_atk_Name_135002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0020",
|
||||
"ico": "dzj_buff_mzts_orange",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -1076,7 +1076,7 @@
|
||||
"key": "skill_skill_atk_Name_124003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0006",
|
||||
"ico": "dzj_buff_mzts_orange",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -1598,7 +1598,7 @@
|
||||
"key": "skill_skill_atk_Name_134006011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0024",
|
||||
"ico": "dzj_buff_sdts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -2242,7 +2242,7 @@
|
||||
"key": "skill_skill_atk_Name_125001011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0029",
|
||||
"ico": "dzj_buff_fyts_green",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -3063,7 +3063,7 @@
|
||||
"key": "skill_skill_atk_Name_144005011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0019",
|
||||
"ico": "dzj_buff_gjts_red",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -3707,7 +3707,7 @@
|
||||
"key": "skill_skill_atk_Name_135001011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0026",
|
||||
"ico": "dzj_buff_gjts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -4418,7 +4418,7 @@
|
||||
"key": "skill_skill_atk_Name_124004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0027",
|
||||
"ico": "dzj_buff_mzts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -4902,7 +4902,7 @@
|
||||
"key": "skill_skill_atk_Name_144006011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0019",
|
||||
"ico": "dzj_buff_gjts_red",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -5590,7 +5590,7 @@
|
||||
"key": "skill_skill_atk_Name_115005011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0001",
|
||||
"ico": "dzj_buff_fyts_red",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -5968,7 +5968,7 @@
|
||||
"key": "skill_skill_atk_Name_115004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0020",
|
||||
"ico": "dzj_buff_mzts_orange",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -6602,7 +6602,7 @@
|
||||
"key": "skill_skill_atk_Name_124002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0029",
|
||||
"ico": "dzj_buff_fyts_green",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -7048,7 +7048,7 @@
|
||||
"key": "skill_skill_atk_Name_114007011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0029",
|
||||
"ico": "dzj_buff_fyts_green",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -7563,7 +7563,7 @@
|
||||
"key": "skill_skill_atk_Name_114003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0031",
|
||||
"ico": "dzj_buff_sdts_red",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -8047,7 +8047,7 @@
|
||||
"key": "skill_skill_atk_Name_145003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0016",
|
||||
"ico": "dzj_buff_smts_red",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -8507,7 +8507,7 @@
|
||||
"key": "skill_skill_atk_Name_135003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -8866,7 +8866,7 @@
|
||||
"key": "skill_skill_atk_Name_113003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -9365,7 +9365,7 @@
|
||||
"key": "skill_skill_atk_Name_135005011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -9859,7 +9859,7 @@
|
||||
"key": "skill_skill_atk_Name_115001011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -9985,7 +9985,7 @@
|
||||
"key": "skill_skill_atk_Name_145001011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -10856,7 +10856,7 @@
|
||||
"key": "skill_skill_atk_Name_124008011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -11375,7 +11375,7 @@
|
||||
"key": "skill_skill_atk_Name_134008011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -12479,7 +12479,7 @@
|
||||
"key": "skill_skill_atk_Name_143002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -12837,7 +12837,7 @@
|
||||
"key": "skill_skill_atk_Name_114006011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -12956,7 +12956,7 @@
|
||||
"key": "skill_skill_atk_Name_135006011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -13374,7 +13374,7 @@
|
||||
"key": "skill_skill_atk_Name_134002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -13758,7 +13758,7 @@
|
||||
"key": "skill_skill_atk_Name_124005011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -14190,7 +14190,7 @@
|
||||
"key": "skill_skill_atk_Name_125003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -14771,7 +14771,7 @@
|
||||
"key": "skill_skill_atk_Name_133003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -15617,7 +15617,7 @@
|
||||
"key": "skill_skill_atk_Name_134003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -16101,7 +16101,7 @@
|
||||
"key": "skill_skill_atk_Name_144004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -16544,7 +16544,7 @@
|
||||
"key": "skill_skill_atk_Name_134007011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -17472,7 +17472,7 @@
|
||||
"key": "skill_skill_atk_Name_113001011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -17959,7 +17959,7 @@
|
||||
"key": "skill_skill_atk_Name_114005011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -18531,7 +18531,7 @@
|
||||
"key": "skill_skill_atk_Name_143003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -19104,7 +19104,7 @@
|
||||
"key": "skill_skill_atk_Name_115002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -19468,7 +19468,7 @@
|
||||
"key": "skill_skill_atk_Name_113005011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -19775,7 +19775,7 @@
|
||||
"key": "skill_skill_atk_Name_124009011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -20294,7 +20294,7 @@
|
||||
"key": "skill_skill_atk_Name_124001011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -22882,7 +22882,7 @@
|
||||
"key": "skill_skill_atk_Name_124007011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -23002,7 +23002,7 @@
|
||||
"key": "skill_skill_atk_Name_123002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -23120,7 +23120,7 @@
|
||||
"key": "skill_skill_atk_Name_123004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -24114,7 +24114,7 @@
|
||||
"key": "skill_skill_atk_Name_115003011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -24583,7 +24583,7 @@
|
||||
"key": "skill_skill_atk_Name_143004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -24877,7 +24877,7 @@
|
||||
"key": "skill_skill_atk_Name_135004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -24993,7 +24993,7 @@
|
||||
"key": "skill_skill_atk_Name_124006011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -25109,7 +25109,7 @@
|
||||
"key": "skill_skill_atk_Name_114004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -25225,7 +25225,7 @@
|
||||
"key": "skill_skill_atk_Name_133004011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -25342,7 +25342,7 @@
|
||||
"key": "skill_skill_atk_Name_134005011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -25712,7 +25712,7 @@
|
||||
"key": "skill_skill_atk_Name_133006011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -25830,7 +25830,7 @@
|
||||
"key": "skill_skill_atk_Name_125002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -26242,7 +26242,7 @@
|
||||
"key": "skill_skill_atk_Name_144002011",
|
||||
"text": "队长技"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
@ -26362,7 +26362,7 @@
|
||||
"key": "skill_skill_atk_Name_111021011",
|
||||
"text": "友方无法受到控制"
|
||||
},
|
||||
"ico": "jn_dzj_0021",
|
||||
"ico": "dzj_buff_dkts_blue",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "",
|
||||
|
||||
@ -48,7 +48,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
|
||||
info = &pb.DBArenaUser{
|
||||
Uid: session.GetUserId(),
|
||||
Name: user.Name,
|
||||
Avatar: user.Avatar,
|
||||
// Avatar: user.Avatar,
|
||||
Lv: user.Lv,
|
||||
Sex: user.Gender,
|
||||
Skin: user.CurSkin,
|
||||
@ -74,7 +74,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.ArenaInfoReq) (errd
|
||||
} else {
|
||||
info.Lv = user.Lv
|
||||
info.Name = user.Name
|
||||
info.Avatar = user.Avatar
|
||||
// info.Avatar = user.Avatar
|
||||
info.Sex = user.Gender
|
||||
info.Skin = user.CurSkin
|
||||
this.module.modelArena.recoverTicket(session, info)
|
||||
|
||||
@ -54,7 +54,7 @@ func (this *apiComp) Rank(session comm.IUserSession, req *pb.ArenaRankReq) (errd
|
||||
players[i] = &pb.ArenaPlayer{
|
||||
Uid: v.Uid,
|
||||
Name: v.Name,
|
||||
Avatar: v.Avatar,
|
||||
// Avatar: v.Avatar,
|
||||
Lv: v.Lv,
|
||||
Dan: v.Dan,
|
||||
Rank: rank,
|
||||
|
||||
@ -78,8 +78,10 @@ func (this *modelArena) queryArenaPlayer(uId string) (result *pb.ArenaPlayer, er
|
||||
result = &pb.ArenaPlayer{
|
||||
Uid: temp.Uid,
|
||||
Name: temp.Name,
|
||||
Avatar: temp.Avatar,
|
||||
// Avatar: temp.Avatar,
|
||||
Lv: temp.Lv,
|
||||
Sex: temp.Sex,
|
||||
Skin: temp.Skin,
|
||||
Dan: temp.Dan,
|
||||
Integral: temp.Integral,
|
||||
Defend: temp.Defend,
|
||||
@ -132,8 +134,9 @@ func (this *modelArena) updateArenaUserInfo(info *pb.DBArenaUser) (err error) {
|
||||
"loc": []float64{float64(dan), float64(rand.Int31n(100)) / 1000.0},
|
||||
"isdef": info.Isdef,
|
||||
"name": info.Name,
|
||||
"avatar": info.Avatar,
|
||||
"lv": info.Lv,
|
||||
"sex": info.Sex,
|
||||
"skin": info.Skin,
|
||||
})
|
||||
return
|
||||
}
|
||||
@ -238,7 +241,7 @@ func (this *modelArena) matcheAI(dan, num int32) (results []*pb.ArenaPlayer, err
|
||||
results[i] = &pb.ArenaPlayer{
|
||||
Uid: fmt.Sprintf("ai_%s", id.NewXId()),
|
||||
Name: robots[i].Name,
|
||||
Avatar: robots[i].Icon,
|
||||
// Avatar: robots[i].Icon,
|
||||
Lv: robots[i].Lvshow,
|
||||
Sex: robots[i].Sex,
|
||||
Skin: robots[i].Showid,
|
||||
@ -314,7 +317,7 @@ func (this *modelArena) matchePlayer(uid string, dan, num int32) (results []*pb.
|
||||
results = append(results, &pb.ArenaPlayer{
|
||||
Uid: temp.Uid,
|
||||
Name: temp.Name,
|
||||
Avatar: temp.Avatar,
|
||||
// Avatar: temp.Avatar,
|
||||
Lv: temp.Lv,
|
||||
Dan: temp.Dan,
|
||||
Integral: temp.Integral,
|
||||
|
||||
@ -148,7 +148,7 @@ type ArenaPlayer struct {
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
|
||||
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"`
|
||||
Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像
|
||||
// string avatar = 3; //@go_tags(`bson:"avatar"`) 头像
|
||||
Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级
|
||||
Sex int32 `protobuf:"varint,5,opt,name=sex,proto3" json:"sex"` //性别
|
||||
Skin string `protobuf:"bytes,6,opt,name=skin,proto3" json:"skin"` //时装
|
||||
@ -207,13 +207,6 @@ func (x *ArenaPlayer) GetName() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *ArenaPlayer) GetAvatar() string {
|
||||
if x != nil {
|
||||
return x.Avatar
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *ArenaPlayer) GetLv() int32 {
|
||||
if x != nil {
|
||||
return x.Lv
|
||||
@ -539,7 +532,7 @@ type DBArenaUser struct {
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id
|
||||
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //玩家名称
|
||||
Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar" bson:"avatar"` //头像
|
||||
// string avatar = 3; //@go_tags(`bson:"avatar"`) 头像
|
||||
Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv" bson:"lv"` //等级
|
||||
Integral int32 `protobuf:"varint,5,opt,name=integral,proto3" json:"integral"` //积分
|
||||
Sex int32 `protobuf:"varint,6,opt,name=sex,proto3" json:"sex"` //性别
|
||||
@ -610,13 +603,6 @@ func (x *DBArenaUser) GetName() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBArenaUser) GetAvatar() string {
|
||||
if x != nil {
|
||||
return x.Avatar
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBArenaUser) GetLv() int32 {
|
||||
if x != nil {
|
||||
return x.Lv
|
||||
@ -902,109 +888,106 @@ var file_arena_arena_db_proto_rawDesc = []byte{
|
||||
0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
|
||||
0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1d, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74,
|
||||
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52,
|
||||
0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0xcb, 0x02, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61,
|
||||
0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x22, 0xb3, 0x02, 0x0a, 0x0b, 0x41, 0x72, 0x65, 0x6e, 0x61,
|
||||
0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06,
|
||||
0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76,
|
||||
0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x06,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61,
|
||||
0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08,
|
||||
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
|
||||
0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b,
|
||||
0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x12, 0x2c, 0x0a, 0x06,
|
||||
0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44,
|
||||
0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72,
|
||||
0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73,
|
||||
0x61, 0x69, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x1c,
|
||||
0x0a, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0e,
|
||||
0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0d,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65,
|
||||
0x67, 0x72, 0x61, 0x6c, 0x22, 0x8e, 0x07, 0x0a, 0x0a, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42,
|
||||
0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18,
|
||||
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
|
||||
0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x35, 0x0a, 0x08, 0x70,
|
||||
0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e,
|
||||
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 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, 0x3e, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74,
|
||||
0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
|
||||
0x42, 0x61, 0x73, 0x65, 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, 0x41, 0x0a, 0x0c, 0x6a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72,
|
||||
0x74, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72,
|
||||
0x6f, 0x42, 0x61, 0x73, 0x65, 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, 0x47, 0x0a, 0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50,
|
||||
0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
|
||||
0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 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, 0x50,
|
||||
0x0a, 0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65,
|
||||
0x72, 0x74, 0x79, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x44, 0x42, 0x48, 0x65,
|
||||
0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65,
|
||||
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x68,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02,
|
||||
0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x73, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x65, 0x78, 0x12, 0x12,
|
||||
0x0a, 0x04, 0x73, 0x6b, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x6b,
|
||||
0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||
0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||
0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
|
||||
0x72, 0x61, 0x6e, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x0a,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42,
|
||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65,
|
||||
0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08,
|
||||
0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61,
|
||||
0x74, 0x69, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x66, 0x6f, 0x72, 0x6d,
|
||||
0x61, 0x74, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e,
|
||||
0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x63, 0x68,
|
||||
0x61, 0x6e, 0x67, 0x65, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x22, 0x8e, 0x07, 0x0a,
|
||||
0x0a, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x63, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12,
|
||||
0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73,
|
||||
0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x02, 0x6c, 0x76, 0x12, 0x35, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18,
|
||||
0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61,
|
||||
0x73, 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, 0x3e, 0x0a, 0x0b, 0x61, 0x64,
|
||||
0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 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, 0x41, 0x0a, 0x0c, 0x6a, 0x75,
|
||||
0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x1d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 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, 0x47, 0x0a,
|
||||
0x0e, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18,
|
||||
0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61,
|
||||
0x73, 0x65, 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, 0x50, 0x0a, 0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63,
|
||||
0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x09, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x22, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x48,
|
||||
0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
|
||||
0x12, 0x32, 0x0a, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x46,
|
||||
0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x66, 0x65, 0x74,
|
||||
0x74, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b,
|
||||
0x69, 0x6c, 0x6c, 0x18, 0x0b, 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, 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,
|
||||
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, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65,
|
||||
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||
0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74,
|
||||
0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 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, 0xae, 0x02, 0x0a, 0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e,
|
||||
0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12,
|
||||
0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74,
|
||||
0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01,
|
||||
0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x64,
|
||||
0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x64,
|
||||
0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a,
|
||||
0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
|
||||
0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74,
|
||||
0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42,
|
||||
0x61, 0x73, 0x65, 0x52, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64,
|
||||
0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05,
|
||||
0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61,
|
||||
0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52,
|
||||
0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0xb4, 0x06, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65,
|
||||
0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06,
|
||||
0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76,
|
||||
0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x11, 0x68, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65,
|
||||
0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x32, 0x0a, 0x07, 0x66, 0x65, 0x74, 0x74,
|
||||
0x65, 0x72, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65,
|
||||
0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x2e, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x52, 0x07, 0x66, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x0b,
|
||||
0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0b, 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, 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, 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, 0x1a, 0x44, 0x0a, 0x16, 0x48,
|
||||
0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||
0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72,
|
||||
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
|
||||
0x6b, 0x65, 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, 0xae, 0x02,
|
||||
0x0a, 0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
|
||||
0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x03, 0x62, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69,
|
||||
0x73, 0x77, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69,
|
||||
0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x04, 0x20,
|
||||
0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x12, 0x18, 0x0a,
|
||||
0x07, 0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
|
||||
0x72, 0x69, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x69, 0x76, 0x61, 0x6c,
|
||||
0x6e, 0x61, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x69, 0x76, 0x61,
|
||||
0x6c, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73,
|
||||
0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12,
|
||||
0x21, 0x0a, 0x05, 0x66, 0x6f, 0x72, 0x6d, 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
|
||||
0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x61, 0x73, 0x65, 0x52, 0x05, 0x66, 0x6f, 0x72,
|
||||
0x6d, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61,
|
||||
0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x61, 0x64, 0x64, 0x69, 0x6e, 0x74, 0x65,
|
||||
0x67, 0x72, 0x61, 0x6c, 0x12, 0x28, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x18, 0x0a, 0x20,
|
||||
0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f,
|
||||
0x72, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x22, 0x9c,
|
||||
0x06, 0x0a, 0x0b, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x55, 0x73, 0x65, 0x72, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
|
||||
0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
|
||||
0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x02, 0x6c, 0x76, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||
0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||
0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, 0x78, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73,
|
||||
|
||||
@ -12,11 +12,11 @@ import "errors"
|
||||
|
||||
type GameRobotData struct {
|
||||
Robotid int32
|
||||
Icon string
|
||||
Lvshow int32
|
||||
Name string
|
||||
Sex int32
|
||||
Showid string
|
||||
Betterid int32
|
||||
}
|
||||
|
||||
const TypeId_GameRobotData = 2060865080
|
||||
@ -27,11 +27,11 @@ func (*GameRobotData) GetTypeId() int32 {
|
||||
|
||||
func (_v *GameRobotData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ 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; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lvshow"].(float64); !_ok_ { err = errors.New("lvshow error"); return }; _v.Lvshow = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sex"].(float64); !_ok_ { err = errors.New("sex error"); return }; _v.Sex = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Showid, _ok_ = _buf["showid"].(string); !_ok_ { err = errors.New("showid error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["betterid"].(float64); !_ok_ { err = errors.New("betterid error"); return }; _v.Betterid = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user