Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
3cc0d746f9
@ -3,7 +3,7 @@
|
||||
"id": 1,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_01",
|
||||
"text": "测试类型名字1"
|
||||
"text": "守护者们的成长"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
@ -11,7 +11,7 @@
|
||||
"id": 2,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_02",
|
||||
"text": "测试类型名字2"
|
||||
"text": "生财有道"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
@ -22,77 +22,5 @@
|
||||
"text": "测试类型名字3"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_04",
|
||||
"text": "测试类型名字4"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_05",
|
||||
"text": "测试类型名字5"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_06",
|
||||
"text": "测试类型名字6"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_07",
|
||||
"text": "测试类型名字7"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_08",
|
||||
"text": "测试类型名字8"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_09",
|
||||
"text": "测试类型名字9"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_10",
|
||||
"text": "测试类型名字10"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_11",
|
||||
"text": "测试类型名字11"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"achieve_group_id": {
|
||||
"key": "achieve_achieve_all_achieve_group_id_12",
|
||||
"text": "测试类型名字12"
|
||||
},
|
||||
"achieve_group_icon": "cj_icon_rk_ty"
|
||||
}
|
||||
]
|
||||
@ -1,10 +1,10 @@
|
||||
[
|
||||
{
|
||||
"key": 1001,
|
||||
"key": 1019,
|
||||
"task_group_from": 1,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_01",
|
||||
"text": "成就任务测试名字1"
|
||||
"key": "achieve_achieve_task_task_name_19",
|
||||
"text": "让邦尼兔升到20级"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -23,11 +23,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1002,
|
||||
"key": 1020,
|
||||
"task_group_from": 1,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_02",
|
||||
"text": "成就任务测试名字2"
|
||||
"key": "achieve_achieve_task_task_name_20",
|
||||
"text": "让警长升到20级"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -46,11 +46,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1003,
|
||||
"key": 1021,
|
||||
"task_group_from": 1,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_03",
|
||||
"text": "成就任务测试名字3"
|
||||
"key": "achieve_achieve_task_task_name_21",
|
||||
"text": "让暴芙那特升到20级"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -69,11 +69,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1004,
|
||||
"key": 1022,
|
||||
"task_group_from": 2,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_04",
|
||||
"text": "成就任务测试名字4"
|
||||
"key": "achieve_achieve_task_task_name_22",
|
||||
"text": "强化成功5次"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -92,11 +92,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1005,
|
||||
"key": 1023,
|
||||
"task_group_from": 2,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_05",
|
||||
"text": "成就任务测试名字5"
|
||||
"key": "achieve_achieve_task_task_name_23",
|
||||
"text": "强化成功10次"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -115,11 +115,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1006,
|
||||
"key": 1024,
|
||||
"task_group_from": 2,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_06",
|
||||
"text": "成就任务测试名字6"
|
||||
"key": "achieve_achieve_task_task_name_24",
|
||||
"text": "强化成功20次"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -138,11 +138,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1007,
|
||||
"key": 1025,
|
||||
"task_group_from": 3,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_07",
|
||||
"text": "成就任务测试名字7"
|
||||
"key": "achieve_achieve_task_task_name_25",
|
||||
"text": "完成1次自动战斗"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -161,11 +161,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1008,
|
||||
"key": 1026,
|
||||
"task_group_from": 3,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_08",
|
||||
"text": "成就任务测试名字8"
|
||||
"key": "achieve_achieve_task_task_name_26",
|
||||
"text": "完成10次自动战斗"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -184,11 +184,11 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1009,
|
||||
"key": 1027,
|
||||
"task_group_from": 3,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_09",
|
||||
"text": "成就任务测试名字9"
|
||||
"key": "achieve_achieve_task_task_name_27",
|
||||
"text": "完成20次自动战斗"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
@ -205,626 +205,5 @@
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1010,
|
||||
"task_group_from": 4,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_10",
|
||||
"text": "成就任务测试名字10"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000010,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1011,
|
||||
"task_group_from": 4,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_11",
|
||||
"text": "成就任务测试名字11"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000011,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1012,
|
||||
"task_group_from": 4,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_12",
|
||||
"text": "成就任务测试名字12"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000012,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1013,
|
||||
"task_group_from": 5,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_13",
|
||||
"text": "成就任务测试名字13"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000013,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1014,
|
||||
"task_group_from": 5,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_14",
|
||||
"text": "成就任务测试名字14"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000014,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1015,
|
||||
"task_group_from": 5,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_15",
|
||||
"text": "成就任务测试名字15"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000015,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1016,
|
||||
"task_group_from": 6,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_16",
|
||||
"text": "成就任务测试名字16"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000016,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1017,
|
||||
"task_group_from": 6,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_17",
|
||||
"text": "成就任务测试名字17"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000017,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1018,
|
||||
"task_group_from": 6,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_18",
|
||||
"text": "成就任务测试名字18"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000018,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1019,
|
||||
"task_group_from": 7,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_19",
|
||||
"text": "成就任务测试名字19"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000019,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1020,
|
||||
"task_group_from": 7,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_20",
|
||||
"text": "成就任务测试名字20"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000020,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1021,
|
||||
"task_group_from": 7,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_21",
|
||||
"text": "成就任务测试名字21"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000021,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1022,
|
||||
"task_group_from": 8,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_22",
|
||||
"text": "成就任务测试名字22"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000022,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1023,
|
||||
"task_group_from": 8,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_23",
|
||||
"text": "成就任务测试名字23"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000023,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1024,
|
||||
"task_group_from": 8,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_24",
|
||||
"text": "成就任务测试名字24"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000024,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1025,
|
||||
"task_group_from": 9,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_25",
|
||||
"text": "成就任务测试名字25"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000025,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1026,
|
||||
"task_group_from": 9,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_26",
|
||||
"text": "成就任务测试名字26"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000026,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1027,
|
||||
"task_group_from": 9,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_27",
|
||||
"text": "成就任务测试名字27"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000027,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1028,
|
||||
"task_group_from": 10,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_28",
|
||||
"text": "成就任务测试名字28"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000028,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1029,
|
||||
"task_group_from": 10,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_29",
|
||||
"text": "成就任务测试名字29"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000029,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1030,
|
||||
"task_group_from": 10,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_30",
|
||||
"text": "成就任务测试名字30"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000030,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1031,
|
||||
"task_group_from": 11,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_31",
|
||||
"text": "成就任务测试名字31"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000031,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1032,
|
||||
"task_group_from": 11,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_32",
|
||||
"text": "成就任务测试名字32"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000032,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1033,
|
||||
"task_group_from": 11,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_33",
|
||||
"text": "成就任务测试名字33"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000033,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1034,
|
||||
"task_group_from": 12,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_34",
|
||||
"text": "成就任务测试名字34"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000034,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 20000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1035,
|
||||
"task_group_from": 12,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_35",
|
||||
"text": "成就任务测试名字35"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000035,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 30000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 1036,
|
||||
"task_group_from": 12,
|
||||
"task_name": {
|
||||
"key": "achieve_achieve_task_task_name_36",
|
||||
"text": "成就任务测试名字36"
|
||||
},
|
||||
"task_desc": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"task_buried": 16000036,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "gold",
|
||||
"n": 10000
|
||||
}
|
||||
],
|
||||
"jump": 103
|
||||
}
|
||||
]
|
||||
@ -31709,7 +31709,7 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1098",
|
||||
"text": "让邦尼兔升到2级"
|
||||
"text": "让邦尼兔升到20级"
|
||||
},
|
||||
"type": 4,
|
||||
"valid": 0,
|
||||
@ -31720,7 +31720,7 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 2,
|
||||
"value": 20,
|
||||
"filter": [
|
||||
24004
|
||||
],
|
||||
@ -31736,7 +31736,7 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1099",
|
||||
"text": "让邦尼兔升到3级"
|
||||
"text": "让警长升到20级"
|
||||
},
|
||||
"type": 4,
|
||||
"valid": 0,
|
||||
@ -31747,9 +31747,9 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 3,
|
||||
"value": 20,
|
||||
"filter": [
|
||||
24004
|
||||
24001
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -31763,7 +31763,7 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1100",
|
||||
"text": "让邦尼兔升到4级"
|
||||
"text": "让暴芙那特升到20级"
|
||||
},
|
||||
"type": 4,
|
||||
"valid": 0,
|
||||
@ -31774,9 +31774,9 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 4,
|
||||
"value": 20,
|
||||
"filter": [
|
||||
24004
|
||||
24008
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -31790,9 +31790,9 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1101",
|
||||
"text": "让邦尼兔升到5级"
|
||||
"text": "强化成功5次"
|
||||
},
|
||||
"type": 4,
|
||||
"type": 47,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
@ -31802,9 +31802,7 @@
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 5,
|
||||
"filter": [
|
||||
24004
|
||||
],
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
@ -31817,9 +31815,9 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1102",
|
||||
"text": "让邦尼兔升到6级"
|
||||
"text": "强化成功10次"
|
||||
},
|
||||
"type": 4,
|
||||
"type": 47,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
@ -31828,10 +31826,8 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 6,
|
||||
"filter": [
|
||||
24004
|
||||
],
|
||||
"value": 10,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
@ -31844,9 +31840,9 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1103",
|
||||
"text": "让邦尼兔升到7级"
|
||||
"text": "强化成功20次"
|
||||
},
|
||||
"type": 4,
|
||||
"type": 47,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
@ -31855,10 +31851,8 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 7,
|
||||
"filter": [
|
||||
24004
|
||||
],
|
||||
"value": 20,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
@ -31871,7 +31865,7 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1104",
|
||||
"text": "让邦尼兔升到8级"
|
||||
"text": "完成1次自动战斗"
|
||||
},
|
||||
"type": 4,
|
||||
"valid": 0,
|
||||
@ -31882,10 +31876,8 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 8,
|
||||
"filter": [
|
||||
24004
|
||||
],
|
||||
"value": 1,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
@ -31898,7 +31890,7 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1105",
|
||||
"text": "让邦尼兔升到9级"
|
||||
"text": "完成10次自动战斗"
|
||||
},
|
||||
"type": 4,
|
||||
"valid": 0,
|
||||
@ -31909,10 +31901,8 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 9,
|
||||
"filter": [
|
||||
24004
|
||||
],
|
||||
"value": 10,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
@ -31925,7 +31915,7 @@
|
||||
"type_sp": 1,
|
||||
"tasktxt": {
|
||||
"key": "buried_buried_condi_tasktxt_1106",
|
||||
"text": "让邦尼兔升到10级"
|
||||
"text": "完成20次自动战斗"
|
||||
},
|
||||
"type": 4,
|
||||
"valid": 0,
|
||||
@ -31936,10 +31926,8 @@
|
||||
},
|
||||
"Npc_event_type": 1,
|
||||
"NPC": 103,
|
||||
"value": 10,
|
||||
"filter": [
|
||||
24004
|
||||
],
|
||||
"value": 20,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
{
|
||||
|
||||
@ -27,8 +27,8 @@
|
||||
"text": "普通宝箱，好东西"
|
||||
},
|
||||
"icon": "item_17010001",
|
||||
"group": 18001001,
|
||||
"cd": 5,
|
||||
"group": 13011006,
|
||||
"cd": 300,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -43,8 +43,8 @@
|
||||
"text": "稀有宝箱，好东西"
|
||||
},
|
||||
"icon": "item_17020001",
|
||||
"group": 18001002,
|
||||
"cd": 10,
|
||||
"group": 13011006,
|
||||
"cd": 300,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -59,8 +59,8 @@
|
||||
"text": "珍贵宝箱，好东西"
|
||||
},
|
||||
"icon": "item_17030001",
|
||||
"group": 18001003,
|
||||
"cd": 15,
|
||||
"group": 13011006,
|
||||
"cd": 300,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -75,8 +75,8 @@
|
||||
"text": "完美宝箱，好东西"
|
||||
},
|
||||
"icon": "item_17050001",
|
||||
"group": 17050001,
|
||||
"cd": 20,
|
||||
"group": 13011006,
|
||||
"cd": 300,
|
||||
"weight": 1000
|
||||
},
|
||||
{
|
||||
@ -91,8 +91,8 @@
|
||||
"text": "七彩宝箱，好东西"
|
||||
},
|
||||
"icon": "item_17050002",
|
||||
"group": 17050002,
|
||||
"cd": 25,
|
||||
"group": 13011006,
|
||||
"cd": 300,
|
||||
"weight": 1000
|
||||
}
|
||||
]
|
||||
@ -6250,8 +6250,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"venturetype": 2,
|
||||
"ventureavatar": [
|
||||
"player"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -6328,8 +6330,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"venturetype": 2,
|
||||
"ventureavatar": [
|
||||
"player"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -6406,8 +6410,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"venturetype": 2,
|
||||
"ventureavatar": [
|
||||
"player"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
|
||||
@ -15,9 +15,11 @@
|
||||
"pos": 1,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_2",
|
||||
"text": "待定关卡"
|
||||
"text": "章节商店"
|
||||
},
|
||||
"jumpidList": []
|
||||
"jumpidList": [
|
||||
10063
|
||||
]
|
||||
},
|
||||
{
|
||||
"chapterid": 11001,
|
||||
@ -33,7 +35,7 @@
|
||||
"pos": 3,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_4",
|
||||
"text": "待定关卡"
|
||||
"text": "Boss来袭"
|
||||
},
|
||||
"jumpidList": []
|
||||
},
|
||||
@ -75,9 +77,11 @@
|
||||
"pos": 1,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_8",
|
||||
"text": "待定关卡"
|
||||
"text": "章节商店"
|
||||
},
|
||||
"jumpidList": []
|
||||
"jumpidList": [
|
||||
10063
|
||||
]
|
||||
},
|
||||
{
|
||||
"chapterid": 11002,
|
||||
@ -93,7 +97,7 @@
|
||||
"pos": 3,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_10",
|
||||
"text": "待定关卡"
|
||||
"text": "Boss来袭"
|
||||
},
|
||||
"jumpidList": []
|
||||
},
|
||||
@ -133,9 +137,11 @@
|
||||
"pos": 1,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_14",
|
||||
"text": "待定关卡"
|
||||
"text": "章节商店"
|
||||
},
|
||||
"jumpidList": []
|
||||
"jumpidList": [
|
||||
10063
|
||||
]
|
||||
},
|
||||
{
|
||||
"chapterid": 11003,
|
||||
@ -151,7 +157,7 @@
|
||||
"pos": 3,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_16",
|
||||
"text": "待定关卡"
|
||||
"text": "Boss来袭"
|
||||
},
|
||||
"jumpidList": []
|
||||
},
|
||||
@ -189,9 +195,11 @@
|
||||
"pos": 1,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_20",
|
||||
"text": "待定关卡"
|
||||
"text": "章节商店"
|
||||
},
|
||||
"jumpidList": []
|
||||
"jumpidList": [
|
||||
10063
|
||||
]
|
||||
},
|
||||
{
|
||||
"chapterid": 11004,
|
||||
@ -207,7 +215,7 @@
|
||||
"pos": 3,
|
||||
"venturetext": {
|
||||
"key": "mainchapter_main_venture_venturetext_22",
|
||||
"text": "待定关卡"
|
||||
"text": "Boss来袭"
|
||||
},
|
||||
"jumpidList": []
|
||||
},
|
||||
|
||||
@ -2285,7 +2285,18 @@
|
||||
{
|
||||
"id": "stonehenge",
|
||||
"subId": "",
|
||||
"currencyField": []
|
||||
"currencyField": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "stonehengeroom",
|
||||
@ -2300,6 +2311,11 @@
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -2321,6 +2337,11 @@
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -2337,6 +2358,11 @@
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -2358,6 +2384,11 @@
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -2387,7 +2418,7 @@
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
@ -2403,7 +2434,7 @@
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000037",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
@ -2411,22 +2442,66 @@
|
||||
{
|
||||
"id": "stonehengeweek",
|
||||
"subId": "",
|
||||
"currencyField": []
|
||||
"currencyField": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "stonehengeachieve",
|
||||
"subId": "",
|
||||
"currencyField": []
|
||||
"currencyField": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "stonehengeillustrated",
|
||||
"subId": "",
|
||||
"currencyField": []
|
||||
"currencyField": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "stonehengebuffinfo",
|
||||
"subId": "",
|
||||
"currencyField": []
|
||||
"currencyField": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000036",
|
||||
"n": 0
|
||||
},
|
||||
{
|
||||
"a": "item",
|
||||
"t": "10000039",
|
||||
"n": 0
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "stonehengebox",
|
||||
|
||||
88
modules/entertainment/api_boxreward.go
Normal file
88
modules/entertainment/api_boxreward.go
Normal file
@ -0,0 +1,88 @@
|
||||
package entertainment
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
)
|
||||
|
||||
//参数校验
|
||||
func (this *apiComp) BoxRewardCheck(session comm.IUserSession, req *pb.EntertainBoxRewardReq) (errdata *pb.ErrorData) {
|
||||
if req.Index < 0 {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 赛季奖励
|
||||
func (this *apiComp) BoxReward(session comm.IUserSession, req *pb.EntertainBoxRewardReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
list *pb.DBXXLData
|
||||
err error
|
||||
atno []*pb.UserAtno
|
||||
boxid int32
|
||||
)
|
||||
list, err = this.module.model.getEntertainmList(session.GetUserId())
|
||||
if err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if len(list.Box) <= int(req.Index) {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
// 校验时间
|
||||
if configure.Now().Unix() >= list.Box[req.Index].Opentime {
|
||||
boxid = list.Box[req.Index].Boxid
|
||||
list.Box = append(list.Box[:req.Index], list.Box[req.Index+1:]...)
|
||||
this.module.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
|
||||
"box": list.Box,
|
||||
})
|
||||
// 发奖
|
||||
if conf, err := this.module.configure.GetGameConsumeBoxConf(boxid); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
} else {
|
||||
user, err := this.module.ModuleUser.GetUser(session.GetUserId())
|
||||
if err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
reward := this.module.ModuleTools.GetGroupDataByLottery(conf.Group, user.Vip, user.Lv)
|
||||
if errdata, atno = this.module.DispenseAtno(session, reward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
} else { // 时间没到不能开启
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_EntertainBoxEndTime,
|
||||
Title: pb.ErrorCode_EntertainBoxEndTime.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "boxreward", &pb.EntertainBoxRewardResp{
|
||||
Box: list.Box,
|
||||
Reward: atno,
|
||||
})
|
||||
return
|
||||
}
|
||||
@ -17,6 +17,7 @@ const (
|
||||
game_integral = "game_integral.json"
|
||||
game_consumeIntegral = "game_consumeintegral.json"
|
||||
game_playingmethod = "game_playingmethod.json"
|
||||
consume_box = "game_consumebox.json"
|
||||
)
|
||||
|
||||
// /配置管理组件
|
||||
@ -37,6 +38,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
game_integral: cfg.NewGameIntegral,
|
||||
game_consumeIntegral: cfg.NewGameConsumeIntegral,
|
||||
game_playingmethod: cfg.NewGamePlayingMethod,
|
||||
consume_box: cfg.NewGameConsumeBox,
|
||||
})
|
||||
configure.RegisterConfigure(game_block, cfg.NewGameBlock, this.LoadGameBlock)
|
||||
|
||||
@ -197,3 +199,37 @@ func (this *configureComp) GetGameConsumeIntegralByKey(key int32) (conf *cfg.Gam
|
||||
err = comm.NewNotFoundConfErr(moduleName, game_playingmethod, key)
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetGameConsumeBoxConf(boxid int32) (conf *cfg.GameConsumeBoxData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(consume_box); err == nil {
|
||||
if configure, ok := v.(*cfg.GameConsumeBox); ok {
|
||||
if conf = configure.Get(boxid); conf != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
err = comm.NewNotFoundConfErr(moduleName, consume_box, boxid)
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetGameRandomConsumeBoxConf() (conf *cfg.GameConsumeBoxData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
szWeight []int32
|
||||
boxid []int32
|
||||
)
|
||||
if v, err = this.GetConfigure(consume_box); err == nil {
|
||||
if configure, ok := v.(*cfg.GameConsumeBox); ok {
|
||||
for _, v1 := range configure.GetDataList() {
|
||||
szWeight = append(szWeight, v1.Weight)
|
||||
boxid = append(boxid, v1.Boxid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
conf, err = this.GetGameConsumeBoxConf(boxid[comm.GetRandW(szWeight)])
|
||||
return
|
||||
}
|
||||
|
||||
@ -6,6 +6,7 @@ import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/sys/timewheel"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
"time"
|
||||
|
||||
@ -534,16 +535,17 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
|
||||
winindex int32
|
||||
bReward bool
|
||||
res []*cfg.Gameatn
|
||||
winner string
|
||||
winner *pb.PlayerData
|
||||
lostPlayer *pb.PlayerData // 输的玩家
|
||||
box *pb.BoxData // 是否可以获得宝箱奖励
|
||||
)
|
||||
if this.operatetimer != nil {
|
||||
timewheel.Remove(this.operatetimer)
|
||||
}
|
||||
winner = this.player1.Userinfo.Uid
|
||||
winner = this.player1
|
||||
bReward = true
|
||||
if this.player1.Score < this.player2.Score {
|
||||
winner = this.player2.Userinfo.Uid
|
||||
winner = this.player2
|
||||
winindex = 1
|
||||
if len(this.szSession) == 1 { // 赢家是AI 的话不发奖
|
||||
bReward = false
|
||||
@ -551,7 +553,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
|
||||
}
|
||||
|
||||
if bReward { // 发奖
|
||||
if user, err := this.module.ModuleUser.GetUser(winner); err == nil {
|
||||
if user, err := this.module.ModuleUser.GetUser(winner.Userinfo.Uid); err == nil {
|
||||
if conf, err := this.module.configure.GetGameConsumeintegral(user.Consumeexp); err == nil {
|
||||
//res = append(res, conf.Onereward...) 这奖励手动领取
|
||||
res = append(res, conf.Rewards...)
|
||||
@ -564,7 +566,7 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
|
||||
}
|
||||
|
||||
// 失败的一方扣除卡
|
||||
if this.player1.Userinfo.Uid != winner {
|
||||
if this.player1 != winner {
|
||||
lostPlayer = this.player1
|
||||
} else {
|
||||
lostPlayer = this.player2
|
||||
@ -582,6 +584,25 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
|
||||
}
|
||||
}
|
||||
}
|
||||
// 查看能不能获得箱子
|
||||
if list, err := this.module.model.getEntertainmList(winner.Userinfo.Uid); err == nil {
|
||||
if len(list.Box) <= 3 { // 可以获得一个宝箱
|
||||
if c, err := this.module.configure.GetGameRandomConsumeBoxConf(); err == nil {
|
||||
if c.Color != 0 {
|
||||
box = &pb.BoxData{
|
||||
Boxid: c.Boxid,
|
||||
Opentime: int64(c.Cd) + configure.Now().Unix(),
|
||||
}
|
||||
list.Box = append(list.Box, box)
|
||||
// 写库
|
||||
this.module.model.modifyEntertainmList(winner.Userinfo.Uid, map[string]interface{}{
|
||||
"box": list.Box,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
// 修改房间状态
|
||||
this.Status = 2
|
||||
this.module.SendMsgSyncToSession(string(this.module.GetType()), "gameover", &pb.EntertainGameOverPush{
|
||||
@ -592,8 +613,9 @@ func (this *Room) GameOver() (errdata *pb.ErrorData) {
|
||||
},
|
||||
Power: "", // 清理权限
|
||||
Round: this.round,
|
||||
Win: winner,
|
||||
Win: winner.Userinfo.Uid,
|
||||
Reward: atno,
|
||||
Box: box,
|
||||
}, this.szSession...)
|
||||
return
|
||||
}
|
||||
|
||||
@ -530,6 +530,7 @@ func (this *MapData) SkillUp(pos int32, color int32, skillid int32, value int32,
|
||||
}
|
||||
|
||||
} else if skillid == 3 || skillid == 5 { //选中一个方块，消除周围一圈
|
||||
ids = append(ids, int(pos)) // 包含自己
|
||||
x := int(pos / Width)
|
||||
y := int(pos % Height)
|
||||
if x-1 >= 0 { // 左
|
||||
|
||||
@ -307,6 +307,61 @@ func (x *DBXXLMatch) GetCardid() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
type BoxData struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Boxid int32 `protobuf:"varint,1,opt,name=boxid,proto3" json:"boxid"` // 宝箱ID
|
||||
Opentime int64 `protobuf:"varint,2,opt,name=opentime,proto3" json:"opentime"` // 开启时间
|
||||
}
|
||||
|
||||
func (x *BoxData) Reset() {
|
||||
*x = BoxData{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_entertain_entertain_db_proto_msgTypes[4]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *BoxData) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*BoxData) ProtoMessage() {}
|
||||
|
||||
func (x *BoxData) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_entertain_entertain_db_proto_msgTypes[4]
|
||||
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 BoxData.ProtoReflect.Descriptor instead.
|
||||
func (*BoxData) Descriptor() ([]byte, []int) {
|
||||
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4}
|
||||
}
|
||||
|
||||
func (x *BoxData) GetBoxid() int32 {
|
||||
if x != nil {
|
||||
return x.Boxid
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *BoxData) GetOpentime() int64 {
|
||||
if x != nil {
|
||||
return x.Opentime
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type DBXXLData struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
@ -318,12 +373,14 @@ type DBXXLData struct {
|
||||
Card map[string]int32 `protobuf:"bytes,4,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0)
|
||||
Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 (客户端不用)
|
||||
Playtype []int32 `protobuf:"varint,6,rep,packed,name=playtype,proto3" json:"playtype"` // 每天随机玩法
|
||||
// map<int32,int64> boxid = 7; // 宝箱 key 宝箱id value 可领取的时间
|
||||
Box []*BoxData `protobuf:"bytes,7,rep,name=box,proto3" json:"box"`
|
||||
}
|
||||
|
||||
func (x *DBXXLData) Reset() {
|
||||
*x = DBXXLData{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_entertain_entertain_db_proto_msgTypes[4]
|
||||
mi := &file_entertain_entertain_db_proto_msgTypes[5]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -336,7 +393,7 @@ func (x *DBXXLData) String() string {
|
||||
func (*DBXXLData) ProtoMessage() {}
|
||||
|
||||
func (x *DBXXLData) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_entertain_entertain_db_proto_msgTypes[4]
|
||||
mi := &file_entertain_entertain_db_proto_msgTypes[5]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -349,7 +406,7 @@ func (x *DBXXLData) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBXXLData.ProtoReflect.Descriptor instead.
|
||||
func (*DBXXLData) Descriptor() ([]byte, []int) {
|
||||
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{4}
|
||||
return file_entertain_entertain_db_proto_rawDescGZIP(), []int{5}
|
||||
}
|
||||
|
||||
func (x *DBXXLData) GetId() string {
|
||||
@ -394,6 +451,13 @@ func (x *DBXXLData) GetPlaytype() []int32 {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBXXLData) GetBox() []*BoxData {
|
||||
if x != nil {
|
||||
return x.Box
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var File_entertain_entertain_db_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_entertain_entertain_db_proto_rawDesc = []byte{
|
||||
@ -429,27 +493,33 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
|
||||
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73,
|
||||
0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f,
|
||||
0x12, 0x16, 0x0a, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x22, 0xad, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x58,
|
||||
0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 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, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c,
|
||||
0x44, 0x61, 0x74, 0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
|
||||
0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64,
|
||||
0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61,
|
||||
0x74, 0x61, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x61,
|
||||
0x72, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
|
||||
0x03, 0x52, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79,
|
||||
0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79,
|
||||
0x74, 0x79, 0x70, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 0x1a,
|
||||
0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 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,
|
||||
0x52, 0x06, 0x63, 0x61, 0x72, 0x64, 0x69, 0x64, 0x22, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78, 0x44,
|
||||
0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65,
|
||||
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65,
|
||||
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x22, 0xc9, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44,
|
||||
0x61, 0x74, 0x61, 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, 0x2e, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18,
|
||||
0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74,
|
||||
0x61, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x2e,
|
||||
0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05,
|
||||
0x72, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70,
|
||||
0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, 0x79, 0x74, 0x79, 0x70,
|
||||
0x65, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f, 0x78, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x08,
|
||||
0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x1a, 0x39, 0x0a,
|
||||
0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
|
||||
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64,
|
||||
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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
||||
0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -464,28 +534,30 @@ func file_entertain_entertain_db_proto_rawDescGZIP() []byte {
|
||||
return file_entertain_entertain_db_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
|
||||
var file_entertain_entertain_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
|
||||
var file_entertain_entertain_db_proto_goTypes = []interface{}{
|
||||
(*MapData)(nil), // 0: MapData
|
||||
(*GirdeData)(nil), // 1: GirdeData
|
||||
(*PlayerData)(nil), // 2: PlayerData
|
||||
(*DBXXLMatch)(nil), // 3: DBXXLMatch
|
||||
(*DBXXLData)(nil), // 4: DBXXLData
|
||||
nil, // 5: DBXXLData.RewardEntry
|
||||
nil, // 6: DBXXLData.CardEntry
|
||||
(*BaseUserInfo)(nil), // 7: BaseUserInfo
|
||||
(*BoxData)(nil), // 4: BoxData
|
||||
(*DBXXLData)(nil), // 5: DBXXLData
|
||||
nil, // 6: DBXXLData.RewardEntry
|
||||
nil, // 7: DBXXLData.CardEntry
|
||||
(*BaseUserInfo)(nil), // 8: BaseUserInfo
|
||||
}
|
||||
var file_entertain_entertain_db_proto_depIdxs = []int32{
|
||||
1, // 0: MapData.data:type_name -> GirdeData
|
||||
7, // 1: PlayerData.userinfo:type_name -> BaseUserInfo
|
||||
7, // 2: DBXXLMatch.userinfo:type_name -> BaseUserInfo
|
||||
5, // 3: DBXXLData.reward:type_name -> DBXXLData.RewardEntry
|
||||
6, // 4: DBXXLData.card:type_name -> DBXXLData.CardEntry
|
||||
5, // [5:5] is the sub-list for method output_type
|
||||
5, // [5:5] is the sub-list for method input_type
|
||||
5, // [5:5] is the sub-list for extension type_name
|
||||
5, // [5:5] is the sub-list for extension extendee
|
||||
0, // [0:5] is the sub-list for field type_name
|
||||
8, // 1: PlayerData.userinfo:type_name -> BaseUserInfo
|
||||
8, // 2: DBXXLMatch.userinfo:type_name -> BaseUserInfo
|
||||
6, // 3: DBXXLData.reward:type_name -> DBXXLData.RewardEntry
|
||||
7, // 4: DBXXLData.card:type_name -> DBXXLData.CardEntry
|
||||
4, // 5: DBXXLData.box:type_name -> BoxData
|
||||
6, // [6:6] is the sub-list for method output_type
|
||||
6, // [6:6] is the sub-list for method input_type
|
||||
6, // [6:6] is the sub-list for extension type_name
|
||||
6, // [6:6] is the sub-list for extension extendee
|
||||
0, // [0:6] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_entertain_entertain_db_proto_init() }
|
||||
@ -544,6 +616,18 @@ func file_entertain_entertain_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_entertain_entertain_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*BoxData); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_entertain_entertain_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBXXLData); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -562,7 +646,7 @@ func file_entertain_entertain_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_entertain_entertain_db_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 7,
|
||||
NumMessages: 8,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
@ -401,7 +401,7 @@ type EntertainOperatorReq struct {
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` // 房间id
|
||||
Itype int32 `protobuf:"varint,2,opt,name=itype,proto3" json:"itype"` // 操作类型 0 默认交换元素
|
||||
Itype int32 `protobuf:"varint,2,opt,name=itype,proto3" json:"itype"` // 操作类型 0 默认交换元素 1 技能
|
||||
Curid int32 `protobuf:"varint,3,opt,name=curid,proto3" json:"curid"` // 当前key
|
||||
Targetid int32 `protobuf:"varint,4,opt,name=targetid,proto3" json:"targetid"` // 目标key
|
||||
}
|
||||
@ -647,6 +647,7 @@ type EntertainGameOverPush struct {
|
||||
Round int32 `protobuf:"varint,5,opt,name=round,proto3" json:"round"` // 回合数
|
||||
Win string `protobuf:"bytes,6,opt,name=win,proto3" json:"win"` // 谁赢了
|
||||
Reward []*UserAtno `protobuf:"bytes,7,rep,name=reward,proto3" json:"reward"` // 获胜的玩家获得的奖励
|
||||
Box *BoxData `protobuf:"bytes,8,opt,name=box,proto3" json:"box"` // 获得的宝箱
|
||||
}
|
||||
|
||||
func (x *EntertainGameOverPush) Reset() {
|
||||
@ -730,6 +731,13 @@ func (x *EntertainGameOverPush) GetReward() []*UserAtno {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *EntertainGameOverPush) GetBox() *BoxData {
|
||||
if x != nil {
|
||||
return x.Box
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
type EntertainEnterRoomPush struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
@ -1879,6 +1887,109 @@ func (x *EntertainGameReadyPush) GetP2Ready() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// 领取宝箱
|
||||
type EntertainBoxRewardReq struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Index int32 `protobuf:"varint,1,opt,name=index,proto3" json:"index"` // 传索引
|
||||
}
|
||||
|
||||
func (x *EntertainBoxRewardReq) Reset() {
|
||||
*x = EntertainBoxRewardReq{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_entertain_entertain_msg_proto_msgTypes[33]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *EntertainBoxRewardReq) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*EntertainBoxRewardReq) ProtoMessage() {}
|
||||
|
||||
func (x *EntertainBoxRewardReq) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_entertain_entertain_msg_proto_msgTypes[33]
|
||||
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 EntertainBoxRewardReq.ProtoReflect.Descriptor instead.
|
||||
func (*EntertainBoxRewardReq) Descriptor() ([]byte, []int) {
|
||||
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{33}
|
||||
}
|
||||
|
||||
func (x *EntertainBoxRewardReq) GetIndex() int32 {
|
||||
if x != nil {
|
||||
return x.Index
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type EntertainBoxRewardResp struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Box []*BoxData `protobuf:"bytes,1,rep,name=box,proto3" json:"box"`
|
||||
Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` // 宝箱的奖励
|
||||
}
|
||||
|
||||
func (x *EntertainBoxRewardResp) Reset() {
|
||||
*x = EntertainBoxRewardResp{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_entertain_entertain_msg_proto_msgTypes[34]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *EntertainBoxRewardResp) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*EntertainBoxRewardResp) ProtoMessage() {}
|
||||
|
||||
func (x *EntertainBoxRewardResp) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_entertain_entertain_msg_proto_msgTypes[34]
|
||||
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 EntertainBoxRewardResp.ProtoReflect.Descriptor instead.
|
||||
func (*EntertainBoxRewardResp) Descriptor() ([]byte, []int) {
|
||||
return file_entertain_entertain_msg_proto_rawDescGZIP(), []int{34}
|
||||
}
|
||||
|
||||
func (x *EntertainBoxRewardResp) GetBox() []*BoxData {
|
||||
if x != nil {
|
||||
return x.Box
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *EntertainBoxRewardResp) GetReward() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Reward
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
var File_entertain_entertain_msg_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_entertain_entertain_msg_proto_rawDesc = []byte{
|
||||
@ -1946,7 +2057,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
|
||||
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72,
|
||||
0x67, 0x65, 0x74, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72,
|
||||
0x67, 0x65, 0x74, 0x69, 0x64, 0x22, 0xe2, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
|
||||
0x67, 0x65, 0x74, 0x69, 0x64, 0x22, 0xfe, 0x01, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
|
||||
0x61, 0x69, 0x6e, 0x47, 0x61, 0x6d, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73, 0x68, 0x12,
|
||||
0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
|
||||
0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65,
|
||||
@ -1960,110 +2071,121 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
|
||||
0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x77, 0x69, 0x6e, 0x18, 0x06, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x03, 0x77, 0x69, 0x6e, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72,
|
||||
0x64, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
|
||||
0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x92, 0x01, 0x0a, 0x16, 0x45,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f,
|
||||
0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73,
|
||||
0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
|
||||
0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65,
|
||||
0x72, 0x31, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65,
|
||||
0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05,
|
||||
0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c,
|
||||
0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22,
|
||||
0x2f, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f,
|
||||
0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
|
||||
0x22, 0xf8, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65,
|
||||
0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72,
|
||||
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
|
||||
0x6d, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07,
|
||||
0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72,
|
||||
0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x1a, 0x0a,
|
||||
0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x08, 0x63, 0x75, 0x72, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f,
|
||||
0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||
0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x07,
|
||||
0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f,
|
||||
0x78, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74,
|
||||
0x61, 0x52, 0x03, 0x62, 0x6f, 0x78, 0x22, 0x92, 0x01, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72,
|
||||
0x74, 0x61, 0x69, 0x6e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73,
|
||||
0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x05, 0x72, 0x6f, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65,
|
||||
0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76,
|
||||
0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x03,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74,
|
||||
0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72,
|
||||
0x32, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
|
||||
0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50,
|
||||
0x6c, 0x61, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x3e,
|
||||
0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65,
|
||||
0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70,
|
||||
0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61,
|
||||
0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a,
|
||||
0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65,
|
||||
0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74,
|
||||
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74,
|
||||
0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x45, 0x6e,
|
||||
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
|
||||
0x71, 0x22, 0x36, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65,
|
||||
0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74,
|
||||
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44,
|
||||
0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x12, 0x45, 0x6e, 0x74,
|
||||
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
|
||||
0x79, 0x22, 0x58, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65,
|
||||
0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61,
|
||||
0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41,
|
||||
0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x82, 0x01, 0x0a, 0x13,
|
||||
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50,
|
||||
0x75, 0x73, 0x68, 0x12, 0x32, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x1e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61,
|
||||
0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72,
|
||||
0x79, 0x52, 0x04, 0x63, 0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 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, 0x30, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65,
|
||||
0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64,
|
||||
0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61,
|
||||
0x72, 0x64, 0x22, 0x4f, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43,
|
||||
0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a,
|
||||
0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72,
|
||||
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61,
|
||||
0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70,
|
||||
0x61, 0x74, 0x68, 0x22, 0x46, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
|
||||
0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72,
|
||||
0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f,
|
||||
0x6d, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x45,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x22, 0x7b, 0x0a, 0x1b, 0x45, 0x6e,
|
||||
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74,
|
||||
0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
|
||||
0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
|
||||
0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
|
||||
0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x2f, 0x0a, 0x15, 0x45,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
|
||||
0x74, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0xf8, 0x01, 0x0a,
|
||||
0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x63, 0x6f, 0x6e, 0x6e,
|
||||
0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12,
|
||||
0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64,
|
||||
0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72,
|
||||
0x70, 0x6f, 0x77, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x75, 0x72,
|
||||
0x70, 0x6f, 0x77, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72,
|
||||
0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e,
|
||||
0x64, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75,
|
||||
0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x03, 0x20,
|
||||
0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x08, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61,
|
||||
0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72,
|
||||
0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52,
|
||||
0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x6c, 0x61, 0x74, 0x52,
|
||||
0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x45, 0x6e,
|
||||
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61,
|
||||
0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
|
||||
0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x3e, 0x0a, 0x18, 0x45, 0x6e,
|
||||
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x6c,
|
||||
0x61, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74,
|
||||
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74,
|
||||
0x61, 0x52, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x3a, 0x0a, 0x14, 0x45, 0x6e,
|
||||
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x50, 0x75,
|
||||
0x73, 0x68, 0x12, 0x22, 0x0a, 0x07, 0x6d, 0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x08, 0x2e, 0x4d, 0x61, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07, 0x6d,
|
||||
0x70, 0x61, 0x64, 0x61, 0x74, 0x61, 0x22, 0x15, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
|
||||
0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a,
|
||||
0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73,
|
||||
0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x52,
|
||||
0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x26, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61,
|
||||
0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6b,
|
||||
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x58, 0x0a,
|
||||
0x13, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
|
||||
0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x82, 0x01, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65,
|
||||
0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12,
|
||||
0x32, 0x0a, 0x04, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
|
||||
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50,
|
||||
0x75, 0x73, 0x68, 0x2e, 0x43, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x63,
|
||||
0x61, 0x72, 0x64, 0x1a, 0x37, 0x0a, 0x09, 0x43, 0x61, 0x72, 0x64, 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, 0x30, 0x0a, 0x16,
|
||||
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52,
|
||||
0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x4f,
|
||||
0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74,
|
||||
0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f,
|
||||
0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
|
||||
0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, 0x76, 0x65, 0x70, 0x61, 0x74, 0x68, 0x22,
|
||||
0x46, 0x0a, 0x14, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e,
|
||||
0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x22, 0x2d, 0x0a, 0x15, 0x45, 0x6e, 0x74, 0x65, 0x72,
|
||||
0x74, 0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x14, 0x0a, 0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
|
||||
0x05, 0x62, 0x4a, 0x6f, 0x69, 0x6e, 0x22, 0x7b, 0x0a, 0x1b, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
|
||||
0x61, 0x69, 0x6e, 0x4a, 0x6f, 0x69, 0x6e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f,
|
||||
0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x21, 0x0a,
|
||||
0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50,
|
||||
0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31,
|
||||
0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73,
|
||||
0x65, 0x72, 0x32, 0x22, 0x31, 0x0a, 0x17, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
|
||||
0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
|
||||
0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1a, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
|
||||
0x61, 0x69, 0x6e, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65,
|
||||
0x73, 0x70, 0x22, 0x32, 0x0a, 0x18, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44,
|
||||
0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
|
||||
0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74,
|
||||
0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52,
|
||||
0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x45, 0x6e,
|
||||
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x52,
|
||||
0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x6e, 0x74, 0x65, 0x72,
|
||||
0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4d, 0x61, 0x73, 0x74,
|
||||
0x65, 0x72, 0x52, 0x6f, 0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f,
|
||||
0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d,
|
||||
0x69, 0x64, 0x22, 0x4c, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47,
|
||||
0x61, 0x6d, 0x65, 0x52, 0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07,
|
||||
0x70, 0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70,
|
||||
0x31, 0x72, 0x65, 0x61, 0x64, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64,
|
||||
0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64, 0x79,
|
||||
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x65, 0x73, 0x70, 0x22, 0x39, 0x0a, 0x1f, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e,
|
||||
0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x52, 0x6f,
|
||||
0x6f, 0x6d, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x22, 0x4c,
|
||||
0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x47, 0x61, 0x6d, 0x65, 0x52,
|
||||
0x65, 0x61, 0x64, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x31, 0x72, 0x65,
|
||||
0x61, 0x64, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x31, 0x72, 0x65, 0x61,
|
||||
0x64, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x08, 0x52, 0x07, 0x70, 0x32, 0x72, 0x65, 0x61, 0x64, 0x79, 0x22, 0x2d, 0x0a, 0x15,
|
||||
0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x77, 0x61,
|
||||
0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x57, 0x0a, 0x16, 0x45,
|
||||
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x77, 0x61, 0x72,
|
||||
0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x03, 0x62, 0x6f, 0x78, 0x18, 0x01, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x08, 0x2e, 0x42, 0x6f, 0x78, 0x44, 0x61, 0x74, 0x61, 0x52, 0x03, 0x62, 0x6f,
|
||||
0x78, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65,
|
||||
0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -2078,7 +2200,7 @@ func file_entertain_entertain_msg_proto_rawDescGZIP() []byte {
|
||||
return file_entertain_entertain_msg_proto_rawDescData
|
||||
}
|
||||
|
||||
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 34)
|
||||
var file_entertain_entertain_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 36)
|
||||
var file_entertain_entertain_msg_proto_goTypes = []interface{}{
|
||||
(*EntertainMatchReq)(nil), // 0: EntertainMatchReq
|
||||
(*EntertainMatchResp)(nil), // 1: EntertainMatchResp
|
||||
@ -2113,41 +2235,47 @@ var file_entertain_entertain_msg_proto_goTypes = []interface{}{
|
||||
(*EntertainDissolveRoomResp)(nil), // 30: EntertainDissolveRoomResp
|
||||
(*EntertainDissolveMasterRoomPush)(nil), // 31: EntertainDissolveMasterRoomPush
|
||||
(*EntertainGameReadyPush)(nil), // 32: EntertainGameReadyPush
|
||||
nil, // 33: EntertainChangePush.CardEntry
|
||||
(*PlayerData)(nil), // 34: PlayerData
|
||||
(*MapData)(nil), // 35: MapData
|
||||
(*UserAtno)(nil), // 36: UserAtno
|
||||
(*DBXXLData)(nil), // 37: DBXXLData
|
||||
(*EntertainBoxRewardReq)(nil), // 33: EntertainBoxRewardReq
|
||||
(*EntertainBoxRewardResp)(nil), // 34: EntertainBoxRewardResp
|
||||
nil, // 35: EntertainChangePush.CardEntry
|
||||
(*PlayerData)(nil), // 36: PlayerData
|
||||
(*MapData)(nil), // 37: MapData
|
||||
(*UserAtno)(nil), // 38: UserAtno
|
||||
(*BoxData)(nil), // 39: BoxData
|
||||
(*DBXXLData)(nil), // 40: DBXXLData
|
||||
}
|
||||
var file_entertain_entertain_msg_proto_depIdxs = []int32{
|
||||
34, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
|
||||
34, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
|
||||
35, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
|
||||
35, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
|
||||
34, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
|
||||
34, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
|
||||
34, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
|
||||
34, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
|
||||
35, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
|
||||
36, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
|
||||
34, // 10: EntertainEnterRoomPush.user1:type_name -> PlayerData
|
||||
34, // 11: EntertainEnterRoomPush.user2:type_name -> PlayerData
|
||||
35, // 12: EntertainReconnectResp.mpadata:type_name -> MapData
|
||||
34, // 13: EntertainReconnectResp.user1:type_name -> PlayerData
|
||||
34, // 14: EntertainReconnectResp.user2:type_name -> PlayerData
|
||||
35, // 15: EntertainRefreshPlatResp.mpadata:type_name -> MapData
|
||||
35, // 16: EntertainRefreshPush.mpadata:type_name -> MapData
|
||||
37, // 17: EntertainGetListResp.data:type_name -> DBXXLData
|
||||
37, // 18: EntertainRewardResp.data:type_name -> DBXXLData
|
||||
36, // 19: EntertainRewardResp.reward:type_name -> UserAtno
|
||||
33, // 20: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
|
||||
34, // 21: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
|
||||
34, // 22: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
|
||||
23, // [23:23] is the sub-list for method output_type
|
||||
23, // [23:23] is the sub-list for method input_type
|
||||
23, // [23:23] is the sub-list for extension type_name
|
||||
23, // [23:23] is the sub-list for extension extendee
|
||||
0, // [0:23] is the sub-list for field type_name
|
||||
36, // 0: EntertainStartGamePush.user1:type_name -> PlayerData
|
||||
36, // 1: EntertainStartGamePush.user2:type_name -> PlayerData
|
||||
37, // 2: EntertainStartGamePush.mpadata:type_name -> MapData
|
||||
37, // 3: EntertainOperatorRstPush.mpadata:type_name -> MapData
|
||||
36, // 4: EntertainOperatorRstPush.user1:type_name -> PlayerData
|
||||
36, // 5: EntertainOperatorRstPush.user2:type_name -> PlayerData
|
||||
36, // 6: EntertainGameOverPush.user1:type_name -> PlayerData
|
||||
36, // 7: EntertainGameOverPush.user2:type_name -> PlayerData
|
||||
37, // 8: EntertainGameOverPush.mpadata:type_name -> MapData
|
||||
38, // 9: EntertainGameOverPush.reward:type_name -> UserAtno
|
||||
39, // 10: EntertainGameOverPush.box:type_name -> BoxData
|
||||
36, // 11: EntertainEnterRoomPush.user1:type_name -> PlayerData
|
||||
36, // 12: EntertainEnterRoomPush.user2:type_name -> PlayerData
|
||||
37, // 13: EntertainReconnectResp.mpadata:type_name -> MapData
|
||||
36, // 14: EntertainReconnectResp.user1:type_name -> PlayerData
|
||||
36, // 15: EntertainReconnectResp.user2:type_name -> PlayerData
|
||||
37, // 16: EntertainRefreshPlatResp.mpadata:type_name -> MapData
|
||||
37, // 17: EntertainRefreshPush.mpadata:type_name -> MapData
|
||||
40, // 18: EntertainGetListResp.data:type_name -> DBXXLData
|
||||
40, // 19: EntertainRewardResp.data:type_name -> DBXXLData
|
||||
38, // 20: EntertainRewardResp.reward:type_name -> UserAtno
|
||||
35, // 21: EntertainChangePush.card:type_name -> EntertainChangePush.CardEntry
|
||||
36, // 22: EntertainJoinCreateRoomPush.user1:type_name -> PlayerData
|
||||
36, // 23: EntertainJoinCreateRoomPush.user2:type_name -> PlayerData
|
||||
39, // 24: EntertainBoxRewardResp.box:type_name -> BoxData
|
||||
38, // 25: EntertainBoxRewardResp.reward:type_name -> UserAtno
|
||||
26, // [26:26] is the sub-list for method output_type
|
||||
26, // [26:26] is the sub-list for method input_type
|
||||
26, // [26:26] is the sub-list for extension type_name
|
||||
26, // [26:26] is the sub-list for extension extendee
|
||||
0, // [0:26] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_entertain_entertain_msg_proto_init() }
|
||||
@ -2554,6 +2682,30 @@ func file_entertain_entertain_msg_proto_init() {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_entertain_entertain_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*EntertainBoxRewardReq); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_entertain_entertain_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*EntertainBoxRewardResp); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
type x struct{}
|
||||
out := protoimpl.TypeBuilder{
|
||||
@ -2561,7 +2713,7 @@ func file_entertain_entertain_msg_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_entertain_entertain_msg_proto_rawDesc,
|
||||
NumEnums: 0,
|
||||
NumMessages: 34,
|
||||
NumMessages: 36,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
@ -459,6 +459,7 @@ const (
|
||||
ErrorCode_EntertainPlayerNoReady ErrorCode = 5206 // 玩家1还没准备不能开始游戏
|
||||
ErrorCode_EntertainNotMaster ErrorCode = 5207 // 不是房主 不能解散
|
||||
ErrorCode_EntertainDissolveFailed ErrorCode = 5208 // 游戏中不允许解散
|
||||
ErrorCode_EntertainBoxEndTime ErrorCode = 5209 // 宝箱开启时间没到
|
||||
)
|
||||
|
||||
// Enum value maps for ErrorCode.
|
||||
@ -855,6 +856,7 @@ var (
|
||||
5206: "EntertainPlayerNoReady",
|
||||
5207: "EntertainNotMaster",
|
||||
5208: "EntertainDissolveFailed",
|
||||
5209: "EntertainBoxEndTime",
|
||||
}
|
||||
ErrorCode_value = map[string]int32{
|
||||
"Success": 0,
|
||||
@ -1248,6 +1250,7 @@ var (
|
||||
"EntertainPlayerNoReady": 5206,
|
||||
"EntertainNotMaster": 5207,
|
||||
"EntertainDissolveFailed": 5208,
|
||||
"EntertainBoxEndTime": 5209,
|
||||
}
|
||||
)
|
||||
|
||||
@ -1282,7 +1285,7 @@ var File_errorcode_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_errorcode_proto_rawDesc = []byte{
|
||||
0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x2a, 0xd4, 0x48, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
0x6f, 0x2a, 0xee, 0x48, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12,
|
||||
0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10,
|
||||
0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76,
|
||||
@ -1863,8 +1866,10 @@ var file_errorcode_proto_rawDesc = []byte{
|
||||
0x28, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4e, 0x6f,
|
||||
0x74, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd7, 0x28, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x6e,
|
||||
0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x44, 0x69, 0x73, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x46,
|
||||
0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd8, 0x28, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
|
||||
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd8, 0x28, 0x12, 0x18, 0x0a, 0x13, 0x45, 0x6e, 0x74, 0x65,
|
||||
0x72, 0x74, 0x61, 0x69, 0x6e, 0x42, 0x6f, 0x78, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x10,
|
||||
0xd9, 0x28, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -483,9 +483,8 @@ type MailGetAllMailAttachmentResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Res []*UserAtno `protobuf:"bytes,1,rep,name=res,proto3" json:"res"` //资源类型
|
||||
Ids []string `protobuf:"bytes,2,rep,name=ids,proto3" json:"ids"` // 已经领取的邮件唯一id
|
||||
Reward []*UserAtno `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward"` //获取资源
|
||||
Ids []string `protobuf:"bytes,1,rep,name=ids,proto3" json:"ids"` // 已经领取的邮件唯一id
|
||||
Reward []*UserAtno `protobuf:"bytes,2,rep,name=reward,proto3" json:"reward"` //获取资源
|
||||
}
|
||||
|
||||
func (x *MailGetAllMailAttachmentResp) Reset() {
|
||||
@ -520,13 +519,6 @@ func (*MailGetAllMailAttachmentResp) Descriptor() ([]byte, []int) {
|
||||
return file_mail_mail_msg_proto_rawDescGZIP(), []int{10}
|
||||
}
|
||||
|
||||
func (x *MailGetAllMailAttachmentResp) GetRes() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Res
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *MailGetAllMailAttachmentResp) GetIds() []string {
|
||||
if x != nil {
|
||||
return x.Ids
|
||||
@ -660,20 +652,18 @@ var file_mail_mail_msg_proto_rawDesc = []byte{
|
||||
0x69, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69,
|
||||
0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x4d, 0x61, 0x69, 0x6c, 0x22, 0x1d, 0x0a, 0x1b, 0x4d,
|
||||
0x61, 0x69, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74,
|
||||
0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x22, 0x70, 0x0a, 0x1c, 0x4d, 0x61,
|
||||
0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x1c, 0x4d, 0x61,
|
||||
0x69, 0x6c, 0x47, 0x65, 0x74, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x61,
|
||||
0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x03, 0x72, 0x65,
|
||||
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74,
|
||||
0x6e, 0x6f, 0x52, 0x03, 0x72, 0x65, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x02,
|
||||
0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x06, 0x72, 0x65, 0x77,
|
||||
0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72,
|
||||
0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22, 0x13, 0x0a, 0x11,
|
||||
0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65,
|
||||
0x71, 0x22, 0x37, 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41, 0x6c, 0x6c, 0x4d,
|
||||
0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73,
|
||||
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61, 0x69, 0x6c, 0x44,
|
||||
0x61, 0x74, 0x61, 0x52, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64,
|
||||
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x12, 0x21, 0x0a, 0x06,
|
||||
0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
|
||||
0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x22,
|
||||
0x13, 0x0a, 0x11, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41, 0x6c, 0x6c, 0x4d, 0x61, 0x69,
|
||||
0x6c, 0x52, 0x65, 0x71, 0x22, 0x37, 0x0a, 0x12, 0x4d, 0x61, 0x69, 0x6c, 0x44, 0x65, 0x6c, 0x41,
|
||||
0x6c, 0x6c, 0x4d, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x4d, 0x61,
|
||||
0x69, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x4d, 0x61,
|
||||
0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x4d, 0x61, 0x69, 0x6c, 0x73, 0x42, 0x06, 0x5a,
|
||||
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -711,14 +701,13 @@ var file_mail_mail_msg_proto_depIdxs = []int32{
|
||||
13, // 1: MailReadMailResp.Mail:type_name -> DBMailData
|
||||
13, // 2: MailGetUserMailAttachmentResp.Mail:type_name -> DBMailData
|
||||
13, // 3: MailGetNewMailPush.Mail:type_name -> DBMailData
|
||||
14, // 4: MailGetAllMailAttachmentResp.res:type_name -> UserAtno
|
||||
14, // 5: MailGetAllMailAttachmentResp.reward:type_name -> UserAtno
|
||||
13, // 6: MailDelAllMailResp.Mails:type_name -> DBMailData
|
||||
7, // [7:7] is the sub-list for method output_type
|
||||
7, // [7:7] is the sub-list for method input_type
|
||||
7, // [7:7] is the sub-list for extension type_name
|
||||
7, // [7:7] is the sub-list for extension extendee
|
||||
0, // [0:7] is the sub-list for field type_name
|
||||
14, // 4: MailGetAllMailAttachmentResp.reward:type_name -> UserAtno
|
||||
13, // 5: MailDelAllMailResp.Mails:type_name -> DBMailData
|
||||
6, // [6:6] is the sub-list for method output_type
|
||||
6, // [6:6] is the sub-list for method input_type
|
||||
6, // [6:6] is the sub-list for extension type_name
|
||||
6, // [6:6] is the sub-list for extension extendee
|
||||
0, // [0:6] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_mail_mail_msg_proto_init() }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user