diff --git a/bin/json/game_activereward.json b/bin/json/game_activereward.json
index fb555e24c..4174a8a5c 100644
--- a/bin/json/game_activereward.json
+++ b/bin/json/game_activereward.json
@@ -1,110 +1,34 @@
[
{
"key": 1,
- "id_tag": 1,
- "active": 20,
+ "id_tag": 2,
+ "active": 40,
"reword": [
{
"a": "attr",
"t": "diamond",
- "n": 5
+ "n": 10
}
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 1
},
{
"key": 2,
- "id_tag": 1,
- "active": 40,
+ "id_tag": 2,
+ "active": 80,
"reword": [
{
"a": "attr",
- "t": "gold",
- "n": 10000
+ "t": "diamond",
+ "n": 10
}
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 2
},
{
"key": 3,
- "id_tag": 1,
- "active": 60,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 4,
- "id_tag": 1,
- "active": 80,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 20000
- }
- ]
- },
- {
- "key": 5,
- "id_tag": 1,
- "active": 100,
- "reword": [
- {
- "a": "item",
- "t": "30001",
- "n": 1
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 50000
- }
- ]
- },
- {
- "key": 6,
- "id_tag": 2,
- "active": 40,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 25000
- }
- ]
- },
- {
- "key": 7,
- "id_tag": 2,
- "active": 80,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 25000
- }
- ]
- },
- {
- "key": 8,
"id_tag": 2,
"active": 120,
"reword": [
@@ -113,10 +37,12 @@
"t": "diamond",
"n": 20
}
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 3
},
{
- "key": 9,
+ "key": 4,
"id_tag": 2,
"active": 160,
"reword": [
@@ -124,29 +50,9 @@
"a": "attr",
"t": "diamond",
"n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 75000
}
- ]
- },
- {
- "key": 10,
- "id_tag": 2,
- "active": 200,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 4
}
]
\ No newline at end of file
diff --git a/bin/json/game_buzkashiopen.json b/bin/json/game_buzkashiopen.json
new file mode 100644
index 000000000..f005ec1ee
--- /dev/null
+++ b/bin/json/game_buzkashiopen.json
@@ -0,0 +1,122 @@
+[
+ {
+ "num": 1,
+ "stime": "1899/12/31 0:30:00",
+ "etime": "1899/12/31 0:50:00"
+ },
+ {
+ "num": 2,
+ "stime": "1899/12/31 1:30:00",
+ "etime": "1899/12/31 1:50:00"
+ },
+ {
+ "num": 3,
+ "stime": "1899/12/31 2:30:00",
+ "etime": "1899/12/31 2:50:00"
+ },
+ {
+ "num": 4,
+ "stime": "1899/12/31 3:30:00",
+ "etime": "1899/12/31 3:50:00"
+ },
+ {
+ "num": 5,
+ "stime": "1899/12/31 4:30:00",
+ "etime": "1899/12/31 4:50:00"
+ },
+ {
+ "num": 6,
+ "stime": "1899/12/31 5:30:00",
+ "etime": "1899/12/31 5:50:00"
+ },
+ {
+ "num": 7,
+ "stime": "1899/12/31 6:30:00",
+ "etime": "1899/12/31 6:50:00"
+ },
+ {
+ "num": 8,
+ "stime": "1899/12/31 7:30:00",
+ "etime": "1899/12/31 7:50:00"
+ },
+ {
+ "num": 9,
+ "stime": "1899/12/31 8:30:00",
+ "etime": "1899/12/31 8:50:00"
+ },
+ {
+ "num": 10,
+ "stime": "1899/12/31 9:30:00",
+ "etime": "1899/12/31 9:50:00"
+ },
+ {
+ "num": 11,
+ "stime": "1899/12/31 10:30:00",
+ "etime": "1899/12/31 10:50:00"
+ },
+ {
+ "num": 12,
+ "stime": "1899/12/31 11:30:00",
+ "etime": "1899/12/31 11:50:00"
+ },
+ {
+ "num": 13,
+ "stime": "1899/12/31 12:30:00",
+ "etime": "1899/12/31 12:50:00"
+ },
+ {
+ "num": 14,
+ "stime": "1899/12/31 13:30:00",
+ "etime": "1899/12/31 13:50:00"
+ },
+ {
+ "num": 15,
+ "stime": "1899/12/31 14:30:00",
+ "etime": "1899/12/31 14:50:00"
+ },
+ {
+ "num": 16,
+ "stime": "1899/12/31 15:30:00",
+ "etime": "1899/12/31 15:50:00"
+ },
+ {
+ "num": 17,
+ "stime": "1899/12/31 16:30:00",
+ "etime": "1899/12/31 16:50:00"
+ },
+ {
+ "num": 18,
+ "stime": "1899/12/31 17:30:00",
+ "etime": "1899/12/31 17:50:00"
+ },
+ {
+ "num": 19,
+ "stime": "1899/12/31 18:30:00",
+ "etime": "1899/12/31 18:50:00"
+ },
+ {
+ "num": 20,
+ "stime": "1899/12/31 19:30:00",
+ "etime": "1899/12/31 19:50:00"
+ },
+ {
+ "num": 21,
+ "stime": "1899/12/31 20:30:00",
+ "etime": "1899/12/31 20:50:00"
+ },
+ {
+ "num": 22,
+ "stime": "1899/12/31 21:30:00",
+ "etime": "1899/12/31 21:50:00"
+ },
+ {
+ "num": 23,
+ "stime": "1899/12/31 22:30:00",
+ "etime": "1899/12/31 22:50:00"
+ },
+ {
+ "num": 24,
+ "stime": "1899/12/31 23:30:00",
+ "etime": "1899/12/31 23:50:00"
+ }
+]
\ No newline at end of file
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index 3e9776337..233818b05 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -684,6 +684,38 @@
"business_rewardday": 1,
"business_renovatething": 180,
"favorability_likes": 1500,
- "favorability_dislikes": 500
+ "favorability_dislikes": 500,
+ "buzkashi_time": 180,
+ "buzkashi_schedule": 200,
+ "buzkashi_stime": 300,
+ "buzkashi_vreward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "buzkashi_freward": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "buzkashi_vintegral": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "buzkashi_fintegral": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
+ ],
+ "buzkashi_resurrection": 10
}
]
\ No newline at end of file
diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json
index ff585981d..98053e46a 100644
--- a/bin/json/game_huntingboss.json
+++ b/bin/json/game_huntingboss.json
@@ -7,7 +7,7 @@
"text": "巨型猩猩"
},
"difficulty": 1,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -25,8 +25,6 @@
"drop": 1001,
"bossmodel": 53001,
"boss": [
- 401001,
- 401002,
401003
],
"ps_consume": [
@@ -52,7 +50,7 @@
"text": "巨型猩猩"
},
"difficulty": 2,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -75,8 +73,6 @@
"drop": 1002,
"bossmodel": 53001,
"boss": [
- 401004,
- 401005,
401006
],
"ps_consume": [
@@ -102,7 +98,7 @@
"text": "巨型猩猩"
},
"difficulty": 3,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -125,8 +121,6 @@
"drop": 1003,
"bossmodel": 53001,
"boss": [
- 401007,
- 401008,
401009
],
"ps_consume": [
@@ -152,7 +146,7 @@
"text": "巨型猩猩"
},
"difficulty": 4,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -175,8 +169,6 @@
"drop": 1004,
"bossmodel": 53001,
"boss": [
- 401010,
- 401011,
401012
],
"ps_consume": [
@@ -202,7 +194,7 @@
"text": "巨型猩猩"
},
"difficulty": 5,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -230,8 +222,6 @@
"drop": 1005,
"bossmodel": 53001,
"boss": [
- 401013,
- 401014,
401015
],
"ps_consume": [
@@ -257,7 +247,7 @@
"text": "巨型猩猩"
},
"difficulty": 6,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -285,8 +275,6 @@
"drop": 1006,
"bossmodel": 53001,
"boss": [
- 401016,
- 401017,
401018
],
"ps_consume": [
@@ -312,7 +300,7 @@
"text": "巨型猩猩"
},
"difficulty": 7,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -340,8 +328,6 @@
"drop": 1007,
"bossmodel": 53001,
"boss": [
- 401019,
- 401020,
401021
],
"ps_consume": [
@@ -367,7 +353,7 @@
"text": "巨型猩猩"
},
"difficulty": 8,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -395,8 +381,6 @@
"drop": 1008,
"bossmodel": 53001,
"boss": [
- 401022,
- 401023,
401024
],
"ps_consume": [
@@ -422,7 +406,7 @@
"text": "巨型猩猩"
},
"difficulty": 9,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -450,8 +434,6 @@
"drop": 1009,
"bossmodel": 53001,
"boss": [
- 401025,
- 401026,
401027
],
"ps_consume": [
@@ -477,7 +459,7 @@
"text": "巨型猩猩"
},
"difficulty": 10,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -505,8 +487,6 @@
"drop": 1010,
"bossmodel": 53001,
"boss": [
- 401028,
- 401029,
401030
],
"ps_consume": [
@@ -532,7 +512,7 @@
"text": "火龙"
},
"difficulty": 1,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -550,8 +530,6 @@
"drop": 1011,
"bossmodel": 51004,
"boss": [
- 402001,
- 402002,
402003
],
"ps_consume": [
@@ -577,7 +555,7 @@
"text": "火龙"
},
"difficulty": 2,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -600,8 +578,6 @@
"drop": 1012,
"bossmodel": 51004,
"boss": [
- 402004,
- 402005,
402006
],
"ps_consume": [
@@ -627,7 +603,7 @@
"text": "火龙"
},
"difficulty": 3,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -650,8 +626,6 @@
"drop": 1013,
"bossmodel": 51004,
"boss": [
- 402007,
- 402008,
402009
],
"ps_consume": [
@@ -677,7 +651,7 @@
"text": "火龙"
},
"difficulty": 4,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -700,8 +674,6 @@
"drop": 1014,
"bossmodel": 51004,
"boss": [
- 402010,
- 402011,
402012
],
"ps_consume": [
@@ -727,7 +699,7 @@
"text": "火龙"
},
"difficulty": 5,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -755,8 +727,6 @@
"drop": 1015,
"bossmodel": 51004,
"boss": [
- 402013,
- 402014,
402015
],
"ps_consume": [
@@ -782,7 +752,7 @@
"text": "火龙"
},
"difficulty": 6,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -810,8 +780,6 @@
"drop": 1016,
"bossmodel": 51004,
"boss": [
- 402016,
- 402017,
402018
],
"ps_consume": [
@@ -837,7 +805,7 @@
"text": "火龙"
},
"difficulty": 7,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -865,8 +833,6 @@
"drop": 1017,
"bossmodel": 51004,
"boss": [
- 402019,
- 402020,
402021
],
"ps_consume": [
@@ -892,7 +858,7 @@
"text": "火龙"
},
"difficulty": 8,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -920,8 +886,6 @@
"drop": 1018,
"bossmodel": 51004,
"boss": [
- 402022,
- 402023,
402024
],
"ps_consume": [
@@ -947,7 +911,7 @@
"text": "火龙"
},
"difficulty": 9,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -975,8 +939,6 @@
"drop": 1019,
"bossmodel": 51004,
"boss": [
- 402025,
- 402026,
402027
],
"ps_consume": [
@@ -1002,7 +964,7 @@
"text": "火龙"
},
"difficulty": 10,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1030,8 +992,6 @@
"drop": 1020,
"bossmodel": 51004,
"boss": [
- 402028,
- 402029,
402030
],
"ps_consume": [
@@ -1057,7 +1017,7 @@
"text": "大厨"
},
"difficulty": 1,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1075,8 +1035,6 @@
"drop": 1021,
"bossmodel": 51005,
"boss": [
- 403001,
- 403002,
403003
],
"ps_consume": [
@@ -1102,7 +1060,7 @@
"text": "大厨"
},
"difficulty": 2,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1125,8 +1083,6 @@
"drop": 1022,
"bossmodel": 51005,
"boss": [
- 403004,
- 403005,
403006
],
"ps_consume": [
@@ -1152,7 +1108,7 @@
"text": "大厨"
},
"difficulty": 3,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1175,8 +1131,6 @@
"drop": 1023,
"bossmodel": 51005,
"boss": [
- 403007,
- 403008,
403009
],
"ps_consume": [
@@ -1202,7 +1156,7 @@
"text": "大厨"
},
"difficulty": 4,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1225,8 +1179,6 @@
"drop": 1024,
"bossmodel": 51005,
"boss": [
- 403010,
- 403011,
403012
],
"ps_consume": [
@@ -1252,7 +1204,7 @@
"text": "大厨"
},
"difficulty": 5,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1280,8 +1232,6 @@
"drop": 1025,
"bossmodel": 51005,
"boss": [
- 403013,
- 403014,
403015
],
"ps_consume": [
@@ -1307,7 +1257,7 @@
"text": "大厨"
},
"difficulty": 6,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1335,8 +1285,6 @@
"drop": 1026,
"bossmodel": 51005,
"boss": [
- 403016,
- 403017,
403018
],
"ps_consume": [
@@ -1362,7 +1310,7 @@
"text": "大厨"
},
"difficulty": 7,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1390,8 +1338,6 @@
"drop": 1027,
"bossmodel": 51005,
"boss": [
- 403019,
- 403020,
403021
],
"ps_consume": [
@@ -1417,7 +1363,7 @@
"text": "大厨"
},
"difficulty": 8,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1445,8 +1391,6 @@
"drop": 1028,
"bossmodel": 51005,
"boss": [
- 403022,
- 403023,
403024
],
"ps_consume": [
@@ -1472,7 +1416,7 @@
"text": "大厨"
},
"difficulty": 9,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1500,8 +1444,6 @@
"drop": 1029,
"bossmodel": 51005,
"boss": [
- 403025,
- 403026,
403027
],
"ps_consume": [
@@ -1527,7 +1469,7 @@
"text": "大厨"
},
"difficulty": 10,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1555,8 +1497,6 @@
"drop": 1030,
"bossmodel": 51005,
"boss": [
- 403028,
- 403029,
403030
],
"ps_consume": [
@@ -1582,7 +1522,7 @@
"text": "太空海星"
},
"difficulty": 1,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1600,8 +1540,6 @@
"drop": 1021,
"bossmodel": 51002,
"boss": [
- 404001,
- 404002,
404003
],
"ps_consume": [
@@ -1627,7 +1565,7 @@
"text": "太空海星"
},
"difficulty": 2,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1650,8 +1588,6 @@
"drop": 1022,
"bossmodel": 51002,
"boss": [
- 404004,
- 404005,
404006
],
"ps_consume": [
@@ -1677,7 +1613,7 @@
"text": "太空海星"
},
"difficulty": 3,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1700,8 +1636,6 @@
"drop": 1023,
"bossmodel": 51002,
"boss": [
- 404007,
- 404008,
404009
],
"ps_consume": [
@@ -1727,7 +1661,7 @@
"text": "太空海星"
},
"difficulty": 4,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1750,8 +1684,6 @@
"drop": 1024,
"bossmodel": 51002,
"boss": [
- 404010,
- 404011,
404012
],
"ps_consume": [
@@ -1777,7 +1709,7 @@
"text": "太空海星"
},
"difficulty": 5,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1805,8 +1737,6 @@
"drop": 1025,
"bossmodel": 51002,
"boss": [
- 404013,
- 404014,
404015
],
"ps_consume": [
@@ -1832,7 +1762,7 @@
"text": "太空海星"
},
"difficulty": 6,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1860,8 +1790,6 @@
"drop": 1026,
"bossmodel": 51002,
"boss": [
- 404016,
- 404017,
404018
],
"ps_consume": [
@@ -1887,7 +1815,7 @@
"text": "太空海星"
},
"difficulty": 7,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1915,8 +1843,6 @@
"drop": 1027,
"bossmodel": 51002,
"boss": [
- 404019,
- 404020,
404021
],
"ps_consume": [
@@ -1942,7 +1868,7 @@
"text": "太空海星"
},
"difficulty": 8,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -1970,8 +1896,6 @@
"drop": 1028,
"bossmodel": 51002,
"boss": [
- 404022,
- 404023,
404024
],
"ps_consume": [
@@ -1997,7 +1921,7 @@
"text": "太空海星"
},
"difficulty": 9,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -2025,8 +1949,6 @@
"drop": 1029,
"bossmodel": 51002,
"boss": [
- 404025,
- 404026,
404027
],
"ps_consume": [
@@ -2052,7 +1974,7 @@
"text": "太空海星"
},
"difficulty": 10,
- "BattleReadyID": 107,
+ "BattleReadyID": 120,
"firstprize": [
{
"a": "attr",
@@ -2080,8 +2002,6 @@
"drop": 1030,
"bossmodel": 51002,
"boss": [
- 404028,
- 404029,
404030
],
"ps_consume": [
diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json
index aa08e35ad..1cbb44c01 100644
--- a/bin/json/game_monsterformat.json
+++ b/bin/json/game_monsterformat.json
@@ -15122,9 +15122,9 @@
"Id": 301013,
"pos": 4,
"captainId": 0,
- "IsBoss": 0,
- "bossHpCnt": 0,
- "monster": -1,
+ "IsBoss": 1,
+ "bossHpCnt": 4,
+ "monster": 550025,
"lv": 35,
"hppro": 0.6,
"atkpro": 1,
@@ -15319,7 +15319,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 40,
"hppro": 0.6,
"atkpro": 1,
@@ -15514,7 +15514,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 45,
"hppro": 0.6,
"atkpro": 1,
@@ -15709,7 +15709,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 50,
"hppro": 0.6,
"atkpro": 1,
@@ -15904,7 +15904,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 55,
"hppro": 0.6,
"atkpro": 1,
@@ -16099,7 +16099,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@@ -16294,7 +16294,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 65,
"hppro": 0.6,
"atkpro": 1,
@@ -16489,7 +16489,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 70,
"hppro": 0.6,
"atkpro": 1,
@@ -16684,7 +16684,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 75,
"hppro": 0.6,
"atkpro": 1,
@@ -16879,7 +16879,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@@ -17074,7 +17074,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 35,
"hppro": 0.6,
"atkpro": 1,
@@ -17269,7 +17269,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 40,
"hppro": 0.6,
"atkpro": 1,
@@ -17464,7 +17464,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 45,
"hppro": 0.6,
"atkpro": 1,
@@ -17659,7 +17659,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 50,
"hppro": 0.6,
"atkpro": 1,
@@ -17854,7 +17854,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 55,
"hppro": 0.6,
"atkpro": 1,
@@ -18049,7 +18049,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@@ -18244,7 +18244,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 65,
"hppro": 0.6,
"atkpro": 1,
@@ -18439,7 +18439,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 70,
"hppro": 0.6,
"atkpro": 1,
@@ -18634,7 +18634,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 75,
"hppro": 0.6,
"atkpro": 1,
@@ -18829,7 +18829,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 80,
"hppro": 0.6,
"atkpro": 1,
@@ -19024,7 +19024,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 35,
"hppro": 0.6,
"atkpro": 1,
@@ -19219,7 +19219,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 40,
"hppro": 0.6,
"atkpro": 1,
@@ -19414,7 +19414,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 45,
"hppro": 0.6,
"atkpro": 1,
@@ -19609,7 +19609,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 50,
"hppro": 0.6,
"atkpro": 1,
@@ -19804,7 +19804,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 55,
"hppro": 0.6,
"atkpro": 1,
@@ -19999,7 +19999,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
@@ -20194,7 +20194,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 65,
"hppro": 0.6,
"atkpro": 1,
@@ -20389,7 +20389,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 70,
"hppro": 0.6,
"atkpro": 1,
@@ -20584,7 +20584,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 75,
"hppro": 0.6,
"atkpro": 1,
@@ -20779,7 +20779,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 80,
"hppro": 0.6,
"atkpro": 1,
@@ -89315,7 +89315,7 @@
"captainId": 0,
"IsBoss": 1,
"bossHpCnt": 4,
- "monster": 110215,
+ "monster": 550025,
"lv": 60,
"hppro": 0.6,
"atkpro": 1,
diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json
index 2d97599b4..b2c93a270 100644
--- a/bin/json/game_rdtaskcondi.json
+++ b/bin/json/game_rdtaskcondi.json
@@ -1176,7 +1176,7 @@
},
"type": 70,
"valid": 0,
- "NPC": 10031,
+ "NPC": 10022,
"data1": 1,
"data2": 101,
"data3": 0,
@@ -1688,7 +1688,7 @@
},
"type": 73,
"valid": 0,
- "NPC": 10071,
+ "NPC": 70022,
"data1": 1,
"data2": 1,
"data3": 1,
@@ -1736,7 +1736,7 @@
},
"type": 70,
"valid": 0,
- "NPC": 10101,
+ "NPC": 10120,
"data1": 1,
"data2": 102,
"data3": 0,
@@ -5752,7 +5752,7 @@
},
"type": 20001,
"valid": 1,
- "NPC": 10011,
+ "NPC": 10012,
"data1": 1,
"data2": 602,
"data3": 0,
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index df9e70724..4ccff658b 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -10819,10 +10819,10 @@
{
"Id": 214003213,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 2,
"Type": 1,
"Argu": [
@@ -10844,10 +10844,10 @@
{
"Id": 214003214,
"EmitPR": 1000,
- "From": 2,
+ "From": 4,
"Where": [],
"Order": "",
- "Limit": 10,
+ "Limit": 1,
"ExecuteCnt": 1,
"Type": 3,
"Argu": [
diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json
index e5e119e09..c59822aad 100644
--- a/bin/json/game_skillbuff.json
+++ b/bin/json/game_skillbuff.json
@@ -1153,7 +1153,7 @@
"SameID": false,
"golbalbufficon": "",
"buffIcon": "ty_zd_buff_ts004",
- "buffeffect": "effect_14001_skill_2",
+ "buffeffect": "effect_14001_qiuzhangzhinu",
"buffpos": "根节点"
},
{
diff --git a/bin/json/game_smithyatlas.json b/bin/json/game_smithyatlas.json
index b7e995d95..5fefd5b77 100644
--- a/bin/json/game_smithyatlas.json
+++ b/bin/json/game_smithyatlas.json
@@ -8,7 +8,7 @@
"text": "无极神功套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10110",
+ "key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装1】的故事。"
},
"atlas_score": 0,
@@ -27,7 +27,7 @@
"text": "无极神功套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10111",
+ "key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装2】的故事。"
},
"atlas_score": 0,
@@ -46,7 +46,7 @@
"text": "无极神功套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10112",
+ "key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装3】的故事。"
},
"atlas_score": 0,
@@ -65,7 +65,7 @@
"text": "无极神功套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10113",
+ "key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装4】的故事。"
},
"atlas_score": 0,
@@ -84,7 +84,7 @@
"text": "无极神功套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10114",
+ "key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装5】的故事。"
},
"atlas_score": 0,
@@ -103,7 +103,7 @@
"text": "无极神功套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10115",
+ "key": "equip_skillintr_1",
"text": "这里会有一段关于【无极神功套装6】的故事。"
},
"atlas_score": 0,
@@ -122,7 +122,7 @@
"text": "驯龙套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10210",
+ "key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装1】的故事。"
},
"atlas_score": 0,
@@ -141,7 +141,7 @@
"text": "驯龙套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10211",
+ "key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装2】的故事。"
},
"atlas_score": 0,
@@ -160,7 +160,7 @@
"text": "驯龙套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10212",
+ "key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装3】的故事。"
},
"atlas_score": 0,
@@ -179,7 +179,7 @@
"text": "驯龙套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10213",
+ "key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装4】的故事。"
},
"atlas_score": 0,
@@ -198,7 +198,7 @@
"text": "驯龙套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10214",
+ "key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装5】的故事。"
},
"atlas_score": 0,
@@ -217,7 +217,7 @@
"text": "驯龙套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10215",
+ "key": "equip_skillintr_2",
"text": "这里会有一段关于【驯龙套装6】的故事。"
},
"atlas_score": 0,
@@ -236,7 +236,7 @@
"text": "雪精灵套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10310",
+ "key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装1】的故事。"
},
"atlas_score": 0,
@@ -255,7 +255,7 @@
"text": "雪精灵套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10311",
+ "key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装2】的故事。"
},
"atlas_score": 0,
@@ -274,7 +274,7 @@
"text": "雪精灵套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10312",
+ "key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装3】的故事。"
},
"atlas_score": 0,
@@ -293,7 +293,7 @@
"text": "雪精灵套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10313",
+ "key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装4】的故事。"
},
"atlas_score": 0,
@@ -312,7 +312,7 @@
"text": "雪精灵套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10314",
+ "key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装5】的故事。"
},
"atlas_score": 0,
@@ -331,7 +331,7 @@
"text": "雪精灵套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10315",
+ "key": "equip_skillintr_3",
"text": "这里会有一段关于【雪精灵套装6】的故事。"
},
"atlas_score": 0,
@@ -350,7 +350,7 @@
"text": "噩梦漩涡套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10410",
+ "key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装1】的故事。"
},
"atlas_score": 0,
@@ -369,7 +369,7 @@
"text": "噩梦漩涡套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10411",
+ "key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装2】的故事。"
},
"atlas_score": 0,
@@ -388,7 +388,7 @@
"text": "噩梦漩涡套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10412",
+ "key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装3】的故事。"
},
"atlas_score": 0,
@@ -407,7 +407,7 @@
"text": "噩梦漩涡套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10413",
+ "key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装4】的故事。"
},
"atlas_score": 0,
@@ -426,7 +426,7 @@
"text": "噩梦漩涡套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10414",
+ "key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装5】的故事。"
},
"atlas_score": 0,
@@ -445,7 +445,7 @@
"text": "噩梦漩涡套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10415",
+ "key": "equip_skillintr_4",
"text": "这里会有一段关于【噩梦漩涡套装6】的故事。"
},
"atlas_score": 0,
@@ -464,7 +464,7 @@
"text": "音乐精灵套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10510",
+ "key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装1】的故事。"
},
"atlas_score": 0,
@@ -483,7 +483,7 @@
"text": "音乐精灵套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10511",
+ "key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装2】的故事。"
},
"atlas_score": 0,
@@ -502,7 +502,7 @@
"text": "音乐精灵套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10512",
+ "key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装3】的故事。"
},
"atlas_score": 0,
@@ -521,7 +521,7 @@
"text": "音乐精灵套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10513",
+ "key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装4】的故事。"
},
"atlas_score": 0,
@@ -540,7 +540,7 @@
"text": "音乐精灵套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10514",
+ "key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装5】的故事。"
},
"atlas_score": 0,
@@ -559,7 +559,7 @@
"text": "音乐精灵套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10515",
+ "key": "equip_skillintr_5",
"text": "这里会有一段关于【音乐精灵套装6】的故事。"
},
"atlas_score": 0,
@@ -578,7 +578,7 @@
"text": "永恒萌狗套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10610",
+ "key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装1】的故事。"
},
"atlas_score": 0,
@@ -597,7 +597,7 @@
"text": "永恒萌狗套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10611",
+ "key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装2】的故事。"
},
"atlas_score": 0,
@@ -616,7 +616,7 @@
"text": "永恒萌狗套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10612",
+ "key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装3】的故事。"
},
"atlas_score": 0,
@@ -635,7 +635,7 @@
"text": "永恒萌狗套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10613",
+ "key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装4】的故事。"
},
"atlas_score": 0,
@@ -654,7 +654,7 @@
"text": "永恒萌狗套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10614",
+ "key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装5】的故事。"
},
"atlas_score": 0,
@@ -673,7 +673,7 @@
"text": "永恒萌狗套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10615",
+ "key": "equip_skillintr_6",
"text": "这里会有一段关于【永恒萌狗套装6】的故事。"
},
"atlas_score": 0,
@@ -692,7 +692,7 @@
"text": "原始狩猎套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10710",
+ "key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装1】的故事。"
},
"atlas_score": 0,
@@ -711,7 +711,7 @@
"text": "原始狩猎套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10711",
+ "key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装2】的故事。"
},
"atlas_score": 0,
@@ -730,7 +730,7 @@
"text": "原始狩猎套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10712",
+ "key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装3】的故事。"
},
"atlas_score": 0,
@@ -749,7 +749,7 @@
"text": "原始狩猎套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10713",
+ "key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装4】的故事。"
},
"atlas_score": 0,
@@ -768,7 +768,7 @@
"text": "原始狩猎套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10714",
+ "key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装5】的故事。"
},
"atlas_score": 0,
@@ -787,7 +787,7 @@
"text": "原始狩猎套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10715",
+ "key": "equip_skillintr_7",
"text": "这里会有一段关于【原始狩猎套装6】的故事。"
},
"atlas_score": 0,
@@ -806,7 +806,7 @@
"text": "气功大师套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text10810",
+ "key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装1】的故事。"
},
"atlas_score": 0,
@@ -825,7 +825,7 @@
"text": "气功大师套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text10811",
+ "key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装2】的故事。"
},
"atlas_score": 0,
@@ -844,7 +844,7 @@
"text": "气功大师套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text10812",
+ "key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装3】的故事。"
},
"atlas_score": 0,
@@ -863,7 +863,7 @@
"text": "气功大师套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text10813",
+ "key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装4】的故事。"
},
"atlas_score": 0,
@@ -882,7 +882,7 @@
"text": "气功大师套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text10814",
+ "key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装5】的故事。"
},
"atlas_score": 0,
@@ -901,7 +901,7 @@
"text": "气功大师套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text10815",
+ "key": "equip_skillintr_8",
"text": "这里会有一段关于【气功大师套装6】的故事。"
},
"atlas_score": 0,
@@ -920,7 +920,7 @@
"text": "马术套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11010",
+ "key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装1】的故事。"
},
"atlas_score": 0,
@@ -939,7 +939,7 @@
"text": "马术套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11011",
+ "key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装2】的故事。"
},
"atlas_score": 0,
@@ -958,7 +958,7 @@
"text": "马术套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11012",
+ "key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装3】的故事。"
},
"atlas_score": 0,
@@ -977,7 +977,7 @@
"text": "马术套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11013",
+ "key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装4】的故事。"
},
"atlas_score": 0,
@@ -996,7 +996,7 @@
"text": "马术套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11014",
+ "key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装5】的故事。"
},
"atlas_score": 0,
@@ -1015,7 +1015,7 @@
"text": "马术套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11015",
+ "key": "equip_skillintr_10",
"text": "这里会有一段关于【马术套装6】的故事。"
},
"atlas_score": 0,
@@ -1034,7 +1034,7 @@
"text": "波波星套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11110",
+ "key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装1】的故事。"
},
"atlas_score": 0,
@@ -1053,7 +1053,7 @@
"text": "波波星套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11111",
+ "key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装2】的故事。"
},
"atlas_score": 0,
@@ -1072,7 +1072,7 @@
"text": "波波星套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11112",
+ "key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装3】的故事。"
},
"atlas_score": 0,
@@ -1091,7 +1091,7 @@
"text": "波波星套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11113",
+ "key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装4】的故事。"
},
"atlas_score": 0,
@@ -1110,7 +1110,7 @@
"text": "波波星套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11114",
+ "key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装5】的故事。"
},
"atlas_score": 0,
@@ -1129,7 +1129,7 @@
"text": "波波星套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11115",
+ "key": "equip_skillintr_11",
"text": "这里会有一段关于【波波星套装6】的故事。"
},
"atlas_score": 0,
@@ -1148,7 +1148,7 @@
"text": "穴居人套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11210",
+ "key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装1】的故事。"
},
"atlas_score": 0,
@@ -1167,7 +1167,7 @@
"text": "穴居人套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11211",
+ "key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装2】的故事。"
},
"atlas_score": 0,
@@ -1186,7 +1186,7 @@
"text": "穴居人套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11212",
+ "key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装3】的故事。"
},
"atlas_score": 0,
@@ -1205,7 +1205,7 @@
"text": "穴居人套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11213",
+ "key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装4】的故事。"
},
"atlas_score": 0,
@@ -1224,7 +1224,7 @@
"text": "穴居人套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11214",
+ "key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装5】的故事。"
},
"atlas_score": 0,
@@ -1243,7 +1243,7 @@
"text": "穴居人套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11215",
+ "key": "equip_skillintr_12",
"text": "这里会有一段关于【穴居人套装6】的故事。"
},
"atlas_score": 0,
@@ -1262,7 +1262,7 @@
"text": "文明人套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11310",
+ "key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装1】的故事。"
},
"atlas_score": 0,
@@ -1281,7 +1281,7 @@
"text": "文明人套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11311",
+ "key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装2】的故事。"
},
"atlas_score": 0,
@@ -1300,7 +1300,7 @@
"text": "文明人套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11312",
+ "key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装3】的故事。"
},
"atlas_score": 0,
@@ -1319,7 +1319,7 @@
"text": "文明人套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11313",
+ "key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装4】的故事。"
},
"atlas_score": 0,
@@ -1338,7 +1338,7 @@
"text": "文明人套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11314",
+ "key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装5】的故事。"
},
"atlas_score": 0,
@@ -1357,7 +1357,7 @@
"text": "文明人套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11315",
+ "key": "equip_skillintr_13",
"text": "这里会有一段关于【文明人套装6】的故事。"
},
"atlas_score": 0,
@@ -1376,7 +1376,7 @@
"text": "马戏团套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11410",
+ "key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装1】的故事。"
},
"atlas_score": 0,
@@ -1395,7 +1395,7 @@
"text": "马戏团套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11411",
+ "key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装2】的故事。"
},
"atlas_score": 0,
@@ -1414,7 +1414,7 @@
"text": "马戏团套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11412",
+ "key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装3】的故事。"
},
"atlas_score": 0,
@@ -1433,7 +1433,7 @@
"text": "马戏团套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11413",
+ "key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装4】的故事。"
},
"atlas_score": 0,
@@ -1452,7 +1452,7 @@
"text": "马戏团套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11414",
+ "key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装5】的故事。"
},
"atlas_score": 0,
@@ -1471,7 +1471,7 @@
"text": "马戏团套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11415",
+ "key": "equip_skillintr_14",
"text": "这里会有一段关于【马戏团套装6】的故事。"
},
"atlas_score": 0,
@@ -1490,7 +1490,7 @@
"text": "泰坦套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11510",
+ "key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装1】的故事。"
},
"atlas_score": 0,
@@ -1509,7 +1509,7 @@
"text": "泰坦套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11511",
+ "key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装2】的故事。"
},
"atlas_score": 0,
@@ -1528,7 +1528,7 @@
"text": "泰坦套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11512",
+ "key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装3】的故事。"
},
"atlas_score": 0,
@@ -1547,7 +1547,7 @@
"text": "泰坦套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11513",
+ "key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装4】的故事。"
},
"atlas_score": 0,
@@ -1566,7 +1566,7 @@
"text": "泰坦套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11514",
+ "key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装5】的故事。"
},
"atlas_score": 0,
@@ -1585,7 +1585,7 @@
"text": "泰坦套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11515",
+ "key": "equip_skillintr_15",
"text": "这里会有一段关于【泰坦套装6】的故事。"
},
"atlas_score": 0,
@@ -1604,7 +1604,7 @@
"text": "巨怪猎人套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11610",
+ "key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装1】的故事。"
},
"atlas_score": 0,
@@ -1623,7 +1623,7 @@
"text": "巨怪猎人套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11611",
+ "key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装2】的故事。"
},
"atlas_score": 0,
@@ -1642,7 +1642,7 @@
"text": "巨怪猎人套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11612",
+ "key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装3】的故事。"
},
"atlas_score": 0,
@@ -1661,7 +1661,7 @@
"text": "巨怪猎人套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11613",
+ "key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装4】的故事。"
},
"atlas_score": 0,
@@ -1680,7 +1680,7 @@
"text": "巨怪猎人套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11614",
+ "key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装5】的故事。"
},
"atlas_score": 0,
@@ -1699,7 +1699,7 @@
"text": "巨怪猎人套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11615",
+ "key": "equip_skillintr_16",
"text": "这里会有一段关于【巨怪猎人套装6】的故事。"
},
"atlas_score": 0,
@@ -1718,7 +1718,7 @@
"text": "天外陨石套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11710",
+ "key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装1】的故事。"
},
"atlas_score": 0,
@@ -1737,7 +1737,7 @@
"text": "天外陨石套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11711",
+ "key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装2】的故事。"
},
"atlas_score": 0,
@@ -1756,7 +1756,7 @@
"text": "天外陨石套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11712",
+ "key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装3】的故事。"
},
"atlas_score": 0,
@@ -1775,7 +1775,7 @@
"text": "天外陨石套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11713",
+ "key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装4】的故事。"
},
"atlas_score": 0,
@@ -1794,7 +1794,7 @@
"text": "天外陨石套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11714",
+ "key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装5】的故事。"
},
"atlas_score": 0,
@@ -1813,7 +1813,7 @@
"text": "天外陨石套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11715",
+ "key": "equip_skillintr_17",
"text": "这里会有一段关于【天外陨石套装6】的故事。"
},
"atlas_score": 0,
@@ -1832,7 +1832,7 @@
"text": "沼泽怪物套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11810",
+ "key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装1】的故事。"
},
"atlas_score": 0,
@@ -1851,7 +1851,7 @@
"text": "沼泽怪物套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11811",
+ "key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装2】的故事。"
},
"atlas_score": 0,
@@ -1870,7 +1870,7 @@
"text": "沼泽怪物套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11812",
+ "key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装3】的故事。"
},
"atlas_score": 0,
@@ -1889,7 +1889,7 @@
"text": "沼泽怪物套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11813",
+ "key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装4】的故事。"
},
"atlas_score": 0,
@@ -1908,7 +1908,7 @@
"text": "沼泽怪物套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11814",
+ "key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装5】的故事。"
},
"atlas_score": 0,
@@ -1927,7 +1927,7 @@
"text": "沼泽怪物套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11815",
+ "key": "equip_skillintr_18",
"text": "这里会有一段关于【沼泽怪物套装6】的故事。"
},
"atlas_score": 0,
@@ -1946,7 +1946,7 @@
"text": "守护神套装1"
},
"content_text": {
- "key": "newsmithy_tool_content_text11910",
+ "key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装1】的故事。"
},
"atlas_score": 0,
@@ -1965,7 +1965,7 @@
"text": "守护神套装2"
},
"content_text": {
- "key": "newsmithy_tool_content_text11911",
+ "key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装2】的故事。"
},
"atlas_score": 0,
@@ -1984,7 +1984,7 @@
"text": "守护神套装3"
},
"content_text": {
- "key": "newsmithy_tool_content_text11912",
+ "key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装3】的故事。"
},
"atlas_score": 0,
@@ -2003,7 +2003,7 @@
"text": "守护神套装4"
},
"content_text": {
- "key": "newsmithy_tool_content_text11913",
+ "key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装4】的故事。"
},
"atlas_score": 0,
@@ -2022,7 +2022,7 @@
"text": "守护神套装5"
},
"content_text": {
- "key": "newsmithy_tool_content_text11914",
+ "key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装5】的故事。"
},
"atlas_score": 0,
@@ -2041,7 +2041,7 @@
"text": "守护神套装6"
},
"content_text": {
- "key": "newsmithy_tool_content_text11915",
+ "key": "equip_skillintr_19",
"text": "这里会有一段关于【守护神套装6】的故事。"
},
"atlas_score": 0,
diff --git a/bin/json/game_taskactivereward.json b/bin/json/game_taskactivereward.json
index fb555e24c..4174a8a5c 100644
--- a/bin/json/game_taskactivereward.json
+++ b/bin/json/game_taskactivereward.json
@@ -1,110 +1,34 @@
[
{
"key": 1,
- "id_tag": 1,
- "active": 20,
+ "id_tag": 2,
+ "active": 40,
"reword": [
{
"a": "attr",
"t": "diamond",
- "n": 5
+ "n": 10
}
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 1
},
{
"key": 2,
- "id_tag": 1,
- "active": 40,
+ "id_tag": 2,
+ "active": 80,
"reword": [
{
"a": "attr",
- "t": "gold",
- "n": 10000
+ "t": "diamond",
+ "n": 10
}
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 2
},
{
"key": 3,
- "id_tag": 1,
- "active": 60,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 4,
- "id_tag": 1,
- "active": 80,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 20000
- }
- ]
- },
- {
- "key": 5,
- "id_tag": 1,
- "active": 100,
- "reword": [
- {
- "a": "item",
- "t": "30001",
- "n": 1
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 50000
- }
- ]
- },
- {
- "key": 6,
- "id_tag": 2,
- "active": 40,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 25000
- }
- ]
- },
- {
- "key": 7,
- "id_tag": 2,
- "active": 80,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 25000
- }
- ]
- },
- {
- "key": 8,
"id_tag": 2,
"active": 120,
"reword": [
@@ -113,10 +37,12 @@
"t": "diamond",
"n": 20
}
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 3
},
{
- "key": 9,
+ "key": 4,
"id_tag": 2,
"active": 160,
"reword": [
@@ -124,29 +50,9 @@
"a": "attr",
"t": "diamond",
"n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 75000
}
- ]
- },
- {
- "key": 10,
- "id_tag": 2,
- "active": 200,
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- },
- {
- "a": "attr",
- "t": "gold",
- "n": 200000
- }
- ]
+ ],
+ "action": "Skill_2",
+ "stage": 4
}
]
\ No newline at end of file
diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json
index edeb0cd42..eda75a7a0 100644
--- a/bin/json/game_taskround.json
+++ b/bin/json/game_taskround.json
@@ -1,100 +1,10 @@
[
- {
- "key": 10001,
- "id_list": 1,
- "id_tag": 1,
- "task_display": {
- "key": "task_10001",
- "text": "进行1次普通招募"
- },
- "type_id": 2018001,
- "active": 20,
- "id_after": 0,
- "jump_interface": 107,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10002,
- "id_list": 2,
- "id_tag": 1,
- "task_display": {
- "key": "task_10002",
- "text": "为任意英雄提升1次等级"
- },
- "type_id": 2024001,
- "active": 20,
- "id_after": 0,
- "jump_interface": 103,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10004,
- "id_list": 4,
- "id_tag": 1,
- "task_display": {
- "key": "task_10004",
- "text": "强化任意装备成功1次"
- },
- "type_id": 2047001,
- "active": 20,
- "id_after": 0,
- "jump_interface": 102,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10006,
- "id_list": 6,
- "id_tag": 1,
- "task_display": {
- "key": "task_10006",
- "text": "在商店购买任意1件商品"
- },
- "type_id": 2064001,
- "active": 20,
- "id_after": 0,
- "jump_interface": 122,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 10007,
- "id_list": 7,
- "id_tag": 1,
- "task_display": {
- "key": "task_10007",
- "text": "使用好友助战英雄战斗1次"
- },
- "type_id": 2012001,
- "active": 20,
- "id_after": 0,
- "jump_interface": 113,
- "icon": "wp_icon_0001",
- "reword": []
- },
{
"key": 20001,
- "id_list": 8,
- "id_tag": 1,
- "task_display": {
- "key": "task_20001",
- "text": "进行竞技场挑战1次"
- },
- "type_id": 2130001,
- "active": 20,
- "id_after": 0,
- "jump_interface": 156,
- "icon": "wp_icon_0001",
- "reword": []
- },
- {
- "key": 20002,
- "id_list": 9,
+ "id_list": 1,
"id_tag": 2,
"task_display": {
- "key": "task_20002",
+ "key": "task_20001",
"text": "进行10次普通招募"
},
"type_id": 3018001,
@@ -105,11 +15,11 @@
"reword": []
},
{
- "key": 20003,
- "id_list": 10,
+ "key": 20002,
+ "id_list": 2,
"id_tag": 2,
"task_display": {
- "key": "task_20003",
+ "key": "task_20002",
"text": "为任意英雄提升10次等级"
},
"type_id": 3024001,
@@ -120,11 +30,11 @@
"reword": []
},
{
- "key": 20005,
- "id_list": 12,
+ "key": 20003,
+ "id_list": 3,
"id_tag": 2,
"task_display": {
- "key": "task_20005",
+ "key": "task_20003",
"text": "强化任意装备成功6次"
},
"type_id": 3047001,
@@ -135,11 +45,11 @@
"reword": []
},
{
- "key": 20007,
- "id_list": 14,
+ "key": 20004,
+ "id_list": 4,
"id_tag": 2,
"task_display": {
- "key": "task_20007",
+ "key": "task_20004",
"text": "在商店购买任意7件商品"
},
"type_id": 3064001,
@@ -150,11 +60,11 @@
"reword": []
},
{
- "key": 20008,
- "id_list": 15,
+ "key": 20005,
+ "id_list": 5,
"id_tag": 2,
"task_display": {
- "key": "task_20008",
+ "key": "task_20005",
"text": "使用好友助战英雄战斗7次"
},
"type_id": 3012001,
@@ -165,11 +75,11 @@
"reword": []
},
{
- "key": 20010,
- "id_list": 17,
+ "key": 20006,
+ "id_list": 6,
"id_tag": 2,
"task_display": {
- "key": "task_20010",
+ "key": "task_20006",
"text": "刷新商店10次"
},
"type_id": 3105001,
@@ -180,11 +90,11 @@
"reword": []
},
{
- "key": 20011,
- "id_list": 18,
+ "key": 20007,
+ "id_list": 7,
"id_tag": 2,
"task_display": {
- "key": "task_20011",
+ "key": "task_20007",
"text": "消费1000颗钻石"
},
"type_id": 3104001,
@@ -195,11 +105,11 @@
"reword": []
},
{
- "key": 20012,
- "id_list": 19,
+ "key": 20008,
+ "id_list": 8,
"id_tag": 2,
"task_display": {
- "key": "task_20012",
+ "key": "task_20008",
"text": "进行30场竞技场挑战"
},
"type_id": 3130001,
@@ -208,2924 +118,5 @@
"jump_interface": 156,
"icon": "wp_icon_0001",
"reword": []
- },
- {
- "key": 30011,
- "id_list": 30,
- "id_tag": 3,
- "task_display": {
- "key": "task_30011",
- "text": "拥有1个好友"
- },
- "type_id": 4010001,
- "active": 0,
- "id_after": 4010002,
- "jump_interface": 117,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30012,
- "id_list": 31,
- "id_tag": 3,
- "task_display": {
- "key": "task_30012",
- "text": "拥有5个好友"
- },
- "type_id": 4010002,
- "active": 0,
- "id_after": 4010003,
- "jump_interface": 117,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30013,
- "id_list": 32,
- "id_tag": 3,
- "task_display": {
- "key": "task_30013",
- "text": "拥有10个好友"
- },
- "type_id": 4010003,
- "active": 0,
- "id_after": 4010004,
- "jump_interface": 117,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30014,
- "id_list": 33,
- "id_tag": 3,
- "task_display": {
- "key": "task_30014",
- "text": "拥有20个好友"
- },
- "type_id": 4010004,
- "active": 0,
- "id_after": 4010005,
- "jump_interface": 117,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30015,
- "id_list": 34,
- "id_tag": 3,
- "task_display": {
- "key": "task_30015",
- "text": "拥有30个好友"
- },
- "type_id": 4010005,
- "active": 0,
- "id_after": 4010006,
- "jump_interface": 117,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30016,
- "id_list": 35,
- "id_tag": 3,
- "task_display": {
- "key": "task_30016",
- "text": "拥有50个好友"
- },
- "type_id": 4010006,
- "active": 0,
- "id_after": 0,
- "jump_interface": 117,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30017,
- "id_list": 36,
- "id_tag": 3,
- "task_display": {
- "key": "task_30017",
- "text": "赠送5次友情点"
- },
- "type_id": 4011001,
- "active": 0,
- "id_after": 4011002,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30018,
- "id_list": 37,
- "id_tag": 3,
- "task_display": {
- "key": "task_30018",
- "text": "赠送10次友情点"
- },
- "type_id": 4011002,
- "active": 0,
- "id_after": 4011003,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30019,
- "id_list": 38,
- "id_tag": 3,
- "task_display": {
- "key": "task_30019",
- "text": "赠送30次友情点"
- },
- "type_id": 4011003,
- "active": 0,
- "id_after": 4011004,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30020,
- "id_list": 39,
- "id_tag": 3,
- "task_display": {
- "key": "task_30020",
- "text": "赠送50次友情点"
- },
- "type_id": 4011004,
- "active": 0,
- "id_after": 4011005,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30021,
- "id_list": 40,
- "id_tag": 3,
- "task_display": {
- "key": "task_30021",
- "text": "赠送100次友情点"
- },
- "type_id": 4011005,
- "active": 0,
- "id_after": 4011006,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30022,
- "id_list": 41,
- "id_tag": 3,
- "task_display": {
- "key": "task_30022",
- "text": "赠送300次友情点"
- },
- "type_id": 4011006,
- "active": 0,
- "id_after": 4011007,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30023,
- "id_list": 42,
- "id_tag": 3,
- "task_display": {
- "key": "task_30023",
- "text": "赠送500次友情点"
- },
- "type_id": 4011007,
- "active": 0,
- "id_after": 4011008,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30024,
- "id_list": 43,
- "id_tag": 3,
- "task_display": {
- "key": "task_30024",
- "text": "赠送1000次友情点"
- },
- "type_id": 4011008,
- "active": 0,
- "id_after": 4011009,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30025,
- "id_list": 44,
- "id_tag": 3,
- "task_display": {
- "key": "task_30025",
- "text": "赠送3000次友情点"
- },
- "type_id": 4011009,
- "active": 0,
- "id_after": 4011010,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30026,
- "id_list": 45,
- "id_tag": 3,
- "task_display": {
- "key": "task_30026",
- "text": "赠送5000次友情点"
- },
- "type_id": 4011010,
- "active": 0,
- "id_after": 4011011,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
- },
- {
- "key": 30027,
- "id_list": 46,
- "id_tag": 3,
- "task_display": {
- "key": "task_30027",
- "text": "赠送10000次友情点"
- },
- "type_id": 4011011,
- "active": 0,
- "id_after": 0,
- "jump_interface": 115,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 110
- }
- ]
- },
- {
- "key": 30028,
- "id_list": 47,
- "id_tag": 3,
- "task_display": {
- "key": "task_30028",
- "text": "使用好友助战英雄1次"
- },
- "type_id": 4012001,
- "active": 0,
- "id_after": 4012002,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30029,
- "id_list": 48,
- "id_tag": 3,
- "task_display": {
- "key": "task_30029",
- "text": "使用好友助战英雄5次"
- },
- "type_id": 4012002,
- "active": 0,
- "id_after": 4012003,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30030,
- "id_list": 49,
- "id_tag": 3,
- "task_display": {
- "key": "task_30030",
- "text": "使用好友助战英雄10次"
- },
- "type_id": 4012003,
- "active": 0,
- "id_after": 4012004,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30031,
- "id_list": 50,
- "id_tag": 3,
- "task_display": {
- "key": "task_30031",
- "text": "使用好友助战英雄30次"
- },
- "type_id": 4012004,
- "active": 0,
- "id_after": 4012005,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30032,
- "id_list": 51,
- "id_tag": 3,
- "task_display": {
- "key": "task_30032",
- "text": "使用好友助战英雄50次"
- },
- "type_id": 4012005,
- "active": 0,
- "id_after": 4012006,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30033,
- "id_list": 52,
- "id_tag": 3,
- "task_display": {
- "key": "task_30033",
- "text": "使用好友助战英雄100次"
- },
- "type_id": 4012006,
- "active": 0,
- "id_after": 4012007,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30034,
- "id_list": 53,
- "id_tag": 3,
- "task_display": {
- "key": "task_30034",
- "text": "使用好友助战英雄300次"
- },
- "type_id": 4012007,
- "active": 0,
- "id_after": 4012008,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30035,
- "id_list": 54,
- "id_tag": 3,
- "task_display": {
- "key": "task_30035",
- "text": "使用好友助战英雄500次"
- },
- "type_id": 4012008,
- "active": 0,
- "id_after": 4012009,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30036,
- "id_list": 55,
- "id_tag": 3,
- "task_display": {
- "key": "task_30036",
- "text": "使用好友助战英雄1000次"
- },
- "type_id": 4012009,
- "active": 0,
- "id_after": 0,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30037,
- "id_list": 56,
- "id_tag": 3,
- "task_display": {
- "key": "task_30037",
- "text": "招募获得个15星以上品质英雄"
- },
- "type_id": 4016001,
- "active": 0,
- "id_after": 4016002,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30038,
- "id_list": 57,
- "id_tag": 3,
- "task_display": {
- "key": "task_30038",
- "text": "招募获得个25星以上品质英雄"
- },
- "type_id": 4016002,
- "active": 0,
- "id_after": 4016003,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30039,
- "id_list": 58,
- "id_tag": 3,
- "task_display": {
- "key": "task_30039",
- "text": "招募获得个35星以上品质英雄"
- },
- "type_id": 4016003,
- "active": 0,
- "id_after": 4016004,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30040,
- "id_list": 59,
- "id_tag": 3,
- "task_display": {
- "key": "task_30040",
- "text": "招募获得个55星以上品质英雄"
- },
- "type_id": 4016004,
- "active": 0,
- "id_after": 4016005,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30041,
- "id_list": 60,
- "id_tag": 3,
- "task_display": {
- "key": "task_30041",
- "text": "招募获得个105星以上品质英雄"
- },
- "type_id": 4016005,
- "active": 0,
- "id_after": 4016006,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30042,
- "id_list": 61,
- "id_tag": 3,
- "task_display": {
- "key": "task_30042",
- "text": "招募获得个155星以上品质英雄"
- },
- "type_id": 4016006,
- "active": 0,
- "id_after": 4016007,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30043,
- "id_list": 62,
- "id_tag": 3,
- "task_display": {
- "key": "task_30043",
- "text": "招募获得个205星以上品质英雄"
- },
- "type_id": 4016007,
- "active": 0,
- "id_after": 4016008,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30044,
- "id_list": 63,
- "id_tag": 3,
- "task_display": {
- "key": "task_30044",
- "text": "招募获得个305星以上品质英雄"
- },
- "type_id": 4016008,
- "active": 0,
- "id_after": 4016009,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30045,
- "id_list": 64,
- "id_tag": 3,
- "task_display": {
- "key": "task_30045",
- "text": "招募获得个505星以上品质英雄"
- },
- "type_id": 4016009,
- "active": 0,
- "id_after": 0,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30046,
- "id_list": 65,
- "id_tag": 3,
- "task_display": {
- "key": "task_30046",
- "text": "累计进行10次普通招募"
- },
- "type_id": 4018001,
- "active": 0,
- "id_after": 4018002,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30047,
- "id_list": 66,
- "id_tag": 3,
- "task_display": {
- "key": "task_30047",
- "text": "累计进行20次普通招募"
- },
- "type_id": 4018002,
- "active": 0,
- "id_after": 4018003,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30048,
- "id_list": 67,
- "id_tag": 3,
- "task_display": {
- "key": "task_30048",
- "text": "累计进行30次普通招募"
- },
- "type_id": 4018003,
- "active": 0,
- "id_after": 4018004,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30049,
- "id_list": 68,
- "id_tag": 3,
- "task_display": {
- "key": "task_30049",
- "text": "累计进行50次普通招募"
- },
- "type_id": 4018004,
- "active": 0,
- "id_after": 4018005,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30050,
- "id_list": 69,
- "id_tag": 3,
- "task_display": {
- "key": "task_30050",
- "text": "累计进行100次普通招募"
- },
- "type_id": 4018005,
- "active": 0,
- "id_after": 4018006,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30051,
- "id_list": 70,
- "id_tag": 3,
- "task_display": {
- "key": "task_30051",
- "text": "累计进行200次普通招募"
- },
- "type_id": 4018006,
- "active": 0,
- "id_after": 4018007,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30052,
- "id_list": 71,
- "id_tag": 3,
- "task_display": {
- "key": "task_30052",
- "text": "累计进行300次普通招募"
- },
- "type_id": 4018007,
- "active": 0,
- "id_after": 4018008,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30053,
- "id_list": 72,
- "id_tag": 3,
- "task_display": {
- "key": "task_30053",
- "text": "累计进行500次普通招募"
- },
- "type_id": 4018008,
- "active": 0,
- "id_after": 4018009,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30054,
- "id_list": 73,
- "id_tag": 3,
- "task_display": {
- "key": "task_30054",
- "text": "累计进行1000次普通招募"
- },
- "type_id": 4018009,
- "active": 0,
- "id_after": 4018010,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30055,
- "id_list": 74,
- "id_tag": 3,
- "task_display": {
- "key": "task_30055",
- "text": "累计进行2000次普通招募"
- },
- "type_id": 4018010,
- "active": 0,
- "id_after": 4018011,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
- },
- {
- "key": 30056,
- "id_list": 75,
- "id_tag": 3,
- "task_display": {
- "key": "task_30056",
- "text": "累计进行5000次普通招募"
- },
- "type_id": 4018011,
- "active": 0,
- "id_after": 4018012,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 110
- }
- ]
- },
- {
- "key": 30057,
- "id_list": 76,
- "id_tag": 3,
- "task_display": {
- "key": "task_30057",
- "text": "累计进行10000次普通招募"
- },
- "type_id": 4018012,
- "active": 0,
- "id_after": 0,
- "jump_interface": 107,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 120
- }
- ]
- },
- {
- "key": 30058,
- "id_list": 77,
- "id_tag": 3,
- "task_display": {
- "key": "task_30058",
- "text": "账号等级达到10级"
- },
- "type_id": 4020001,
- "active": 0,
- "id_after": 4020002,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30059,
- "id_list": 78,
- "id_tag": 3,
- "task_display": {
- "key": "task_30059",
- "text": "账号等级达到20级"
- },
- "type_id": 4020002,
- "active": 0,
- "id_after": 4020003,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30060,
- "id_list": 79,
- "id_tag": 3,
- "task_display": {
- "key": "task_30060",
- "text": "账号等级达到30级"
- },
- "type_id": 4020003,
- "active": 0,
- "id_after": 4020004,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30061,
- "id_list": 80,
- "id_tag": 3,
- "task_display": {
- "key": "task_30061",
- "text": "账号等级达到40级"
- },
- "type_id": 4020004,
- "active": 0,
- "id_after": 4020005,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30062,
- "id_list": 81,
- "id_tag": 3,
- "task_display": {
- "key": "task_30062",
- "text": "账号等级达到50级"
- },
- "type_id": 4020005,
- "active": 0,
- "id_after": 4020006,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30063,
- "id_list": 82,
- "id_tag": 3,
- "task_display": {
- "key": "task_30063",
- "text": "账号等级达到60级"
- },
- "type_id": 4020006,
- "active": 0,
- "id_after": 0,
- "jump_interface": 113,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30064,
- "id_list": 83,
- "id_tag": 3,
- "task_display": {
- "key": "task_30064",
- "text": "件装备强化至15级1"
- },
- "type_id": 4043001,
- "active": 0,
- "id_after": 4043002,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30065,
- "id_list": 84,
- "id_tag": 3,
- "task_display": {
- "key": "task_30065",
- "text": "件装备强化至15级2"
- },
- "type_id": 4043002,
- "active": 0,
- "id_after": 4043003,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30066,
- "id_list": 85,
- "id_tag": 3,
- "task_display": {
- "key": "task_30066",
- "text": "件装备强化至15级4"
- },
- "type_id": 4043003,
- "active": 0,
- "id_after": 4043004,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30067,
- "id_list": 86,
- "id_tag": 3,
- "task_display": {
- "key": "task_30067",
- "text": "件装备强化至15级6"
- },
- "type_id": 4043004,
- "active": 0,
- "id_after": 4043005,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30068,
- "id_list": 87,
- "id_tag": 3,
- "task_display": {
- "key": "task_30068",
- "text": "件装备强化至15级12"
- },
- "type_id": 4043005,
- "active": 0,
- "id_after": 4043006,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30069,
- "id_list": 88,
- "id_tag": 3,
- "task_display": {
- "key": "task_30069",
- "text": "件装备强化至15级18"
- },
- "type_id": 4043006,
- "active": 0,
- "id_after": 4043007,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30070,
- "id_list": 89,
- "id_tag": 3,
- "task_display": {
- "key": "task_30070",
- "text": "件装备强化至15级24"
- },
- "type_id": 4043007,
- "active": 0,
- "id_after": 4043008,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30071,
- "id_list": 90,
- "id_tag": 3,
- "task_display": {
- "key": "task_30071",
- "text": "件装备强化至15级30"
- },
- "type_id": 4043008,
- "active": 0,
- "id_after": 4043009,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30072,
- "id_list": 91,
- "id_tag": 3,
- "task_display": {
- "key": "task_30072",
- "text": "件装备强化至15级60"
- },
- "type_id": 4043009,
- "active": 0,
- "id_after": 4043010,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30073,
- "id_list": 92,
- "id_tag": 3,
- "task_display": {
- "key": "task_30073",
- "text": "件装备强化至15级120"
- },
- "type_id": 4043010,
- "active": 0,
- "id_after": 0,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
- },
- {
- "key": 30074,
- "id_list": 93,
- "id_tag": 3,
- "task_display": {
- "key": "task_30074",
- "text": "累计强化装备成功10次"
- },
- "type_id": 4047001,
- "active": 0,
- "id_after": 4047002,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30075,
- "id_list": 94,
- "id_tag": 3,
- "task_display": {
- "key": "task_30075",
- "text": "累计强化装备成功20次"
- },
- "type_id": 4047002,
- "active": 0,
- "id_after": 4047003,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30076,
- "id_list": 95,
- "id_tag": 3,
- "task_display": {
- "key": "task_30076",
- "text": "累计强化装备成功30次"
- },
- "type_id": 4047003,
- "active": 0,
- "id_after": 4047004,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30077,
- "id_list": 96,
- "id_tag": 3,
- "task_display": {
- "key": "task_30077",
- "text": "累计强化装备成功50次"
- },
- "type_id": 4047004,
- "active": 0,
- "id_after": 4047005,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30078,
- "id_list": 97,
- "id_tag": 3,
- "task_display": {
- "key": "task_30078",
- "text": "累计强化装备成功100次"
- },
- "type_id": 4047005,
- "active": 0,
- "id_after": 4047006,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30079,
- "id_list": 98,
- "id_tag": 3,
- "task_display": {
- "key": "task_30079",
- "text": "累计强化装备成功200次"
- },
- "type_id": 4047006,
- "active": 0,
- "id_after": 4047007,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30080,
- "id_list": 99,
- "id_tag": 3,
- "task_display": {
- "key": "task_30080",
- "text": "累计强化装备成功300次"
- },
- "type_id": 4047007,
- "active": 0,
- "id_after": 4047008,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30081,
- "id_list": 100,
- "id_tag": 3,
- "task_display": {
- "key": "task_30081",
- "text": "累计强化装备成功500次"
- },
- "type_id": 4047008,
- "active": 0,
- "id_after": 4047009,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30082,
- "id_list": 101,
- "id_tag": 3,
- "task_display": {
- "key": "task_30082",
- "text": "累计强化装备成功1000次"
- },
- "type_id": 4047009,
- "active": 0,
- "id_after": 4047010,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30083,
- "id_list": 102,
- "id_tag": 3,
- "task_display": {
- "key": "task_30083",
- "text": "累计强化装备成功2000次"
- },
- "type_id": 4047010,
- "active": 0,
- "id_after": 4047011,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
- },
- {
- "key": 30084,
- "id_list": 103,
- "id_tag": 3,
- "task_display": {
- "key": "task_30084",
- "text": "累计强化装备成功3000次"
- },
- "type_id": 4047011,
- "active": 0,
- "id_after": 4047012,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 110
- }
- ]
- },
- {
- "key": 30085,
- "id_list": 104,
- "id_tag": 3,
- "task_display": {
- "key": "task_30085",
- "text": "累计强化装备成功5000次"
- },
- "type_id": 4047012,
- "active": 0,
- "id_after": 4047013,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 120
- }
- ]
- },
- {
- "key": 30086,
- "id_list": 105,
- "id_tag": 3,
- "task_display": {
- "key": "task_30086",
- "text": "累计强化装备成功10000次"
- },
- "type_id": 4047013,
- "active": 0,
- "id_after": 0,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 130
- }
- ]
- },
- {
- "key": 30087,
- "id_list": 106,
- "id_tag": 3,
- "task_display": {
- "key": "task_30087",
- "text": "在商店购买5份商品"
- },
- "type_id": 4064001,
- "active": 0,
- "id_after": 4064002,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30088,
- "id_list": 107,
- "id_tag": 3,
- "task_display": {
- "key": "task_30088",
- "text": "在商店购买10份商品"
- },
- "type_id": 4064002,
- "active": 0,
- "id_after": 4064003,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30089,
- "id_list": 108,
- "id_tag": 3,
- "task_display": {
- "key": "task_30089",
- "text": "在商店购买20份商品"
- },
- "type_id": 4064003,
- "active": 0,
- "id_after": 4064004,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30090,
- "id_list": 109,
- "id_tag": 3,
- "task_display": {
- "key": "task_30090",
- "text": "在商店购买50份商品"
- },
- "type_id": 4064004,
- "active": 0,
- "id_after": 4064005,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30091,
- "id_list": 110,
- "id_tag": 3,
- "task_display": {
- "key": "task_30091",
- "text": "在商店购买100份商品"
- },
- "type_id": 4064005,
- "active": 0,
- "id_after": 4064006,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30092,
- "id_list": 111,
- "id_tag": 3,
- "task_display": {
- "key": "task_30092",
- "text": "在商店购买200份商品"
- },
- "type_id": 4064006,
- "active": 0,
- "id_after": 4064007,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30093,
- "id_list": 112,
- "id_tag": 3,
- "task_display": {
- "key": "task_30093",
- "text": "在商店购买500份商品"
- },
- "type_id": 4064007,
- "active": 0,
- "id_after": 0,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30094,
- "id_list": 113,
- "id_tag": 3,
- "task_display": {
- "key": "task_30094",
- "text": "累计消费50000金币"
- },
- "type_id": 4068001,
- "active": 0,
- "id_after": 4068002,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30095,
- "id_list": 114,
- "id_tag": 3,
- "task_display": {
- "key": "task_30095",
- "text": "累计消费500000金币"
- },
- "type_id": 4068002,
- "active": 0,
- "id_after": 4068003,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30096,
- "id_list": 115,
- "id_tag": 3,
- "task_display": {
- "key": "task_30096",
- "text": "累计消费5000000金币"
- },
- "type_id": 4068003,
- "active": 0,
- "id_after": 4068004,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30097,
- "id_list": 116,
- "id_tag": 3,
- "task_display": {
- "key": "task_30097",
- "text": "累计消费50000000金币"
- },
- "type_id": 4068004,
- "active": 0,
- "id_after": 0,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30098,
- "id_list": 117,
- "id_tag": 3,
- "task_display": {
- "key": "task_30098",
- "text": "普通塔达到10层"
- },
- "type_id": 4084001,
- "active": 0,
- "id_after": 4084002,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30099,
- "id_list": 118,
- "id_tag": 3,
- "task_display": {
- "key": "task_30099",
- "text": "普通塔达到20层"
- },
- "type_id": 4084002,
- "active": 0,
- "id_after": 4084003,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30100,
- "id_list": 119,
- "id_tag": 3,
- "task_display": {
- "key": "task_30100",
- "text": "普通塔达到50层"
- },
- "type_id": 4084003,
- "active": 0,
- "id_after": 4084004,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30101,
- "id_list": 120,
- "id_tag": 3,
- "task_display": {
- "key": "task_30101",
- "text": "普通塔达到100层"
- },
- "type_id": 4084004,
- "active": 0,
- "id_after": 0,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30102,
- "id_list": 121,
- "id_tag": 3,
- "task_display": {
- "key": "task_30102",
- "text": "赛季塔达到5层"
- },
- "type_id": 4085001,
- "active": 0,
- "id_after": 4085002,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30103,
- "id_list": 122,
- "id_tag": 3,
- "task_display": {
- "key": "task_30103",
- "text": "赛季塔达到10层"
- },
- "type_id": 4085002,
- "active": 0,
- "id_after": 4085003,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30104,
- "id_list": 123,
- "id_tag": 3,
- "task_display": {
- "key": "task_30104",
- "text": "赛季塔达到20层"
- },
- "type_id": 4085003,
- "active": 0,
- "id_after": 4085004,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30105,
- "id_list": 124,
- "id_tag": 3,
- "task_display": {
- "key": "task_30105",
- "text": "赛季塔达到30层"
- },
- "type_id": 4085004,
- "active": 0,
- "id_after": 4085005,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30106,
- "id_list": 125,
- "id_tag": 3,
- "task_display": {
- "key": "task_30106",
- "text": "赛季塔达到50层"
- },
- "type_id": 4085005,
- "active": 0,
- "id_after": 0,
- "jump_interface": 120,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30107,
- "id_list": 126,
- "id_tag": 3,
- "task_display": {
- "key": "task_30107",
- "text": "装备累计强化失败10次"
- },
- "type_id": 4096001,
- "active": 0,
- "id_after": 4096002,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30108,
- "id_list": 127,
- "id_tag": 3,
- "task_display": {
- "key": "task_30108",
- "text": "装备累计强化失败20次"
- },
- "type_id": 4096002,
- "active": 0,
- "id_after": 4096003,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30109,
- "id_list": 128,
- "id_tag": 3,
- "task_display": {
- "key": "task_30109",
- "text": "装备累计强化失败50次"
- },
- "type_id": 4096003,
- "active": 0,
- "id_after": 4096004,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30110,
- "id_list": 129,
- "id_tag": 3,
- "task_display": {
- "key": "task_30110",
- "text": "装备累计强化失败100次"
- },
- "type_id": 4096004,
- "active": 0,
- "id_after": 4096005,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30111,
- "id_list": 130,
- "id_tag": 3,
- "task_display": {
- "key": "task_30111",
- "text": "装备累计强化失败200次"
- },
- "type_id": 4096005,
- "active": 0,
- "id_after": 4096006,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30112,
- "id_list": 131,
- "id_tag": 3,
- "task_display": {
- "key": "task_30112",
- "text": "装备累计强化失败300次"
- },
- "type_id": 4096006,
- "active": 0,
- "id_after": 4096007,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30113,
- "id_list": 132,
- "id_tag": 3,
- "task_display": {
- "key": "task_30113",
- "text": "装备累计强化失败500次"
- },
- "type_id": 4096007,
- "active": 0,
- "id_after": 4096008,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30114,
- "id_list": 133,
- "id_tag": 3,
- "task_display": {
- "key": "task_30114",
- "text": "装备累计强化失败1000次"
- },
- "type_id": 4096008,
- "active": 0,
- "id_after": 4096009,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30115,
- "id_list": 134,
- "id_tag": 3,
- "task_display": {
- "key": "task_30115",
- "text": "装备累计强化失败2000次"
- },
- "type_id": 4096009,
- "active": 0,
- "id_after": 4096010,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30116,
- "id_list": 135,
- "id_tag": 3,
- "task_display": {
- "key": "task_30116",
- "text": "装备累计强化失败3000次"
- },
- "type_id": 4096010,
- "active": 0,
- "id_after": 4096011,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
- },
- {
- "key": 30117,
- "id_list": 136,
- "id_tag": 3,
- "task_display": {
- "key": "task_30117",
- "text": "装备累计强化失败5000次"
- },
- "type_id": 4096011,
- "active": 0,
- "id_after": 4096012,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 110
- }
- ]
- },
- {
- "key": 30118,
- "id_list": 137,
- "id_tag": 3,
- "task_display": {
- "key": "task_30118",
- "text": "装备累计强化失败10000次"
- },
- "type_id": 4096012,
- "active": 0,
- "id_after": 0,
- "jump_interface": 102,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 120
- }
- ]
- },
- {
- "key": 30119,
- "id_list": 138,
- "id_tag": 3,
- "task_display": {
- "key": "task_30119",
- "text": "累计消费500钻石"
- },
- "type_id": 4104001,
- "active": 0,
- "id_after": 4104002,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30120,
- "id_list": 139,
- "id_tag": 3,
- "task_display": {
- "key": "task_30120",
- "text": "累计消费1000钻石"
- },
- "type_id": 4104002,
- "active": 0,
- "id_after": 4104003,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30121,
- "id_list": 140,
- "id_tag": 3,
- "task_display": {
- "key": "task_30121",
- "text": "累计消费3000钻石"
- },
- "type_id": 4104003,
- "active": 0,
- "id_after": 4104004,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30122,
- "id_list": 141,
- "id_tag": 3,
- "task_display": {
- "key": "task_30122",
- "text": "累计消费5000钻石"
- },
- "type_id": 4104004,
- "active": 0,
- "id_after": 4104005,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30123,
- "id_list": 142,
- "id_tag": 3,
- "task_display": {
- "key": "task_30123",
- "text": "累计消费10000钻石"
- },
- "type_id": 4104005,
- "active": 0,
- "id_after": 4104006,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30124,
- "id_list": 143,
- "id_tag": 3,
- "task_display": {
- "key": "task_30124",
- "text": "累计消费20000钻石"
- },
- "type_id": 4104006,
- "active": 0,
- "id_after": 4104007,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30125,
- "id_list": 144,
- "id_tag": 3,
- "task_display": {
- "key": "task_30125",
- "text": "累计消费30000钻石"
- },
- "type_id": 4104007,
- "active": 0,
- "id_after": 4104008,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30126,
- "id_list": 145,
- "id_tag": 3,
- "task_display": {
- "key": "task_30126",
- "text": "累计消费50000钻石"
- },
- "type_id": 4104008,
- "active": 0,
- "id_after": 4104009,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30127,
- "id_list": 146,
- "id_tag": 3,
- "task_display": {
- "key": "task_30127",
- "text": "累计消费100000钻石"
- },
- "type_id": 4104009,
- "active": 0,
- "id_after": 4104010,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30128,
- "id_list": 147,
- "id_tag": 3,
- "task_display": {
- "key": "task_30128",
- "text": "累计消费200000钻石"
- },
- "type_id": 4104010,
- "active": 0,
- "id_after": 4104011,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
- },
- {
- "key": 30129,
- "id_list": 148,
- "id_tag": 3,
- "task_display": {
- "key": "task_30129",
- "text": "累计消费500000钻石"
- },
- "type_id": 4104011,
- "active": 0,
- "id_after": 0,
- "jump_interface": 122,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 110
- }
- ]
- },
- {
- "key": 30130,
- "id_list": 149,
- "id_tag": 3,
- "task_display": {
- "key": "task_30130",
- "text": "竞技场积分达到1100分"
- },
- "type_id": 4128001,
- "active": 0,
- "id_after": 4128002,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30131,
- "id_list": 150,
- "id_tag": 3,
- "task_display": {
- "key": "task_30131",
- "text": "竞技场积分达到1200分"
- },
- "type_id": 4128002,
- "active": 0,
- "id_after": 4128003,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30132,
- "id_list": 151,
- "id_tag": 3,
- "task_display": {
- "key": "task_30132",
- "text": "竞技场积分达到1300分"
- },
- "type_id": 4128003,
- "active": 0,
- "id_after": 4128004,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30133,
- "id_list": 152,
- "id_tag": 3,
- "task_display": {
- "key": "task_30133",
- "text": "竞技场积分达到1400分"
- },
- "type_id": 4128004,
- "active": 0,
- "id_after": 4128005,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30134,
- "id_list": 153,
- "id_tag": 3,
- "task_display": {
- "key": "task_30134",
- "text": "竞技场积分达到1500分"
- },
- "type_id": 4128005,
- "active": 0,
- "id_after": 4128006,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30135,
- "id_list": 154,
- "id_tag": 3,
- "task_display": {
- "key": "task_30135",
- "text": "竞技场积分达到1600分"
- },
- "type_id": 4128006,
- "active": 0,
- "id_after": 4128007,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30136,
- "id_list": 155,
- "id_tag": 3,
- "task_display": {
- "key": "task_30136",
- "text": "竞技场积分达到1700分"
- },
- "type_id": 4128007,
- "active": 0,
- "id_after": 4128008,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30137,
- "id_list": 156,
- "id_tag": 3,
- "task_display": {
- "key": "task_30137",
- "text": "竞技场积分达到1800分"
- },
- "type_id": 4128008,
- "active": 0,
- "id_after": 4128009,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30138,
- "id_list": 157,
- "id_tag": 3,
- "task_display": {
- "key": "task_30138",
- "text": "竞技场积分达到1900分"
- },
- "type_id": 4128009,
- "active": 0,
- "id_after": 4128010,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30139,
- "id_list": 158,
- "id_tag": 3,
- "task_display": {
- "key": "task_30139",
- "text": "竞技场积分达到2000分"
- },
- "type_id": 4128010,
- "active": 0,
- "id_after": 0,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
- },
- {
- "key": 30140,
- "id_list": 159,
- "id_tag": 3,
- "task_display": {
- "key": "task_30140",
- "text": "竞技场累计获胜5场"
- },
- "type_id": 4131001,
- "active": 0,
- "id_after": 4131002,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 10
- }
- ]
- },
- {
- "key": 30141,
- "id_list": 160,
- "id_tag": 3,
- "task_display": {
- "key": "task_30141",
- "text": "竞技场累计获胜10场"
- },
- "type_id": 4131002,
- "active": 0,
- "id_after": 4131003,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 20
- }
- ]
- },
- {
- "key": 30142,
- "id_list": 161,
- "id_tag": 3,
- "task_display": {
- "key": "task_30142",
- "text": "竞技场累计获胜20场"
- },
- "type_id": 4131003,
- "active": 0,
- "id_after": 4131004,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 30
- }
- ]
- },
- {
- "key": 30143,
- "id_list": 162,
- "id_tag": 3,
- "task_display": {
- "key": "task_30143",
- "text": "竞技场累计获胜30场"
- },
- "type_id": 4131004,
- "active": 0,
- "id_after": 4131005,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 40
- }
- ]
- },
- {
- "key": 30144,
- "id_list": 163,
- "id_tag": 3,
- "task_display": {
- "key": "task_30144",
- "text": "竞技场累计获胜50场"
- },
- "type_id": 4131005,
- "active": 0,
- "id_after": 4131006,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 50
- }
- ]
- },
- {
- "key": 30145,
- "id_list": 164,
- "id_tag": 3,
- "task_display": {
- "key": "task_30145",
- "text": "竞技场累计获胜100场"
- },
- "type_id": 4131006,
- "active": 0,
- "id_after": 4131007,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 60
- }
- ]
- },
- {
- "key": 30146,
- "id_list": 165,
- "id_tag": 3,
- "task_display": {
- "key": "task_30146",
- "text": "竞技场累计获胜200场"
- },
- "type_id": 4131007,
- "active": 0,
- "id_after": 4131008,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 70
- }
- ]
- },
- {
- "key": 30147,
- "id_list": 166,
- "id_tag": 3,
- "task_display": {
- "key": "task_30147",
- "text": "竞技场累计获胜300场"
- },
- "type_id": 4131008,
- "active": 0,
- "id_after": 4131009,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 80
- }
- ]
- },
- {
- "key": 30148,
- "id_list": 167,
- "id_tag": 3,
- "task_display": {
- "key": "task_30148",
- "text": "竞技场累计获胜500场"
- },
- "type_id": 4131009,
- "active": 0,
- "id_after": 4131010,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 90
- }
- ]
- },
- {
- "key": 30149,
- "id_list": 168,
- "id_tag": 3,
- "task_display": {
- "key": "task_30149",
- "text": "竞技场累计获胜1000场"
- },
- "type_id": 4131010,
- "active": 0,
- "id_after": 0,
- "jump_interface": 156,
- "icon": "rw_cj_icon10",
- "reword": [
- {
- "a": "attr",
- "t": "diamond",
- "n": 100
- }
- ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json
index 091aa4b21..231ed9d81 100644
--- a/bin/json/game_vikingboss.json
+++ b/bin/json/game_vikingboss.json
@@ -8,7 +8,7 @@
"text": "火焰泰坦"
},
"difficulty": 1,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -45,8 +45,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301011,
- 301012,
301013
],
"ps_consume": [
@@ -73,7 +71,7 @@
"text": "火焰泰坦"
},
"difficulty": 2,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -110,8 +108,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301014,
- 301015,
301016
],
"ps_consume": [
@@ -138,7 +134,7 @@
"text": "火焰泰坦"
},
"difficulty": 3,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -175,8 +171,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301017,
- 301018,
301019
],
"ps_consume": [
@@ -203,7 +197,7 @@
"text": "火焰泰坦"
},
"difficulty": 4,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -240,8 +234,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301020,
- 301021,
301022
],
"ps_consume": [
@@ -268,7 +260,7 @@
"text": "火焰泰坦"
},
"difficulty": 5,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -305,8 +297,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301023,
- 301024,
301025
],
"ps_consume": [
@@ -333,7 +323,7 @@
"text": "火焰泰坦"
},
"difficulty": 6,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -370,8 +360,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301026,
- 301027,
301028
],
"ps_consume": [
@@ -398,7 +386,7 @@
"text": "火焰泰坦"
},
"difficulty": 7,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -435,8 +423,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301029,
- 301030,
301031
],
"ps_consume": [
@@ -463,7 +449,7 @@
"text": "火焰泰坦"
},
"difficulty": 8,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -500,8 +486,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301032,
- 301033,
301034
],
"ps_consume": [
@@ -528,7 +512,7 @@
"text": "火焰泰坦"
},
"difficulty": 9,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -565,8 +549,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301035,
- 301036,
301037
],
"ps_consume": [
@@ -593,7 +575,7 @@
"text": "火焰泰坦"
},
"difficulty": 10,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -630,8 +612,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301038,
- 301039,
301040
],
"ps_consume": [
@@ -658,7 +638,7 @@
"text": "冰之泰坦"
},
"difficulty": 1,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -695,8 +675,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302011,
- 302012,
302013
],
"ps_consume": [
@@ -723,7 +701,7 @@
"text": "冰之泰坦"
},
"difficulty": 2,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -760,8 +738,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302014,
- 302015,
302016
],
"ps_consume": [
@@ -788,7 +764,7 @@
"text": "冰之泰坦"
},
"difficulty": 3,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -825,8 +801,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302017,
- 302018,
302019
],
"ps_consume": [
@@ -853,7 +827,7 @@
"text": "冰之泰坦"
},
"difficulty": 4,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -890,8 +864,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302020,
- 302021,
302022
],
"ps_consume": [
@@ -918,7 +890,7 @@
"text": "冰之泰坦"
},
"difficulty": 5,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -955,8 +927,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302023,
- 302024,
302025
],
"ps_consume": [
@@ -983,7 +953,7 @@
"text": "冰之泰坦"
},
"difficulty": 6,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1020,8 +990,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302026,
- 302027,
302028
],
"ps_consume": [
@@ -1048,7 +1016,7 @@
"text": "冰之泰坦"
},
"difficulty": 7,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1085,8 +1053,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302029,
- 302030,
302031
],
"ps_consume": [
@@ -1113,7 +1079,7 @@
"text": "冰之泰坦"
},
"difficulty": 8,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1150,8 +1116,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302032,
- 302033,
302034
],
"ps_consume": [
@@ -1178,7 +1142,7 @@
"text": "冰之泰坦"
},
"difficulty": 9,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1215,8 +1179,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302035,
- 302036,
302037
],
"ps_consume": [
@@ -1243,7 +1205,7 @@
"text": "冰之泰坦"
},
"difficulty": 10,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1280,8 +1242,6 @@
"bossmodel": 11003,
"boss_skill": 51004,
"boss": [
- 302038,
- 302039,
302040
],
"ps_consume": [
@@ -1308,7 +1268,7 @@
"text": "森林泰坦"
},
"difficulty": 1,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1345,8 +1305,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303011,
- 303012,
303013
],
"ps_consume": [
@@ -1373,7 +1331,7 @@
"text": "森林泰坦"
},
"difficulty": 2,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1410,8 +1368,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303014,
- 303015,
303016
],
"ps_consume": [
@@ -1438,7 +1394,7 @@
"text": "森林泰坦"
},
"difficulty": 3,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1475,8 +1431,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303017,
- 303018,
303019
],
"ps_consume": [
@@ -1503,7 +1457,7 @@
"text": "森林泰坦"
},
"difficulty": 4,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1540,8 +1494,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303020,
- 303021,
303022
],
"ps_consume": [
@@ -1568,7 +1520,7 @@
"text": "森林泰坦"
},
"difficulty": 5,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1605,8 +1557,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303023,
- 303024,
303025
],
"ps_consume": [
@@ -1633,7 +1583,7 @@
"text": "森林泰坦"
},
"difficulty": 6,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1670,8 +1620,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303026,
- 303027,
303028
],
"ps_consume": [
@@ -1698,7 +1646,7 @@
"text": "森林泰坦"
},
"difficulty": 7,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1735,8 +1683,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303029,
- 303030,
303031
],
"ps_consume": [
@@ -1763,7 +1709,7 @@
"text": "森林泰坦"
},
"difficulty": 8,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1800,8 +1746,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303032,
- 303033,
303034
],
"ps_consume": [
@@ -1828,7 +1772,7 @@
"text": "森林泰坦"
},
"difficulty": 9,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1865,8 +1809,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303035,
- 303036,
303037
],
"ps_consume": [
@@ -1893,7 +1835,7 @@
"text": "森林泰坦"
},
"difficulty": 10,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -1930,8 +1872,6 @@
"bossmodel": 11018,
"boss_skill": 51004,
"boss": [
- 303038,
- 303039,
303040
],
"ps_consume": [
@@ -1958,7 +1898,7 @@
"text": "武器BOSS"
},
"difficulty": 1,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2000,8 +1940,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301011,
- 301012,
301013
],
"ps_consume": [
@@ -2028,7 +1966,7 @@
"text": "武器BOSS"
},
"difficulty": 2,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2070,8 +2008,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301014,
- 301015,
301016
],
"ps_consume": [
@@ -2098,7 +2034,7 @@
"text": "武器BOSS"
},
"difficulty": 3,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2140,8 +2076,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301017,
- 301018,
301019
],
"ps_consume": [
@@ -2168,7 +2102,7 @@
"text": "武器BOSS"
},
"difficulty": 4,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2210,8 +2144,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301020,
- 301021,
301022
],
"ps_consume": [
@@ -2238,7 +2170,7 @@
"text": "武器BOSS"
},
"difficulty": 5,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2280,8 +2212,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301023,
- 301024,
301025
],
"ps_consume": [
@@ -2308,7 +2238,7 @@
"text": "武器BOSS"
},
"difficulty": 6,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2350,8 +2280,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301026,
- 301027,
301028
],
"ps_consume": [
@@ -2378,7 +2306,7 @@
"text": "武器BOSS"
},
"difficulty": 7,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2420,8 +2348,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301029,
- 301030,
301031
],
"ps_consume": [
@@ -2448,7 +2374,7 @@
"text": "武器BOSS"
},
"difficulty": 8,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2490,8 +2416,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301032,
- 301033,
301034
],
"ps_consume": [
@@ -2518,7 +2442,7 @@
"text": "武器BOSS"
},
"difficulty": 9,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2560,8 +2484,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301035,
- 301036,
301037
],
"ps_consume": [
@@ -2588,7 +2510,7 @@
"text": "武器BOSS"
},
"difficulty": 10,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2630,8 +2552,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301038,
- 301039,
301040
],
"ps_consume": [
@@ -2658,7 +2578,7 @@
"text": "饰品BOSS"
},
"difficulty": 1,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2700,8 +2620,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301011,
- 301012,
301013
],
"ps_consume": [
@@ -2728,7 +2646,7 @@
"text": "饰品BOSS"
},
"difficulty": 2,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2770,8 +2688,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301014,
- 301015,
301016
],
"ps_consume": [
@@ -2798,7 +2714,7 @@
"text": "饰品BOSS"
},
"difficulty": 3,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2840,8 +2756,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301017,
- 301018,
301019
],
"ps_consume": [
@@ -2868,7 +2782,7 @@
"text": "饰品BOSS"
},
"difficulty": 4,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2910,8 +2824,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301020,
- 301021,
301022
],
"ps_consume": [
@@ -2938,7 +2850,7 @@
"text": "饰品BOSS"
},
"difficulty": 5,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -2980,8 +2892,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301023,
- 301024,
301025
],
"ps_consume": [
@@ -3008,7 +2918,7 @@
"text": "饰品BOSS"
},
"difficulty": 6,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3050,8 +2960,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301026,
- 301027,
301028
],
"ps_consume": [
@@ -3078,7 +2986,7 @@
"text": "饰品BOSS"
},
"difficulty": 7,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3120,8 +3028,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301029,
- 301030,
301031
],
"ps_consume": [
@@ -3148,7 +3054,7 @@
"text": "饰品BOSS"
},
"difficulty": 8,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3190,8 +3096,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301032,
- 301033,
301034
],
"ps_consume": [
@@ -3218,7 +3122,7 @@
"text": "饰品BOSS"
},
"difficulty": 9,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3260,8 +3164,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301035,
- 301036,
301037
],
"ps_consume": [
@@ -3288,7 +3190,7 @@
"text": "饰品BOSS"
},
"difficulty": 10,
- "BattleReadyID": 104,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3330,8 +3232,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 301038,
- 301039,
301040
],
"ps_consume": [
@@ -3358,7 +3258,7 @@
"text": "火焰泰坦"
},
"difficulty": 1,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3405,8 +3305,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3433,7 +3331,7 @@
"text": "火焰泰坦"
},
"difficulty": 2,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3480,8 +3378,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3508,7 +3404,7 @@
"text": "火焰泰坦"
},
"difficulty": 3,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3555,8 +3451,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3583,7 +3477,7 @@
"text": "火焰泰坦"
},
"difficulty": 4,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3630,8 +3524,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3658,7 +3550,7 @@
"text": "火焰泰坦"
},
"difficulty": 5,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3705,8 +3597,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3733,7 +3623,7 @@
"text": "火焰泰坦"
},
"difficulty": 6,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3780,8 +3670,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3808,7 +3696,7 @@
"text": "火焰泰坦"
},
"difficulty": 7,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3855,8 +3743,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3883,7 +3769,7 @@
"text": "火焰泰坦"
},
"difficulty": 8,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -3930,8 +3816,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -3958,7 +3842,7 @@
"text": "火焰泰坦"
},
"difficulty": 9,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -4005,8 +3889,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -4033,7 +3915,7 @@
"text": "火焰泰坦"
},
"difficulty": 10,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -4080,8 +3962,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -4108,7 +3988,7 @@
"text": "火焰泰坦"
},
"difficulty": 11,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -4155,8 +4035,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
@@ -4183,7 +4061,7 @@
"text": "火焰泰坦"
},
"difficulty": 12,
- "BattleReadyID": 112,
+ "BattleReadyID": 121,
"captionrecommend": [
25001,
25004,
@@ -4230,8 +4108,6 @@
"bossmodel": 11009,
"boss_skill": 51004,
"boss": [
- 710001,
- 710001,
710001
],
"ps_consume": [
diff --git a/bin/json/game_worldall.json b/bin/json/game_worldall.json
index 297268950..f2ff54061 100644
--- a/bin/json/game_worldall.json
+++ b/bin/json/game_worldall.json
@@ -2,7 +2,7 @@
{
"id": 210,
"name": {
- "key": "mainline_name_10001",
+ "key": "Mainline_Tasks1",
"text": "章节1全部任务"
},
"task_icon": "",
@@ -21,8 +21,8 @@
{
"id": 310,
"name": {
- "key": "Side_Quest",
- "text": "武馆支线1"
+ "key": "Side_Quest1",
+ "text": "武馆内勤奋的身影是？"
},
"task_icon": "",
"task_txt": {
@@ -45,8 +45,8 @@
{
"id": 320,
"name": {
- "key": "Side_Quest",
- "text": "铁匠铺支线1"
+ "key": "Side_Quest2",
+ "text": "铁匠铺门口身影是?"
},
"task_icon": "",
"task_txt": {
@@ -69,8 +69,8 @@
{
"id": 330,
"name": {
- "key": "Side_Quest",
- "text": "铁匠铺支线2"
+ "key": "Side_Quest3",
+ "text": "戈伯的嘱托"
},
"task_icon": "",
"task_txt": {
@@ -93,8 +93,8 @@
{
"id": 340,
"name": {
- "key": "Side_Quest",
- "text": "武馆支线2"
+ "key": "Side_Quest4",
+ "text": "武馆秘闻"
},
"task_icon": "",
"task_txt": {
@@ -117,8 +117,8 @@
{
"id": 350,
"name": {
- "key": "Side_Quest",
- "text": "武馆支线3"
+ "key": "Side_Quest5",
+ "text": "好像有人再看我？"
},
"task_icon": "",
"task_txt": {
@@ -141,8 +141,8 @@
{
"id": 360,
"name": {
- "key": "Side_Quest",
- "text": "铁匠铺支线3"
+ "key": "Side_Quest6",
+ "text": "戈伯的委托"
},
"task_icon": "",
"task_txt": {
diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json
index 6bd829600..6472d86c1 100644
--- a/bin/json/game_worldtask.json
+++ b/bin/json/game_worldtask.json
@@ -350,7 +350,7 @@
"key": "Mainline_Tasks1_8_Receiving",
"text": "听说维京人热爱海上的风浪、甘醇的啤酒、勇猛的龙，还有那无与伦比的艺术品……"
},
- "deliver_npc": 10082,
+ "deliver_npc": 10081,
"auto_accept": 0,
"reword": [
{
@@ -552,11 +552,11 @@
},
"task_name": {
"key": "Mainline_Tasks1_13",
- "text": ""
+ "text": "消失的阴影"
},
"npctxt": {
"key": "Mainline_Tasks1_13_Receiving",
- "text": "消失的阴影"
+ "text": "梦魇消失了，虽然危险的根源并未被根除，但至少现在我们安全了，暂时的。"
},
"npc": 10130,
"completetasktxt": {
@@ -585,7 +585,7 @@
"key": 20140,
"lock": 1,
"lockend": 0,
- "ontxe": 20120,
+ "ontxe": 20130,
"id_after": 0,
"group": 210,
"des": 2,
@@ -595,23 +595,23 @@
"text": "第一章:预言之声"
},
"task_name": {
- "key": "Mainline_Tasks1_11",
+ "key": "Mainline_Tasks1_999",
"text": "敬请期待"
},
"npctxt": {
- "key": "Mainline_Tasks1_11",
+ "key": "Mainline_Tasks1_999",
"text": "敬请期待"
},
"npc": 10110,
"completetasktxt": {
- "key": "Mainline_Tasks1_11",
+ "key": "Mainline_Tasks1_999",
"text": "敬请期待！"
},
"completetask": [
193
],
"deliver_npctxt": {
- "key": "Mainline_Tasks1_11",
+ "key": "Mainline_Tasks1_999",
"text": "敬请期待！"
},
"deliver_npc": 0,
diff --git a/modules/parkour/api_Info.go b/modules/parkour/api_Info.go
index 1e9b0aa7c..830853973 100644
--- a/modules/parkour/api_Info.go
+++ b/modules/parkour/api_Info.go
@@ -13,21 +13,25 @@ func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.ParkourInfoReq
///匹配请求
func (this *apiComp) Info(session comm.IUserSession, req *pb.ParkourInfoReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
+ isopen bool
info *pb.DBParkour
- recommend []*pb.DBParkour
+ recommend []*pb.DBRaceMember
err error
)
if code = this.InfoCheck(session, req); code != pb.ErrorCode_Success {
return
}
- if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
- code = pb.ErrorCode_DBError
- return
+ isopen = this.module.configure.isopen()
+ if isopen {
+ if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ if recommend, err = this.module.parkourComp.getrusers(session.GetUserId()); err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
}
- if recommend, err = this.module.parkourComp.getrusers(session.GetUserId()); err != nil {
- code = pb.ErrorCode_DBError
- return
- }
- session.SendMsg(string(this.module.GetType()), "info", &pb.ParkourInfoResp{Info: info, Recommend: recommend})
+ session.SendMsg(string(this.module.GetType()), "info", &pb.ParkourInfoResp{Isopen: isopen, Info: info, Recommend: recommend})
return
}
diff --git a/modules/parkour/api_invite.go b/modules/parkour/api_invite.go
index b632ba9a8..a10ab4340 100644
--- a/modules/parkour/api_invite.go
+++ b/modules/parkour/api_invite.go
@@ -19,12 +19,14 @@ func (this *apiComp) InviteCheck(session comm.IUserSession, req *pb.ParkourInvit
///邀请组队
func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
- info *pb.DBParkour
- tinfo *pb.DBParkour
- tuser *pb.DBUser
- mount *cfg.GameBuzkashiMountData
- ok bool
- err error
+ info *pb.DBParkour
+ tinfo *pb.DBParkour
+ tuser *pb.DBUser
+ mount *cfg.GameBuzkashiMountData
+ member *pb.DBRaceMember
+ users []string
+ ok bool
+ err error
)
if code = this.InviteCheck(session, req); code != pb.ErrorCode_Success {
return
@@ -75,7 +77,16 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq)
//目标是否在线
if !this.module.ModuleUser.IsOnline(req.Uid) {
- info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Mount: tinfo.Dfmount, Hp: mount.Hp, Isai: true})
+ member = &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Mount: tinfo.Dfmount, Hp: mount.Hp, Isai: true}
+ info.Member = append(info.Member, member)
+ users = make([]string, len(info.Member))
+ for i, v := range info.Member {
+ users[i] = v.Uid
+ }
+ this.module.SendMsgToUsers(string(this.module.GetType()), "teamjoinnotice",
+ &pb.ParkourTeamJoinNoticePush{Member: member}, users...)
+ this.module.SendMsgToUsers(string(this.module.GetType()), "teamchanage",
+ &pb.ParkourTeamChanagePush{Team: info}, users...)
} else {
if tinfo.Captainid != "" {
code = pb.ErrorCode_ParkourTargetTeamed
diff --git a/modules/parkour/api_racematch.go b/modules/parkour/api_racematch.go
index 9c2710c20..18400c836 100644
--- a/modules/parkour/api_racematch.go
+++ b/modules/parkour/api_racematch.go
@@ -7,14 +7,18 @@ import (
//参数校验
func (this *apiComp) RaceMatchCheck(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode) {
+ if session.GetUserId() != req.Captainid {
+ code = pb.ErrorCode_ReqParameterError
+ }
return
}
///匹配请求
func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMatchReq) (code pb.ErrorCode, data *pb.ErrorData) {
var (
- team *pb.DBParkour
- err error
+ team *pb.DBParkour
+ users []string
+ err error
)
if code = this.RaceMatchCheck(session, req); code != pb.ErrorCode_Success {
return
@@ -23,10 +27,32 @@ func (this *apiComp) RaceMatch(session comm.IUserSession, req *pb.ParkourRaceMat
code = pb.ErrorCode_DBError
return
}
+ if team.Captainid != session.GetUserId() {
+ code = pb.ErrorCode_ReqParameterError
+ return
+ }
+
if err = this.module.match(team); err != nil {
code = pb.ErrorCode_DBError
return
}
+
+ users = make([]string, len(team.Member))
+ for i, v := range team.Member {
+ if !v.Isai {
+ users[i] = v.Uid
+ if err = this.module.parkourComp.Change(v.Uid, map[string]interface{}{
+ "state": pb.RaceTeamState_matching,
+ }); err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ }
+
+ }
+ this.module.SendMsgToUsers(string(this.module.GetType()), "racematchstart",
+ &pb.ParkourRaceMatchStartPush{Team: team}, users...)
+
session.SendMsg(string(this.module.GetType()), "racematch", &pb.ParkourRaceMatchResp{})
return
}
diff --git a/modules/parkour/api_racematchcancel.go b/modules/parkour/api_racematchcancel.go
new file mode 100644
index 000000000..cf0110ca0
--- /dev/null
+++ b/modules/parkour/api_racematchcancel.go
@@ -0,0 +1,56 @@
+package parkour
+
+import (
+ "go_dreamfactory/comm"
+ "go_dreamfactory/pb"
+)
+
+//参数校验
+func (this *apiComp) RaceMatchCancelCheck(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (code pb.ErrorCode) {
+ if session.GetUserId() != req.Captainid {
+ code = pb.ErrorCode_ReqParameterError
+ }
+ return
+}
+
+///匹配请求
+func (this *apiComp) RaceMatchCancel(session comm.IUserSession, req *pb.ParkourRaceMatchCancelReq) (code pb.ErrorCode, data *pb.ErrorData) {
+ var (
+ team *pb.DBParkour
+ users []string
+ err error
+ )
+ if code = this.RaceMatchCancelCheck(session, req); code != pb.ErrorCode_Success {
+ return
+ }
+ if team, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ if team.Captainid != session.GetUserId() {
+ code = pb.ErrorCode_ReqParameterError
+ return
+ }
+
+ if err = this.module.match(team); err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ users = make([]string, len(team.Member))
+ for i, v := range team.Member {
+ if !v.Isai {
+ users[i] = v.Uid
+ if err = this.module.parkourComp.Change(v.Uid, map[string]interface{}{
+ "state": pb.RaceTeamState_matching,
+ }); err != nil {
+ code = pb.ErrorCode_DBError
+ return
+ }
+ }
+ }
+ this.module.SendMsgToUsers(string(this.module.GetType()), "racematchstart",
+ &pb.ParkourRaceMatchCancelPush{Team: team}, users...)
+
+ session.SendMsg(string(this.module.GetType()), "racematch", &pb.ParkourRaceMatchResp{})
+ return
+}
diff --git a/modules/parkour/configure.go b/modules/parkour/configure.go
index 179827bf1..c2b72fe44 100644
--- a/modules/parkour/configure.go
+++ b/modules/parkour/configure.go
@@ -4,10 +4,12 @@ import (
"fmt"
"go_dreamfactory/lego/core"
"go_dreamfactory/modules"
+ "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
)
const (
+ game_buzkashiopen = "game_buzkashiopen.json"
game_buzkashigrade = "game_buzkashigrade.json"
game_buzkashilv = "game_buzkashilv.json"
game_buzkashimount = "game_buzkashimount.json"
@@ -24,6 +26,7 @@ type configureComp struct {
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Parkour)
+ this.LoadConfigure(game_buzkashiopen, cfg.NewGamebuzkashiOpen)
this.LoadConfigure(game_buzkashigrade, cfg.NewGameBuzkashiGrade)
this.LoadConfigure(game_buzkashilv, cfg.NewGameBuzkashiLv)
this.LoadConfigure(game_buzkashimount, cfg.NewGameBuzkashiMount)
@@ -31,6 +34,34 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
return
}
+//查询开启表
+func (this *configureComp) isopen() (open bool) {
+ var (
+ v interface{}
+ config *cfg.GamebuzkashiOpen
+ currtime string = configure.Now().Format("15:04")
+ err error
+ ok bool
+ )
+ if v, err = this.GetConfigure(game_buzkashiopen); err != nil {
+ this.module.Errorln(err)
+ return
+ } else {
+ if config, ok = v.(*cfg.GamebuzkashiOpen); !ok {
+ err = fmt.Errorf("config type err:%T", v)
+ return
+ } else {
+ for _, v := range config.GetDataList() {
+ if currtime >= v.Stime && currtime < v.Etime {
+ open = true
+ return
+ }
+ }
+ }
+ }
+ return
+}
+
//查询坐骑表
func (this *configureComp) getGameBuzkashiMount(id string) (configure *cfg.GameBuzkashiMountData, err error) {
var (
diff --git a/modules/parkour/core.go b/modules/parkour/core.go
index 3d4dae539..14bd1f929 100644
--- a/modules/parkour/core.go
+++ b/modules/parkour/core.go
@@ -8,6 +8,12 @@ import (
"time"
)
+type Recommend struct {
+ parkour *pb.DBParkour
+ user *pb.DBUser
+ member *pb.DBRaceMember
+}
+
///捕羊大赛对象
type RaceItem struct {
Id string //战斗id
diff --git a/modules/parkour/model_parkour.go b/modules/parkour/model_parkour.go
index ef03444d3..2b89fca98 100644
--- a/modules/parkour/model_parkour.go
+++ b/modules/parkour/model_parkour.go
@@ -10,6 +10,7 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
+ cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/sys/db"
"math/rand"
"sync"
@@ -28,7 +29,7 @@ type ModelParkourComp struct {
module *Parkour
refresh time.Time //上一次刷新时间
lock sync.RWMutex
- users []*pb.DBParkour //推荐用户信息
+ users []*Recommend //推荐用户信息
}
//组件初始化接口
@@ -50,9 +51,10 @@ func (this *ModelParkourComp) Start() (err error) {
}
//获取推荐用户
-func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour, err error) {
+func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBRaceMember, err error) {
var (
- users []*pb.DBParkour
+ users []*Recommend
+ mount *cfg.GameBuzkashiMountData
ondata bool
)
this.lock.RLock()
@@ -64,9 +66,9 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour,
this.refreshlist()
}
this.lock.RLock()
- users = make([]*pb.DBParkour, 0, len(this.users))
+ users = make([]*Recommend, 0, len(this.users))
for _, v := range this.users {
- if v.Uid != uid {
+ if v.parkour.Uid != uid {
users = append(users, v)
}
}
@@ -75,10 +77,26 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour,
if len(users) < 6 {
num = len(users)
}
- recommend = make([]*pb.DBParkour, num)
+ recommend = make([]*pb.DBRaceMember, num)
r := rand.New(rand.NewSource(configure.Now().Unix()))
for i, v := range r.Perm(num) {
- recommend[i] = users[v]
+ if users[v].member == nil {
+ if users[v].user = this.module.ModuleUser.GetUser(users[v].parkour.Uid); users[v].user == nil {
+ continue
+ }
+ if mount, err = this.module.configure.getGameBuzkashiMount(users[v].parkour.Dfmount); err != nil {
+ continue
+ }
+ users[v].member = &pb.DBRaceMember{
+ Uid: users[v].user.Uid,
+ Name: users[v].user.Name,
+ Avatar: users[v].user.Avatar,
+ Lv: users[v].user.Lv,
+ Mount: users[v].parkour.Dfmount,
+ Hp: mount.Hp,
+ }
+ }
+ recommend[i] = users[v].member
}
return
}
@@ -86,8 +104,9 @@ func (this *ModelParkourComp) getrusers(uid string) (recommend []*pb.DBParkour,
//刷新推荐列表
func (this *ModelParkourComp) refreshlist() {
var (
- c *mongo.Cursor
- err error
+ users []*Recommend
+ c *mongo.Cursor
+ err error
)
if c, err = this.DB.Find(core.SqlTable(this.TableName), bson.M{"captainid": ""}, options.Find().SetSort(bson.D{{"integral", -1}}).SetSkip(0).SetLimit(100)); err != nil {
@@ -103,8 +122,16 @@ func (this *ModelParkourComp) refreshlist() {
result = append(result, tmp)
}
}
+ users = make([]*Recommend, len(result))
+ for i, v := range result {
+ users[i] = &Recommend{
+ parkour: v,
+ user: nil,
+ }
+ }
+
this.lock.Lock()
- this.users = result
+ this.users = users
this.lock.Unlock()
}
}
diff --git a/modules/parkour/module.go b/modules/parkour/module.go
index 424b337a2..e1d754d5f 100644
--- a/modules/parkour/module.go
+++ b/modules/parkour/module.go
@@ -198,7 +198,7 @@ func (this *Parkour) startbattle(id string) {
sessions = append(sessions, v)
}
- if err = this.SendMsgToSession(string(comm.ModulePvp), "racestart", &pb.ParkourRaceStartPush{
+ if err = this.SendMsgToSession(string(this.GetType()), "racestart", &pb.ParkourRaceStartPush{
Countdown: 3,
}, sessions...); err != nil {
this.Errorln(err)
@@ -263,6 +263,12 @@ func (this *Parkour) avoid(id string, uid string, dis int32) {
this.Error("躲避障碍物逻辑异常 未找到玩家!", log.Field{Key: "battleid", Value: id}, log.Field{Key: "uid", Value: uid})
return
}
+ if dis < 0 {
+ member.Hp--
+ } else {
+
+ }
+
for _, v := range battle.Session {
sessions = append(sessions, v)
}
@@ -463,8 +469,7 @@ func (this *Parkour) useroffline(uid, sessionid string) {
} else if info.State == pb.RaceTeamState_raceing {
var (
lockpath string = fmt.Sprintf("%s/%s", this.service.GetType(), this.service.GetId())
-
- result []*pb.DBRace
+ result []*pb.DBRace
)
if result, err = this.raceComp.queryraces(); err != nil {
this.Errorln(err)
diff --git a/modules/parkour/parkour_test.go b/modules/parkour/parkour_test.go
new file mode 100644
index 000000000..4deda17f3
--- /dev/null
+++ b/modules/parkour/parkour_test.go
@@ -0,0 +1,18 @@
+package parkour_test
+
+import (
+ "fmt"
+ "testing"
+ "time"
+)
+
+func Test_Time(t *testing.T) {
+ currt := time.Now().Format("15:04")
+ fmt.Printf(currt)
+ if currt > "13:10" && currt < "16:30" {
+ fmt.Printf("true")
+ } else {
+ fmt.Printf("false")
+ }
+
+}
diff --git a/pb/parkour_db.pb.go b/pb/parkour_db.pb.go
index e38660c12..ba17532d7 100644
--- a/pb/parkour_db.pb.go
+++ b/pb/parkour_db.pb.go
@@ -128,12 +128,13 @@ type DBRaceMember struct {
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //用户名称
Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar"` //用户头像
- Mount string `protobuf:"bytes,4,opt,name=mount,proto3" json:"mount"` //上阵坐骑
- Hp int32 `protobuf:"varint,5,opt,name=hp,proto3" json:"hp"` //初始血量
- Innermost int32 `protobuf:"varint,6,opt,name=innermost,proto3" json:"innermost"` //里程数
- Ready bool `protobuf:"varint,7,opt,name=ready,proto3" json:"ready"` //是否准备
- Isai bool `protobuf:"varint,8,opt,name=isai,proto3" json:"isai"` //是否是ai
- Isoff bool `protobuf:"varint,9,opt,name=isoff,proto3" json:"isoff"` //是否离线
+ Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //等级
+ Mount string `protobuf:"bytes,5,opt,name=mount,proto3" json:"mount"` //上阵坐骑
+ Hp int32 `protobuf:"varint,6,opt,name=hp,proto3" json:"hp"` //初始血量
+ Innermost int32 `protobuf:"varint,7,opt,name=innermost,proto3" json:"innermost"` //里程数
+ Ready bool `protobuf:"varint,8,opt,name=ready,proto3" json:"ready"` //是否准备
+ Isai bool `protobuf:"varint,9,opt,name=isai,proto3" json:"isai"` //是否是ai
+ Isoff bool `protobuf:"varint,10,opt,name=isoff,proto3" json:"isoff"` //是否离线
}
func (x *DBRaceMember) Reset() {
@@ -189,6 +190,13 @@ func (x *DBRaceMember) GetAvatar() string {
return ""
}
+func (x *DBRaceMember) GetLv() int32 {
+ if x != nil {
+ return x.Lv
+ }
+ return 0
+}
+
func (x *DBRaceMember) GetMount() string {
if x != nil {
return x.Mount
@@ -239,7 +247,8 @@ type DBRaceInvite struct {
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //用户名称
Avatar string `protobuf:"bytes,3,opt,name=avatar,proto3" json:"avatar"` //用户头像
- Expired int64 `protobuf:"varint,4,opt,name=expired,proto3" json:"expired"` //过期时间
+ Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //等级
+ Expired int64 `protobuf:"varint,5,opt,name=expired,proto3" json:"expired"` //过期时间
}
func (x *DBRaceInvite) Reset() {
@@ -295,6 +304,13 @@ func (x *DBRaceInvite) GetAvatar() string {
return ""
}
+func (x *DBRaceInvite) GetLv() int32 {
+ if x != nil {
+ return x.Lv
+ }
+ return 0
+}
+
func (x *DBRaceInvite) GetExpired() int64 {
if x != nil {
return x.Expired
@@ -522,26 +538,28 @@ var File_parkour_parkour_db_proto protoreflect.FileDescriptor
var file_parkour_parkour_db_proto_rawDesc = []byte{
0x0a, 0x18, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x2f, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75,
- 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd0, 0x01, 0x0a, 0x0c, 0x44,
+ 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe0, 0x01, 0x0a, 0x0c, 0x44,
0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75,
0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a,
0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d,
0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75,
- 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
- 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12,
- 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01,
+ 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18,
+ 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f, 0x75,
+ 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
+ 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x12,
+ 0x1c, 0x0a, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x18, 0x07, 0x20, 0x01,
0x28, 0x05, 0x52, 0x09, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x74, 0x12, 0x14, 0x0a,
- 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65,
- 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x08, 0x20, 0x01, 0x28,
+ 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65,
+ 0x61, 0x64, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x61, 0x69, 0x18, 0x09, 0x20, 0x01, 0x28,
0x08, 0x52, 0x04, 0x69, 0x73, 0x61, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x6f, 0x66, 0x66,
- 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x6f, 0x66, 0x66, 0x22, 0x66, 0x0a,
+ 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x6f, 0x66, 0x66, 0x22, 0x76, 0x0a,
0x0c, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x12, 0x10, 0x0a,
0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12,
0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20,
- 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x65,
- 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78,
+ 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c,
+ 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x18, 0x0a, 0x07, 0x65,
+ 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x78,
0x70, 0x69, 0x72, 0x65, 0x64, 0x22, 0x80, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b,
0x6f, 0x75, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
diff --git a/pb/parkour_msg.pb.go b/pb/parkour_msg.pb.go
index 023d6fc85..caed7dcff 100644
--- a/pb/parkour_msg.pb.go
+++ b/pb/parkour_msg.pb.go
@@ -65,8 +65,9 @@ type ParkourInfoResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
- Info *DBParkour `protobuf:"bytes,1,opt,name=info,proto3" json:"info"`
- Recommend []*DBParkour `protobuf:"bytes,2,rep,name=recommend,proto3" json:"recommend"`
+ Isopen bool `protobuf:"varint,1,opt,name=isopen,proto3" json:"isopen"` //当前赛事是否开启
+ Info *DBParkour `protobuf:"bytes,2,opt,name=info,proto3" json:"info"`
+ Recommend []*DBRaceMember `protobuf:"bytes,3,rep,name=recommend,proto3" json:"recommend"`
}
func (x *ParkourInfoResp) Reset() {
@@ -101,6 +102,13 @@ func (*ParkourInfoResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{1}
}
+func (x *ParkourInfoResp) GetIsopen() bool {
+ if x != nil {
+ return x.Isopen
+ }
+ return false
+}
+
func (x *ParkourInfoResp) GetInfo() *DBParkour {
if x != nil {
return x.Info
@@ -108,7 +116,7 @@ func (x *ParkourInfoResp) GetInfo() *DBParkour {
return nil
}
-func (x *ParkourInfoResp) GetRecommend() []*DBParkour {
+func (x *ParkourInfoResp) GetRecommend() []*DBRaceMember {
if x != nil {
return x.Recommend
}
@@ -800,11 +808,13 @@ func (*ParkourTeamDisbandNoticePush) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{15}
}
-//匹配请求
+//匹配请求 只有队长有权限
type ParkourRaceMatchReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
+
+ Captainid string `protobuf:"bytes,1,opt,name=captainid,proto3" json:"captainid"` //队长id
}
func (x *ParkourRaceMatchReq) Reset() {
@@ -839,6 +849,13 @@ func (*ParkourRaceMatchReq) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{16}
}
+func (x *ParkourRaceMatchReq) GetCaptainid() string {
+ if x != nil {
+ return x.Captainid
+ }
+ return ""
+}
+
//匹配请求
type ParkourRaceMatchResp struct {
state protoimpl.MessageState
@@ -878,6 +895,189 @@ func (*ParkourRaceMatchResp) Descriptor() ([]byte, []int) {
return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{17}
}
+//匹配取消请求 只有队长有权限
+type ParkourRaceMatchCancelReq struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Captainid string `protobuf:"bytes,1,opt,name=captainid,proto3" json:"captainid"` //队长id
+}
+
+func (x *ParkourRaceMatchCancelReq) Reset() {
+ *x = ParkourRaceMatchCancelReq{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[18]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ParkourRaceMatchCancelReq) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParkourRaceMatchCancelReq) ProtoMessage() {}
+
+func (x *ParkourRaceMatchCancelReq) ProtoReflect() protoreflect.Message {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[18]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ParkourRaceMatchCancelReq.ProtoReflect.Descriptor instead.
+func (*ParkourRaceMatchCancelReq) Descriptor() ([]byte, []int) {
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{18}
+}
+
+func (x *ParkourRaceMatchCancelReq) GetCaptainid() string {
+ if x != nil {
+ return x.Captainid
+ }
+ return ""
+}
+
+//匹配取消请求
+type ParkourRaceMatchCancelResp struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+}
+
+func (x *ParkourRaceMatchCancelResp) Reset() {
+ *x = ParkourRaceMatchCancelResp{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[19]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ParkourRaceMatchCancelResp) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParkourRaceMatchCancelResp) ProtoMessage() {}
+
+func (x *ParkourRaceMatchCancelResp) ProtoReflect() protoreflect.Message {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[19]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ParkourRaceMatchCancelResp.ProtoReflect.Descriptor instead.
+func (*ParkourRaceMatchCancelResp) Descriptor() ([]byte, []int) {
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{19}
+}
+
+//匹配成功
+type ParkourRaceMatchStartPush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Team *DBParkour `protobuf:"bytes,1,opt,name=team,proto3" json:"team"`
+}
+
+func (x *ParkourRaceMatchStartPush) Reset() {
+ *x = ParkourRaceMatchStartPush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[20]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ParkourRaceMatchStartPush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParkourRaceMatchStartPush) ProtoMessage() {}
+
+func (x *ParkourRaceMatchStartPush) ProtoReflect() protoreflect.Message {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[20]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ParkourRaceMatchStartPush.ProtoReflect.Descriptor instead.
+func (*ParkourRaceMatchStartPush) Descriptor() ([]byte, []int) {
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{20}
+}
+
+func (x *ParkourRaceMatchStartPush) GetTeam() *DBParkour {
+ if x != nil {
+ return x.Team
+ }
+ return nil
+}
+
+//匹配取消通知
+type ParkourRaceMatchCancelPush struct {
+ state protoimpl.MessageState
+ sizeCache protoimpl.SizeCache
+ unknownFields protoimpl.UnknownFields
+
+ Team *DBParkour `protobuf:"bytes,1,opt,name=team,proto3" json:"team"`
+}
+
+func (x *ParkourRaceMatchCancelPush) Reset() {
+ *x = ParkourRaceMatchCancelPush{}
+ if protoimpl.UnsafeEnabled {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[21]
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ ms.StoreMessageInfo(mi)
+ }
+}
+
+func (x *ParkourRaceMatchCancelPush) String() string {
+ return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ParkourRaceMatchCancelPush) ProtoMessage() {}
+
+func (x *ParkourRaceMatchCancelPush) ProtoReflect() protoreflect.Message {
+ mi := &file_parkour_parkour_msg_proto_msgTypes[21]
+ if protoimpl.UnsafeEnabled && x != nil {
+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+ if ms.LoadMessageInfo() == nil {
+ ms.StoreMessageInfo(mi)
+ }
+ return ms
+ }
+ return mi.MessageOf(x)
+}
+
+// Deprecated: Use ParkourRaceMatchCancelPush.ProtoReflect.Descriptor instead.
+func (*ParkourRaceMatchCancelPush) Descriptor() ([]byte, []int) {
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{21}
+}
+
+func (x *ParkourRaceMatchCancelPush) GetTeam() *DBParkour {
+ if x != nil {
+ return x.Team
+ }
+ return nil
+}
+
//匹配成功
type ParkourRaceMatchSuccPush struct {
state protoimpl.MessageState
@@ -890,7 +1090,7 @@ type ParkourRaceMatchSuccPush struct {
func (x *ParkourRaceMatchSuccPush) Reset() {
*x = ParkourRaceMatchSuccPush{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[18]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -903,7 +1103,7 @@ func (x *ParkourRaceMatchSuccPush) String() string {
func (*ParkourRaceMatchSuccPush) ProtoMessage() {}
func (x *ParkourRaceMatchSuccPush) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[18]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[22]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -916,7 +1116,7 @@ func (x *ParkourRaceMatchSuccPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourRaceMatchSuccPush.ProtoReflect.Descriptor instead.
func (*ParkourRaceMatchSuccPush) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{18}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{22}
}
func (x *ParkourRaceMatchSuccPush) GetRace() *DBRace {
@@ -938,7 +1138,7 @@ type ParkourReadyReq struct {
func (x *ParkourReadyReq) Reset() {
*x = ParkourReadyReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[19]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[23]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -951,7 +1151,7 @@ func (x *ParkourReadyReq) String() string {
func (*ParkourReadyReq) ProtoMessage() {}
func (x *ParkourReadyReq) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[19]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[23]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -964,7 +1164,7 @@ func (x *ParkourReadyReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourReadyReq.ProtoReflect.Descriptor instead.
func (*ParkourReadyReq) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{19}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{23}
}
func (x *ParkourReadyReq) GetId() string {
@@ -984,7 +1184,7 @@ type ParkourReadyResp struct {
func (x *ParkourReadyResp) Reset() {
*x = ParkourReadyResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[20]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[24]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -997,7 +1197,7 @@ func (x *ParkourReadyResp) String() string {
func (*ParkourReadyResp) ProtoMessage() {}
func (x *ParkourReadyResp) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[20]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[24]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1010,7 +1210,7 @@ func (x *ParkourReadyResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourReadyResp.ProtoReflect.Descriptor instead.
func (*ParkourReadyResp) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{20}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{24}
}
//竞速开始推送
@@ -1025,7 +1225,7 @@ type ParkourRaceStartPush struct {
func (x *ParkourRaceStartPush) Reset() {
*x = ParkourRaceStartPush{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[21]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[25]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1038,7 +1238,7 @@ func (x *ParkourRaceStartPush) String() string {
func (*ParkourRaceStartPush) ProtoMessage() {}
func (x *ParkourRaceStartPush) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[21]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[25]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1051,7 +1251,7 @@ func (x *ParkourRaceStartPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourRaceStartPush.ProtoReflect.Descriptor instead.
func (*ParkourRaceStartPush) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{21}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{25}
}
func (x *ParkourRaceStartPush) GetCountdown() int32 {
@@ -1073,7 +1273,7 @@ type ParkourShotReq struct {
func (x *ParkourShotReq) Reset() {
*x = ParkourShotReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[22]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[26]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1086,7 +1286,7 @@ func (x *ParkourShotReq) String() string {
func (*ParkourShotReq) ProtoMessage() {}
func (x *ParkourShotReq) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[22]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[26]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1099,7 +1299,7 @@ func (x *ParkourShotReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourShotReq.ProtoReflect.Descriptor instead.
func (*ParkourShotReq) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{22}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{26}
}
func (x *ParkourShotReq) GetId() string {
@@ -1119,7 +1319,7 @@ type ParkourShotResp struct {
func (x *ParkourShotResp) Reset() {
*x = ParkourShotResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[23]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[27]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1132,7 +1332,7 @@ func (x *ParkourShotResp) String() string {
func (*ParkourShotResp) ProtoMessage() {}
func (x *ParkourShotResp) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[23]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[27]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1145,7 +1345,7 @@ func (x *ParkourShotResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourShotResp.ProtoReflect.Descriptor instead.
func (*ParkourShotResp) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{23}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{27}
}
//躲避障碍请求
@@ -1161,7 +1361,7 @@ type ParkourAvoidReq struct {
func (x *ParkourAvoidReq) Reset() {
*x = ParkourAvoidReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[24]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[28]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1174,7 +1374,7 @@ func (x *ParkourAvoidReq) String() string {
func (*ParkourAvoidReq) ProtoMessage() {}
func (x *ParkourAvoidReq) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[24]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[28]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1187,7 +1387,7 @@ func (x *ParkourAvoidReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourAvoidReq.ProtoReflect.Descriptor instead.
func (*ParkourAvoidReq) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{24}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{28}
}
func (x *ParkourAvoidReq) GetId() string {
@@ -1214,7 +1414,7 @@ type ParkourAvoidResp struct {
func (x *ParkourAvoidResp) Reset() {
*x = ParkourAvoidResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[25]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[29]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1227,7 +1427,7 @@ func (x *ParkourAvoidResp) String() string {
func (*ParkourAvoidResp) ProtoMessage() {}
func (x *ParkourAvoidResp) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[25]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[29]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1240,7 +1440,7 @@ func (x *ParkourAvoidResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourAvoidResp.ProtoReflect.Descriptor instead.
func (*ParkourAvoidResp) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{25}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{29}
}
//全员冲刺
@@ -1255,7 +1455,7 @@ type ParkourAllSprintsPush struct {
func (x *ParkourAllSprintsPush) Reset() {
*x = ParkourAllSprintsPush{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[26]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[30]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1268,7 +1468,7 @@ func (x *ParkourAllSprintsPush) String() string {
func (*ParkourAllSprintsPush) ProtoMessage() {}
func (x *ParkourAllSprintsPush) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[26]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[30]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1281,7 +1481,7 @@ func (x *ParkourAllSprintsPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourAllSprintsPush.ProtoReflect.Descriptor instead.
func (*ParkourAllSprintsPush) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{26}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{30}
}
func (x *ParkourAllSprintsPush) GetLeft() int32 {
@@ -1304,7 +1504,7 @@ type ParkourPlayerHPChanagePush struct {
func (x *ParkourPlayerHPChanagePush) Reset() {
*x = ParkourPlayerHPChanagePush{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[27]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[31]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1317,7 +1517,7 @@ func (x *ParkourPlayerHPChanagePush) String() string {
func (*ParkourPlayerHPChanagePush) ProtoMessage() {}
func (x *ParkourPlayerHPChanagePush) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[27]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[31]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1330,7 +1530,7 @@ func (x *ParkourPlayerHPChanagePush) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourPlayerHPChanagePush.ProtoReflect.Descriptor instead.
func (*ParkourPlayerHPChanagePush) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{27}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{31}
}
func (x *ParkourPlayerHPChanagePush) GetUid() string {
@@ -1360,7 +1560,7 @@ type ParkourScoreChanagePush struct {
func (x *ParkourScoreChanagePush) Reset() {
*x = ParkourScoreChanagePush{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[28]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[32]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1373,7 +1573,7 @@ func (x *ParkourScoreChanagePush) String() string {
func (*ParkourScoreChanagePush) ProtoMessage() {}
func (x *ParkourScoreChanagePush) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[28]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[32]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1386,7 +1586,7 @@ func (x *ParkourScoreChanagePush) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourScoreChanagePush.ProtoReflect.Descriptor instead.
func (*ParkourScoreChanagePush) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{28}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{32}
}
func (x *ParkourScoreChanagePush) GetRed() int32 {
@@ -1415,7 +1615,7 @@ type ParkourRaceOverPush struct {
func (x *ParkourRaceOverPush) Reset() {
*x = ParkourRaceOverPush{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[29]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[33]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1428,7 +1628,7 @@ func (x *ParkourRaceOverPush) String() string {
func (*ParkourRaceOverPush) ProtoMessage() {}
func (x *ParkourRaceOverPush) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[29]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[33]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1441,7 +1641,7 @@ func (x *ParkourRaceOverPush) ProtoReflect() protoreflect.Message {
// Deprecated: Use ParkourRaceOverPush.ProtoReflect.Descriptor instead.
func (*ParkourRaceOverPush) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{29}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{33}
}
func (x *ParkourRaceOverPush) GetWinside() int32 {
@@ -1464,7 +1664,7 @@ type RPCParkourJoinMatchReq struct {
func (x *RPCParkourJoinMatchReq) Reset() {
*x = RPCParkourJoinMatchReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[30]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[34]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1477,7 +1677,7 @@ func (x *RPCParkourJoinMatchReq) String() string {
func (*RPCParkourJoinMatchReq) ProtoMessage() {}
func (x *RPCParkourJoinMatchReq) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[30]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[34]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1490,7 +1690,7 @@ func (x *RPCParkourJoinMatchReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourJoinMatchReq.ProtoReflect.Descriptor instead.
func (*RPCParkourJoinMatchReq) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{30}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{34}
}
func (x *RPCParkourJoinMatchReq) GetCaptainid() string {
@@ -1517,7 +1717,7 @@ type RPCParkourJoinMatchResp struct {
func (x *RPCParkourJoinMatchResp) Reset() {
*x = RPCParkourJoinMatchResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[31]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[35]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1530,7 +1730,7 @@ func (x *RPCParkourJoinMatchResp) String() string {
func (*RPCParkourJoinMatchResp) ProtoMessage() {}
func (x *RPCParkourJoinMatchResp) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[31]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[35]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1543,7 +1743,7 @@ func (x *RPCParkourJoinMatchResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourJoinMatchResp.ProtoReflect.Descriptor instead.
func (*RPCParkourJoinMatchResp) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{31}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{35}
}
//取消匹配
@@ -1558,7 +1758,7 @@ type RPCParkourCancelMatchReq struct {
func (x *RPCParkourCancelMatchReq) Reset() {
*x = RPCParkourCancelMatchReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[32]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[36]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1571,7 +1771,7 @@ func (x *RPCParkourCancelMatchReq) String() string {
func (*RPCParkourCancelMatchReq) ProtoMessage() {}
func (x *RPCParkourCancelMatchReq) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[32]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[36]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1584,7 +1784,7 @@ func (x *RPCParkourCancelMatchReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourCancelMatchReq.ProtoReflect.Descriptor instead.
func (*RPCParkourCancelMatchReq) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{32}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{36}
}
func (x *RPCParkourCancelMatchReq) GetCaptainid() string {
@@ -1603,7 +1803,7 @@ type RPCParkourCancelMatchResp struct {
func (x *RPCParkourCancelMatchResp) Reset() {
*x = RPCParkourCancelMatchResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[33]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[37]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1616,7 +1816,7 @@ func (x *RPCParkourCancelMatchResp) String() string {
func (*RPCParkourCancelMatchResp) ProtoMessage() {}
func (x *RPCParkourCancelMatchResp) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[33]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[37]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1629,7 +1829,7 @@ func (x *RPCParkourCancelMatchResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourCancelMatchResp.ProtoReflect.Descriptor instead.
func (*RPCParkourCancelMatchResp) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{33}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{37}
}
///匹配成功通知请求
@@ -1645,7 +1845,7 @@ type RPCParkourMatchSuccReq struct {
func (x *RPCParkourMatchSuccReq) Reset() {
*x = RPCParkourMatchSuccReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[34]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[38]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1658,7 +1858,7 @@ func (x *RPCParkourMatchSuccReq) String() string {
func (*RPCParkourMatchSuccReq) ProtoMessage() {}
func (x *RPCParkourMatchSuccReq) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[34]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[38]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1671,7 +1871,7 @@ func (x *RPCParkourMatchSuccReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourMatchSuccReq.ProtoReflect.Descriptor instead.
func (*RPCParkourMatchSuccReq) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{34}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{38}
}
func (x *RPCParkourMatchSuccReq) GetRed() []*DBRaceMember {
@@ -1698,7 +1898,7 @@ type RPCParkourMatchSuccResp struct {
func (x *RPCParkourMatchSuccResp) Reset() {
*x = RPCParkourMatchSuccResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[35]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[39]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1711,7 +1911,7 @@ func (x *RPCParkourMatchSuccResp) String() string {
func (*RPCParkourMatchSuccResp) ProtoMessage() {}
func (x *RPCParkourMatchSuccResp) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[35]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[39]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1724,7 +1924,7 @@ func (x *RPCParkourMatchSuccResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPCParkourMatchSuccResp.ProtoReflect.Descriptor instead.
func (*RPCParkourMatchSuccResp) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{35}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{39}
}
//托管求情
@@ -1740,7 +1940,7 @@ type RPC_ParkourTrusteeshipReq struct {
func (x *RPC_ParkourTrusteeshipReq) Reset() {
*x = RPC_ParkourTrusteeshipReq{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[36]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[40]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1753,7 +1953,7 @@ func (x *RPC_ParkourTrusteeshipReq) String() string {
func (*RPC_ParkourTrusteeshipReq) ProtoMessage() {}
func (x *RPC_ParkourTrusteeshipReq) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[36]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[40]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1766,7 +1966,7 @@ func (x *RPC_ParkourTrusteeshipReq) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPC_ParkourTrusteeshipReq.ProtoReflect.Descriptor instead.
func (*RPC_ParkourTrusteeshipReq) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{36}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{40}
}
func (x *RPC_ParkourTrusteeshipReq) GetBattleid() string {
@@ -1792,7 +1992,7 @@ type RPC_ParkourTrusteeshipResp struct {
func (x *RPC_ParkourTrusteeshipResp) Reset() {
*x = RPC_ParkourTrusteeshipResp{}
if protoimpl.UnsafeEnabled {
- mi := &file_parkour_parkour_msg_proto_msgTypes[37]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[41]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@@ -1805,7 +2005,7 @@ func (x *RPC_ParkourTrusteeshipResp) String() string {
func (*RPC_ParkourTrusteeshipResp) ProtoMessage() {}
func (x *RPC_ParkourTrusteeshipResp) ProtoReflect() protoreflect.Message {
- mi := &file_parkour_parkour_msg_proto_msgTypes[37]
+ mi := &file_parkour_parkour_msg_proto_msgTypes[41]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@@ -1818,7 +2018,7 @@ func (x *RPC_ParkourTrusteeshipResp) ProtoReflect() protoreflect.Message {
// Deprecated: Use RPC_ParkourTrusteeshipResp.ProtoReflect.Descriptor instead.
func (*RPC_ParkourTrusteeshipResp) Descriptor() ([]byte, []int) {
- return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{37}
+ return file_parkour_parkour_msg_proto_rawDescGZIP(), []int{41}
}
var File_parkour_parkour_msg_proto protoreflect.FileDescriptor
@@ -1828,127 +2028,143 @@ var file_parkour_parkour_msg_proto_rawDesc = []byte{
0x72, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x18, 0x70, 0x61, 0x72,
0x6b, 0x6f, 0x75, 0x72, 0x2f, 0x70, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x5f, 0x64, 0x62, 0x2e,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x10, 0x0a, 0x0e, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
- 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x5b, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f,
- 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e,
- 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72,
- 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x28, 0x0a, 0x09, 0x72, 0x65,
- 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e,
- 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x09, 0x72, 0x65, 0x63, 0x6f, 0x6d,
- 0x6d, 0x65, 0x6e, 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43,
- 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6d,
- 0x74, 0x73, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x74, 0x73, 0x69,
- 0x64, 0x22, 0x44, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x68, 0x61, 0x6e,
- 0x67, 0x65, 0x4d, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73,
- 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63,
- 0x63, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
- 0x52, 0x05, 0x6d, 0x74, 0x73, 0x69, 0x64, 0x22, 0x37, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x6b, 0x6f,
- 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68,
- 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
- 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f,
- 0x22, 0x24, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74,
- 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
- 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75,
- 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69,
- 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73,
- 0x75, 0x63, 0x63, 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74,
- 0x65, 0x61, 0x6d, 0x22, 0x4f, 0x0a, 0x17, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e,
- 0x76, 0x69, 0x74, 0x65, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e,
- 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
- 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x14,
- 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73,
- 0x74, 0x61, 0x74, 0x65, 0x22, 0x38, 0x0a, 0x16, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54,
- 0x65, 0x61, 0x6d, 0x43, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e,
- 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
- 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x4c,
- 0x0a, 0x16, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x48,
- 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74,
- 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70,
- 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18,
- 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x31, 0x0a, 0x17,
- 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x48, 0x61, 0x6e,
- 0x64, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63,
- 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22,
- 0x32, 0x0a, 0x12, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x51, 0x75, 0x69, 0x74, 0x54, 0x65,
- 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e,
- 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69,
- 0x6e, 0x69, 0x64, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x51, 0x75,
- 0x69, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x19, 0x50, 0x61,
- 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x65, 0x61, 0x6d, 0x4a, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x74,
- 0x69, 0x63, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65,
- 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65,
- 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x42,
- 0x0a, 0x19, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x65, 0x61, 0x6d, 0x51, 0x75, 0x69,
- 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x25, 0x0a, 0x06, 0x6d,
- 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42,
- 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62,
- 0x65, 0x72, 0x22, 0x1e, 0x0a, 0x1c, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x65, 0x61,
- 0x6d, 0x44, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x50, 0x75,
- 0x73, 0x68, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63,
- 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x61, 0x72,
- 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73,
- 0x70, 0x22, 0x37, 0x0a, 0x18, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65,
- 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a,
- 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42,
- 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x21, 0x0a, 0x0f, 0x50, 0x61,
- 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a,
- 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x12, 0x0a,
- 0x10, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73,
- 0x70, 0x22, 0x34, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65,
- 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75,
- 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f,
- 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x20, 0x0a, 0x0e, 0x50, 0x61, 0x72, 0x6b, 0x6f,
- 0x75, 0x72, 0x53, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x50, 0x61, 0x72,
- 0x6b, 0x6f, 0x75, 0x72, 0x53, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x0f,
- 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64, 0x52, 0x65, 0x71, 0x12,
- 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12,
- 0x1a, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
- 0x05, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x50,
- 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22,
- 0x2b, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x6c, 0x6c, 0x53, 0x70, 0x72,
- 0x69, 0x6e, 0x74, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x65, 0x66, 0x74,
- 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x65, 0x66, 0x74, 0x22, 0x3e, 0x0a, 0x1a,
- 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x48, 0x50, 0x43,
- 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69,
- 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02,
- 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x22, 0x3f, 0x0a, 0x17,
- 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x43, 0x68, 0x61, 0x6e,
- 0x61, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x01,
- 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6c, 0x75,
- 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x22, 0x2f, 0x0a,
- 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4f, 0x76, 0x65, 0x72,
- 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18,
- 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x22, 0x5d,
- 0x0a, 0x16, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e,
- 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74,
- 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70,
- 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
- 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d,
- 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x19, 0x0a,
- 0x17, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d,
- 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x38, 0x0a, 0x18, 0x52, 0x50, 0x43, 0x50,
- 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63,
+ 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x22, 0x76, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+ 0x75, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73,
+ 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x6f, 0x70,
+ 0x65, 0x6e, 0x12, 0x1e, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+ 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x69, 0x6e,
+ 0x66, 0x6f, 0x12, 0x2b, 0x0a, 0x09, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x18,
+ 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65,
+ 0x6d, 0x62, 0x65, 0x72, 0x52, 0x09, 0x72, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x64, 0x22,
+ 0x2b, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
+ 0x4d, 0x74, 0x73, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, 0x73, 0x69, 0x64, 0x18,
+ 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x74, 0x73, 0x69, 0x64, 0x22, 0x44, 0x0a, 0x14,
+ 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x74, 0x73,
+ 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x14, 0x0a, 0x05,
+ 0x6d, 0x74, 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x74, 0x73,
+ 0x69, 0x64, 0x22, 0x37, 0x0a, 0x15, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x66,
+ 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x69,
+ 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61,
+ 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x24, 0x0a, 0x10, 0x50,
+ 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12,
+ 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69,
+ 0x64, 0x22, 0x4b, 0x0a, 0x11, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69,
+ 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x12, 0x1e,
+ 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
+ 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x4f,
+ 0x0a, 0x17, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x4e,
+ 0x6f, 0x74, 0x69, 0x63, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x65, 0x61,
+ 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b,
+ 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61,
+ 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22,
+ 0x38, 0x0a, 0x16, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x65, 0x61, 0x6d, 0x43, 0x68,
+ 0x61, 0x6e, 0x61, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x65, 0x61,
+ 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b,
+ 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x4c, 0x0a, 0x16, 0x50, 0x61, 0x72,
+ 0x6b, 0x6f, 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65,
+ 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69,
+ 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+ 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x22, 0x31, 0x0a, 0x17, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+ 0x75, 0x72, 0x49, 0x6e, 0x76, 0x69, 0x74, 0x65, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x52, 0x65,
+ 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x32, 0x0a, 0x12, 0x50, 0x61,
+ 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x51, 0x75, 0x69, 0x74, 0x54, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71,
+ 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x22, 0x15,
+ 0x0a, 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x51, 0x75, 0x69, 0x74, 0x54, 0x65, 0x61,
+ 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x19, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
+ 0x54, 0x65, 0x61, 0x6d, 0x4a, 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x50, 0x75,
+ 0x73, 0x68, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65,
+ 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x42, 0x0a, 0x19, 0x50, 0x61, 0x72,
+ 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x65, 0x61, 0x6d, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, 0x74, 0x69,
+ 0x63, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d,
+ 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x1e, 0x0a,
+ 0x1c, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x65, 0x61, 0x6d, 0x44, 0x69, 0x73, 0x62,
+ 0x61, 0x6e, 0x64, 0x4e, 0x6f, 0x74, 0x69, 0x63, 0x65, 0x50, 0x75, 0x73, 0x68, 0x22, 0x33, 0x0a,
+ 0x13, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63,
0x68, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e,
- 0x69, 0x64, 0x22, 0x1b, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
- 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22,
- 0x5c, 0x0a, 0x16, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74,
- 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x03, 0x72, 0x65, 0x64,
- 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d,
- 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x62, 0x75,
- 0x6c, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63,
- 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x19, 0x0a,
- 0x17, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68,
- 0x53, 0x75, 0x63, 0x63, 0x52, 0x65, 0x73, 0x70, 0x22, 0x49, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x5f,
- 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68,
- 0x69, 0x70, 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, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03,
- 0x75, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f,
- 0x75, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73,
- 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
- 0x33,
+ 0x69, 0x64, 0x22, 0x16, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63,
+ 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x39, 0x0a, 0x19, 0x50, 0x61,
+ 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61,
+ 0x6e, 0x63, 0x65, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61,
+ 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74,
+ 0x61, 0x69, 0x6e, 0x69, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72,
+ 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x52,
+ 0x65, 0x73, 0x70, 0x22, 0x3b, 0x0a, 0x19, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61,
+ 0x63, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x74, 0x61, 0x72, 0x74, 0x50, 0x75, 0x73, 0x68,
+ 0x12, 0x1e, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a,
+ 0x2e, 0x44, 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d,
+ 0x22, 0x3c, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d,
+ 0x61, 0x74, 0x63, 0x68, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1e,
+ 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x44,
+ 0x42, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x22, 0x37,
+ 0x0a, 0x18, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x61, 0x74,
+ 0x63, 0x68, 0x53, 0x75, 0x63, 0x63, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x72, 0x61,
+ 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63,
+ 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x21, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f,
+ 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+ 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x61,
+ 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x22, 0x34,
+ 0x0a, 0x14, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x53, 0x74, 0x61,
+ 0x72, 0x74, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x64,
+ 0x6f, 0x77, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+ 0x64, 0x6f, 0x77, 0x6e, 0x22, 0x20, 0x0a, 0x0e, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x53,
+ 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75,
+ 0x72, 0x53, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3d, 0x0a, 0x0f, 0x50, 0x61, 0x72,
+ 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
+ 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
+ 0x64, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x61, 0x72, 0x6b,
+ 0x6f, 0x75, 0x72, 0x41, 0x76, 0x6f, 0x69, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x2b, 0x0a, 0x15,
+ 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x41, 0x6c, 0x6c, 0x53, 0x70, 0x72, 0x69, 0x6e, 0x74,
+ 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x65, 0x66, 0x74, 0x18, 0x01, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x65, 0x66, 0x74, 0x22, 0x3e, 0x0a, 0x1a, 0x50, 0x61, 0x72,
+ 0x6b, 0x6f, 0x75, 0x72, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x48, 0x50, 0x43, 0x68, 0x61, 0x6e,
+ 0x61, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x70, 0x18,
+ 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68, 0x70, 0x22, 0x3f, 0x0a, 0x17, 0x50, 0x61, 0x72,
+ 0x6b, 0x6f, 0x75, 0x72, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x43, 0x68, 0x61, 0x6e, 0x61, 0x67, 0x65,
+ 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+ 0x05, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x18, 0x02,
+ 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x62, 0x6c, 0x75, 0x65, 0x22, 0x2f, 0x0a, 0x13, 0x50, 0x61,
+ 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x52, 0x61, 0x63, 0x65, 0x4f, 0x76, 0x65, 0x72, 0x50, 0x75, 0x73,
+ 0x68, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
+ 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x22, 0x5d, 0x0a, 0x16, 0x52,
+ 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74,
+ 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e,
+ 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69,
+ 0x6e, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62,
+ 0x65, 0x72, 0x52, 0x06, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50,
+ 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4a, 0x6f, 0x69, 0x6e, 0x4d, 0x61, 0x74, 0x63,
+ 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x38, 0x0a, 0x18, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b,
+ 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65,
+ 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x18, 0x01,
+ 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x69, 0x64, 0x22,
+ 0x1b, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x43, 0x61, 0x6e,
+ 0x63, 0x65, 0x6c, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x22, 0x5c, 0x0a, 0x16,
+ 0x52, 0x50, 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53,
+ 0x75, 0x63, 0x63, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x18, 0x02, 0x20,
+ 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62,
+ 0x65, 0x72, 0x52, 0x03, 0x72, 0x65, 0x64, 0x12, 0x21, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x18,
+ 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65,
+ 0x6d, 0x62, 0x65, 0x72, 0x52, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x22, 0x19, 0x0a, 0x17, 0x52, 0x50,
+ 0x43, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x53, 0x75, 0x63,
+ 0x63, 0x52, 0x65, 0x73, 0x70, 0x22, 0x49, 0x0a, 0x19, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72,
+ 0x6b, 0x6f, 0x75, 0x72, 0x54, 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 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, 0x12, 0x10,
+ 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64,
+ 0x22, 0x1c, 0x0a, 0x1a, 0x52, 0x50, 0x43, 0x5f, 0x50, 0x61, 0x72, 0x6b, 0x6f, 0x75, 0x72, 0x54,
+ 0x72, 0x75, 0x73, 0x74, 0x65, 0x65, 0x73, 0x68, 0x69, 0x70, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06,
+ 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@@ -1963,7 +2179,7 @@ func file_parkour_parkour_msg_proto_rawDescGZIP() []byte {
return file_parkour_parkour_msg_proto_rawDescData
}
-var file_parkour_parkour_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 38)
+var file_parkour_parkour_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 42)
var file_parkour_parkour_msg_proto_goTypes = []interface{}{
(*ParkourInfoReq)(nil), // 0: ParkourInfoReq
(*ParkourInfoResp)(nil), // 1: ParkourInfoResp
@@ -1983,48 +2199,54 @@ var file_parkour_parkour_msg_proto_goTypes = []interface{}{
(*ParkourTeamDisbandNoticePush)(nil), // 15: ParkourTeamDisbandNoticePush
(*ParkourRaceMatchReq)(nil), // 16: ParkourRaceMatchReq
(*ParkourRaceMatchResp)(nil), // 17: ParkourRaceMatchResp
- (*ParkourRaceMatchSuccPush)(nil), // 18: ParkourRaceMatchSuccPush
- (*ParkourReadyReq)(nil), // 19: ParkourReadyReq
- (*ParkourReadyResp)(nil), // 20: ParkourReadyResp
- (*ParkourRaceStartPush)(nil), // 21: ParkourRaceStartPush
- (*ParkourShotReq)(nil), // 22: ParkourShotReq
- (*ParkourShotResp)(nil), // 23: ParkourShotResp
- (*ParkourAvoidReq)(nil), // 24: ParkourAvoidReq
- (*ParkourAvoidResp)(nil), // 25: ParkourAvoidResp
- (*ParkourAllSprintsPush)(nil), // 26: ParkourAllSprintsPush
- (*ParkourPlayerHPChanagePush)(nil), // 27: ParkourPlayerHPChanagePush
- (*ParkourScoreChanagePush)(nil), // 28: ParkourScoreChanagePush
- (*ParkourRaceOverPush)(nil), // 29: ParkourRaceOverPush
- (*RPCParkourJoinMatchReq)(nil), // 30: RPCParkourJoinMatchReq
- (*RPCParkourJoinMatchResp)(nil), // 31: RPCParkourJoinMatchResp
- (*RPCParkourCancelMatchReq)(nil), // 32: RPCParkourCancelMatchReq
- (*RPCParkourCancelMatchResp)(nil), // 33: RPCParkourCancelMatchResp
- (*RPCParkourMatchSuccReq)(nil), // 34: RPCParkourMatchSuccReq
- (*RPCParkourMatchSuccResp)(nil), // 35: RPCParkourMatchSuccResp
- (*RPC_ParkourTrusteeshipReq)(nil), // 36: RPC_ParkourTrusteeshipReq
- (*RPC_ParkourTrusteeshipResp)(nil), // 37: RPC_ParkourTrusteeshipResp
- (*DBParkour)(nil), // 38: DBParkour
- (*DBRaceMember)(nil), // 39: DBRaceMember
- (*DBRace)(nil), // 40: DBRace
+ (*ParkourRaceMatchCancelReq)(nil), // 18: ParkourRaceMatchCancelReq
+ (*ParkourRaceMatchCancelResp)(nil), // 19: ParkourRaceMatchCancelResp
+ (*ParkourRaceMatchStartPush)(nil), // 20: ParkourRaceMatchStartPush
+ (*ParkourRaceMatchCancelPush)(nil), // 21: ParkourRaceMatchCancelPush
+ (*ParkourRaceMatchSuccPush)(nil), // 22: ParkourRaceMatchSuccPush
+ (*ParkourReadyReq)(nil), // 23: ParkourReadyReq
+ (*ParkourReadyResp)(nil), // 24: ParkourReadyResp
+ (*ParkourRaceStartPush)(nil), // 25: ParkourRaceStartPush
+ (*ParkourShotReq)(nil), // 26: ParkourShotReq
+ (*ParkourShotResp)(nil), // 27: ParkourShotResp
+ (*ParkourAvoidReq)(nil), // 28: ParkourAvoidReq
+ (*ParkourAvoidResp)(nil), // 29: ParkourAvoidResp
+ (*ParkourAllSprintsPush)(nil), // 30: ParkourAllSprintsPush
+ (*ParkourPlayerHPChanagePush)(nil), // 31: ParkourPlayerHPChanagePush
+ (*ParkourScoreChanagePush)(nil), // 32: ParkourScoreChanagePush
+ (*ParkourRaceOverPush)(nil), // 33: ParkourRaceOverPush
+ (*RPCParkourJoinMatchReq)(nil), // 34: RPCParkourJoinMatchReq
+ (*RPCParkourJoinMatchResp)(nil), // 35: RPCParkourJoinMatchResp
+ (*RPCParkourCancelMatchReq)(nil), // 36: RPCParkourCancelMatchReq
+ (*RPCParkourCancelMatchResp)(nil), // 37: RPCParkourCancelMatchResp
+ (*RPCParkourMatchSuccReq)(nil), // 38: RPCParkourMatchSuccReq
+ (*RPCParkourMatchSuccResp)(nil), // 39: RPCParkourMatchSuccResp
+ (*RPC_ParkourTrusteeshipReq)(nil), // 40: RPC_ParkourTrusteeshipReq
+ (*RPC_ParkourTrusteeshipResp)(nil), // 41: RPC_ParkourTrusteeshipResp
+ (*DBParkour)(nil), // 42: DBParkour
+ (*DBRaceMember)(nil), // 43: DBRaceMember
+ (*DBRace)(nil), // 44: DBRace
}
var file_parkour_parkour_msg_proto_depIdxs = []int32{
- 38, // 0: ParkourInfoResp.info:type_name -> DBParkour
- 38, // 1: ParkourInfoResp.recommend:type_name -> DBParkour
- 38, // 2: ParkourInfoChangePush.info:type_name -> DBParkour
- 38, // 3: ParkourInviteResp.team:type_name -> DBParkour
- 38, // 4: ParkourInviteNoticePush.team:type_name -> DBParkour
- 38, // 5: ParkourTeamChanagePush.team:type_name -> DBParkour
- 39, // 6: ParkourTeamJoinNoticePush.member:type_name -> DBRaceMember
- 39, // 7: ParkourTeamQuitNoticePush.member:type_name -> DBRaceMember
- 40, // 8: ParkourRaceMatchSuccPush.race:type_name -> DBRace
- 39, // 9: RPCParkourJoinMatchReq.member:type_name -> DBRaceMember
- 39, // 10: RPCParkourMatchSuccReq.red:type_name -> DBRaceMember
- 39, // 11: RPCParkourMatchSuccReq.bule:type_name -> DBRaceMember
- 12, // [12:12] is the sub-list for method output_type
- 12, // [12:12] is the sub-list for method input_type
- 12, // [12:12] is the sub-list for extension type_name
- 12, // [12:12] is the sub-list for extension extendee
- 0, // [0:12] is the sub-list for field type_name
+ 42, // 0: ParkourInfoResp.info:type_name -> DBParkour
+ 43, // 1: ParkourInfoResp.recommend:type_name -> DBRaceMember
+ 42, // 2: ParkourInfoChangePush.info:type_name -> DBParkour
+ 42, // 3: ParkourInviteResp.team:type_name -> DBParkour
+ 42, // 4: ParkourInviteNoticePush.team:type_name -> DBParkour
+ 42, // 5: ParkourTeamChanagePush.team:type_name -> DBParkour
+ 43, // 6: ParkourTeamJoinNoticePush.member:type_name -> DBRaceMember
+ 43, // 7: ParkourTeamQuitNoticePush.member:type_name -> DBRaceMember
+ 42, // 8: ParkourRaceMatchStartPush.team:type_name -> DBParkour
+ 42, // 9: ParkourRaceMatchCancelPush.team:type_name -> DBParkour
+ 44, // 10: ParkourRaceMatchSuccPush.race:type_name -> DBRace
+ 43, // 11: RPCParkourJoinMatchReq.member:type_name -> DBRaceMember
+ 43, // 12: RPCParkourMatchSuccReq.red:type_name -> DBRaceMember
+ 43, // 13: RPCParkourMatchSuccReq.bule:type_name -> DBRaceMember
+ 14, // [14:14] is the sub-list for method output_type
+ 14, // [14:14] is the sub-list for method input_type
+ 14, // [14:14] is the sub-list for extension type_name
+ 14, // [14:14] is the sub-list for extension extendee
+ 0, // [0:14] is the sub-list for field type_name
}
func init() { file_parkour_parkour_msg_proto_init() }
@@ -2251,7 +2473,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourRaceMatchSuccPush); i {
+ switch v := v.(*ParkourRaceMatchCancelReq); i {
case 0:
return &v.state
case 1:
@@ -2263,7 +2485,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourReadyReq); i {
+ switch v := v.(*ParkourRaceMatchCancelResp); i {
case 0:
return &v.state
case 1:
@@ -2275,7 +2497,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourReadyResp); i {
+ switch v := v.(*ParkourRaceMatchStartPush); i {
case 0:
return &v.state
case 1:
@@ -2287,7 +2509,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourRaceStartPush); i {
+ switch v := v.(*ParkourRaceMatchCancelPush); i {
case 0:
return &v.state
case 1:
@@ -2299,7 +2521,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourShotReq); i {
+ switch v := v.(*ParkourRaceMatchSuccPush); i {
case 0:
return &v.state
case 1:
@@ -2311,7 +2533,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourShotResp); i {
+ switch v := v.(*ParkourReadyReq); i {
case 0:
return &v.state
case 1:
@@ -2323,7 +2545,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourAvoidReq); i {
+ switch v := v.(*ParkourReadyResp); i {
case 0:
return &v.state
case 1:
@@ -2335,7 +2557,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourAvoidResp); i {
+ switch v := v.(*ParkourRaceStartPush); i {
case 0:
return &v.state
case 1:
@@ -2347,7 +2569,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourAllSprintsPush); i {
+ switch v := v.(*ParkourShotReq); i {
case 0:
return &v.state
case 1:
@@ -2359,7 +2581,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourPlayerHPChanagePush); i {
+ switch v := v.(*ParkourShotResp); i {
case 0:
return &v.state
case 1:
@@ -2371,7 +2593,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourScoreChanagePush); i {
+ switch v := v.(*ParkourAvoidReq); i {
case 0:
return &v.state
case 1:
@@ -2383,7 +2605,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*ParkourRaceOverPush); i {
+ switch v := v.(*ParkourAvoidResp); i {
case 0:
return &v.state
case 1:
@@ -2395,7 +2617,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*RPCParkourJoinMatchReq); i {
+ switch v := v.(*ParkourAllSprintsPush); i {
case 0:
return &v.state
case 1:
@@ -2407,7 +2629,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*RPCParkourJoinMatchResp); i {
+ switch v := v.(*ParkourPlayerHPChanagePush); i {
case 0:
return &v.state
case 1:
@@ -2419,7 +2641,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*RPCParkourCancelMatchReq); i {
+ switch v := v.(*ParkourScoreChanagePush); i {
case 0:
return &v.state
case 1:
@@ -2431,7 +2653,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*RPCParkourCancelMatchResp); i {
+ switch v := v.(*ParkourRaceOverPush); i {
case 0:
return &v.state
case 1:
@@ -2443,7 +2665,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*RPCParkourMatchSuccReq); i {
+ switch v := v.(*RPCParkourJoinMatchReq); i {
case 0:
return &v.state
case 1:
@@ -2455,7 +2677,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*RPCParkourMatchSuccResp); i {
+ switch v := v.(*RPCParkourJoinMatchResp); i {
case 0:
return &v.state
case 1:
@@ -2467,7 +2689,7 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
- switch v := v.(*RPC_ParkourTrusteeshipReq); i {
+ switch v := v.(*RPCParkourCancelMatchReq); i {
case 0:
return &v.state
case 1:
@@ -2479,6 +2701,54 @@ func file_parkour_parkour_msg_proto_init() {
}
}
file_parkour_parkour_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*RPCParkourCancelMatchResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_parkour_parkour_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*RPCParkourMatchSuccReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_parkour_parkour_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*RPCParkourMatchSuccResp); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_parkour_parkour_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+ switch v := v.(*RPC_ParkourTrusteeshipReq); i {
+ case 0:
+ return &v.state
+ case 1:
+ return &v.sizeCache
+ case 2:
+ return &v.unknownFields
+ default:
+ return nil
+ }
+ }
+ file_parkour_parkour_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*RPC_ParkourTrusteeshipResp); i {
case 0:
return &v.state
@@ -2497,7 +2767,7 @@ func file_parkour_parkour_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_parkour_parkour_msg_proto_rawDesc,
NumEnums: 0,
- NumMessages: 38,
+ NumMessages: 42,
NumExtensions: 0,
NumServices: 0,
},
diff --git a/sys/configure/structs/Game.buzkashiOpen.go b/sys/configure/structs/Game.buzkashiOpen.go
new file mode 100644
index 000000000..819f52683
--- /dev/null
+++ b/sys/configure/structs/Game.buzkashiOpen.go
@@ -0,0 +1,42 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+type GamebuzkashiOpen struct {
+ _dataMap map[int32]*GamebuzkashiOpenData
+ _dataList []*GamebuzkashiOpenData
+}
+
+func NewGamebuzkashiOpen(_buf []map[string]interface{}) (*GamebuzkashiOpen, error) {
+ _dataList := make([]*GamebuzkashiOpenData, 0, len(_buf))
+ dataMap := make(map[int32]*GamebuzkashiOpenData)
+ for _, _ele_ := range _buf {
+ if _v, err2 := DeserializeGamebuzkashiOpenData(_ele_); err2 != nil {
+ return nil, err2
+ } else {
+ _dataList = append(_dataList, _v)
+ dataMap[_v.Num] = _v
+ }
+ }
+ return &GamebuzkashiOpen{_dataList:_dataList, _dataMap:dataMap}, nil
+}
+
+func (table *GamebuzkashiOpen) GetDataMap() map[int32]*GamebuzkashiOpenData {
+ return table._dataMap
+}
+
+func (table *GamebuzkashiOpen) GetDataList() []*GamebuzkashiOpenData {
+ return table._dataList
+}
+
+func (table *GamebuzkashiOpen) Get(key int32) *GamebuzkashiOpenData {
+ return table._dataMap[key]
+}
+
+
diff --git a/sys/configure/structs/Game.buzkashiOpenData.go b/sys/configure/structs/Game.buzkashiOpenData.go
new file mode 100644
index 000000000..980b5a756
--- /dev/null
+++ b/sys/configure/structs/Game.buzkashiOpenData.go
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+package cfg
+
+import "errors"
+
+type GamebuzkashiOpenData struct {
+ Num int32
+ Stime string
+ Etime string
+}
+
+const TypeId_GamebuzkashiOpenData = 1621393927
+
+func (*GamebuzkashiOpenData) GetTypeId() int32 {
+ return 1621393927
+}
+
+func (_v *GamebuzkashiOpenData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
+ { var _ok_ bool; if _v.Stime, _ok_ = _buf["stime"].(string); !_ok_ { err = errors.New("stime error"); return } }
+ { var _ok_ bool; if _v.Etime, _ok_ = _buf["etime"].(string); !_ok_ { err = errors.New("etime error"); return } }
+ return
+}
+
+func DeserializeGamebuzkashiOpenData(_buf map[string]interface{}) (*GamebuzkashiOpenData, error) {
+ v := &GamebuzkashiOpenData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index 95775d48d..abe7c23b7 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -194,6 +194,7 @@ type Tables struct {
BuzkashiLv *GameBuzkashiLv
BuzkashiGrade *GameBuzkashiGrade
BuzkashiReward *GameBuzkashiReward
+ buzkashiOpen *GamebuzkashiOpen
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -1299,5 +1300,11 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if tables.BuzkashiReward, err = NewGameBuzkashiReward(buf) ; err != nil {
return nil, err
}
+ if buf, err = loader("game_buzkashiopen") ; err != nil {
+ return nil, err
+ }
+ if tables.buzkashiOpen, err = NewGamebuzkashiOpen(buf) ; err != nil {
+ return nil, err
+ }
return tables, nil
}
diff --git a/sys/configure/structs/game.activeRewardData.go b/sys/configure/structs/game.activeRewardData.go
index 1b741d60e..aa46b9d5f 100644
--- a/sys/configure/structs/game.activeRewardData.go
+++ b/sys/configure/structs/game.activeRewardData.go
@@ -15,6 +15,8 @@ type GameActiveRewardData struct {
IdTag int32
Active int32
Reword []*Gameatn
+ Action string
+ Stage int32
}
const TypeId_GameActiveRewardData = 942906779
@@ -41,6 +43,8 @@ func (_v *GameActiveRewardData)Deserialize(_buf map[string]interface{}) (err err
}
}
+ { var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage"].(float64); !_ok_ { err = errors.New("stage error"); return }; _v.Stage = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 22c982fca..0a16cb656 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -214,6 +214,14 @@ type GameGlobalData struct {
BusinessRenovatething int32
FavorabilityLikes int32
FavorabilityDislikes int32
+ BuzkashiTime int32
+ BuzkashiSchedule int32
+ BuzkashiStime int32
+ BuzkashiVreward []*Gameatn
+ BuzkashiFreward []*Gameatn
+ BuzkashiVintegral []*Gameatn
+ BuzkashiFintegral []*Gameatn
+ BuzkashiResurrection int32
}
const TypeId_GameGlobalData = 477542761
@@ -842,6 +850,66 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_time"].(float64); !_ok_ { err = errors.New("buzkashi_time error"); return }; _v.BuzkashiTime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_schedule"].(float64); !_ok_ { err = errors.New("buzkashi_schedule error"); return }; _v.BuzkashiSchedule = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_stime"].(float64); !_ok_ { err = errors.New("buzkashi_stime error"); return }; _v.BuzkashiStime = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["buzkashi_vreward"].([]interface{}); !_ok_ { err = errors.New("buzkashi_vreward error"); return }
+
+ _v.BuzkashiVreward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.BuzkashiVreward = append(_v.BuzkashiVreward, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["buzkashi_freward"].([]interface{}); !_ok_ { err = errors.New("buzkashi_freward error"); return }
+
+ _v.BuzkashiFreward = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.BuzkashiFreward = append(_v.BuzkashiFreward, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["buzkashi_vintegral"].([]interface{}); !_ok_ { err = errors.New("buzkashi_vintegral error"); return }
+
+ _v.BuzkashiVintegral = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.BuzkashiVintegral = append(_v.BuzkashiVintegral, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["buzkashi_fintegral"].([]interface{}); !_ok_ { err = errors.New("buzkashi_fintegral error"); return }
+
+ _v.BuzkashiFintegral = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.BuzkashiFintegral = append(_v.BuzkashiFintegral, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buzkashi_resurrection"].(float64); !_ok_ { err = errors.New("buzkashi_resurrection error"); return }; _v.BuzkashiResurrection = int32(_tempNum_) }
return
}
diff --git a/sys/configure/structs/game.taskActiveRewardData.go b/sys/configure/structs/game.taskActiveRewardData.go
index b6cff4ed7..fde65e4da 100644
--- a/sys/configure/structs/game.taskActiveRewardData.go
+++ b/sys/configure/structs/game.taskActiveRewardData.go
@@ -15,6 +15,8 @@ type GameTaskActiveRewardData struct {
IdTag int32
Active int32
Reword []*Gameatn
+ Action string
+ Stage int32
}
const TypeId_GameTaskActiveRewardData = 1583402816
@@ -41,6 +43,8 @@ func (_v *GameTaskActiveRewardData)Deserialize(_buf map[string]interface{}) (err
}
}
+ { var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stage"].(float64); !_ok_ { err = errors.New("stage error"); return }; _v.Stage = int32(_tempNum_) }
return
}