Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
commit
5cd01c45c5
@ -1,7 +1,7 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"id": 1,
|
"id": "gold6",
|
||||||
"bpoint": "gold6",
|
"pid": 1,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -27,8 +27,8 @@
|
|||||||
"integral": 500
|
"integral": 500
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 2,
|
"id": "gold30",
|
||||||
"bpoint": "gold30",
|
"pid": 2,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -54,8 +54,8 @@
|
|||||||
"integral": 600
|
"integral": 600
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 3,
|
"id": "gold68",
|
||||||
"bpoint": "gold68",
|
"pid": 3,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -81,8 +81,8 @@
|
|||||||
"integral": 700
|
"integral": 700
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4,
|
"id": "gold128",
|
||||||
"bpoint": "gold128",
|
"pid": 4,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -108,8 +108,8 @@
|
|||||||
"integral": 800
|
"integral": 800
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 5,
|
"id": "gold198",
|
||||||
"bpoint": "gold198",
|
"pid": 5,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -135,8 +135,8 @@
|
|||||||
"integral": 900
|
"integral": 900
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 6,
|
"id": "gold328",
|
||||||
"bpoint": "gold328",
|
"pid": 6,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -162,8 +162,8 @@
|
|||||||
"integral": 1000
|
"integral": 1000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 7,
|
"id": "gold448",
|
||||||
"bpoint": "gold448",
|
"pid": 7,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -189,8 +189,8 @@
|
|||||||
"integral": 1100
|
"integral": 1100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 8,
|
"id": "gold648",
|
||||||
"bpoint": "gold648",
|
"pid": 8,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 1,
|
"recharge_type": 1,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -216,8 +216,8 @@
|
|||||||
"integral": 1200
|
"integral": 1200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 9,
|
"id": "lb6_1",
|
||||||
"bpoint": "lb6_1",
|
"pid": 9,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -231,8 +231,8 @@
|
|||||||
"integral": 1300
|
"integral": 1300
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10,
|
"id": "day_1",
|
||||||
"bpoint": "day_1",
|
"pid": 10,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -246,8 +246,8 @@
|
|||||||
"integral": 1400
|
"integral": 1400
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 11,
|
"id": "day_2",
|
||||||
"bpoint": "day_2",
|
"pid": 11,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -261,8 +261,8 @@
|
|||||||
"integral": 1500
|
"integral": 1500
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 12,
|
"id": "day_3",
|
||||||
"bpoint": "day_3",
|
"pid": 12,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -276,8 +276,8 @@
|
|||||||
"integral": 1600
|
"integral": 1600
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 13,
|
"id": "day_4",
|
||||||
"bpoint": "day_4",
|
"pid": 13,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -291,8 +291,8 @@
|
|||||||
"integral": 1700
|
"integral": 1700
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 14,
|
"id": "week_1",
|
||||||
"bpoint": "week_1",
|
"pid": 14,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -306,8 +306,8 @@
|
|||||||
"integral": 1800
|
"integral": 1800
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 15,
|
"id": "week_2",
|
||||||
"bpoint": "week_2",
|
"pid": 15,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -321,8 +321,8 @@
|
|||||||
"integral": 1900
|
"integral": 1900
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 16,
|
"id": "week_3",
|
||||||
"bpoint": "week_3",
|
"pid": 16,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -336,8 +336,8 @@
|
|||||||
"integral": 2000
|
"integral": 2000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 17,
|
"id": "week_4",
|
||||||
"bpoint": "week_4",
|
"pid": 17,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -351,8 +351,8 @@
|
|||||||
"integral": 2100
|
"integral": 2100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 18,
|
"id": "week_5",
|
||||||
"bpoint": "week_5",
|
"pid": 18,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -366,8 +366,8 @@
|
|||||||
"integral": 2200
|
"integral": 2200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 19,
|
"id": "week_6",
|
||||||
"bpoint": "week_6",
|
"pid": 19,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -381,8 +381,8 @@
|
|||||||
"integral": 2300
|
"integral": 2300
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 20,
|
"id": "month_1",
|
||||||
"bpoint": "month_1",
|
"pid": 20,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -396,8 +396,8 @@
|
|||||||
"integral": 2400
|
"integral": 2400
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 21,
|
"id": "month_2",
|
||||||
"bpoint": "month_2",
|
"pid": 21,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -411,8 +411,8 @@
|
|||||||
"integral": 2500
|
"integral": 2500
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 22,
|
"id": "month_3",
|
||||||
"bpoint": "month_3",
|
"pid": 22,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 2,
|
"recharge_type": 2,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -426,8 +426,8 @@
|
|||||||
"integral": 2600
|
"integral": 2600
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 23,
|
"id": "yueka_lv1",
|
||||||
"bpoint": "yueka_lv1",
|
"pid": 23,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 3,
|
"recharge_type": 3,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -447,8 +447,8 @@
|
|||||||
"integral": 2700
|
"integral": 2700
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 24,
|
"id": "yueka_lv2",
|
||||||
"bpoint": "yueka_lv2",
|
"pid": 24,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 3,
|
"recharge_type": 3,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -468,8 +468,8 @@
|
|||||||
"integral": 2800
|
"integral": 2800
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 25,
|
"id": "passcheck_1",
|
||||||
"bpoint": "passcheck_1",
|
"pid": 25,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 4,
|
"recharge_type": 4,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -483,8 +483,8 @@
|
|||||||
"integral": 2900
|
"integral": 2900
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 26,
|
"id": "passcheck_2",
|
||||||
"bpoint": "passcheck_2",
|
"pid": 26,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 4,
|
"recharge_type": 4,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -498,8 +498,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 27,
|
"id": "drawcard_pack1",
|
||||||
"bpoint": "drawcard_pack1",
|
"pid": 27,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 5,
|
"recharge_type": 5,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -513,8 +513,8 @@
|
|||||||
"integral": 3100
|
"integral": 3100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 28,
|
"id": "passcheck_3",
|
||||||
"bpoint": "passcheck_3",
|
"pid": 28,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 4,
|
"recharge_type": 4,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -528,8 +528,8 @@
|
|||||||
"integral": 3200
|
"integral": 3200
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 29,
|
"id": "passcheck_4",
|
||||||
"bpoint": "passcheck_4",
|
"pid": 29,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 4,
|
"recharge_type": 4,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -543,8 +543,8 @@
|
|||||||
"integral": 3300
|
"integral": 3300
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 30,
|
"id": "fund_1",
|
||||||
"bpoint": "fund_1",
|
"pid": 30,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -558,8 +558,8 @@
|
|||||||
"integral": 3400
|
"integral": 3400
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 31,
|
"id": "fund_2",
|
||||||
"bpoint": "fund_2",
|
"pid": 31,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -573,8 +573,8 @@
|
|||||||
"integral": 0
|
"integral": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 32,
|
"id": "fund_3",
|
||||||
"bpoint": "fund_3",
|
"pid": 32,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -588,8 +588,8 @@
|
|||||||
"integral": 0
|
"integral": 0
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 33,
|
"id": "fund_4",
|
||||||
"bpoint": "fund_4",
|
"pid": 33,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -603,8 +603,8 @@
|
|||||||
"integral": 3500
|
"integral": 3500
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 34,
|
"id": "fund_5",
|
||||||
"bpoint": "fund_5",
|
"pid": 34,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -618,8 +618,8 @@
|
|||||||
"integral": 3600
|
"integral": 3600
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 35,
|
"id": "fund_6",
|
||||||
"bpoint": "fund_6",
|
"pid": 35,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -633,8 +633,8 @@
|
|||||||
"integral": 3700
|
"integral": 3700
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 36,
|
"id": "fund_7",
|
||||||
"bpoint": "fund_7",
|
"pid": 36,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -648,8 +648,8 @@
|
|||||||
"integral": 3800
|
"integral": 3800
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 37,
|
"id": "fund_8",
|
||||||
"bpoint": "fund_8",
|
"pid": 37,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -663,8 +663,8 @@
|
|||||||
"integral": 3600
|
"integral": 3600
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 38,
|
"id": "fund_9",
|
||||||
"bpoint": "fund_9",
|
"pid": 38,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -678,8 +678,8 @@
|
|||||||
"integral": 3700
|
"integral": 3700
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 39,
|
"id": "fund_10",
|
||||||
"bpoint": "fund_10",
|
"pid": 39,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 6,
|
"recharge_type": 6,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -693,8 +693,8 @@
|
|||||||
"integral": 3800
|
"integral": 3800
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 40,
|
"id": "drawcard_pack2",
|
||||||
"bpoint": "drawcard_pack2",
|
"pid": 40,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 5,
|
"recharge_type": 5,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -708,8 +708,8 @@
|
|||||||
"integral": 3100
|
"integral": 3100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 41,
|
"id": "drawcard_pack3",
|
||||||
"bpoint": "drawcard_pack3",
|
"pid": 41,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 5,
|
"recharge_type": 5,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -723,8 +723,8 @@
|
|||||||
"integral": 3100
|
"integral": 3100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 42,
|
"id": "drawcard_pack4",
|
||||||
"bpoint": "drawcard_pack4",
|
"pid": 42,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 5,
|
"recharge_type": 5,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -738,8 +738,8 @@
|
|||||||
"integral": 3100
|
"integral": 3100
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 43,
|
"id": "passcheckPro_4",
|
||||||
"bpoint": "passcheckPro_4",
|
"pid": 43,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 4,
|
"recharge_type": 4,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -765,8 +765,8 @@
|
|||||||
"integral": 9800
|
"integral": 9800
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 44,
|
"id": "passcheckMid_4",
|
||||||
"bpoint": "passcheckMid_4",
|
"pid": 44,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 4,
|
"recharge_type": 4,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -792,8 +792,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 45,
|
"id": "push_gift_1",
|
||||||
"bpoint": "push_gift_1",
|
"pid": 45,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -807,8 +807,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 46,
|
"id": "push_gift_2",
|
||||||
"bpoint": "push_gift_2",
|
"pid": 46,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -822,8 +822,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 47,
|
"id": "push_gift_3",
|
||||||
"bpoint": "push_gift_3",
|
"pid": 47,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -837,8 +837,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 48,
|
"id": "push_gift_4",
|
||||||
"bpoint": "push_gift_4",
|
"pid": 48,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -852,8 +852,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 49,
|
"id": "push_gift_5",
|
||||||
"bpoint": "push_gift_5",
|
"pid": 49,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -867,8 +867,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 50,
|
"id": "push_gift_6",
|
||||||
"bpoint": "push_gift_6",
|
"pid": 50,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -882,8 +882,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 51,
|
"id": "push_gift_7",
|
||||||
"bpoint": "push_gift_7",
|
"pid": 51,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -897,8 +897,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 52,
|
"id": "push_gift_8",
|
||||||
"bpoint": "push_gift_8",
|
"pid": 52,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -912,8 +912,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 53,
|
"id": "push_gift_9",
|
||||||
"bpoint": "push_gift_9",
|
"pid": 53,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -927,8 +927,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 54,
|
"id": "push_gift_10",
|
||||||
"bpoint": "push_gift_10",
|
"pid": 54,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -942,8 +942,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 55,
|
"id": "push_gift_11",
|
||||||
"bpoint": "push_gift_11",
|
"pid": 55,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
@ -957,8 +957,8 @@
|
|||||||
"integral": 3000
|
"integral": 3000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 56,
|
"id": "push_gift_12",
|
||||||
"bpoint": "push_gift_12",
|
"pid": 56,
|
||||||
"editionid": "debug",
|
"editionid": "debug",
|
||||||
"recharge_type": 7,
|
"recharge_type": 7,
|
||||||
"monetaryunit": "¥",
|
"monetaryunit": "¥",
|
||||||
|
@ -71,6 +71,6 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.GuildGveInfoReq) (e
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
session.SendMsg(string(this.module.GetType()), "info", &pb.GuildGveInfoResp{Info: info, Boosticket: member.Boosticket, Records: roulette.Roulette})
|
session.SendMsg(string(this.module.GetType()), "info", &pb.GuildGveInfoResp{Info: info, Useheros: member.Useheros, Boosticket: member.Boosticket, Records: roulette.Roulette})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
@ -200,8 +200,11 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.PayDelivery
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
go func() {
|
||||||
|
this.ModuleHero.RechargeMoney(args.Uid, args.Price)
|
||||||
|
this.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype229, 1, conf.Pid))
|
||||||
|
}()
|
||||||
|
|
||||||
go this.ModuleHero.RechargeMoney(args.Uid, args.Price)
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
744
pb/comm.pb.go
744
pb/comm.pb.go
File diff suppressed because it is too large
Load Diff
@ -75,7 +75,8 @@ type GuildGveInfoResp struct {
|
|||||||
|
|
||||||
Info *DBGuildGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
|
Info *DBGuildGve `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
|
||||||
Boosticket int32 `protobuf:"varint,2,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
|
Boosticket int32 `protobuf:"varint,2,opt,name=boosticket,proto3" json:"boosticket"` //工会boos战门票
|
||||||
Records []*DBGveRouletteRecord `protobuf:"bytes,3,rep,name=records,proto3" json:"records"` //转盘记录
|
Useheros []string `protobuf:"bytes,3,rep,name=useheros,proto3" json:"useheros"` //工会战已使用英雄
|
||||||
|
Records []*DBGveRouletteRecord `protobuf:"bytes,4,rep,name=records,proto3" json:"records"` //转盘记录
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *GuildGveInfoResp) Reset() {
|
func (x *GuildGveInfoResp) Reset() {
|
||||||
@ -124,6 +125,13 @@ func (x *GuildGveInfoResp) GetBoosticket() int32 {
|
|||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *GuildGveInfoResp) GetUseheros() []string {
|
||||||
|
if x != nil {
|
||||||
|
return x.Useheros
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (x *GuildGveInfoResp) GetRecords() []*DBGveRouletteRecord {
|
func (x *GuildGveInfoResp) GetRecords() []*DBGveRouletteRecord {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.Records
|
return x.Records
|
||||||
@ -1141,115 +1149,116 @@ var file_guildgve_guildgve_msg_proto_rawDesc = []byte{
|
|||||||
0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b,
|
0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2b,
|
||||||
0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
|
0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65,
|
||||||
0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x83, 0x01, 0x0a, 0x10,
|
0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x9f, 0x01, 0x0a, 0x10,
|
||||||
0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
|
0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
|
||||||
0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
|
0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b,
|
||||||
0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66,
|
0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66,
|
||||||
0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18,
|
0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18,
|
||||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65,
|
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65,
|
||||||
0x74, 0x12, 0x2e, 0x0a, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03,
|
0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, 0x03, 0x20,
|
||||||
0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74,
|
0x03, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x12, 0x2e, 0x0a,
|
||||||
0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64,
|
0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14,
|
||||||
0x73, 0x22, 0x5e, 0x0a, 0x12, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74,
|
0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65,
|
||||||
0x46, 0x69, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64,
|
0x63, 0x6f, 0x72, 0x64, 0x52, 0x07, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x22, 0x5e, 0x0a,
|
||||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69,
|
0x12, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46, 0x69, 0x72, 0x65,
|
||||||
0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
|
||||||
0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74,
|
|
||||||
0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63,
|
|
||||||
0x65, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74,
|
|
||||||
0x46, 0x69, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c,
|
|
||||||
0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67,
|
|
||||||
0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75,
|
|
||||||
0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
|
|
||||||
0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75,
|
|
||||||
0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69,
|
|
||||||
0x6c, 0x64, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01,
|
|
||||||
0x28, 0x09, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65,
|
|
||||||
0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09,
|
|
||||||
0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52,
|
|
||||||
0x09, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61,
|
|
||||||
0x73, 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
|
|
||||||
0x52, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12,
|
|
||||||
0x0a, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61,
|
|
||||||
0x6e, 0x6b, 0x22, 0x39, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61,
|
|
||||||
0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01,
|
|
||||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52,
|
|
||||||
0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a,
|
|
||||||
0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74,
|
|
||||||
0x65, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18,
|
|
||||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x4b,
|
|
||||||
0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74,
|
|
||||||
0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20,
|
|
||||||
0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72,
|
|
||||||
0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73,
|
|
||||||
0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x72, 0x0a, 0x14, 0x47,
|
|
||||||
0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65,
|
|
||||||
0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01,
|
0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01,
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a,
|
0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a,
|
||||||
0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
|
0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
|
||||||
0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18,
|
0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x18,
|
||||||
0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f,
|
0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x22, 0x15, 0x0a,
|
||||||
0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22,
|
0x13, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53, 0x65, 0x74, 0x46, 0x69, 0x72, 0x65,
|
||||||
0x8a, 0x01, 0x0a, 0x15, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c,
|
0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x0f, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
|
||||||
0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69,
|
0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64,
|
||||||
0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c,
|
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69,
|
||||||
0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20,
|
0x64, 0x22, 0xaa, 0x01, 0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69,
|
0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69,
|
||||||
0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
|
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64,
|
||||||
0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a,
|
0x12, 0x12, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
|
||||||
0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
|
0x69, 0x63, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
|
||||||
0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x75, 0x0a, 0x1a,
|
0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x69, 0x6c, 0x6c,
|
||||||
|
0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6b, 0x69, 0x6c,
|
||||||
|
0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x4b, 0x69,
|
||||||
|
0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x6c, 0x61,
|
||||||
|
0x73, 0x74, 0x4b, 0x69, 0x6c, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61,
|
||||||
|
0x6e, 0x6b, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22, 0x39,
|
||||||
|
0x0a, 0x10, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65,
|
||||||
|
0x73, 0x70, 0x12, 0x25, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
|
||||||
|
0x32, 0x11, 0x2e, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x49,
|
||||||
|
0x74, 0x65, 0x6d, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2f, 0x0a, 0x13, 0x47, 0x75, 0x69,
|
||||||
|
0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x71,
|
||||||
|
0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||||
|
0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x14, 0x47, 0x75,
|
||||||
|
0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65,
|
||||||
|
0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
|
0x03, 0x63, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20,
|
||||||
|
0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73,
|
||||||
|
0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x72, 0x0a, 0x14, 0x47, 0x75, 0x69, 0x6c, 0x64,
|
||||||
|
0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12,
|
||||||
|
0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||||
|
0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f,
|
||||||
|
0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69,
|
||||||
|
0x64, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||||
|
0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
|
0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x8a, 0x01, 0x0a, 0x15,
|
||||||
0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
|
0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
|
||||||
0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75,
|
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64,
|
||||||
0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69,
|
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12,
|
||||||
0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02,
|
0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06,
|
0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
|
||||||
0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42,
|
0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70,
|
0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73,
|
||||||
0x6f, 0x72, 0x74, 0x22, 0xd6, 0x01, 0x0a, 0x1b, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65,
|
0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f,
|
||||||
0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52,
|
0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x75, 0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c,
|
||||||
0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01,
|
0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e,
|
||||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a,
|
0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69,
|
||||||
0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62,
|
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64,
|
||||||
0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28,
|
0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||||
0x05, 0x52, 0x02, 0x68, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04,
|
0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f,
|
||||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
|
0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||||
0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x66, 0x66, 0x69,
|
0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22,
|
||||||
0x63, 0x69, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66,
|
0xd6, 0x01, 0x0a, 0x1b, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x43, 0x68, 0x61, 0x6c,
|
||||||
0x69, 0x63, 0x69, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18,
|
0x6c, 0x65, 0x6e, 0x67, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||||
0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
|
0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||||
0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
|
0x52, 0x07, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f,
|
||||||
0x52, 0x0a, 0x62, 0x6f, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16,
|
0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69,
|
||||||
0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e,
|
0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68,
|
||||||
0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,
|
0x70, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b,
|
||||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76,
|
0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61,
|
||||||
0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x17, 0x47, 0x75, 0x69, 0x6c, 0x64,
|
0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65, 0x6e,
|
||||||
0x47, 0x76, 0x65, 0x53, 0x74, 0x61, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75,
|
0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x66, 0x66, 0x69, 0x63, 0x69, 0x65,
|
||||||
|
0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
|
||||||
|
0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x73,
|
||||||
|
0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x62, 0x6f,
|
||||||
|
0x6f, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c,
|
||||||
|
0x64, 0x47, 0x76, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75,
|
||||||
0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
|
0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
|
||||||
0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69,
|
0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69,
|
||||||
0x6e, 0x66, 0x6f, 0x22, 0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42,
|
0x6e, 0x66, 0x6f, 0x22, 0x3a, 0x0a, 0x17, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x53,
|
||||||
0x6f, 0x6f, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a,
|
0x74, 0x61, 0x67, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f,
|
||||||
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42,
|
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44,
|
||||||
0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4a,
|
0x42, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||||
0x0a, 0x1a, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74,
|
0x39, 0x0a, 0x16, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x42, 0x6f, 0x6f, 0x73, 0x43,
|
||||||
0x74, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2c, 0x0a, 0x06,
|
0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66,
|
||||||
0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44,
|
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x47, 0x75, 0x69, 0x6c,
|
||||||
0x42, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f,
|
0x64, 0x47, 0x76, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4a, 0x0a, 0x1a, 0x47, 0x75,
|
||||||
0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x18, 0x47, 0x75,
|
0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x43, 0x68,
|
||||||
0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63,
|
0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x2c, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f,
|
||||||
0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64,
|
0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65,
|
||||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1c,
|
0x52, 0x6f, 0x75, 0x6c, 0x65, 0x74, 0x74, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06,
|
||||||
0x0a, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x6a, 0x0a, 0x18, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
|
||||||
0x05, 0x52, 0x09, 0x71, 0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07,
|
|
||||||
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x66,
|
|
||||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x59, 0x0a, 0x19, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47,
|
|
||||||
0x76, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52,
|
0x76, 0x65, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52,
|
||||||
0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20,
|
0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x72,
|
0x28, 0x05, 0x52, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x71, 0x75,
|
||||||
0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42,
|
0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x71,
|
||||||
0x47, 0x76, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72,
|
0x75, 0x65, 0x72, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65,
|
||||||
0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
|
0x6e, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e,
|
||||||
0x33,
|
0x64, 0x73, 0x22, 0x59, 0x0a, 0x19, 0x47, 0x75, 0x69, 0x6c, 0x64, 0x47, 0x76, 0x65, 0x46, 0x72,
|
||||||
|
0x69, 0x65, 0x6e, 0x64, 0x73, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||||
|
0x16, 0x0a, 0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
|
0x06, 0x62, 0x6f, 0x6f, 0x73, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72,
|
||||||
|
0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x47, 0x76, 0x65, 0x52,
|
||||||
|
0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x42, 0x06, 0x5a,
|
||||||
|
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -11,8 +11,8 @@ package cfg
|
|||||||
import "errors"
|
import "errors"
|
||||||
|
|
||||||
type GameRechargeData struct {
|
type GameRechargeData struct {
|
||||||
Id int32
|
Id string
|
||||||
Bpoint string
|
Pid int32
|
||||||
Editionid string
|
Editionid string
|
||||||
RechargeType int32
|
RechargeType int32
|
||||||
Monetaryunit string
|
Monetaryunit string
|
||||||
@ -33,22 +33,77 @@ func (*GameRechargeData) GetTypeId() int32 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (_v *GameRechargeData) Deserialize(_buf map[string]interface{}) (err error) {
|
func (_v *GameRechargeData) Deserialize(_buf map[string]interface{}) (err error) {
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
{
|
||||||
{ var _ok_ bool; if _v.Bpoint, _ok_ = _buf["bpoint"].(string); !_ok_ { err = errors.New("bpoint error"); return } }
|
var _ok_ bool
|
||||||
{ var _ok_ bool; if _v.Editionid, _ok_ = _buf["editionid"].(string); !_ok_ { err = errors.New("editionid error"); return } }
|
if _v.Id, _ok_ = _buf["id"].(string); !_ok_ {
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recharge_type"].(float64); !_ok_ { err = errors.New("recharge_type error"); return }; _v.RechargeType = int32(_tempNum_) }
|
err = errors.New("id error")
|
||||||
{ var _ok_ bool; if _v.Monetaryunit, _ok_ = _buf["monetaryunit"].(string); !_ok_ { err = errors.New("monetaryunit error"); return } }
|
return
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["amount"].(float64); !_ok_ { err = errors.New("amount error"); return }; _v.Amount = int32(_tempNum_) }
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
var _tempNum_ float64
|
||||||
|
if _tempNum_, _ok_ = _buf["pid"].(float64); !_ok_ {
|
||||||
|
err = errors.New("pid error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_v.Pid = int32(_tempNum_)
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
if _v.Editionid, _ok_ = _buf["editionid"].(string); !_ok_ {
|
||||||
|
err = errors.New("editionid error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
var _tempNum_ float64
|
||||||
|
if _tempNum_, _ok_ = _buf["recharge_type"].(float64); !_ok_ {
|
||||||
|
err = errors.New("recharge_type error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_v.RechargeType = int32(_tempNum_)
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
if _v.Monetaryunit, _ok_ = _buf["monetaryunit"].(string); !_ok_ {
|
||||||
|
err = errors.New("monetaryunit error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
var _tempNum_ float64
|
||||||
|
if _tempNum_, _ok_ = _buf["amount"].(float64); !_ok_ {
|
||||||
|
err = errors.New("amount error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_v.Amount = int32(_tempNum_)
|
||||||
|
}
|
||||||
{
|
{
|
||||||
var _arr_ []interface{}
|
var _arr_ []interface{}
|
||||||
var _ok_ bool
|
var _ok_ bool
|
||||||
if _arr_, _ok_ = _buf["vipexp"].([]interface{}); !_ok_ { err = errors.New("vipexp error"); return }
|
if _arr_, _ok_ = _buf["vipexp"].([]interface{}); !_ok_ {
|
||||||
|
err = errors.New("vipexp error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
_v.Vipexp = make([]*Gameatn, 0, len(_arr_))
|
_v.Vipexp = make([]*Gameatn, 0, len(_arr_))
|
||||||
|
|
||||||
for _, _e_ := range _arr_ {
|
for _, _e_ := range _arr_ {
|
||||||
var _list_v_ *Gameatn
|
var _list_v_ *Gameatn
|
||||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
var _x_ map[string]interface{}
|
||||||
|
if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
|
||||||
|
err = errors.New("_list_v_ error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _list_v_, err = DeserializeGameatn(_x_); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
_v.Vipexp = append(_v.Vipexp, _list_v_)
|
_v.Vipexp = append(_v.Vipexp, _list_v_)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -56,22 +111,67 @@ func (_v *GameRechargeData)Deserialize(_buf map[string]interface{}) (err error)
|
|||||||
{
|
{
|
||||||
var _arr_ []interface{}
|
var _arr_ []interface{}
|
||||||
var _ok_ bool
|
var _ok_ bool
|
||||||
if _arr_, _ok_ = _buf["diamond_num_double"].([]interface{}); !_ok_ { err = errors.New("diamond_num_double error"); return }
|
if _arr_, _ok_ = _buf["diamond_num_double"].([]interface{}); !_ok_ {
|
||||||
|
err = errors.New("diamond_num_double error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
_v.DiamondNumDouble = make([]*Gameatn, 0, len(_arr_))
|
_v.DiamondNumDouble = make([]*Gameatn, 0, len(_arr_))
|
||||||
|
|
||||||
for _, _e_ := range _arr_ {
|
for _, _e_ := range _arr_ {
|
||||||
var _list_v_ *Gameatn
|
var _list_v_ *Gameatn
|
||||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
var _x_ map[string]interface{}
|
||||||
|
if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ {
|
||||||
|
err = errors.New("_list_v_ error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if _list_v_, err = DeserializeGameatn(_x_); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
_v.DiamondNumDouble = append(_v.DiamondNumDouble, _list_v_)
|
_v.DiamondNumDouble = append(_v.DiamondNumDouble, _list_v_)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
{ var _ok_ bool; if _v.Channel, _ok_ = _buf["channel"].(string); !_ok_ { err = errors.New("channel error"); return } }
|
{
|
||||||
{ var _ok_ bool; if _v.Text, _ok_ = _buf["text"].(string); !_ok_ { err = errors.New("text error"); return } }
|
var _ok_ bool
|
||||||
{ var _ok_ bool; if _v.Show, _ok_ = _buf["show"].(string); !_ok_ { err = errors.New("show error"); return } }
|
if _v.Channel, _ok_ = _buf["channel"].(string); !_ok_ {
|
||||||
{ var _ok_ bool; if _v.Image, _ok_ = _buf["image"].(string); !_ok_ { err = errors.New("image error"); return } }
|
err = errors.New("channel error")
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["integral"].(float64); !_ok_ { err = errors.New("integral error"); return }; _v.Integral = int32(_tempNum_) }
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
if _v.Text, _ok_ = _buf["text"].(string); !_ok_ {
|
||||||
|
err = errors.New("text error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
if _v.Show, _ok_ = _buf["show"].(string); !_ok_ {
|
||||||
|
err = errors.New("show error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
if _v.Image, _ok_ = _buf["image"].(string); !_ok_ {
|
||||||
|
err = errors.New("image error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
var _ok_ bool
|
||||||
|
var _tempNum_ float64
|
||||||
|
if _tempNum_, _ok_ = _buf["integral"].(float64); !_ok_ {
|
||||||
|
err = errors.New("integral error")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
_v.Integral = int32(_tempNum_)
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user