积分boss修改
This commit is contained in:
parent
63886d0780
commit
d7770b71fa
File diff suppressed because it is too large
Load Diff
@ -859,20 +859,20 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_01",
|
"key": "enchantboss_name_01",
|
||||||
"text": "F"
|
"text": "F"
|
||||||
},
|
},
|
||||||
"PassUnlock": 0,
|
"PassUnlock": 0,
|
||||||
"rank_low": 0,
|
"rank_low": 0,
|
||||||
"rank_up": 30000,
|
"rank_up": 300000,
|
||||||
"icon": "gh_img_f",
|
"icon": "gh_img_f",
|
||||||
"grade": 101
|
"grade": 101
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_02",
|
"key": "enchantboss_name_02",
|
||||||
"text": "C"
|
"text": "C"
|
||||||
@ -885,7 +885,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_03",
|
"key": "enchantboss_name_03",
|
||||||
"text": "B"
|
"text": "B"
|
||||||
@ -898,7 +898,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_04",
|
"key": "enchantboss_name_04",
|
||||||
"text": "A"
|
"text": "A"
|
||||||
@ -911,7 +911,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_05",
|
"key": "enchantboss_name_05",
|
||||||
"text": "A+"
|
"text": "A+"
|
||||||
@ -924,7 +924,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_06",
|
"key": "enchantboss_name_06",
|
||||||
"text": "S"
|
"text": "S"
|
||||||
@ -937,7 +937,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_07",
|
"key": "enchantboss_name_07",
|
||||||
"text": "SS"
|
"text": "SS"
|
||||||
@ -950,7 +950,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_08",
|
"key": "enchantboss_name_08",
|
||||||
"text": "SSS"
|
"text": "SSS"
|
||||||
@ -963,7 +963,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_09",
|
"key": "enchantboss_name_09",
|
||||||
"text": "EX"
|
"text": "EX"
|
||||||
@ -976,7 +976,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_10",
|
"key": "enchantboss_name_10",
|
||||||
"text": "EX+"
|
"text": "EX+"
|
||||||
@ -989,33 +989,33 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4101,
|
"id": 4101,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_11",
|
"key": "enchantboss_name_11",
|
||||||
"text": "EX++"
|
"text": "EX++"
|
||||||
},
|
},
|
||||||
"PassUnlock": 1,
|
"PassUnlock": 1,
|
||||||
"rank_low": 6666667,
|
"rank_low": 6666667,
|
||||||
"rank_up": 99999999,
|
"rank_up": -1,
|
||||||
"icon": "gh_img_ex2",
|
"icon": "gh_img_ex2",
|
||||||
"grade": 111
|
"grade": 111
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_01",
|
"key": "enchantboss_name_01",
|
||||||
"text": "F"
|
"text": "F"
|
||||||
},
|
},
|
||||||
"PassUnlock": 0,
|
"PassUnlock": 0,
|
||||||
"rank_low": 0,
|
"rank_low": 0,
|
||||||
"rank_up": 30000,
|
"rank_up": 300000,
|
||||||
"icon": "gh_img_f",
|
"icon": "gh_img_f",
|
||||||
"grade": 201
|
"grade": 201
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_02",
|
"key": "enchantboss_name_02",
|
||||||
"text": "C"
|
"text": "C"
|
||||||
@ -1028,7 +1028,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_03",
|
"key": "enchantboss_name_03",
|
||||||
"text": "B"
|
"text": "B"
|
||||||
@ -1041,7 +1041,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_04",
|
"key": "enchantboss_name_04",
|
||||||
"text": "A"
|
"text": "A"
|
||||||
@ -1054,7 +1054,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_05",
|
"key": "enchantboss_name_05",
|
||||||
"text": "A+"
|
"text": "A+"
|
||||||
@ -1067,7 +1067,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_06",
|
"key": "enchantboss_name_06",
|
||||||
"text": "S"
|
"text": "S"
|
||||||
@ -1080,7 +1080,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_07",
|
"key": "enchantboss_name_07",
|
||||||
"text": "SS"
|
"text": "SS"
|
||||||
@ -1093,7 +1093,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_08",
|
"key": "enchantboss_name_08",
|
||||||
"text": "SSS"
|
"text": "SSS"
|
||||||
@ -1106,7 +1106,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_09",
|
"key": "enchantboss_name_09",
|
||||||
"text": "EX"
|
"text": "EX"
|
||||||
@ -1119,7 +1119,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_10",
|
"key": "enchantboss_name_10",
|
||||||
"text": "EX+"
|
"text": "EX+"
|
||||||
@ -1132,33 +1132,33 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4201,
|
"id": 4201,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_11",
|
"key": "enchantboss_name_11",
|
||||||
"text": "EX++"
|
"text": "EX++"
|
||||||
},
|
},
|
||||||
"PassUnlock": 1,
|
"PassUnlock": 1,
|
||||||
"rank_low": 6666667,
|
"rank_low": 6666667,
|
||||||
"rank_up": 99999999,
|
"rank_up": -1,
|
||||||
"icon": "gh_img_ex2",
|
"icon": "gh_img_ex2",
|
||||||
"grade": 211
|
"grade": 211
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_01",
|
"key": "enchantboss_name_01",
|
||||||
"text": "F"
|
"text": "F"
|
||||||
},
|
},
|
||||||
"PassUnlock": 0,
|
"PassUnlock": 0,
|
||||||
"rank_low": 0,
|
"rank_low": 0,
|
||||||
"rank_up": 30000,
|
"rank_up": 300000,
|
||||||
"icon": "gh_img_f",
|
"icon": "gh_img_f",
|
||||||
"grade": 301
|
"grade": 301
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_02",
|
"key": "enchantboss_name_02",
|
||||||
"text": "C"
|
"text": "C"
|
||||||
@ -1171,7 +1171,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_03",
|
"key": "enchantboss_name_03",
|
||||||
"text": "B"
|
"text": "B"
|
||||||
@ -1184,7 +1184,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_04",
|
"key": "enchantboss_name_04",
|
||||||
"text": "A"
|
"text": "A"
|
||||||
@ -1197,7 +1197,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_05",
|
"key": "enchantboss_name_05",
|
||||||
"text": "A+"
|
"text": "A+"
|
||||||
@ -1210,7 +1210,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_06",
|
"key": "enchantboss_name_06",
|
||||||
"text": "S"
|
"text": "S"
|
||||||
@ -1223,7 +1223,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_07",
|
"key": "enchantboss_name_07",
|
||||||
"text": "SS"
|
"text": "SS"
|
||||||
@ -1236,7 +1236,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_08",
|
"key": "enchantboss_name_08",
|
||||||
"text": "SSS"
|
"text": "SSS"
|
||||||
@ -1249,7 +1249,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_09",
|
"key": "enchantboss_name_09",
|
||||||
"text": "EX"
|
"text": "EX"
|
||||||
@ -1262,7 +1262,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_10",
|
"key": "enchantboss_name_10",
|
||||||
"text": "EX+"
|
"text": "EX+"
|
||||||
@ -1275,14 +1275,14 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4301,
|
"id": 4301,
|
||||||
"iType": 0,
|
"iType": 2,
|
||||||
"score_name": {
|
"score_name": {
|
||||||
"key": "enchantboss_name_11",
|
"key": "enchantboss_name_11",
|
||||||
"text": "EX++"
|
"text": "EX++"
|
||||||
},
|
},
|
||||||
"PassUnlock": 1,
|
"PassUnlock": 1,
|
||||||
"rank_low": 6666667,
|
"rank_low": 6666667,
|
||||||
"rank_up": 99999999,
|
"rank_up": -1,
|
||||||
"icon": "gh_img_ex2",
|
"icon": "gh_img_ex2",
|
||||||
"grade": 311
|
"grade": 311
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1474,5 +1474,10 @@
|
|||||||
"filter": [
|
"filter": [
|
||||||
"eq"
|
"eq"
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 253,
|
||||||
|
"insert": 1,
|
||||||
|
"filter": []
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -11,6 +11,7 @@
|
|||||||
"coefficient": 1,
|
"coefficient": 1,
|
||||||
"unlock": 101,
|
"unlock": 101,
|
||||||
"unlockval": 0,
|
"unlockval": 0,
|
||||||
|
"unlockval2": 0,
|
||||||
"name": {
|
"name": {
|
||||||
"key": "IntegralBoss_Integralboss_name_1",
|
"key": "IntegralBoss_Integralboss_name_1",
|
||||||
"text": "火龙"
|
"text": "火龙"
|
||||||
@ -46,7 +47,8 @@
|
|||||||
],
|
],
|
||||||
"bossIcon": "gl_img_55001",
|
"bossIcon": "gl_img_55001",
|
||||||
"back_png": "hl_img_bg",
|
"back_png": "hl_img_bg",
|
||||||
"recommendlv": 20
|
"recommendlv": 20,
|
||||||
|
"spbuff": 310001001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10001002,
|
"id": 10001002,
|
||||||
@ -58,8 +60,9 @@
|
|||||||
"text": "普通"
|
"text": "普通"
|
||||||
},
|
},
|
||||||
"coefficient": 1.2,
|
"coefficient": 1.2,
|
||||||
"unlock": 102,
|
"unlock": 103,
|
||||||
"unlockval": 1000,
|
"unlockval": 1000,
|
||||||
|
"unlockval2": 2,
|
||||||
"name": {
|
"name": {
|
||||||
"key": "IntegralBoss_Integralboss_name_2",
|
"key": "IntegralBoss_Integralboss_name_2",
|
||||||
"text": "火龙"
|
"text": "火龙"
|
||||||
@ -90,7 +93,8 @@
|
|||||||
],
|
],
|
||||||
"bossIcon": "gl_img_55001",
|
"bossIcon": "gl_img_55001",
|
||||||
"back_png": "hl_img_bg",
|
"back_png": "hl_img_bg",
|
||||||
"recommendlv": 30
|
"recommendlv": 30,
|
||||||
|
"spbuff": 310001001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10001003,
|
"id": 10001003,
|
||||||
@ -102,8 +106,9 @@
|
|||||||
"text": "困难"
|
"text": "困难"
|
||||||
},
|
},
|
||||||
"coefficient": 1.4,
|
"coefficient": 1.4,
|
||||||
"unlock": 102,
|
"unlock": 103,
|
||||||
"unlockval": 2000,
|
"unlockval": 2000,
|
||||||
|
"unlockval2": 2,
|
||||||
"name": {
|
"name": {
|
||||||
"key": "IntegralBoss_Integralboss_name_3",
|
"key": "IntegralBoss_Integralboss_name_3",
|
||||||
"text": "火龙"
|
"text": "火龙"
|
||||||
@ -139,7 +144,8 @@
|
|||||||
],
|
],
|
||||||
"bossIcon": "gl_img_55001",
|
"bossIcon": "gl_img_55001",
|
||||||
"back_png": "hl_img_bg",
|
"back_png": "hl_img_bg",
|
||||||
"recommendlv": 40
|
"recommendlv": 40,
|
||||||
|
"spbuff": 310001001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10001004,
|
"id": 10001004,
|
||||||
@ -151,8 +157,9 @@
|
|||||||
"text": "精英"
|
"text": "精英"
|
||||||
},
|
},
|
||||||
"coefficient": 1.6,
|
"coefficient": 1.6,
|
||||||
"unlock": 102,
|
"unlock": 103,
|
||||||
"unlockval": 3000,
|
"unlockval": 3000,
|
||||||
|
"unlockval2": 4,
|
||||||
"name": {
|
"name": {
|
||||||
"key": "IntegralBoss_Integralboss_name_4",
|
"key": "IntegralBoss_Integralboss_name_4",
|
||||||
"text": "火龙"
|
"text": "火龙"
|
||||||
@ -183,7 +190,8 @@
|
|||||||
],
|
],
|
||||||
"bossIcon": "gl_img_55001",
|
"bossIcon": "gl_img_55001",
|
||||||
"back_png": "hl_img_bg",
|
"back_png": "hl_img_bg",
|
||||||
"recommendlv": 50
|
"recommendlv": 50,
|
||||||
|
"spbuff": 310001001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10001005,
|
"id": 10001005,
|
||||||
@ -195,8 +203,9 @@
|
|||||||
"text": "地狱"
|
"text": "地狱"
|
||||||
},
|
},
|
||||||
"coefficient": 1.8,
|
"coefficient": 1.8,
|
||||||
"unlock": 102,
|
"unlock": 103,
|
||||||
"unlockval": 4000,
|
"unlockval": 4000,
|
||||||
|
"unlockval2": 4,
|
||||||
"name": {
|
"name": {
|
||||||
"key": "IntegralBoss_Integralboss_name_5",
|
"key": "IntegralBoss_Integralboss_name_5",
|
||||||
"text": "火龙"
|
"text": "火龙"
|
||||||
@ -232,7 +241,8 @@
|
|||||||
],
|
],
|
||||||
"bossIcon": "gl_img_55001",
|
"bossIcon": "gl_img_55001",
|
||||||
"back_png": "hl_img_bg",
|
"back_png": "hl_img_bg",
|
||||||
"recommendlv": 60
|
"recommendlv": 60,
|
||||||
|
"spbuff": 310001001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10001006,
|
"id": 10001006,
|
||||||
@ -244,8 +254,9 @@
|
|||||||
"text": "噩梦"
|
"text": "噩梦"
|
||||||
},
|
},
|
||||||
"coefficient": 2,
|
"coefficient": 2,
|
||||||
"unlock": 102,
|
"unlock": 103,
|
||||||
"unlockval": 5000,
|
"unlockval": 5000,
|
||||||
|
"unlockval2": 4,
|
||||||
"name": {
|
"name": {
|
||||||
"key": "IntegralBoss_Integralboss_name_6",
|
"key": "IntegralBoss_Integralboss_name_6",
|
||||||
"text": "火龙"
|
"text": "火龙"
|
||||||
@ -276,7 +287,8 @@
|
|||||||
],
|
],
|
||||||
"bossIcon": "gl_img_55001",
|
"bossIcon": "gl_img_55001",
|
||||||
"back_png": "hl_img_bg",
|
"back_png": "hl_img_bg",
|
||||||
"recommendlv": 60
|
"recommendlv": 60,
|
||||||
|
"spbuff": 310001001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 20001001,
|
"id": 20001001,
|
||||||
@ -290,6 +302,7 @@
|
|||||||
"coefficient": 1,
|
"coefficient": 1,
|
||||||
"unlock": 101,
|
"unlock": 101,
|
||||||
"unlockval": 0,
|
"unlockval": 0,
|
||||||
|
"unlockval2": 0,
|
||||||
"name": {
|
"name": {
|
||||||
"key": "IntegralBoss_Integralboss_name_7",
|
"key": "IntegralBoss_Integralboss_name_7",
|
||||||
"text": "火龙"
|
"text": "火龙"
|
||||||
@ -320,6 +333,7 @@
|
|||||||
],
|
],
|
||||||
"bossIcon": "gl_img_55001",
|
"bossIcon": "gl_img_55001",
|
||||||
"back_png": "hl_img_bg",
|
"back_png": "hl_img_bg",
|
||||||
"recommendlv": 60
|
"recommendlv": 60,
|
||||||
|
"spbuff": 310001001
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -3,180 +3,170 @@
|
|||||||
"id": 1001,
|
"id": 1001,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_01",
|
"key": "IntegralBoss_Integralcondition_condition_01",
|
||||||
"text": "完成俱乐部任务3次"
|
"text": "消耗3000钻石"
|
||||||
},
|
},
|
||||||
"TaskId": 17100001,
|
"TaskId": 17100001,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001001
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_01",
|
"key": "IntegralBoss_Integralcondition_des_01",
|
||||||
"text": "[敌方]暴击伤害降低10%"
|
"text": "[敌方]暴击伤害降低10%"
|
||||||
},
|
}
|
||||||
"skillid": 310001001
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1002,
|
"id": 1002,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_02",
|
"key": "IntegralBoss_Integralcondition_condition_02",
|
||||||
"text": "累计消费3000钻石"
|
"text": "进行30次召唤"
|
||||||
},
|
},
|
||||||
"TaskId": 17100002,
|
"TaskId": 17100002,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001002
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_02",
|
"key": "IntegralBoss_Integralcondition_des_02",
|
||||||
"text": "[敌方]防御降低10%"
|
"text": "[敌方]防御降低10%"
|
||||||
},
|
}
|
||||||
"skillid": 310001002
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1003,
|
"id": 1003,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_03",
|
"key": "IntegralBoss_Integralcondition_condition_03",
|
||||||
"text": "传承者达到20级"
|
"text": "赠送10次友情点"
|
||||||
},
|
},
|
||||||
"TaskId": 17100003,
|
"TaskId": 17100003,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001003
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_03",
|
"key": "IntegralBoss_Integralcondition_des_03",
|
||||||
"text": "[敌方]攻击降低10%"
|
"text": "[敌方]攻击降低10%"
|
||||||
},
|
}
|
||||||
"skillid": 310001003
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1004,
|
"id": 1004,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_04",
|
"key": "IntegralBoss_Integralcondition_condition_04",
|
||||||
"text": "累计召唤20次守护者"
|
"text": "竞技场挑战10次"
|
||||||
},
|
},
|
||||||
"TaskId": 17100004,
|
"TaskId": 17100004,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001004
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_04",
|
"key": "IntegralBoss_Integralcondition_des_04",
|
||||||
"text": "[敌方]速度降低10%"
|
"text": "[敌方]速度降低10%"
|
||||||
},
|
}
|
||||||
"skillid": 310001004
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1005,
|
"id": 1005,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_05",
|
"key": "IntegralBoss_Integralcondition_condition_05",
|
||||||
"text": "完成5个日常任务"
|
"text": "在商店购物3次"
|
||||||
},
|
},
|
||||||
"TaskId": 17100005,
|
"TaskId": 17100005,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001005
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_05",
|
"key": "IntegralBoss_Integralcondition_des_05",
|
||||||
"text": "[敌方]命中降低10%"
|
"text": "[敌方]命中降低10%"
|
||||||
},
|
}
|
||||||
"skillid": 310001005
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1006,
|
"id": 1006,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_06",
|
"key": "IntegralBoss_Integralcondition_condition_06",
|
||||||
"text": "在任意商店购买5次商品"
|
"text": "完成5次俱乐部任务"
|
||||||
},
|
},
|
||||||
"TaskId": 17100006,
|
"TaskId": 17100006,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001006
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_06",
|
"key": "IntegralBoss_Integralcondition_des_06",
|
||||||
"text": "[敌方]暴击降低10%"
|
"text": "[敌方]暴击降低10%"
|
||||||
},
|
}
|
||||||
"skillid": 310001006
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1007,
|
"id": 1007,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_07",
|
"key": "IntegralBoss_Integralcondition_condition_07",
|
||||||
"text": "进行10次竞技挑战"
|
"text": "拍照1次"
|
||||||
},
|
},
|
||||||
"TaskId": 17100007,
|
"TaskId": 17100007,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001007
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_07",
|
"key": "IntegralBoss_Integralcondition_des_07",
|
||||||
"text": "[敌方]受到增益效果持续回合数-1"
|
"text": "[敌方]受到增益效果持续回合数-1"
|
||||||
},
|
}
|
||||||
"skillid": 310001007
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1008,
|
"id": 1008,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_08",
|
"key": "IntegralBoss_Integralcondition_condition_08",
|
||||||
"text": "参加3次捕羊大赛"
|
"text": "制作食物1次"
|
||||||
},
|
},
|
||||||
"TaskId": 17100008,
|
"TaskId": 17100008,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001008
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_08",
|
"key": "IntegralBoss_Integralcondition_des_08",
|
||||||
"text": "[敌方]所有减益效果持续回合数+1"
|
"text": "[敌方]所有减益效果持续回合数+1"
|
||||||
},
|
}
|
||||||
"skillid": 310001008
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1009,
|
"id": 1009,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_09",
|
"key": "IntegralBoss_Integralcondition_condition_09",
|
||||||
"text": "辉月等级达到3级"
|
"text": "修炼塔挑战3次"
|
||||||
},
|
},
|
||||||
"TaskId": 17100009,
|
"TaskId": 17100009,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001009
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_09",
|
"key": "IntegralBoss_Integralcondition_des_09",
|
||||||
"text": "[敌方]受到持续伤害增加50%"
|
"text": "[敌方]受到持续伤害增加50%"
|
||||||
},
|
}
|
||||||
"skillid": 310001009
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 1010,
|
"id": 1010,
|
||||||
"condition": {
|
"condition": {
|
||||||
"key": "IntegralBoss_Integralcondition_condition_10",
|
"key": "IntegralBoss_Integralcondition_condition_10",
|
||||||
"text": "完成3次每日一练"
|
"text": "任意守护者升级1次"
|
||||||
},
|
},
|
||||||
"TaskId": 17100010,
|
"TaskId": 17100010,
|
||||||
"iType": 1,
|
"iType": 1,
|
||||||
"jumpto": 150,
|
"jumpto": 150,
|
||||||
|
"skillid": [
|
||||||
|
310001010
|
||||||
|
],
|
||||||
"des": {
|
"des": {
|
||||||
"key": "IntegralBoss_Integralcondition_des_10",
|
"key": "IntegralBoss_Integralcondition_des_10",
|
||||||
"text": "[敌方]无法触发会心"
|
"text": "[敌方]无法触发会心"
|
||||||
},
|
}
|
||||||
"skillid": 310001010
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 1011,
|
|
||||||
"condition": {
|
|
||||||
"key": "IntegralBoss_Integralcondition_condition_11",
|
|
||||||
"text": "上阵2个属性为感官之林的继承者"
|
|
||||||
},
|
|
||||||
"TaskId": 0,
|
|
||||||
"iType": 2,
|
|
||||||
"jumpto": 150,
|
|
||||||
"des": {
|
|
||||||
"key": "IntegralBoss_Integralcondition_des_11",
|
|
||||||
"text": "[敌方]所有技能冷却回合+1"
|
|
||||||
},
|
|
||||||
"skillid": 310001011
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": 1012,
|
|
||||||
"condition": {
|
|
||||||
"key": "IntegralBoss_Integralcondition_condition_12",
|
|
||||||
"text": "上阵1名攻击型守护者"
|
|
||||||
},
|
|
||||||
"TaskId": 0,
|
|
||||||
"iType": 2,
|
|
||||||
"jumpto": 150,
|
|
||||||
"des": {
|
|
||||||
"key": "IntegralBoss_Integralcondition_des_12",
|
|
||||||
"text": "[敌方]身上每有一个减益效果受到伤害增加5%"
|
|
||||||
},
|
|
||||||
"skillid": 310001012
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
File diff suppressed because it is too large
Load Diff
@ -98,7 +98,7 @@
|
|||||||
},
|
},
|
||||||
"describe": {
|
"describe": {
|
||||||
"key": "mainchapter_main_chapter_describe_2",
|
"key": "mainchapter_main_chapter_describe_2",
|
||||||
"text": "获得小伊"
|
"text": "探索原始人聚集地，完成拼图。每一块拼图完成都有神秘奖励！拼图集齐后可以获得小伊！"
|
||||||
},
|
},
|
||||||
"achunlock": 11002004,
|
"achunlock": 11002004,
|
||||||
"venturecurrency": [
|
"venturecurrency": [
|
||||||
@ -138,12 +138,12 @@
|
|||||||
"id": 11003,
|
"id": 11003,
|
||||||
"reward": {
|
"reward": {
|
||||||
"a": "hero",
|
"a": "hero",
|
||||||
"t": "44005",
|
"t": "44001",
|
||||||
"n": 1
|
"n": 1
|
||||||
},
|
},
|
||||||
"describe": {
|
"describe": {
|
||||||
"key": "mainchapter_main_chapter_describe_3",
|
"key": "mainchapter_main_chapter_describe_3",
|
||||||
"text": "获得小伊"
|
"text": "探索罪恶都市，完成拼图。每一块拼图完成都有神秘奖励！拼图集齐后可以获得美肚鲨！"
|
||||||
},
|
},
|
||||||
"achunlock": 11001001,
|
"achunlock": 11001001,
|
||||||
"venturecurrency": [
|
"venturecurrency": [
|
||||||
@ -188,7 +188,7 @@
|
|||||||
},
|
},
|
||||||
"describe": {
|
"describe": {
|
||||||
"key": "mainchapter_main_chapter_describe_4",
|
"key": "mainchapter_main_chapter_describe_4",
|
||||||
"text": "获得小伊"
|
"text": "探索精灵王国，完成拼图。每一块拼图完成都有神秘奖励！拼图集齐后可以获得穿靴子的猫！"
|
||||||
},
|
},
|
||||||
"achunlock": 11001001,
|
"achunlock": 11001001,
|
||||||
"venturecurrency": [
|
"venturecurrency": [
|
||||||
|
|||||||
@ -40894,7 +40894,10 @@
|
|||||||
},
|
},
|
||||||
"venturetype": 0,
|
"venturetype": 0,
|
||||||
"ventureavatar": [],
|
"ventureavatar": [],
|
||||||
"scene_effect": [],
|
"scene_effect": [
|
||||||
|
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab",
|
||||||
|
"xiaxue"
|
||||||
|
],
|
||||||
"scene_effectfilter": "",
|
"scene_effectfilter": "",
|
||||||
"is_near": false,
|
"is_near": false,
|
||||||
"openlevel": 1,
|
"openlevel": 1,
|
||||||
@ -40977,7 +40980,10 @@
|
|||||||
"ventureavatar": [
|
"ventureavatar": [
|
||||||
"sbkp_js_35002"
|
"sbkp_js_35002"
|
||||||
],
|
],
|
||||||
"scene_effect": [],
|
"scene_effect": [
|
||||||
|
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab",
|
||||||
|
"xiaxue"
|
||||||
|
],
|
||||||
"scene_effectfilter": "",
|
"scene_effectfilter": "",
|
||||||
"is_near": false,
|
"is_near": false,
|
||||||
"openlevel": 1,
|
"openlevel": 1,
|
||||||
@ -41094,7 +41100,10 @@
|
|||||||
},
|
},
|
||||||
"venturetype": 0,
|
"venturetype": 0,
|
||||||
"ventureavatar": [],
|
"ventureavatar": [],
|
||||||
"scene_effect": [],
|
"scene_effect": [
|
||||||
|
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab",
|
||||||
|
"xiaxue"
|
||||||
|
],
|
||||||
"scene_effectfilter": "",
|
"scene_effectfilter": "",
|
||||||
"is_near": false,
|
"is_near": false,
|
||||||
"openlevel": 1,
|
"openlevel": 1,
|
||||||
@ -41175,7 +41184,10 @@
|
|||||||
},
|
},
|
||||||
"venturetype": 0,
|
"venturetype": 0,
|
||||||
"ventureavatar": [],
|
"ventureavatar": [],
|
||||||
"scene_effect": [],
|
"scene_effect": [
|
||||||
|
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab",
|
||||||
|
"xiaxue"
|
||||||
|
],
|
||||||
"scene_effectfilter": "",
|
"scene_effectfilter": "",
|
||||||
"is_near": false,
|
"is_near": false,
|
||||||
"openlevel": 1,
|
"openlevel": 1,
|
||||||
@ -41256,7 +41268,10 @@
|
|||||||
},
|
},
|
||||||
"venturetype": 0,
|
"venturetype": 0,
|
||||||
"ventureavatar": [],
|
"ventureavatar": [],
|
||||||
"scene_effect": [],
|
"scene_effect": [
|
||||||
|
"Effect/Scene/scenes_chapter_05/effect_scenes_chapter_05_shotsnow_01.prefab",
|
||||||
|
"xiaxue"
|
||||||
|
],
|
||||||
"scene_effectfilter": "",
|
"scene_effectfilter": "",
|
||||||
"is_near": false,
|
"is_near": false,
|
||||||
"openlevel": 1,
|
"openlevel": 1,
|
||||||
|
|||||||
@ -150,9 +150,11 @@
|
|||||||
"pos": 2,
|
"pos": 2,
|
||||||
"venturetext": {
|
"venturetext": {
|
||||||
"key": "mainchapter_main_venture_venturetext_15",
|
"key": "mainchapter_main_venture_venturetext_15",
|
||||||
"text": "塔防玩法"
|
"text": "扑克对决"
|
||||||
},
|
},
|
||||||
"jumpidList": []
|
"jumpidList": [
|
||||||
|
10061
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"chapterid": 11003,
|
"chapterid": 11003,
|
||||||
@ -197,18 +199,22 @@
|
|||||||
"pos": 1,
|
"pos": 1,
|
||||||
"venturetext": {
|
"venturetext": {
|
||||||
"key": "mainchapter_main_venture_venturetext_20",
|
"key": "mainchapter_main_venture_venturetext_20",
|
||||||
"text": "暂定玩法"
|
"text": "与驴同行"
|
||||||
},
|
},
|
||||||
"jumpidList": []
|
"jumpidList": [
|
||||||
|
10070
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"chapterid": 11004,
|
"chapterid": 11004,
|
||||||
"pos": 2,
|
"pos": 2,
|
||||||
"venturetext": {
|
"venturetext": {
|
||||||
"key": "mainchapter_main_venture_venturetext_21",
|
"key": "mainchapter_main_venture_venturetext_21",
|
||||||
"text": "暂定玩法"
|
"text": "胜者为王"
|
||||||
},
|
},
|
||||||
"jumpidList": []
|
"jumpidList": [
|
||||||
|
10073
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"chapterid": 11004,
|
"chapterid": 11004,
|
||||||
|
|||||||
@ -3612,7 +3612,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 1.5,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3632,7 +3632,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 1.5,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3652,7 +3652,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 1.5,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3672,7 +3672,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 1.5,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3692,7 +3692,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 1.5,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3713,7 +3713,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 1,
|
"hppro": 1,
|
||||||
"atkpro": 2,
|
"atkpro": 4,
|
||||||
"defpro": 1.5,
|
"defpro": 1.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3733,7 +3733,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 1,
|
"hppro": 1,
|
||||||
"atkpro": 2,
|
"atkpro": 4,
|
||||||
"defpro": 1.5,
|
"defpro": 1.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3753,7 +3753,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 1,
|
"hppro": 1,
|
||||||
"atkpro": 2,
|
"atkpro": 4,
|
||||||
"defpro": 1.5,
|
"defpro": 1.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3773,7 +3773,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 1,
|
"hppro": 1,
|
||||||
"atkpro": 2,
|
"atkpro": 4,
|
||||||
"defpro": 1.5,
|
"defpro": 1.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3793,7 +3793,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 1,
|
"hppro": 1,
|
||||||
"atkpro": 2,
|
"atkpro": 4,
|
||||||
"defpro": 1.5,
|
"defpro": 1.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3812,7 +3812,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2.2,
|
"hppro": 1.65,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3832,7 +3832,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2.2,
|
"hppro": 1.65,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3852,7 +3852,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2.2,
|
"hppro": 1.65,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3872,7 +3872,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2.2,
|
"hppro": 1.65,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3892,7 +3892,7 @@
|
|||||||
"equip": [],
|
"equip": [],
|
||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2.2,
|
"hppro": 1.65,
|
||||||
"atkpro": 3,
|
"atkpro": 3,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
@ -3913,7 +3913,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3933,7 +3933,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3953,7 +3953,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3973,7 +3973,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -3993,7 +3993,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4113,7 +4113,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4133,7 +4133,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4153,7 +4153,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4173,7 +4173,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4193,7 +4193,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4313,7 +4313,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4333,7 +4333,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4353,7 +4353,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4373,7 +4373,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4393,7 +4393,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4513,7 +4513,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4533,7 +4533,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4553,7 +4553,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4573,7 +4573,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4593,7 +4593,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4713,7 +4713,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4733,7 +4733,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4753,7 +4753,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4773,7 +4773,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4793,7 +4793,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4913,7 +4913,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4933,7 +4933,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4953,7 +4953,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4973,7 +4973,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
@ -4993,7 +4993,7 @@
|
|||||||
"newskill": [],
|
"newskill": [],
|
||||||
"lv": 60,
|
"lv": 60,
|
||||||
"hppro": 2,
|
"hppro": 2,
|
||||||
"atkpro": 3,
|
"atkpro": 4,
|
||||||
"defpro": 0.5,
|
"defpro": 0.5,
|
||||||
"skill1": 1,
|
"skill1": 1,
|
||||||
"skill2": 1,
|
"skill2": 1,
|
||||||
|
|||||||
@ -2981,5 +2981,30 @@
|
|||||||
"key": "opencond_opencond_kqbx_text_115",
|
"key": "opencond_opencond_kqbx_text_115",
|
||||||
"text": "获取途径功能开启"
|
"text": "获取途径功能开启"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "guildjoin",
|
||||||
|
"name": {
|
||||||
|
"key": "opencond_opencond_name_115",
|
||||||
|
"text": "是否加入工会"
|
||||||
|
},
|
||||||
|
"opencondi": [
|
||||||
|
12070430
|
||||||
|
],
|
||||||
|
"wkqbx": 2,
|
||||||
|
"img": "",
|
||||||
|
"prompt": {
|
||||||
|
"key": "",
|
||||||
|
"text": ""
|
||||||
|
},
|
||||||
|
"uiid": 0,
|
||||||
|
"activateType": false,
|
||||||
|
"notify": [],
|
||||||
|
"kqbx": false,
|
||||||
|
"kqbx_ui": "",
|
||||||
|
"kqbx_text": {
|
||||||
|
"key": "opencond_opencond_kqbx_text_115",
|
||||||
|
"text": "是否加入工会功能开启"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -7117,7 +7117,7 @@
|
|||||||
"passSkill": [],
|
"passSkill": [],
|
||||||
"Desc": {
|
"Desc": {
|
||||||
"key": "skill_skill_atk_Desc_114003111_1",
|
"key": "skill_skill_atk_Desc_114003111_1",
|
||||||
"text": "攻击1个敌方2次，每次伤害为自身攻击力160%，50%概率降低目标30%行动值，每点速度提供攻击力0.33%额外伤害。"
|
"text": "攻击1个敌方2次，每次伤害为自身攻击力160%，50%概率降低目标30%行动值，每点速度提供攻击力1%额外伤害。"
|
||||||
},
|
},
|
||||||
"buffid": [],
|
"buffid": [],
|
||||||
"map": ""
|
"map": ""
|
||||||
@ -7271,7 +7271,7 @@
|
|||||||
"IsMelee": 1,
|
"IsMelee": 1,
|
||||||
"act": "Skill_2",
|
"act": "Skill_2",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"CD": 4,
|
"CD": 3,
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Target": 2,
|
"Target": 2,
|
||||||
"ChildSkill": {
|
"ChildSkill": {
|
||||||
@ -7285,7 +7285,7 @@
|
|||||||
],
|
],
|
||||||
"Desc": {
|
"Desc": {
|
||||||
"key": "skill_skill_atk_Desc_114003211_1",
|
"key": "skill_skill_atk_Desc_114003211_1",
|
||||||
"text": "攻击1个敌方2次，每次伤害为自身攻击225%，80%概率为目标附加2回合[color=#e5621b]速度下降[/color]。每点速度提供攻击力0.33%额外伤害。触发暴击时对自身附加2回合[color=#37d8a9]速度提升[/color]状态。"
|
"text": "攻击1个敌方2次，每次伤害为自身攻击225%，80%概率为目标附加2回合[color=#e5621b]速度下降[/color]。每点速度提供攻击力1%额外伤害。触发暴击时对自身附加2回合[color=#37d8a9]速度提升[/color]状态。"
|
||||||
},
|
},
|
||||||
"buffid": [
|
"buffid": [
|
||||||
390001008,
|
390001008,
|
||||||
@ -7310,7 +7310,7 @@
|
|||||||
"IsMelee": 1,
|
"IsMelee": 1,
|
||||||
"act": "Skill_2",
|
"act": "Skill_2",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"CD": 4,
|
"CD": 3,
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Target": 2,
|
"Target": 2,
|
||||||
"ChildSkill": {
|
"ChildSkill": {
|
||||||
@ -7349,7 +7349,7 @@
|
|||||||
"IsMelee": 1,
|
"IsMelee": 1,
|
||||||
"act": "Skill_2",
|
"act": "Skill_2",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"CD": 4,
|
"CD": 3,
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Target": 2,
|
"Target": 2,
|
||||||
"ChildSkill": {
|
"ChildSkill": {
|
||||||
@ -7388,7 +7388,7 @@
|
|||||||
"IsMelee": 1,
|
"IsMelee": 1,
|
||||||
"act": "Skill_2",
|
"act": "Skill_2",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"CD": 4,
|
"CD": 3,
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Target": 2,
|
"Target": 2,
|
||||||
"ChildSkill": {
|
"ChildSkill": {
|
||||||
@ -7427,7 +7427,7 @@
|
|||||||
"IsMelee": 1,
|
"IsMelee": 1,
|
||||||
"act": "Skill_2",
|
"act": "Skill_2",
|
||||||
"Type": 1,
|
"Type": 1,
|
||||||
"CD": 3,
|
"CD": 2,
|
||||||
"Where": [],
|
"Where": [],
|
||||||
"Target": 2,
|
"Target": 2,
|
||||||
"ChildSkill": {
|
"ChildSkill": {
|
||||||
@ -7477,7 +7477,7 @@
|
|||||||
"passSkill": [],
|
"passSkill": [],
|
||||||
"Desc": {
|
"Desc": {
|
||||||
"key": "skill_skill_atk_Desc_114003311_1",
|
"key": "skill_skill_atk_Desc_114003311_1",
|
||||||
"text": "攻击全体敌方3次，每次伤害为自身攻击力200%，每次有40%概率降低目标30%行动值。每点速度提供攻击力0.33%额外伤害。"
|
"text": "攻击全体敌方3次，每次伤害为自身攻击力200%，每次有40%概率降低目标30%行动值。每点速度提供攻击力1%额外伤害。"
|
||||||
},
|
},
|
||||||
"buffid": [],
|
"buffid": [],
|
||||||
"map": ""
|
"map": ""
|
||||||
|
|||||||
@ -91,12 +91,162 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 100010,
|
"id": 100010,
|
||||||
"talkhero": "44013",
|
"talkhero": "44012",
|
||||||
"talktext": {
|
"talktext": {
|
||||||
"key": "systemnotice_chattext_talktext_10",
|
"key": "systemnotice_chattext_talktext_10",
|
||||||
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
},
|
},
|
||||||
"delay": 509,
|
"delay": 509,
|
||||||
"jumpid": 10010
|
"jumpid": 10010
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100011,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_11",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 510,
|
||||||
|
"jumpid": 10011
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100012,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_12",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 511,
|
||||||
|
"jumpid": 10012
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100013,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_13",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 512,
|
||||||
|
"jumpid": 10013
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100014,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_14",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 513,
|
||||||
|
"jumpid": 10014
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100015,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_15",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 514,
|
||||||
|
"jumpid": 10015
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100016,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_16",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 515,
|
||||||
|
"jumpid": 10016
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100017,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_17",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 516,
|
||||||
|
"jumpid": 10017
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100018,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_18",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 517,
|
||||||
|
"jumpid": 10018
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100019,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_19",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 518,
|
||||||
|
"jumpid": 10019
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100020,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_20",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 519,
|
||||||
|
"jumpid": 10020
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100021,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_21",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 520,
|
||||||
|
"jumpid": 10021
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100022,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_22",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 521,
|
||||||
|
"jumpid": 10022
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100023,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_23",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 522,
|
||||||
|
"jumpid": 10023
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100024,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_24",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 523,
|
||||||
|
"jumpid": 10024
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 100025,
|
||||||
|
"talkhero": "44012",
|
||||||
|
"talktext": {
|
||||||
|
"key": "systemnotice_chattext_talktext_25",
|
||||||
|
"text": "木桩上的守护者锻炼好了！现在立马去领取吗？"
|
||||||
|
},
|
||||||
|
"delay": 524,
|
||||||
|
"jumpid": 10025
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -1,8 +1,8 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"id": 1,
|
"id": 1,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 1,
|
||||||
"systemtype": 1,
|
"systemtype": 1,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": [
|
"noticetext": [
|
||||||
@ -11,154 +11,192 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 2,
|
"id": 2,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 2,
|
||||||
"systemtype": 1,
|
"systemtype": 1,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100002
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 3,
|
"id": 3,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 3,
|
||||||
"systemtype": 1,
|
"systemtype": 1,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100003
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4,
|
"id": 4,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 4,
|
||||||
"systemtype": 1,
|
"systemtype": 1,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100004
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 5,
|
"id": 5,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 5,
|
||||||
"systemtype": 1,
|
"systemtype": 1,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100005
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 6,
|
"id": 6,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 6,
|
||||||
"systemtype": 1,
|
"systemtype": 1,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100006
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 7,
|
"id": 7,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 7,
|
||||||
"systemtype": 1,
|
"systemtype": 1,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100007
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 8,
|
"id": 8,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 8,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100008
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 9,
|
"id": 9,
|
||||||
"redid": 0,
|
"redid": 21101,
|
||||||
"priority": 0,
|
"priority": 9,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100009
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 10,
|
"id": 10,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 10,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100010
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 11,
|
"id": 11,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 11,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100011
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 12,
|
"id": 12,
|
||||||
"redid": 0,
|
"redid": 21101,
|
||||||
"priority": 0,
|
"priority": 12,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100012
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 13,
|
"id": 13,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 13,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100013
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 14,
|
"id": 14,
|
||||||
"redid": 0,
|
"redid": 21101,
|
||||||
"priority": 0,
|
"priority": 14,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100014
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 15,
|
"id": 15,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 15,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100015
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 16,
|
"id": 16,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 16,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100016
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 17,
|
"id": 17,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 17,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100017
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 18,
|
"id": 18,
|
||||||
"redid": 0,
|
"redid": 21101,
|
||||||
"priority": 0,
|
"priority": 18,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100018
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 19,
|
"id": 19,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 19,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100019
|
||||||
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 20,
|
"id": 20,
|
||||||
"redid": 0,
|
"redid": 12101,
|
||||||
"priority": 0,
|
"priority": 20,
|
||||||
"systemtype": 2,
|
"systemtype": 2,
|
||||||
"jumpid": 0,
|
"jumpid": 0,
|
||||||
"noticetext": []
|
"noticetext": [
|
||||||
|
100020
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -1,68 +1,79 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"id": 1,
|
"id": 1,
|
||||||
"opentime": 10000001,
|
"opentime": 18000007,
|
||||||
"groupid": 0,
|
"groupid": 1,
|
||||||
"herohead": "35002",
|
"herohead": "tx_js_25004",
|
||||||
"heroname": {
|
"heroname": {
|
||||||
"key": "heroname_1",
|
"key": "heroname_1",
|
||||||
"text": "飞龙在天群组"
|
"text": "飞龙在天群组"
|
||||||
},
|
},
|
||||||
"storytalk": 100001
|
"storytalk": 200150
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 2,
|
"id": 2,
|
||||||
"opentime": 10000002,
|
"opentime": 18000012,
|
||||||
"groupid": 0,
|
"groupid": 1,
|
||||||
"herohead": "35002",
|
"herohead": "tx_js_25004",
|
||||||
"heroname": {
|
"heroname": {
|
||||||
"key": "",
|
"key": "heroname_1",
|
||||||
"text": ""
|
"text": "飞龙在天群组"
|
||||||
},
|
},
|
||||||
"storytalk": 100002
|
"storytalk": 301031
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 3,
|
"id": 3,
|
||||||
"opentime": 10000003,
|
"opentime": 18000073,
|
||||||
"groupid": 0,
|
"groupid": 2,
|
||||||
"herohead": "35002",
|
"herohead": "tx_js_24008",
|
||||||
"heroname": {
|
"heroname": {
|
||||||
"key": "",
|
"key": "heroname_1",
|
||||||
"text": ""
|
"text": "飞龙在天群组"
|
||||||
},
|
},
|
||||||
"storytalk": 100003
|
"storytalk": 301011
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 4,
|
"id": 4,
|
||||||
"opentime": 10000004,
|
"opentime": 18000074,
|
||||||
"groupid": 0,
|
"groupid": 2,
|
||||||
"herohead": "35002",
|
"herohead": "tx_js_24008",
|
||||||
"heroname": {
|
"heroname": {
|
||||||
"key": "",
|
"key": "heroname_1",
|
||||||
"text": ""
|
"text": "飞龙在天群组"
|
||||||
},
|
},
|
||||||
"storytalk": 0
|
"storytalk": 301011
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 5,
|
"id": 5,
|
||||||
"opentime": 0,
|
"opentime": 18000092,
|
||||||
"groupid": 0,
|
"groupid": 3,
|
||||||
"herohead": "",
|
"herohead": "tx_js_24009",
|
||||||
"heroname": {
|
"heroname": {
|
||||||
"key": "",
|
"key": "heroname_1",
|
||||||
"text": ""
|
"text": "飞龙在天群组"
|
||||||
},
|
},
|
||||||
"storytalk": 0
|
"storytalk": 301012
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": 6,
|
"id": 6,
|
||||||
"opentime": 0,
|
"opentime": 18000093,
|
||||||
"groupid": 0,
|
"groupid": 4,
|
||||||
"herohead": "",
|
"herohead": "tx_js_25002",
|
||||||
"heroname": {
|
"heroname": {
|
||||||
"key": "",
|
"key": "heroname_1",
|
||||||
"text": ""
|
"text": "飞龙在天群组"
|
||||||
},
|
},
|
||||||
"storytalk": 0
|
"storytalk": 300964
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": 7,
|
||||||
|
"opentime": 18000094,
|
||||||
|
"groupid": 5,
|
||||||
|
"herohead": "tx_js_25003",
|
||||||
|
"heroname": {
|
||||||
|
"key": "heroname_1",
|
||||||
|
"text": "飞龙在天群组"
|
||||||
|
},
|
||||||
|
"storytalk": 300964
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -165,7 +165,7 @@ func (this *configureComp) GetIntegralConditionByKeys(ids []int32) (result []int
|
|||||||
if v, err := this.GetConfigure(game_integralcondition); err == nil {
|
if v, err := this.GetConfigure(game_integralcondition); err == nil {
|
||||||
if configure, ok := v.(*cfg.GameIntegralCondition); ok {
|
if configure, ok := v.(*cfg.GameIntegralCondition); ok {
|
||||||
for _, id := range ids {
|
for _, id := range ids {
|
||||||
result = append(result, configure.Get(id).Skillid)
|
result = append(result, configure.Get(id).Skillid...)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,6 +40,10 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe
|
|||||||
}
|
}
|
||||||
list.Landid = land.Id
|
list.Landid = land.Id
|
||||||
} else {
|
} else {
|
||||||
|
// 校验是否过期
|
||||||
|
if list.Etime > configure.Now().Unix() {
|
||||||
|
|
||||||
|
}
|
||||||
if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
|
if land, err = this.module.modelLand.getPlunderLandData(list.Landid); err != nil {
|
||||||
errdata = &pb.ErrorData{
|
errdata = &pb.ErrorData{
|
||||||
Code: pb.ErrorCode_DBError,
|
Code: pb.ErrorCode_DBError,
|
||||||
|
|||||||
@ -150,10 +150,11 @@ func (this *modelPlunder) queryPlunderInfos(uids []string, landid string) (data
|
|||||||
}
|
}
|
||||||
for _, v := range unfound {
|
for _, v := range unfound {
|
||||||
temp := &pb.DBPlunder{
|
temp := &pb.DBPlunder{
|
||||||
Id: primitive.NewObjectID().Hex(),
|
Id: primitive.NewObjectID().Hex(),
|
||||||
Uid: v,
|
Uid: v,
|
||||||
Ctime: configure.Now().Unix(),
|
Ctime: configure.Now().Unix(),
|
||||||
Landid: landid,
|
Landid: landid,
|
||||||
|
Develop: make(map[int32]int32),
|
||||||
}
|
}
|
||||||
|
|
||||||
for i := 0; i < 3; i++ { // 队列固定三条
|
for i := 0; i < 3; i++ { // 队列固定三条
|
||||||
|
|||||||
@ -900,6 +900,7 @@ type BattleInfo struct {
|
|||||||
Buleflist []*DBBattleFormt `protobuf:"bytes,9,rep,name=buleflist,proto3" json:"buleflist"` //红方阵型列表
|
Buleflist []*DBBattleFormt `protobuf:"bytes,9,rep,name=buleflist,proto3" json:"buleflist"` //红方阵型列表
|
||||||
Tasks []int32 `protobuf:"varint,10,rep,packed,name=tasks,proto3" json:"tasks"` //任务列表
|
Tasks []int32 `protobuf:"varint,10,rep,packed,name=tasks,proto3" json:"tasks"` //任务列表
|
||||||
Params []float32 `protobuf:"fixed32,11,rep,packed,name=params,proto3" json:"params"` //需要代入战斗中的参数列表
|
Params []float32 `protobuf:"fixed32,11,rep,packed,name=params,proto3" json:"params"` //需要代入战斗中的参数列表
|
||||||
|
Buffer []int32 `protobuf:"varint,12,rep,packed,name=buffer,proto3" json:"buffer"` // 战斗buff 带入
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *BattleInfo) Reset() {
|
func (x *BattleInfo) Reset() {
|
||||||
@ -1011,6 +1012,13 @@ func (x *BattleInfo) GetParams() []float32 {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *BattleInfo) GetBuffer() []int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Buffer
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
type BattleCmd struct {
|
type BattleCmd struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
@ -2312,7 +2320,7 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
|
|||||||
0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
|
0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
|
||||||
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
||||||
0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28,
|
0x12, 0x18, 0x0a, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28,
|
||||||
0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xd6, 0x02, 0x0a, 0x0a, 0x42,
|
0x05, 0x52, 0x07, 0x6d, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x22, 0xee, 0x02, 0x0a, 0x0a, 0x42,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
|
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
|
||||||
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
|
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74,
|
||||||
0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
|
0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12,
|
||||||
@ -2334,129 +2342,131 @@ var file_battle_battle_msg_proto_rawDesc = []byte{
|
|||||||
0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a,
|
0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0a,
|
||||||
0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70,
|
0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70,
|
||||||
0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x02, 0x52, 0x06, 0x70, 0x61, 0x72,
|
0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x02, 0x52, 0x06, 0x70, 0x61, 0x72,
|
||||||
0x61, 0x6d, 0x73, 0x22, 0x51, 0x0a, 0x09, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64,
|
0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x18, 0x0c, 0x20,
|
||||||
0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
|
0x03, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x65, 0x72, 0x22, 0x51, 0x0a, 0x09, 0x42,
|
||||||
0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e,
|
0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6d, 0x64, 0x74,
|
||||||
0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78,
|
0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79,
|
||||||
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52,
|
0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xca, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||||
0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
|
0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xca,
|
||||||
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
|
0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12,
|
||||||
0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74,
|
0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
|
||||||
0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74,
|
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
|
||||||
0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18,
|
0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01,
|
||||||
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20,
|
0x28, 0x05, 0x52, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07,
|
||||||
0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
|
0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77,
|
||||||
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64,
|
0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x18,
|
||||||
0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
|
0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d,
|
||||||
0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75,
|
0x64, 0x52, 0x05, 0x69, 0x6e, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x06, 0x6f, 0x75, 0x74, 0x63,
|
||||||
0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
|
0x6d, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||||
0x74, 0x61, 0x73, 0x6b, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70,
|
0x65, 0x43, 0x6d, 0x64, 0x52, 0x06, 0x6f, 0x75, 0x74, 0x63, 0x6d, 0x64, 0x12, 0x22, 0x0a, 0x0c,
|
||||||
0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74,
|
0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x18, 0x06, 0x20, 0x03,
|
||||||
0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14,
|
0x28, 0x05, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b,
|
||||||
0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72,
|
0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
|
||||||
0x6f, 0x75, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20,
|
0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72,
|
0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05,
|
||||||
0x61, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65,
|
0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f,
|
||||||
0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28,
|
||||||
0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c,
|
0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x76,
|
||||||
0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63,
|
0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||||
0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01,
|
0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, 0x66, 0x0a, 0x10, 0x42,
|
||||||
0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74,
|
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12,
|
||||||
0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f,
|
0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x03, 0x72, 0x69,
|
||||||
0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
|
0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74,
|
||||||
0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42,
|
0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
|
0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64,
|
||||||
0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01,
|
0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65,
|
||||||
0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2f, 0x0a, 0x0c, 0x42,
|
0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69,
|
0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x63, 0x68,
|
||||||
0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74,
|
0x65, 0x63, 0x6b, 0x22, 0x2f, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e,
|
||||||
0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x0d,
|
0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||||
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a,
|
0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04,
|
||||||
0x07, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d,
|
0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75,
|
||||||
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x07, 0x72,
|
0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73,
|
||||||
0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52,
|
||||||
0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
|
0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x07, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x22, 0x2e,
|
||||||
0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
|
0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||||
0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
|
||||||
0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62,
|
0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
|
0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
|
0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
|
||||||
0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
|
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12,
|
||||||
0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a,
|
0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e,
|
||||||
0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72,
|
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
|
||||||
0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01,
|
0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43,
|
||||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66,
|
0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f,
|
||||||
0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42,
|
||||||
0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73,
|
0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22,
|
||||||
0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28,
|
0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53,
|
||||||
0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74,
|
0x65, 0x72, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
|
||||||
0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62,
|
0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62,
|
0x63, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64,
|
||||||
0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18,
|
0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18,
|
||||||
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69,
|
0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12,
|
||||||
0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73,
|
||||||
0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
||||||
0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61,
|
0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22,
|
||||||
0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61,
|
0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65,
|
||||||
0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01,
|
0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01,
|
||||||
0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02,
|
0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1a,
|
||||||
0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01,
|
0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74,
|
||||||
0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61,
|
0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73,
|
||||||
0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a,
|
0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75,
|
||||||
0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43,
|
||||||
0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d,
|
0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||||
0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
|
||||||
0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74,
|
|
||||||
0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08,
|
|
||||||
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
|
|
||||||
0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53,
|
|
||||||
0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69,
|
|
||||||
0x64, 0x65, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63,
|
|
||||||
0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
|
||||||
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||||
0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
|
0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||||
0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64,
|
||||||
0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
|
0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68,
|
||||||
0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
|
0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
|
||||||
0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74,
|
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64,
|
||||||
0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18,
|
0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||||
0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e,
|
0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61,
|
||||||
0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43,
|
0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a,
|
||||||
0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74,
|
0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
|
||||||
0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28,
|
0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69,
|
||||||
0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
|
0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b,
|
||||||
0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69,
|
0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52,
|
||||||
0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72,
|
0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20,
|
||||||
0x6f, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06,
|
0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x82, 0x01, 0x0a, 0x0f,
|
||||||
0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44,
|
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12,
|
||||||
0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75,
|
0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e,
|
||||||
0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03,
|
0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
|
||||||
0x28, 0x05, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f,
|
0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
|
||||||
0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f,
|
||||||
0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c,
|
0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43,
|
||||||
0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65,
|
0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74,
|
||||||
0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05,
|
0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73,
|
||||||
0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70,
|
0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e, 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c,
|
||||||
0x65, 0x52, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70,
|
0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x01,
|
||||||
0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79,
|
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61,
|
||||||
0x70, 0x65, 0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74,
|
0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f,
|
||||||
0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52,
|
0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d,
|
||||||
0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01,
|
0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
|
||||||
0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64,
|
0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72,
|
||||||
0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01,
|
0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04,
|
||||||
0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a,
|
||||||
0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18,
|
0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42,
|
||||||
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07,
|
0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65,
|
||||||
0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72,
|
0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32,
|
||||||
0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x50, 0x74, 0x79, 0x70,
|
||||||
0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46,
|
0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74,
|
||||||
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45,
|
||||||
0x12, 0x2e, 0x0a, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20,
|
0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65,
|
||||||
0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d,
|
0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a,
|
||||||
0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
|
0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50,
|
||||||
0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14,
|
||||||
|
0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74,
|
||||||
|
0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18,
|
||||||
|
0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x69, 0x64, 0x12, 0x28,
|
||||||
|
0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
|
||||||
|
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||||
|
0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x09, 0x64, 0x65, 0x66, 0x66,
|
||||||
|
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61,
|
||||||
|
0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64,
|
||||||
|
0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
|
||||||
|
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
@ -113,6 +113,7 @@ type IntegralChallengeReq struct {
|
|||||||
|
|
||||||
Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // boos 难度
|
Nandu int32 `protobuf:"varint,1,opt,name=nandu,proto3" json:"nandu"` // boos 难度
|
||||||
Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"`
|
Battle *BattleFormation `protobuf:"bytes,2,opt,name=battle,proto3" json:"battle"`
|
||||||
|
Buff []int32 `protobuf:"varint,3,rep,packed,name=buff,proto3" json:"buff"` // 传入的buff
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *IntegralChallengeReq) Reset() {
|
func (x *IntegralChallengeReq) Reset() {
|
||||||
@ -161,6 +162,13 @@ func (x *IntegralChallengeReq) GetBattle() *BattleFormation {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *IntegralChallengeReq) GetBuff() []int32 {
|
||||||
|
if x != nil {
|
||||||
|
return x.Buff
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
type IntegralChallengeResp struct {
|
type IntegralChallengeResp struct {
|
||||||
state protoimpl.MessageState
|
state protoimpl.MessageState
|
||||||
sizeCache protoimpl.SizeCache
|
sizeCache protoimpl.SizeCache
|
||||||
@ -555,56 +563,57 @@ var file_integral_integral_msg_proto_rawDesc = []byte{
|
|||||||
0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64,
|
0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64,
|
||||||
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e,
|
0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e,
|
||||||
0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
|
0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
|
||||||
0x22, 0x56, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c,
|
0x22, 0x6a, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c,
|
||||||
0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64,
|
0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64,
|
||||||
0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28,
|
0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x28,
|
||||||
0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
|
0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
|
||||||
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e,
|
||||||
0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x4e, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65,
|
0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x75, 0x66, 0x66,
|
||||||
0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73,
|
0x18, 0x03, 0x20, 0x03, 0x28, 0x05, 0x52, 0x04, 0x62, 0x75, 0x66, 0x66, 0x22, 0x4e, 0x0a, 0x15,
|
||||||
0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
|
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
|
||||||
0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e,
|
0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20,
|
||||||
0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28,
|
0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f,
|
||||||
0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x57, 0x0a, 0x18, 0x49, 0x6e, 0x74, 0x65,
|
0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18,
|
||||||
0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65,
|
0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x57, 0x0a, 0x18,
|
||||||
0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18, 0x01, 0x20,
|
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67,
|
||||||
0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65,
|
0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64,
|
||||||
0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74,
|
0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x12, 0x25,
|
||||||
0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72,
|
0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
|
||||||
0x74, 0x22, 0xde, 0x01, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43, 0x68,
|
0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72,
|
||||||
0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12,
|
0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0xde, 0x01, 0x0a, 0x19, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
|
||||||
0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e,
|
0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52,
|
||||||
0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04,
|
0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
|
||||||
0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x18, 0x02, 0x20, 0x03,
|
0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f,
|
||||||
0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61,
|
0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, 0x6f,
|
||||||
0x74, 0x6e, 0x6f, 0x12, 0x41, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x18, 0x03,
|
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e,
|
||||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x43,
|
0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x12, 0x41, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65,
|
||||||
0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70,
|
0x78, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x49, 0x6e, 0x74, 0x65, 0x67,
|
||||||
0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x68,
|
0x72, 0x61, 0x6c, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x4f, 0x76, 0x65, 0x72,
|
||||||
0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78,
|
0x52, 0x65, 0x73, 0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72,
|
||||||
0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
0x79, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x78, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x48, 0x65,
|
||||||
0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
0x72, 0x6f, 0x65, 0x78, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
|
||||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
|
||||||
0x38, 0x01, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65,
|
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
|
||||||
0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74,
|
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2c, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72,
|
||||||
0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65,
|
0x61, 0x6c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x14,
|
||||||
0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x47, 0x65, 0x74, 0x52,
|
0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69,
|
||||||
0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, 0x74,
|
0x74, 0x79, 0x70, 0x65, 0x22, 0x5d, 0x0a, 0x15, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
||||||
0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
|
0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a,
|
||||||
0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1f,
|
0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42,
|
||||||
0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e,
|
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x42, 0x6f, 0x73, 0x73, 0x52, 0x04, 0x64, 0x61,
|
||||||
0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22,
|
0x74, 0x61, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28,
|
||||||
0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c,
|
0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77,
|
||||||
0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x18,
|
0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52,
|
||||||
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75, 0x22, 0x68, 0x0a, 0x14,
|
0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61,
|
||||||
0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x4c, 0x69, 0x73, 0x74,
|
0x6e, 0x64, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x64, 0x75,
|
||||||
0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x18, 0x01, 0x20,
|
0x22, 0x68, 0x0a, 0x14, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b,
|
||||||
0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c,
|
0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x6b,
|
||||||
0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12, 0x29, 0x0a, 0x07, 0x66,
|
0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65,
|
||||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44,
|
0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x6b, 0x73, 0x12,
|
||||||
0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x07, 0x66,
|
0x29, 0x0a, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
|
||||||
0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06,
|
0x32, 0x0f, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x52, 0x61, 0x6e,
|
||||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x6b, 0x52, 0x07, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
|
||||||
|
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
|||||||
@ -36,6 +36,7 @@ type GameBattleReadyData struct {
|
|||||||
BlueAssistTeam int32
|
BlueAssistTeam int32
|
||||||
CanFriendHelp bool
|
CanFriendHelp bool
|
||||||
Numrounds int32
|
Numrounds int32
|
||||||
|
BossRounds int32
|
||||||
}
|
}
|
||||||
|
|
||||||
const TypeId_GameBattleReadyData = -266091495
|
const TypeId_GameBattleReadyData = -266091495
|
||||||
@ -174,6 +175,7 @@ func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err erro
|
|||||||
{ 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["BlueAssistTeam"].(float64); !_ok_ { err = errors.New("BlueAssistTeam error"); return }; _v.BlueAssistTeam = int32(_tempNum_) }
|
||||||
{ var _ok_ bool; if _v.CanFriendHelp, _ok_ = _buf["CanFriendHelp"].(bool); !_ok_ { err = errors.New("CanFriendHelp error"); return } }
|
{ 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_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Numrounds"].(float64); !_ok_ { err = errors.New("Numrounds error"); return }; _v.Numrounds = int32(_tempNum_) }
|
||||||
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BossRounds"].(float64); !_ok_ { err = errors.New("BossRounds error"); return }; _v.BossRounds = int32(_tempNum_) }
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -19,6 +19,7 @@ type GameIntegralBossData struct {
|
|||||||
Coefficient float32
|
Coefficient float32
|
||||||
Unlock int32
|
Unlock int32
|
||||||
Unlockval int32
|
Unlockval int32
|
||||||
|
Unlockval2 int32
|
||||||
Name string
|
Name string
|
||||||
Introduce string
|
Introduce string
|
||||||
BattleReadyID int32
|
BattleReadyID int32
|
||||||
@ -31,6 +32,7 @@ type GameIntegralBossData struct {
|
|||||||
BossIcon string
|
BossIcon string
|
||||||
BackPng string
|
BackPng string
|
||||||
Recommendlv int32
|
Recommendlv int32
|
||||||
|
Spbuff int32
|
||||||
}
|
}
|
||||||
|
|
||||||
const TypeId_GameIntegralBossData = 1191591167
|
const TypeId_GameIntegralBossData = 1191591167
|
||||||
@ -48,6 +50,7 @@ func (_v *GameIntegralBossData)Deserialize(_buf map[string]interface{}) (err err
|
|||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["coefficient"].(float64); !_ok_ { err = errors.New("coefficient error"); return }; _v.Coefficient = float32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["coefficient"].(float64); !_ok_ { err = errors.New("coefficient error"); return }; _v.Coefficient = float32(_tempNum_) }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockval"].(float64); !_ok_ { err = errors.New("unlockval error"); return }; _v.Unlockval = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockval"].(float64); !_ok_ { err = errors.New("unlockval error"); return }; _v.Unlockval = int32(_tempNum_) }
|
||||||
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlockval2"].(float64); !_ok_ { err = errors.New("unlockval2 error"); return }; _v.Unlockval2 = int32(_tempNum_) }
|
||||||
{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 } } }
|
{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 } } }
|
||||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _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["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) }
|
||||||
@ -86,6 +89,7 @@ func (_v *GameIntegralBossData)Deserialize(_buf map[string]interface{}) (err err
|
|||||||
{ var _ok_ bool; if _v.BossIcon, _ok_ = _buf["bossIcon"].(string); !_ok_ { err = errors.New("bossIcon error"); return } }
|
{ var _ok_ bool; if _v.BossIcon, _ok_ = _buf["bossIcon"].(string); !_ok_ { err = errors.New("bossIcon error"); return } }
|
||||||
{ var _ok_ bool; if _v.BackPng, _ok_ = _buf["back_png"].(string); !_ok_ { err = errors.New("back_png error"); return } }
|
{ var _ok_ bool; if _v.BackPng, _ok_ = _buf["back_png"].(string); !_ok_ { err = errors.New("back_png error"); return } }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recommendlv"].(float64); !_ok_ { err = errors.New("recommendlv error"); return }; _v.Recommendlv = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recommendlv"].(float64); !_ok_ { err = errors.New("recommendlv error"); return }; _v.Recommendlv = int32(_tempNum_) }
|
||||||
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["spbuff"].(float64); !_ok_ { err = errors.New("spbuff error"); return }; _v.Spbuff = int32(_tempNum_) }
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -16,8 +16,8 @@ type GameIntegralConditionData struct {
|
|||||||
TaskId int32
|
TaskId int32
|
||||||
IType int32
|
IType int32
|
||||||
Jumpto int32
|
Jumpto int32
|
||||||
|
Skillid []int32
|
||||||
Des string
|
Des string
|
||||||
Skillid int32
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const TypeId_GameIntegralConditionData = -198632419
|
const TypeId_GameIntegralConditionData = -198632419
|
||||||
@ -32,8 +32,21 @@ func (_v *GameIntegralConditionData)Deserialize(_buf map[string]interface{}) (er
|
|||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskId"].(float64); !_ok_ { err = errors.New("TaskId error"); return }; _v.TaskId = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["TaskId"].(float64); !_ok_ { err = errors.New("TaskId error"); return }; _v.TaskId = int32(_tempNum_) }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpto"].(float64); !_ok_ { err = errors.New("jumpto error"); return }; _v.Jumpto = int32(_tempNum_) }
|
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jumpto"].(float64); !_ok_ { err = errors.New("jumpto error"); return }; _v.Jumpto = int32(_tempNum_) }
|
||||||
|
{
|
||||||
|
var _arr_ []interface{}
|
||||||
|
var _ok_ bool
|
||||||
|
if _arr_, _ok_ = _buf["skillid"].([]interface{}); !_ok_ { err = errors.New("skillid error"); return }
|
||||||
|
|
||||||
|
_v.Skillid = make([]int32, 0, len(_arr_))
|
||||||
|
|
||||||
|
for _, _e_ := range _arr_ {
|
||||||
|
var _list_v_ int32
|
||||||
|
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
|
||||||
|
_v.Skillid = append(_v.Skillid, _list_v_)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["des"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Des error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Des, _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["des"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Des error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Des, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
|
||||||
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skillid"].(float64); !_ok_ { err = errors.New("skillid error"); return }; _v.Skillid = int32(_tempNum_) }
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user