上传商城代码
This commit is contained in:
liwei1dao
parent
f96232a3a5
commit
a311730351
@ -491,7 +491,7 @@
|
||||
},
|
||||
{
|
||||
"id": 114,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_05",
|
||||
"battleScenes": [
|
||||
@ -526,7 +526,7 @@
|
||||
},
|
||||
{
|
||||
"id": 115,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_06",
|
||||
"battleScenes": [
|
||||
@ -561,7 +561,7 @@
|
||||
},
|
||||
{
|
||||
"id": 116,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_05",
|
||||
"battleScenes": [
|
||||
@ -596,7 +596,7 @@
|
||||
},
|
||||
{
|
||||
"id": 117,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_06",
|
||||
"battleScenes": [
|
||||
@ -633,7 +633,7 @@
|
||||
},
|
||||
{
|
||||
"id": 118,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_06",
|
||||
"battleScenes": [
|
||||
@ -668,7 +668,7 @@
|
||||
},
|
||||
{
|
||||
"id": 119,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_02",
|
||||
"battleScenes": [
|
||||
@ -913,7 +913,7 @@
|
||||
},
|
||||
{
|
||||
"id": 126,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_04",
|
||||
"battleScenes": [
|
||||
@ -948,7 +948,7 @@
|
||||
},
|
||||
{
|
||||
"id": 127,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_04",
|
||||
"battleScenes": [
|
||||
@ -983,7 +983,7 @@
|
||||
},
|
||||
{
|
||||
"id": 128,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_02",
|
||||
"battleScenes": [
|
||||
@ -1271,7 +1271,7 @@
|
||||
},
|
||||
{
|
||||
"id": 136,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_03",
|
||||
"battleScenes": [
|
||||
@ -1306,7 +1306,7 @@
|
||||
},
|
||||
{
|
||||
"id": 137,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_03",
|
||||
"battleScenes": [
|
||||
@ -1344,7 +1344,7 @@
|
||||
},
|
||||
{
|
||||
"id": 138,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_03",
|
||||
"battleScenes": [
|
||||
@ -1379,7 +1379,7 @@
|
||||
},
|
||||
{
|
||||
"id": 139,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_05",
|
||||
"battleScenes": [
|
||||
@ -1414,7 +1414,7 @@
|
||||
},
|
||||
{
|
||||
"id": 140,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_05",
|
||||
"battleScenes": [
|
||||
@ -1564,7 +1564,7 @@
|
||||
},
|
||||
{
|
||||
"id": 204,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_03",
|
||||
"battleScenes": [
|
||||
@ -1636,7 +1636,7 @@
|
||||
},
|
||||
{
|
||||
"id": 206,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_03",
|
||||
"battleScenes": [
|
||||
@ -1671,7 +1671,7 @@
|
||||
},
|
||||
{
|
||||
"id": 207,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_04",
|
||||
"battleScenes": [
|
||||
@ -1706,7 +1706,7 @@
|
||||
},
|
||||
{
|
||||
"id": 208,
|
||||
"PlayType": 0,
|
||||
"PlayType": 1,
|
||||
"HeroCount": 5,
|
||||
"readyScene": "scenesfight_role_interface_03",
|
||||
"battleScenes": [
|
||||
|
||||
@ -798,5 +798,15 @@
|
||||
},
|
||||
"data": "1",
|
||||
"prefix": "bingo:sociatybooslv,{0}"
|
||||
},
|
||||
{
|
||||
"id": 81,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_128",
|
||||
"text": "创角"
|
||||
},
|
||||
"data": "输入昵称",
|
||||
"prefix": "bingo:create,{0}"
|
||||
}
|
||||
]
|
||||
@ -16771,7 +16771,7 @@
|
||||
"hid": "53007",
|
||||
"name": {
|
||||
"key": "hero_main_name_53007",
|
||||
"text": "巨型蜘蛛"
|
||||
"text": "漆黑"
|
||||
},
|
||||
"star": 3,
|
||||
"color": 2,
|
||||
@ -16781,16 +16781,16 @@
|
||||
"ip": 1,
|
||||
"sd": 1,
|
||||
"handbook": -1,
|
||||
"prefab": "51050",
|
||||
"prefab": "35003",
|
||||
"rotation": "0|0|0",
|
||||
"revolve": 0,
|
||||
"scale": [
|
||||
1,
|
||||
1,
|
||||
1
|
||||
0.5,
|
||||
0.5,
|
||||
0.5
|
||||
],
|
||||
"icon": "51050",
|
||||
"vocal": "51050",
|
||||
"icon": "35003",
|
||||
"vocal": "35003",
|
||||
"tujing": [
|
||||
107
|
||||
],
|
||||
@ -16799,7 +16799,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"events": "hero_51050",
|
||||
"events": "hero_35003",
|
||||
"cite": "",
|
||||
"effectstay": [],
|
||||
"hpspace": {
|
||||
@ -16847,7 +16847,7 @@
|
||||
"expitemnum": 7,
|
||||
"herointr": {
|
||||
"key": "hero_main_herointr_202",
|
||||
"text": "传说中的守护者“巨型蜘蛛”,拥有不俗的战斗能力"
|
||||
"text": "传说中的守护者“漆黑”,拥有不俗的战斗能力"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -9546,7 +9546,7 @@
|
||||
"grouptype": [],
|
||||
"Episodetype": 0,
|
||||
"stage_param": 0,
|
||||
"inherit": 1,
|
||||
"inherit": 0,
|
||||
"battle_fail": 0,
|
||||
"venturemodelspeed": 0,
|
||||
"venturemodelscale": 0,
|
||||
@ -9563,8 +9563,8 @@
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
"EditorStage": 0,
|
||||
"herocolor": 2,
|
||||
"heroimg": "zxgq_qp_icon_gth",
|
||||
"herocolor": 0,
|
||||
"heroimg": "",
|
||||
"bubbletext": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -9581,8 +9581,8 @@
|
||||
"text": ""
|
||||
},
|
||||
"mainlineName": {
|
||||
"key": "mainchapter_main_stage_mainlineName_108",
|
||||
"text": "2-74"
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"title": {
|
||||
"key": "",
|
||||
|
||||
@ -2987,5 +2987,61 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "treasuremap",
|
||||
"name": {
|
||||
"key": "opencond_opencond_name_108",
|
||||
"text": "藏宝图"
|
||||
},
|
||||
"main": [
|
||||
{
|
||||
"key": 2,
|
||||
"param": 1101004
|
||||
}
|
||||
],
|
||||
"wkqbx": 0,
|
||||
"img": "icon_cbt_bs",
|
||||
"prompt": {
|
||||
"key": "opencond_opencond_prompt_89",
|
||||
"text": "继续完成更多主线任务开启"
|
||||
},
|
||||
"uiid": 0,
|
||||
"activateType": 0,
|
||||
"notify": [],
|
||||
"kqbx": 0,
|
||||
"kqbx_ui": "",
|
||||
"kqbx_text": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "moonlevel",
|
||||
"name": {
|
||||
"key": "opencond_opencond_name_109",
|
||||
"text": "辉月等级"
|
||||
},
|
||||
"main": [
|
||||
{
|
||||
"key": 2,
|
||||
"param": 1101005
|
||||
}
|
||||
],
|
||||
"wkqbx": 2,
|
||||
"img": "ty_icon_shz",
|
||||
"prompt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"uiid": 0,
|
||||
"activateType": 0,
|
||||
"notify": [],
|
||||
"kqbx": 1,
|
||||
"kqbx_ui": "btn_card",
|
||||
"kqbx_text": {
|
||||
"key": "opencond_opencond_kqbx_text_1",
|
||||
"text": "守护者养成，战力提升"
|
||||
}
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
@ -3,23 +3,10 @@
|
||||
"id": "gold6",
|
||||
"pid": 1,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 600,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 60
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 120
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "6元",
|
||||
@ -30,23 +17,10 @@
|
||||
"id": "gold30",
|
||||
"pid": 2,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 300
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 600
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "30元",
|
||||
@ -57,23 +31,10 @@
|
||||
"id": "gold68",
|
||||
"pid": 3,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 6800,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 680
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1360
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "68元",
|
||||
@ -84,23 +45,10 @@
|
||||
"id": "gold128",
|
||||
"pid": 4,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 9800,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 980
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1960
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "98元",
|
||||
@ -111,23 +59,10 @@
|
||||
"id": "gold198",
|
||||
"pid": 5,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 12800,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1280
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 2560
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "128元",
|
||||
@ -138,23 +73,10 @@
|
||||
"id": "gold328",
|
||||
"pid": 6,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 19800,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1980
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 3960
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "198元",
|
||||
@ -165,23 +87,10 @@
|
||||
"id": "gold448",
|
||||
"pid": 7,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 32800,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 3280
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 6560
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "328元",
|
||||
@ -192,23 +101,10 @@
|
||||
"id": "gold648",
|
||||
"pid": 8,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 1,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 64800,
|
||||
"vipexp": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 6480
|
||||
}
|
||||
],
|
||||
"diamond_num_double": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 12960
|
||||
}
|
||||
],
|
||||
"vipexp": [],
|
||||
"diamond_num_double": [],
|
||||
"channel": "0",
|
||||
"text": "0",
|
||||
"show": "648元",
|
||||
@ -219,7 +115,6 @@
|
||||
"id": "lb6_1",
|
||||
"pid": 9,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 600,
|
||||
"vipexp": [],
|
||||
@ -234,7 +129,6 @@
|
||||
"id": "day_1",
|
||||
"pid": 10,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 600,
|
||||
"vipexp": [],
|
||||
@ -249,7 +143,6 @@
|
||||
"id": "day_2",
|
||||
"pid": 11,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -264,7 +157,6 @@
|
||||
"id": "day_3",
|
||||
"pid": 12,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 6800,
|
||||
"vipexp": [],
|
||||
@ -279,7 +171,6 @@
|
||||
"id": "day_4",
|
||||
"pid": 13,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 12800,
|
||||
"vipexp": [],
|
||||
@ -294,7 +185,6 @@
|
||||
"id": "week_1",
|
||||
"pid": 14,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -309,7 +199,6 @@
|
||||
"id": "week_2",
|
||||
"pid": 15,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 9800,
|
||||
"vipexp": [],
|
||||
@ -324,7 +213,6 @@
|
||||
"id": "week_3",
|
||||
"pid": 16,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 19800,
|
||||
"vipexp": [],
|
||||
@ -339,7 +227,6 @@
|
||||
"id": "week_4",
|
||||
"pid": 17,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 32800,
|
||||
"vipexp": [],
|
||||
@ -354,7 +241,6 @@
|
||||
"id": "week_5",
|
||||
"pid": 18,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 44800,
|
||||
"vipexp": [],
|
||||
@ -369,7 +255,6 @@
|
||||
"id": "week_6",
|
||||
"pid": 19,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 64800,
|
||||
"vipexp": [],
|
||||
@ -384,7 +269,6 @@
|
||||
"id": "month_1",
|
||||
"pid": 20,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 12800,
|
||||
"vipexp": [],
|
||||
@ -399,7 +283,6 @@
|
||||
"id": "month_2",
|
||||
"pid": 21,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 19800,
|
||||
"vipexp": [],
|
||||
@ -414,7 +297,6 @@
|
||||
"id": "month_3",
|
||||
"pid": 22,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 2,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 32800,
|
||||
"vipexp": [],
|
||||
@ -429,7 +311,6 @@
|
||||
"id": "yueka_lv1",
|
||||
"pid": 23,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 3,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [
|
||||
@ -450,7 +331,6 @@
|
||||
"id": "yueka_lv2",
|
||||
"pid": 24,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 3,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 9800,
|
||||
"vipexp": [
|
||||
@ -471,7 +351,6 @@
|
||||
"id": "passcheck_1",
|
||||
"pid": 25,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 4,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 9800,
|
||||
"vipexp": [],
|
||||
@ -486,7 +365,6 @@
|
||||
"id": "passcheck_2",
|
||||
"pid": 26,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 4,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 9800,
|
||||
"vipexp": [],
|
||||
@ -501,7 +379,6 @@
|
||||
"id": "drawcard_pack1",
|
||||
"pid": 27,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 5,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -516,7 +393,6 @@
|
||||
"id": "passcheck_3",
|
||||
"pid": 28,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 4,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -531,7 +407,6 @@
|
||||
"id": "passcheck_4",
|
||||
"pid": 29,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 4,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 6800,
|
||||
"vipexp": [],
|
||||
@ -546,7 +421,6 @@
|
||||
"id": "fund_1",
|
||||
"pid": 30,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -561,7 +435,6 @@
|
||||
"id": "fund_2",
|
||||
"pid": 31,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -576,7 +449,6 @@
|
||||
"id": "fund_3",
|
||||
"pid": 32,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -591,7 +463,6 @@
|
||||
"id": "fund_4",
|
||||
"pid": 33,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -606,7 +477,6 @@
|
||||
"id": "fund_5",
|
||||
"pid": 34,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -621,7 +491,6 @@
|
||||
"id": "fund_6",
|
||||
"pid": 35,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -636,7 +505,6 @@
|
||||
"id": "fund_7",
|
||||
"pid": 36,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -651,7 +519,6 @@
|
||||
"id": "fund_8",
|
||||
"pid": 37,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 6000,
|
||||
"vipexp": [],
|
||||
@ -666,7 +533,6 @@
|
||||
"id": "fund_9",
|
||||
"pid": 38,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -681,7 +547,6 @@
|
||||
"id": "fund_10",
|
||||
"pid": 39,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 6,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 6800,
|
||||
"vipexp": [],
|
||||
@ -696,7 +561,6 @@
|
||||
"id": "drawcard_pack2",
|
||||
"pid": 40,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 5,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -711,7 +575,6 @@
|
||||
"id": "drawcard_pack3",
|
||||
"pid": 41,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 5,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -726,7 +589,6 @@
|
||||
"id": "drawcard_pack4",
|
||||
"pid": 42,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 5,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -741,7 +603,6 @@
|
||||
"id": "passcheckPro_4",
|
||||
"pid": 43,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 4,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 9800,
|
||||
"vipexp": [
|
||||
@ -768,7 +629,6 @@
|
||||
"id": "passcheckMid_4",
|
||||
"pid": 44,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 4,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [
|
||||
@ -795,7 +655,6 @@
|
||||
"id": "push_gift_1",
|
||||
"pid": 45,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -810,7 +669,6 @@
|
||||
"id": "push_gift_2",
|
||||
"pid": 46,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -825,7 +683,6 @@
|
||||
"id": "push_gift_3",
|
||||
"pid": 47,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -840,7 +697,6 @@
|
||||
"id": "push_gift_4",
|
||||
"pid": 48,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -855,7 +711,6 @@
|
||||
"id": "push_gift_5",
|
||||
"pid": 49,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -870,7 +725,6 @@
|
||||
"id": "push_gift_6",
|
||||
"pid": 50,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -885,7 +739,6 @@
|
||||
"id": "push_gift_7",
|
||||
"pid": 51,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -900,7 +753,6 @@
|
||||
"id": "push_gift_8",
|
||||
"pid": 52,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -915,7 +767,6 @@
|
||||
"id": "push_gift_9",
|
||||
"pid": 53,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -930,7 +781,6 @@
|
||||
"id": "push_gift_10",
|
||||
"pid": 54,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -945,7 +795,6 @@
|
||||
"id": "push_gift_11",
|
||||
"pid": 55,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
@ -960,7 +809,6 @@
|
||||
"id": "push_gift_12",
|
||||
"pid": 56,
|
||||
"editionid": "debug",
|
||||
"recharge_type": 7,
|
||||
"monetaryunit": "￥",
|
||||
"amount": 3000,
|
||||
"vipexp": [],
|
||||
|
||||
154
bin/json/game_rechargediamond.json
Normal file
154
bin/json/game_rechargediamond.json
Normal file
@ -0,0 +1,154 @@
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 60
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 120
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_01",
|
||||
"bpoint": "gold6"
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 300
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 600
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_02",
|
||||
"bpoint": "gold30"
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 680
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1360
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_02",
|
||||
"bpoint": "gold68"
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 980
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1960
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_02",
|
||||
"bpoint": "gold128"
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1280
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 2560
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_03",
|
||||
"bpoint": "gold198"
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 1980
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 3960
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_03",
|
||||
"bpoint": "gold328"
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 3280
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 6560
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_03",
|
||||
"bpoint": "gold448"
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 6480
|
||||
}
|
||||
],
|
||||
"diamond_award": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 12960
|
||||
}
|
||||
],
|
||||
"image": "cz_zs_03",
|
||||
"bpoint": "gold648"
|
||||
}
|
||||
]
|
||||
@ -48926,7 +48926,7 @@
|
||||
"ico": "jn_51050_1",
|
||||
"CorrectPos": 0,
|
||||
"IsMelee": 0,
|
||||
"act": "Skill_1",
|
||||
"act": "Skill_3",
|
||||
"Type": 1,
|
||||
"CD": 0,
|
||||
"Where": [],
|
||||
|
||||
@ -232,6 +232,8 @@ const (
|
||||
TablePay = "payorder"
|
||||
///充值数据表
|
||||
TablePayUser = "payuser"
|
||||
///充值数据表 钻石商城
|
||||
TablePayDiamond = "paydiamond"
|
||||
///充值数据表 每日礼包
|
||||
TablePayDaily = "paydaily"
|
||||
// 巨怪列车收益记录
|
||||
|
||||
@ -31,7 +31,7 @@ type (
|
||||
}
|
||||
//支付发布接口
|
||||
IPayDelivery interface {
|
||||
Delivery(session IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAssets)
|
||||
Delivery(session IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAtno)
|
||||
}
|
||||
)
|
||||
|
||||
@ -390,7 +390,7 @@ type (
|
||||
// 创建一个新的特权卡
|
||||
IPayDelivery
|
||||
// 续费特权卡
|
||||
RenewPrivilegeCard(session IUserSession, cId string) (errdata *pb.ErrorData)
|
||||
RenewPrivilegeCard(session IUserSession, cId int32) (errdata *pb.ErrorData)
|
||||
// 检查特权 参数 计费点 返回值 是否有特权
|
||||
CheckPrivilege(session IUserSession, cId int32) bool
|
||||
// 检查每日特权邮件
|
||||
|
||||
@ -17,7 +17,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq
|
||||
var (
|
||||
info *pb.DBIsland
|
||||
warorder *pb.Warorder
|
||||
confs []*cfg.GamePuggsyPasscheckData
|
||||
confs []*cfg.GamePassCheckTaskData
|
||||
awards []*cfg.Gameatn
|
||||
award []*pb.UserAtno
|
||||
err error
|
||||
@ -33,7 +33,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq
|
||||
}
|
||||
return
|
||||
}
|
||||
if confs, err = this.module.configure.getGamePuggsyPasscheckData(); err != nil {
|
||||
if confs, err = this.module.configure.getGamePassCheckTaskData(); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
@ -46,11 +46,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq
|
||||
for _, v := range confs {
|
||||
if v.Parameter <= int32(len(info.Nodes)) {
|
||||
if warorder.Freeprogress < v.Parameter {
|
||||
awards = append(awards, v.FreeReward)
|
||||
awards = append(awards, v.ShowAtn)
|
||||
}
|
||||
if warorder.Vip {
|
||||
if warorder.Payprogress < v.Parameter {
|
||||
awards = append(awards, v.PayReward...)
|
||||
awards = append(awards, v.ShowAtn)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,13 +10,13 @@ import (
|
||||
)
|
||||
|
||||
const (
|
||||
game_puggsyevent = "game_puggsyevent.json"
|
||||
game_puggsyskill = "game_puggsyskill.json"
|
||||
game_puggsyfight = "game_puggsyfight.json"
|
||||
game_puggsyscore = "game_puggsyscore.json"
|
||||
game_puggsypasscheck = "game_puggsypasscheck.json"
|
||||
game_puggsystar = "game_puggsystar.json"
|
||||
game_puggsyrecruit = "game_puggsyrecruit.json"
|
||||
game_puggsyevent = "game_puggsyevent.json"
|
||||
game_puggsyskill = "game_puggsyskill.json"
|
||||
game_puggsyfight = "game_puggsyfight.json"
|
||||
game_puggsyscore = "game_puggsyscore.json"
|
||||
game_passcheck = "game_passcheck.json"
|
||||
game_puggsystar = "game_puggsystar.json"
|
||||
game_puggsyrecruit = "game_puggsyrecruit.json"
|
||||
)
|
||||
|
||||
// /背包配置管理组件
|
||||
@ -33,7 +33,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
|
||||
err = this.LoadConfigure(game_puggsyskill, cfg.NewGamePuggsySkill)
|
||||
err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight)
|
||||
err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore)
|
||||
err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPasscheck)
|
||||
err = this.LoadConfigure(game_passcheck, cfg.NewGamePassCheck)
|
||||
err = this.LoadConfigure(game_puggsystar, cfg.NewGamePuggsyStar)
|
||||
err = this.LoadConfigure(game_puggsyrecruit, cfg.NewGamePuggsyRecruit)
|
||||
return
|
||||
@ -157,14 +157,18 @@ func (this *ConfigureComp) getGamePuggsyScoreDatas(min, max int32) (confs []*cfg
|
||||
}
|
||||
|
||||
// 获取伤害对应的评分组
|
||||
func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPasscheckData, err error) {
|
||||
func (this *ConfigureComp) getGamePassCheckTaskData() (confs []*cfg.GamePassCheckTaskData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_puggsyscore); err != nil {
|
||||
if v, err = this.GetConfigure(game_passcheck); err != nil {
|
||||
return
|
||||
} else {
|
||||
results = v.(*cfg.GamePuggsyPasscheck).GetDataList()
|
||||
for _, v := range v.(*cfg.GamePassCheckTask).GetDataList() {
|
||||
if v.PasscheckType == 5 {
|
||||
confs = append(confs, v)
|
||||
}
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -25,7 +25,7 @@ func (this *apiComp) ActivityBuy(session comm.IUserSession, req *pb.PayActivityB
|
||||
var (
|
||||
info *pb.DBActivityGiftbag
|
||||
conf *cfg.GamePayGiftpackData
|
||||
items []*pb.UserAssets
|
||||
items []*pb.UserAtno
|
||||
buynum, totalbuy int32
|
||||
err error
|
||||
)
|
||||
@ -88,7 +88,7 @@ func (this *apiComp) ActivityBuy(session comm.IUserSession, req *pb.PayActivityB
|
||||
return
|
||||
}
|
||||
}
|
||||
if errdata, items = this.module.modelActivity.deliverybyid(session, conf.Id); errdata != nil {
|
||||
if errdata, items = this.module.modelActivity.delivery(session, conf.Id); errdata != nil {
|
||||
return
|
||||
}
|
||||
session.SendMsg(string(this.module.GetType()), "activitybuy", &pb.PayDailyBuyResp{Isucc: true, Items: items})
|
||||
|
||||
@ -23,7 +23,7 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq)
|
||||
var (
|
||||
info *pb.DBPayDaily
|
||||
conf *cfg.GamePayPackageData
|
||||
items []*pb.UserAssets
|
||||
items []*pb.UserAtno
|
||||
err error
|
||||
)
|
||||
if errdata = this.DailyBuyCheck(session, req); errdata != nil {
|
||||
@ -62,7 +62,7 @@ func (this *apiComp) DailyBuy(session comm.IUserSession, req *pb.PayDailyBuyReq)
|
||||
}
|
||||
}
|
||||
|
||||
if errdata, items = this.module.modelDaily.deliverybyid(session, conf.Id); errdata != nil {
|
||||
if errdata, items = this.module.modelDaily.delivery(session, conf.Id); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@ -1,16 +1,17 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/modules"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
)
|
||||
|
||||
const (
|
||||
game_recharge = "game_recharge.json"
|
||||
game_paypackage = "game_paypackage.json"
|
||||
game_paygiftpack = "game_paygiftpack.json"
|
||||
game_recharge = "game_recharge.json"
|
||||
game_rechargediamond = "game_rechargediamond.json"
|
||||
game_paypackage = "game_paypackage.json"
|
||||
game_paygiftpack = "game_paygiftpack.json"
|
||||
)
|
||||
|
||||
// /背包配置管理组件
|
||||
@ -24,6 +25,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
|
||||
this.MCompConfigure.Init(service, module, comp, options)
|
||||
this.module = module.(*Pay)
|
||||
this.LoadConfigure(game_recharge, cfg.NewGameRecharge)
|
||||
this.LoadConfigure(game_rechargediamond, cfg.NewGameRechargeDiamond)
|
||||
this.LoadConfigure(game_paypackage, cfg.NewGamePayPackage)
|
||||
this.LoadConfigure(game_paygiftpack, cfg.NewGamePayGiftpack)
|
||||
return
|
||||
@ -40,8 +42,8 @@ func (this *configureComp) getGameRecharge(id string) (result *cfg.GameRechargeD
|
||||
return
|
||||
} else {
|
||||
if result, ok = v.(*cfg.GameRecharge).GetDataMap()[id]; !ok {
|
||||
err = fmt.Errorf("getGameRecharge on found %s", id)
|
||||
this.module.Errorf("err:%v", err)
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_recharge, id)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -54,7 +56,7 @@ func (this *configureComp) getPayPackageDatas(ptype int32) (result []*cfg.GamePa
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_paypackage); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
} else {
|
||||
result = make([]*cfg.GamePayPackageData, 0)
|
||||
@ -74,12 +76,12 @@ func (this *configureComp) getPayPackageData(id int32) (result *cfg.GamePayPacka
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(game_paypackage); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
} else {
|
||||
if result, ok = v.(*cfg.GamePayPackage).GetDataMap()[id]; !ok {
|
||||
err = fmt.Errorf("getGameRecharge on found %d", id)
|
||||
this.module.Errorf("err:%v", err)
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_paypackage, id)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -92,7 +94,7 @@ func (this *configureComp) getPayPackageDataByPid(pid int32) (result *cfg.GamePa
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_paypackage); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
} else {
|
||||
for _, v := range v.(*cfg.GamePayPackage).GetDataMap() {
|
||||
@ -102,7 +104,7 @@ func (this *configureComp) getPayPackageDataByPid(pid int32) (result *cfg.GamePa
|
||||
}
|
||||
}
|
||||
}
|
||||
err = fmt.Errorf("getPayPackageDataByPid no found %s", pid)
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_paypackage, pid)
|
||||
return
|
||||
}
|
||||
|
||||
@ -113,12 +115,12 @@ func (this *configureComp) getPayGiftpackeData(id int32) (result *cfg.GamePayGif
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(game_paygiftpack); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
} else {
|
||||
if result, ok = v.(*cfg.GamePayGiftpack).GetDataMap()[id]; !ok {
|
||||
err = fmt.Errorf("getGameRecharge on found %d", id)
|
||||
this.module.Errorf("err:%v", err)
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_paygiftpack, id)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
@ -131,7 +133,7 @@ func (this *configureComp) getPayGiftpackDataByPid(pid int32) (result *cfg.GameP
|
||||
v interface{}
|
||||
)
|
||||
if v, err = this.GetConfigure(game_paygiftpack); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
} else {
|
||||
for _, v := range v.(*cfg.GamePayGiftpack).GetDataMap() {
|
||||
@ -141,6 +143,25 @@ func (this *configureComp) getPayGiftpackDataByPid(pid int32) (result *cfg.GameP
|
||||
}
|
||||
}
|
||||
}
|
||||
err = fmt.Errorf("getPayPackageDataByPid no found %s", pid)
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_paygiftpack, pid)
|
||||
return
|
||||
}
|
||||
|
||||
// 獲取
|
||||
func (this *configureComp) getGameRechargeDiamond(pid int32) (conf *cfg.GameRechargeDiamondData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
ok bool
|
||||
)
|
||||
if v, err = this.GetConfigure(game_rechargediamond); err != nil {
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
} else {
|
||||
if conf, ok = v.(*cfg.GameRechargeDiamond).GetDataMap()[pid]; !ok {
|
||||
err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_rechargediamond, pid)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@ -82,74 +82,7 @@ func (this *modelActivityComp) updateActivitys(uid string, data *pb.DBActivityGi
|
||||
}
|
||||
|
||||
// 每日礼包发货
|
||||
func (this *modelActivityComp) deliverybyid(session comm.IUserSession, id int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
var (
|
||||
info *pb.DBActivityGiftbag
|
||||
item *pb.ActivityGiftbagItem
|
||||
conf *cfg.GamePayGiftpackData
|
||||
ok bool
|
||||
err error
|
||||
)
|
||||
if conf, err = this.module.configure.getPayGiftpackeData(id); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if info, err = this.getUserActivitys(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if item, ok = info.Activitys[conf.Type]; !ok {
|
||||
item = &pb.ActivityGiftbagItem{
|
||||
Opentime: 0,
|
||||
Items: make(map[int32]*pb.PayActivityGiftbagItem),
|
||||
}
|
||||
info.Activitys[conf.Type] = item
|
||||
}
|
||||
|
||||
if _, ok = item.Items[conf.Id]; !ok {
|
||||
item.Items[conf.Id] = &pb.PayActivityGiftbagItem{
|
||||
Id: conf.Id,
|
||||
Lastrefresh: configure.Now().Unix(),
|
||||
}
|
||||
}
|
||||
item.Items[conf.Id].Buyunm++
|
||||
item.Items[conf.Id].Totalbuynum++
|
||||
if err = this.updateActivitys(session.GetUserId(), info); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_DBError,
|
||||
Title: pb.ErrorCode_DBError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
items = make([]*pb.UserAssets, len(conf.Item))
|
||||
for i, v := range conf.Item {
|
||||
items[i] = &pb.UserAssets{
|
||||
A: v.A,
|
||||
T: v.T,
|
||||
N: v.N,
|
||||
}
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "deliverybyid", conf.Item)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// 每日礼包发货
|
||||
func (this *modelActivityComp) delivery(session comm.IUserSession, pid int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
func (this *modelActivityComp) delivery(session comm.IUserSession, pid int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
info *pb.DBActivityGiftbag
|
||||
item *pb.ActivityGiftbagItem
|
||||
@ -198,15 +131,7 @@ func (this *modelActivityComp) delivery(session comm.IUserSession, pid int32) (e
|
||||
return
|
||||
}
|
||||
|
||||
items = make([]*pb.UserAssets, len(conf.Item))
|
||||
for i, v := range conf.Item {
|
||||
items[i] = &pb.UserAssets{
|
||||
A: v.A,
|
||||
T: v.T,
|
||||
N: v.N,
|
||||
}
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
if errdata, items = this.module.DispenseAtno(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
|
||||
@ -9,6 +9,7 @@ import (
|
||||
"go_dreamfactory/sys/configure"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.mongodb.org/mongo-driver/x/bsonx"
|
||||
)
|
||||
@ -32,16 +33,18 @@ func (this *modelDailyComp) Init(service core.IService, module core.IModule, com
|
||||
}
|
||||
|
||||
// 查询用户重置数据
|
||||
func (this *modelDailyComp) queryUserDaily(uId string) (result *pb.DBPayDaily, err error) {
|
||||
result = &pb.DBPayDaily{
|
||||
Uid: uId,
|
||||
Items: make(map[int32]*pb.PayDailyItem),
|
||||
}
|
||||
if err = this.Get(uId, result); err != nil && err != mgo.MongodbNil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
func (this *modelDailyComp) queryUserDaily(uid string) (result *pb.DBPayDaily, err error) {
|
||||
result = &pb.DBPayDaily{}
|
||||
if err = this.Get(uid, result); err != nil && err != mgo.MongodbNil {
|
||||
this.module.Errorln(err)
|
||||
}
|
||||
if err == mgo.MongodbNil {
|
||||
err = nil
|
||||
result = &pb.DBPayDaily{
|
||||
Id: primitive.NewObjectID().Hex(),
|
||||
Uid: uid,
|
||||
Items: make(map[int32]*pb.PayDailyItem),
|
||||
}
|
||||
err = this.Add(uid, result)
|
||||
}
|
||||
return
|
||||
}
|
||||
@ -51,65 +54,14 @@ func (this *modelDailyComp) updateUserDaily(info *pb.DBPayDaily) (err error) {
|
||||
if err = this.Change(info.Uid, map[string]interface{}{
|
||||
"items": info.Items,
|
||||
}); err != nil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
this.module.Errorln(err)
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 每日礼包发货
|
||||
func (this *modelDailyComp) deliverybyid(session comm.IUserSession, id int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
var (
|
||||
info *pb.DBPayDaily
|
||||
conf *cfg.GamePayPackageData
|
||||
err error
|
||||
)
|
||||
if conf, err = this.module.configure.getPayPackageData(id); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if info, err = this.queryUserDaily(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if info.Items[conf.Id] == nil {
|
||||
info.Items[conf.Id] = &pb.PayDailyItem{
|
||||
Id: conf.Id,
|
||||
Buyunm: 0,
|
||||
Lastrefresh: configure.Now().Unix(),
|
||||
}
|
||||
}
|
||||
info.Items[conf.Id].Buyunm++
|
||||
if err = this.updateUserDaily(info); err != nil {
|
||||
return
|
||||
}
|
||||
items = make([]*pb.UserAssets, len(conf.Item))
|
||||
for i, v := range conf.Item {
|
||||
items[i] = &pb.UserAssets{
|
||||
A: v.A,
|
||||
T: v.T,
|
||||
N: v.N,
|
||||
}
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "deliverybyid", conf.Item)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// 每日礼包发货
|
||||
func (this *modelDailyComp) delivery(session comm.IUserSession, pid int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
func (this *modelDailyComp) delivery(session comm.IUserSession, pid int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
info *pb.DBPayDaily
|
||||
conf *cfg.GamePayPackageData
|
||||
@ -142,15 +94,8 @@ func (this *modelDailyComp) delivery(session comm.IUserSession, pid int32) (errd
|
||||
if err = this.updateUserDaily(info); err != nil {
|
||||
return
|
||||
}
|
||||
items = make([]*pb.UserAssets, len(conf.Item))
|
||||
for i, v := range conf.Item {
|
||||
items[i] = &pb.UserAssets{
|
||||
A: v.A,
|
||||
T: v.T,
|
||||
N: v.N,
|
||||
}
|
||||
}
|
||||
if errdata = this.module.DispenseRes(session, conf.Item, true); errdata != nil {
|
||||
|
||||
if errdata, items = this.module.DispenseAtno(session, conf.Item, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
|
||||
100
modules/pay/modelDiamond.go
Normal file
100
modules/pay/modelDiamond.go
Normal file
@ -0,0 +1,100 @@
|
||||
package pay
|
||||
|
||||
import (
|
||||
"go_dreamfactory/comm"
|
||||
"go_dreamfactory/lego/core"
|
||||
"go_dreamfactory/lego/sys/mgo"
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
cfg "go_dreamfactory/sys/configure/structs"
|
||||
|
||||
"go.mongodb.org/mongo-driver/bson/primitive"
|
||||
"go.mongodb.org/mongo-driver/mongo"
|
||||
"go.mongodb.org/mongo-driver/x/bsonx"
|
||||
)
|
||||
|
||||
//钻石商城
|
||||
type modelDiamondComp struct {
|
||||
modules.MCompModel
|
||||
module *Pay
|
||||
}
|
||||
|
||||
// 组件初始化接口
|
||||
func (this *modelDiamondComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) {
|
||||
this.MCompModel.Init(service, module, comp, opt)
|
||||
this.module = module.(*Pay)
|
||||
this.TableName = comm.TablePayDiamond
|
||||
//创建uid索引
|
||||
this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{
|
||||
Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}},
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
// 查询用户重置数据
|
||||
func (this *modelDiamondComp) getmodel(uid string) (result *pb.DBPayDiamond, err error) {
|
||||
result = &pb.DBPayDiamond{}
|
||||
if err = this.Get(uid, result); err != nil && err != mgo.MongodbNil {
|
||||
this.module.Errorf("err:%v", err)
|
||||
}
|
||||
if err == mgo.MongodbNil {
|
||||
result = &pb.DBPayDiamond{
|
||||
Id: primitive.NewObjectID().Hex(),
|
||||
Uid: uid,
|
||||
Items: make(map[int32]int32),
|
||||
}
|
||||
err = this.Add(uid, result)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 添加用户订单数据
|
||||
func (this *modelDiamondComp) updatemodel(data *pb.DBPayDiamond) (err error) {
|
||||
if err = this.Change(data.Uid, map[string]interface{}{
|
||||
"items": data.Items,
|
||||
}); err != nil {
|
||||
this.module.Errorln(err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
// 每日礼包发货
|
||||
func (this *modelDiamondComp) delivery(session comm.IUserSession, id int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
info *pb.DBPayDiamond
|
||||
conf *cfg.GameRechargeDiamondData
|
||||
res []*cfg.Gameatn
|
||||
ok bool
|
||||
err error
|
||||
)
|
||||
if conf, err = this.module.configure.getGameRechargeDiamond(id); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if info, err = this.getmodel(session.GetUserId()); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
}
|
||||
if _, ok = info.Items[conf.Id]; ok {
|
||||
res = conf.Award
|
||||
} else {
|
||||
res = conf.DiamondAward
|
||||
}
|
||||
info.Items[conf.Id]++
|
||||
|
||||
if errdata, items = this.module.DispenseAtno(session, res, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "deliverybyid", items)
|
||||
})
|
||||
return
|
||||
}
|
||||
@ -27,6 +27,7 @@ type Pay struct {
|
||||
api *apiComp
|
||||
model *modelComp
|
||||
modelPayUser *modelPayUserComp
|
||||
modelDiamond *modelDiamondComp
|
||||
modelDaily *modelDailyComp
|
||||
modelActivity *modelActivityComp //活动礼包
|
||||
privilege comm.IPayDelivery //月卡
|
||||
@ -86,6 +87,7 @@ func (this *Pay) OnInstallComp() {
|
||||
this.api = this.RegisterComp(new(apiComp)).(*apiComp)
|
||||
this.model = this.RegisterComp(new(modelComp)).(*modelComp)
|
||||
this.modelPayUser = this.RegisterComp(new(modelPayUserComp)).(*modelPayUserComp)
|
||||
this.modelDiamond = this.RegisterComp(new(modelDiamondComp)).(*modelDiamondComp)
|
||||
this.modelDaily = this.RegisterComp(new(modelDailyComp)).(*modelDailyComp)
|
||||
this.modelActivity = this.RegisterComp(new(modelActivityComp)).(*modelActivityComp)
|
||||
this.configure = this.RegisterComp(new(configureComp)).(*configureComp)
|
||||
@ -99,7 +101,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli
|
||||
conf *cfg.GameRechargeData
|
||||
info *pb.DBUserPay
|
||||
res []*cfg.Gameatn
|
||||
items []*pb.UserAssets
|
||||
items []*pb.UserAtno
|
||||
session comm.IUserSession
|
||||
errdata *pb.ErrorData
|
||||
online bool
|
||||
@ -151,6 +153,10 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli
|
||||
|
||||
switch order.Ptype {
|
||||
case pb.DBPayType_DiamondShop:
|
||||
if errdata, items = this.modelDiamond.delivery(session, order.Pid); errdata != nil {
|
||||
reply.Code = errdata.Code
|
||||
return
|
||||
}
|
||||
break
|
||||
case pb.DBPayType_Packs:
|
||||
if errdata, items = this.modelDaily.delivery(session, order.Pid); errdata != nil {
|
||||
@ -191,7 +197,7 @@ func (this *Pay) Rpc_ModulePayDelivery(ctx context.Context, args *pb.HttpPayDeli
|
||||
}
|
||||
this.addrecharge.RechargeIntegral(session, conf.Integral) //记录累充积分
|
||||
for _, v := range res {
|
||||
items = append(items, &pb.UserAssets{A: v.A, T: v.T, N: v.N})
|
||||
items = append(items, &pb.UserAtno{A: v.A, T: v.T, N: v.N})
|
||||
}
|
||||
session.SendMsg(string(this.GetType()), "shipped", &pb.PayShippedPush{
|
||||
Order: order,
|
||||
|
||||
@ -70,7 +70,7 @@ func (this *Privilege) EventUserOffline(uid, sessionid string) {
|
||||
}
|
||||
|
||||
// 购买了一个新的特权
|
||||
func (this *Privilege) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
func (this *Privilege) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
bFind bool
|
||||
cId int32
|
||||
@ -180,16 +180,10 @@ func (this *Privilege) Delivery(session comm.IUserSession, pId int32) (errdata *
|
||||
this.SendDailyMail(session, cId, 1, conf.PType)
|
||||
}
|
||||
// 即使奖励 马上发送
|
||||
if errdata = this.DispenseRes(session, conf.DisposableReward, true); errdata != nil {
|
||||
if errdata, items = this.DispenseAtno(session, conf.DisposableReward, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
for _, v := range conf.DisposableReward {
|
||||
items = append(items, &pb.UserAssets{
|
||||
A: v.A,
|
||||
T: v.T,
|
||||
N: v.N,
|
||||
})
|
||||
}
|
||||
|
||||
// 推送
|
||||
session.SendMsg(string(this.GetType()), PrivilegeBuyYuekaResp, &pb.PrivilegeBuyYuekaResp{Data: list})
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
|
||||
@ -52,7 +52,7 @@ func (this *PushGiftbag) OnInstallComp() {
|
||||
}
|
||||
|
||||
// 发货
|
||||
func (this *PushGiftbag) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
func (this *PushGiftbag) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
confs []*cfg.GamePushGiftData
|
||||
conf *cfg.GamePushGiftData
|
||||
@ -78,12 +78,12 @@ func (this *PushGiftbag) Delivery(session comm.IUserSession, pId int32) (errdata
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.String(),
|
||||
Message: fmt.Sprintf("no found pid:%s", pId),
|
||||
Message: fmt.Sprintf("no found pid:%d", pId),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
if errdata = this.DispenseRes(session, conf.Lbid, true); err != nil {
|
||||
if errdata, items = this.DispenseAtno(session, conf.Lbid, true); err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@ -97,7 +97,7 @@ func (this *PushGiftbag) Delivery(session comm.IUserSession, pId int32) (errdata
|
||||
})
|
||||
session.SendMsg(string(this.GetType()), "chanage", &pb.PushGiftbagChanagePush{Item: info.Item})
|
||||
go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.WriteUserLog(session.GetUserId(), 0, "PushGiftbagChanagePush", conf.Lbid)
|
||||
this.WriteUserLog(session.GetUserId(), 0, "PushGiftbagChanagePush", items)
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
@ -92,7 +92,7 @@ func (this *ShopCenter) ActivityCloseNotice(hdlist *pb.DBHuodong) {
|
||||
}
|
||||
|
||||
// 发货
|
||||
func (this *ShopCenter) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
func (this *ShopCenter) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
confs []*cfg.GameShopCenterControlData
|
||||
conf *cfg.GameShopCenterControlData
|
||||
@ -138,7 +138,6 @@ func (this *ShopCenter) Delivery(session comm.IUserSession, pId int32) (errdata
|
||||
Buytime: configure.Now().Unix(),
|
||||
Record: make(map[int32]bool),
|
||||
}
|
||||
items = make([]*pb.UserAssets, 0)
|
||||
if err = this.modelshop.Change(session.GetUserId(), map[string]interface{}{
|
||||
"item": info.Item,
|
||||
}); err != nil {
|
||||
|
||||
@ -23,7 +23,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
|
||||
dwarorder *pb.DreamWarorder
|
||||
confs []*cfg.GamePassCheckData
|
||||
awards []*cfg.Gameatn
|
||||
ads []*pb.UserAssets = make([]*pb.UserAssets, 0)
|
||||
award []*pb.UserAtno
|
||||
days int32
|
||||
err error
|
||||
ok bool
|
||||
@ -63,23 +63,12 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
|
||||
for _, v := range confs {
|
||||
if v.Parameter <= days {
|
||||
if warorder.Freeprogress < v.Parameter {
|
||||
awards = append(awards, v.FreeReward)
|
||||
ads = append(ads, &pb.UserAssets{
|
||||
A: v.FreeReward.A,
|
||||
T: v.FreeReward.T,
|
||||
N: v.FreeReward.N,
|
||||
})
|
||||
awards = append(awards, v.FreeReward...)
|
||||
|
||||
}
|
||||
if warorder.Vip {
|
||||
if warorder.Payprogress < v.Parameter {
|
||||
awards = append(awards, v.PayReward...)
|
||||
for _, v := range v.PayReward {
|
||||
ads = append(ads, &pb.UserAssets{
|
||||
A: v.A,
|
||||
T: v.T,
|
||||
N: v.N,
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -102,24 +91,11 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
|
||||
for _, v := range confs {
|
||||
if v.Parameter <= dwarorder.Lv {
|
||||
if dwarorder.Freeprogress < v.Parameter {
|
||||
awards = append(awards, v.FreeReward)
|
||||
ads = append(ads, &pb.UserAssets{
|
||||
A: v.FreeReward.A,
|
||||
T: v.FreeReward.T,
|
||||
N: v.FreeReward.N,
|
||||
})
|
||||
awards = append(awards, v.FreeReward...)
|
||||
}
|
||||
if dwarorder.Vip > 0 {
|
||||
if dwarorder.Payprogress < v.Parameter {
|
||||
awards = append(awards, v.PayReward...)
|
||||
for _, v := range v.PayReward {
|
||||
ads = append(ads, &pb.UserAssets{
|
||||
A: v.A,
|
||||
T: v.T,
|
||||
N: v.N,
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -130,7 +106,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
|
||||
}
|
||||
}
|
||||
|
||||
if errdata = this.module.DispenseRes(session, awards, true); errdata != nil {
|
||||
if errdata, award = this.module.DispenseAtno(session, awards, true); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
@ -143,7 +119,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.WarorderReceiveR
|
||||
return
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Warorder: warorder, Dwarorder: dwarorder, Award: ads})
|
||||
session.SendMsg(string(this.module.GetType()), "receive", &pb.WarorderReceiveResp{Rtype: req.Rtype, Warorder: warorder, Dwarorder: dwarorder, Award: award})
|
||||
|
||||
go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
|
||||
this.module.WriteUserLog(session.GetUserId(), comm.GMResAddType, "WarorderReceiveReq", awards)
|
||||
|
||||
@ -163,7 +163,7 @@ func (this *modelWarorder) settlement(wtype int32) {
|
||||
for _, v := range confs {
|
||||
if v.Parameter <= days {
|
||||
if warorder.Freeprogress < v.Parameter {
|
||||
awards = append(awards, v.FreeReward)
|
||||
awards = append(awards, v.FreeReward...)
|
||||
|
||||
}
|
||||
if warorder.Vip {
|
||||
|
||||
@ -51,7 +51,7 @@ func (this *Warorder) OnInstallComp() {
|
||||
}
|
||||
|
||||
// 发货
|
||||
func (this *Warorder) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAssets) {
|
||||
func (this *Warorder) Delivery(session comm.IUserSession, pId int32) (errdata *pb.ErrorData, items []*pb.UserAtno) {
|
||||
var (
|
||||
confs []*cfg.GamePassCheckPriceData
|
||||
conf *cfg.GamePassCheckPriceData
|
||||
@ -80,7 +80,7 @@ func (this *Warorder) Delivery(session comm.IUserSession, pId int32) (errdata *p
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ConfigNoFound,
|
||||
Title: pb.ErrorCode_ConfigNoFound.String(),
|
||||
Message: fmt.Sprintf("no found pid:%s", pId),
|
||||
Message: fmt.Sprintf("no found pid:%d", pId),
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
322
pb/pay_db.pb.go
322
pb/pay_db.pb.go
@ -309,6 +309,70 @@ func (x *DBUserPay) GetRecord() map[string]int32 {
|
||||
return nil
|
||||
}
|
||||
|
||||
//每日商城商品数据
|
||||
type DBPayDiamond struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户ID
|
||||
Items map[int32]int32 `protobuf:"bytes,3,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //商品购买次数
|
||||
}
|
||||
|
||||
func (x *DBPayDiamond) Reset() {
|
||||
*x = DBPayDiamond{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[2]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *DBPayDiamond) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*DBPayDiamond) ProtoMessage() {}
|
||||
|
||||
func (x *DBPayDiamond) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[2]
|
||||
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 DBPayDiamond.ProtoReflect.Descriptor instead.
|
||||
func (*DBPayDiamond) Descriptor() ([]byte, []int) {
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{2}
|
||||
}
|
||||
|
||||
func (x *DBPayDiamond) GetId() string {
|
||||
if x != nil {
|
||||
return x.Id
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBPayDiamond) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBPayDiamond) GetItems() map[int32]int32 {
|
||||
if x != nil {
|
||||
return x.Items
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
//每日商城商品数据
|
||||
type PayDailyItem struct {
|
||||
state protoimpl.MessageState
|
||||
@ -323,7 +387,7 @@ type PayDailyItem struct {
|
||||
func (x *PayDailyItem) Reset() {
|
||||
*x = PayDailyItem{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[2]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[3]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -336,7 +400,7 @@ func (x *PayDailyItem) String() string {
|
||||
func (*PayDailyItem) ProtoMessage() {}
|
||||
|
||||
func (x *PayDailyItem) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[2]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[3]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -349,7 +413,7 @@ func (x *PayDailyItem) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use PayDailyItem.ProtoReflect.Descriptor instead.
|
||||
func (*PayDailyItem) Descriptor() ([]byte, []int) {
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{2}
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{3}
|
||||
}
|
||||
|
||||
func (x *PayDailyItem) GetId() int32 {
|
||||
@ -379,14 +443,15 @@ type DBPayDaily struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id
|
||||
Items map[int32]*PayDailyItem `protobuf:"bytes,2,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //商品购买次数
|
||||
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户ID
|
||||
Items map[int32]*PayDailyItem `protobuf:"bytes,3,rep,name=items,proto3" json:"items" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //商品购买次数
|
||||
}
|
||||
|
||||
func (x *DBPayDaily) Reset() {
|
||||
*x = DBPayDaily{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[3]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[4]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -399,7 +464,7 @@ func (x *DBPayDaily) String() string {
|
||||
func (*DBPayDaily) ProtoMessage() {}
|
||||
|
||||
func (x *DBPayDaily) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[3]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[4]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -412,7 +477,14 @@ func (x *DBPayDaily) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBPayDaily.ProtoReflect.Descriptor instead.
|
||||
func (*DBPayDaily) Descriptor() ([]byte, []int) {
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{3}
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{4}
|
||||
}
|
||||
|
||||
func (x *DBPayDaily) GetId() string {
|
||||
if x != nil {
|
||||
return x.Id
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBPayDaily) GetUid() string {
|
||||
@ -443,7 +515,7 @@ type DBActivityGiftbag struct {
|
||||
func (x *DBActivityGiftbag) Reset() {
|
||||
*x = DBActivityGiftbag{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[4]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[5]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -456,7 +528,7 @@ func (x *DBActivityGiftbag) String() string {
|
||||
func (*DBActivityGiftbag) ProtoMessage() {}
|
||||
|
||||
func (x *DBActivityGiftbag) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[4]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[5]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -469,7 +541,7 @@ func (x *DBActivityGiftbag) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use DBActivityGiftbag.ProtoReflect.Descriptor instead.
|
||||
func (*DBActivityGiftbag) Descriptor() ([]byte, []int) {
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{4}
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{5}
|
||||
}
|
||||
|
||||
func (x *DBActivityGiftbag) GetId() string {
|
||||
@ -507,7 +579,7 @@ type ActivityGiftbagItem struct {
|
||||
func (x *ActivityGiftbagItem) Reset() {
|
||||
*x = ActivityGiftbagItem{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[5]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[6]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -520,7 +592,7 @@ func (x *ActivityGiftbagItem) String() string {
|
||||
func (*ActivityGiftbagItem) ProtoMessage() {}
|
||||
|
||||
func (x *ActivityGiftbagItem) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[5]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[6]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -533,7 +605,7 @@ func (x *ActivityGiftbagItem) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use ActivityGiftbagItem.ProtoReflect.Descriptor instead.
|
||||
func (*ActivityGiftbagItem) Descriptor() ([]byte, []int) {
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{5}
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{6}
|
||||
}
|
||||
|
||||
func (x *ActivityGiftbagItem) GetOpentime() int64 {
|
||||
@ -572,7 +644,7 @@ type PayActivityGiftbagItem struct {
|
||||
func (x *PayActivityGiftbagItem) Reset() {
|
||||
*x = PayActivityGiftbagItem{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[6]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[7]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
@ -585,7 +657,7 @@ func (x *PayActivityGiftbagItem) String() string {
|
||||
func (*PayActivityGiftbagItem) ProtoMessage() {}
|
||||
|
||||
func (x *PayActivityGiftbagItem) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_pay_pay_db_proto_msgTypes[6]
|
||||
mi := &file_pay_pay_db_proto_msgTypes[7]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
@ -598,7 +670,7 @@ func (x *PayActivityGiftbagItem) ProtoReflect() protoreflect.Message {
|
||||
|
||||
// Deprecated: Use PayActivityGiftbagItem.ProtoReflect.Descriptor instead.
|
||||
func (*PayActivityGiftbagItem) Descriptor() ([]byte, []int) {
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{6}
|
||||
return file_pay_pay_db_proto_rawDescGZIP(), []int{7}
|
||||
}
|
||||
|
||||
func (x *PayActivityGiftbagItem) GetId() int32 {
|
||||
@ -657,74 +729,85 @@ var file_pay_pay_db_proto_rawDesc = []byte{
|
||||
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, 0x58, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74,
|
||||
0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
||||
0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61,
|
||||
0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52,
|
||||
0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0x95, 0x01, 0x0a,
|
||||
0x0a, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x75,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a,
|
||||
0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44,
|
||||
0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45,
|
||||
0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, 0x0a, 0x49,
|
||||
0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x61, 0x79,
|
||||
0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x3a, 0x02, 0x38, 0x01, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76,
|
||||
0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 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, 0x3f, 0x0a, 0x09,
|
||||
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x21, 0x2e, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74,
|
||||
0x62, 0x61, 0x67, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a, 0x52, 0x0a,
|
||||
0x0e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65,
|
||||
0x79, 0x12, 0x2a, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62,
|
||||
0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||
0x01, 0x22, 0xcf, 0x01, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69,
|
||||
0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65,
|
||||
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65,
|
||||
0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69, 0x74, 0x65,
|
||||
0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76,
|
||||
0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x49,
|
||||
0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
|
||||
0x1a, 0x51, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
|
||||
0x12, 0x2d, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x17, 0x2e, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66,
|
||||
0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
|
||||
0x02, 0x38, 0x01, 0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76,
|
||||
0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e,
|
||||
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06,
|
||||
0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62,
|
||||
0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74,
|
||||
0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74,
|
||||
0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c,
|
||||
0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a, 0x09, 0x44,
|
||||
0x42, 0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d,
|
||||
0x6f, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x61, 0x63,
|
||||
0x6b, 0x73, 0x10, 0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50,
|
||||
0x61, 0x73, 0x73, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x65, 0x61, 0x63, 0x68, 0x42, 0x61,
|
||||
0x74, 0x74, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x65,
|
||||
0x61, 0x63, 0x68, 0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a,
|
||||
0x0d, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73, 0x10, 0x05,
|
||||
0x12, 0x0f, 0x0a, 0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61, 0x67, 0x10,
|
||||
0x06, 0x12, 0x14, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||
0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x61, 0x79,
|
||||
0x4f, 0x72, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61,
|
||||
0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, 0x00, 0x12,
|
||||
0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, 0x69, 0x64,
|
||||
0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46,
|
||||
0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72,
|
||||
0x64, 0x65, 0x72, 0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d,
|
||||
0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, 0x04, 0x42,
|
||||
0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x38, 0x01, 0x22, 0x9a, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x69, 0x61, 0x6d,
|
||||
0x6f, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x69, 0x61, 0x6d,
|
||||
0x6f, 0x6e, 0x64, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
|
||||
0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 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, 0x22,
|
||||
0x58, 0x0a, 0x0c, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x12,
|
||||
0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x06, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72,
|
||||
0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61,
|
||||
0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xa5, 0x01, 0x0a, 0x0a, 0x44, 0x42,
|
||||
0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 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, 0x2c, 0x0a, 0x05, 0x69, 0x74,
|
||||
0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x50, 0x61,
|
||||
0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72,
|
||||
0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x47, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d,
|
||||
0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69,
|
||||
0x6c, 0x79, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||
0x01, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x44, 0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
|
||||
0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 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, 0x3f, 0x0a, 0x09, 0x61, 0x63, 0x74,
|
||||
0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x44,
|
||||
0x42, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67,
|
||||
0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
|
||||
0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x1a, 0x52, 0x0a, 0x0e, 0x41, 0x63,
|
||||
0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2a,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e,
|
||||
0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49,
|
||||
0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xcf,
|
||||
0x01, 0x0a, 0x13, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62,
|
||||
0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x04, 0x64, 0x61, 0x79, 0x73, 0x12, 0x35, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18,
|
||||
0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
|
||||
0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x49, 0x74, 0x65, 0x6d,
|
||||
0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x1a, 0x51, 0x0a,
|
||||
0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
|
||||
0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2d, 0x0a,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x50,
|
||||
0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61,
|
||||
0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
|
||||
0x22, 0x84, 0x01, 0x0a, 0x16, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
|
||||
0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62,
|
||||
0x75, 0x79, 0x75, 0x6e, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x79,
|
||||
0x75, 0x6e, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e,
|
||||
0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x62,
|
||||
0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x20, 0x0a, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66,
|
||||
0x72, 0x65, 0x73, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74,
|
||||
0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x2a, 0x9a, 0x01, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61,
|
||||
0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64,
|
||||
0x53, 0x68, 0x6f, 0x70, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x50, 0x61, 0x63, 0x6b, 0x73, 0x10,
|
||||
0x01, 0x12, 0x0f, 0x0a, 0x0b, 0x4d, 0x6f, 0x6e, 0x74, 0x68, 0x6c, 0x79, 0x50, 0x61, 0x73, 0x73,
|
||||
0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x65, 0x61, 0x63, 0x68, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||
0x65, 0x50, 0x61, 0x73, 0x73, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x65, 0x61, 0x63, 0x68,
|
||||
0x52, 0x65, 0x63, 0x68, 0x61, 0x72, 0x67, 0x65, 0x10, 0x04, 0x12, 0x11, 0x0a, 0x0d, 0x41, 0x63,
|
||||
0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x46, 0x75, 0x6e, 0x64, 0x73, 0x10, 0x05, 0x12, 0x0f, 0x0a,
|
||||
0x0b, 0x50, 0x75, 0x73, 0x68, 0x67, 0x69, 0x66, 0x74, 0x42, 0x61, 0x67, 0x10, 0x06, 0x12, 0x14,
|
||||
0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x61,
|
||||
0x73, 0x73, 0x10, 0x07, 0x2a, 0x76, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72,
|
||||
0x64, 0x65, 0x72, 0x5f, 0x55, 0x6e, 0x70, 0x61, 0x69, 0x64, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d,
|
||||
0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x50, 0x61, 0x69, 0x64, 0x10, 0x01, 0x12,
|
||||
0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x69, 0x6e, 0x69,
|
||||
0x73, 0x68, 0x10, 0x02, 0x12, 0x13, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
|
||||
0x5f, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x10, 0x03, 0x12, 0x11, 0x0a, 0x0d, 0x50, 0x61, 0x79,
|
||||
0x4f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x46, 0x61, 0x69, 0x6c, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04,
|
||||
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -740,37 +823,40 @@ func file_pay_pay_db_proto_rawDescGZIP() []byte {
|
||||
}
|
||||
|
||||
var file_pay_pay_db_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
|
||||
var file_pay_pay_db_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
|
||||
var file_pay_pay_db_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
|
||||
var file_pay_pay_db_proto_goTypes = []interface{}{
|
||||
(DBPayType)(0), // 0: DBPayType
|
||||
(DBPayOrderState)(0), // 1: DBPayOrderState
|
||||
(*DBPayOrder)(nil), // 2: DBPayOrder
|
||||
(*DBUserPay)(nil), // 3: DBUserPay
|
||||
(*PayDailyItem)(nil), // 4: PayDailyItem
|
||||
(*DBPayDaily)(nil), // 5: DBPayDaily
|
||||
(*DBActivityGiftbag)(nil), // 6: DBActivityGiftbag
|
||||
(*ActivityGiftbagItem)(nil), // 7: ActivityGiftbagItem
|
||||
(*PayActivityGiftbagItem)(nil), // 8: PayActivityGiftbagItem
|
||||
nil, // 9: DBUserPay.RecordEntry
|
||||
nil, // 10: DBPayDaily.ItemsEntry
|
||||
nil, // 11: DBActivityGiftbag.ActivitysEntry
|
||||
nil, // 12: ActivityGiftbagItem.ItemsEntry
|
||||
(*DBPayDiamond)(nil), // 4: DBPayDiamond
|
||||
(*PayDailyItem)(nil), // 5: PayDailyItem
|
||||
(*DBPayDaily)(nil), // 6: DBPayDaily
|
||||
(*DBActivityGiftbag)(nil), // 7: DBActivityGiftbag
|
||||
(*ActivityGiftbagItem)(nil), // 8: ActivityGiftbagItem
|
||||
(*PayActivityGiftbagItem)(nil), // 9: PayActivityGiftbagItem
|
||||
nil, // 10: DBUserPay.RecordEntry
|
||||
nil, // 11: DBPayDiamond.ItemsEntry
|
||||
nil, // 12: DBPayDaily.ItemsEntry
|
||||
nil, // 13: DBActivityGiftbag.ActivitysEntry
|
||||
nil, // 14: ActivityGiftbagItem.ItemsEntry
|
||||
}
|
||||
var file_pay_pay_db_proto_depIdxs = []int32{
|
||||
1, // 0: DBPayOrder.state:type_name -> DBPayOrderState
|
||||
0, // 1: DBPayOrder.ptype:type_name -> DBPayType
|
||||
9, // 2: DBUserPay.record:type_name -> DBUserPay.RecordEntry
|
||||
10, // 3: DBPayDaily.items:type_name -> DBPayDaily.ItemsEntry
|
||||
11, // 4: DBActivityGiftbag.activitys:type_name -> DBActivityGiftbag.ActivitysEntry
|
||||
12, // 5: ActivityGiftbagItem.items:type_name -> ActivityGiftbagItem.ItemsEntry
|
||||
4, // 6: DBPayDaily.ItemsEntry.value:type_name -> PayDailyItem
|
||||
7, // 7: DBActivityGiftbag.ActivitysEntry.value:type_name -> ActivityGiftbagItem
|
||||
8, // 8: ActivityGiftbagItem.ItemsEntry.value:type_name -> PayActivityGiftbagItem
|
||||
9, // [9:9] is the sub-list for method output_type
|
||||
9, // [9:9] is the sub-list for method input_type
|
||||
9, // [9:9] is the sub-list for extension type_name
|
||||
9, // [9:9] is the sub-list for extension extendee
|
||||
0, // [0:9] is the sub-list for field type_name
|
||||
10, // 2: DBUserPay.record:type_name -> DBUserPay.RecordEntry
|
||||
11, // 3: DBPayDiamond.items:type_name -> DBPayDiamond.ItemsEntry
|
||||
12, // 4: DBPayDaily.items:type_name -> DBPayDaily.ItemsEntry
|
||||
13, // 5: DBActivityGiftbag.activitys:type_name -> DBActivityGiftbag.ActivitysEntry
|
||||
14, // 6: ActivityGiftbagItem.items:type_name -> ActivityGiftbagItem.ItemsEntry
|
||||
5, // 7: DBPayDaily.ItemsEntry.value:type_name -> PayDailyItem
|
||||
8, // 8: DBActivityGiftbag.ActivitysEntry.value:type_name -> ActivityGiftbagItem
|
||||
9, // 9: ActivityGiftbagItem.ItemsEntry.value:type_name -> PayActivityGiftbagItem
|
||||
10, // [10:10] is the sub-list for method output_type
|
||||
10, // [10:10] is the sub-list for method input_type
|
||||
10, // [10:10] is the sub-list for extension type_name
|
||||
10, // [10:10] is the sub-list for extension extendee
|
||||
0, // [0:10] is the sub-list for field type_name
|
||||
}
|
||||
|
||||
func init() { file_pay_pay_db_proto_init() }
|
||||
@ -804,7 +890,7 @@ func file_pay_pay_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_pay_pay_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*PayDailyItem); i {
|
||||
switch v := v.(*DBPayDiamond); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -816,7 +902,7 @@ func file_pay_pay_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_pay_pay_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBPayDaily); i {
|
||||
switch v := v.(*PayDailyItem); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -828,7 +914,7 @@ func file_pay_pay_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_pay_pay_db_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*DBActivityGiftbag); i {
|
||||
switch v := v.(*DBPayDaily); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -840,7 +926,7 @@ func file_pay_pay_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_pay_pay_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*ActivityGiftbagItem); i {
|
||||
switch v := v.(*DBActivityGiftbag); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
@ -852,6 +938,18 @@ func file_pay_pay_db_proto_init() {
|
||||
}
|
||||
}
|
||||
file_pay_pay_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*ActivityGiftbagItem); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_pay_pay_db_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*PayActivityGiftbagItem); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
@ -870,7 +968,7 @@ func file_pay_pay_db_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_pay_pay_db_proto_rawDesc,
|
||||
NumEnums: 2,
|
||||
NumMessages: 11,
|
||||
NumMessages: 13,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
||||
128
pb/pay_msg.pb.go
128
pb/pay_msg.pb.go
@ -462,8 +462,8 @@ type PayDailyBuyResp struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Isucc bool `protobuf:"varint,1,opt,name=isucc,proto3" json:"isucc"`
|
||||
Items []*UserAssets `protobuf:"bytes,2,rep,name=items,proto3" json:"items"`
|
||||
Isucc bool `protobuf:"varint,1,opt,name=isucc,proto3" json:"isucc"`
|
||||
Items []*UserAtno `protobuf:"bytes,2,rep,name=items,proto3" json:"items"`
|
||||
}
|
||||
|
||||
func (x *PayDailyBuyResp) Reset() {
|
||||
@ -505,7 +505,7 @@ func (x *PayDailyBuyResp) GetIsucc() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (x *PayDailyBuyResp) GetItems() []*UserAssets {
|
||||
func (x *PayDailyBuyResp) GetItems() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Items
|
||||
}
|
||||
@ -518,9 +518,9 @@ type PayShippedPush struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Order *DBPayOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order"`
|
||||
Items []*UserAssets `protobuf:"bytes,2,rep,name=items,proto3" json:"items"`
|
||||
Info *DBUserPay `protobuf:"bytes,4,opt,name=info,proto3" json:"info"`
|
||||
Order *DBPayOrder `protobuf:"bytes,1,opt,name=order,proto3" json:"order"`
|
||||
Items []*UserAtno `protobuf:"bytes,2,rep,name=items,proto3" json:"items"`
|
||||
Info *DBUserPay `protobuf:"bytes,4,opt,name=info,proto3" json:"info"`
|
||||
}
|
||||
|
||||
func (x *PayShippedPush) Reset() {
|
||||
@ -562,7 +562,7 @@ func (x *PayShippedPush) GetOrder() *DBPayOrder {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *PayShippedPush) GetItems() []*UserAssets {
|
||||
func (x *PayShippedPush) GetItems() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Items
|
||||
}
|
||||
@ -1065,59 +1065,58 @@ var file_pay_pay_msg_proto_rawDesc = []byte{
|
||||
0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x52, 0x04,
|
||||
0x69, 0x6e, 0x66, 0x6f, 0x22, 0x20, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69, 0x6c, 0x79,
|
||||
0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69,
|
||||
0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x61, 0x69,
|
||||
0x6c, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x75,
|
||||
0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x12,
|
||||
0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b,
|
||||
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65,
|
||||
0x6d, 0x73, 0x22, 0x76, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64,
|
||||
0x50, 0x75, 0x73, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72,
|
||||
0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
|
||||
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73,
|
||||
0x65, 0x74, 0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e,
|
||||
0x66, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65,
|
||||
0x72, 0x50, 0x61, 0x79, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x0e, 0x50, 0x61,
|
||||
0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05,
|
||||
0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42,
|
||||
0x50, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x70, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64,
|
||||
0x12, 0x24, 0x0a, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, 0x74,
|
||||
0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
|
||||
0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c,
|
||||
0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79,
|
||||
0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x29, 0x0a, 0x11,
|
||||
0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65,
|
||||
0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x47, 0x65,
|
||||
0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a,
|
||||
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63,
|
||||
0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65,
|
||||
0x6d, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x41, 0x63,
|
||||
0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0f,
|
||||
0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x69, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05,
|
||||
0x69, 0x73, 0x75, 0x63, 0x63, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74,
|
||||
0x73, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x48, 0x74, 0x74,
|
||||
0x70, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
|
||||
0x64, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70,
|
||||
0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
|
||||
0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69,
|
||||
0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x5b, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70, 0x50,
|
||||
0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e,
|
||||
0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45,
|
||||
0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10,
|
||||
0x0a, 0x03, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67,
|
||||
0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
0x1f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09,
|
||||
0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73,
|
||||
0x22, 0x74, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x53, 0x68, 0x69, 0x70, 0x70, 0x65, 0x64, 0x50, 0x75,
|
||||
0x73, 0x68, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x05,
|
||||
0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52,
|
||||
0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x04,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x50, 0x61, 0x79,
|
||||
0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x0e, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c,
|
||||
0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x20, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70,
|
||||
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x54,
|
||||
0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x69,
|
||||
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x0d,
|
||||
0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x0d, 0x42, 0x69, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x6f, 0x69, 0x6e,
|
||||
0x74, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72,
|
||||
0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65,
|
||||
0x72, 0x52, 0x05, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x29, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x47,
|
||||
0x65, 0x74, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x61, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x61, 0x74,
|
||||
0x79, 0x70, 0x65, 0x22, 0x3e, 0x0a, 0x12, 0x50, 0x61, 0x79, 0x47, 0x65, 0x74, 0x41, 0x63, 0x74,
|
||||
0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x04, 0x69, 0x6e, 0x66,
|
||||
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
|
||||
0x74, 0x79, 0x47, 0x69, 0x66, 0x74, 0x62, 0x61, 0x67, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x69,
|
||||
0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x11, 0x50, 0x61, 0x79, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69,
|
||||
0x74, 0x79, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4a, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x41,
|
||||
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69,
|
||||
0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x75, 0x63,
|
||||
0x63, 0x12, 0x21, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x69,
|
||||
0x74, 0x65, 0x6d, 0x73, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x48, 0x74, 0x74, 0x70, 0x50, 0x61, 0x79,
|
||||
0x44, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x18, 0x0a,
|
||||
0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
|
||||
0x6f, 0x72, 0x64, 0x65, 0x72, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x6f, 0x64, 0x75,
|
||||
0x63, 0x74, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x72, 0x6f, 0x64,
|
||||
0x75, 0x63, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x04,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61,
|
||||
0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f,
|
||||
0x75, 0x6e, 0x74, 0x22, 0x5b, 0x0a, 0x13, 0x48, 0x74, 0x74, 0x70, 0x50, 0x61, 0x79, 0x44, 0x65,
|
||||
0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x63, 0x6f,
|
||||
0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72,
|
||||
0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x73,
|
||||
0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
|
||||
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -1158,9 +1157,10 @@ var file_pay_pay_msg_proto_goTypes = []interface{}{
|
||||
(DBPayOrderState)(0), // 21: DBPayOrderState
|
||||
(*DBUserPay)(nil), // 22: DBUserPay
|
||||
(*DBPayDaily)(nil), // 23: DBPayDaily
|
||||
(*UserAssets)(nil), // 24: UserAssets
|
||||
(*UserAtno)(nil), // 24: UserAtno
|
||||
(*ActivityGiftbagItem)(nil), // 25: ActivityGiftbagItem
|
||||
(ErrorCode)(0), // 26: ErrorCode
|
||||
(*UserAssets)(nil), // 26: UserAssets
|
||||
(ErrorCode)(0), // 27: ErrorCode
|
||||
}
|
||||
var file_pay_pay_msg_proto_depIdxs = []int32{
|
||||
19, // 0: PayCreateOrderReq.ptype:type_name -> DBPayType
|
||||
@ -1168,15 +1168,15 @@ var file_pay_pay_msg_proto_depIdxs = []int32{
|
||||
21, // 2: PayResponseOrderReq.State:type_name -> DBPayOrderState
|
||||
22, // 3: PayRecordResp.info:type_name -> DBUserPay
|
||||
23, // 4: PayInfoResp.info:type_name -> DBPayDaily
|
||||
24, // 5: PayDailyBuyResp.items:type_name -> UserAssets
|
||||
24, // 5: PayDailyBuyResp.items:type_name -> UserAtno
|
||||
20, // 6: PayShippedPush.order:type_name -> DBPayOrder
|
||||
24, // 7: PayShippedPush.items:type_name -> UserAssets
|
||||
24, // 7: PayShippedPush.items:type_name -> UserAtno
|
||||
22, // 8: PayShippedPush.info:type_name -> DBUserPay
|
||||
19, // 9: PayDeliveryReq.ptype:type_name -> DBPayType
|
||||
20, // 10: PayDeliveryResp.order:type_name -> DBPayOrder
|
||||
25, // 11: PayGetActivityResp.info:type_name -> ActivityGiftbagItem
|
||||
24, // 12: PayActivityResp.items:type_name -> UserAssets
|
||||
26, // 13: HttpPayDeliveryResp.code:type_name -> ErrorCode
|
||||
26, // 12: PayActivityResp.items:type_name -> UserAssets
|
||||
27, // 13: HttpPayDeliveryResp.code:type_name -> ErrorCode
|
||||
14, // [14:14] is the sub-list for method output_type
|
||||
14, // [14:14] is the sub-list for method input_type
|
||||
14, // [14:14] is the sub-list for extension type_name
|
||||
|
||||
@ -195,7 +195,7 @@ type WarorderReceiveResp struct {
|
||||
Rtype int32 `protobuf:"varint,1,opt,name=rtype,proto3" json:"rtype"`
|
||||
Warorder *Warorder `protobuf:"bytes,2,opt,name=warorder,proto3" json:"warorder"`
|
||||
Dwarorder *DreamWarorder `protobuf:"bytes,3,opt,name=dwarorder,proto3" json:"dwarorder"`
|
||||
Award []*UserAssets `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励
|
||||
Award []*UserAtno `protobuf:"bytes,4,rep,name=award,proto3" json:"award"` //奖励
|
||||
}
|
||||
|
||||
func (x *WarorderReceiveResp) Reset() {
|
||||
@ -251,7 +251,7 @@ func (x *WarorderReceiveResp) GetDwarorder() *DreamWarorder {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *WarorderReceiveResp) GetAward() []*UserAssets {
|
||||
func (x *WarorderReceiveResp) GetAward() []*UserAtno {
|
||||
if x != nil {
|
||||
return x.Award
|
||||
}
|
||||
@ -666,7 +666,7 @@ var file_warorder_warorder_msg_proto_rawDesc = []byte{
|
||||
0x67, 0x72, 0x65, 0x73, 0x73, 0x52, 0x06, 0x63, 0x6f, 0x6e, 0x6c, 0x64, 0x73, 0x22, 0x2a, 0x0a,
|
||||
0x12, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
|
||||
0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0xa3, 0x01, 0x0a, 0x13, 0x57, 0x61,
|
||||
0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0xa1, 0x01, 0x0a, 0x13, 0x57, 0x61,
|
||||
0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x25, 0x0a, 0x08, 0x77, 0x61, 0x72, 0x6f, 0x72,
|
||||
@ -674,45 +674,45 @@ var file_warorder_warorder_msg_proto_rawDesc = []byte{
|
||||
0x72, 0x64, 0x65, 0x72, 0x52, 0x08, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x2c,
|
||||
0x0a, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65,
|
||||
0x72, 0x52, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x05,
|
||||
0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 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,
|
||||
0x38, 0x0a, 0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76,
|
||||
0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x5d, 0x0a, 0x11, 0x57, 0x61, 0x72,
|
||||
0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72,
|
||||
0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x41, 0x0a, 0x17, 0x57, 0x61, 0x72, 0x6f,
|
||||
0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b,
|
||||
0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x7e, 0x0a, 0x18, 0x57,
|
||||
0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54,
|
||||
0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x74, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12,
|
||||
0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78,
|
||||
0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c,
|
||||
0x76, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65, 0x78, 0x70, 0x22, 0x32, 0x0a, 0x1a, 0x57,
|
||||
0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x41,
|
||||
0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79,
|
||||
0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22,
|
||||
0x95, 0x01, 0x0a, 0x1b, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70,
|
||||
0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05,
|
||||
0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65,
|
||||
0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65, 0x78,
|
||||
0x70, 0x12, 0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73,
|
||||
0x6b, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
|
||||
0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62,
|
||||
0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x72, 0x52, 0x09, 0x64, 0x77, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x1f, 0x0a, 0x05,
|
||||
0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73,
|
||||
0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x38, 0x0a,
|
||||
0x10, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65,
|
||||
0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x5d, 0x0a, 0x11, 0x57, 0x61, 0x72, 0x6f, 0x72,
|
||||
0x64, 0x65, 0x72, 0x42, 0x75, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79,
|
||||
0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
||||
0x6c, 0x76, 0x12, 0x22, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x0e, 0x2e, 0x44, 0x72, 0x65, 0x61, 0x6d, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72,
|
||||
0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x41, 0x0a, 0x17, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64,
|
||||
0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65,
|
||||
0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x22, 0x7e, 0x0a, 0x18, 0x57, 0x61, 0x72,
|
||||
0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x73,
|
||||
0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74,
|
||||
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x65, 0x78, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12,
|
||||
0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12,
|
||||
0x18, 0x0a, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65, 0x78, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65, 0x78, 0x70, 0x22, 0x32, 0x0a, 0x1a, 0x57, 0x61, 0x72,
|
||||
0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x6c, 0x6c,
|
||||
0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x22, 0x95, 0x01,
|
||||
0x0a, 0x1b, 0x57, 0x61, 0x72, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
|
||||
0x74, 0x65, 0x41, 0x6c, 0x6c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a,
|
||||
0x05, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x74,
|
||||
0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65, 0x78, 0x70,
|
||||
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x65, 0x65, 0x6b, 0x65, 0x78, 0x70, 0x12,
|
||||
0x24, 0x0a, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x73,
|
||||
0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
|
||||
0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
|
||||
0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -742,7 +742,7 @@ var file_warorder_warorder_msg_proto_goTypes = []interface{}{
|
||||
(*Warorder)(nil), // 10: Warorder
|
||||
(*DreamWarorder)(nil), // 11: DreamWarorder
|
||||
(*ConIProgress)(nil), // 12: ConIProgress
|
||||
(*UserAssets)(nil), // 13: UserAssets
|
||||
(*UserAtno)(nil), // 13: UserAtno
|
||||
}
|
||||
var file_warorder_warorder_msg_proto_depIdxs = []int32{
|
||||
10, // 0: WarorderInfoResp.warorder:type_name -> Warorder
|
||||
@ -750,7 +750,7 @@ var file_warorder_warorder_msg_proto_depIdxs = []int32{
|
||||
12, // 2: WarorderInfoResp.conlds:type_name -> ConIProgress
|
||||
10, // 3: WarorderReceiveResp.warorder:type_name -> Warorder
|
||||
11, // 4: WarorderReceiveResp.dwarorder:type_name -> DreamWarorder
|
||||
13, // 5: WarorderReceiveResp.award:type_name -> UserAssets
|
||||
13, // 5: WarorderReceiveResp.award:type_name -> UserAtno
|
||||
11, // 6: WarorderBuyLvResp.info:type_name -> DreamWarorder
|
||||
7, // [7:7] is the sub-list for method output_type
|
||||
7, // [7:7] is the sub-list for method input_type
|
||||
|
||||
@ -14,5 +14,4 @@ const (
|
||||
GameOpencondType_Maxmapid = 2
|
||||
GameOpencondType_Worldtaskid = 3
|
||||
GameOpencondType_Friend = 4
|
||||
GameOpencondType_MoonLevel = 5
|
||||
)
|
||||
|
||||
@ -15,7 +15,7 @@ type GamePassCheckData struct {
|
||||
PasscheckType int32
|
||||
Parameter int32
|
||||
UnlockText string
|
||||
FreeReward *Gameatn
|
||||
FreeReward []*Gameatn
|
||||
PayReward []*Gameatn
|
||||
}
|
||||
|
||||
@ -30,7 +30,20 @@ func (_v *GamePassCheckData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["passcheck_type"].(float64); !_ok_ { err = errors.New("passcheck_type error"); return }; _v.PasscheckType = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UnlockText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UnlockText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["free_reward"].(map[string]interface{}); !_ok_ { err = errors.New("free_reward error"); return }; if _v.FreeReward, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["free_reward"].([]interface{}); !_ok_ { err = errors.New("free_reward error"); return }
|
||||
|
||||
_v.FreeReward = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
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 } }
|
||||
_v.FreeReward = append(_v.FreeReward, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
|
||||
@ -1,42 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GamePuggsyPasscheck struct {
|
||||
_dataMap map[int32]*GamePuggsyPasscheckData
|
||||
_dataList []*GamePuggsyPasscheckData
|
||||
}
|
||||
|
||||
func NewGamePuggsyPasscheck(_buf []map[string]interface{}) (*GamePuggsyPasscheck, error) {
|
||||
_dataList := make([]*GamePuggsyPasscheckData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GamePuggsyPasscheckData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGamePuggsyPasscheckData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Id] = _v
|
||||
}
|
||||
}
|
||||
return &GamePuggsyPasscheck{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GamePuggsyPasscheck) GetDataMap() map[int32]*GamePuggsyPasscheckData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GamePuggsyPasscheck) GetDataList() []*GamePuggsyPasscheckData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GamePuggsyPasscheck) Get(key int32) *GamePuggsyPasscheckData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GamePuggsyPasscheckData struct {
|
||||
Id int32
|
||||
PayId string
|
||||
Parameter int32
|
||||
UnlockText string
|
||||
FreeReward *Gameatn
|
||||
PayReward []*Gameatn
|
||||
}
|
||||
|
||||
const TypeId_GamePuggsyPasscheckData = 2074500826
|
||||
|
||||
func (*GamePuggsyPasscheckData) GetTypeId() int32 {
|
||||
return 2074500826
|
||||
}
|
||||
|
||||
func (_v *GamePuggsyPasscheckData)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.PayId, _ok_ = _buf["pay_id"].(string); !_ok_ { err = errors.New("pay_id error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UnlockText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UnlockText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["free_reward"].(map[string]interface{}); !_ok_ { err = errors.New("free_reward error"); return }; if _v.FreeReward, err = DeserializeGameatn(_x_); err != nil { return } }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["pay_reward"].([]interface{}); !_ok_ { err = errors.New("pay_reward error"); return }
|
||||
|
||||
_v.PayReward = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
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 } }
|
||||
_v.PayReward = append(_v.PayReward, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGamePuggsyPasscheckData(_buf map[string]interface{}) (*GamePuggsyPasscheckData, error) {
|
||||
v := &GamePuggsyPasscheckData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
@ -14,7 +14,6 @@ type GameRechargeData struct {
|
||||
Id string
|
||||
Pid int32
|
||||
Editionid string
|
||||
RechargeType int32
|
||||
Monetaryunit string
|
||||
Amount int32
|
||||
Vipexp []*Gameatn
|
||||
@ -36,7 +35,6 @@ func (_v *GameRechargeData)Deserialize(_buf map[string]interface{}) (err error)
|
||||
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
|
||||
{ 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_) }
|
||||
{
|
||||
|
||||
42
sys/configure/structs/Game.RechargeDiamond.go
Normal file
42
sys/configure/structs/Game.RechargeDiamond.go
Normal file
@ -0,0 +1,42 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
type GameRechargeDiamond struct {
|
||||
_dataMap map[int32]*GameRechargeDiamondData
|
||||
_dataList []*GameRechargeDiamondData
|
||||
}
|
||||
|
||||
func NewGameRechargeDiamond(_buf []map[string]interface{}) (*GameRechargeDiamond, error) {
|
||||
_dataList := make([]*GameRechargeDiamondData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GameRechargeDiamondData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGameRechargeDiamondData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
} else {
|
||||
_dataList = append(_dataList, _v)
|
||||
dataMap[_v.Id] = _v
|
||||
}
|
||||
}
|
||||
return &GameRechargeDiamond{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GameRechargeDiamond) GetDataMap() map[int32]*GameRechargeDiamondData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
func (table *GameRechargeDiamond) GetDataList() []*GameRechargeDiamondData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GameRechargeDiamond) Get(key int32) *GameRechargeDiamondData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
69
sys/configure/structs/Game.RechargeDiamondData.go
Normal file
69
sys/configure/structs/Game.RechargeDiamondData.go
Normal file
@ -0,0 +1,69 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type GameRechargeDiamondData struct {
|
||||
Id int32
|
||||
Award []*Gameatn
|
||||
DiamondAward []*Gameatn
|
||||
Image string
|
||||
Bpoint string
|
||||
}
|
||||
|
||||
const TypeId_GameRechargeDiamondData = -1674029573
|
||||
|
||||
func (*GameRechargeDiamondData) GetTypeId() int32 {
|
||||
return -1674029573
|
||||
}
|
||||
|
||||
func (_v *GameRechargeDiamondData)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 _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return }
|
||||
|
||||
_v.Award = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
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 } }
|
||||
_v.Award = append(_v.Award, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
if _arr_, _ok_ = _buf["diamond_award"].([]interface{}); !_ok_ { err = errors.New("diamond_award error"); return }
|
||||
|
||||
_v.DiamondAward = make([]*Gameatn, 0, len(_arr_))
|
||||
|
||||
for _, _e_ := range _arr_ {
|
||||
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 } }
|
||||
_v.DiamondAward = append(_v.DiamondAward, _list_v_)
|
||||
}
|
||||
}
|
||||
|
||||
{ var _ok_ bool; if _v.Image, _ok_ = _buf["image"].(string); !_ok_ { err = errors.New("image error"); return } }
|
||||
{ var _ok_ bool; if _v.Bpoint, _ok_ = _buf["bpoint"].(string); !_ok_ { err = errors.New("bpoint error"); return } }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGameRechargeDiamondData(_buf map[string]interface{}) (*GameRechargeDiamondData, error) {
|
||||
v := &GameRechargeDiamondData{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
@ -96,6 +96,7 @@ type Tables struct {
|
||||
GrowTask *GameGrowTask
|
||||
GrowReward *GameGrowReward
|
||||
Recharge *GameRecharge
|
||||
RechargeDiamond *GameRechargeDiamond
|
||||
PrivilegeCard *GamePrivilegeCard
|
||||
Privilege *GamePrivilege
|
||||
WorldTask *GameWorldTask
|
||||
@ -826,6 +827,12 @@ func NewTables(loader JsonLoader) (*Tables, error) {
|
||||
if tables.Recharge, err = NewGameRecharge(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_rechargediamond") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if tables.RechargeDiamond, err = NewGameRechargeDiamond(buf) ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if buf, err = loader("game_privilegecard") ; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <auto-generated>
|
||||
// This code was generated by a tool.
|
||||
// Changes to this file may cause incorrect behavior and will be lost if
|
||||
// the code is regenerated.
|
||||
// </auto-generated>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
package cfg
|
||||
|
||||
import "errors"
|
||||
|
||||
type Gamebasepool struct {
|
||||
S int32
|
||||
E int32
|
||||
P string
|
||||
}
|
||||
|
||||
const TypeId_Gamebasepool = 347927753
|
||||
|
||||
func (*Gamebasepool) GetTypeId() int32 {
|
||||
return 347927753
|
||||
}
|
||||
|
||||
func (_v *Gamebasepool)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["s"].(float64); !_ok_ { err = errors.New("s error"); return }; _v.S = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["e"].(float64); !_ok_ { err = errors.New("e error"); return }; _v.E = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.P, _ok_ = _buf["p"].(string); !_ok_ { err = errors.New("p error"); return } }
|
||||
return
|
||||
}
|
||||
|
||||
func DeserializeGamebasepool(_buf map[string]interface{}) (*Gamebasepool, error) {
|
||||
v := &Gamebasepool{}
|
||||
if err := v.Deserialize(_buf); err == nil {
|
||||
return v, nil
|
||||
} else {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user