Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev
This commit is contained in:
liwei1dao
commit
bfcec3f226
@ -12,7 +12,7 @@
|
||||
},
|
||||
"task_buried": 16000001,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_quality": 0,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -35,7 +35,7 @@
|
||||
},
|
||||
"task_buried": 16000002,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -58,7 +58,7 @@
|
||||
},
|
||||
"task_buried": 16000003,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -81,7 +81,7 @@
|
||||
},
|
||||
"task_buried": 16000004,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_quality": 0,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -104,7 +104,7 @@
|
||||
},
|
||||
"task_buried": 16000005,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -127,7 +127,7 @@
|
||||
},
|
||||
"task_buried": 16000006,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -150,7 +150,7 @@
|
||||
},
|
||||
"task_buried": 16000007,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_quality": 0,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -173,7 +173,7 @@
|
||||
},
|
||||
"task_buried": 16000008,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -196,7 +196,7 @@
|
||||
},
|
||||
"task_buried": 16000009,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -219,7 +219,7 @@
|
||||
},
|
||||
"task_buried": 16000010,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_quality": 0,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -242,7 +242,7 @@
|
||||
},
|
||||
"task_buried": 16000011,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -265,7 +265,7 @@
|
||||
},
|
||||
"task_buried": 16000012,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -288,7 +288,7 @@
|
||||
},
|
||||
"task_buried": 16000013,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_quality": 0,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -311,7 +311,7 @@
|
||||
},
|
||||
"task_buried": 16000014,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -334,7 +334,7 @@
|
||||
},
|
||||
"task_buried": 16000015,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -357,7 +357,7 @@
|
||||
},
|
||||
"task_buried": 16000016,
|
||||
"task_icon": "cj_icon_lb_ty03",
|
||||
"task_quality": 1,
|
||||
"task_quality": 0,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -380,7 +380,7 @@
|
||||
},
|
||||
"task_buried": 16000017,
|
||||
"task_icon": "cj_icon_lb_ty02",
|
||||
"task_quality": 2,
|
||||
"task_quality": 1,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
@ -403,7 +403,7 @@
|
||||
},
|
||||
"task_buried": 16000018,
|
||||
"task_icon": "cj_icon_lb_ty01",
|
||||
"task_quality": 3,
|
||||
"task_quality": 2,
|
||||
"task_reward": [
|
||||
{
|
||||
"a": "attr",
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
[
|
||||
{
|
||||
"id": 1,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 6,
|
||||
"afterid": 0,
|
||||
"BattleReadyID": 110,
|
||||
@ -37,7 +37,7 @@
|
||||
},
|
||||
{
|
||||
"id": 2,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 8,
|
||||
"afterid": 1,
|
||||
"BattleReadyID": 110,
|
||||
@ -73,7 +73,7 @@
|
||||
},
|
||||
{
|
||||
"id": 3,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 10,
|
||||
"afterid": 2,
|
||||
"BattleReadyID": 110,
|
||||
@ -109,7 +109,7 @@
|
||||
},
|
||||
{
|
||||
"id": 4,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 12,
|
||||
"afterid": 3,
|
||||
"BattleReadyID": 110,
|
||||
@ -145,7 +145,7 @@
|
||||
},
|
||||
{
|
||||
"id": 5,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 14,
|
||||
"afterid": 4,
|
||||
"BattleReadyID": 110,
|
||||
@ -181,7 +181,7 @@
|
||||
},
|
||||
{
|
||||
"id": 6,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 16,
|
||||
"afterid": 5,
|
||||
"BattleReadyID": 110,
|
||||
@ -217,7 +217,7 @@
|
||||
},
|
||||
{
|
||||
"id": 7,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 18,
|
||||
"afterid": 6,
|
||||
"BattleReadyID": 110,
|
||||
@ -253,7 +253,7 @@
|
||||
},
|
||||
{
|
||||
"id": 8,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 20,
|
||||
"afterid": 7,
|
||||
"BattleReadyID": 110,
|
||||
@ -289,7 +289,7 @@
|
||||
},
|
||||
{
|
||||
"id": 9,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 22,
|
||||
"afterid": 8,
|
||||
"BattleReadyID": 110,
|
||||
@ -325,7 +325,7 @@
|
||||
},
|
||||
{
|
||||
"id": 10,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 24,
|
||||
"afterid": 9,
|
||||
"BattleReadyID": 110,
|
||||
@ -361,7 +361,7 @@
|
||||
},
|
||||
{
|
||||
"id": 11,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 27,
|
||||
"afterid": 10,
|
||||
"BattleReadyID": 110,
|
||||
@ -397,7 +397,7 @@
|
||||
},
|
||||
{
|
||||
"id": 12,
|
||||
"open_cond": 1,
|
||||
"open_cond": 0,
|
||||
"open_value": 30,
|
||||
"afterid": 11,
|
||||
"BattleReadyID": 110,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,42 +2,42 @@
|
||||
{
|
||||
"Type": 1,
|
||||
"TagName": {
|
||||
"key": "breakingbad_gourmet_TagName_1",
|
||||
"key": "breakingbad_gourmettag_TagName_1",
|
||||
"text": "点心"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Type": 2,
|
||||
"TagName": {
|
||||
"key": "breakingbad_gourmet_TagName_2",
|
||||
"key": "breakingbad_gourmettag_TagName_2",
|
||||
"text": "凉菜"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Type": 3,
|
||||
"TagName": {
|
||||
"key": "breakingbad_gourmet_TagName_3",
|
||||
"key": "breakingbad_gourmettag_TagName_3",
|
||||
"text": "热菜"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Type": 4,
|
||||
"TagName": {
|
||||
"key": "breakingbad_gourmet_TagName_4",
|
||||
"key": "breakingbad_gourmettag_TagName_4",
|
||||
"text": "汤"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Type": 5,
|
||||
"TagName": {
|
||||
"key": "breakingbad_gourmet_TagName_5",
|
||||
"key": "breakingbad_gourmettag_TagName_5",
|
||||
"text": "饮料"
|
||||
}
|
||||
},
|
||||
{
|
||||
"Type": 6,
|
||||
"TagName": {
|
||||
"key": "breakingbad_gourmet_TagName_6",
|
||||
"key": "breakingbad_gourmettag_TagName_6",
|
||||
"text": "主食"
|
||||
}
|
||||
}
|
||||
|
||||
@ -1442,7 +1442,7 @@
|
||||
{
|
||||
"KeyId": 121,
|
||||
"GroupID": 20030234,
|
||||
"Type": 0,
|
||||
"Type": 1,
|
||||
"TaskIDMin": 0,
|
||||
"TaskIDMax": 0,
|
||||
"weight": 10,
|
||||
@ -1454,7 +1454,7 @@
|
||||
{
|
||||
"KeyId": 122,
|
||||
"GroupID": 20030235,
|
||||
"Type": 0,
|
||||
"Type": 1,
|
||||
"TaskIDMin": 0,
|
||||
"TaskIDMax": 0,
|
||||
"weight": 10,
|
||||
@ -1478,7 +1478,7 @@
|
||||
{
|
||||
"KeyId": 124,
|
||||
"GroupID": 15000001,
|
||||
"Type": 0,
|
||||
"Type": 1,
|
||||
"TaskIDMin": 0,
|
||||
"TaskIDMax": 0,
|
||||
"weight": 10,
|
||||
@ -1490,7 +1490,7 @@
|
||||
{
|
||||
"KeyId": 125,
|
||||
"GroupID": 15000002,
|
||||
"Type": 0,
|
||||
"Type": 1,
|
||||
"TaskIDMin": 0,
|
||||
"TaskIDMax": 0,
|
||||
"weight": 10,
|
||||
@ -1502,7 +1502,7 @@
|
||||
{
|
||||
"KeyId": 126,
|
||||
"GroupID": 15000003,
|
||||
"Type": 0,
|
||||
"Type": 1,
|
||||
"TaskIDMin": 0,
|
||||
"TaskIDMax": 0,
|
||||
"weight": 10,
|
||||
|
||||
@ -764,8 +764,7 @@
|
||||
},
|
||||
"value": 4,
|
||||
"filter": [
|
||||
16003001,
|
||||
24012016
|
||||
16003001
|
||||
],
|
||||
"filter2": [
|
||||
"0",
|
||||
@ -11980,7 +11979,7 @@
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": -160,
|
||||
"NPC": -166,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -12007,7 +12006,7 @@
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": -160,
|
||||
"NPC": -166,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -12068,7 +12067,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 1,
|
||||
"value": 10,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
@ -12260,7 +12259,7 @@
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": -160,
|
||||
"NPC": -166,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -12287,7 +12286,7 @@
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": -160,
|
||||
"NPC": -166,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -12314,7 +12313,7 @@
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": -160,
|
||||
"NPC": -166,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -12341,7 +12340,7 @@
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": -160,
|
||||
"NPC": -166,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -12368,7 +12367,7 @@
|
||||
"n": 1
|
||||
},
|
||||
"Npc_event_type": 0,
|
||||
"NPC": -160,
|
||||
"NPC": -166,
|
||||
"tipstxt": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
@ -12574,7 +12573,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 20,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
@ -12601,7 +12600,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 30,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
@ -12628,7 +12627,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 4,
|
||||
"value": 40,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
@ -12655,7 +12654,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 5,
|
||||
"value": 50,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
@ -12682,7 +12681,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 6,
|
||||
"value": 60,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
@ -12709,7 +12708,7 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 7,
|
||||
"value": 70,
|
||||
"filter": [],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13275,10 +13274,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
2,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13307,8 +13306,8 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
1,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13335,10 +13334,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
3,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13365,10 +13364,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 50,
|
||||
"filter": [
|
||||
1,
|
||||
50
|
||||
2,
|
||||
1
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13395,10 +13394,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 1,
|
||||
"value": 50,
|
||||
"filter": [
|
||||
1,
|
||||
50
|
||||
1
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13425,10 +13424,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 50,
|
||||
"filter": [
|
||||
1,
|
||||
50
|
||||
3,
|
||||
1
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13455,10 +13454,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
2,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13487,8 +13486,8 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
1,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13515,10 +13514,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
3,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13545,10 +13544,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
2,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13577,8 +13576,8 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
1,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13605,10 +13604,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
3,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13635,10 +13634,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
2,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13667,8 +13666,8 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
1,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13695,10 +13694,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
3,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13725,10 +13724,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
2,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13757,8 +13756,8 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
1,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13785,10 +13784,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
3,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13815,10 +13814,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
2,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13847,8 +13846,8 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
1,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13875,10 +13874,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
3,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13905,10 +13904,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 2,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
2,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13937,8 +13936,8 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
1,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -13965,10 +13964,10 @@
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"value": 3,
|
||||
"value": 1,
|
||||
"filter": [
|
||||
8,
|
||||
1
|
||||
3,
|
||||
8
|
||||
],
|
||||
"filter2": []
|
||||
},
|
||||
@ -16921,7 +16920,7 @@
|
||||
"key": "buried_buried_condi_tasktxt_547",
|
||||
"text": "在任意商店购买5次商品"
|
||||
},
|
||||
"type": 241,
|
||||
"type": 64,
|
||||
"valid": 0,
|
||||
"head": {
|
||||
"a": "attr",
|
||||
@ -17956,6 +17955,7 @@
|
||||
},
|
||||
"value": 1,
|
||||
"filter": [
|
||||
1,
|
||||
1
|
||||
],
|
||||
"filter2": []
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
"eventgroup": 1,
|
||||
"eventweight": 250,
|
||||
"eventtype": 1,
|
||||
"mustdo": 2,
|
||||
"mustdo": false,
|
||||
"citystory": 50020010,
|
||||
"citynormal": 50020030,
|
||||
"cityabnormal": 50020020,
|
||||
@ -34,7 +34,7 @@
|
||||
"eventgroup": 1,
|
||||
"eventweight": 250,
|
||||
"eventtype": 1,
|
||||
"mustdo": 2,
|
||||
"mustdo": false,
|
||||
"citystory": 50020010,
|
||||
"citynormal": 50020030,
|
||||
"cityabnormal": 50020020,
|
||||
@ -64,7 +64,7 @@
|
||||
"eventgroup": 1,
|
||||
"eventweight": 250,
|
||||
"eventtype": 1,
|
||||
"mustdo": 2,
|
||||
"mustdo": false,
|
||||
"citystory": 50020010,
|
||||
"citynormal": 50020030,
|
||||
"cityabnormal": 50020020,
|
||||
@ -94,7 +94,7 @@
|
||||
"eventgroup": 1,
|
||||
"eventweight": 250,
|
||||
"eventtype": 1,
|
||||
"mustdo": 2,
|
||||
"mustdo": false,
|
||||
"citystory": 50020010,
|
||||
"citynormal": 50020030,
|
||||
"cityabnormal": 50020020,
|
||||
|
||||
@ -678,9 +678,9 @@
|
||||
},
|
||||
"passlvmax": 50,
|
||||
"guildboss_roulette": {
|
||||
"a": "attr",
|
||||
"t": "arenacoin",
|
||||
"n": 1000
|
||||
"a": "item",
|
||||
"t": "22100001",
|
||||
"n": 1
|
||||
},
|
||||
"guildboss_kill_Preview": [
|
||||
{
|
||||
|
||||
@ -828,5 +828,15 @@
|
||||
},
|
||||
"data": "触发条件",
|
||||
"prefix": ""
|
||||
},
|
||||
{
|
||||
"id": 84,
|
||||
"type": 2,
|
||||
"text": {
|
||||
"key": "GM_GM_text_131",
|
||||
"text": "辉月等级"
|
||||
},
|
||||
"data": "3",
|
||||
"prefix": "bingo:moonlv,{0}"
|
||||
}
|
||||
]
|
||||
@ -19424,7 +19424,7 @@
|
||||
"access": [],
|
||||
"use_skip": 0,
|
||||
"upper_limit": 9999,
|
||||
"img": "wp_icon_jjcq",
|
||||
"img": "item_23000001",
|
||||
"intr": {
|
||||
"key": "item_item_intr_23000001",
|
||||
"text": "可以用于开服活动中抽奖。"
|
||||
@ -19471,7 +19471,7 @@
|
||||
"access": [],
|
||||
"use_skip": 0,
|
||||
"upper_limit": 9999,
|
||||
"img": "wp_icon_jjcq",
|
||||
"img": "item_23000002",
|
||||
"intr": {
|
||||
"key": "item_item_intr_23000002",
|
||||
"text": "可用于拼图游戏中完成拼图游戏。"
|
||||
@ -19518,7 +19518,7 @@
|
||||
"access": [],
|
||||
"use_skip": 0,
|
||||
"upper_limit": 9999,
|
||||
"img": "wp_icon_jjcq",
|
||||
"img": "item_23000003",
|
||||
"intr": {
|
||||
"key": "item_item_intr_23000003",
|
||||
"text": "可用于云上行走游戏中。"
|
||||
@ -19565,7 +19565,7 @@
|
||||
"access": [],
|
||||
"use_skip": 0,
|
||||
"upper_limit": 9999,
|
||||
"img": "wp_icon_jjcq",
|
||||
"img": "item_23000004",
|
||||
"intr": {
|
||||
"key": "item_item_intr_23000004",
|
||||
"text": "可用于黄金矿工游戏中。"
|
||||
|
||||
@ -6172,7 +6172,7 @@
|
||||
"n": 1
|
||||
}
|
||||
],
|
||||
"BattleReadyID": 10103004,
|
||||
"BattleReadyID": 10103001,
|
||||
"FormatList": [
|
||||
1104008
|
||||
],
|
||||
@ -21440,7 +21440,7 @@
|
||||
"frontstoryid": 303000,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "mainchapter_main_stage_maingroupName_167",
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"maingroupIcon": "",
|
||||
@ -23848,9 +23848,11 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"senlinmiwu01",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
@ -23932,9 +23934,11 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"senlinmiwu01",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
@ -24064,9 +24068,11 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"senlinmiwu01",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
@ -24148,9 +24154,11 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"senlinmiwu",
|
||||
"senlinmiwu01",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
@ -24282,6 +24290,7 @@
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [
|
||||
"senlinmiwu02",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
@ -24413,6 +24422,7 @@
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [
|
||||
"senlinmiwu03",
|
||||
"miwu"
|
||||
],
|
||||
"scene_effectfilter": "",
|
||||
@ -24542,7 +24552,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -24673,7 +24686,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -24756,7 +24772,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -24839,7 +24858,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -24922,7 +24944,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -25005,7 +25030,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -25136,7 +25164,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -25219,7 +25250,9 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -25302,7 +25335,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/13004/13004_q.prefab"
|
||||
],
|
||||
"scene_effect": [
|
||||
"miwu"
|
||||
],
|
||||
@ -25385,10 +25421,11 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"scene_effect": [
|
||||
"miwuxiaosan"
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/13004/13004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
"openlevel": 1,
|
||||
@ -25468,7 +25505,9 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -25597,7 +25636,9 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -25678,7 +25719,9 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -25807,7 +25850,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -25936,7 +25982,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -26323,7 +26372,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -26452,7 +26504,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -26662,7 +26717,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -26743,7 +26801,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -26872,7 +26933,9 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -26953,7 +27016,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -27082,7 +27148,10 @@
|
||||
"text": ""
|
||||
},
|
||||
"venturetype": 0,
|
||||
"ventureavatar": [],
|
||||
"ventureavatar": [
|
||||
"Person/24004/24004_q.prefab",
|
||||
"Person/45004/45004_q.prefab"
|
||||
],
|
||||
"scene_effect": [],
|
||||
"scene_effectfilter": "",
|
||||
"is_near": 0,
|
||||
@ -30263,8 +30332,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_167",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -30392,8 +30461,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_168",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -30521,8 +30590,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_169",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -30650,8 +30719,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_170",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -30779,8 +30848,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_171",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -30908,8 +30977,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_172",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -31037,8 +31106,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_173",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -31166,8 +31235,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_174",
|
||||
"text": "国王的新装"
|
||||
},
|
||||
"maingroupIcon": "13004",
|
||||
"mainlineName": {
|
||||
@ -31295,8 +31364,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_175",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
@ -31424,8 +31493,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_176",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
@ -31553,8 +31622,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_177",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
@ -31682,8 +31751,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_178",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
@ -31811,8 +31880,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_179",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
@ -31940,8 +32009,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_180",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
@ -32069,8 +32138,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_181",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
@ -32198,8 +32267,8 @@
|
||||
"frontstoryid": 0,
|
||||
"afterstoryid": 0,
|
||||
"maingroupName": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
"key": "mainchapter_main_stage_maingroupName_182",
|
||||
"text": "魂之挽歌"
|
||||
},
|
||||
"maingroupIcon": "54016",
|
||||
"mainlineName": {
|
||||
|
||||
@ -250036,7 +250036,7 @@
|
||||
"Id": 1104008,
|
||||
"pos": 1,
|
||||
"captainId": 0,
|
||||
"IsBoss": 1,
|
||||
"IsBoss": 0,
|
||||
"bossHpCnt": 0,
|
||||
"heroid": 55007,
|
||||
"star": 3,
|
||||
|
||||
@ -174,7 +174,7 @@
|
||||
"text": "每日一练"
|
||||
},
|
||||
"npcName": [
|
||||
"每日一练"
|
||||
"阿宝"
|
||||
],
|
||||
"functionicon": "ty_qp_mryj",
|
||||
"jumpId": 10002
|
||||
@ -228,7 +228,7 @@
|
||||
"text": "打造"
|
||||
},
|
||||
"npcName": [
|
||||
"打造"
|
||||
"阿宝"
|
||||
],
|
||||
"functionicon": "ty_qp_zm",
|
||||
"jumpId": 1001
|
||||
@ -279,7 +279,7 @@
|
||||
"sceneicon": "ty_qp_my01",
|
||||
"functionname": {
|
||||
"key": "navigation_Sheet1_functionname_17",
|
||||
"text": "纸牌接龙"
|
||||
"text": "纸牌对决"
|
||||
},
|
||||
"npcName": [
|
||||
"功能入口-纸牌接龙"
|
||||
@ -315,7 +315,7 @@
|
||||
"sceneicon": "ty_qp_my01",
|
||||
"functionname": {
|
||||
"key": "navigation_Sheet1_functionname_19",
|
||||
"text": "猜颜色"
|
||||
"text": "缤纷乐声"
|
||||
},
|
||||
"npcName": [
|
||||
"功能入口-藏书馆"
|
||||
|
||||
@ -2945,8 +2945,8 @@
|
||||
},
|
||||
"main": [
|
||||
{
|
||||
"key": 1,
|
||||
"param": 40
|
||||
"key": 2,
|
||||
"param": 1103015
|
||||
}
|
||||
],
|
||||
"wkqbx": 2,
|
||||
@ -2973,8 +2973,8 @@
|
||||
},
|
||||
"main": [
|
||||
{
|
||||
"key": 1,
|
||||
"param": 41
|
||||
"key": 2,
|
||||
"param": 1104031
|
||||
}
|
||||
],
|
||||
"wkqbx": 2,
|
||||
|
||||
@ -2363,7 +2363,7 @@
|
||||
"key": "pandamas_pagoda_name_display_71",
|
||||
"text": "第1层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2394,7 +2394,7 @@
|
||||
"key": "pandamas_pagoda_name_display_72",
|
||||
"text": "第2层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2425,7 +2425,7 @@
|
||||
"key": "pandamas_pagoda_name_display_73",
|
||||
"text": "第3层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2456,7 +2456,7 @@
|
||||
"key": "pandamas_pagoda_name_display_74",
|
||||
"text": "第4层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2498,7 +2498,7 @@
|
||||
"key": "pandamas_pagoda_name_display_75",
|
||||
"text": "第5层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2529,7 +2529,7 @@
|
||||
"key": "pandamas_pagoda_name_display_76",
|
||||
"text": "第6层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2560,7 +2560,7 @@
|
||||
"key": "pandamas_pagoda_name_display_77",
|
||||
"text": "第7层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2591,7 +2591,7 @@
|
||||
"key": "pandamas_pagoda_name_display_78",
|
||||
"text": "第8层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2622,7 +2622,7 @@
|
||||
"key": "pandamas_pagoda_name_display_79",
|
||||
"text": "第9层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2665,7 +2665,7 @@
|
||||
"key": "pandamas_pagoda_name_display_80",
|
||||
"text": "第10层"
|
||||
},
|
||||
"model_display": 25001,
|
||||
"model_display": 44002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2696,7 +2696,7 @@
|
||||
"key": "pandamas_pagoda_name_display_81",
|
||||
"text": "第1层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2727,7 +2727,7 @@
|
||||
"key": "pandamas_pagoda_name_display_82",
|
||||
"text": "第2层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2758,7 +2758,7 @@
|
||||
"key": "pandamas_pagoda_name_display_83",
|
||||
"text": "第3层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2789,7 +2789,7 @@
|
||||
"key": "pandamas_pagoda_name_display_84",
|
||||
"text": "第4层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2831,7 +2831,7 @@
|
||||
"key": "pandamas_pagoda_name_display_85",
|
||||
"text": "第5层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2862,7 +2862,7 @@
|
||||
"key": "pandamas_pagoda_name_display_86",
|
||||
"text": "第6层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2893,7 +2893,7 @@
|
||||
"key": "pandamas_pagoda_name_display_87",
|
||||
"text": "第7层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2924,7 +2924,7 @@
|
||||
"key": "pandamas_pagoda_name_display_88",
|
||||
"text": "第8层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2955,7 +2955,7 @@
|
||||
"key": "pandamas_pagoda_name_display_89",
|
||||
"text": "第9层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -2998,7 +2998,7 @@
|
||||
"key": "pandamas_pagoda_name_display_90",
|
||||
"text": "第10层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 35002,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3029,7 +3029,7 @@
|
||||
"key": "pandamas_pagoda_name_display_91",
|
||||
"text": "第1层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3060,7 +3060,7 @@
|
||||
"key": "pandamas_pagoda_name_display_92",
|
||||
"text": "第2层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3091,7 +3091,7 @@
|
||||
"key": "pandamas_pagoda_name_display_93",
|
||||
"text": "第3层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3122,7 +3122,7 @@
|
||||
"key": "pandamas_pagoda_name_display_94",
|
||||
"text": "第4层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3164,7 +3164,7 @@
|
||||
"key": "pandamas_pagoda_name_display_95",
|
||||
"text": "第5层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3195,7 +3195,7 @@
|
||||
"key": "pandamas_pagoda_name_display_96",
|
||||
"text": "第6层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3226,7 +3226,7 @@
|
||||
"key": "pandamas_pagoda_name_display_97",
|
||||
"text": "第7层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3257,7 +3257,7 @@
|
||||
"key": "pandamas_pagoda_name_display_98",
|
||||
"text": "第8层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3288,7 +3288,7 @@
|
||||
"key": "pandamas_pagoda_name_display_99",
|
||||
"text": "第9层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
},
|
||||
{
|
||||
@ -3331,7 +3331,7 @@
|
||||
"key": "pandamas_pagoda_name_display_100",
|
||||
"text": "第10层"
|
||||
},
|
||||
"model_display": 45001,
|
||||
"model_display": 45004,
|
||||
"unlock": 1101007
|
||||
}
|
||||
]
|
||||
@ -3,11 +3,14 @@
|
||||
"id": 20001,
|
||||
"type": 1,
|
||||
"type2": 101,
|
||||
"rank": 2,
|
||||
"day": 1,
|
||||
"repeat_num": 1,
|
||||
"refreshtime": 1,
|
||||
"packagetype": "",
|
||||
"buy_num": 1,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20001",
|
||||
"text": "每日好礼"
|
||||
@ -31,11 +34,14 @@
|
||||
"id": 20002,
|
||||
"type": 1,
|
||||
"type2": 101,
|
||||
"rank": 3,
|
||||
"day": 2,
|
||||
"repeat_num": 1,
|
||||
"refreshtime": 1,
|
||||
"packagetype": "",
|
||||
"buy_num": 1,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20002",
|
||||
"text": "每日好礼"
|
||||
@ -59,11 +65,14 @@
|
||||
"id": 20003,
|
||||
"type": 1,
|
||||
"type2": 101,
|
||||
"rank": 4,
|
||||
"day": 3,
|
||||
"repeat_num": 1,
|
||||
"refreshtime": 1,
|
||||
"packagetype": "",
|
||||
"buy_num": 1,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20003",
|
||||
"text": "每日好礼"
|
||||
@ -87,11 +96,14 @@
|
||||
"id": 20004,
|
||||
"type": 1,
|
||||
"type2": 101,
|
||||
"rank": 5,
|
||||
"day": 4,
|
||||
"repeat_num": 1,
|
||||
"refreshtime": 1,
|
||||
"packagetype": "",
|
||||
"buy_num": 1,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20004",
|
||||
"text": "每日好礼"
|
||||
@ -115,11 +127,14 @@
|
||||
"id": 20005,
|
||||
"type": 1,
|
||||
"type2": 101,
|
||||
"rank": 6,
|
||||
"day": 5,
|
||||
"repeat_num": 1,
|
||||
"refreshtime": 1,
|
||||
"packagetype": "",
|
||||
"buy_num": 1,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20005",
|
||||
"text": "每日好礼"
|
||||
@ -143,11 +158,14 @@
|
||||
"id": 20006,
|
||||
"type": 1,
|
||||
"type2": 102,
|
||||
"rank": 1,
|
||||
"day": 0,
|
||||
"repeat_num": 2,
|
||||
"refreshtime": 30,
|
||||
"packagetype": "",
|
||||
"buy_num": 2,
|
||||
"issp": 1,
|
||||
"isrecommend": 1,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20006",
|
||||
"text": "兑换礼包"
|
||||
@ -171,11 +189,14 @@
|
||||
"id": 20007,
|
||||
"type": 1,
|
||||
"type2": 103,
|
||||
"rank": 0,
|
||||
"day": 0,
|
||||
"repeat_num": 3,
|
||||
"refreshtime": 30,
|
||||
"packagetype": "drawcard_pack1",
|
||||
"buy_num": 3,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20007",
|
||||
"text": "招募礼包1"
|
||||
@ -193,11 +214,14 @@
|
||||
"id": 20008,
|
||||
"type": 2,
|
||||
"type2": 104,
|
||||
"rank": 0,
|
||||
"day": 0,
|
||||
"repeat_num": 3,
|
||||
"refreshtime": 30,
|
||||
"packagetype": "drawcard_pack2",
|
||||
"buy_num": 3,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20008",
|
||||
"text": "限时礼包1"
|
||||
@ -215,11 +239,14 @@
|
||||
"id": 20009,
|
||||
"type": 2,
|
||||
"type2": 104,
|
||||
"rank": 0,
|
||||
"day": 0,
|
||||
"repeat_num": 3,
|
||||
"refreshtime": 30,
|
||||
"packagetype": "drawcard_pack3",
|
||||
"buy_num": 3,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20009",
|
||||
"text": "限时礼包2"
|
||||
@ -237,11 +264,14 @@
|
||||
"id": 20010,
|
||||
"type": 2,
|
||||
"type2": 104,
|
||||
"rank": 0,
|
||||
"day": 0,
|
||||
"repeat_num": 3,
|
||||
"refreshtime": 30,
|
||||
"packagetype": "drawcard_pack4",
|
||||
"buy_num": 3,
|
||||
"issp": 0,
|
||||
"isrecommend": 0,
|
||||
"packagename": {
|
||||
"key": "paypackage_paypackage_packagename_20010",
|
||||
"text": "限时礼包3"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[
|
||||
{
|
||||
"key": 10001,
|
||||
"key": "10001",
|
||||
"skillvalue": 0,
|
||||
"icon": "sx_img_cz",
|
||||
"name": {
|
||||
@ -17,7 +17,7 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 10002,
|
||||
"key": "10002",
|
||||
"skillvalue": 0,
|
||||
"icon": "sx_img_fj",
|
||||
"name": {
|
||||
@ -34,7 +34,7 @@
|
||||
"jump": 103
|
||||
},
|
||||
{
|
||||
"key": 10003,
|
||||
"key": "10003",
|
||||
"skillvalue": 0,
|
||||
"icon": "sx_img_pz",
|
||||
"name": {
|
||||
|
||||
@ -403,5 +403,34 @@
|
||||
28011,
|
||||
28012
|
||||
]
|
||||
},
|
||||
{
|
||||
"shopid": 15,
|
||||
"tab": 15,
|
||||
"shopname": {
|
||||
"key": "shop_shop_shopname_15",
|
||||
"text": "巅峰商店"
|
||||
},
|
||||
"upper_shop": {
|
||||
"key": "",
|
||||
"text": ""
|
||||
},
|
||||
"opencond": "shop15",
|
||||
"rtype": 2,
|
||||
"rtime": 1,
|
||||
"rnum": 10,
|
||||
"rneed": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "diamond",
|
||||
"n": 50
|
||||
}
|
||||
],
|
||||
"shopitem": [
|
||||
30001,
|
||||
30002,
|
||||
30003,
|
||||
30004
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -28438,5 +28438,437 @@
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 807,
|
||||
"id": 30001,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000100",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 808,
|
||||
"id": 30001,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000100",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 809,
|
||||
"id": 30001,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000100",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 810,
|
||||
"id": 30002,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000102",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 811,
|
||||
"id": 30002,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000102",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 812,
|
||||
"id": 30002,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000102",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 813,
|
||||
"id": 30003,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000103",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 814,
|
||||
"id": 30003,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000103",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 815,
|
||||
"id": 30003,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000103",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 816,
|
||||
"id": 30004,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000104",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 817,
|
||||
"id": 30004,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000104",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
},
|
||||
{
|
||||
"key": 818,
|
||||
"id": 30004,
|
||||
"iteminfo": [
|
||||
{
|
||||
"a": "item",
|
||||
"t": "27000104",
|
||||
"n": 10
|
||||
}
|
||||
],
|
||||
"preview": false,
|
||||
"probability": 1000,
|
||||
"need": [
|
||||
{
|
||||
"a": "attr",
|
||||
"t": "consumemoney",
|
||||
"n": 100
|
||||
}
|
||||
],
|
||||
"sale": 1000,
|
||||
"salelist": [
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000,
|
||||
1000
|
||||
],
|
||||
"buyminnum": 10,
|
||||
"buymaxnum": 10,
|
||||
"vip": 0,
|
||||
"lvmin": 1,
|
||||
"lvmax": 60,
|
||||
"mapidmin": 101,
|
||||
"mapidmax": 9999
|
||||
}
|
||||
]
|
||||
@ -112,7 +112,7 @@ type (
|
||||
CleanData(uid string)
|
||||
|
||||
// 英雄加经验
|
||||
AddHerosExp(session IUserSession, heroObjs []string, exp int32) (curAddExp []int32, errdata *pb.ErrorData)
|
||||
AddHerosExp(session IUserSession, heroObjs []string, exp int32) (curAddExp map[string]int32, errdata *pb.ErrorData)
|
||||
// 英雄练功
|
||||
KungFuHero(session IUserSession, heroObjID string, bKongfu bool, kongfuUid string) (errdata *pb.ErrorData)
|
||||
|
||||
|
||||
@ -620,9 +620,9 @@ func (this *Buried) trigger(session comm.IUserSession, burieds ...*pb.BuriedPara
|
||||
if len(pass) > 0 {
|
||||
if ok, mate := session.GetMate(comm.Session_Buried); ok {
|
||||
bdatas = mate.(*pb.DBBuried)
|
||||
return
|
||||
} else {
|
||||
if bdatas, err = model.getSessionBuried(session); err != nil {
|
||||
this.Errorln(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
@ -56,7 +56,7 @@ func (this *apiComp) GotoCity(session comm.IUserSession, req *pb.CaravanGotoCity
|
||||
if list.Tasktime-configure.Now().Unix() > int64(event.Eventtime) { //TODO 任务超时
|
||||
this.module.CheckCaravanTask(session, list)
|
||||
}
|
||||
if event.Mustdo == 1 { // 需要完成强制任务
|
||||
if event.Mustdo { // 需要完成强制任务
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_TrollTask,
|
||||
Title: pb.ErrorCode_TrollTask.ToString(),
|
||||
|
||||
@ -78,7 +78,7 @@ func (this *apiComp) Match(session comm.IUserSession, req *pb.EntertainMatchReq)
|
||||
}
|
||||
|
||||
}
|
||||
mySkill := make(map[int32]int32, 0)
|
||||
mySkill := make(map[string]int32, 0)
|
||||
for _, v := range req.Skillcard {
|
||||
mySkill[v] = 1
|
||||
}
|
||||
|
||||
@ -278,7 +278,7 @@ func (this *configureComp) GetGameNormalElem() (rd int32) {
|
||||
rd = comm.GetRandW(szWeight) + 1
|
||||
return
|
||||
}
|
||||
func (this *configureComp) GetGamePlaySkill(skillid int32) (conf *cfg.GamePlayerSkillData, err error) {
|
||||
func (this *configureComp) GetGamePlaySkill(skillid string) (conf *cfg.GamePlayerSkillData, err error) {
|
||||
var (
|
||||
v interface{}
|
||||
)
|
||||
@ -341,7 +341,7 @@ func (this *configureComp) getPassCheckCfg() (data *cfg.GamePassCheck, err error
|
||||
return
|
||||
}
|
||||
|
||||
func (this *configureComp) GetInitGameConsumeSkill() (skill []int32) {
|
||||
func (this *configureComp) GetInitGameConsumeSkill() (skill []string) {
|
||||
|
||||
if v, err := this.GetConfigure(game_playerskill); err == nil {
|
||||
if configure, ok := v.(*cfg.GamePlayerSkill); ok {
|
||||
|
||||
@ -68,7 +68,6 @@ func (this *matchComp) MatchNotic(players map[string]interface{}) (err error) {
|
||||
playerSlice = append(playerSlice, v.(*pb.DBXXLMatch))
|
||||
}
|
||||
for pos, v := range playerSlice {
|
||||
|
||||
if pos == 0 {
|
||||
p1 = &pb.PlayerData{
|
||||
Userinfo: v.Userinfo,
|
||||
|
||||
@ -44,7 +44,7 @@ func (this *modelComp) getEntertainmList(uid string) (result *pb.DBXXLData, err
|
||||
result = &pb.DBXXLData{
|
||||
Reward: map[int32]int32{},
|
||||
Card: map[string]int32{},
|
||||
Skill: map[int32]int32{},
|
||||
Skill: map[string]int32{},
|
||||
}
|
||||
|
||||
err = this.Get(uid, result)
|
||||
|
||||
@ -11,7 +11,6 @@ import (
|
||||
"go_dreamfactory/modules"
|
||||
"go_dreamfactory/pb"
|
||||
"go_dreamfactory/sys/db"
|
||||
"strconv"
|
||||
)
|
||||
|
||||
func NewModule() core.IModule {
|
||||
@ -185,8 +184,8 @@ func (this *Entertainment) CreateRoom(sessions []comm.IUserSession, rulesStr str
|
||||
RoomType: 0,
|
||||
Card1: "",
|
||||
Card2: "",
|
||||
Skill1: make(map[int32]int32),
|
||||
Skill2: make(map[int32]int32),
|
||||
Skill1: make(map[string]int32),
|
||||
Skill2: make(map[string]int32),
|
||||
}
|
||||
red *pb.DBUser
|
||||
blue *pb.DBUser
|
||||
@ -231,6 +230,7 @@ func (this *Entertainment) CreateRoom(sessions []comm.IUserSession, rulesStr str
|
||||
Lv: red.Lv,
|
||||
},
|
||||
Cardid: rules.Card1,
|
||||
Skill: rules.Skill1,
|
||||
}
|
||||
p2 = &pb.PlayerData{
|
||||
Userinfo: &pb.BaseUserInfo{
|
||||
@ -244,6 +244,7 @@ func (this *Entertainment) CreateRoom(sessions []comm.IUserSession, rulesStr str
|
||||
Lv: blue.Lv,
|
||||
},
|
||||
Cardid: rules.Card2,
|
||||
Skill: rules.Skill2,
|
||||
}
|
||||
|
||||
if room, err = this.gameMgr.CreateRoomByType(p1, p2, rules.RoomType); err != nil {
|
||||
@ -266,30 +267,11 @@ func (this *Entertainment) AddXxlSkillCard(session comm.IUserSession, skill map[
|
||||
result *pb.DBXXLData
|
||||
err error
|
||||
)
|
||||
// for k := range skill {
|
||||
// if _, err := this.model.module.configure.GetGameConsumeHero(k); err != nil {
|
||||
// errdata = &pb.ErrorData{
|
||||
// Code: pb.ErrorCode_ReqParameterError,
|
||||
// Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
// Message: err.Error(),
|
||||
// }
|
||||
// return
|
||||
// }
|
||||
// }
|
||||
if result, err = this.model.getEntertainmList(session.GetUserId()); err != nil {
|
||||
return
|
||||
}
|
||||
for k, v := range skill {
|
||||
if iKey, err := strconv.Atoi(k); err != nil {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_ReqParameterError,
|
||||
Title: pb.ErrorCode_ReqParameterError.ToString(),
|
||||
Message: err.Error(),
|
||||
}
|
||||
return
|
||||
} else {
|
||||
result.Skill[int32(iKey)] += v
|
||||
}
|
||||
result.Skill[k] += v
|
||||
}
|
||||
this.model.modifyEntertainmList(session.GetUserId(), map[string]interface{}{
|
||||
"skill": result.Skill,
|
||||
@ -304,7 +286,7 @@ func (this *Entertainment) AddXxlSkillCard(session comm.IUserSession, skill map[
|
||||
}
|
||||
|
||||
// 消耗一张技能卡
|
||||
func (this *Entertainment) ConsumXxlSkillCard(session comm.IUserSession, skillCard int32) (errdata *pb.ErrorData) {
|
||||
func (this *Entertainment) ConsumXxlSkillCard(session comm.IUserSession, skillCard string) (errdata *pb.ErrorData) {
|
||||
|
||||
var (
|
||||
result *pb.DBXXLData
|
||||
|
||||
@ -149,26 +149,29 @@ func (this *Room) ReceiveMessage(session comm.IUserSession, stype string, msg pr
|
||||
color = 2
|
||||
curPlayer = this.player2
|
||||
}
|
||||
if req.Itype == 1 { //释放技能
|
||||
if req.Itype == "cardskill" { //释放技能
|
||||
if errdata = this.UserSkillUp(color, req.Curid); errdata != nil {
|
||||
return
|
||||
}
|
||||
return
|
||||
} else if req.Itype > 0 { //玩家卡牌技能
|
||||
if curPlayer.Skill[req.Itype] <= 0 {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_EntertainNoSkillCard, // 技能卡不足
|
||||
Title: pb.ErrorCode_EntertainNoSkillCard.ToString(),
|
||||
} else if req.Itype != "swap" { //玩家卡牌技能
|
||||
if conf, err := this.module.configure.GetGamePlaySkill(req.Itype); err == nil {
|
||||
if curPlayer.Skill[conf.Key] <= 0 {
|
||||
errdata = &pb.ErrorData{
|
||||
Code: pb.ErrorCode_EntertainNoSkillCard, // 技能卡不足
|
||||
Title: pb.ErrorCode_EntertainNoSkillCard.ToString(),
|
||||
}
|
||||
return
|
||||
}
|
||||
curPlayer.Skill[conf.Key] -= 1
|
||||
if errdata = this.UserCardSkill(curPlayer, color, conf.Key, req.Curid); errdata != nil {
|
||||
return
|
||||
}
|
||||
return
|
||||
}
|
||||
curPlayer.Skill[req.Itype] -= 1
|
||||
if errdata = this.UserCardSkill(curPlayer, color, req.Itype, req.Curid); errdata != nil {
|
||||
return
|
||||
}
|
||||
|
||||
return
|
||||
}
|
||||
if req.Itype == 0 && req.Curid == 0 && req.Targetid == 0 {
|
||||
if req.Itype == "swap" && req.Curid == 0 && req.Targetid == 0 {
|
||||
if this.curPower == this.player1.Userinfo.Uid {
|
||||
this.NexPower = this.player2.Userinfo.Uid
|
||||
this.player2.Ps = 2
|
||||
@ -807,7 +810,7 @@ func (this *Room) AutoOperator(uid string) {
|
||||
Round: this.round,
|
||||
User1: this.player1,
|
||||
User2: this.player2,
|
||||
Itype: 0,
|
||||
Itype: "swap",
|
||||
Curid: oid1,
|
||||
Targetid: oid2,
|
||||
}, this.szSession...); err != nil {
|
||||
@ -910,7 +913,7 @@ func (this *Room) UserSkillUp(color int32, curid int32) (errdata *pb.ErrorData)
|
||||
Round: this.round,
|
||||
User1: this.player1,
|
||||
User2: this.player2,
|
||||
Itype: 1,
|
||||
Itype: "cardskill",
|
||||
Curid: oid1,
|
||||
Targetid: oid2,
|
||||
}, this.szSession...); err != nil {
|
||||
@ -934,7 +937,7 @@ func (this *Room) ChangePower() {
|
||||
}
|
||||
|
||||
// 玩家释放技能
|
||||
func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid int32, curid int32) (errdata *pb.ErrorData) {
|
||||
func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid string, curid int32) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
curScore int32 // 该次操作的得分
|
||||
oid1 int32 // 唯一id
|
||||
@ -1006,7 +1009,7 @@ func (this *Room) UserCardSkill(curPlayer *pb.PlayerData, color int32, skillid i
|
||||
Round: this.round,
|
||||
User1: this.player1,
|
||||
User2: this.player2,
|
||||
Itype: skillid,
|
||||
Itype: conf.Key,
|
||||
Curid: oid1,
|
||||
Targetid: oid2,
|
||||
}, this.szSession...); err != nil {
|
||||
|
||||
@ -52,6 +52,7 @@ func (this *apiComp) setDefaultFriendUserBaseInfo(userId string) *pb.FriendBase
|
||||
Skin: user.CurSkin,
|
||||
OfflineTime: user.Offlinetime,
|
||||
Gender: user.Gender,
|
||||
Aframe: user.Curaframe,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -94,6 +94,7 @@ func (this *apiComp) Randlist(session comm.IUserSession, req *pb.FriendRandlistR
|
||||
Level: user.Info.Lv,
|
||||
Skin: user.Info.Skin,
|
||||
Gender: user.Info.Gender,
|
||||
Aframe: user.Info.Aframe,
|
||||
}
|
||||
if base == nil {
|
||||
this.module.Debug("未找到玩家信息",
|
||||
|
||||
@ -54,6 +54,7 @@ func (this *apiComp) Search(session comm.IUserSession, req *pb.FriendSearchReq)
|
||||
Skin: u.CurSkin,
|
||||
ServerId: u.Sid,
|
||||
Gender: u.Gender,
|
||||
Aframe: u.Curaframe,
|
||||
}
|
||||
|
||||
target, err := this.module.modelFriend.GetFriend(u.Uid)
|
||||
|
||||
@ -398,14 +398,14 @@ func (this *ModelHero) cleanData(uid string) {
|
||||
}
|
||||
}
|
||||
|
||||
func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, exp int32, model *db.DBModel) (curAddExp []int32, errdata *pb.ErrorData) {
|
||||
func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero, exp int32, model *db.DBModel) (curAddExp map[string]int32, errdata *pb.ErrorData) {
|
||||
var (
|
||||
tasks []*pb.BuriedParam
|
||||
changeupdate map[string]interface{} = make(map[string]interface{})
|
||||
maxlvhero *pb.DBHero
|
||||
)
|
||||
curAddExp = make([]int32, len(heros))
|
||||
for i, hero := range heros {
|
||||
curAddExp = make(map[string]int32, len(heros))
|
||||
for _, hero := range heros {
|
||||
var (
|
||||
preLv int32 //加经验之前的等级
|
||||
curExp int32 // 加经验之后的经验
|
||||
@ -446,21 +446,23 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero,
|
||||
var maxExp int32
|
||||
maxExp = _data.Heroexp
|
||||
if maxLv <= curLv && curExp >= maxExp { // 加经验之前校验是否达到最大等级
|
||||
curAddExp[i] = 0 // 已经满级的时候
|
||||
//code = pb.ErrorCode_HeroMaxLv //
|
||||
curAddExp[hero.Id] = 0
|
||||
this.module.Debugf("英雄已经满级 不需要升级heroid:%s,addexp:%d", hero.Id, exp)
|
||||
return
|
||||
}
|
||||
curExp += exp // 先把经验加上
|
||||
for { // 死循环判断一键升级
|
||||
var fullexp int32 // 溢出的经验
|
||||
curExp += exp // 先把经验加上
|
||||
for { // 死循环判断一键升级
|
||||
if _data.Heroexp == 0 {
|
||||
curAddExp[i] = exp - (curExp - maxExp) // 减去超过部分的经验
|
||||
fullexp = (curExp - maxExp)
|
||||
//curAddExp[hero.Id] = exp - (curExp - maxExp) // 减去超过部分的经验
|
||||
curExp = 0
|
||||
break
|
||||
}
|
||||
maxExp = _data.Heroexp
|
||||
if maxLv <= curLv && curExp >= maxExp { // 设置最大经验和等级
|
||||
curAddExp[i] = exp - (curExp - maxExp) // 减去超过部分的经验
|
||||
fullexp = (curExp - maxExp)
|
||||
//curAddExp[hero.Id] = exp - (curExp - maxExp) // 减去超过部分的经验
|
||||
curLv = maxLv
|
||||
curExp = maxExp
|
||||
break
|
||||
@ -472,14 +474,17 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, heros []*pb.DBHero,
|
||||
curLv += 1 // 经验够了 那么等级+1
|
||||
_data = this.module.configure.GetHeroLv(curLv)
|
||||
if _data == nil { // 等级加失败了 回到原来的等级
|
||||
fullexp = (curExp - maxExp)
|
||||
curLv -= 1
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if curAddExp[i] != 0 {
|
||||
curAddExp[i] = exp // 真正加的经验
|
||||
if curAddExp[hero.Id] == 0 {
|
||||
curAddExp[hero.Id] = exp // 真正加的经验
|
||||
} else {
|
||||
curAddExp[hero.Id] = (exp - fullexp)
|
||||
}
|
||||
|
||||
this.module.Debugf("add hero exp :old lv:%d,old exp:%d,new lv:%d,new exp:%d,addexp:%d", hero.Lv, hero.Exp, curLv, curExp, exp)
|
||||
|
||||
@ -835,15 +835,14 @@ func (this *Hero) CheckPeachReward(session comm.IUserSession, ctime int64) {
|
||||
return
|
||||
}
|
||||
|
||||
func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp int32) (curAddExp []int32, errdata *pb.ErrorData) {
|
||||
func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp int32) (curAddExp map[string]int32, errdata *pb.ErrorData) {
|
||||
var (
|
||||
ids []string = make([]string, 0)
|
||||
heros []*pb.DBHero
|
||||
changeHero []*pb.DBHero // 变化的英雄
|
||||
addExp []int32
|
||||
err error
|
||||
)
|
||||
curAddExp = make([]int32, len(heroObjs))
|
||||
curAddExp = make(map[string]int32, len(heroObjs))
|
||||
for _, v := range heroObjs {
|
||||
if v != "" {
|
||||
ids = append(ids, v)
|
||||
@ -860,16 +859,10 @@ func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp
|
||||
}
|
||||
return
|
||||
}
|
||||
if addExp, errdata = this.modelHero.AddCardExp(session, heros, exp, model); errdata != nil {
|
||||
if curAddExp, errdata = this.modelHero.AddCardExp(session, heros, exp, model); errdata != nil {
|
||||
return
|
||||
}
|
||||
for i, v := range heros {
|
||||
for n, id := range heroObjs {
|
||||
if v.Id == id {
|
||||
curAddExp[n] = addExp[i]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
changeHero = append(changeHero, heros...)
|
||||
}
|
||||
} else {
|
||||
@ -881,16 +874,9 @@ func (this *Hero) AddHerosExp(session comm.IUserSession, heroObjs []string, exp
|
||||
return
|
||||
}
|
||||
|
||||
if addExp, errdata = this.modelHero.AddCardExp(session, heros, exp, nil); errdata != nil {
|
||||
if curAddExp, errdata = this.modelHero.AddCardExp(session, heros, exp, nil); errdata != nil {
|
||||
return
|
||||
}
|
||||
for i, v := range heros {
|
||||
for n, id := range heroObjs {
|
||||
if v.Id == id {
|
||||
curAddExp[n] = addExp[i]
|
||||
}
|
||||
}
|
||||
}
|
||||
changeHero = append(changeHero, heros...)
|
||||
}
|
||||
if len(changeHero) > 0 {
|
||||
|
||||
@ -165,11 +165,12 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.HuntingCha
|
||||
for _, v := range req.Report.Info.Redflist[0].Team {
|
||||
if v.Oid != "" && !v.Ishelp { // 助战英雄不加经验
|
||||
heroObjs = append(heroObjs, v.Oid)
|
||||
changExp[v.Oid] = cfgHunting.Heroexp
|
||||
}
|
||||
}
|
||||
}
|
||||
this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgHunting.Heroexp)
|
||||
if changExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgHunting.Heroexp); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
errdata = this.module.ModifyHuntingData(session.GetUserId(), mapData)
|
||||
|
||||
@ -21,14 +21,13 @@ func (this *apiComp) ChallengeOverCheck(session comm.IUserSession, req *pb.Integ
|
||||
///挑战主线关卡
|
||||
func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralChallengeOverReq) (errdata *pb.ErrorData) {
|
||||
var (
|
||||
update map[string]interface{}
|
||||
res []*cfg.Gameatn
|
||||
first bool // 是否是首通
|
||||
line []*pb.LineUp // 阵容数据
|
||||
harm int32
|
||||
changExp map[string]int32
|
||||
atno []*pb.UserAtno // atno 类型
|
||||
curAddExp []int32
|
||||
update map[string]interface{}
|
||||
res []*cfg.Gameatn
|
||||
first bool // 是否是首通
|
||||
line []*pb.LineUp // 阵容数据
|
||||
harm int32
|
||||
changExp map[string]int32
|
||||
atno []*pb.UserAtno // atno 类型
|
||||
)
|
||||
changExp = make(map[string]int32)
|
||||
harm = req.Report.Harm
|
||||
@ -139,17 +138,13 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
|
||||
if v.HeroID != "" {
|
||||
if !v.Ishelp { // 助战英雄不加经验
|
||||
heroObjs = append(heroObjs, v.Oid)
|
||||
changExp[v.Oid] = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if curAddExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgData.Heroexp); errdata != nil {
|
||||
if changExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, cfgData.Heroexp); errdata != nil {
|
||||
return
|
||||
}
|
||||
for pos, v := range heroObjs {
|
||||
changExp[v] = curAddExp[pos]
|
||||
}
|
||||
}
|
||||
|
||||
err = this.module.modelIntegral.modifyIntegralData(session.GetUserId(), update)
|
||||
|
||||
@ -679,9 +679,10 @@ func (this *User) change(session comm.IUserSession, attrs map[string]int32) (atn
|
||||
}
|
||||
return
|
||||
}
|
||||
this.recoverUserPs(user)
|
||||
user.Ps += add
|
||||
userEx.ConsumPs += -add
|
||||
this.recoverUserPs(user)
|
||||
|
||||
change.Ps = user.Ps
|
||||
go this.ModuleUiGame.HDPSTodayConsum(session.GetUserId(), userEx.ConsumPs)
|
||||
} else {
|
||||
@ -1104,7 +1105,7 @@ func (this *User) recoverUserPs(user *pb.DBUser) (change bool, total int32, next
|
||||
yu int32
|
||||
add int32
|
||||
)
|
||||
|
||||
cur := configure.Now().Unix()
|
||||
ggd := this.ModuleTools.GetGlobalConf()
|
||||
if ggd == nil {
|
||||
return
|
||||
@ -1114,10 +1115,11 @@ func (this *User) recoverUserPs(user *pb.DBUser) (change bool, total int32, next
|
||||
return
|
||||
}
|
||||
if user.Ps >= pconf.PsCeiling {
|
||||
user.LastRecoverPsSec = cur
|
||||
return
|
||||
}
|
||||
total = pconf.PsCeiling
|
||||
cur := configure.Now().Unix()
|
||||
|
||||
if user.LastRecoverPsSec == 0 {
|
||||
user.LastRecoverPsSec = cur
|
||||
change = true
|
||||
|
||||
@ -214,7 +214,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal
|
||||
}
|
||||
}
|
||||
}
|
||||
this.module.ModuleHero.AddHerosExp(session, heroObjs, vikingCfg.Heroexp)
|
||||
if changExp, errdata = this.module.ModuleHero.AddHerosExp(session, heroObjs, vikingCfg.Heroexp); errdata != nil {
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
session.SendMsg(string(this.module.GetType()), VikingChallengeOverResp, &pb.VikingChallengeOverResp{
|
||||
|
||||
@ -177,13 +177,13 @@ type PlayerData struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
|
||||
Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"` // 本局战斗得分
|
||||
Ps int32 `protobuf:"varint,3,opt,name=ps,proto3" json:"ps"` // 体力
|
||||
Cardid string `protobuf:"bytes,4,opt,name=cardid,proto3" json:"cardid"` // 出战的英雄卡
|
||||
Energy int32 `protobuf:"varint,5,opt,name=energy,proto3" json:"energy"` // 能量进度
|
||||
Consumeexp int32 `protobuf:"varint,6,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
|
||||
Skill map[int32]int32 `protobuf:"bytes,7,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 出战的技能卡 key consume_playerskill表中cid value 数量
|
||||
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
|
||||
Score int32 `protobuf:"varint,2,opt,name=score,proto3" json:"score"` // 本局战斗得分
|
||||
Ps int32 `protobuf:"varint,3,opt,name=ps,proto3" json:"ps"` // 体力
|
||||
Cardid string `protobuf:"bytes,4,opt,name=cardid,proto3" json:"cardid"` // 出战的英雄卡
|
||||
Energy int32 `protobuf:"varint,5,opt,name=energy,proto3" json:"energy"` // 能量进度
|
||||
Consumeexp int32 `protobuf:"varint,6,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
|
||||
Skill map[string]int32 `protobuf:"bytes,7,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 出战的技能卡 key consume_playerskill表中cid value 数量
|
||||
}
|
||||
|
||||
func (x *PlayerData) Reset() {
|
||||
@ -260,7 +260,7 @@ func (x *PlayerData) GetConsumeexp() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *PlayerData) GetSkill() map[int32]int32 {
|
||||
func (x *PlayerData) GetSkill() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Skill
|
||||
}
|
||||
@ -273,10 +273,10 @@ type DBXXLMatch struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
|
||||
Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID
|
||||
Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
|
||||
Skill map[int32]int32 `protobuf:"bytes,4,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
|
||||
Userinfo *BaseUserInfo `protobuf:"bytes,1,opt,name=userinfo,proto3" json:"userinfo"`
|
||||
Cardid string `protobuf:"bytes,2,opt,name=cardid,proto3" json:"cardid"` // 选择的卡片ID
|
||||
Consumeexp int32 `protobuf:"varint,3,opt,name=consumeexp,proto3" json:"consumeexp"` // 消消乐积分
|
||||
Skill map[string]int32 `protobuf:"bytes,4,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
|
||||
}
|
||||
|
||||
func (x *DBXXLMatch) Reset() {
|
||||
@ -332,7 +332,7 @@ func (x *DBXXLMatch) GetConsumeexp() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBXXLMatch) GetSkill() map[int32]int32 {
|
||||
func (x *DBXXLMatch) GetSkill() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Skill
|
||||
}
|
||||
@ -406,13 +406,13 @@ type DBXXLData struct {
|
||||
Rtime int64 `protobuf:"varint,5,opt,name=rtime,proto3" json:"rtime"` // 刷新时间 (客户端不用)
|
||||
Playtype []int32 `protobuf:"varint,6,rep,packed,name=playtype,proto3" json:"playtype"` // 每天随机玩法
|
||||
Box []*BoxData `protobuf:"bytes,7,rep,name=box,proto3" json:"box"`
|
||||
Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用
|
||||
ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用
|
||||
Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间
|
||||
Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数
|
||||
Skill map[int32]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0)
|
||||
Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜
|
||||
Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度
|
||||
Roomid string `protobuf:"bytes,8,opt,name=roomid,proto3" json:"roomid"` // 房间id 重连用
|
||||
ServicePath string `protobuf:"bytes,9,opt,name=servicePath,proto3" json:"servicePath"` // 目标服务节点 重连RPC用
|
||||
Etime int64 `protobuf:"varint,10,opt,name=etime,proto3" json:"etime"` // 赛季结束时间
|
||||
Touxiang int32 `protobuf:"varint,11,opt,name=touxiang,proto3" json:"touxiang"` // 今天投降的次数
|
||||
Skill map[string]int32 `protobuf:"bytes,12,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 技能id value 数量(可为0)
|
||||
Liansheng int32 `protobuf:"varint,13,opt,name=liansheng,proto3" json:"liansheng"` // 连胜
|
||||
Freeprogress int32 `protobuf:"varint,14,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取进度
|
||||
Payprogress int32 `protobuf:"varint,15,opt,name=payprogress,proto3" json:"payprogress"`
|
||||
Vip bool `protobuf:"varint,16,opt,name=vip,proto3" json:"vip"` // 是否购买
|
||||
Maxconsumeexp int32 `protobuf:"varint,17,opt,name=maxconsumeexp,proto3" json:"maxconsumeexp"` // 最大赛季积分
|
||||
@ -531,7 +531,7 @@ func (x *DBXXLData) GetTouxiang() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *DBXXLData) GetSkill() map[int32]int32 {
|
||||
func (x *DBXXLData) GetSkill() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Skill
|
||||
}
|
||||
@ -607,11 +607,11 @@ type DBXxlRules struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
RoomType int32 `protobuf:"varint,1,opt,name=RoomType,proto3" json:"RoomType"` // 房间类型
|
||||
Card1 string `protobuf:"bytes,2,opt,name=card1,proto3" json:"card1"` // player1 卡
|
||||
Card2 string `protobuf:"bytes,3,opt,name=card2,proto3" json:"card2"` // player2 卡
|
||||
Skill1 map[int32]int32 `protobuf:"bytes,4,rep,name=skill1,proto3" json:"skill1" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家1携带的技能
|
||||
Skill2 map[int32]int32 `protobuf:"bytes,5,rep,name=skill2,proto3" json:"skill2" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家2携带的技能
|
||||
RoomType int32 `protobuf:"varint,1,opt,name=RoomType,proto3" json:"RoomType"` // 房间类型
|
||||
Card1 string `protobuf:"bytes,2,opt,name=card1,proto3" json:"card1"` // player1 卡
|
||||
Card2 string `protobuf:"bytes,3,opt,name=card2,proto3" json:"card2"` // player2 卡
|
||||
Skill1 map[string]int32 `protobuf:"bytes,4,rep,name=skill1,proto3" json:"skill1" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家1携带的技能
|
||||
Skill2 map[string]int32 `protobuf:"bytes,5,rep,name=skill2,proto3" json:"skill2" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 玩家2携带的技能
|
||||
}
|
||||
|
||||
func (x *DBXxlRules) Reset() {
|
||||
@ -667,14 +667,14 @@ func (x *DBXxlRules) GetCard2() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *DBXxlRules) GetSkill1() map[int32]int32 {
|
||||
func (x *DBXxlRules) GetSkill1() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Skill1
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *DBXxlRules) GetSkill2() map[int32]int32 {
|
||||
func (x *DBXxlRules) GetSkill2() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Skill2
|
||||
}
|
||||
@ -957,7 +957,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
|
||||
0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x44,
|
||||
0x61, 0x74, 0x61, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
|
||||
0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e,
|
||||
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
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,
|
||||
0xd7, 0x01, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x29,
|
||||
@ -971,7 +971,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
|
||||
0x32, 0x16, 0x2e, 0x44, 0x42, 0x58, 0x58, 0x4c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x6b,
|
||||
0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x1a,
|
||||
0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
|
||||
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, 0x3b, 0x0a, 0x07, 0x42, 0x6f, 0x78,
|
||||
0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
@ -1027,7 +1027,7 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
|
||||
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b,
|
||||
0x69, 0x6c, 0x6c, 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,
|
||||
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, 0xac, 0x02, 0x0a, 0x0a, 0x44, 0x42, 0x58, 0x78, 0x6c, 0x52, 0x75,
|
||||
0x6c, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x6f, 0x6f, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x18,
|
||||
@ -1042,11 +1042,11 @@ var file_entertain_entertain_db_proto_rawDesc = []byte{
|
||||
0x42, 0x58, 0x78, 0x6c, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x32,
|
||||
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x32, 0x1a, 0x39, 0x0a,
|
||||
0x0b, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x31, 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,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x39, 0x0a, 0x0b, 0x53, 0x6b, 0x69, 0x6c,
|
||||
0x6c, 0x32, 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,
|
||||
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, 0xa6, 0x01, 0x0a, 0x09, 0x58, 0x78, 0x6c, 0x50, 0x6c, 0x61, 0x79, 0x65,
|
||||
0x72, 0x12, 0x23, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
|
||||
|
||||
@ -26,8 +26,8 @@ type EntertainMatchReq struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Idcard string `protobuf:"bytes,1,opt,name=idcard,proto3" json:"idcard"` //出战的英雄卡
|
||||
Skillcard []int32 `protobuf:"varint,2,rep,packed,name=skillcard,proto3" json:"skillcard"`
|
||||
Idcard string `protobuf:"bytes,1,opt,name=idcard,proto3" json:"idcard"` //出战的英雄卡
|
||||
Skillcard []string `protobuf:"bytes,2,rep,name=skillcard,proto3" json:"skillcard"`
|
||||
}
|
||||
|
||||
func (x *EntertainMatchReq) Reset() {
|
||||
@ -69,7 +69,7 @@ func (x *EntertainMatchReq) GetIdcard() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *EntertainMatchReq) GetSkillcard() []int32 {
|
||||
func (x *EntertainMatchReq) GetSkillcard() []string {
|
||||
if x != nil {
|
||||
return x.Skillcard
|
||||
}
|
||||
@ -409,7 +409,7 @@ type EntertainOperatorReq struct {
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Roomid string `protobuf:"bytes,1,opt,name=roomid,proto3" json:"roomid"` // 房间id
|
||||
Itype int32 `protobuf:"varint,2,opt,name=itype,proto3" json:"itype"` // 操作类型 0 默认交换元素 1 卡片技能
|
||||
Itype string `protobuf:"bytes,2,opt,name=itype,proto3" json:"itype"` // 操作类型 "swap" 默认交换元素 "cardskill" 卡片技能 playerskill 传对应的key
|
||||
Curid int32 `protobuf:"varint,3,opt,name=curid,proto3" json:"curid"` // 当前key
|
||||
Targetid int32 `protobuf:"varint,4,opt,name=targetid,proto3" json:"targetid"` // 目标key
|
||||
}
|
||||
@ -453,11 +453,11 @@ func (x *EntertainOperatorReq) GetRoomid() string {
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *EntertainOperatorReq) GetItype() int32 {
|
||||
func (x *EntertainOperatorReq) GetItype() string {
|
||||
if x != nil {
|
||||
return x.Itype
|
||||
}
|
||||
return 0
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *EntertainOperatorReq) GetCurid() int32 {
|
||||
@ -535,7 +535,7 @@ type EntertainOperatorRstPush struct {
|
||||
Round int32 `protobuf:"varint,5,opt,name=round,proto3" json:"round"` // 轮数
|
||||
User1 *PlayerData `protobuf:"bytes,6,opt,name=user1,proto3" json:"user1"` // 玩家数据也需要同步
|
||||
User2 *PlayerData `protobuf:"bytes,7,opt,name=user2,proto3" json:"user2"`
|
||||
Itype int32 `protobuf:"varint,8,opt,name=itype,proto3" json:"itype"` // 操作类型 0 默认交换元素
|
||||
Itype string `protobuf:"bytes,8,opt,name=itype,proto3" json:"itype"` // 操作类型 0 默认交换元素
|
||||
Curid int32 `protobuf:"varint,9,opt,name=curid,proto3" json:"curid"` // 当前key
|
||||
Targetid int32 `protobuf:"varint,10,opt,name=targetid,proto3" json:"targetid"` // 目标key
|
||||
}
|
||||
@ -621,11 +621,11 @@ func (x *EntertainOperatorRstPush) GetUser2() *PlayerData {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *EntertainOperatorRstPush) GetItype() int32 {
|
||||
func (x *EntertainOperatorRstPush) GetItype() string {
|
||||
if x != nil {
|
||||
return x.Itype
|
||||
}
|
||||
return 0
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *EntertainOperatorRstPush) GetCurid() int32 {
|
||||
@ -1313,8 +1313,8 @@ type EntertainChangePush struct {
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Card map[string]int32 `protobuf:"bytes,1,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0)
|
||||
Skill map[int32]int32 `protobuf:"bytes,2,rep,name=skill,proto3" json:"skill" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
|
||||
Card map[string]int32 `protobuf:"bytes,1,rep,name=card,proto3" json:"card" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 卡id value 数量(可为0)
|
||||
Skill map[string]int32 `protobuf:"bytes,2,rep,name=skill,proto3" json:"skill" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //
|
||||
}
|
||||
|
||||
func (x *EntertainChangePush) Reset() {
|
||||
@ -1356,7 +1356,7 @@ func (x *EntertainChangePush) GetCard() map[string]int32 {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (x *EntertainChangePush) GetSkill() map[int32]int32 {
|
||||
func (x *EntertainChangePush) GetSkill() map[string]int32 {
|
||||
if x != nil {
|
||||
return x.Skill
|
||||
}
|
||||
@ -2641,7 +2641,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
|
||||
0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x16,
|
||||
0x0a, 0x06, 0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
|
||||
0x69, 0x64, 0x63, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x63,
|
||||
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
|
||||
0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
|
||||
0x63, 0x61, 0x72, 0x64, 0x22, 0x2a, 0x0a, 0x12, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69,
|
||||
0x6e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61,
|
||||
0x79, 0x63, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x61, 0x79, 0x63, 0x68,
|
||||
@ -2673,7 +2673,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
|
||||
0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72,
|
||||
0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6f, 0x6d, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x69,
|
||||
0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
|
||||
0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
|
||||
0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
|
||||
0x74, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
|
||||
@ -2695,7 +2695,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
|
||||
0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x31, 0x12, 0x21, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72,
|
||||
0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72,
|
||||
0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x32, 0x12, 0x14, 0x0a, 0x05, 0x69,
|
||||
0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
|
||||
0x74, 0x79, 0x70, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70,
|
||||
0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x05, 0x63, 0x75, 0x72, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
|
||||
0x74, 0x69, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65,
|
||||
@ -2782,7 +2782,7 @@ var file_entertain_entertain_msg_proto_rawDesc = []byte{
|
||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
|
||||
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
|
||||
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,
|
||||
0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
|
||||
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
|
||||
0x01, 0x22, 0x30, 0x0a, 0x16, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x74, 0x61, 0x69, 0x6e, 0x43, 0x72,
|
||||
0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6f, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x69,
|
||||
|
||||
@ -39,6 +39,7 @@ type FriendBase struct {
|
||||
Score int32 `protobuf:"varint,12,opt,name=score,proto3" json:"score"` //助战分数
|
||||
UpdateTime int64 `protobuf:"varint,13,opt,name=updateTime,proto3" json:"updateTime"` //更新时间
|
||||
Gender int32 `protobuf:"varint,14,opt,name=gender,proto3" json:"gender"` //性别
|
||||
Aframe string `protobuf:"bytes,15,opt,name=aframe,proto3" json:"aframe"` //头像框
|
||||
}
|
||||
|
||||
func (x *FriendBase) Reset() {
|
||||
@ -171,6 +172,13 @@ func (x *FriendBase) GetGender() int32 {
|
||||
return 0
|
||||
}
|
||||
|
||||
func (x *FriendBase) GetAframe() string {
|
||||
if x != nil {
|
||||
return x.Aframe
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
//好友列表
|
||||
type FriendListReq struct {
|
||||
state protoimpl.MessageState
|
||||
@ -2593,7 +2601,7 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
|
||||
0x68, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x16, 0x66,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, 0x64, 0x62, 0x2e,
|
||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x22, 0x88, 0x03, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65,
|
||||
0x6f, 0x22, 0xa0, 0x03, 0x0a, 0x0a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65,
|
||||
0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b,
|
||||
0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b,
|
||||
@ -2617,181 +2625,183 @@ var file_friend_friend_msg_proto_rawDesc = []byte{
|
||||
0x63, 0x6f, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69,
|
||||
0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
|
||||
0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x0e,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x0f, 0x0a, 0x0d,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x54, 0x0a,
|
||||
0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12,
|
||||
0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74,
|
||||
0x12, 0x21, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
|
||||
0x32, 0x09, 0x2e, 0x44, 0x42, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x06, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x6e,
|
||||
0x64, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x52, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f,
|
||||
0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22,
|
||||
0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65,
|
||||
0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x45, 0x0a,
|
||||
0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65,
|
||||
0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
|
||||
0x22, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a,
|
||||
0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75,
|
||||
0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
|
||||
0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
|
||||
0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e,
|
||||
0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a,
|
||||
0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74,
|
||||
0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70,
|
||||
0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69,
|
||||
0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a,
|
||||
0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x39, 0x0a, 0x10, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25,
|
||||
0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42,
|
||||
0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x13, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65,
|
||||
0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a,
|
||||
0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06,
|
||||
0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73,
|
||||
0x65, 0x72, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65,
|
||||
0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44,
|
||||
0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
|
||||
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22,
|
||||
0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65,
|
||||
0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a,
|
||||
0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05,
|
||||
0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74,
|
||||
0x61, 0x6c, 0x22, 0x12, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c,
|
||||
0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x34, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c,
|
||||
0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0c,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09,
|
||||
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
|
||||
0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x23, 0x0a, 0x0d, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66,
|
||||
0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22,
|
||||
0x33, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65,
|
||||
0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x49, 0x64, 0x73, 0x22, 0x2a, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61,
|
||||
0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04,
|
||||
0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67,
|
||||
0x22, 0x33, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74,
|
||||
0x68, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f,
|
||||
0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f,
|
||||
0x4f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x50, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
|
||||
0x73, 0x73, 0x69, 0x73, 0x74, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a,
|
||||
0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72,
|
||||
0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72,
|
||||
0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x7c,
|
||||
0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69,
|
||||
0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06,
|
||||
0x61, 0x66, 0x72, 0x61, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x66,
|
||||
0x72, 0x61, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c, 0x69,
|
||||
0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x54, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4c,
|
||||
0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18,
|
||||
0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61,
|
||||
0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x46, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x6e, 0x64, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71,
|
||||
0x22, 0x35, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x61, 0x6e, 0x64, 0x6c, 0x69,
|
||||
0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73,
|
||||
0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f,
|
||||
0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f,
|
||||
0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18,
|
||||
0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x52, 0x65,
|
||||
0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x14, 0x0a, 0x12,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52,
|
||||
0x65, 0x71, 0x22, 0x50, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72,
|
||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63,
|
||||
0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63,
|
||||
0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04,
|
||||
0x61, 0x74, 0x6e, 0x6f, 0x22, 0x41, 0x0a, 0x1a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73,
|
||||
0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x75,
|
||||
0x73, 0x68, 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52,
|
||||
0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52,
|
||||
0x65, 0x71, 0x22, 0x41, 0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69,
|
||||
0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25,
|
||||
0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x34, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47,
|
||||
0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a,
|
||||
0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x15, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69,
|
||||
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55,
|
||||
0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x53, 0x0a, 0x12, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73, 0x68,
|
||||
0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x12, 0x1f,
|
||||
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||
0x53, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x41, 0x70, 0x70, 0x6c,
|
||||
0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
|
||||
0x55, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
|
||||
0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
|
||||
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
|
||||
0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x2a, 0x0a, 0x0c,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08,
|
||||
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
|
||||
0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x44, 0x65, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2e, 0x0a,
|
||||
0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03,
|
||||
0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x2f, 0x0a,
|
||||
0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x67, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70,
|
||||
0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x2f,
|
||||
0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52, 0x65,
|
||||
0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01,
|
||||
0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22,
|
||||
0x24, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x75, 0x73, 0x65, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41,
|
||||
0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x36, 0x0a, 0x13, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65,
|
||||
0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
|
||||
0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c,
|
||||
0x69, 0x73, 0x74, 0x22, 0x2d, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61,
|
||||
0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61,
|
||||
0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61,
|
||||
0x6d, 0x65, 0x22, 0x39, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72,
|
||||
0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x14, 0x0a,
|
||||
0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74,
|
||||
0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61,
|
||||
0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x73, 0x22, 0x2f, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x42, 0x6c,
|
||||
0x61, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x42,
|
||||
0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x11,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52, 0x65,
|
||||
0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x48, 0x0a,
|
||||
0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x65, 0x6c, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x18,
|
||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x12,
|
||||
0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x2c, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54,
|
||||
0x6f, 0x74, 0x61, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x12, 0x0a, 0x10, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x34,
|
||||
0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x6c, 0x69, 0x73, 0x74, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04,
|
||||
0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4c, 0x0a, 0x16, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61,
|
||||
0x6e, 0x41, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x7a, 0x61, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x7a,
|
||||
0x61, 0x6e, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x69,
|
||||
0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
|
||||
0x69, 0x64, 0x22, 0x38, 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x41,
|
||||
0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
|
||||
0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73,
|
||||
0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x1c, 0x0a, 0x1a,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x41, 0x73, 0x73,
|
||||
0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x5d, 0x0a, 0x1b, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x41, 0x73, 0x73, 0x69, 0x73,
|
||||
0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74,
|
||||
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x41, 0x73, 0x73, 0x69,
|
||||
0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x04,
|
||||
0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48,
|
||||
0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x18, 0x0a, 0x16, 0x46, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f,
|
||||
0x52, 0x65, 0x71, 0x22, 0x59, 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74,
|
||||
0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21,
|
||||
0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44,
|
||||
0x42, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74,
|
||||
0x61, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||
0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x3a,
|
||||
0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x65, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x43,
|
||||
0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x65,
|
||||
0x62, 0x6c, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a,
|
||||
0x62, 0x65, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
0x6c, 0x69, 0x73, 0x74, 0x22, 0x2c, 0x0a, 0x0c, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61,
|
||||
0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64,
|
||||
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49,
|
||||
0x64, 0x73, 0x22, 0x23, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x52,
|
||||
0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||
0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22, 0x33, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c,
|
||||
0x0a, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x09, 0x52, 0x09, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, 0x73, 0x22, 0x2a, 0x0a, 0x14,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65,
|
||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x22, 0x33, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x68, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x50, 0x0a,
|
||||
0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x68, 0x65, 0x72,
|
||||
0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a,
|
||||
0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62,
|
||||
0x6a, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18,
|
||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x22,
|
||||
0x15, 0x0a, 0x13, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c,
|
||||
0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x7c, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f,
|
||||
0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x12,
|
||||
0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01,
|
||||
0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x25, 0x0a,
|
||||
0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e,
|
||||
0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65,
|
||||
0x63, 0x6f, 0x72, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65,
|
||||
0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x50, 0x0a, 0x13, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x12, 0x1d, 0x0a,
|
||||
0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73,
|
||||
0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x41, 0x0a, 0x1a,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f,
|
||||
0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x23, 0x0a, 0x06, 0x66, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69,
|
||||
0x65, 0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x06, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x22,
|
||||
0x19, 0x0a, 0x17, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48,
|
||||
0x65, 0x72, 0x6f, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x22, 0x41, 0x0a, 0x18, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x69,
|
||||
0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x42, 0x61, 0x73, 0x65, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x22, 0x34, 0x0a,
|
||||
0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69,
|
||||
0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55,
|
||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
|
||||
0x55, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74,
|
||||
0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09,
|
||||
0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
|
||||
0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74,
|
||||
0x61, 0x74, 0x75, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74,
|
||||
0x75, 0x73, 0x22, 0x53, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x41,
|
||||
0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x61, 0x72, 0x67,
|
||||
0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x61, 0x72,
|
||||
0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x61, 0x73,
|
||||
0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x53, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e,
|
||||
0x64, 0x41, 0x64, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a,
|
||||
0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x55, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x04, 0x69,
|
||||
0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x46, 0x72, 0x69, 0x65,
|
||||
0x6e, 0x64, 0x42, 0x61, 0x73, 0x65, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x4c, 0x0a, 0x16,
|
||||
0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x41, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65,
|
||||
0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x7a, 0x61, 0x6e, 0x69, 0x64, 0x18,
|
||||
0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x7a, 0x61, 0x6e, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09,
|
||||
0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x69, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52,
|
||||
0x09, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x69, 0x64, 0x22, 0x38, 0x0a, 0x17, 0x46, 0x72,
|
||||
0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x41, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76,
|
||||
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x01, 0x20,
|
||||
0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04,
|
||||
0x61, 0x74, 0x6e, 0x6f, 0x22, 0x1c, 0x0a, 0x1a, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65,
|
||||
0x66, 0x72, 0x65, 0x73, 0x68, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52,
|
||||
0x65, 0x71, 0x22, 0x5d, 0x0a, 0x1b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72,
|
||||
0x65, 0x73, 0x68, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73,
|
||||
0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||
0x0d, 0x2e, 0x44, 0x42, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04,
|
||||
0x64, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, 0x20, 0x03,
|
||||
0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72,
|
||||
0x6f, 0x22, 0x18, 0x0a, 0x16, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x41, 0x73,
|
||||
0x73, 0x69, 0x73, 0x74, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x59, 0x0a, 0x17, 0x46,
|
||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x47, 0x65, 0x74, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48, 0x65,
|
||||
0x72, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01,
|
||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x41, 0x73, 0x73, 0x69, 0x73, 0x74, 0x48,
|
||||
0x65, 0x72, 0x6f, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72,
|
||||
0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
|
||||
0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x3a, 0x0a, 0x18, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64,
|
||||
0x42, 0x65, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x43, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x50, 0x75,
|
||||
0x73, 0x68, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x65, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x69, 0x64, 0x73,
|
||||
0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x65, 0x62, 0x6c, 0x61, 0x63, 0x6b, 0x69,
|
||||
0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
|
||||
0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
||||
@ -659,7 +659,7 @@ type DBHeroDrawRecord struct {
|
||||
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID
|
||||
HeroId []string `protobuf:"bytes,3,rep,name=heroId,proto3" json:"heroId"` // 英雄ID
|
||||
Drawtype int32 `protobuf:"varint,4,opt,name=drawtype,proto3" json:"drawtype"` // 卡池
|
||||
Ctime int64 `protobuf:"varint,5,opt,name=ctime,proto3" json:"ctime"`
|
||||
Ctime int64 `protobuf:"varint,5,opt,name=ctime,proto3" json:"ctime"` // 抽卡时间
|
||||
}
|
||||
|
||||
func (x *DBHeroDrawRecord) Reset() {
|
||||
|
||||
34
sys/configure/structs/Game.BattlePlayType.go
Normal file
34
sys/configure/structs/Game.BattlePlayType.go
Normal file
@ -0,0 +1,34 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <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
|
||||
|
||||
const (
|
||||
GameBattlePlayType_Null = 0
|
||||
GameBattlePlayType_Mainline = 1
|
||||
GameBattlePlayType_Pagoda = 2
|
||||
GameBattlePlayType_Rtask = 3
|
||||
GameBattlePlayType_Hunting = 4
|
||||
GameBattlePlayType_Viking = 5
|
||||
GameBattlePlayType_Moonfantasy = 6
|
||||
GameBattlePlayType_Arena = 7
|
||||
GameBattlePlayType_Academy = 8
|
||||
GameBattlePlayType_Heroteaching = 9
|
||||
GameBattlePlayType_Combat = 10
|
||||
GameBattlePlayType_Enchant = 11
|
||||
GameBattlePlayType_Sociaty = 12
|
||||
GameBattlePlayType_Friendsmeet = 13
|
||||
GameBattlePlayType_Practicenpc = 14
|
||||
GameBattlePlayType_Race = 15
|
||||
GameBattlePlayType_Cycle = 16
|
||||
GameBattlePlayType_Guildgve = 17
|
||||
GameBattlePlayType_Stone = 18
|
||||
GameBattlePlayType_Expboos = 19
|
||||
GameBattlePlayType_IsLand = 20
|
||||
GameBattlePlayType_Integral = 21
|
||||
)
|
||||
@ -18,13 +18,13 @@ type GameBattleReadyData struct {
|
||||
BattleScenes []string
|
||||
BGMusic string
|
||||
LoadingId int32
|
||||
HideAlienSpace int32
|
||||
HideFightUI int32
|
||||
HideAlienSpace bool
|
||||
HideFightUI bool
|
||||
RuleTips string
|
||||
BattleTips string
|
||||
BattleEvents []int32
|
||||
ScoreGroupID int32
|
||||
DisableAiCamera int32
|
||||
DisableAiCamera bool
|
||||
ChoseCamp []int32
|
||||
DisableCamp []int32
|
||||
DefaultHero int32
|
||||
@ -34,7 +34,7 @@ type GameBattleReadyData struct {
|
||||
HeroCheck []string
|
||||
RedAssistTeam int32
|
||||
BlueAssistTeam int32
|
||||
CanFriendHelp int32
|
||||
CanFriendHelp bool
|
||||
Numrounds int32
|
||||
}
|
||||
|
||||
@ -65,8 +65,8 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
|
||||
{ var _ok_ bool; if _v.BGMusic, _ok_ = _buf["BGMusic"].(string); !_ok_ { err = errors.New("BGMusic error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LoadingId"].(float64); !_ok_ { err = errors.New("LoadingId error"); return }; _v.LoadingId = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideAlienSpace"].(float64); !_ok_ { err = errors.New("HideAlienSpace error"); return }; _v.HideAlienSpace = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HideFightUI"].(float64); !_ok_ { err = errors.New("HideFightUI error"); return }; _v.HideFightUI = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.HideAlienSpace, _ok_ = _buf["HideAlienSpace"].(bool); !_ok_ { err = errors.New("HideAlienSpace error"); return } }
|
||||
{ var _ok_ bool; if _v.HideFightUI, _ok_ = _buf["HideFightUI"].(bool); !_ok_ { err = errors.New("HideFightUI error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["RuleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RuleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RuleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["BattleTips"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BattleTips error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BattleTips, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{
|
||||
@ -84,7 +84,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
}
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ScoreGroupID"].(float64); !_ok_ { err = errors.New("ScoreGroupID error"); return }; _v.ScoreGroupID = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["disableAiCamera"].(float64); !_ok_ { err = errors.New("disableAiCamera error"); return }; _v.DisableAiCamera = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.DisableAiCamera, _ok_ = _buf["disableAiCamera"].(bool); !_ok_ { err = errors.New("disableAiCamera error"); return } }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
var _ok_ bool
|
||||
@ -172,7 +172,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["RedAssistTeam"].(float64); !_ok_ { err = errors.New("RedAssistTeam error"); return }; _v.RedAssistTeam = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BlueAssistTeam"].(float64); !_ok_ { err = errors.New("BlueAssistTeam error"); return }; _v.BlueAssistTeam = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.CanFriendHelp, _ok_ = _buf["CanFriendHelp"].(bool); !_ok_ { err = errors.New("CanFriendHelp error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
|
||||
return
|
||||
}
|
||||
|
||||
14
sys/configure/structs/Game.BattleScoreType.go
Normal file
14
sys/configure/structs/Game.BattleScoreType.go
Normal file
@ -0,0 +1,14 @@
|
||||
//------------------------------------------------------------------------------
|
||||
// <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
|
||||
|
||||
const (
|
||||
GameBattleScoreType_Ordinary = 0
|
||||
GameBattleScoreType_Coefficient = 1
|
||||
)
|
||||
@ -15,7 +15,7 @@ type GameCaravanEventData struct {
|
||||
Eventgroup int32
|
||||
Eventweight int32
|
||||
Eventtype int32
|
||||
Mustdo int32
|
||||
Mustdo bool
|
||||
Citystory int32
|
||||
Citynormal int32
|
||||
Cityabnormal int32
|
||||
@ -41,7 +41,7 @@ func (_v *GameCaravanEventData)Deserialize(_buf map[string]interface{}) (err err
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventgroup"].(float64); !_ok_ { err = errors.New("eventgroup error"); return }; _v.Eventgroup = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventweight"].(float64); !_ok_ { err = errors.New("eventweight error"); return }; _v.Eventweight = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["eventtype"].(float64); !_ok_ { err = errors.New("eventtype error"); return }; _v.Eventtype = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mustdo"].(float64); !_ok_ { err = errors.New("mustdo error"); return }; _v.Mustdo = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Mustdo, _ok_ = _buf["mustdo"].(bool); !_ok_ { err = errors.New("mustdo error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citystory"].(float64); !_ok_ { err = errors.New("citystory error"); return }; _v.Citystory = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["citynormal"].(float64); !_ok_ { err = errors.New("citynormal error"); return }; _v.Citynormal = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cityabnormal"].(float64); !_ok_ { err = errors.New("cityabnormal error"); return }; _v.Cityabnormal = int32(_tempNum_) }
|
||||
|
||||
@ -14,11 +14,14 @@ type GamePayGiftpackData struct {
|
||||
Id int32
|
||||
Type int32
|
||||
Type2 int32
|
||||
Rank int32
|
||||
Day int32
|
||||
RepeatNum int32
|
||||
Refreshtime int32
|
||||
Packagetype string
|
||||
BuyNum int32
|
||||
Issp int32
|
||||
Isrecommend int32
|
||||
Packagename string
|
||||
Costitem []*Gameatn
|
||||
Item []*Gameatn
|
||||
@ -34,11 +37,14 @@ func (_v *GamePayGiftpackData)Deserialize(_buf map[string]interface{}) (err erro
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type2"].(float64); !_ok_ { err = errors.New("type2 error"); return }; _v.Type2 = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank"].(float64); !_ok_ { err = errors.New("rank error"); return }; _v.Rank = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["day"].(float64); !_ok_ { err = errors.New("day error"); return }; _v.Day = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["repeat_num"].(float64); !_ok_ { err = errors.New("repeat_num error"); return }; _v.RepeatNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["refreshtime"].(float64); !_ok_ { err = errors.New("refreshtime error"); return }; _v.Refreshtime = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Packagetype, _ok_ = _buf["packagetype"].(string); !_ok_ { err = errors.New("packagetype error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buy_num"].(float64); !_ok_ { err = errors.New("buy_num error"); return }; _v.BuyNum = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["issp"].(float64); !_ok_ { err = errors.New("issp error"); return }; _v.Issp = int32(_tempNum_) }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["isrecommend"].(float64); !_ok_ { err = errors.New("isrecommend error"); return }; _v.Isrecommend = int32(_tempNum_) }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["packagename"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Packagename error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Packagename, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
{
|
||||
var _arr_ []interface{}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
package cfg
|
||||
|
||||
type GamePlayerSkill struct {
|
||||
_dataMap map[int32]*GamePlayerSkillData
|
||||
_dataMap map[string]*GamePlayerSkillData
|
||||
_dataList []*GamePlayerSkillData
|
||||
}
|
||||
|
||||
func NewGamePlayerSkill(_buf []map[string]interface{}) (*GamePlayerSkill, error) {
|
||||
_dataList := make([]*GamePlayerSkillData, 0, len(_buf))
|
||||
dataMap := make(map[int32]*GamePlayerSkillData)
|
||||
dataMap := make(map[string]*GamePlayerSkillData)
|
||||
for _, _ele_ := range _buf {
|
||||
if _v, err2 := DeserializeGamePlayerSkillData(_ele_); err2 != nil {
|
||||
return nil, err2
|
||||
@ -27,7 +27,7 @@ func NewGamePlayerSkill(_buf []map[string]interface{}) (*GamePlayerSkill, error)
|
||||
return &GamePlayerSkill{_dataList:_dataList, _dataMap:dataMap}, nil
|
||||
}
|
||||
|
||||
func (table *GamePlayerSkill) GetDataMap() map[int32]*GamePlayerSkillData {
|
||||
func (table *GamePlayerSkill) GetDataMap() map[string]*GamePlayerSkillData {
|
||||
return table._dataMap
|
||||
}
|
||||
|
||||
@ -35,7 +35,7 @@ func (table *GamePlayerSkill) GetDataList() []*GamePlayerSkillData {
|
||||
return table._dataList
|
||||
}
|
||||
|
||||
func (table *GamePlayerSkill) Get(key int32) *GamePlayerSkillData {
|
||||
func (table *GamePlayerSkill) Get(key string) *GamePlayerSkillData {
|
||||
return table._dataMap[key]
|
||||
}
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ package cfg
|
||||
import "errors"
|
||||
|
||||
type GamePlayerSkillData struct {
|
||||
Key int32
|
||||
Key string
|
||||
Skillvalue int32
|
||||
Icon string
|
||||
Name string
|
||||
@ -29,7 +29,7 @@ func (*GamePlayerSkillData) GetTypeId() int32 {
|
||||
}
|
||||
|
||||
func (_v *GamePlayerSkillData)Deserialize(_buf map[string]interface{}) (err error) {
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
|
||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillvalue"].(float64); !_ok_ { err = errors.New("skillvalue error"); return }; _v.Skillvalue = int32(_tempNum_) }
|
||||
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
|
||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user