From 2530db04161dbc24aa8334468149c6eb2baf51dd Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 23 Jan 2024 15:45:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8E=A0=E5=A4=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battlescore.json | 495 +-- bin/json/game_buriedcondi.json | 3069 ++++++++++++----- bin/json/game_buriedtype.json | 4 +- bin/json/game_expeditionboss.json | 457 +++ bin/json/game_gm.json | 32 +- bin/json/game_mainstage.json | 94 +- bin/json/game_monsterformat.json | 2 +- bin/json/game_skillatk.json | 3 +- modules/plunder/api_pvpchallengeover.go | 18 +- modules/plunder/api_reach.go | 61 +- pb/battle_msg.pb.go | 214 +- pb/battle_struct.pb.go | 519 ++- pb/plunder_db.pb.go | 37 +- pb/plunder_msg.pb.go | 101 +- sys/configure/structs/Game.BattleScoreData.go | 10 +- sys/configure/structs/Game.BuriedCondiData.go | 2 + sys/configure/structs/Game.ExpeditionBoss.go | 42 + .../structs/Game.ExpeditionBossData.go | 124 + sys/configure/structs/Tables.go | 6 +- 19 files changed, 3764 insertions(+), 1526 deletions(-) create mode 100644 bin/json/game_expeditionboss.json create mode 100644 sys/configure/structs/Game.ExpeditionBoss.go create mode 100644 sys/configure/structs/Game.ExpeditionBossData.go diff --git a/bin/json/game_battlescore.json b/bin/json/game_battlescore.json index d6d7a2927..aaeb65d87 100644 --- a/bin/json/game_battlescore.json +++ b/bin/json/game_battlescore.json @@ -6,10 +6,11 @@ "key": "guild_guild_boss_score_name_1", "text": "e-" }, + "PassUnlock": 0, "rank_low": 0, "rank_up": 19999, - "grade": "gh_img_e0", - "score": 1 + "icon": "gh_img_e0", + "grade": 1 }, { "id": 1, @@ -18,10 +19,11 @@ "key": "guild_guild_boss_score_name_2", "text": "e" }, + "PassUnlock": 0, "rank_low": 20000, "rank_up": 49999, - "grade": "gh_img_e", - "score": 2 + "icon": "gh_img_e", + "grade": 2 }, { "id": 1, @@ -30,10 +32,11 @@ "key": "guild_guild_boss_score_name_3", "text": "e+" }, + "PassUnlock": 0, "rank_low": 50000, "rank_up": 79999, - "grade": "gh_img_e1", - "score": 3 + "icon": "gh_img_e1", + "grade": 3 }, { "id": 1, @@ -42,10 +45,11 @@ "key": "guild_guild_boss_score_name_4", "text": "d-" }, + "PassUnlock": 0, "rank_low": 80000, "rank_up": 99999, - "grade": "gh_img_d0", - "score": 4 + "icon": "gh_img_d0", + "grade": 4 }, { "id": 1, @@ -54,10 +58,11 @@ "key": "guild_guild_boss_score_name_5", "text": "d" }, + "PassUnlock": 0, "rank_low": 100000, "rank_up": 149999, - "grade": "gh_img_d", - "score": 5 + "icon": "gh_img_d", + "grade": 5 }, { "id": 1, @@ -66,10 +71,11 @@ "key": "guild_guild_boss_score_name_6", "text": "d+" }, + "PassUnlock": 0, "rank_low": 150000, "rank_up": 199999, - "grade": "gh_img_d1", - "score": 6 + "icon": "gh_img_d1", + "grade": 6 }, { "id": 1, @@ -78,10 +84,11 @@ "key": "guild_guild_boss_score_name_7", "text": "c-" }, + "PassUnlock": 0, "rank_low": 200000, "rank_up": 249999, - "grade": "gh_img_c0", - "score": 7 + "icon": "gh_img_c0", + "grade": 7 }, { "id": 1, @@ -90,10 +97,11 @@ "key": "guild_guild_boss_score_name_8", "text": "c" }, + "PassUnlock": 0, "rank_low": 250000, "rank_up": 319999, - "grade": "gh_img_c", - "score": 8 + "icon": "gh_img_c", + "grade": 8 }, { "id": 1, @@ -102,10 +110,11 @@ "key": "guild_guild_boss_score_name_9", "text": "c+" }, + "PassUnlock": 0, "rank_low": 320000, "rank_up": 399999, - "grade": "gh_img_c1", - "score": 9 + "icon": "gh_img_c1", + "grade": 9 }, { "id": 1, @@ -114,10 +123,11 @@ "key": "guild_guild_boss_score_name_11", "text": "b" }, + "PassUnlock": 0, "rank_low": 400000, "rank_up": 499999, - "grade": "gh_img_b", - "score": 11 + "icon": "gh_img_b", + "grade": 11 }, { "id": 1, @@ -126,10 +136,11 @@ "key": "guild_guild_boss_score_name_12", "text": "b+" }, + "PassUnlock": 0, "rank_low": 500000, "rank_up": 599999, - "grade": "gh_img_b1", - "score": 12 + "icon": "gh_img_b1", + "grade": 12 }, { "id": 1, @@ -138,10 +149,11 @@ "key": "guild_guild_boss_score_name_14", "text": "a" }, + "PassUnlock": 0, "rank_low": 600000, "rank_up": 699999, - "grade": "gh_img_a", - "score": 14 + "icon": "gh_img_a", + "grade": 14 }, { "id": 1, @@ -150,10 +162,11 @@ "key": "guild_guild_boss_score_name_15", "text": "a+" }, + "PassUnlock": 0, "rank_low": 700000, "rank_up": 999999, - "grade": "gh_img_a1", - "score": 15 + "icon": "gh_img_a1", + "grade": 15 }, { "id": 1, @@ -162,10 +175,11 @@ "key": "guild_guild_boss_score_name_16", "text": "s" }, + "PassUnlock": 0, "rank_low": 1000000, "rank_up": 1199999, - "grade": "gh_img_s", - "score": 16 + "icon": "gh_img_s", + "grade": 16 }, { "id": 1, @@ -174,10 +188,11 @@ "key": "guild_guild_boss_score_name_17", "text": "ss" }, + "PassUnlock": 0, "rank_low": 1200000, "rank_up": 1599999, - "grade": "gh_img_ss", - "score": 17 + "icon": "gh_img_ss", + "grade": 17 }, { "id": 1, @@ -186,10 +201,11 @@ "key": "guild_guild_boss_score_name_18", "text": "sss" }, + "PassUnlock": 0, "rank_low": 1600000, "rank_up": 1999999, - "grade": "gh_img_sss", - "score": 18 + "icon": "gh_img_sss", + "grade": 18 }, { "id": 1, @@ -198,10 +214,11 @@ "key": "guild_guild_boss_score_name_19", "text": "sss+" }, + "PassUnlock": 0, "rank_low": 2000000, "rank_up": 2799999, - "grade": "gh_img_sss1", - "score": 19 + "icon": "gh_img_sss1", + "grade": 19 }, { "id": 1, @@ -210,10 +227,11 @@ "key": "guild_guild_boss_score_name_20", "text": "ex" }, + "PassUnlock": 0, "rank_low": 2800000, "rank_up": 3799999, - "grade": "gh_img_ex3", - "score": 20 + "icon": "gh_img_ex3", + "grade": 20 }, { "id": 1, @@ -222,10 +240,11 @@ "key": "guild_guild_boss_score_name_21", "text": "ex+" }, + "PassUnlock": 0, "rank_low": 3800000, "rank_up": 4999999, - "grade": "gh_img_ex2", - "score": 21 + "icon": "gh_img_ex2", + "grade": 21 }, { "id": 1, @@ -234,10 +253,11 @@ "key": "guild_guild_boss_score_name_22", "text": "ex++" }, + "PassUnlock": 0, "rank_low": 5000000, "rank_up": -1, - "grade": "gh_img_ex1", - "score": 22 + "icon": "gh_img_ex1", + "grade": 22 }, { "id": 2001, @@ -246,10 +266,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 10000, "rank_up": 19999, - "grade": "", - "score": 1 + "icon": "", + "grade": 1 }, { "id": 2001, @@ -258,10 +279,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 20000, "rank_up": 49999, - "grade": "", - "score": 2 + "icon": "", + "grade": 2 }, { "id": 2001, @@ -270,10 +292,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 50000, "rank_up": 79999, - "grade": "", - "score": 3 + "icon": "", + "grade": 3 }, { "id": 2001, @@ -282,10 +305,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 80000, "rank_up": -1, - "grade": "", - "score": 4 + "icon": "", + "grade": 4 }, { "id": 2002, @@ -294,10 +318,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 10000, "rank_up": 19999, - "grade": "", - "score": 5 + "icon": "", + "grade": 5 }, { "id": 2002, @@ -306,10 +331,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 20000, "rank_up": 49999, - "grade": "", - "score": 6 + "icon": "", + "grade": 6 }, { "id": 2002, @@ -318,10 +344,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 50000, "rank_up": 79999, - "grade": "", - "score": 7 + "icon": "", + "grade": 7 }, { "id": 2002, @@ -330,10 +357,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 80000, "rank_up": -1, - "grade": "", - "score": 8 + "icon": "", + "grade": 8 }, { "id": 2003, @@ -342,10 +370,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 10000, "rank_up": 19999, - "grade": "", - "score": 9 + "icon": "", + "grade": 9 }, { "id": 2003, @@ -354,10 +383,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 20000, "rank_up": 49999, - "grade": "", - "score": 10 + "icon": "", + "grade": 10 }, { "id": 2003, @@ -366,10 +396,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 50000, "rank_up": 79999, - "grade": "", - "score": 11 + "icon": "", + "grade": 11 }, { "id": 2003, @@ -378,10 +409,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 80000, "rank_up": -1, - "grade": "", - "score": 12 + "icon": "", + "grade": 12 }, { "id": 2004, @@ -390,10 +422,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 10000, "rank_up": 19999, - "grade": "", - "score": 13 + "icon": "", + "grade": 13 }, { "id": 2004, @@ -402,10 +435,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 20000, "rank_up": 49999, - "grade": "", - "score": 14 + "icon": "", + "grade": 14 }, { "id": 2004, @@ -414,10 +448,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 50000, "rank_up": 79999, - "grade": "", - "score": 15 + "icon": "", + "grade": 15 }, { "id": 2004, @@ -426,10 +461,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 80000, "rank_up": -1, - "grade": "", - "score": 16 + "icon": "", + "grade": 16 }, { "id": 2005, @@ -438,10 +474,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 10000, "rank_up": 19999, - "grade": "", - "score": 17 + "icon": "", + "grade": 17 }, { "id": 2005, @@ -450,10 +487,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 20000, "rank_up": 49999, - "grade": "", - "score": 18 + "icon": "", + "grade": 18 }, { "id": 2005, @@ -462,10 +500,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 50000, "rank_up": 79999, - "grade": "", - "score": 19 + "icon": "", + "grade": 19 }, { "id": 2005, @@ -474,10 +513,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 80000, "rank_up": -1, - "grade": "", - "score": 20 + "icon": "", + "grade": 20 }, { "id": 2006, @@ -486,10 +526,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 10000, "rank_up": 19999, - "grade": "", - "score": 21 + "icon": "", + "grade": 21 }, { "id": 2006, @@ -498,10 +539,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 20000, "rank_up": 49999, - "grade": "", - "score": 22 + "icon": "", + "grade": 22 }, { "id": 2006, @@ -510,10 +552,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 50000, "rank_up": 79999, - "grade": "", - "score": 23 + "icon": "", + "grade": 23 }, { "id": 2006, @@ -522,10 +565,11 @@ "key": "", "text": "" }, + "PassUnlock": 0, "rank_low": 80000, "rank_up": -1, - "grade": "", - "score": 24 + "icon": "", + "grade": 24 }, { "id": 301, @@ -534,10 +578,11 @@ "key": "Integralboss_boss_name_1", "text": "c-" }, + "PassUnlock": 0, "rank_low": 0, "rank_up": 249999, - "grade": "gh_img_c0", - "score": 1 + "icon": "gh_img_c0", + "grade": 1 }, { "id": 301, @@ -546,10 +591,11 @@ "key": "Integralboss_boss_name_1", "text": "c" }, + "PassUnlock": 0, "rank_low": 250000, "rank_up": 319999, - "grade": "gh_img_c", - "score": 2 + "icon": "gh_img_c", + "grade": 2 }, { "id": 301, @@ -558,10 +604,11 @@ "key": "Integralboss_boss_name_1", "text": "c+" }, + "PassUnlock": 0, "rank_low": 320000, "rank_up": 399999, - "grade": "gh_img_c1", - "score": 3 + "icon": "gh_img_c1", + "grade": 3 }, { "id": 301, @@ -570,10 +617,11 @@ "key": "Integralboss_boss_name_1", "text": "b" }, + "PassUnlock": 0, "rank_low": 400000, "rank_up": 499999, - "grade": "gh_img_b", - "score": 4 + "icon": "gh_img_b", + "grade": 4 }, { "id": 301, @@ -582,10 +630,11 @@ "key": "Integralboss_boss_name_1", "text": "b+" }, + "PassUnlock": 0, "rank_low": 500000, "rank_up": 599999, - "grade": "gh_img_b1", - "score": 5 + "icon": "gh_img_b1", + "grade": 5 }, { "id": 301, @@ -594,10 +643,11 @@ "key": "Integralboss_boss_name_1", "text": "a" }, + "PassUnlock": 0, "rank_low": 600000, "rank_up": 699999, - "grade": "gh_img_a", - "score": 6 + "icon": "gh_img_a", + "grade": 6 }, { "id": 301, @@ -606,10 +656,11 @@ "key": "Integralboss_boss_name_1", "text": "a+" }, + "PassUnlock": 0, "rank_low": 700000, "rank_up": 999999, - "grade": "gh_img_a1", - "score": 7 + "icon": "gh_img_a1", + "grade": 7 }, { "id": 301, @@ -618,10 +669,11 @@ "key": "Integralboss_boss_name_1", "text": "s" }, + "PassUnlock": 0, "rank_low": 1000000, "rank_up": 1199999, - "grade": "gh_img_s", - "score": 8 + "icon": "gh_img_s", + "grade": 8 }, { "id": 301, @@ -630,10 +682,11 @@ "key": "Integralboss_boss_name_1", "text": "ss" }, + "PassUnlock": 0, "rank_low": 1200000, "rank_up": 1599999, - "grade": "gh_img_ss", - "score": 9 + "icon": "gh_img_ss", + "grade": 9 }, { "id": 301, @@ -642,10 +695,11 @@ "key": "Integralboss_boss_name_1", "text": "sss" }, + "PassUnlock": 0, "rank_low": 1600000, "rank_up": 1999999, - "grade": "gh_img_sss", - "score": 10 + "icon": "gh_img_sss", + "grade": 10 }, { "id": 301, @@ -654,10 +708,11 @@ "key": "Integralboss_boss_name_1", "text": "sss+" }, + "PassUnlock": 0, "rank_low": 2000000, "rank_up": -1, - "grade": "gh_img_sss1", - "score": 11 + "icon": "gh_img_sss1", + "grade": 11 }, { "id": 302, @@ -666,10 +721,11 @@ "key": "Integralboss_boss_name_7", "text": "c-" }, + "PassUnlock": 0, "rank_low": 0, "rank_up": 249999, - "grade": "gh_img_c0", - "score": 12 + "icon": "gh_img_c0", + "grade": 12 }, { "id": 302, @@ -678,10 +734,11 @@ "key": "Integralboss_boss_name_7", "text": "c" }, + "PassUnlock": 0, "rank_low": 250000, "rank_up": 319999, - "grade": "gh_img_c", - "score": 13 + "icon": "gh_img_c", + "grade": 13 }, { "id": 302, @@ -690,10 +747,11 @@ "key": "Integralboss_boss_name_7", "text": "c+" }, + "PassUnlock": 0, "rank_low": 320000, "rank_up": 399999, - "grade": "gh_img_c1", - "score": 14 + "icon": "gh_img_c1", + "grade": 14 }, { "id": 302, @@ -702,10 +760,11 @@ "key": "Integralboss_boss_name_7", "text": "b" }, + "PassUnlock": 0, "rank_low": 400000, "rank_up": 499999, - "grade": "gh_img_b", - "score": 15 + "icon": "gh_img_b", + "grade": 15 }, { "id": 302, @@ -714,10 +773,11 @@ "key": "Integralboss_boss_name_7", "text": "b+" }, + "PassUnlock": 0, "rank_low": 500000, "rank_up": 599999, - "grade": "gh_img_b1", - "score": 16 + "icon": "gh_img_b1", + "grade": 16 }, { "id": 302, @@ -726,10 +786,11 @@ "key": "Integralboss_boss_name_7", "text": "a" }, + "PassUnlock": 0, "rank_low": 600000, "rank_up": 699999, - "grade": "gh_img_a", - "score": 17 + "icon": "gh_img_a", + "grade": 17 }, { "id": 302, @@ -738,10 +799,11 @@ "key": "Integralboss_boss_name_7", "text": "a+" }, + "PassUnlock": 0, "rank_low": 700000, "rank_up": 999999, - "grade": "gh_img_a1", - "score": 18 + "icon": "gh_img_a1", + "grade": 18 }, { "id": 302, @@ -750,10 +812,11 @@ "key": "Integralboss_boss_name_7", "text": "s" }, + "PassUnlock": 0, "rank_low": 1000000, "rank_up": 1199999, - "grade": "gh_img_s", - "score": 19 + "icon": "gh_img_s", + "grade": 19 }, { "id": 302, @@ -762,10 +825,11 @@ "key": "Integralboss_boss_name_7", "text": "ss" }, + "PassUnlock": 0, "rank_low": 1200000, "rank_up": 1599999, - "grade": "gh_img_ss", - "score": 20 + "icon": "gh_img_ss", + "grade": 20 }, { "id": 302, @@ -774,10 +838,11 @@ "key": "Integralboss_boss_name_7", "text": "sss" }, + "PassUnlock": 0, "rank_low": 1600000, "rank_up": 1999999, - "grade": "gh_img_sss", - "score": 21 + "icon": "gh_img_sss", + "grade": 21 }, { "id": 302, @@ -786,10 +851,11 @@ "key": "Integralboss_boss_name_7", "text": "sss+" }, + "PassUnlock": 0, "rank_low": 2000000, "rank_up": -1, - "grade": "gh_img_sss1", - "score": 22 + "icon": "gh_img_sss1", + "grade": 22 }, { "id": 4101, @@ -798,10 +864,11 @@ "key": "enchantboss_name_01", "text": "F" }, + "PassUnlock": 0, "rank_low": 0, "rank_up": 30000, - "grade": "gh_img_f", - "score": 101 + "icon": "gh_img_f", + "grade": 101 }, { "id": 4101, @@ -810,10 +877,11 @@ "key": "enchantboss_name_02", "text": "C" }, + "PassUnlock": 0, "rank_low": 300001, "rank_up": 600000, - "grade": "gh_img_c", - "score": 102 + "icon": "gh_img_c", + "grade": 102 }, { "id": 4101, @@ -822,10 +890,11 @@ "key": "enchantboss_name_03", "text": "B" }, + "PassUnlock": 0, "rank_low": 600001, "rank_up": 700000, - "grade": "gh_img_b", - "score": 103 + "icon": "gh_img_b", + "grade": 103 }, { "id": 4101, @@ -834,10 +903,11 @@ "key": "enchantboss_name_04", "text": "A" }, + "PassUnlock": 0, "rank_low": 700001, "rank_up": 800000, - "grade": "gh_img_a", - "score": 104 + "icon": "gh_img_a", + "grade": 104 }, { "id": 4101, @@ -846,10 +916,11 @@ "key": "enchantboss_name_05", "text": "A+" }, + "PassUnlock": 0, "rank_low": 800001, "rank_up": 1000000, - "grade": "gh_img_a1", - "score": 105 + "icon": "gh_img_a1", + "grade": 105 }, { "id": 4101, @@ -858,10 +929,11 @@ "key": "enchantboss_name_06", "text": "S" }, + "PassUnlock": 1, "rank_low": 1000001, "rank_up": 2000000, - "grade": "gh_img_s", - "score": 106 + "icon": "gh_img_s", + "grade": 106 }, { "id": 4101, @@ -870,10 +942,11 @@ "key": "enchantboss_name_07", "text": "SS" }, + "PassUnlock": 1, "rank_low": 2000001, "rank_up": 3000000, - "grade": "gh_img_ss", - "score": 107 + "icon": "gh_img_ss", + "grade": 107 }, { "id": 4101, @@ -882,10 +955,11 @@ "key": "enchantboss_name_08", "text": "SSS" }, + "PassUnlock": 1, "rank_low": 3000001, "rank_up": 4000000, - "grade": "gh_img_sss", - "score": 108 + "icon": "gh_img_sss", + "grade": 108 }, { "id": 4101, @@ -894,10 +968,11 @@ "key": "enchantboss_name_09", "text": "EX" }, + "PassUnlock": 1, "rank_low": 4000001, "rank_up": 5000000, - "grade": "gh_img_ex", - "score": 109 + "icon": "gh_img_ex", + "grade": 109 }, { "id": 4101, @@ -906,10 +981,11 @@ "key": "enchantboss_name_10", "text": "EX+" }, + "PassUnlock": 1, "rank_low": 5000001, "rank_up": 6666666, - "grade": "gh_img_ex1", - "score": 110 + "icon": "gh_img_ex1", + "grade": 110 }, { "id": 4101, @@ -918,10 +994,11 @@ "key": "enchantboss_name_11", "text": "EX++" }, + "PassUnlock": 1, "rank_low": 6666667, "rank_up": 99999999, - "grade": "gh_img_ex2", - "score": 111 + "icon": "gh_img_ex2", + "grade": 111 }, { "id": 4201, @@ -930,10 +1007,11 @@ "key": "enchantboss_name_01", "text": "F" }, + "PassUnlock": 0, "rank_low": 0, "rank_up": 30000, - "grade": "gh_img_f", - "score": 201 + "icon": "gh_img_f", + "grade": 201 }, { "id": 4201, @@ -942,10 +1020,11 @@ "key": "enchantboss_name_02", "text": "C" }, + "PassUnlock": 0, "rank_low": 300001, "rank_up": 600000, - "grade": "gh_img_c", - "score": 202 + "icon": "gh_img_c", + "grade": 202 }, { "id": 4201, @@ -954,10 +1033,11 @@ "key": "enchantboss_name_03", "text": "B" }, + "PassUnlock": 0, "rank_low": 600001, "rank_up": 700000, - "grade": "gh_img_b", - "score": 203 + "icon": "gh_img_b", + "grade": 203 }, { "id": 4201, @@ -966,10 +1046,11 @@ "key": "enchantboss_name_04", "text": "A" }, + "PassUnlock": 0, "rank_low": 700001, "rank_up": 800000, - "grade": "gh_img_a", - "score": 204 + "icon": "gh_img_a", + "grade": 204 }, { "id": 4201, @@ -978,10 +1059,11 @@ "key": "enchantboss_name_05", "text": "A+" }, + "PassUnlock": 0, "rank_low": 800001, "rank_up": 1000000, - "grade": "gh_img_a1", - "score": 205 + "icon": "gh_img_a1", + "grade": 205 }, { "id": 4201, @@ -990,10 +1072,11 @@ "key": "enchantboss_name_06", "text": "S" }, + "PassUnlock": 1, "rank_low": 1000001, "rank_up": 2000000, - "grade": "gh_img_s", - "score": 206 + "icon": "gh_img_s", + "grade": 206 }, { "id": 4201, @@ -1002,10 +1085,11 @@ "key": "enchantboss_name_07", "text": "SS" }, + "PassUnlock": 1, "rank_low": 2000001, "rank_up": 3000000, - "grade": "gh_img_ss", - "score": 207 + "icon": "gh_img_ss", + "grade": 207 }, { "id": 4201, @@ -1014,10 +1098,11 @@ "key": "enchantboss_name_08", "text": "SSS" }, + "PassUnlock": 1, "rank_low": 3000001, "rank_up": 4000000, - "grade": "gh_img_sss", - "score": 208 + "icon": "gh_img_sss", + "grade": 208 }, { "id": 4201, @@ -1026,10 +1111,11 @@ "key": "enchantboss_name_09", "text": "EX" }, + "PassUnlock": 1, "rank_low": 4000001, "rank_up": 5000000, - "grade": "gh_img_ex", - "score": 209 + "icon": "gh_img_ex", + "grade": 209 }, { "id": 4201, @@ -1038,10 +1124,11 @@ "key": "enchantboss_name_10", "text": "EX+" }, + "PassUnlock": 1, "rank_low": 5000001, "rank_up": 6666666, - "grade": "gh_img_ex1", - "score": 210 + "icon": "gh_img_ex1", + "grade": 210 }, { "id": 4201, @@ -1050,10 +1137,11 @@ "key": "enchantboss_name_11", "text": "EX++" }, + "PassUnlock": 1, "rank_low": 6666667, "rank_up": 99999999, - "grade": "gh_img_ex2", - "score": 211 + "icon": "gh_img_ex2", + "grade": 211 }, { "id": 4301, @@ -1062,10 +1150,11 @@ "key": "enchantboss_name_01", "text": "F" }, + "PassUnlock": 0, "rank_low": 0, "rank_up": 30000, - "grade": "gh_img_f", - "score": 301 + "icon": "gh_img_f", + "grade": 301 }, { "id": 4301, @@ -1074,10 +1163,11 @@ "key": "enchantboss_name_02", "text": "C" }, + "PassUnlock": 0, "rank_low": 300001, "rank_up": 600000, - "grade": "gh_img_c", - "score": 302 + "icon": "gh_img_c", + "grade": 302 }, { "id": 4301, @@ -1086,10 +1176,11 @@ "key": "enchantboss_name_03", "text": "B" }, + "PassUnlock": 0, "rank_low": 600001, "rank_up": 700000, - "grade": "gh_img_b", - "score": 303 + "icon": "gh_img_b", + "grade": 303 }, { "id": 4301, @@ -1098,10 +1189,11 @@ "key": "enchantboss_name_04", "text": "A" }, + "PassUnlock": 0, "rank_low": 700001, "rank_up": 800000, - "grade": "gh_img_a", - "score": 304 + "icon": "gh_img_a", + "grade": 304 }, { "id": 4301, @@ -1110,10 +1202,11 @@ "key": "enchantboss_name_05", "text": "A+" }, + "PassUnlock": 0, "rank_low": 800001, "rank_up": 1000000, - "grade": "gh_img_a1", - "score": 305 + "icon": "gh_img_a1", + "grade": 305 }, { "id": 4301, @@ -1122,10 +1215,11 @@ "key": "enchantboss_name_06", "text": "S" }, + "PassUnlock": 1, "rank_low": 1000001, "rank_up": 2000000, - "grade": "gh_img_s", - "score": 306 + "icon": "gh_img_s", + "grade": 306 }, { "id": 4301, @@ -1134,10 +1228,11 @@ "key": "enchantboss_name_07", "text": "SS" }, + "PassUnlock": 1, "rank_low": 2000001, "rank_up": 3000000, - "grade": "gh_img_ss", - "score": 307 + "icon": "gh_img_ss", + "grade": 307 }, { "id": 4301, @@ -1146,10 +1241,11 @@ "key": "enchantboss_name_08", "text": "SSS" }, + "PassUnlock": 1, "rank_low": 3000001, "rank_up": 4000000, - "grade": "gh_img_sss", - "score": 308 + "icon": "gh_img_sss", + "grade": 308 }, { "id": 4301, @@ -1158,10 +1254,11 @@ "key": "enchantboss_name_09", "text": "EX" }, + "PassUnlock": 1, "rank_low": 4000001, "rank_up": 5000000, - "grade": "gh_img_ex", - "score": 309 + "icon": "gh_img_ex", + "grade": 309 }, { "id": 4301, @@ -1170,10 +1267,11 @@ "key": "enchantboss_name_10", "text": "EX+" }, + "PassUnlock": 1, "rank_low": 5000001, "rank_up": 6666666, - "grade": "gh_img_ex1", - "score": 310 + "icon": "gh_img_ex1", + "grade": 310 }, { "id": 4301, @@ -1182,9 +1280,10 @@ "key": "enchantboss_name_11", "text": "EX++" }, + "PassUnlock": 1, "rank_low": 6666667, "rank_up": 99999999, - "grade": "gh_img_ex2", - "score": 311 + "icon": "gh_img_ex2", + "grade": 311 } ] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 823dd0c55..ae4ea72dc 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -1,6 +1,7 @@ [ { "id": 107, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -35,6 +36,7 @@ }, { "id": 108, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -69,6 +71,7 @@ }, { "id": 109, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -103,6 +106,7 @@ }, { "id": 110, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -137,6 +141,7 @@ }, { "id": 111, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -171,6 +176,7 @@ }, { "id": 112, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -205,6 +211,7 @@ }, { "id": 113, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -239,6 +246,7 @@ }, { "id": 114, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -273,6 +281,7 @@ }, { "id": 115, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -307,6 +316,7 @@ }, { "id": 11187001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -343,6 +353,7 @@ }, { "id": 11187002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -379,6 +390,7 @@ }, { "id": 11187003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -415,6 +427,7 @@ }, { "id": 11187004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -451,6 +464,7 @@ }, { "id": 11187005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -487,6 +501,7 @@ }, { "id": 11187006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -523,6 +538,7 @@ }, { "id": 11187007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -559,6 +575,7 @@ }, { "id": 11187008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -595,6 +612,7 @@ }, { "id": 11187009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -631,6 +649,7 @@ }, { "id": 11187010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -667,6 +686,7 @@ }, { "id": 11187011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -703,6 +723,7 @@ }, { "id": 11187012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -739,6 +760,7 @@ }, { "id": 11187013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -774,6 +796,7 @@ }, { "id": 11187014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -810,6 +833,7 @@ }, { "id": 11187015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -846,6 +870,7 @@ }, { "id": 11187016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -882,6 +907,7 @@ }, { "id": 11187017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -918,6 +944,7 @@ }, { "id": 11187018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -954,6 +981,7 @@ }, { "id": 11187019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -990,6 +1018,7 @@ }, { "id": 11187020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1026,6 +1055,7 @@ }, { "id": 11187021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1062,6 +1092,7 @@ }, { "id": 11187022, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1098,6 +1129,7 @@ }, { "id": 11187023, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1134,6 +1166,7 @@ }, { "id": 11187024, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1170,6 +1203,7 @@ }, { "id": 11187025, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1206,6 +1240,7 @@ }, { "id": 11187026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1242,6 +1277,7 @@ }, { "id": 11187027, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1278,6 +1314,7 @@ }, { "id": 11187028, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1314,6 +1351,7 @@ }, { "id": 11187029, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1350,6 +1388,7 @@ }, { "id": 11187030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1386,6 +1425,7 @@ }, { "id": 11187031, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1422,6 +1462,7 @@ }, { "id": 11187032, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1458,6 +1499,7 @@ }, { "id": 11187033, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1494,6 +1536,7 @@ }, { "id": 11187034, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1530,6 +1573,7 @@ }, { "id": 11187035, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1566,6 +1610,7 @@ }, { "id": 11187036, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1602,6 +1647,7 @@ }, { "id": 11187037, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1638,6 +1684,7 @@ }, { "id": 11187038, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1674,6 +1721,7 @@ }, { "id": 11187039, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1710,6 +1758,7 @@ }, { "id": 11187040, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1746,6 +1795,7 @@ }, { "id": 11187041, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1782,6 +1832,7 @@ }, { "id": 11187042, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1818,6 +1869,7 @@ }, { "id": 11187043, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1854,6 +1906,7 @@ }, { "id": 11187044, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1890,6 +1943,7 @@ }, { "id": 11187045, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1926,6 +1980,7 @@ }, { "id": 11187046, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1962,6 +2017,7 @@ }, { "id": 11187047, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -1998,6 +2054,7 @@ }, { "id": 11187048, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2034,6 +2091,7 @@ }, { "id": 11187049, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2070,6 +2128,7 @@ }, { "id": 11187050, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2106,6 +2165,7 @@ }, { "id": 11187051, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2142,6 +2202,7 @@ }, { "id": 11187052, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2178,6 +2239,7 @@ }, { "id": 11187053, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2214,6 +2276,7 @@ }, { "id": 11187054, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2250,6 +2313,7 @@ }, { "id": 11187055, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2286,6 +2350,7 @@ }, { "id": 11187056, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2322,6 +2387,7 @@ }, { "id": 11187057, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2358,6 +2424,7 @@ }, { "id": 11187058, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2394,6 +2461,7 @@ }, { "id": 11187059, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2430,6 +2498,7 @@ }, { "id": 11187060, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2466,6 +2535,7 @@ }, { "id": 11187061, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2502,6 +2572,7 @@ }, { "id": 11187062, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2538,6 +2609,7 @@ }, { "id": 11187063, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2574,6 +2646,7 @@ }, { "id": 11187064, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2610,6 +2683,7 @@ }, { "id": 11187065, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2646,6 +2720,7 @@ }, { "id": 11187066, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2682,6 +2757,7 @@ }, { "id": 11187067, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2718,6 +2794,7 @@ }, { "id": 11187068, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2754,6 +2831,7 @@ }, { "id": 11187069, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2790,6 +2868,7 @@ }, { "id": 11187070, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2826,6 +2905,7 @@ }, { "id": 11187071, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2862,6 +2942,7 @@ }, { "id": 11187072, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2898,6 +2979,7 @@ }, { "id": 11187073, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2934,6 +3016,7 @@ }, { "id": 11187074, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -2970,6 +3053,7 @@ }, { "id": 11187075, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -3006,6 +3090,7 @@ }, { "id": 11187076, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -3042,6 +3127,7 @@ }, { "id": 11187077, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -3078,6 +3164,7 @@ }, { "id": 11187078, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -3114,6 +3201,7 @@ }, { "id": 12070010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3148,6 +3236,7 @@ }, { "id": 12070011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3177,6 +3266,7 @@ }, { "id": 12070012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3206,6 +3296,7 @@ }, { "id": 12070020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3240,6 +3331,7 @@ }, { "id": 12070021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3269,6 +3361,7 @@ }, { "id": 12070030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3301,6 +3394,7 @@ }, { "id": 12070031, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3330,6 +3424,7 @@ }, { "id": 12070032, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3359,6 +3454,7 @@ }, { "id": 12070033, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3388,6 +3484,7 @@ }, { "id": 12070034, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3415,6 +3512,7 @@ }, { "id": 12070035, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3444,6 +3542,7 @@ }, { "id": 12070036, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3471,6 +3570,7 @@ }, { "id": 12070040, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3505,6 +3605,7 @@ }, { "id": 12070041, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3532,6 +3633,7 @@ }, { "id": 12070042, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3561,6 +3663,7 @@ }, { "id": 12070050, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3593,6 +3696,7 @@ }, { "id": 12070060, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3625,6 +3729,7 @@ }, { "id": 12070070, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3659,6 +3764,7 @@ }, { "id": 12070080, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3693,6 +3799,7 @@ }, { "id": 12070090, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3727,6 +3834,7 @@ }, { "id": 12070100, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3759,6 +3867,7 @@ }, { "id": 12070110, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3793,6 +3902,7 @@ }, { "id": 12070120, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3827,6 +3937,7 @@ }, { "id": 120701201, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3856,6 +3967,7 @@ }, { "id": 120701202, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3885,6 +3997,7 @@ }, { "id": 120701203, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3914,6 +4027,7 @@ }, { "id": 120701204, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3943,6 +4057,7 @@ }, { "id": 1207012041, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -3972,6 +4087,7 @@ }, { "id": 120701205, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4001,6 +4117,7 @@ }, { "id": 120701206, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4030,6 +4147,7 @@ }, { "id": 120701207, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4059,6 +4177,7 @@ }, { "id": 120701208, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4088,6 +4207,7 @@ }, { "id": 120701209, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4117,6 +4237,7 @@ }, { "id": 120701210, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4146,6 +4267,7 @@ }, { "id": 120701211, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4175,6 +4297,7 @@ }, { "id": 120701212, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4204,6 +4327,7 @@ }, { "id": 120701213, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4233,6 +4357,7 @@ }, { "id": 120701214, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4262,6 +4387,7 @@ }, { "id": 120701224, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4291,6 +4417,7 @@ }, { "id": 120701234, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4318,6 +4445,7 @@ }, { "id": 120701244, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4348,6 +4476,7 @@ }, { "id": 120701245, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4377,6 +4506,7 @@ }, { "id": 120701246, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4404,6 +4534,7 @@ }, { "id": 120701247, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4433,6 +4564,7 @@ }, { "id": 12070130, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4467,6 +4599,7 @@ }, { "id": 12070140, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4501,6 +4634,7 @@ }, { "id": 12070150, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -4536,6 +4670,7 @@ }, { "id": 12070160, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -4568,6 +4703,7 @@ }, { "id": 12070170, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4602,6 +4738,7 @@ }, { "id": 12070180, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4636,6 +4773,7 @@ }, { "id": 12070190, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4670,6 +4808,7 @@ }, { "id": 12070200, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4704,6 +4843,7 @@ }, { "id": 12070210, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4736,6 +4876,7 @@ }, { "id": 12070220, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4770,6 +4911,7 @@ }, { "id": 12070230, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4804,6 +4946,7 @@ }, { "id": 12070240, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4838,6 +4981,7 @@ }, { "id": 12070250, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4870,6 +5014,7 @@ }, { "id": 12070260, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4904,6 +5049,7 @@ }, { "id": 12070270, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4938,6 +5084,7 @@ }, { "id": 12070280, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -4972,6 +5119,7 @@ }, { "id": 12070290, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5006,6 +5154,7 @@ }, { "id": 12070300, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5040,6 +5189,7 @@ }, { "id": 12070301, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5069,6 +5219,7 @@ }, { "id": 12070302, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5098,6 +5249,7 @@ }, { "id": 12070303, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5127,6 +5279,7 @@ }, { "id": 12070304, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5156,6 +5309,7 @@ }, { "id": 12070305, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5185,6 +5339,7 @@ }, { "id": 12070306, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5214,6 +5369,7 @@ }, { "id": 12070307, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5243,6 +5399,7 @@ }, { "id": 12070308, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5272,6 +5429,7 @@ }, { "id": 12070309, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5301,6 +5459,7 @@ }, { "id": 12070310, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5330,6 +5489,7 @@ }, { "id": 12070320, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5357,6 +5517,7 @@ }, { "id": 12070330, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5384,6 +5545,7 @@ }, { "id": 12070340, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5413,6 +5575,7 @@ }, { "id": 12070350, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5442,6 +5605,7 @@ }, { "id": 12070360, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5469,6 +5633,7 @@ }, { "id": 12070370, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5498,6 +5663,7 @@ }, { "id": 12070371, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5525,6 +5691,7 @@ }, { "id": 12070372, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5552,6 +5719,7 @@ }, { "id": 12070380, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5586,6 +5754,7 @@ }, { "id": 12070381, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5615,6 +5784,7 @@ }, { "id": 12070382, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5644,6 +5814,7 @@ }, { "id": 12070383, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5673,6 +5844,7 @@ }, { "id": 12070384, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5702,6 +5874,7 @@ }, { "id": 12070390, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5736,6 +5909,7 @@ }, { "id": 12070400, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5770,6 +5944,7 @@ }, { "id": 12070410, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5802,6 +5977,7 @@ }, { "id": 12070420, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -5837,6 +6013,7 @@ }, { "id": 12070430, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5869,6 +6046,7 @@ }, { "id": 12070440, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5901,6 +6079,7 @@ }, { "id": 12070450, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5935,6 +6114,7 @@ }, { "id": 12070451, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5964,6 +6144,7 @@ }, { "id": 12070452, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -5993,6 +6174,7 @@ }, { "id": 12070453, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6022,6 +6204,7 @@ }, { "id": 12070454, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6051,6 +6234,7 @@ }, { "id": 12070455, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6080,6 +6264,7 @@ }, { "id": 12070456, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6109,6 +6294,7 @@ }, { "id": 12070457, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6138,6 +6324,7 @@ }, { "id": 12070458, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6167,6 +6354,7 @@ }, { "id": 12070459, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6196,6 +6384,7 @@ }, { "id": 12070460, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6225,6 +6414,7 @@ }, { "id": 12070461, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6254,6 +6444,7 @@ }, { "id": 12070462, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6283,6 +6474,7 @@ }, { "id": 12070463, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6312,6 +6504,7 @@ }, { "id": 12070464, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6341,6 +6534,7 @@ }, { "id": 12070465, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6368,6 +6562,7 @@ }, { "id": 12070470, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6403,6 +6598,7 @@ }, { "id": 12070480, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6437,6 +6633,7 @@ }, { "id": 12070490, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6471,6 +6668,7 @@ }, { "id": 12070500, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6505,6 +6703,7 @@ }, { "id": 12070510, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6540,6 +6739,7 @@ }, { "id": 12070520, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6574,6 +6774,7 @@ }, { "id": 12070530, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6608,6 +6809,7 @@ }, { "id": 12070540, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6642,6 +6844,7 @@ }, { "id": 12070550, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6676,6 +6879,7 @@ }, { "id": 12070560, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6710,6 +6914,7 @@ }, { "id": 12070570, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6744,6 +6949,7 @@ }, { "id": 12070580, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6778,6 +6984,7 @@ }, { "id": 12070590, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6813,6 +7020,7 @@ }, { "id": 12070600, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6845,6 +7053,7 @@ }, { "id": 12070610, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6879,6 +7088,7 @@ }, { "id": 12070620, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6913,6 +7123,7 @@ }, { "id": 12070630, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6947,6 +7158,7 @@ }, { "id": 12070640, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -6981,6 +7193,7 @@ }, { "id": 12070650, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7015,6 +7228,7 @@ }, { "id": 12070660, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7050,6 +7264,7 @@ }, { "id": 12070670, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7084,6 +7299,7 @@ }, { "id": 12070680, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7116,6 +7332,7 @@ }, { "id": 12070690, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7150,6 +7367,7 @@ }, { "id": 12070700, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7184,6 +7402,7 @@ }, { "id": 12070710, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7218,6 +7437,7 @@ }, { "id": 12070720, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7252,6 +7472,7 @@ }, { "id": 12070730, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7287,6 +7508,7 @@ }, { "id": 12070740, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7319,6 +7541,7 @@ }, { "id": 12070750, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7354,6 +7577,7 @@ }, { "id": 12070760, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7389,6 +7613,7 @@ }, { "id": 12070770, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7421,6 +7646,7 @@ }, { "id": 12070780, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7453,6 +7679,7 @@ }, { "id": 12070790, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7487,6 +7714,7 @@ }, { "id": 12070800, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7521,6 +7749,7 @@ }, { "id": 12070810, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7553,6 +7782,7 @@ }, { "id": 12070820, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7588,6 +7818,7 @@ }, { "id": 12070830, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7620,6 +7851,7 @@ }, { "id": 12070840, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7654,6 +7886,7 @@ }, { "id": 12070850, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7688,6 +7921,7 @@ }, { "id": 12070860, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7722,6 +7956,7 @@ }, { "id": 12070870, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7756,6 +7991,7 @@ }, { "id": 12070880, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7791,6 +8027,7 @@ }, { "id": 12070890, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7825,6 +8062,7 @@ }, { "id": 12070900, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7859,6 +8097,7 @@ }, { "id": 12070910, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7891,6 +8130,7 @@ }, { "id": 12070920, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7925,6 +8165,7 @@ }, { "id": 12070930, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7960,6 +8201,7 @@ }, { "id": 12070940, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -7994,6 +8236,7 @@ }, { "id": 12070950, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8028,6 +8271,7 @@ }, { "id": 12070960, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8060,6 +8304,7 @@ }, { "id": 12070970, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8094,6 +8339,7 @@ }, { "id": 12070980, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8128,6 +8374,7 @@ }, { "id": 12070990, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8162,6 +8409,7 @@ }, { "id": 12071000, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8196,6 +8444,7 @@ }, { "id": 12071010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8230,6 +8479,7 @@ }, { "id": 12071020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8264,6 +8514,7 @@ }, { "id": 12071030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8298,6 +8549,7 @@ }, { "id": 12071040, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8332,6 +8584,7 @@ }, { "id": 12071050, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8366,6 +8619,7 @@ }, { "id": 12071060, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8400,6 +8654,7 @@ }, { "id": 12071070, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8434,6 +8689,7 @@ }, { "id": 12071080, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8468,6 +8724,7 @@ }, { "id": 12071090, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8502,6 +8759,7 @@ }, { "id": 168, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8536,6 +8794,7 @@ }, { "id": 12071110, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8570,6 +8829,7 @@ }, { "id": 12071120, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8604,6 +8864,7 @@ }, { "id": 12071130, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8638,6 +8899,7 @@ }, { "id": 12071140, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8672,6 +8934,7 @@ }, { "id": 12071150, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8706,6 +8969,7 @@ }, { "id": 12071160, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8740,6 +9004,7 @@ }, { "id": 12071170, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8774,6 +9039,7 @@ }, { "id": 12071180, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8808,6 +9074,7 @@ }, { "id": 12071190, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8842,6 +9109,7 @@ }, { "id": 12071200, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8876,6 +9144,7 @@ }, { "id": 12071210, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -8910,6 +9179,7 @@ }, { "id": 13000001, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -8937,6 +9207,7 @@ }, { "id": 13000002, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -8964,6 +9235,7 @@ }, { "id": 13000003, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -8991,6 +9263,7 @@ }, { "id": 13000004, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9018,6 +9291,7 @@ }, { "id": 13000005, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9045,6 +9319,7 @@ }, { "id": 13000006, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9072,6 +9347,7 @@ }, { "id": 13000007, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9101,6 +9377,7 @@ }, { "id": 13000008, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9130,6 +9407,7 @@ }, { "id": 13000009, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9159,6 +9437,7 @@ }, { "id": 13000010, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9186,6 +9465,7 @@ }, { "id": 13000011, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9213,6 +9493,7 @@ }, { "id": 13000012, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9240,6 +9521,7 @@ }, { "id": 13000013, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9269,6 +9551,7 @@ }, { "id": 13000014, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9298,6 +9581,7 @@ }, { "id": 13000015, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9327,6 +9611,7 @@ }, { "id": 13000016, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9354,6 +9639,7 @@ }, { "id": 13000017, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9381,6 +9667,7 @@ }, { "id": 13000018, + "refresh": 0, "rtype": 1, "ctype": 4, "notify": [], @@ -9408,6 +9695,7 @@ }, { "id": 14000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9437,6 +9725,7 @@ }, { "id": 14000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9466,6 +9755,7 @@ }, { "id": 14000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9495,6 +9785,7 @@ }, { "id": 14000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9524,6 +9815,7 @@ }, { "id": 14000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9553,6 +9845,7 @@ }, { "id": 14000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9582,6 +9875,7 @@ }, { "id": 14000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9612,6 +9906,7 @@ }, { "id": 14000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9639,6 +9934,7 @@ }, { "id": 14000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9669,6 +9965,7 @@ }, { "id": 140000121, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9698,6 +9995,7 @@ }, { "id": 14000013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9727,6 +10025,7 @@ }, { "id": 14000014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9756,6 +10055,7 @@ }, { "id": 14000015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9783,6 +10083,7 @@ }, { "id": 14000016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9812,6 +10113,7 @@ }, { "id": 14000017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9841,6 +10143,7 @@ }, { "id": 14000018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9868,6 +10171,7 @@ }, { "id": 14000019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9897,6 +10201,7 @@ }, { "id": 14000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9926,6 +10231,7 @@ }, { "id": 14000026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -9955,6 +10261,7 @@ }, { "id": 15000001, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -9984,6 +10291,7 @@ }, { "id": 15000002, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -10013,6 +10321,7 @@ }, { "id": 15000003, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -10042,6 +10351,7 @@ }, { "id": 15000004, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -10071,6 +10381,7 @@ }, { "id": 15000005, + "refresh": 0, "rtype": 2, "ctype": 1, "notify": [], @@ -10101,6 +10412,7 @@ }, { "id": 50000001, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10130,6 +10442,7 @@ }, { "id": 50000002, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10159,6 +10472,7 @@ }, { "id": 50000003, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10188,6 +10502,7 @@ }, { "id": 50000004, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10217,6 +10532,7 @@ }, { "id": 50000005, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10246,6 +10562,7 @@ }, { "id": 50000006, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10275,6 +10592,7 @@ }, { "id": 50000007, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10304,6 +10622,7 @@ }, { "id": 50000008, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10333,6 +10652,7 @@ }, { "id": 50000009, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10362,6 +10682,7 @@ }, { "id": 50000010, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -10391,6 +10712,7 @@ }, { "id": 50000011, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10418,6 +10740,7 @@ }, { "id": 50000012, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10445,6 +10768,7 @@ }, { "id": 50000013, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10472,6 +10796,7 @@ }, { "id": 50000014, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10499,6 +10824,7 @@ }, { "id": 50000015, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10526,6 +10852,7 @@ }, { "id": 50000016, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10553,6 +10880,7 @@ }, { "id": 50000017, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10580,6 +10908,7 @@ }, { "id": 50000018, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10609,6 +10938,7 @@ }, { "id": 50000019, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10638,6 +10968,7 @@ }, { "id": 50000020, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10667,6 +10998,7 @@ }, { "id": 50000021, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10696,6 +11028,7 @@ }, { "id": 50000022, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10725,6 +11058,7 @@ }, { "id": 50000023, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10752,6 +11086,7 @@ }, { "id": 50000024, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10779,6 +11114,7 @@ }, { "id": 50000025, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10806,6 +11142,7 @@ }, { "id": 50000026, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10833,6 +11170,7 @@ }, { "id": 50000027, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10860,6 +11198,7 @@ }, { "id": 50000028, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10889,6 +11228,7 @@ }, { "id": 50000029, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10918,6 +11258,7 @@ }, { "id": 50000030, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10947,6 +11288,7 @@ }, { "id": 50000031, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -10976,6 +11318,7 @@ }, { "id": 50000032, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11005,6 +11348,7 @@ }, { "id": 50000033, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11034,6 +11378,7 @@ }, { "id": 50000034, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11061,6 +11406,7 @@ }, { "id": 500000341, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11088,6 +11434,7 @@ }, { "id": 500000342, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11115,6 +11462,7 @@ }, { "id": 50000035, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11142,6 +11490,7 @@ }, { "id": 500000351, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11169,6 +11518,7 @@ }, { "id": 500000352, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11196,6 +11546,7 @@ }, { "id": 50000036, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11223,6 +11574,7 @@ }, { "id": 500000361, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11250,6 +11602,7 @@ }, { "id": 500000362, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11277,6 +11630,7 @@ }, { "id": 50000037, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11304,6 +11658,7 @@ }, { "id": 500000371, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11331,6 +11686,7 @@ }, { "id": 500000372, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11358,6 +11714,7 @@ }, { "id": 50000038, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11385,6 +11742,7 @@ }, { "id": 500000381, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11412,6 +11770,7 @@ }, { "id": 500000382, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11439,6 +11798,7 @@ }, { "id": 50000039, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11468,6 +11828,7 @@ }, { "id": 50000040, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11497,6 +11858,7 @@ }, { "id": 50000041, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11526,6 +11888,7 @@ }, { "id": 50000042, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11555,6 +11918,7 @@ }, { "id": 50000043, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11584,6 +11948,7 @@ }, { "id": 50000044, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11613,6 +11978,7 @@ }, { "id": 50000045, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11642,6 +12008,7 @@ }, { "id": 50000046, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11671,6 +12038,7 @@ }, { "id": 50000047, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11700,6 +12068,7 @@ }, { "id": 50000048, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11729,6 +12098,7 @@ }, { "id": 50000049, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11758,6 +12128,7 @@ }, { "id": 50000050, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11787,6 +12158,7 @@ }, { "id": 50000051, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11816,6 +12188,7 @@ }, { "id": 50000052, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11845,6 +12218,7 @@ }, { "id": 50000053, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -11874,6 +12248,7 @@ }, { "id": 60000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -11903,6 +12278,7 @@ }, { "id": 60000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -11932,6 +12308,7 @@ }, { "id": 60000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -11961,6 +12338,7 @@ }, { "id": 60000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -11988,6 +12366,7 @@ }, { "id": 60000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12015,6 +12394,7 @@ }, { "id": 60000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12044,6 +12424,7 @@ }, { "id": 60000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12071,6 +12452,7 @@ }, { "id": 60000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12098,6 +12480,7 @@ }, { "id": 60000009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12125,6 +12508,7 @@ }, { "id": 60000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12154,6 +12538,7 @@ }, { "id": 60000011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12183,6 +12568,7 @@ }, { "id": 60000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12212,6 +12598,7 @@ }, { "id": 60000013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12241,6 +12628,7 @@ }, { "id": 60000014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12268,6 +12656,7 @@ }, { "id": 60000015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12295,6 +12684,7 @@ }, { "id": 60000016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12322,6 +12712,7 @@ }, { "id": 60000017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12349,6 +12740,7 @@ }, { "id": 60000018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12376,6 +12768,7 @@ }, { "id": 60000019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12405,6 +12798,7 @@ }, { "id": 60000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12434,6 +12828,7 @@ }, { "id": 60000021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12463,6 +12858,7 @@ }, { "id": 60000022, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12492,6 +12888,7 @@ }, { "id": 60000023, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12521,6 +12918,7 @@ }, { "id": 60000024, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12550,6 +12948,7 @@ }, { "id": 60000025, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12577,6 +12976,7 @@ }, { "id": 60000026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12604,6 +13004,7 @@ }, { "id": 60000027, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12631,6 +13032,7 @@ }, { "id": 60000028, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12658,6 +13060,7 @@ }, { "id": 60000029, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12685,6 +13088,7 @@ }, { "id": 60000030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12712,6 +13116,7 @@ }, { "id": 60000031, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12739,6 +13144,7 @@ }, { "id": 60000032, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12766,6 +13172,7 @@ }, { "id": 60000033, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12793,6 +13200,7 @@ }, { "id": 60000034, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12820,6 +13228,7 @@ }, { "id": 60000035, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12847,6 +13256,7 @@ }, { "id": 60000036, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12874,6 +13284,7 @@ }, { "id": 70000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12903,6 +13314,7 @@ }, { "id": 70000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12932,6 +13344,7 @@ }, { "id": 70000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12961,6 +13374,7 @@ }, { "id": 70000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -12990,6 +13404,7 @@ }, { "id": 70000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13019,6 +13434,7 @@ }, { "id": 70000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13048,6 +13464,7 @@ }, { "id": 70000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13077,6 +13494,7 @@ }, { "id": 70000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13106,6 +13524,7 @@ }, { "id": 70000009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13135,6 +13554,7 @@ }, { "id": 70000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13164,6 +13584,7 @@ }, { "id": 70000011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13193,6 +13614,7 @@ }, { "id": 70000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13222,6 +13644,7 @@ }, { "id": 70000013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13251,6 +13674,7 @@ }, { "id": 70000014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13281,6 +13705,7 @@ }, { "id": 70000015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13311,6 +13736,7 @@ }, { "id": 70000016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13341,6 +13767,7 @@ }, { "id": 70000017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13371,6 +13798,7 @@ }, { "id": 70000018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13401,6 +13829,7 @@ }, { "id": 70000019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13431,6 +13860,7 @@ }, { "id": 70000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13461,6 +13891,7 @@ }, { "id": 70000021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13491,6 +13922,7 @@ }, { "id": 70000022, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13521,6 +13953,7 @@ }, { "id": 70000023, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13551,6 +13984,7 @@ }, { "id": 70000024, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13581,6 +14015,7 @@ }, { "id": 70000025, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13611,6 +14046,7 @@ }, { "id": 70000026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13641,6 +14077,7 @@ }, { "id": 70000027, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13671,6 +14108,7 @@ }, { "id": 70000028, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13701,6 +14139,7 @@ }, { "id": 70000029, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13731,6 +14170,7 @@ }, { "id": 70000030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13761,6 +14201,7 @@ }, { "id": 70000031, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13791,6 +14232,7 @@ }, { "id": 70000032, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13821,6 +14263,7 @@ }, { "id": 70000033, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13851,6 +14294,7 @@ }, { "id": 70000034, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13881,6 +14325,7 @@ }, { "id": 70000035, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13911,6 +14356,7 @@ }, { "id": 70000036, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13941,6 +14387,7 @@ }, { "id": 70000037, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -13971,6 +14418,7 @@ }, { "id": 80000001, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [], @@ -13998,6 +14446,7 @@ }, { "id": 90043001, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14027,6 +14476,7 @@ }, { "id": 90043022, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14056,6 +14506,7 @@ }, { "id": 90043003, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14085,6 +14536,7 @@ }, { "id": 90043004, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14114,6 +14566,7 @@ }, { "id": 90043005, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14143,6 +14596,7 @@ }, { "id": 90043006, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14172,6 +14626,7 @@ }, { "id": 90043007, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14201,6 +14656,7 @@ }, { "id": 90044001, + "refresh": 0, "rtype": 2, "ctype": 4, "notify": [ @@ -14230,6 +14686,7 @@ }, { "id": 90044002, + "refresh": 0, "rtype": 2, "ctype": 4, "notify": [ @@ -14259,6 +14716,7 @@ }, { "id": 90044003, + "refresh": 0, "rtype": 2, "ctype": 4, "notify": [ @@ -14288,6 +14746,7 @@ }, { "id": 90044004, + "refresh": 0, "rtype": 2, "ctype": 4, "notify": [ @@ -14317,6 +14776,7 @@ }, { "id": 90044005, + "refresh": 0, "rtype": 2, "ctype": 4, "notify": [ @@ -14346,6 +14806,7 @@ }, { "id": 90044006, + "refresh": 0, "rtype": 2, "ctype": 4, "notify": [ @@ -14375,6 +14836,7 @@ }, { "id": 90044007, + "refresh": 0, "rtype": 2, "ctype": 4, "notify": [ @@ -14404,6 +14866,7 @@ }, { "id": 90041001, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14433,6 +14896,7 @@ }, { "id": 90041002, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14462,6 +14926,7 @@ }, { "id": 90041003, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14491,6 +14956,7 @@ }, { "id": 90041004, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14520,6 +14986,7 @@ }, { "id": 90041005, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14549,6 +15016,7 @@ }, { "id": 90041006, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14578,6 +15046,7 @@ }, { "id": 90041007, + "refresh": 0, "rtype": 2, "ctype": 3, "notify": [ @@ -14607,6 +15076,7 @@ }, { "id": 22215001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14636,6 +15106,7 @@ }, { "id": 22215002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14665,6 +15136,7 @@ }, { "id": 22215003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14694,6 +15166,7 @@ }, { "id": 22215004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14723,6 +15196,7 @@ }, { "id": 22215005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14752,6 +15226,7 @@ }, { "id": 22215006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14781,6 +15256,7 @@ }, { "id": 22216001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14811,6 +15287,7 @@ }, { "id": 22216002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14841,6 +15318,7 @@ }, { "id": 22216003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14871,6 +15349,7 @@ }, { "id": 22216004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14901,6 +15380,7 @@ }, { "id": 22216005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14931,6 +15411,7 @@ }, { "id": 22216006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14961,6 +15442,7 @@ }, { "id": 22216007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -14991,6 +15473,7 @@ }, { "id": 22216008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15021,6 +15504,7 @@ }, { "id": 22216009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15051,6 +15535,7 @@ }, { "id": 22216010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15081,6 +15566,7 @@ }, { "id": 22216011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15111,6 +15597,7 @@ }, { "id": 22216012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15141,6 +15628,7 @@ }, { "id": 22216013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15171,6 +15659,7 @@ }, { "id": 22216014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15201,6 +15690,7 @@ }, { "id": 22216015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15231,6 +15721,7 @@ }, { "id": 22216016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -15261,6 +15752,7 @@ }, { "id": 90000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15292,6 +15784,7 @@ }, { "id": 90000002, + "refresh": 0, "rtype": 1, "ctype": 3, "notify": [ @@ -15321,6 +15814,7 @@ }, { "id": 90000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15352,6 +15846,7 @@ }, { "id": 90000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15381,6 +15876,7 @@ }, { "id": 90000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15412,6 +15908,7 @@ }, { "id": 90000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15441,6 +15938,7 @@ }, { "id": 90000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15472,6 +15970,7 @@ }, { "id": 11001001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15503,6 +16002,7 @@ }, { "id": 11001002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15534,6 +16034,7 @@ }, { "id": 11001003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15565,6 +16066,7 @@ }, { "id": 11001004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15596,6 +16098,7 @@ }, { "id": 11001005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15627,6 +16130,7 @@ }, { "id": 11001006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15658,6 +16162,7 @@ }, { "id": 11001007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15687,6 +16192,7 @@ }, { "id": 11001008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15718,6 +16224,7 @@ }, { "id": 11001009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15749,6 +16256,7 @@ }, { "id": 11001010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15780,6 +16288,7 @@ }, { "id": 11002001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15811,6 +16320,7 @@ }, { "id": 11002002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15842,6 +16352,7 @@ }, { "id": 11002003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15873,6 +16384,7 @@ }, { "id": 11002004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15904,6 +16416,7 @@ }, { "id": 11002005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15935,6 +16448,7 @@ }, { "id": 11002006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15966,6 +16480,7 @@ }, { "id": 11002007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -15998,6 +16513,7 @@ }, { "id": 11002008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16029,6 +16545,7 @@ }, { "id": 11002009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16060,6 +16577,7 @@ }, { "id": 11003001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16091,6 +16609,7 @@ }, { "id": 11003002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16122,6 +16641,7 @@ }, { "id": 11003003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16153,6 +16673,7 @@ }, { "id": 11003004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16184,6 +16705,7 @@ }, { "id": 11003005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16215,6 +16737,7 @@ }, { "id": 11003006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16246,6 +16769,7 @@ }, { "id": 11003007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16277,6 +16801,7 @@ }, { "id": 11003008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16308,6 +16833,7 @@ }, { "id": 11003009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16339,6 +16865,7 @@ }, { "id": 11004001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16370,6 +16897,7 @@ }, { "id": 11004002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16401,6 +16929,7 @@ }, { "id": 11004003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16432,6 +16961,7 @@ }, { "id": 11004004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16463,6 +16993,7 @@ }, { "id": 11004005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16494,6 +17025,7 @@ }, { "id": 11004006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16525,6 +17057,7 @@ }, { "id": 11004007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16556,6 +17089,7 @@ }, { "id": 11004008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16587,6 +17121,7 @@ }, { "id": 11004009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -16618,6 +17153,7 @@ }, { "id": 600000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16647,6 +17183,7 @@ }, { "id": 600000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16676,6 +17213,7 @@ }, { "id": 600000030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16705,6 +17243,7 @@ }, { "id": 600000040, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16734,6 +17273,7 @@ }, { "id": 16000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16763,6 +17303,7 @@ }, { "id": 16000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16792,6 +17333,7 @@ }, { "id": 16000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16821,6 +17363,7 @@ }, { "id": 16000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16850,6 +17393,7 @@ }, { "id": 16000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16879,6 +17423,7 @@ }, { "id": 16000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16908,6 +17453,7 @@ }, { "id": 16000009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16937,6 +17483,7 @@ }, { "id": 16000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16966,6 +17513,7 @@ }, { "id": 16000011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -16995,6 +17543,7 @@ }, { "id": 16000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17024,6 +17573,7 @@ }, { "id": 16000013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17053,6 +17603,7 @@ }, { "id": 16000014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17082,6 +17633,7 @@ }, { "id": 16000015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17111,6 +17663,7 @@ }, { "id": 16000016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17140,6 +17693,7 @@ }, { "id": 16000017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17169,6 +17723,7 @@ }, { "id": 16000018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17198,6 +17753,7 @@ }, { "id": 16000019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17227,6 +17783,7 @@ }, { "id": 16000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17256,6 +17813,7 @@ }, { "id": 16000021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17285,6 +17843,7 @@ }, { "id": 16000022, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17314,6 +17873,7 @@ }, { "id": 16000023, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17343,6 +17903,7 @@ }, { "id": 16000024, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17372,6 +17933,7 @@ }, { "id": 16000025, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17401,6 +17963,7 @@ }, { "id": 16000026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17430,6 +17993,7 @@ }, { "id": 16000027, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17459,6 +18023,7 @@ }, { "id": 16000028, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17488,6 +18053,7 @@ }, { "id": 16000029, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17515,6 +18081,7 @@ }, { "id": 16000030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17542,6 +18109,7 @@ }, { "id": 16000031, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17569,6 +18137,7 @@ }, { "id": 16000032, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17596,6 +18165,7 @@ }, { "id": 16000033, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17623,6 +18193,7 @@ }, { "id": 16000034, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17650,6 +18221,7 @@ }, { "id": 16000035, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17677,6 +18249,7 @@ }, { "id": 16000036, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17704,6 +18277,7 @@ }, { "id": 16000037, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17731,6 +18305,7 @@ }, { "id": 16000038, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17758,6 +18333,7 @@ }, { "id": 16000039, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17785,6 +18361,7 @@ }, { "id": 16000040, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17812,6 +18389,7 @@ }, { "id": 16000041, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17839,6 +18417,7 @@ }, { "id": 16000042, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17866,6 +18445,7 @@ }, { "id": 16000043, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17893,6 +18473,7 @@ }, { "id": 16000044, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17920,6 +18501,7 @@ }, { "id": 16000045, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17947,6 +18529,7 @@ }, { "id": 16000046, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -17974,6 +18557,7 @@ }, { "id": 16000047, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18001,6 +18585,7 @@ }, { "id": 16000048, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18028,6 +18613,7 @@ }, { "id": 16000049, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18055,6 +18641,7 @@ }, { "id": 16000050, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18082,6 +18669,7 @@ }, { "id": 16000051, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18111,6 +18699,7 @@ }, { "id": 16000052, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18140,6 +18729,7 @@ }, { "id": 16000053, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18169,6 +18759,7 @@ }, { "id": 16000054, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18198,6 +18789,7 @@ }, { "id": 16000055, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18227,6 +18819,7 @@ }, { "id": 16000056, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18256,6 +18849,7 @@ }, { "id": 16000057, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18286,6 +18880,7 @@ }, { "id": 16000058, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18316,6 +18911,7 @@ }, { "id": 16000059, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18346,6 +18942,7 @@ }, { "id": 16000060, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18376,6 +18973,7 @@ }, { "id": 16000061, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18405,6 +19003,7 @@ }, { "id": 16000062, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18434,6 +19033,7 @@ }, { "id": 16000063, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18463,6 +19063,7 @@ }, { "id": 16000064, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18490,6 +19091,7 @@ }, { "id": 16000065, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18517,6 +19119,7 @@ }, { "id": 16000066, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18544,6 +19147,7 @@ }, { "id": 16000067, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18571,6 +19175,7 @@ }, { "id": 16000068, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18600,6 +19205,7 @@ }, { "id": 16000069, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18629,6 +19235,7 @@ }, { "id": 16000070, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18658,6 +19265,7 @@ }, { "id": 16000072, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18687,6 +19295,7 @@ }, { "id": 16000073, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18716,6 +19325,7 @@ }, { "id": 16000074, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18745,6 +19355,7 @@ }, { "id": 16000075, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18774,6 +19385,7 @@ }, { "id": 16000076, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18803,6 +19415,7 @@ }, { "id": 16000077, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18832,6 +19445,7 @@ }, { "id": 16000078, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18861,6 +19475,7 @@ }, { "id": 16000079, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18890,6 +19505,7 @@ }, { "id": 16000080, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18919,6 +19535,7 @@ }, { "id": 16000081, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18948,6 +19565,7 @@ }, { "id": 16000082, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -18977,6 +19595,7 @@ }, { "id": 16000083, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19006,6 +19625,7 @@ }, { "id": 16000084, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19035,6 +19655,7 @@ }, { "id": 16000085, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19064,6 +19685,7 @@ }, { "id": 16000086, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19093,6 +19715,7 @@ }, { "id": 16000087, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19122,6 +19745,7 @@ }, { "id": 16000088, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19151,6 +19775,7 @@ }, { "id": 16000089, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19180,6 +19805,7 @@ }, { "id": 16000090, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19209,6 +19835,7 @@ }, { "id": 16000091, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19238,6 +19865,7 @@ }, { "id": 16000092, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19267,6 +19895,7 @@ }, { "id": 16000093, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19296,6 +19925,7 @@ }, { "id": 16000094, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19325,6 +19955,7 @@ }, { "id": 16000095, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19354,6 +19985,7 @@ }, { "id": 16000096, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19383,6 +20015,7 @@ }, { "id": 16000097, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19412,6 +20045,7 @@ }, { "id": 16000098, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19441,6 +20075,7 @@ }, { "id": 16000099, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19470,6 +20105,7 @@ }, { "id": 16000100, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19499,6 +20135,7 @@ }, { "id": 16000101, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19528,6 +20165,7 @@ }, { "id": 16000102, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19557,6 +20195,7 @@ }, { "id": 16000103, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19586,6 +20225,7 @@ }, { "id": 16000104, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19615,6 +20255,7 @@ }, { "id": 16000105, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19644,6 +20285,7 @@ }, { "id": 16000106, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19673,6 +20315,7 @@ }, { "id": 16000107, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19702,6 +20345,7 @@ }, { "id": 16000108, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19731,6 +20375,7 @@ }, { "id": 16000109, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19760,6 +20405,7 @@ }, { "id": 16000110, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19789,6 +20435,7 @@ }, { "id": 16000111, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19818,6 +20465,7 @@ }, { "id": 16000112, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19847,6 +20495,7 @@ }, { "id": 16000113, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19876,6 +20525,7 @@ }, { "id": 16000114, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19905,6 +20555,7 @@ }, { "id": 16000115, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19934,6 +20585,7 @@ }, { "id": 16000116, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19963,6 +20615,7 @@ }, { "id": 16000117, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -19992,6 +20645,7 @@ }, { "id": 16000118, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20021,6 +20675,7 @@ }, { "id": 16000119, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20050,6 +20705,7 @@ }, { "id": 16000120, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20079,6 +20735,7 @@ }, { "id": 16000121, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20108,6 +20765,7 @@ }, { "id": 16000122, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20137,6 +20795,7 @@ }, { "id": 16000123, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20166,6 +20825,7 @@ }, { "id": 16000124, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20195,6 +20855,7 @@ }, { "id": 16000125, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20224,6 +20885,7 @@ }, { "id": 16000126, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20253,6 +20915,7 @@ }, { "id": 16000127, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20282,6 +20945,7 @@ }, { "id": 16000128, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20311,6 +20975,7 @@ }, { "id": 16000129, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20340,6 +21005,7 @@ }, { "id": 16000130, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20369,6 +21035,7 @@ }, { "id": 16000131, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20398,6 +21065,7 @@ }, { "id": 16000132, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20427,6 +21095,7 @@ }, { "id": 16000133, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20456,6 +21125,7 @@ }, { "id": 16000134, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20485,6 +21155,7 @@ }, { "id": 16000135, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20514,6 +21185,7 @@ }, { "id": 16000136, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20543,6 +21215,7 @@ }, { "id": 16000137, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20572,6 +21245,7 @@ }, { "id": 16000138, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20601,6 +21275,7 @@ }, { "id": 16000139, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20630,6 +21305,7 @@ }, { "id": 16000140, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20659,6 +21335,7 @@ }, { "id": 16000141, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20688,6 +21365,7 @@ }, { "id": 16000142, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20717,6 +21395,7 @@ }, { "id": 16000143, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20746,6 +21425,7 @@ }, { "id": 16000144, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20775,6 +21455,7 @@ }, { "id": 16000145, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20802,6 +21483,7 @@ }, { "id": 16000146, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20829,6 +21511,7 @@ }, { "id": 16000147, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20856,6 +21539,7 @@ }, { "id": 16000148, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20883,6 +21567,7 @@ }, { "id": 16000149, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20910,6 +21595,7 @@ }, { "id": 16000150, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20937,6 +21623,7 @@ }, { "id": 16000151, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20964,6 +21651,7 @@ }, { "id": 16000152, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -20991,6 +21679,7 @@ }, { "id": 16000153, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21018,6 +21707,7 @@ }, { "id": 16000154, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21045,6 +21735,7 @@ }, { "id": 16000155, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21072,6 +21763,7 @@ }, { "id": 16000156, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21099,6 +21791,7 @@ }, { "id": 16000157, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21126,6 +21819,7 @@ }, { "id": 16000158, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21153,6 +21847,7 @@ }, { "id": 16000159, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21180,6 +21875,7 @@ }, { "id": 16000160, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21207,6 +21903,7 @@ }, { "id": 16000161, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21234,6 +21931,7 @@ }, { "id": 16000162, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21261,6 +21959,7 @@ }, { "id": 16000163, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21288,6 +21987,7 @@ }, { "id": 16000164, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21315,6 +22015,7 @@ }, { "id": 16000165, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21342,6 +22043,7 @@ }, { "id": 16000166, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21369,6 +22071,7 @@ }, { "id": 16000167, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21396,6 +22099,7 @@ }, { "id": 16000168, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21423,6 +22127,7 @@ }, { "id": 16000169, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21450,6 +22155,7 @@ }, { "id": 16000170, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21477,6 +22183,7 @@ }, { "id": 16000171, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21504,6 +22211,7 @@ }, { "id": 16000172, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21531,6 +22239,7 @@ }, { "id": 16000173, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21558,6 +22267,7 @@ }, { "id": 16000174, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21585,6 +22295,7 @@ }, { "id": 16000175, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21612,6 +22323,7 @@ }, { "id": 16000176, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21639,6 +22351,7 @@ }, { "id": 16000177, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21666,6 +22379,7 @@ }, { "id": 16000178, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21693,6 +22407,7 @@ }, { "id": 16000179, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21720,6 +22435,7 @@ }, { "id": 16000180, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21747,6 +22463,7 @@ }, { "id": 16000181, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21774,6 +22491,7 @@ }, { "id": 16000182, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21801,6 +22519,7 @@ }, { "id": 16000183, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21828,6 +22547,7 @@ }, { "id": 16000184, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21855,6 +22575,7 @@ }, { "id": 16000185, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21882,6 +22603,7 @@ }, { "id": 16000186, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21909,6 +22631,7 @@ }, { "id": 16000187, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21936,6 +22659,7 @@ }, { "id": 16000188, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21963,6 +22687,7 @@ }, { "id": 16000189, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -21990,6 +22715,7 @@ }, { "id": 16000190, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22017,6 +22743,7 @@ }, { "id": 16000191, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22044,6 +22771,7 @@ }, { "id": 16000192, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22071,6 +22799,7 @@ }, { "id": 16000193, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22098,6 +22827,7 @@ }, { "id": 16000194, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22125,6 +22855,7 @@ }, { "id": 16000195, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22152,6 +22883,7 @@ }, { "id": 16000196, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22179,6 +22911,7 @@ }, { "id": 16000197, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22206,6 +22939,7 @@ }, { "id": 16000198, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22233,6 +22967,7 @@ }, { "id": 16000199, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22260,6 +22995,7 @@ }, { "id": 16000200, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22287,6 +23023,7 @@ }, { "id": 16000201, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22314,6 +23051,7 @@ }, { "id": 16000202, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22341,6 +23079,7 @@ }, { "id": 16000203, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22368,6 +23107,7 @@ }, { "id": 16000204, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22395,6 +23135,7 @@ }, { "id": 16000205, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22422,6 +23163,7 @@ }, { "id": 16000206, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22449,6 +23191,7 @@ }, { "id": 16000207, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22476,6 +23219,7 @@ }, { "id": 16000208, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22503,6 +23247,7 @@ }, { "id": 16000209, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22530,6 +23275,7 @@ }, { "id": 16000210, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22557,6 +23303,7 @@ }, { "id": 16000211, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22584,6 +23331,7 @@ }, { "id": 16000212, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22611,6 +23359,7 @@ }, { "id": 16000213, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22638,6 +23387,7 @@ }, { "id": 16000214, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22665,6 +23415,7 @@ }, { "id": 16000215, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22692,6 +23443,7 @@ }, { "id": 16000216, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22719,6 +23471,7 @@ }, { "id": 16000217, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22746,6 +23499,7 @@ }, { "id": 16000218, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22773,6 +23527,7 @@ }, { "id": 16000219, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22800,6 +23555,7 @@ }, { "id": 16000220, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22827,6 +23583,7 @@ }, { "id": 16000221, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22854,6 +23611,7 @@ }, { "id": 16000222, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22881,6 +23639,7 @@ }, { "id": 16000223, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22908,6 +23667,7 @@ }, { "id": 16000224, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22935,6 +23695,7 @@ }, { "id": 16000225, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22962,6 +23723,7 @@ }, { "id": 16000226, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -22989,6 +23751,7 @@ }, { "id": 16000227, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23016,6 +23779,7 @@ }, { "id": 16000228, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23043,6 +23807,7 @@ }, { "id": 16000229, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23070,6 +23835,7 @@ }, { "id": 16000230, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23097,6 +23863,7 @@ }, { "id": 16000231, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23124,6 +23891,7 @@ }, { "id": 16000232, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23151,6 +23919,7 @@ }, { "id": 16000233, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23178,6 +23947,7 @@ }, { "id": 16000234, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23205,6 +23975,7 @@ }, { "id": 16000235, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23232,6 +24003,7 @@ }, { "id": 16000236, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23259,6 +24031,7 @@ }, { "id": 16000237, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23286,6 +24059,7 @@ }, { "id": 16000238, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23313,6 +24087,7 @@ }, { "id": 16000239, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23340,6 +24115,7 @@ }, { "id": 16000240, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23367,6 +24143,7 @@ }, { "id": 16000241, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23394,6 +24171,7 @@ }, { "id": 16000242, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23421,6 +24199,7 @@ }, { "id": 16000243, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23448,6 +24227,7 @@ }, { "id": 16000244, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23475,6 +24255,7 @@ }, { "id": 16000245, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23502,6 +24283,7 @@ }, { "id": 16000246, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23529,6 +24311,7 @@ }, { "id": 16000247, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23556,6 +24339,7 @@ }, { "id": 16000248, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23583,6 +24367,7 @@ }, { "id": 16000249, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23610,6 +24395,7 @@ }, { "id": 16000250, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23637,6 +24423,7 @@ }, { "id": 16000251, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23664,6 +24451,7 @@ }, { "id": 16000252, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23691,6 +24479,7 @@ }, { "id": 16000253, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23718,6 +24507,7 @@ }, { "id": 16000254, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23745,6 +24535,7 @@ }, { "id": 16000255, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23772,6 +24563,7 @@ }, { "id": 16000256, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23799,6 +24591,7 @@ }, { "id": 16000257, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23826,6 +24619,7 @@ }, { "id": 16000258, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23853,6 +24647,7 @@ }, { "id": 16000259, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23880,6 +24675,7 @@ }, { "id": 16000260, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23907,6 +24703,7 @@ }, { "id": 16000261, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23934,6 +24731,7 @@ }, { "id": 16000262, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23961,6 +24759,7 @@ }, { "id": 16000263, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -23988,6 +24787,7 @@ }, { "id": 16000264, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24015,6 +24815,7 @@ }, { "id": 16000265, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24042,6 +24843,7 @@ }, { "id": 16000266, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24069,6 +24871,7 @@ }, { "id": 16000267, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24096,6 +24899,7 @@ }, { "id": 16000268, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24123,6 +24927,7 @@ }, { "id": 16000269, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24150,6 +24955,7 @@ }, { "id": 16000270, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24177,6 +24983,7 @@ }, { "id": 16000271, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24204,6 +25011,7 @@ }, { "id": 16000272, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24231,6 +25039,7 @@ }, { "id": 16000273, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24258,6 +25067,7 @@ }, { "id": 16000274, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24285,6 +25095,7 @@ }, { "id": 16000275, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24312,6 +25123,7 @@ }, { "id": 16000276, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24339,6 +25151,7 @@ }, { "id": 16000277, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24366,6 +25179,7 @@ }, { "id": 16000278, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24393,6 +25207,7 @@ }, { "id": 16000279, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24420,6 +25235,7 @@ }, { "id": 16000280, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24447,6 +25263,7 @@ }, { "id": 16000281, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24474,6 +25291,7 @@ }, { "id": 16000282, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24501,6 +25319,7 @@ }, { "id": 16000283, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24528,6 +25347,7 @@ }, { "id": 16000284, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24555,6 +25375,7 @@ }, { "id": 16000285, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24582,6 +25403,7 @@ }, { "id": 16000286, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24609,6 +25431,7 @@ }, { "id": 16000287, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24636,6 +25459,7 @@ }, { "id": 16000288, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24663,6 +25487,7 @@ }, { "id": 16000289, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24690,6 +25515,7 @@ }, { "id": 16000290, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24717,6 +25543,7 @@ }, { "id": 16000291, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24744,6 +25571,7 @@ }, { "id": 16000292, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24771,6 +25599,7 @@ }, { "id": 16000293, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24798,6 +25627,7 @@ }, { "id": 16000294, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24825,6 +25655,7 @@ }, { "id": 16000295, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24852,6 +25683,7 @@ }, { "id": 16000296, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24879,6 +25711,7 @@ }, { "id": 16000297, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24906,6 +25739,7 @@ }, { "id": 16000298, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24933,6 +25767,7 @@ }, { "id": 16000299, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24960,6 +25795,7 @@ }, { "id": 16000300, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -24987,6 +25823,7 @@ }, { "id": 16000301, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25014,6 +25851,7 @@ }, { "id": 16000302, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25041,6 +25879,7 @@ }, { "id": 16000303, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25068,6 +25907,7 @@ }, { "id": 16000304, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25095,6 +25935,7 @@ }, { "id": 16000305, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25122,6 +25963,7 @@ }, { "id": 16000306, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25149,6 +25991,7 @@ }, { "id": 16000307, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25176,6 +26019,7 @@ }, { "id": 16000308, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25203,6 +26047,7 @@ }, { "id": 16000309, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25230,6 +26075,7 @@ }, { "id": 16000310, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25257,6 +26103,7 @@ }, { "id": 16000311, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25284,6 +26131,7 @@ }, { "id": 16000312, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25311,6 +26159,7 @@ }, { "id": 16000313, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25338,6 +26187,7 @@ }, { "id": 16000314, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25365,6 +26215,7 @@ }, { "id": 16000315, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25392,6 +26243,7 @@ }, { "id": 16000316, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25419,6 +26271,7 @@ }, { "id": 16000317, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25446,6 +26299,7 @@ }, { "id": 16000318, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25473,6 +26327,7 @@ }, { "id": 16000319, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25500,6 +26355,7 @@ }, { "id": 16000320, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25527,6 +26383,7 @@ }, { "id": 16000321, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25554,6 +26411,7 @@ }, { "id": 16000322, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25581,6 +26439,7 @@ }, { "id": 16000323, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25608,6 +26467,7 @@ }, { "id": 16000324, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25635,6 +26495,7 @@ }, { "id": 16000325, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25662,6 +26523,7 @@ }, { "id": 16000326, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25689,6 +26551,7 @@ }, { "id": 16000327, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25716,6 +26579,7 @@ }, { "id": 16000328, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25743,6 +26607,7 @@ }, { "id": 16000329, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25770,6 +26635,7 @@ }, { "id": 16000330, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25797,6 +26663,7 @@ }, { "id": 16000331, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25824,6 +26691,7 @@ }, { "id": 16000332, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25851,6 +26719,7 @@ }, { "id": 16000333, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25878,6 +26747,7 @@ }, { "id": 16000334, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25905,6 +26775,7 @@ }, { "id": 16000335, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25932,6 +26803,7 @@ }, { "id": 16000336, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25959,6 +26831,7 @@ }, { "id": 16000337, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -25986,6 +26859,7 @@ }, { "id": 16000338, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26013,6 +26887,7 @@ }, { "id": 16000339, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26040,6 +26915,7 @@ }, { "id": 16000340, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26067,6 +26943,7 @@ }, { "id": 16000341, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26094,6 +26971,7 @@ }, { "id": 16000342, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26121,6 +26999,7 @@ }, { "id": 16000343, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26148,6 +27027,7 @@ }, { "id": 16000344, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26175,6 +27055,7 @@ }, { "id": 16000345, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26202,6 +27083,7 @@ }, { "id": 16000346, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26229,6 +27111,7 @@ }, { "id": 16000347, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26256,6 +27139,7 @@ }, { "id": 16000348, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26283,6 +27167,7 @@ }, { "id": 16000349, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26310,6 +27195,7 @@ }, { "id": 16000350, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26337,6 +27223,7 @@ }, { "id": 16000351, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26364,6 +27251,7 @@ }, { "id": 16000352, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26391,6 +27279,7 @@ }, { "id": 16000353, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26418,6 +27307,7 @@ }, { "id": 16000354, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26445,6 +27335,7 @@ }, { "id": 16000355, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26472,6 +27363,7 @@ }, { "id": 16000356, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26499,6 +27391,7 @@ }, { "id": 16000357, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26526,6 +27419,7 @@ }, { "id": 16000358, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26553,6 +27447,7 @@ }, { "id": 16000359, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26580,6 +27475,7 @@ }, { "id": 16000360, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26607,6 +27503,7 @@ }, { "id": 16000361, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26634,6 +27531,7 @@ }, { "id": 16000362, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26661,6 +27559,7 @@ }, { "id": 16000363, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26688,6 +27587,7 @@ }, { "id": 16000364, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26715,6 +27615,7 @@ }, { "id": 16000365, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26742,6 +27643,7 @@ }, { "id": 16000366, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26769,6 +27671,7 @@ }, { "id": 16000367, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26796,6 +27699,7 @@ }, { "id": 16000368, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26823,6 +27727,7 @@ }, { "id": 600000050, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -26852,6 +27757,7 @@ }, { "id": 17100001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -26881,6 +27787,7 @@ }, { "id": 17100002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -26910,6 +27817,7 @@ }, { "id": 17100003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -26939,6 +27847,7 @@ }, { "id": 17100004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -26968,6 +27877,7 @@ }, { "id": 17100005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -26997,6 +27907,7 @@ }, { "id": 17100006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27026,6 +27937,7 @@ }, { "id": 17100007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27055,6 +27967,7 @@ }, { "id": 17100008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27084,6 +27997,7 @@ }, { "id": 17100009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27113,6 +28027,7 @@ }, { "id": 17100010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27142,6 +28057,7 @@ }, { "id": 17100101, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27173,6 +28089,7 @@ }, { "id": 17100201, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27202,6 +28119,7 @@ }, { "id": 17100202, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27233,6 +28151,7 @@ }, { "id": 17100203, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27264,6 +28183,7 @@ }, { "id": 17100204, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27293,6 +28213,7 @@ }, { "id": 17100205, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27322,6 +28243,7 @@ }, { "id": 17100206, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27353,6 +28275,7 @@ }, { "id": 17100207, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27384,6 +28307,7 @@ }, { "id": 17100208, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27413,6 +28337,7 @@ }, { "id": 17100209, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27444,6 +28369,7 @@ }, { "id": 17100210, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27475,6 +28401,7 @@ }, { "id": 17100211, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27506,6 +28433,7 @@ }, { "id": 17100212, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27535,6 +28463,7 @@ }, { "id": 17100213, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27567,6 +28496,7 @@ }, { "id": 17100214, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27598,6 +28528,7 @@ }, { "id": 17100215, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27627,6 +28558,7 @@ }, { "id": 17100301, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27656,6 +28588,7 @@ }, { "id": 17100302, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27685,6 +28618,7 @@ }, { "id": 17100303, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27714,6 +28648,7 @@ }, { "id": 17100304, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27743,6 +28678,7 @@ }, { "id": 17100305, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27774,6 +28710,7 @@ }, { "id": 17100306, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27805,6 +28742,7 @@ }, { "id": 17100307, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27836,6 +28774,7 @@ }, { "id": 17100308, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27868,6 +28807,7 @@ }, { "id": 17100309, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27897,6 +28837,7 @@ }, { "id": 17100310, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27926,6 +28867,7 @@ }, { "id": 17100311, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27957,6 +28899,7 @@ }, { "id": 17100312, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -27988,6 +28931,7 @@ }, { "id": 17100401, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28017,6 +28961,7 @@ }, { "id": 17100402, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28049,6 +28994,7 @@ }, { "id": 17100403, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28078,6 +29024,7 @@ }, { "id": 17100404, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28107,6 +29054,7 @@ }, { "id": 17100405, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28136,6 +29084,7 @@ }, { "id": 17100406, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28167,6 +29116,7 @@ }, { "id": 17100407, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28198,6 +29148,7 @@ }, { "id": 17100501, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28229,6 +29180,7 @@ }, { "id": 17100502, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28260,6 +29212,7 @@ }, { "id": 17100503, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28289,6 +29242,7 @@ }, { "id": 17100504, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28318,6 +29272,7 @@ }, { "id": 17100505, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28347,6 +29302,7 @@ }, { "id": 17100506, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28376,6 +29332,7 @@ }, { "id": 18000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28384,9 +29341,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_957", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -28400,11 +29357,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20034 + ], "filter2": [] }, { "id": 18000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28413,7 +29373,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_958", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28434,6 +29394,7 @@ }, { "id": 18000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28442,7 +29403,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_959", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28463,6 +29424,7 @@ }, { "id": 18000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28471,7 +29433,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_960", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28492,6 +29454,7 @@ }, { "id": 18000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28500,7 +29463,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_961", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28521,6 +29484,7 @@ }, { "id": 18000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28529,9 +29493,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_962", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第3章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -28545,11 +29509,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20261 + ], "filter2": [] }, { "id": 18000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28558,9 +29525,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_963", - "text": "主角等级达到1级开启" + "text": "主角等级达到10开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -28574,11 +29541,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20034 + ], "filter2": [] }, { "id": 18000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28587,7 +29557,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_964", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28608,6 +29578,7 @@ }, { "id": 18000009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28616,9 +29587,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_965", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第1关开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -28632,11 +29603,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 1101000 + ], "filter2": [] }, { "id": 18000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28645,9 +29619,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_966", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -28661,11 +29635,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 1101016 + ], "filter2": [] }, { "id": 18000011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28674,7 +29651,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_967", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28695,6 +29672,7 @@ }, { "id": 18000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28703,7 +29681,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_968", - "text": "主角等级达到1级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -28724,6 +29702,7 @@ }, { "id": 18000013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28732,9 +29711,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_969", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -28748,11 +29727,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20050 + ], "filter2": [] }, { "id": 18000014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28761,9 +29743,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_970", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -28777,11 +29759,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 1101000 + ], "filter2": [] }, { "id": 18000015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28790,9 +29775,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_971", - "text": "主角等级达到1级开启" + "text": "继续完成更多主线任务开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -28806,11 +29791,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20030 + ], "filter2": [] }, { "id": 18000016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28819,9 +29807,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_972", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第1关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -28835,11 +29823,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 20032 + ], "filter2": [] }, { "id": 18000017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28848,7 +29839,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_973", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28869,6 +29860,7 @@ }, { "id": 18000018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28877,7 +29869,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_974", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第1关开启" }, "type": 20, "valid": 0, @@ -28898,6 +29890,7 @@ }, { "id": 18000019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28906,7 +29899,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_975", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28927,6 +29920,7 @@ }, { "id": 18000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28935,7 +29929,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_976", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -28956,6 +29950,7 @@ }, { "id": 18000021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28964,7 +29959,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_977", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第4章的第4关开启" }, "type": 20, "valid": 0, @@ -28985,6 +29980,7 @@ }, { "id": 18000022, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -28993,7 +29989,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_978", - "text": "主角等级达到1级开启" + "text": "主角等级达到999开启" }, "type": 20, "valid": 0, @@ -29009,11 +30005,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 9999 + ], "filter2": [] }, { "id": 18000023, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29022,7 +30021,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_979", - "text": "主角等级达到1级开启" + "text": "主角等级达到999开启" }, "type": 20, "valid": 0, @@ -29038,11 +30037,14 @@ "text": "" }, "value": 1, - "filter": [], + "filter": [ + 9999 + ], "filter2": [] }, { "id": 18000024, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29051,7 +30053,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_980", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, "type": 20, "valid": 0, @@ -29072,6 +30074,7 @@ }, { "id": 18000025, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29080,7 +30083,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_981", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29101,6 +30104,7 @@ }, { "id": 18000026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29109,7 +30113,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_982", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29130,6 +30134,7 @@ }, { "id": 18000027, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29138,7 +30143,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_983", - "text": "主角等级达到1级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29159,6 +30164,7 @@ }, { "id": 18000028, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29167,7 +30173,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_984", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29182,12 +30188,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000029, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29196,7 +30203,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_985", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29211,12 +30218,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29225,9 +30233,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_986", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第6章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29240,12 +30248,15 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20130 + ], "filter2": [] }, { "id": 18000031, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29254,7 +30265,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_987", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29269,12 +30280,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000032, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29283,7 +30295,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_988", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第6章的第8关开启" }, "type": 20, "valid": 0, @@ -29298,12 +30310,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000033, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29312,7 +30325,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_989", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29327,12 +30340,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000034, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29341,7 +30355,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_990", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第4章的第4关开启" }, "type": 20, "valid": 0, @@ -29356,12 +30370,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000035, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29370,7 +30385,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_991", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第2章的第8关开启" }, "type": 20, "valid": 0, @@ -29385,12 +30400,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000036, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29399,9 +30415,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_992", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29414,12 +30430,15 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20050 + ], "filter2": [] }, { "id": 18000037, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29428,7 +30447,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_993", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29443,12 +30462,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000038, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29457,7 +30477,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_994", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第3章的第4关开启" }, "type": 252, "valid": 0, @@ -29473,13 +30493,12 @@ "text": "" }, "value": 1, - "filter": [ - 20364 - ], + "filter": [], "filter2": [] }, { "id": 18000039, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29488,7 +30507,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_995", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29503,12 +30522,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000040, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29517,7 +30537,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_996", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29532,12 +30552,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000041, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29546,7 +30567,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_997", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29561,12 +30582,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000042, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29575,7 +30597,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_998", - "text": "主角等级达到1级开启" + "text": "主线关卡通关达到第3章的第4关开启" }, "type": 252, "valid": 0, @@ -29592,12 +30614,13 @@ }, "value": 1, "filter": [ - 20364 + 20128 ], "filter2": [] }, { "id": 18000043, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29606,9 +30629,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_999", - "text": "主角等级达到2级开启" + "text": "主线关卡通关达到第5章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29621,12 +30644,15 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20140 + ], "filter2": [] }, { "id": 18000044, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29635,7 +30661,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1000", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29650,12 +30676,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000045, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29664,7 +30691,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1001", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29679,12 +30706,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000046, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29693,7 +30721,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1002", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29708,12 +30736,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000047, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29722,7 +30751,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1003", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29737,12 +30766,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000048, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29751,9 +30781,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1004", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29766,12 +30796,15 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20020 + ], "filter2": [] }, { "id": 18000049, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29780,9 +30813,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1005", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -29795,12 +30828,15 @@ "key": "", "text": "" }, - "value": 2, - "filter": [], + "value": 1, + "filter": [ + 20020 + ], "filter2": [] }, { "id": 18000050, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29809,7 +30845,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1006", - "text": "主角等级达到2级开启" + "text": "主角等级达到50开启" }, "type": 20, "valid": 0, @@ -29824,12 +30860,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 70, "filter": [], "filter2": [] }, { "id": 18000051, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29838,7 +30875,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1007", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29853,12 +30890,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000052, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29867,7 +30905,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1008", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" }, "type": 20, "valid": 0, @@ -29882,12 +30920,13 @@ "key": "", "text": "" }, - "value": 2, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000053, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -29896,7 +30935,671 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1009", - "text": "主角等级达到2级开启" + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000054, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1010", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000055, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1011", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000056, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1012", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000057, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1013", + "text": "主角等级达到1开启" + }, + "type": 252, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [ + 20140 + ], + "filter2": [] + }, + { + "id": 18000058, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1014", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000059, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1015", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000060, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1016", + "text": "主角等级达到第4章的第8关开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000061, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1017", + "text": "主角等级达到1开启" + }, + "type": 252, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [ + 20033 + ], + "filter2": [] + }, + { + "id": 18000062, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1018", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000063, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1019", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000064, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1020", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000065, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1021", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000066, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1022", + "text": "主线关卡通关达到第1章的第7关开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000067, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1023", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000068, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1024", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000069, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1025", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000070, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1026", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000071, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1027", + "text": "主线关卡通关达到第3章的第8关开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000072, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1028", + "text": "主角等级达到1开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 1, + "filter": [], + "filter2": [] + }, + { + "id": 18000073, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1029", + "text": "主角等级达到6开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 6, + "filter": [], + "filter2": [] + }, + { + "id": 18000074, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1030", + "text": "主角等级达到10开启" + }, + "type": 20, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 0, + "tipstxt": { + "key": "", + "text": "" + }, + "value": 10, + "filter": [], + "filter2": [] + }, + { + "id": 18000075, + "refresh": 0, + "rtype": 1, + "ctype": 1, + "notify": [ + "sys" + ], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1031", + "text": "主角等级达到2开启" }, "type": 20, "valid": 0, @@ -29915,646 +31618,9 @@ "filter": [], "filter2": [] }, - { - "id": 18000054, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1010", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000055, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1011", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000056, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1012", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000057, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1013", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000058, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1014", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000059, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1015", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000060, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1016", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000061, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1017", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000062, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1018", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000063, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1019", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000064, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1020", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000065, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1021", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000066, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1022", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000067, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1023", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000068, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1024", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000069, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1025", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000070, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1026", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000071, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1027", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000072, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1028", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000073, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1029", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000074, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1030", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000075, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1031", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, { "id": 18000076, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30563,9 +31629,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1032", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第2章的第4关开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -30578,12 +31644,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1101012 + ], "filter2": [] }, { "id": 18000077, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30592,7 +31661,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1033", - "text": "主角等级达到4级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -30607,12 +31676,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 10, "filter": [], "filter2": [] }, { "id": 18000078, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30621,7 +31691,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1034", - "text": "主角等级达到4级开启" + "text": "主角等级达到70开启" }, "type": 20, "valid": 0, @@ -30636,12 +31706,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 70, "filter": [], "filter2": [] }, { "id": 18000079, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30650,7 +31721,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1035", - "text": "主角等级达到4级开启" + "text": "主角等级达到第8章的第8关开启" }, "type": 20, "valid": 0, @@ -30665,12 +31736,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000080, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30679,7 +31751,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1036", - "text": "主角等级达到4级开启" + "text": "主角等级达到第12章的第8关开启" }, "type": 20, "valid": 0, @@ -30694,12 +31766,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000081, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30708,7 +31781,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1037", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第6章的第4关开启" }, "type": 20, "valid": 0, @@ -30723,12 +31796,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000082, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30737,9 +31811,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1038", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -30752,12 +31826,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20050 + ], "filter2": [] }, { "id": 18000083, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30766,7 +31843,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1039", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第5章的第4关开启" }, "type": 20, "valid": 0, @@ -30781,12 +31858,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000084, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30795,7 +31873,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1040", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第1章的第8关开启" }, "type": 20, "valid": 0, @@ -30810,12 +31888,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000085, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30824,9 +31903,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1041", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第6章的第8关开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -30839,12 +31918,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20250 + ], "filter2": [] }, { "id": 18000086, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30853,9 +31935,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1042", - "text": "主角等级达到4级开启" + "text": "好友数量" }, - "type": 20, + "type": 10, "valid": 0, "head": { "a": "attr", @@ -30868,12 +31950,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 10, "filter": [], "filter2": [] }, { "id": 18000087, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30882,7 +31965,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1043", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第12章的第8关开启" }, "type": 20, "valid": 0, @@ -30897,12 +31980,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000088, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30911,7 +31995,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1044", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第10章的第8关开启" }, "type": 20, "valid": 0, @@ -30926,12 +32010,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000089, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30940,7 +32025,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1045", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第10章的第8关开启" }, "type": 20, "valid": 0, @@ -30955,12 +32040,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000090, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30969,7 +32055,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1046", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第4章的第8关开启" }, "type": 20, "valid": 0, @@ -30984,12 +32070,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000091, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -30998,7 +32085,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1047", - "text": "主角等级达到4级开启" + "text": "主线关卡通关达到第8章的第8关开启" }, "type": 20, "valid": 0, @@ -31013,12 +32100,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000092, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31027,7 +32115,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1048", - "text": "主角等级达到4级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -31042,12 +32130,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 40, "filter": [], "filter2": [] }, { "id": 18000093, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31056,9 +32145,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1049", - "text": "主角等级达到4级开启" + "text": "主角等级达到4开启" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -31071,12 +32160,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20050 + ], "filter2": [] }, { "id": 18000094, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31085,7 +32177,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1050", - "text": "主角等级达到4级开启" + "text": "主角等级达到10开启" }, "type": 20, "valid": 0, @@ -31100,12 +32192,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 10, "filter": [], "filter2": [] }, { "id": 18000095, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31114,9 +32207,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1051", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31129,12 +32222,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1101000 + ], "filter2": [] }, { "id": 18000096, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31143,9 +32239,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1052", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -31158,12 +32254,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 20140 + ], "filter2": [] }, { "id": 18000097, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31172,7 +32271,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1053", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31187,12 +32286,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000098, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31201,7 +32301,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1054", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31216,12 +32316,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000099, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31230,7 +32331,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1055", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31245,12 +32346,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000100, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31259,7 +32361,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1056", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31274,12 +32376,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000101, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31288,7 +32391,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1057", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31303,12 +32406,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000102, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31317,7 +32421,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1058", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31332,12 +32436,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 2, "filter": [], "filter2": [] }, { "id": 18000103, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31346,7 +32451,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1059", - "text": "主角等级达到4级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31361,12 +32466,13 @@ "key": "", "text": "" }, - "value": 4, + "value": 3, "filter": [], "filter2": [] }, { "id": 18000104, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31375,9 +32481,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1060", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31390,12 +32496,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1101017 + ], "filter2": [] }, { "id": 18000105, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31404,9 +32513,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1061", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31419,12 +32528,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1102020 + ], "filter2": [] }, { "id": 18000106, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31433,9 +32545,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1062", - "text": "主角等级达到4级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31448,12 +32560,15 @@ "key": "", "text": "" }, - "value": 4, - "filter": [], + "value": 1, + "filter": [ + 1103015 + ], "filter2": [] }, { "id": 18000107, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31462,9 +32577,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1063", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31477,12 +32592,15 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1104031 + ], "filter2": [] }, { "id": 18000108, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31491,7 +32609,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1064", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31506,12 +32624,13 @@ "key": "", "text": "" }, - "value": 5, + "value": 70, "filter": [], "filter2": [] }, { "id": 18000109, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31520,7 +32639,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1065", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31535,12 +32654,13 @@ "key": "", "text": "" }, - "value": 5, + "value": 71, "filter": [], "filter2": [] }, { "id": 18000110, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31549,7 +32669,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1066", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31564,12 +32684,13 @@ "key": "", "text": "" }, - "value": 5, + "value": 72, "filter": [], "filter2": [] }, { "id": 18000111, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31578,7 +32699,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1067", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31593,12 +32714,13 @@ "key": "", "text": "" }, - "value": 5, + "value": 73, "filter": [], "filter2": [] }, { "id": 18000112, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31607,9 +32729,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1068", - "text": "主角等级达到5级开启" + "text": "继续完成更多主线任务开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31622,12 +32744,15 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101037 + ], "filter2": [] }, { "id": 18000113, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31636,9 +32761,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1069", - "text": "主角等级达到5级开启" + "text": "继续完成更多主线任务开启" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31651,12 +32776,15 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101004 + ], "filter2": [] }, { "id": 18000114, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31665,9 +32793,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1070", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31680,12 +32808,15 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101012 + ], "filter2": [] }, { "id": 18000115, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31694,9 +32825,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1071", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31709,12 +32840,15 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 1101018 + ], "filter2": [] }, { "id": 18000116, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31723,9 +32857,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1072", - "text": "主角等级达到5级开启" + "text": "" }, - "type": 20, + "type": 252, "valid": 0, "head": { "a": "attr", @@ -31738,12 +32872,15 @@ "key": "", "text": "" }, - "value": 5, - "filter": [], + "value": 1, + "filter": [ + 20250 + ], "filter2": [] }, { "id": 18000117, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31752,7 +32889,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1073", - "text": "主角等级达到5级开启" + "text": "" }, "type": 20, "valid": 0, @@ -31767,12 +32904,13 @@ "key": "", "text": "" }, - "value": 5, + "value": 1, "filter": [], "filter2": [] }, { "id": 18000118, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31781,9 +32919,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1074", - "text": "主角等级达到6级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31796,12 +32934,15 @@ "key": "", "text": "" }, - "value": 6, - "filter": [], + "value": 1, + "filter": [ + 1101012 + ], "filter2": [] }, { "id": 18000119, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [ @@ -31810,9 +32951,9 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1075", - "text": "主角等级达到6级开启" + "text": "" }, - "type": 20, + "type": 61, "valid": 0, "head": { "a": "attr", @@ -31825,12 +32966,15 @@ "key": "", "text": "" }, - "value": 6, - "filter": [], + "value": 1, + "filter": [ + 1102023 + ], "filter2": [] }, { "id": 19000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -31852,12 +32996,13 @@ "key": "", "text": "" }, - "value": 25, + "value": 1, "filter": [], "filter2": [] }, { "id": 19000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -31879,12 +33024,13 @@ "key": "", "text": "" }, - "value": 30, + "value": 1, "filter": [], "filter2": [] }, { "id": 19000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -31906,12 +33052,13 @@ "key": "", "text": "" }, - "value": 35, + "value": 1, "filter": [], "filter2": [] }, { "id": 19000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -31933,12 +33080,13 @@ "key": "", "text": "" }, - "value": 40, + "value": 1, "filter": [], "filter2": [] }, { "id": 19000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -31968,6 +33116,7 @@ }, { "id": 19000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -31989,7 +33138,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 35002 ], @@ -31997,6 +33146,7 @@ }, { "id": 19000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32018,7 +33168,7 @@ "key": "", "text": "" }, - "value": 40, + "value": 1, "filter": [ 35002 ], @@ -32026,6 +33176,7 @@ }, { "id": 19000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32047,7 +33198,7 @@ "key": "", "text": "" }, - "value": 60, + "value": 1, "filter": [ 35002 ], @@ -32055,6 +33206,7 @@ }, { "id": 19000009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32084,6 +33236,7 @@ }, { "id": 19000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32105,7 +33258,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 14003 ], @@ -32113,6 +33266,7 @@ }, { "id": 19000011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32134,7 +33288,7 @@ "key": "", "text": "" }, - "value": 40, + "value": 1, "filter": [ 14003 ], @@ -32142,6 +33296,7 @@ }, { "id": 19000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32163,7 +33318,7 @@ "key": "", "text": "" }, - "value": 60, + "value": 1, "filter": [ 14003 ], @@ -32171,6 +33326,7 @@ }, { "id": 20000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32200,6 +33356,7 @@ }, { "id": 20000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32229,6 +33386,7 @@ }, { "id": 20000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32258,6 +33416,7 @@ }, { "id": 20000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32287,6 +33446,7 @@ }, { "id": 20000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32316,6 +33476,7 @@ }, { "id": 20000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32345,6 +33506,7 @@ }, { "id": 20000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32374,6 +33536,7 @@ }, { "id": 20000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32403,6 +33566,7 @@ }, { "id": 20000009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32432,6 +33596,7 @@ }, { "id": 20000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32461,6 +33626,7 @@ }, { "id": 20000011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32490,6 +33656,7 @@ }, { "id": 20000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32519,6 +33686,7 @@ }, { "id": 20000013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32548,6 +33716,7 @@ }, { "id": 20000014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32577,6 +33746,7 @@ }, { "id": 20000015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32598,7 +33768,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 13004 ], @@ -32606,6 +33776,7 @@ }, { "id": 20000016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32627,7 +33798,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 13005 ], @@ -32635,6 +33806,7 @@ }, { "id": 20000017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32656,7 +33828,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 15002 ], @@ -32664,6 +33836,7 @@ }, { "id": 20000018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32685,7 +33858,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 24001 ], @@ -32693,6 +33866,7 @@ }, { "id": 20000019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32714,7 +33888,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 25001 ], @@ -32722,6 +33896,7 @@ }, { "id": 20000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32743,7 +33918,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 35001 ], @@ -32751,6 +33926,7 @@ }, { "id": 20000021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32772,7 +33948,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 44004 ], @@ -32780,6 +33956,7 @@ }, { "id": 20000022, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32801,7 +33978,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 44006 ], @@ -32809,6 +33986,7 @@ }, { "id": 20000023, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32830,7 +34008,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 45003 ], @@ -32838,6 +34016,7 @@ }, { "id": 20000024, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32859,7 +34038,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 34007 ], @@ -32867,6 +34046,7 @@ }, { "id": 20000025, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32888,7 +34068,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 45004 ], @@ -32896,6 +34076,7 @@ }, { "id": 20000026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32917,7 +34098,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 45001 ], @@ -32925,6 +34106,7 @@ }, { "id": 20000027, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32946,7 +34128,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 34006 ], @@ -32954,6 +34136,7 @@ }, { "id": 20000028, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -32975,7 +34158,7 @@ "key": "", "text": "" }, - "value": 20, + "value": 1, "filter": [ 35003 ], @@ -32983,6 +34166,7 @@ }, { "id": 21000001, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33013,6 +34197,7 @@ }, { "id": 21000002, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33043,6 +34228,7 @@ }, { "id": 21000003, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33073,6 +34259,7 @@ }, { "id": 21000004, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33103,6 +34290,7 @@ }, { "id": 21000005, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33133,6 +34321,7 @@ }, { "id": 21000006, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33163,6 +34352,7 @@ }, { "id": 21000007, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33193,6 +34383,7 @@ }, { "id": 21000008, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33223,6 +34414,7 @@ }, { "id": 21000009, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33253,6 +34445,7 @@ }, { "id": 21000010, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33283,6 +34476,7 @@ }, { "id": 21000011, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33313,6 +34507,7 @@ }, { "id": 21000012, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33343,6 +34538,7 @@ }, { "id": 21000013, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33373,6 +34569,7 @@ }, { "id": 21000014, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33403,6 +34600,7 @@ }, { "id": 21000015, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33433,6 +34631,7 @@ }, { "id": 21000016, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33463,6 +34662,7 @@ }, { "id": 21000017, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33493,6 +34693,7 @@ }, { "id": 21000018, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33523,6 +34724,7 @@ }, { "id": 21000019, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33553,6 +34755,7 @@ }, { "id": 21000020, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33583,6 +34786,7 @@ }, { "id": 21000021, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33613,6 +34817,7 @@ }, { "id": 21000022, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33643,6 +34848,7 @@ }, { "id": 21000023, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33673,6 +34879,7 @@ }, { "id": 21000024, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33703,6 +34910,7 @@ }, { "id": 21000025, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33733,6 +34941,7 @@ }, { "id": 21000026, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33763,6 +34972,7 @@ }, { "id": 21000027, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33793,6 +35003,7 @@ }, { "id": 21000028, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33823,6 +35034,7 @@ }, { "id": 21000029, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33853,6 +35065,7 @@ }, { "id": 21000030, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33883,6 +35096,7 @@ }, { "id": 21000031, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33913,6 +35127,7 @@ }, { "id": 21000032, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33943,6 +35158,7 @@ }, { "id": 21000033, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -33973,6 +35189,7 @@ }, { "id": 21000034, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34003,6 +35220,7 @@ }, { "id": 21000035, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34033,6 +35251,7 @@ }, { "id": 21000036, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34063,6 +35282,7 @@ }, { "id": 21000037, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34093,6 +35313,7 @@ }, { "id": 21000038, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34123,6 +35344,7 @@ }, { "id": 21000039, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34153,6 +35375,7 @@ }, { "id": 21000040, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34183,6 +35406,7 @@ }, { "id": 21000041, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34213,6 +35437,7 @@ }, { "id": 21000042, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34243,6 +35468,7 @@ }, { "id": 21000043, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34273,6 +35499,7 @@ }, { "id": 21000044, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34303,6 +35530,7 @@ }, { "id": 21000045, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34333,6 +35561,7 @@ }, { "id": 21000046, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34363,6 +35592,7 @@ }, { "id": 21000047, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34393,6 +35623,7 @@ }, { "id": 21000048, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34423,6 +35654,7 @@ }, { "id": 21000049, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34453,6 +35685,7 @@ }, { "id": 21000050, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34483,6 +35716,7 @@ }, { "id": 21000051, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34513,6 +35747,7 @@ }, { "id": 21000052, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34543,6 +35778,7 @@ }, { "id": 21000053, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34573,6 +35809,7 @@ }, { "id": 21000054, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34603,6 +35840,7 @@ }, { "id": 21000055, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34633,6 +35871,7 @@ }, { "id": 21000056, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34663,6 +35902,7 @@ }, { "id": 21000057, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34693,6 +35933,7 @@ }, { "id": 21000058, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34723,6 +35964,7 @@ }, { "id": 21000059, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34753,6 +35995,7 @@ }, { "id": 21000060, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34783,6 +36026,7 @@ }, { "id": 21000061, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34813,6 +36057,7 @@ }, { "id": 21000062, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34843,6 +36088,7 @@ }, { "id": 21000063, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34873,6 +36119,7 @@ }, { "id": 21000064, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34903,6 +36150,7 @@ }, { "id": 21000065, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34933,6 +36181,7 @@ }, { "id": 21000066, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34963,6 +36212,7 @@ }, { "id": 21000067, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -34993,6 +36243,7 @@ }, { "id": 21000068, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35023,6 +36274,7 @@ }, { "id": 21000069, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35053,6 +36305,7 @@ }, { "id": 21000070, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35083,6 +36336,7 @@ }, { "id": 21000071, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35113,6 +36367,7 @@ }, { "id": 21000072, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35143,6 +36398,7 @@ }, { "id": 21000073, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35173,6 +36429,7 @@ }, { "id": 21000074, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35203,6 +36460,7 @@ }, { "id": 21000075, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35233,6 +36491,7 @@ }, { "id": 21000076, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35263,6 +36522,7 @@ }, { "id": 21000077, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35293,6 +36553,7 @@ }, { "id": 21000078, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35323,6 +36584,7 @@ }, { "id": 21000079, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35353,6 +36615,7 @@ }, { "id": 21000080, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35383,6 +36646,7 @@ }, { "id": 21000081, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35413,6 +36677,7 @@ }, { "id": 21000082, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35443,6 +36708,7 @@ }, { "id": 21000083, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35473,6 +36739,7 @@ }, { "id": 21000084, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35503,6 +36770,7 @@ }, { "id": 21000085, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35533,6 +36801,7 @@ }, { "id": 21000086, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35563,6 +36832,7 @@ }, { "id": 21000087, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35593,6 +36863,7 @@ }, { "id": 21000088, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35623,6 +36894,7 @@ }, { "id": 21000089, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35653,6 +36925,7 @@ }, { "id": 21000090, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35683,6 +36956,7 @@ }, { "id": 21000091, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35713,6 +36987,7 @@ }, { "id": 21000092, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35743,6 +37018,7 @@ }, { "id": 21000093, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35773,6 +37049,7 @@ }, { "id": 21000094, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35803,6 +37080,7 @@ }, { "id": 21000095, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], @@ -35833,6 +37111,7 @@ }, { "id": 21000096, + "refresh": 0, "rtype": 1, "ctype": 1, "notify": [], diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json index 4e2b92a5e..ad088a483 100644 --- a/bin/json/game_buriedtype.json +++ b/bin/json/game_buriedtype.json @@ -1172,7 +1172,9 @@ { "id": 206, "insert": 2, - "filter": [] + "filter": [ + "eq" + ] }, { "id": 207, diff --git a/bin/json/game_expeditionboss.json b/bin/json/game_expeditionboss.json new file mode 100644 index 000000000..303cad2e4 --- /dev/null +++ b/bin/json/game_expeditionboss.json @@ -0,0 +1,457 @@ +[ + { + "boss_id": 50000001, + "boss_name": { + "key": "guild_guild_boss_boss_name_1", + "text": "希卡普" + }, + "boss_lv": 1, + "serial": 1, + "fighting": 1000, + "boss_img": 11009, + "kill_reward": 1004, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000002, + "boss_name": { + "key": "guild_guild_boss_boss_name_2", + "text": "波比" + }, + "boss_lv": 1, + "serial": 2, + "fighting": 1200, + "boss_img": 11009, + "kill_reward": 1005, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000003, + "boss_name": { + "key": "guild_guild_boss_boss_name_3", + "text": "阿宝" + }, + "boss_lv": 1, + "serial": 3, + "fighting": 1440, + "boss_img": 11009, + "kill_reward": 1006, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 50 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000004, + "boss_name": { + "key": "guild_guild_boss_boss_name_4", + "text": "希卡普" + }, + "boss_lv": 1, + "serial": 4, + "fighting": 1728, + "boss_img": 11009, + "kill_reward": 1007, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 51 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000005, + "boss_name": { + "key": "guild_guild_boss_boss_name_5", + "text": "波比" + }, + "boss_lv": 1, + "serial": 5, + "fighting": 2073, + "boss_img": 11009, + "kill_reward": 1008, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 52 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000006, + "boss_name": { + "key": "guild_guild_boss_boss_name_6", + "text": "阿宝" + }, + "boss_lv": 1, + "serial": 6, + "fighting": 2487, + "boss_img": 11009, + "kill_reward": 1009, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 53 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000007, + "boss_name": { + "key": "guild_guild_boss_boss_name_7", + "text": "希卡普" + }, + "boss_lv": 1, + "serial": 7, + "fighting": 2984, + "boss_img": 11009, + "kill_reward": 1010, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 54 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000008, + "boss_name": { + "key": "guild_guild_boss_boss_name_8", + "text": "波比" + }, + "boss_lv": 2, + "serial": 1, + "fighting": 3580, + "boss_img": 11009, + "kill_reward": 1011, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 55 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000009, + "boss_name": { + "key": "guild_guild_boss_boss_name_9", + "text": "阿宝" + }, + "boss_lv": 2, + "serial": 2, + "fighting": 4296, + "boss_img": 11009, + "kill_reward": 1012, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 56 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000010, + "boss_name": { + "key": "guild_guild_boss_boss_name_10", + "text": "希卡普" + }, + "boss_lv": 2, + "serial": 3, + "fighting": 5155, + "boss_img": 11009, + "kill_reward": 1013, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 57 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000011, + "boss_name": { + "key": "guild_guild_boss_boss_name_11", + "text": "波比" + }, + "boss_lv": 2, + "serial": 4, + "fighting": 6186, + "boss_img": 11009, + "kill_reward": 1014, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 58 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000012, + "boss_name": { + "key": "guild_guild_boss_boss_name_12", + "text": "阿宝" + }, + "boss_lv": 2, + "serial": 5, + "fighting": 7423, + "boss_img": 11009, + "kill_reward": 1015, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 59 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + }, + { + "boss_id": 50000013, + "boss_name": { + "key": "guild_guild_boss_boss_name_13", + "text": "希卡普" + }, + "boss_lv": 2, + "serial": 6, + "fighting": 8907, + "boss_img": 11009, + "kill_reward": 1016, + "fail_reward": [ + { + "a": "attr", + "t": "guildcoin", + "n": 60 + } + ], + "race": [ + 1, + 4 + ], + "job": [ + 2, + 6 + ], + "hid": [ + "25001" + ], + "color": [ + 4, + 2 + ], + "fight": 50 + } +] \ No newline at end of file diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index 420f633aa..4166ef3cc 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -791,16 +791,6 @@ }, { "id": 80, - "type": 4, - "text": { - "key": "GM_GM_text_120", - "text": "积分BOSS" - }, - "data": "11081", - "prefix": "" - }, - { - "id": 81, "type": 2, "text": { "key": "GM_GM_text_127", @@ -810,7 +800,7 @@ "prefix": "bingo:sociatybooslv,{0}" }, { - "id": 82, + "id": 81, "type": 2, "text": { "key": "GM_GM_text_128", @@ -820,7 +810,7 @@ "prefix": "bingo:create,{0}" }, { - "id": 83, + "id": 82, "type": 2, "text": { "key": "GM_GM_text_129", @@ -830,7 +820,7 @@ "prefix": "bingo:mainline,{0}" }, { - "id": 84, + "id": 83, "type": 2, "text": { "key": "GM_GM_text_130", @@ -840,7 +830,7 @@ "prefix": "" }, { - "id": 85, + "id": 84, "type": 2, "text": { "key": "GM_GM_text_131", @@ -850,7 +840,7 @@ "prefix": "bingo:moonlv,{0}" }, { - "id": 86, + "id": 85, "type": 2, "text": { "key": "GM_GM_text_132", @@ -860,7 +850,7 @@ "prefix": "" }, { - "id": 87, + "id": 86, "type": 1, "text": { "key": "GM_GM_text_133", @@ -868,5 +858,15 @@ }, "data": "7,1", "prefix": "bingo:bagtype,{0}" + }, + { + "id": 87, + "type": 4, + "text": { + "key": "GM_GM_text_120", + "text": "积分BOSS" + }, + "data": "11081", + "prefix": "" } ] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index b73754567..b20f1fe15 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -39925,7 +39925,7 @@ "progress": 0, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401000, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40006,7 +40006,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401010, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40074,8 +40074,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_260", + "text": "呃呃呃，好冷啊……！！" }, "animation": [], "prewarbubbletext": { @@ -40087,7 +40087,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401020, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40155,8 +40155,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_261", + "text": "吼吼吼——" }, "animation": [], "prewarbubbletext": { @@ -40168,7 +40168,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401050, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40236,8 +40236,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_262", + "text": "哦，我的奥丁神啊！！" }, "animation": [], "prewarbubbletext": { @@ -40249,7 +40249,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401060, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40317,8 +40317,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_263", + "text": "小嗝嗝，快来帮忙。" }, "animation": [], "prewarbubbletext": { @@ -40330,7 +40330,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401070, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40446,8 +40446,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_264", + "text": "好端端的，龙群怎么会感染瘟疫？" }, "animation": [], "prewarbubbletext": { @@ -40459,8 +40459,8 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 401090, + "afterstoryid": 401100, "maingroupName": { "key": "", "text": "" @@ -40704,8 +40704,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_266", + "text": "事关博克岛生存，必须谨慎处理。" }, "animation": [], "prewarbubbletext": { @@ -40717,7 +40717,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401110, "afterstoryid": 0, "maingroupName": { "key": "", @@ -40962,8 +40962,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_268", + "text": "别打了，大家都冷静一下！" }, "animation": [], "prewarbubbletext": { @@ -40975,7 +40975,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401120, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41045,8 +41045,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_269", + "text": "这不是你的错，小嗝嗝。" }, "animation": [], "prewarbubbletext": { @@ -41058,8 +41058,8 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 401140, + "afterstoryid": 401150, "maingroupName": { "key": "", "text": "" @@ -41174,8 +41174,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_270", + "text": "终于又回到了这里。" }, "animation": [], "prewarbubbletext": { @@ -41187,7 +41187,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401160, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41255,8 +41255,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_271", + "text": "希卡普，我的儿子！！" }, "animation": [], "prewarbubbletext": { @@ -41268,7 +41268,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401170, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41349,7 +41349,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401180, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41420,8 +41420,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_273", + "text": "以爱回应忠诚，以荣誉回应英勇。" }, "animation": [], "prewarbubbletext": { @@ -41433,7 +41433,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401190, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41507,8 +41507,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_274", + "text": "是奥拉夫暴风雪！！" }, "animation": [], "prewarbubbletext": { @@ -41520,7 +41520,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401200, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41604,7 +41604,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401210, "afterstoryid": 0, "maingroupName": { "key": "", @@ -41691,8 +41691,8 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 401220, + "afterstoryid": 401230, "maingroupName": { "key": "", "text": "" @@ -41807,8 +41807,8 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "", - "text": "" + "key": "main_stage_bubbletext_277", + "text": "怎么办怎么办，暴风雪来了！" }, "animation": [], "prewarbubbletext": { @@ -41820,7 +41820,7 @@ "progress": 1, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 401250, "afterstoryid": 0, "maingroupName": { "key": "", diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 7e193f44f..0ccf78645 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -244964,7 +244964,7 @@ ], "lv": 20, "hppro": 10, - "atkpro": 4, + "atkpro": 2, "defpro": 10, "skill1": 1, "skill2": 1, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index aa8c11312..c59d470cc 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -24831,7 +24831,8 @@ "Id": [ 255007211, 255007212, - 255007213 + 255007213, + 255007315 ] }, "passSkill": [], diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go index 59d1c336d..d94c0225b 100644 --- a/modules/plunder/api_pvpchallengeover.go +++ b/modules/plunder/api_pvpchallengeover.go @@ -30,6 +30,7 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder users []string lock *redis.RedisMutex changeShip map[string]*pb.ShipData // 数据变化通知 + atno []*pb.UserAtno // 打赢奖励 ) if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil { return @@ -99,17 +100,32 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder return } land.Ship[req.Oid].Status = 3 + if errdata, atno = this.module.DispenseAtno(session, conf.Keepreward, true); errdata != nil { + return + } + if conf.Numitem.N > 0 { + atno = append(atno, &pb.UserAtno{ + A: conf.Numitem.A, + T: conf.Numitem.T, + N: conf.Numitem.N, + }) + list.Score += conf.Numitem.N + } // 修改状态 changeShip[req.Oid] = land.Ship[req.Oid] this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{ "ship": land.Ship, }) + + this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{ + "score": list.Score, + }) // 通知大家 this.module.SendMsgToUsers(string(this.module.GetType()), "change", &pb.PlunderChangePush{ Ship: changeShip, }, users...) session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ - Atno: []*pb.UserAtno{}, + Atno: atno, }) return diff --git a/modules/plunder/api_reach.go b/modules/plunder/api_reach.go index 8e3c96ff1..9615a4eaf 100644 --- a/modules/plunder/api_reach.go +++ b/modules/plunder/api_reach.go @@ -4,6 +4,8 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/redis" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" ) // 参数校验 @@ -17,14 +19,20 @@ func (this *apiComp) ReachCheck(session comm.IUserSession, req *pb.PlunderReachR return } -// 船准备出发 +// 船到达 领奖 func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) (errdata *pb.ErrorData) { var ( err error list *pb.DBPlunder land *pb.DBPlunderLand // 岛屿数据 //changeShip map[string]*pb.ShipData // 变化的信息 - lock *redis.RedisMutex + lock *redis.RedisMutex + bPlunder bool // 到达检测 是否被掠夺 + cid int32 + conf *cfg.GamePlunderData + res []*cfg.Gameatn // 奖励 + bExReward bool // 是否是高级运输 + atno []*pb.UserAtno ) //changeShip = make(map[string]*pb.ShipData, 0) if errdata = this.ReachCheck(session, req); errdata != nil { @@ -62,17 +70,61 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) ( } return } else { + if land.Ship[oid].Line.Etime >= configure.Now().Unix() { // 还没到时间 船没到达 + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + if land.Ship[oid].Line.Itype != 0 { + bExReward = true + if land.Ship[oid].Status == 3 { // 高级船 + bPlunder = true + } + } for _, v := range list.Line { if v.Oid == oid { v.Oid = "" } } + cid = land.Ship[oid].Line.Cid delete(land.Ship, oid) } } - + // 配置校验 + if conf, err = this.module.configure.getGamePlunderDataById(cid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if !bExReward { // 普通奖励 + res = append(res, conf.Keepreward...) + list.Score += conf.Numitem.N + } else { + res = append(res, conf.Exreward...) // 高级奖励 + } + if !bPlunder { // 掠夺成功 + res = append(res, conf.Keepreward...) + } + if errdata, atno = this.module.DispenseAtno(session, res, true); errdata != nil { + return + } + if bExReward { + if conf.Numitem.N > 0 { + atno = append(atno, &pb.UserAtno{ + A: conf.Numitem.A, + T: conf.Numitem.T, + N: conf.Numitem.N, + }) + } + } this.module.modelPlunder.changePlunderData(session.GetUserId(), map[string]interface{}{ - "line": list.Line, + "line": list.Line, + "score": list.Score, }) this.module.modelLand.changePlunderLandData(land.Id, map[string]interface{}{ "ship": land.Ship, @@ -80,6 +132,7 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) ( session.SendMsg(string(this.module.GetType()), "reach", &pb.PlunderReachResp{ Line: list.Line, Ship: land.Ship, + Atno: atno, }) return } diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go index b51d62a69..2e1ec62ec 100644 --- a/pb/battle_msg.pb.go +++ b/pb/battle_msg.pb.go @@ -1080,8 +1080,8 @@ type BattleReport struct { Completetask []int32 `protobuf:"varint,6,rep,packed,name=completetask,proto3" json:"completetask"` //完成任务 Death int32 `protobuf:"varint,7,opt,name=death,proto3" json:"death"` // 死亡人数 Round int32 `protobuf:"varint,8,opt,name=round,proto3" json:"round"` // 回合数 - Harm int32 `protobuf:"varint,9,opt,name=harm,proto3" json:"harm"` //伤害积分 - Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` //评分 + Score int32 `protobuf:"varint,9,opt,name=score,proto3" json:"score"` //积分 + Grade int32 `protobuf:"varint,10,opt,name=grade,proto3" json:"grade"` //评级 Alive []*BattleRole `protobuf:"bytes,11,rep,name=alive,proto3" json:"alive"` //存活列表 } @@ -1173,16 +1173,16 @@ func (x *BattleReport) GetRound() int32 { return 0 } -func (x *BattleReport) GetHarm() int32 { +func (x *BattleReport) GetScore() int32 { if x != nil { - return x.Harm + return x.Score } return 0 } -func (x *BattleReport) GetScore() int32 { +func (x *BattleReport) GetGrade() int32 { if x != nil { - return x.Score + return x.Grade } return 0 } @@ -2330,7 +2330,7 @@ var file_battle_battle_msg_proto_rawDesc = []byte{ 0x07, 0x63, 0x6d, 0x64, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x22, 0xc8, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x61, 0x6c, 0x75, 0x65, 0x22, 0xca, 0x02, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x6f, 0x73, 0x74, 0x74, 0x69, @@ -2346,108 +2346,108 @@ var file_battle_battle_msg_proto_rawDesc = []byte{ 0x74, 0x65, 0x74, 0x61, 0x73, 0x6b, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x64, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x75, - 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x04, 0x68, 0x61, 0x72, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, - 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x21, 0x0a, 0x05, - 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x22, - 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x28, 0x0a, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, - 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, 0x18, 0x0a, - 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, - 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2f, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, - 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x0d, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x72, 0x65, 0x70, - 0x6f, 0x72, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x07, 0x72, 0x65, 0x70, 0x6f, 0x72, - 0x74, 0x73, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, - 0x6e, 0x66, 0x6f, 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, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, 0x74, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 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, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x52, - 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, - 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 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, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, - 0x6e, 0x43, 0x6d, 0x64, 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, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, - 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x43, - 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 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, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, - 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x16, - 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, - 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, - 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, - 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, - 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, + 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x12, 0x21, + 0x0a, 0x05, 0x61, 0x6c, 0x69, 0x76, 0x65, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x61, 0x6c, 0x69, 0x76, + 0x65, 0x22, 0x66, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x70, 0x63, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x04, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, + 0x28, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x41, 0x6e, 0x79, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x2e, 0x0a, 0x12, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x12, + 0x18, 0x0a, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x07, 0x69, 0x73, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x22, 0x2f, 0x0a, 0x0c, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x0d, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x52, 0x75, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x27, 0x0a, 0x07, 0x72, + 0x65, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x07, 0x72, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x73, 0x22, 0x2e, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, + 0x74, 0x49, 0x6e, 0x66, 0x6f, 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, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x22, 0x42, - 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, 0x65, 0x52, - 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x12, - 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, - 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, - 0x65, 0x64, 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, 0x22, - 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x49, - 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, + 0x6c, 0x65, 0x69, 0x64, 0x22, 0x55, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x47, 0x65, + 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 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, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x38, 0x0a, 0x15, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 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, 0x22, 0x5c, 0x0a, 0x0e, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x49, 0x6e, 0x43, 0x6d, 0x64, 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, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, + 0x64, 0x52, 0x02, 0x69, 0x6e, 0x22, 0x61, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, + 0x6e, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 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, 0x1a, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x02, 0x69, 0x6e, + 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x22, 0x4c, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x4f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, + 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x03, 0x63, 0x6d, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, - 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, 0x69, 0x6e, - 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, - 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e, 0x65, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69, 0x42, 0x75, - 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, 0x12, 0x16, - 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, - 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, - 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, - 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, - 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x42, - 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, - 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, - 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01, 0x0a, 0x13, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, - 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, 0x6c, 0x65, - 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, 0x65, 0x73, - 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2e, 0x0a, 0x09, - 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x52, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x06, 0x5a, 0x04, - 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x52, 0x03, 0x63, 0x6d, 0x64, 0x22, 0x48, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, + 0x22, 0x42, 0x0a, 0x10, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x63, 0x65, 0x64, + 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x69, 0x64, + 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, + 0x73, 0x69, 0x64, 0x65, 0x22, 0x2b, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, + 0x6e, 0x63, 0x65, 0x64, 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, 0x22, 0x82, 0x01, 0x0a, 0x0f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, + 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x24, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, + 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x43, 0x6d, 0x64, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x12, 0x28, 0x0a, 0x09, + 0x69, 0x6e, 0x70, 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, 0x52, 0x09, 0x69, 0x6e, 0x70, + 0x75, 0x74, 0x43, 0x6d, 0x64, 0x73, 0x22, 0xf2, 0x01, 0x0a, 0x0f, 0x53, 0x74, 0x72, 0x6f, 0x6e, + 0x65, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x06, 0x64, 0x69, + 0x42, 0x75, 0x66, 0x66, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x64, 0x69, 0x42, 0x75, 0x66, 0x66, + 0x12, 0x16, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, + 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, + 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, + 0x64, 0x70, 0x6f, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, + 0x70, 0x6f, 0x73, 0x12, 0x21, 0x0a, 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, + 0x05, 0x42, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, + 0x52, 0x05, 0x50, 0x74, 0x79, 0x70, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x22, 0xc0, 0x01, 0x0a, 0x13, + 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x56, 0x45, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, + 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x75, + 0x6c, 0x65, 0x73, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x75, 0x6c, + 0x65, 0x73, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, + 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x2e, + 0x0a, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x65, 0x66, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x42, 0x06, + 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/battle_struct.pb.go b/pb/battle_struct.pb.go index bbb50b9b1..5cf2d8144 100644 --- a/pb/battle_struct.pb.go +++ b/pb/battle_struct.pb.go @@ -442,9 +442,12 @@ type ComEndFight struct { FightId string `protobuf:"bytes,1,opt,name=fightId,proto3" json:"fightId"` WinSide int32 `protobuf:"varint,2,opt,name=winSide,proto3" json:"winSide"` - TotalRound int32 `protobuf:"varint,3,opt,name=totalRound,proto3" json:"totalRound"` //经历回合 - RedDeath int32 `protobuf:"varint,4,opt,name=RedDeath,proto3" json:"RedDeath"` //红方死亡统计 - BuleDeath int32 `protobuf:"varint,5,opt,name=buleDeath,proto3" json:"buleDeath"` //蓝方死亡统计 + GiveUp bool `protobuf:"varint,3,opt,name=giveUp,proto3" json:"giveUp"` //是否主动认输的 + TotalRound int32 `protobuf:"varint,4,opt,name=totalRound,proto3" json:"totalRound"` //经历回合 + RedDeath int32 `protobuf:"varint,5,opt,name=RedDeath,proto3" json:"RedDeath"` //红方死亡统计 + BuleDeath int32 `protobuf:"varint,6,opt,name=buleDeath,proto3" json:"buleDeath"` //蓝方死亡统计 + Score int32 `protobuf:"varint,7,opt,name=score,proto3" json:"score"` //战斗获得了多少积分 + Grade int32 `protobuf:"varint,8,opt,name=grade,proto3" json:"grade"` //获得到了评分档次 } func (x *ComEndFight) Reset() { @@ -493,6 +496,13 @@ func (x *ComEndFight) GetWinSide() int32 { return 0 } +func (x *ComEndFight) GetGiveUp() bool { + if x != nil { + return x.GiveUp + } + return false +} + func (x *ComEndFight) GetTotalRound() int32 { if x != nil { return x.TotalRound @@ -514,6 +524,20 @@ func (x *ComEndFight) GetBuleDeath() int32 { return 0 } +func (x *ComEndFight) GetScore() int32 { + if x != nil { + return x.Score + } + return 0 +} + +func (x *ComEndFight) GetGrade() int32 { + if x != nil { + return x.Grade + } + return 0 +} + //技能信息 type ComSkillInfo struct { state protoimpl.MessageState @@ -2112,6 +2136,93 @@ func (x *ComTriggerPassive) GetId() int32 { return 0 } +type ComUpdateScore struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GroupId int32 `protobuf:"varint,1,opt,name=groupId,proto3" json:"groupId"` //评分组ID + Grade int32 `protobuf:"varint,2,opt,name=grade,proto3" json:"grade"` //当前积分对应的档次 + Socre int32 `protobuf:"varint,3,opt,name=socre,proto3" json:"socre"` //积分 + ExtraSocre int32 `protobuf:"varint,4,opt,name=extraSocre,proto3" json:"extraSocre"` //额外积分 + Rate int32 `protobuf:"varint,5,opt,name=rate,proto3" json:"rate"` //当前积分倍率 + Stage int32 `protobuf:"varint,6,opt,name=stage,proto3" json:"stage"` //为0不显示 +} + +func (x *ComUpdateScore) Reset() { + *x = ComUpdateScore{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_struct_proto_msgTypes[30] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ComUpdateScore) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ComUpdateScore) ProtoMessage() {} + +func (x *ComUpdateScore) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_struct_proto_msgTypes[30] + 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 ComUpdateScore.ProtoReflect.Descriptor instead. +func (*ComUpdateScore) Descriptor() ([]byte, []int) { + return file_battle_battle_struct_proto_rawDescGZIP(), []int{30} +} + +func (x *ComUpdateScore) GetGroupId() int32 { + if x != nil { + return x.GroupId + } + return 0 +} + +func (x *ComUpdateScore) GetGrade() int32 { + if x != nil { + return x.Grade + } + return 0 +} + +func (x *ComUpdateScore) GetSocre() int32 { + if x != nil { + return x.Socre + } + return 0 +} + +func (x *ComUpdateScore) GetExtraSocre() int32 { + if x != nil { + return x.ExtraSocre + } + return 0 +} + +func (x *ComUpdateScore) GetRate() int32 { + if x != nil { + return x.Rate + } + return 0 +} + +func (x *ComUpdateScore) GetStage() int32 { + if x != nil { + return x.Stage + } + return 0 +} + var File_battle_battle_struct_proto protoreflect.FileDescriptor var file_battle_battle_struct_proto_rawDesc = []byte{ @@ -2146,189 +2257,204 @@ var file_battle_battle_struct_proto_rawDesc = []byte{ 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x1f, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x9b, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x45, + 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0xdf, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x45, 0x6e, 0x64, 0x46, 0x69, 0x67, 0x68, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x74, - 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, - 0x65, 0x64, 0x44, 0x65, 0x61, 0x74, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, - 0x65, 0x64, 0x44, 0x65, 0x61, 0x74, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x44, - 0x65, 0x61, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, - 0x44, 0x65, 0x61, 0x74, 0x68, 0x22, 0x98, 0x01, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, - 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, - 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x02, 0x63, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, - 0x66, 0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, - 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69, - 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x43, 0x61, 0x6e, 0x45, 0x6d, 0x69, 0x74, - 0x22, 0x9d, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72, 0x74, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, - 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, - 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, - 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x61, 0x6e, - 0x41, 0x74, 0x6b, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, - 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, - 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, - 0x22, 0x53, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x43, 0x44, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, - 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, - 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, - 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x70, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x43, - 0x6f, 0x6d, 0x57, 0x61, 0x69, 0x74, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, - 0x61, 0x75, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, - 0x6c, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, - 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, - 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, - 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0xc0, 0x01, 0x0a, 0x0b, 0x43, 0x6f, 0x6d, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 0x41, 0x74, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, - 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, - 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, - 0x72, 0x67, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x12, 0x2b, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66, - 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x12, - 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x7e, 0x0a, 0x10, 0x43, 0x6f, 0x6d, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x12, 0x18, 0x0a, - 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, - 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, - 0x67, 0x65, 0x74, 0x12, 0x24, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x05, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6d, 0x64, - 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x9a, 0x01, 0x0a, 0x0e, 0x43, 0x6f, - 0x6d, 0x4d, 0x6f, 0x6e, 0x64, 0x69, 0x66, 0x79, 0x42, 0x75, 0x66, 0x66, 0x12, 0x0e, 0x0a, 0x02, - 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03, - 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x67, 0x69, 0x64, 0x12, 0x16, - 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, - 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, - 0x70, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6f, 0x76, 0x65, 0x72, - 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x18, 0x0a, 0x07, - 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0x40, 0x0a, 0x0a, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x62, - 0x69, 0x72, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x22, 0x8a, 0x02, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, - 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, - 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, - 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, - 0x12, 0x14, 0x0a, 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d, - 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x69, 0x64, 0x65, 0x44, 0x6d, 0x67, - 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x02, 0x52, 0x03, 0x6e, - 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, 0x48, 0x70, 0x12, 0x10, - 0x0a, 0x03, 0x64, 0x6d, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x64, 0x6d, 0x67, - 0x12, 0x23, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, - 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, - 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x54, 0x65, 0x61, 0x63, - 0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x34, 0x0a, 0x08, 0x43, - 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x49, - 0x64, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x47, 0x75, 0x69, 0x64, 0x65, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, - 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, - 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x6c, 0x61, - 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x70, 0x6c, 0x61, - 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, - 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x4b, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x50, - 0x6c, 0x61, 0x79, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x66, 0x66, - 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x65, - 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x6e, 0x6f, 0x64, - 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6e, 0x6f, 0x64, - 0x65, 0x50, 0x61, 0x74, 0x68, 0x22, 0x2c, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x45, 0x6d, 0x69, 0x74, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x65, 0x73, - 0x65, 0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x65, 0x73, 0x65, - 0x72, 0x76, 0x65, 0x22, 0x44, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, - 0x54, 0x69, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, - 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, - 0x43, 0x68, 0x61, 0x69, 0x6e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x72, - 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, - 0x73, 0x22, 0x53, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x03, 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, - 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, - 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x42, 0x75, 0x66, - 0x66, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, - 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, - 0x64, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x53, 0x63, - 0x65, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x22, 0x4e, 0x0a, 0x0f, 0x43, 0x6f, 0x6d, - 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x0e, 0x0a, 0x02, - 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x2b, 0x0a, 0x09, + 0x28, 0x05, 0x52, 0x07, 0x77, 0x69, 0x6e, 0x53, 0x69, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x67, + 0x69, 0x76, 0x65, 0x55, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x67, 0x69, 0x76, + 0x65, 0x55, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x6f, 0x75, 0x6e, + 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x52, 0x6f, + 0x75, 0x6e, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x52, 0x65, 0x64, 0x44, 0x65, 0x61, 0x74, 0x68, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x52, 0x65, 0x64, 0x44, 0x65, 0x61, 0x74, 0x68, 0x12, + 0x1c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x44, 0x65, 0x61, 0x74, 0x68, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x44, 0x65, 0x61, 0x74, 0x68, 0x12, 0x14, 0x0a, + 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, + 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, 0x65, 0x22, 0x98, 0x01, 0x0a, 0x0c, 0x43, 0x6f, + 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, + 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, + 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x61, 0x78, 0x43, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x63, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x68, + 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, + 0x73, 0x68, 0x6f, 0x77, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x61, + 0x6e, 0x45, 0x6d, 0x69, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x43, 0x61, 0x6e, + 0x45, 0x6d, 0x69, 0x74, 0x22, 0x9d, 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x61, 0x72, + 0x74, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, + 0x67, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x06, 0x63, 0x61, 0x6e, 0x41, 0x74, 0x6b, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, + 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, + 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x53, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, + 0x43, 0x44, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x09, - 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x66, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, - 0x45, 0x78, 0x74, 0x72, 0x61, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, - 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, - 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, - 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, - 0x74, 0x22, 0x37, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x50, - 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45, - 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, - 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, - 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, - 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, - 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, - 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, - 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, - 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, - 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, - 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, - 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, - 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, - 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, - 0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, - 0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, - 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, - 0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, - 0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, - 0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, - 0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, - 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, - 0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, - 0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, - 0x72, 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x23, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, + 0x53, 0x74, 0x6f, 0x70, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, + 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x22, 0x89, + 0x01, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x57, 0x61, 0x69, 0x74, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x53, + 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x04, 0x61, 0x75, 0x74, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, + 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x1a, + 0x0a, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x63, 0x75, 0x72, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0xc0, 0x01, 0x0a, 0x0b, 0x43, + 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x74, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, + 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x18, + 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, + 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x16, + 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x2b, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, + 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, 0x6b, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, + 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x7e, 0x0a, + 0x10, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x41, 0x66, 0x74, 0x65, 0x72, 0x41, 0x74, + 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x66, + 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, + 0x16, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, + 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x24, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, + 0x73, 0x74, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x43, 0x6d, 0x64, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x9a, 0x01, + 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x6e, 0x64, 0x69, 0x66, 0x79, 0x42, 0x75, 0x66, 0x66, + 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, + 0x12, 0x10, 0x0a, 0x03, 0x67, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x67, + 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x76, + 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x6f, 0x76, 0x65, 0x72, 0x6c, 0x61, 0x70, 0x4e, 0x75, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, + 0x72, 0x61, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x22, 0x40, 0x0a, 0x0a, 0x43, 0x6f, + 0x6d, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, + 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x22, 0x8a, 0x02, 0x0a, + 0x0f, 0x43, 0x6f, 0x6d, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, + 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, + 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, + 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x05, 0x62, 0x61, 0x6f, 0x6a, 0x69, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, + 0x64, 0x65, 0x44, 0x6d, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x69, 0x64, + 0x65, 0x44, 0x6d, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x54, 0x79, + 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x02, 0x52, 0x03, 0x6e, 0x75, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x68, 0x70, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x68, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6d, 0x68, 0x70, 0x18, + 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6d, 0x68, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, + 0x61, 0x6c, 0x48, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x73, 0x65, 0x61, 0x6c, + 0x48, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x6d, 0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x03, 0x64, 0x6d, 0x67, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x69, 0x70, 0x73, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x54, + 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x69, 0x70, 0x73, 0x22, 0x34, 0x0a, 0x0c, 0x43, 0x6f, 0x6d, + 0x54, 0x65, 0x61, 0x63, 0x68, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, + 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x53, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, + 0x74, 0x6f, 0x72, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x74, + 0x6f, 0x72, 0x79, 0x49, 0x64, 0x22, 0x34, 0x0a, 0x08, 0x43, 0x6f, 0x6d, 0x47, 0x75, 0x69, 0x64, + 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, + 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x67, 0x75, 0x69, 0x64, 0x65, 0x49, 0x64, 0x22, 0x7f, 0x0a, 0x0e, 0x43, + 0x6f, 0x6d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x12, 0x0a, + 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x69, 0x64, + 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x65, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x69, 0x64, 0x12, 0x1a, 0x0a, + 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x08, 0x70, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x72, 0x6f, 0x6c, + 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x4b, 0x0a, 0x0d, + 0x43, 0x6f, 0x6d, 0x50, 0x6c, 0x61, 0x79, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x1e, 0x0a, + 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, + 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x61, 0x74, 0x68, 0x22, 0x2c, 0x0a, 0x10, 0x43, 0x6f, 0x6d, + 0x45, 0x6d, 0x69, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x64, 0x6f, 0x77, 0x6e, 0x12, 0x18, 0x0a, + 0x07, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x22, 0x44, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x45, 0x66, + 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, 0x12, 0x23, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0f, 0x2e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, + 0x69, 0x70, 0x73, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, + 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, 0x22, 0x26, 0x0a, + 0x0e, 0x43, 0x6f, 0x6d, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, + 0x14, 0x0a, 0x05, 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, + 0x72, 0x6f, 0x6c, 0x65, 0x73, 0x22, 0x53, 0x0a, 0x0d, 0x43, 0x6f, 0x6d, 0x53, 0x68, 0x69, 0x65, + 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, + 0x0a, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x08, 0x63, 0x75, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x39, 0x0a, 0x0d, 0x43, 0x6f, + 0x6d, 0x42, 0x75, 0x66, 0x66, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x72, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, + 0x06, 0x62, 0x75, 0x66, 0x66, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x62, + 0x75, 0x66, 0x66, 0x49, 0x64, 0x22, 0x26, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x53, 0x77, 0x69, 0x74, + 0x63, 0x68, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x63, 0x65, 0x6e, 0x65, 0x22, 0x4e, 0x0a, + 0x0f, 0x43, 0x6f, 0x6d, 0x52, 0x65, 0x70, 0x6c, 0x61, 0x63, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, + 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x74, 0x6f, + 0x12, 0x2b, 0x0a, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x6d, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, + 0x66, 0x6f, 0x52, 0x09, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x66, 0x0a, + 0x0e, 0x43, 0x6f, 0x6d, 0x45, 0x78, 0x74, 0x72, 0x61, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, + 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, + 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x6e, 0x69, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0x37, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x54, 0x72, 0x69, 0x67, + 0x67, 0x65, 0x72, 0x50, 0x61, 0x73, 0x73, 0x69, 0x76, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, + 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, + 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0xa0, + 0x01, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x63, 0x6f, 0x72, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x67, + 0x72, 0x61, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x61, 0x64, + 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x73, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x65, 0x78, 0x74, 0x72, 0x61, + 0x53, 0x6f, 0x63, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x65, 0x78, 0x74, + 0x72, 0x61, 0x53, 0x6f, 0x63, 0x72, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, + 0x74, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x67, + 0x65, 0x2a, 0x93, 0x03, 0x0a, 0x0e, 0x45, 0x66, 0x66, 0x65, 0x63, 0x74, 0x54, 0x69, 0x70, 0x73, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x45, 0x66, 0x66, 0x5f, 0x53, 0x75, 0x63, 0x63, + 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x53, 0x75, 0x63, + 0x63, 0x65, 0x73, 0x73, 0x10, 0x01, 0x12, 0x0c, 0x0a, 0x08, 0x49, 0x6d, 0x6d, 0x75, 0x6e, 0x69, + 0x74, 0x79, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x52, 0x65, 0x73, 0x69, 0x73, 0x74, 0x10, 0x03, + 0x12, 0x0c, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x04, 0x12, 0x0f, + 0x0a, 0x0b, 0x4e, 0x6f, 0x74, 0x5f, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x10, 0x05, 0x12, + 0x0e, 0x0a, 0x0a, 0x4e, 0x6f, 0x74, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x06, 0x12, + 0x10, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, + 0x07, 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x70, 0x65, 0x72, 0x73, 0x65, 0x10, 0x08, 0x12, + 0x0e, 0x0a, 0x0a, 0x47, 0x61, 0x69, 0x6e, 0x5f, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0x09, 0x12, + 0x0f, 0x0a, 0x0b, 0x41, 0x64, 0x64, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, 0x0a, + 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x75, 0x62, 0x5f, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x65, 0x10, + 0x0b, 0x12, 0x0c, 0x0a, 0x08, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x6f, 0x66, 0x66, 0x10, 0x0c, 0x12, + 0x0a, 0x0a, 0x06, 0x55, 0x6e, 0x64, 0x65, 0x61, 0x64, 0x10, 0x0d, 0x12, 0x0c, 0x0a, 0x08, 0x50, + 0x6f, 0x69, 0x73, 0x6f, 0x6e, 0x65, 0x64, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x42, 0x6c, 0x65, + 0x65, 0x64, 0x10, 0x0f, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, + 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x42, 0x65, 0x61, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x10, 0x11, + 0x12, 0x0c, 0x0a, 0x08, 0x44, 0x69, 0x73, 0x65, 0x61, 0x73, 0x65, 0x64, 0x10, 0x12, 0x12, 0x0c, + 0x0a, 0x08, 0x4c, 0x6f, 0x73, 0x74, 0x48, 0x6f, 0x6c, 0x64, 0x10, 0x13, 0x12, 0x0e, 0x0a, 0x0a, + 0x55, 0x6e, 0x64, 0x65, 0x72, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x10, 0x14, 0x12, 0x11, 0x0a, 0x0d, + 0x49, 0x6e, 0x76, 0x69, 0x6e, 0x63, 0x69, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x10, 0x15, 0x12, + 0x0d, 0x0a, 0x09, 0x53, 0x74, 0x65, 0x61, 0x6c, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x16, 0x12, 0x0f, + 0x0a, 0x0b, 0x53, 0x68, 0x69, 0x66, 0x74, 0x44, 0x65, 0x62, 0x75, 0x66, 0x66, 0x10, 0x17, 0x12, + 0x0b, 0x0a, 0x07, 0x52, 0x65, 0x62, 0x69, 0x72, 0x74, 0x68, 0x10, 0x18, 0x12, 0x09, 0x0a, 0x05, + 0x42, 0x72, 0x6f, 0x69, 0x6c, 0x10, 0x19, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2344,7 +2470,7 @@ func file_battle_battle_struct_proto_rawDescGZIP() []byte { } var file_battle_battle_struct_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 30) +var file_battle_battle_struct_proto_msgTypes = make([]protoimpl.MessageInfo, 31) var file_battle_battle_struct_proto_goTypes = []interface{}{ (EffectTipsType)(0), // 0: EffectTipsType (*DBPlayerBattleFormt)(nil), // 1: DBPlayerBattleFormt @@ -2377,19 +2503,20 @@ var file_battle_battle_struct_proto_goTypes = []interface{}{ (*ComReplaceSkill)(nil), // 28: ComReplaceSkill (*ComExtraEffect)(nil), // 29: ComExtraEffect (*ComTriggerPassive)(nil), // 30: ComTriggerPassive - (*DBHero)(nil), // 31: DBHero - (*BattleRole)(nil), // 32: BattleRole - (*BattleCmd)(nil), // 33: BattleCmd + (*ComUpdateScore)(nil), // 31: ComUpdateScore + (*DBHero)(nil), // 32: DBHero + (*BattleRole)(nil), // 33: BattleRole + (*BattleCmd)(nil), // 34: BattleCmd } var file_battle_battle_struct_proto_depIdxs = []int32{ - 31, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero - 32, // 1: ComInitFight.roles:type_name -> BattleRole + 32, // 0: DBPlayerBattleFormt.formt:type_name -> DBHero + 33, // 1: ComInitFight.roles:type_name -> BattleRole 7, // 2: ComStartAction.skillInfo:type_name -> ComSkillInfo 7, // 3: ComSkillCDAction.skillInfo:type_name -> ComSkillInfo 13, // 4: ComSkillAtk.comList:type_name -> ComSkillAfterAtk - 33, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd + 34, // 5: ComSkillAfterAtk.comList:type_name -> BattleCmd 0, // 6: ComModifyHealth.tips:type_name -> EffectTipsType - 32, // 7: ComCreateRoles.roles:type_name -> BattleRole + 33, // 7: ComCreateRoles.roles:type_name -> BattleRole 0, // 8: ComEffectTips.type:type_name -> EffectTipsType 7, // 9: ComReplaceSkill.skillInfo:type_name -> ComSkillInfo 10, // [10:10] is the sub-list for method output_type @@ -2768,6 +2895,18 @@ func file_battle_battle_struct_proto_init() { return nil } } + file_battle_battle_struct_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ComUpdateScore); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -2775,7 +2914,7 @@ func file_battle_battle_struct_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_struct_proto_rawDesc, NumEnums: 1, - NumMessages: 30, + NumMessages: 31, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/plunder_db.pb.go b/pb/plunder_db.pb.go index c6ba5bfcc..a0873ff13 100644 --- a/pb/plunder_db.pb.go +++ b/pb/plunder_db.pb.go @@ -26,17 +26,18 @@ type DBPlunder struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // - Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid - Line []*TransportLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列 - Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数 - Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表 - Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表 - Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数 - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用 - Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分 - Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // + Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid + Line []*TransportLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列 + Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数 + Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表 + Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表 + Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数 + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用 + Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分 + Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间 + Plunderexp int32 `protobuf:"varint,12,opt,name=plunderexp,proto3" json:"plunderexp"` // 积分 排行用 } func (x *DBPlunder) Reset() { @@ -148,6 +149,13 @@ func (x *DBPlunder) GetEtime() int64 { return 0 } +func (x *DBPlunder) GetPlunderexp() int32 { + if x != nil { + return x.Plunderexp + } + return 0 +} + type TransportLine struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -373,7 +381,8 @@ type DBPlunderLand struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uinfo map[int32]*BaseUserInfo `protobuf:"bytes,2,rep,name=uinfo,proto3" json:"uinfo" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 成员信息 key 岛位置 Ship map[string]*ShipData `protobuf:"bytes,3,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id - Etime int64 `protobuf:"varint,4,opt,name=etime,proto3" json:"etime"` // 结束时间 + //map score= 4;// 排行榜积分用 + Etime int64 `protobuf:"varint,4,opt,name=etime,proto3" json:"etime"` // 结束时间 } func (x *DBPlunderLand) Reset() { @@ -443,7 +452,7 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0x8b, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x74, 0x6f, 0x22, 0xab, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 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, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, @@ -460,6 +469,8 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x74, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, + 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70, 0x18, 0x0c, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70, 0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go index 91a946e32..795dd6b8a 100644 --- a/pb/plunder_msg.pb.go +++ b/pb/plunder_msg.pb.go @@ -739,6 +739,7 @@ type PlunderReachResp struct { Line []*TransportLine `protobuf:"bytes,1,rep,name=line,proto3" json:"line"` // 运输队列 Ship map[string]*ShipData `protobuf:"bytes,2,rep,name=ship,proto3" json:"ship" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` // 运输的船 key 唯一id + Atno []*UserAtno `protobuf:"bytes,3,rep,name=atno,proto3" json:"atno"` // 奖励 } func (x *PlunderReachResp) Reset() { @@ -787,6 +788,13 @@ func (x *PlunderReachResp) GetShip() map[string]*ShipData { return nil } +func (x *PlunderReachResp) GetAtno() []*UserAtno { + if x != nil { + return x.Atno + } + return nil +} + // 修改状态 type PlunderClientTagReq struct { state protoimpl.MessageState @@ -1109,45 +1117,47 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{ 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x22, 0x23, 0x0a, 0x0f, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, - 0xab, 0x01, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, + 0xca, 0x01, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x2f, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x61, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, - 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, - 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, - 0x67, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, - 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x33, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, + 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x74, 0x6e, + 0x6f, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, + 0x6e, 0x6f, 0x52, 0x04, 0x61, 0x74, 0x6e, 0x6f, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x13, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, - 0x52, 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, - 0x73, 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, - 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, - 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, - 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, - 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, - 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, - 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, - 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, - 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x3a, 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, - 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x37, 0x0a, 0x11, 0x50, 0x6c, - 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, - 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, - 0x69, 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, 0x8f, 0x01, 0x0a, 0x14, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, + 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x33, + 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x50, + 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x67, 0x52, + 0x65, 0x73, 0x70, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, + 0x68, 0x69, 0x70, 0x1a, 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, + 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x89, 0x01, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x30, 0x0a, + 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x50, 0x6c, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, + 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x1a, + 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, + 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, + 0x02, 0x38, 0x01, 0x22, 0x24, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, + 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x22, 0x37, 0x0a, 0x11, 0x50, 0x6c, 0x75, + 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, + 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, + 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, + 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -1213,18 +1223,19 @@ var file_plunder_plunder_msg_proto_depIdxs = []int32{ 30, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno 29, // 13: PlunderReachResp.line:type_name -> TransportLine 21, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry - 22, // 15: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry - 23, // 16: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry - 29, // 17: PlunderUnlockResp.line:type_name -> TransportLine - 31, // 18: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData - 31, // 19: PlunderReachResp.ShipEntry.value:type_name -> ShipData - 31, // 20: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData - 31, // 21: PlunderChangePush.ShipEntry.value:type_name -> ShipData - 22, // [22:22] is the sub-list for method output_type - 22, // [22:22] is the sub-list for method input_type - 22, // [22:22] is the sub-list for extension type_name - 22, // [22:22] is the sub-list for extension extendee - 0, // [0:22] is the sub-list for field type_name + 30, // 15: PlunderReachResp.atno:type_name -> UserAtno + 22, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry + 23, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry + 29, // 18: PlunderUnlockResp.line:type_name -> TransportLine + 31, // 19: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData + 31, // 20: PlunderReachResp.ShipEntry.value:type_name -> ShipData + 31, // 21: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData + 31, // 22: PlunderChangePush.ShipEntry.value:type_name -> ShipData + 23, // [23:23] is the sub-list for method output_type + 23, // [23:23] is the sub-list for method input_type + 23, // [23:23] is the sub-list for extension type_name + 23, // [23:23] is the sub-list for extension extendee + 0, // [0:23] is the sub-list for field type_name } func init() { file_plunder_plunder_msg_proto_init() } diff --git a/sys/configure/structs/Game.BattleScoreData.go b/sys/configure/structs/Game.BattleScoreData.go index 0ec86695e..2b800c23d 100644 --- a/sys/configure/structs/Game.BattleScoreData.go +++ b/sys/configure/structs/Game.BattleScoreData.go @@ -14,10 +14,11 @@ type GameBattleScoreData struct { Id int32 IType int32 ScoreName string + PassUnlock int32 RankLow int32 RankUp int32 - Grade string - Score int32 + Icon string + Grade int32 } const TypeId_GameBattleScoreData = -1341711992 @@ -30,10 +31,11 @@ func (_v *GameBattleScoreData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["iType"].(float64); !_ok_ { err = errors.New("iType error"); return }; _v.IType = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["score_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ScoreName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ScoreName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PassUnlock"].(float64); !_ok_ { err = errors.New("PassUnlock error"); return }; _v.PassUnlock = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) } - { var _ok_ bool; if _v.Grade, _ok_ = _buf["grade"].(string); !_ok_ { err = errors.New("grade error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["grade"].(float64); !_ok_ { err = errors.New("grade error"); return }; _v.Grade = int32(_tempNum_) } return } diff --git a/sys/configure/structs/Game.BuriedCondiData.go b/sys/configure/structs/Game.BuriedCondiData.go index fb179da88..ad9420b5d 100644 --- a/sys/configure/structs/Game.BuriedCondiData.go +++ b/sys/configure/structs/Game.BuriedCondiData.go @@ -12,6 +12,7 @@ import "errors" type GameBuriedCondiData struct { Id int32 + Refresh int32 Rtype int32 Ctype int32 Notify []string @@ -36,6 +37,7 @@ func (*GameBuriedCondiData) GetTypeId() int32 { func (_v *GameBuriedCondiData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["refresh"].(float64); !_ok_ { err = errors.New("refresh error"); return }; _v.Refresh = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rtype"].(float64); !_ok_ { err = errors.New("rtype error"); return }; _v.Rtype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ctype"].(float64); !_ok_ { err = errors.New("ctype error"); return }; _v.Ctype = int32(_tempNum_) } { diff --git a/sys/configure/structs/Game.ExpeditionBoss.go b/sys/configure/structs/Game.ExpeditionBoss.go new file mode 100644 index 000000000..2f4101c52 --- /dev/null +++ b/sys/configure/structs/Game.ExpeditionBoss.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 GameExpeditionBoss struct { + _dataMap map[int32]*GameExpeditionBossData + _dataList []*GameExpeditionBossData +} + +func NewGameExpeditionBoss(_buf []map[string]interface{}) (*GameExpeditionBoss, error) { + _dataList := make([]*GameExpeditionBossData, 0, len(_buf)) + dataMap := make(map[int32]*GameExpeditionBossData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameExpeditionBossData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.BossId] = _v + } + } + return &GameExpeditionBoss{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameExpeditionBoss) GetDataMap() map[int32]*GameExpeditionBossData { + return table._dataMap +} + +func (table *GameExpeditionBoss) GetDataList() []*GameExpeditionBossData { + return table._dataList +} + +func (table *GameExpeditionBoss) Get(key int32) *GameExpeditionBossData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.ExpeditionBossData.go b/sys/configure/structs/Game.ExpeditionBossData.go new file mode 100644 index 000000000..1990bba41 --- /dev/null +++ b/sys/configure/structs/Game.ExpeditionBossData.go @@ -0,0 +1,124 @@ +//------------------------------------------------------------------------------ +// +// 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 GameExpeditionBossData struct { + BossId int32 + BossName string + BossLv int32 + Serial int32 + Fighting int32 + BossImg int32 + KillReward int32 + FailReward []*Gameatn + Race []int32 + Job []int32 + Hid []string + Color []int32 + Fight int32 +} + +const TypeId_GameExpeditionBossData = -271002540 + +func (*GameExpeditionBossData) GetTypeId() int32 { + return -271002540 +} + +func (_v *GameExpeditionBossData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_id"].(float64); !_ok_ { err = errors.New("boss_id error"); return }; _v.BossId = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["boss_name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.BossName error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.BossName, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_lv"].(float64); !_ok_ { err = errors.New("boss_lv error"); return }; _v.BossLv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["serial"].(float64); !_ok_ { err = errors.New("serial error"); return }; _v.Serial = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fighting"].(float64); !_ok_ { err = errors.New("fighting error"); return }; _v.Fighting = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boss_img"].(float64); !_ok_ { err = errors.New("boss_img error"); return }; _v.BossImg = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kill_reward"].(float64); !_ok_ { err = errors.New("kill_reward error"); return }; _v.KillReward = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["fail_reward"].([]interface{}); !_ok_ { err = errors.New("fail_reward error"); return } + + _v.FailReward = 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.FailReward = append(_v.FailReward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["race"].([]interface{}); !_ok_ { err = errors.New("race error"); return } + + _v.Race = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Race = append(_v.Race, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["job"].([]interface{}); !_ok_ { err = errors.New("job error"); return } + + _v.Job = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Job = append(_v.Job, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["hid"].([]interface{}); !_ok_ { err = errors.New("hid error"); return } + + _v.Hid = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Hid = append(_v.Hid, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["color"].([]interface{}); !_ok_ { err = errors.New("color error"); return } + + _v.Color = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Color = append(_v.Color, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fight"].(float64); !_ok_ { err = errors.New("fight error"); return }; _v.Fight = int32(_tempNum_) } + return +} + +func DeserializeGameExpeditionBossData(_buf map[string]interface{}) (*GameExpeditionBossData, error) { + v := &GameExpeditionBossData{} + 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 887870509..74f89596a 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -345,7 +345,7 @@ type Tables struct { FightingSkilllv *GameFightingSkilllv FightingSkill *GameFightingSkill FightingSkillStar *GameFightingSkillStar - ExpeditionBoos *GameExpeditionBoos + ExpeditionBoss *GameExpeditionBoss } func NewTables(loader JsonLoader) (*Tables, error) { @@ -2357,10 +2357,10 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.FightingSkillStar, err = NewGameFightingSkillStar(buf) ; err != nil { return nil, err } - if buf, err = loader("game_expeditionboos") ; err != nil { + if buf, err = loader("game_expeditionboss") ; err != nil { return nil, err } - if tables.ExpeditionBoos, err = NewGameExpeditionBoos(buf) ; err != nil { + if tables.ExpeditionBoss, err = NewGameExpeditionBoss(buf) ; err != nil { return nil, err } return tables, nil From a29fc82bf989a29606a347361146106343230e03 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 23 Jan 2024 16:09:32 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A0=E5=A4=BA=E8=88=AA=E6=B5=B7?= =?UTF-8?q?=E6=9C=AF=E5=AD=A6=E4=B9=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_arenaactivereward.json | 64 + bin/json/game_arenarankreward.json | 12 + bin/json/game_battleready.json | 245 +++ bin/json/game_buriedcondi.json | 660 -------- bin/json/game_mainstage.json | 10 +- bin/json/game_monsterformat.json | 1404 ++++++++++++++++- bin/json/game_plunderdevelop.json | 363 +++++ bin/json/game_skillatk.json | 3 +- modules/plunder/api_develop.go | 67 + modules/plunder/configure.go | 26 +- modules/plunder/model_plunder.go | 7 +- pb/chat_db.pb.go | 2 +- pb/errorcode.pb.go | 11 +- pb/plunder_db.pb.go | 159 +- pb/plunder_msg.pb.go | 223 ++- .../structs/Game.ArenaActiveRewardData.go | 17 + .../structs/Game.ArenaRankRewardData.go | 2 + sys/configure/structs/Game.PlunderDevelop.go | 42 + .../structs/Game.PlunderDevelopData.go | 79 + sys/configure/structs/Tables.go | 7 + 20 files changed, 2608 insertions(+), 795 deletions(-) create mode 100644 bin/json/game_plunderdevelop.json create mode 100644 modules/plunder/api_develop.go create mode 100644 sys/configure/structs/Game.PlunderDevelop.go create mode 100644 sys/configure/structs/Game.PlunderDevelopData.go diff --git a/bin/json/game_arenaactivereward.json b/bin/json/game_arenaactivereward.json index 0953fe604..9644852a6 100644 --- a/bin/json/game_arenaactivereward.json +++ b/bin/json/game_arenaactivereward.json @@ -8,6 +8,14 @@ "key": "arena_active_reward_name_1", "text": "黑铁" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 0, "win_reward": [ { "a": "attr", @@ -27,6 +35,14 @@ "key": "arena_active_reward_name_2", "text": "青铜" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 0, "win_reward": [ { "a": "attr", @@ -46,6 +62,14 @@ "key": "arena_active_reward_name_3", "text": "白银" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 800, "win_reward": [ { "a": "attr", @@ -65,6 +89,14 @@ "key": "arena_active_reward_name_4", "text": "黄金" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 1300, "win_reward": [ { "a": "attr", @@ -84,6 +116,14 @@ "key": "arena_active_reward_name_5", "text": "铂金" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 1600, "win_reward": [ { "a": "attr", @@ -103,6 +143,14 @@ "key": "arena_active_reward_name_6", "text": "钻石" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 2200, "win_reward": [ { "a": "attr", @@ -122,6 +170,14 @@ "key": "arena_active_reward_name_7", "text": "大师" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 2800, "win_reward": [ { "a": "attr", @@ -141,6 +197,14 @@ "key": "arena_active_reward_name_8", "text": "王者" }, + "ex_reward": [ + { + "a": "attr", + "t": "arenacoin", + "n": 10 + } + ], + "score_return": 3700, "win_reward": [ { "a": "attr", diff --git a/bin/json/game_arenarankreward.json b/bin/json/game_arenarankreward.json index 6543810aa..5572b26cb 100644 --- a/bin/json/game_arenarankreward.json +++ b/bin/json/game_arenarankreward.json @@ -1,6 +1,7 @@ [ { "id": 1, + "name": 1, "rank_low": 1, "rank_up": 1, "rank_display": { @@ -27,6 +28,7 @@ }, { "id": 2, + "name": 1, "rank_low": 2, "rank_up": 2, "rank_display": { @@ -53,6 +55,7 @@ }, { "id": 3, + "name": 1, "rank_low": 3, "rank_up": 3, "rank_display": { @@ -79,6 +82,7 @@ }, { "id": 4, + "name": 1, "rank_low": 4, "rank_up": 10, "rank_display": { @@ -105,6 +109,7 @@ }, { "id": 5, + "name": 1, "rank_low": 11, "rank_up": 20, "rank_display": { @@ -126,6 +131,7 @@ }, { "id": 6, + "name": 1, "rank_low": 21, "rank_up": 50, "rank_display": { @@ -147,6 +153,7 @@ }, { "id": 7, + "name": 1, "rank_low": 51, "rank_up": 100, "rank_display": { @@ -168,6 +175,7 @@ }, { "id": 8, + "name": 1, "rank_low": 101, "rank_up": 200, "rank_display": { @@ -189,6 +197,7 @@ }, { "id": 9, + "name": 1, "rank_low": 201, "rank_up": 500, "rank_display": { @@ -210,6 +219,7 @@ }, { "id": 10, + "name": 1, "rank_low": 501, "rank_up": 1000, "rank_display": { @@ -231,6 +241,7 @@ }, { "id": 11, + "name": 1, "rank_low": 1001, "rank_up": 2000, "rank_display": { @@ -252,6 +263,7 @@ }, { "id": 12, + "name": 1, "rank_low": 2001, "rank_up": 9999, "rank_display": { diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index e2040d316..2b121227d 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -3674,5 +3674,250 @@ "BlueAssistTeam": 0, "CanFriendHelp": true, "Numrounds": 0 + }, + { + "id": 10103101, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101612, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103102, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101622, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103103, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101632, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103104, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101642, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103105, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101652, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103106, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101662, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 + }, + { + "id": 10103107, + "PlayType": 1, + "HeroCount": 5, + "readyScene": "scenesfight_role_interface_07", + "battleScenes": [ + "scenesfight_09" + ], + "BGMusic": "", + "LoadingId": 1031, + "HideAlienSpace": false, + "HideFightUI": false, + "RuleTips": { + "key": "", + "text": "" + }, + "BattleTips": { + "key": "", + "text": "" + }, + "battleEvents": [], + "ScoreGroupID": 0, + "disableAiCamera": false, + "ChoseCamp": [], + "DisableCamp": [], + "DefaultHero": 101672, + "ChoseHero": [], + "DisableHero": [], + "LockSlots": [], + "HeroCheck": [], + "RedAssistTeam": 0, + "BlueAssistTeam": 0, + "CanFriendHelp": false, + "Numrounds": 0 } ] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 70425c7a9..ae4ea72dc 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -31618,666 +31618,6 @@ "filter": [], "filter2": [] }, - { - "id": 18000054, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1010", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000055, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1011", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000056, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1012", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000057, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1013", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000058, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1014", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000059, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1015", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000060, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1016", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000061, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1017", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000062, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1018", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000063, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1019", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000064, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1020", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000065, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1021", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000066, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1022", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000067, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1023", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000068, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1024", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000069, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1025", - "text": "主角等级达到3级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 3, - "filter": [], - "filter2": [] - }, - { - "id": 18000070, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1026", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000071, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1027", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000072, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1028", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000073, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1029", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000074, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1030", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, - { - "id": 18000075, - "refresh": 0, - "rtype": 1, - "ctype": 1, - "notify": [ - "sys" - ], - "type_sp": 1, - "tasktxt": { - "key": "buried_buried_condi_tasktxt_1031", - "text": "主角等级达到4级开启" - }, - "type": 20, - "valid": 0, - "head": { - "a": "attr", - "t": "gold", - "n": 1 - }, - "Npc_event_type": 0, - "NPC": 0, - "tipstxt": { - "key": "", - "text": "" - }, - "value": 4, - "filter": [], - "filter2": [] - }, { "id": 18000076, "refresh": 0, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index b20f1fe15..ef3185996 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -40074,7 +40074,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_260", + "key": "main_stage_bubbletext_261", "text": "呃呃呃，好冷啊……！！" }, "animation": [], @@ -40155,7 +40155,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_261", + "key": "main_stage_bubbletext_262", "text": "吼吼吼——" }, "animation": [], @@ -40236,7 +40236,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_262", + "key": "main_stage_bubbletext_263", "text": "哦，我的奥丁神啊！！" }, "animation": [], @@ -40317,7 +40317,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_263", + "key": "main_stage_bubbletext_264", "text": "小嗝嗝，快来帮忙。" }, "animation": [], @@ -40446,7 +40446,7 @@ "herocolor": 1, "heroimg": "zxgq_qp_icon_gth", "bubbletext": { - "key": "main_stage_bubbletext_264", + "key": "main_stage_bubbletext_265", "text": "好端端的，龙群怎么会感染瘟疫？" }, "animation": [], diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 0ccf78645..f53f9e9b6 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -3601,6 +3601,1406 @@ "speed": 58, "modelsize": 1 }, + { + "Id": 101611, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 150, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 110, + "modelsize": 1 + }, + { + "Id": 101611, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51006, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 115, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101612, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 1, + "atkpro": 2, + "defpro": 1.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 53001, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101621, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101622, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 33005, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 24008, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 34008, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101631, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.4, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101632, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101641, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.6, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101642, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 53001, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101651, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2.9, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101652, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101661, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101662, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 130, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 13001, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 13003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101671, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 3.2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 35002, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 133, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14003, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 135, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 132, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 120, + "modelsize": 1 + }, + { + "Id": 101672, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": -1, + "star": 6, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 2, + "atkpro": 3, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 125, + "modelsize": 1 + }, { "Id": 102011, "pos": 1, @@ -127376,8 +128776,8 @@ "newskill": [], "lv": 65, "hppro": 20, - "atkpro": 3, - "defpro": 0.5, + "atkpro": 2.3, + "defpro": 0.6, "skill1": 1, "skill2": 1, "skill3": 1, diff --git a/bin/json/game_plunderdevelop.json b/bin/json/game_plunderdevelop.json new file mode 100644 index 000000000..53903f5ec --- /dev/null +++ b/bin/json/game_plunderdevelop.json @@ -0,0 +1,363 @@ +[ + { + "id": 1001, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_01", + "text": "初级航海术" + }, + "open": [], + "last": [], + "icon": "jn_24004_1", + "place": 0, + "type": 101, + "buffID": 1, + "txt": { + "key": "plunder_plunder_develop_txt_01", + "text": "货船免费刷新次数+1" + } + }, + { + "id": 1002, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_02", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1001 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_02", + "text": "全队攻击增加3%" + } + }, + { + "id": 1003, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_03", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1001 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_03", + "text": "全队防御增加3%" + } + }, + { + "id": 1004, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_04", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1002 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_04", + "text": "全队生命增加3%" + } + }, + { + "id": 1005, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_05", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1003 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_05", + "text": "全队速度增加3%" + } + }, + { + "id": 1006, + "itype": 1, + "name": { + "key": "plunder_plunder_develop_name_06", + "text": "初级航海术" + }, + "open": [], + "last": [ + 1004, + 1005 + ], + "icon": "jn_24004_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_06", + "text": "全队暴击率增加3%" + } + }, + { + "id": 1007, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_07", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1006 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 101, + "buffID": 1, + "txt": { + "key": "plunder_plunder_develop_txt_07", + "text": "货船免费刷新次数+1" + } + }, + { + "id": 1008, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_08", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1007 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_08", + "text": "全队攻击增加6%" + } + }, + { + "id": 1009, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_09", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1007 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_09", + "text": "全队防御增加6%" + } + }, + { + "id": 1010, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_10", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1008 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_10", + "text": "全队生命增加6%" + } + }, + { + "id": 1011, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_11", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1009 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_11", + "text": "全队速度增加6%" + } + }, + { + "id": 1012, + "itype": 2, + "name": { + "key": "plunder_plunder_develop_name_12", + "text": "中级航海术" + }, + "open": [], + "last": [ + 1010, + 1011 + ], + "icon": "jn_43003_1", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_12", + "text": "全队暴击率增加6%" + } + }, + { + "id": 1013, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_13", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1012 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 101, + "buffID": 1, + "txt": { + "key": "plunder_plunder_develop_txt_13", + "text": "货船免费刷新次数+1" + } + }, + { + "id": 1014, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_14", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1013 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_14", + "text": "全队攻击增加9%" + } + }, + { + "id": 1015, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_15", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1013 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_15", + "text": "全队防御增加9%" + } + }, + { + "id": 1016, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_16", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1014 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_16", + "text": "全队生命增加3%" + } + }, + { + "id": 1017, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_17", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1015 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_17", + "text": "全队速度增加9%" + } + }, + { + "id": 1018, + "itype": 3, + "name": { + "key": "plunder_plunder_develop_name_18", + "text": "高级航海术" + }, + "open": [], + "last": [ + 1016, + 1018 + ], + "icon": "jn_35005_2", + "place": 0, + "type": 1, + "buffID": 300, + "txt": { + "key": "plunder_plunder_develop_txt_18", + "text": "全队暴击伤害增加10%" + } + } +] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index c59d470cc..09d6160c7 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -24832,7 +24832,8 @@ 255007211, 255007212, 255007213, - 255007315 + 255007315, + 255007319 ] }, "passSkill": [], diff --git a/modules/plunder/api_develop.go b/modules/plunder/api_develop.go new file mode 100644 index 000000000..b4d15198f --- /dev/null +++ b/modules/plunder/api_develop.go @@ -0,0 +1,67 @@ +package plunder + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +func (this *apiComp) DevelopCheck(session comm.IUserSession, req *pb.PlunderDevelopReq) (errdata *pb.ErrorData) { + return +} + +// 获取基本信息 +func (this *apiComp) Develop(session comm.IUserSession, req *pb.PlunderDevelopReq) (errdata *pb.ErrorData) { + var ( + err error + list *pb.DBPlunder + update map[string]interface{} + conf *cfg.GamePlunderDevelopData + ) + if errdata = this.DevelopCheck(session, req); errdata != nil { + return + } + + update = make(map[string]interface{}) + if list, err = this.module.modelPlunder.getPlunderData(session.GetUserId()); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Message: err.Error(), + } + return + } + + if conf, err = this.module.configure.getPlunderDevelopById(req.Cid); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Message: err.Error(), + } + return + } + if _, ok := list.Develop[conf.Itype]; ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_PlundeAlreadyLearn, + Title: pb.ErrorCode_PlundeAlreadyLearn.ToString(), + } + return + } + // 校验前置任务 + for _, v := range conf.Last { + if _, ok := list.Develop[v]; !ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_PlundeAlreadyLearn, + Title: pb.ErrorCode_PlundeAlreadyLearn.ToString(), + } + return + } + } + list.Develop[conf.Itype] = 1 + update["develop"] = list.Develop + this.module.modelPlunder.changePlunderData(session.GetUserId(), update) + + session.SendMsg(string(this.module.GetType()), "develop", &pb.PlunderDevelopResp{ + Develop: list.Develop, + }) + + return +} diff --git a/modules/plunder/configure.go b/modules/plunder/configure.go index 521774aa1..cce394d36 100644 --- a/modules/plunder/configure.go +++ b/modules/plunder/configure.go @@ -8,8 +8,9 @@ import ( ) const ( - game_plunder = "game_plunder.json" - game_plunderbattle = "game_plunderbattle.json" + game_plunder = "game_plunder.json" + game_plunderbattle = "game_plunderbattle.json" + game_plunderdevelop = "game_plunderdevelop.json" ) type configureComp struct { @@ -22,8 +23,9 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp this.module = module.(*Plunder) //err = this.LoadConfigure(game_plunder, cfg.NewGamePlunder) err = this.LoadMultiConfigure(map[string]interface{}{ - game_plunder: cfg.NewGamePlunder, - game_plunderbattle: cfg.NewGamePlunderBattle, + game_plunder: cfg.NewGamePlunder, + game_plunderbattle: cfg.NewGamePlunderBattle, + game_plunderdevelop: cfg.NewGamePlunderDevelop, }) return } @@ -75,3 +77,19 @@ func (this *configureComp) getGameMonkeyRewardData(chapterid int32) (result []*c return } + +// 获取航海术相关 +func (this *configureComp) getPlunderDevelopById(id int32) (result *cfg.GamePlunderDevelopData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_plunderdevelop); err == nil { + if configure, ok := v.(*cfg.GamePlunderDevelop); ok { + if result = configure.Get(id); result != nil { + return + } + } + } + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_plunderdevelop, id) + return +} diff --git a/modules/plunder/model_plunder.go b/modules/plunder/model_plunder.go index 6d1adbb87..bbbbb732c 100644 --- a/modules/plunder/model_plunder.go +++ b/modules/plunder/model_plunder.go @@ -39,9 +39,10 @@ func (this *modelPlunder) getPlunderData(uid string) (info *pb.DBPlunder, err er } if err == mgo.MongodbNil { info = &pb.DBPlunder{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - Ctime: configure.Now().Unix(), + Id: primitive.NewObjectID().Hex(), + Uid: uid, + Ctime: configure.Now().Unix(), + Develop: make(map[int32]int32), } for i := 0; i < 3; i++ { // 队列固定三条 diff --git a/pb/chat_db.pb.go b/pb/chat_db.pb.go index d1c8b51a7..491fc39d9 100644 --- a/pb/chat_db.pb.go +++ b/pb/chat_db.pb.go @@ -87,7 +87,7 @@ const ( ChatType_ItemShare ChatType = 5 //道具分享 ChatType_Parkour ChatType = 6 //捕羊大赛邀请 ChatType_Questionnaire ChatType = 7 //问答分享 - ChatType_XxlRoom ChatType = 8 //三消房间分享类型 + ChatType_XxlRoom ChatType = 8 // 三消房间分享类型 ) // Enum value maps for ChatType. diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 7382f3f35..05bbe4739 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -480,6 +480,7 @@ const ( ErrorCode_PlundeShipCDIng ErrorCode = 5406 //掠夺cd中 ErrorCode_PlundeShipRunning ErrorCode = 5407 //运输中 ErrorCode_PlundeUnlock ErrorCode = 5408 //已解锁 + ErrorCode_PlundeAlreadyLearn ErrorCode = 5409 //重复学习 ) // Enum value maps for ErrorCode. @@ -895,6 +896,7 @@ var ( 5406: "PlundeShipCDIng", 5407: "PlundeShipRunning", 5408: "PlundeUnlock", + 5409: "PlundeAlreadyLearn", } ErrorCode_value = map[string]int32{ "Success": 0, @@ -1307,6 +1309,7 @@ var ( "PlundeShipCDIng": 5406, "PlundeShipRunning": 5407, "PlundeUnlock": 5408, + "PlundeAlreadyLearn": 5409, } ) @@ -1341,7 +1344,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xb4, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xcd, 0x4c, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x01, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, @@ -1952,8 +1955,10 @@ var file_errorcode_proto_rawDesc = []byte{ 0x65, 0x53, 0x68, 0x69, 0x70, 0x43, 0x44, 0x49, 0x6e, 0x67, 0x10, 0x9e, 0x2a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x53, 0x68, 0x69, 0x70, 0x52, 0x75, 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x10, 0x9f, 0x2a, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x55, - 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x10, 0xa0, 0x2a, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x6c, 0x75, 0x6e, + 0x64, 0x65, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0xa1, + 0x2a, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/pb/plunder_db.pb.go b/pb/plunder_db.pb.go index a0873ff13..8051063a7 100644 --- a/pb/plunder_db.pb.go +++ b/pb/plunder_db.pb.go @@ -26,18 +26,19 @@ type DBPlunder struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // - Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid - Line []*TransportLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列 - Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数 - Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表 - Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表 - Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数 - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用 - Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分 - Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间 - Plunderexp int32 `protobuf:"varint,12,opt,name=plunderexp,proto3" json:"plunderexp"` // 积分 排行用 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` // + Landid string `protobuf:"bytes,3,opt,name=landid,proto3" json:"landid"` //掠夺岛 oid + Line []*TransportLine `protobuf:"bytes,4,rep,name=line,proto3" json:"line"` // 运输队列 + Count int32 `protobuf:"varint,5,opt,name=count,proto3" json:"count"` // 运输次数 + Source []int32 `protobuf:"varint,6,rep,packed,name=source,proto3" json:"source"` // 货源列表 + Setout []int32 `protobuf:"varint,7,rep,packed,name=setout,proto3" json:"setout"` // 已经出发的列表 + Refresh int32 `protobuf:"varint,8,opt,name=refresh,proto3" json:"refresh"` // 刷新次数 + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` // 刷新时间 客户端不用 + Score int32 `protobuf:"varint,10,opt,name=score,proto3" json:"score"` // 当前赛季积分 + Etime int64 `protobuf:"varint,11,opt,name=etime,proto3" json:"etime"` // 结束时间 + Plunderexp int32 `protobuf:"varint,12,opt,name=plunderexp,proto3" json:"plunderexp"` // 积分 排行用 + Develop map[int32]int32 `protobuf:"bytes,13,rep,name=develop,proto3" json:"develop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 海航术 } func (x *DBPlunder) Reset() { @@ -156,6 +157,13 @@ func (x *DBPlunder) GetPlunderexp() int32 { return 0 } +func (x *DBPlunder) GetDevelop() map[int32]int32 { + if x != nil { + return x.Develop + } + return nil +} + type TransportLine struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -452,7 +460,7 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xab, 0x02, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x74, 0x6f, 0x22, 0x9a, 0x03, 0x0a, 0x09, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 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, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, @@ -471,47 +479,54 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x65, 0x78, 0x70, - 0x22, 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, - 0x65, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6f, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, - 0x65, 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, - 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x63, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, - 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, - 0x22, 0xac, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x20, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, - 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, - 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, - 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, - 0xa1, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, - 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, - 0x2e, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, - 0x66, 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, - 0x2e, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, - 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, - 0x42, 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, - 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, - 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, - 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x12, 0x31, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x18, 0x0d, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x2e, 0x44, 0x65, + 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x65, 0x76, 0x65, + 0x6c, 0x6f, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, + 0x3f, 0x0a, 0x0d, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, + 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, + 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x74, 0x69, 0x6d, 0x65, + 0x22, 0x5d, 0x0a, 0x0b, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, + 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x63, + 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, + 0x03, 0x6f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x22, + 0xac, 0x01, 0x0a, 0x08, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x20, + 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x50, + 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, + 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x63, 0x64, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x63, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6c, 0x69, 0x65, + 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x12, 0x2c, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x14, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x06, 0x64, 0x65, 0x66, 0x65, 0x6e, 0x64, 0x22, 0xa1, + 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x2f, 0x0a, 0x05, 0x75, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, + 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x75, 0x69, 0x6e, 0x66, + 0x6f, 0x12, 0x2c, 0x0a, 0x04, 0x73, 0x68, 0x69, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x18, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x4c, 0x61, 0x6e, 0x64, 0x2e, + 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x73, 0x68, 0x69, 0x70, 0x12, + 0x14, 0x0a, 0x05, 0x65, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x65, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0a, 0x55, 0x69, 0x6e, 0x66, 0x6f, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x42, + 0x0a, 0x09, 0x53, 0x68, 0x69, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, + 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, + 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, + 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( @@ -526,31 +541,33 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte { return file_plunder_plunder_db_proto_rawDescData } -var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 7) +var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) var file_plunder_plunder_db_proto_goTypes = []interface{}{ (*DBPlunder)(nil), // 0: DBPlunder (*TransportLine)(nil), // 1: TransportLine (*PlunderLine)(nil), // 2: PlunderLine (*ShipData)(nil), // 3: ShipData (*DBPlunderLand)(nil), // 4: DBPlunderLand - nil, // 5: DBPlunderLand.UinfoEntry - nil, // 6: DBPlunderLand.ShipEntry - (*DBPlayerBattleFormt)(nil), // 7: DBPlayerBattleFormt - (*BaseUserInfo)(nil), // 8: BaseUserInfo + nil, // 5: DBPlunder.DevelopEntry + nil, // 6: DBPlunderLand.UinfoEntry + nil, // 7: DBPlunderLand.ShipEntry + (*DBPlayerBattleFormt)(nil), // 8: DBPlayerBattleFormt + (*BaseUserInfo)(nil), // 9: BaseUserInfo } var file_plunder_plunder_db_proto_depIdxs = []int32{ 1, // 0: DBPlunder.line:type_name -> TransportLine - 2, // 1: ShipData.line:type_name -> PlunderLine - 7, // 2: ShipData.defend:type_name -> DBPlayerBattleFormt - 5, // 3: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry - 6, // 4: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry - 8, // 5: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo - 3, // 6: DBPlunderLand.ShipEntry.value:type_name -> ShipData - 7, // [7:7] is the sub-list for method output_type - 7, // [7:7] is the sub-list for method input_type - 7, // [7:7] is the sub-list for extension type_name - 7, // [7:7] is the sub-list for extension extendee - 0, // [0:7] is the sub-list for field type_name + 5, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry + 2, // 2: ShipData.line:type_name -> PlunderLine + 8, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt + 6, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry + 7, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry + 9, // 6: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo + 3, // 7: DBPlunderLand.ShipEntry.value:type_name -> ShipData + 8, // [8:8] is the sub-list for method output_type + 8, // [8:8] is the sub-list for method input_type + 8, // [8:8] is the sub-list for extension type_name + 8, // [8:8] is the sub-list for extension extendee + 0, // [0:8] is the sub-list for field type_name } func init() { file_plunder_plunder_db_proto_init() } @@ -628,7 +645,7 @@ func file_plunder_plunder_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_db_proto_rawDesc, NumEnums: 0, - NumMessages: 7, + NumMessages: 8, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go index 795dd6b8a..e2f040037 100644 --- a/pb/plunder_msg.pb.go +++ b/pb/plunder_msg.pb.go @@ -1033,6 +1033,100 @@ func (x *PlunderUnlockResp) GetLine() []*TransportLine { return nil } +type PlunderDevelopReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Cid int32 `protobuf:"varint,1,opt,name=cid,proto3" json:"cid"` // +} + +func (x *PlunderDevelopReq) Reset() { + *x = PlunderDevelopReq{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[19] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderDevelopReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderDevelopReq) ProtoMessage() {} + +func (x *PlunderDevelopReq) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_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 PlunderDevelopReq.ProtoReflect.Descriptor instead. +func (*PlunderDevelopReq) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{19} +} + +func (x *PlunderDevelopReq) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +type PlunderDevelopResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Develop map[int32]int32 `protobuf:"bytes,1,rep,name=develop,proto3" json:"develop" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 海航术 +} + +func (x *PlunderDevelopResp) Reset() { + *x = PlunderDevelopResp{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[20] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderDevelopResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderDevelopResp) ProtoMessage() {} + +func (x *PlunderDevelopResp) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_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 PlunderDevelopResp.ProtoReflect.Descriptor instead. +func (*PlunderDevelopResp) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{20} +} + +func (x *PlunderDevelopResp) GetDevelop() map[int32]int32 { + if x != nil { + return x.Develop + } + return nil +} + var File_plunder_plunder_msg_proto protoreflect.FileDescriptor var file_plunder_plunder_msg_proto_rawDesc = []byte{ @@ -1156,8 +1250,19 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{ 0x6e, 0x64, 0x65, 0x72, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x4c, 0x69, 0x6e, 0x65, 0x52, 0x04, 0x6c, 0x69, - 0x6e, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x6e, 0x65, 0x22, 0x25, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, + 0x65, 0x6c, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x22, 0x8c, 0x01, 0x0a, 0x12, 0x50, 0x6c, + 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x3a, 0x0a, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x20, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x44, 0x65, 0x76, 0x65, 0x6c, + 0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x07, 0x64, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x1a, 0x3a, 0x0a, 0x0c, + 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, + 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1172,7 +1277,7 @@ func file_plunder_plunder_msg_proto_rawDescGZIP() []byte { return file_plunder_plunder_msg_proto_rawDescData } -var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 24) +var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27) var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderGetListReq)(nil), // 0: PlunderGetListReq (*PlunderGetListResp)(nil), // 1: PlunderGetListResp @@ -1193,49 +1298,53 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderChangePush)(nil), // 16: PlunderChangePush (*PlunderUnlockReq)(nil), // 17: PlunderUnlockReq (*PlunderUnlockResp)(nil), // 18: PlunderUnlockResp - nil, // 19: PlunderChallengeOverResp.ShipEntry - nil, // 20: PlunderChallengeOverResp.HeroexpEntry - nil, // 21: PlunderReachResp.ShipEntry - nil, // 22: PlunderClientTagResp.ShipEntry - nil, // 23: PlunderChangePush.ShipEntry - (*DBPlunder)(nil), // 24: DBPlunder - (*DBPlunderLand)(nil), // 25: DBPlunderLand - (*BattleFormation)(nil), // 26: BattleFormation - (*BattleInfo)(nil), // 27: BattleInfo - (*BattleReport)(nil), // 28: BattleReport - (*TransportLine)(nil), // 29: TransportLine - (*UserAtno)(nil), // 30: UserAtno - (*ShipData)(nil), // 31: ShipData + (*PlunderDevelopReq)(nil), // 19: PlunderDevelopReq + (*PlunderDevelopResp)(nil), // 20: PlunderDevelopResp + nil, // 21: PlunderChallengeOverResp.ShipEntry + nil, // 22: PlunderChallengeOverResp.HeroexpEntry + nil, // 23: PlunderReachResp.ShipEntry + nil, // 24: PlunderClientTagResp.ShipEntry + nil, // 25: PlunderChangePush.ShipEntry + nil, // 26: PlunderDevelopResp.DevelopEntry + (*DBPlunder)(nil), // 27: DBPlunder + (*DBPlunderLand)(nil), // 28: DBPlunderLand + (*BattleFormation)(nil), // 29: BattleFormation + (*BattleInfo)(nil), // 30: BattleInfo + (*BattleReport)(nil), // 31: BattleReport + (*TransportLine)(nil), // 32: TransportLine + (*UserAtno)(nil), // 33: UserAtno + (*ShipData)(nil), // 34: ShipData } var file_plunder_plunder_msg_proto_depIdxs = []int32{ - 24, // 0: PlunderGetListResp.list:type_name -> DBPlunder - 25, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand - 26, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation - 27, // 3: PlunderChallengeResp.info:type_name -> BattleInfo - 28, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport - 29, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine - 19, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry - 30, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno - 20, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry - 26, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation - 27, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo - 28, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport - 30, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno - 29, // 13: PlunderReachResp.line:type_name -> TransportLine - 21, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry - 30, // 15: PlunderReachResp.atno:type_name -> UserAtno - 22, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry - 23, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry - 29, // 18: PlunderUnlockResp.line:type_name -> TransportLine - 31, // 19: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData - 31, // 20: PlunderReachResp.ShipEntry.value:type_name -> ShipData - 31, // 21: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData - 31, // 22: PlunderChangePush.ShipEntry.value:type_name -> ShipData - 23, // [23:23] is the sub-list for method output_type - 23, // [23:23] is the sub-list for method input_type - 23, // [23:23] is the sub-list for extension type_name - 23, // [23:23] is the sub-list for extension extendee - 0, // [0:23] is the sub-list for field type_name + 27, // 0: PlunderGetListResp.list:type_name -> DBPlunder + 28, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand + 29, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation + 30, // 3: PlunderChallengeResp.info:type_name -> BattleInfo + 31, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport + 32, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine + 21, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry + 33, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno + 22, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry + 29, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation + 30, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo + 31, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport + 33, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno + 32, // 13: PlunderReachResp.line:type_name -> TransportLine + 23, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry + 33, // 15: PlunderReachResp.atno:type_name -> UserAtno + 24, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry + 25, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry + 32, // 18: PlunderUnlockResp.line:type_name -> TransportLine + 26, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry + 34, // 20: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData + 34, // 21: PlunderReachResp.ShipEntry.value:type_name -> ShipData + 34, // 22: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData + 34, // 23: PlunderChangePush.ShipEntry.value:type_name -> ShipData + 24, // [24:24] is the sub-list for method output_type + 24, // [24:24] is the sub-list for method input_type + 24, // [24:24] is the sub-list for extension type_name + 24, // [24:24] is the sub-list for extension extendee + 0, // [0:24] is the sub-list for field type_name } func init() { file_plunder_plunder_msg_proto_init() } @@ -1475,6 +1584,30 @@ func file_plunder_plunder_msg_proto_init() { return nil } } + file_plunder_plunder_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderDevelopReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderDevelopResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1482,7 +1615,7 @@ func file_plunder_plunder_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 24, + NumMessages: 27, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.ArenaActiveRewardData.go b/sys/configure/structs/Game.ArenaActiveRewardData.go index 4984ba7ea..318d0da10 100644 --- a/sys/configure/structs/Game.ArenaActiveRewardData.go +++ b/sys/configure/structs/Game.ArenaActiveRewardData.go @@ -16,6 +16,8 @@ type GameArenaActiveRewardData struct { ScoreUp int32 HumanNum int32 Name string + ExReward []*Gameatn + ScoreReturn int32 WinReward []*Gameatn Png string KValue float32 @@ -33,6 +35,21 @@ func (_v *GameArenaActiveRewardData)Deserialize(_buf map[string]interface{}) (er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_up"].(float64); !_ok_ { err = errors.New("score_up error"); return }; _v.ScoreUp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["human_num"].(float64); !_ok_ { err = errors.New("human_num error"); return }; _v.HumanNum = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ex_reward"].([]interface{}); !_ok_ { err = errors.New("ex_reward error"); return } + + _v.ExReward = 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.ExReward = append(_v.ExReward, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_return"].(float64); !_ok_ { err = errors.New("score_return error"); return }; _v.ScoreReturn = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.ArenaRankRewardData.go b/sys/configure/structs/Game.ArenaRankRewardData.go index 780dcd7aa..f2d0c34ed 100644 --- a/sys/configure/structs/Game.ArenaRankRewardData.go +++ b/sys/configure/structs/Game.ArenaRankRewardData.go @@ -12,6 +12,7 @@ import "errors" type GameArenaRankRewardData struct { Id int32 + Name int32 RankLow int32 RankUp int32 RankDisplay string @@ -26,6 +27,7 @@ func (*GameArenaRankRewardData) GetTypeId() int32 { func (_v *GameArenaRankRewardData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["name"].(float64); !_ok_ { err = errors.New("name error"); return }; _v.Name = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["rank_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RankDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RankDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } diff --git a/sys/configure/structs/Game.PlunderDevelop.go b/sys/configure/structs/Game.PlunderDevelop.go new file mode 100644 index 000000000..2dc708beb --- /dev/null +++ b/sys/configure/structs/Game.PlunderDevelop.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 GamePlunderDevelop struct { + _dataMap map[int32]*GamePlunderDevelopData + _dataList []*GamePlunderDevelopData +} + +func NewGamePlunderDevelop(_buf []map[string]interface{}) (*GamePlunderDevelop, error) { + _dataList := make([]*GamePlunderDevelopData, 0, len(_buf)) + dataMap := make(map[int32]*GamePlunderDevelopData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePlunderDevelopData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePlunderDevelop{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePlunderDevelop) GetDataMap() map[int32]*GamePlunderDevelopData { + return table._dataMap +} + +func (table *GamePlunderDevelop) GetDataList() []*GamePlunderDevelopData { + return table._dataList +} + +func (table *GamePlunderDevelop) Get(key int32) *GamePlunderDevelopData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PlunderDevelopData.go b/sys/configure/structs/Game.PlunderDevelopData.go new file mode 100644 index 000000000..ae5364013 --- /dev/null +++ b/sys/configure/structs/Game.PlunderDevelopData.go @@ -0,0 +1,79 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePlunderDevelopData struct { + Id int32 + Itype int32 + Name string + Open []int32 + Last []int32 + Icon string + Place int32 + Type int32 + BuffID int32 + Txt string +} + +const TypeId_GamePlunderDevelopData = -2120757465 + +func (*GamePlunderDevelopData) GetTypeId() int32 { + return -2120757465 +} + +func (_v *GamePlunderDevelopData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["itype"].(float64); !_ok_ { err = errors.New("itype error"); return }; _v.Itype = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["open"].([]interface{}); !_ok_ { err = errors.New("open error"); return } + + _v.Open = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Open = append(_v.Open, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["last"].([]interface{}); !_ok_ { err = errors.New("last error"); return } + + _v.Last = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Last = append(_v.Last, _list_v_) + } + } + + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["buffID"].(float64); !_ok_ { err = errors.New("buffID error"); return }; _v.BuffID = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGamePlunderDevelopData(_buf map[string]interface{}) (*GamePlunderDevelopData, error) { + v := &GamePlunderDevelopData{} + 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 74f89596a..648100bf5 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -346,6 +346,7 @@ type Tables struct { FightingSkill *GameFightingSkill FightingSkillStar *GameFightingSkillStar ExpeditionBoss *GameExpeditionBoss + PlunderDevelop *GamePlunderDevelop } func NewTables(loader JsonLoader) (*Tables, error) { @@ -2363,5 +2364,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.ExpeditionBoss, err = NewGameExpeditionBoss(buf) ; err != nil { return nil, err } + if buf, err = loader("game_plunderdevelop") ; err != nil { + return nil, err + } + if tables.PlunderDevelop, err = NewGamePlunderDevelop(buf) ; err != nil { + return nil, err + } return tables, nil } From c130575fb89042178f3ee12f49815029adaeb95c Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 23 Jan 2024 17:05:09 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E7=A9=BF=E6=88=B4=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97=E8=8B=B1=E9=9B=84=E6=88=98?= =?UTF-8?q?=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 8 ++++---- modules/hero/model_hero.go | 8 ++------ 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/comm/const.go b/comm/const.go index 2a07312b4..debff5406 100644 --- a/comm/const.go +++ b/comm/const.go @@ -448,10 +448,10 @@ const ( TableIntegralRank = "integralrank" //排名 // 助战信息列表 - TableAssist = "assist" - TablePlunder = "plunder" // 掠夺 - TablePlunderLand = "plunderland" // 掠夺岛 - + TableAssist = "assist" + TablePlunder = "plunder" // 掠夺 + TablePlunderLand = "plunderland" // 掠夺岛 + TablePlunderRecord = "plunderrecord" // 掠夺岛记录 ///工会远征 TableExpedition = "expedition" ) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index e290f2de6..4e025a0a5 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -57,13 +57,7 @@ func (this *ModelHero) calFigthValue(hero *pb.DBHero) (addValue int32, err error skillStar *cfg.GameFightingSkillStarData ) tmpHero = new(pb.DBHero) - //tmpHero = this.copyPoint(hero) *tmpHero = *hero // 克隆一个对象 - // tmpHero.Property = make(map[int32]int32) - // tmpHero.AddProperty = make(map[int32]int32) - // tmpHero.JuexProperty = make(map[int32]int32) - // tmpHero.HoroscopeProperty = make(map[int32]int32) - // tmpHero.TalentProperty = make(map[int32]int32) tmpHero.Property = this.cloneTags(hero.Property) tmpHero.AddProperty = this.cloneTags(hero.AddProperty) tmpHero.JuexProperty = this.cloneTags(hero.JuexProperty) @@ -460,9 +454,11 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[int32]int32, skills []*pb.SkillData) { hero.AddProperty = data + this.calFigthValue(hero) if err := this.ChangeList(uid, hero.Id, map[string]interface{}{ "addProperty": data, "equipSkill": skills, + "fightvalue": hero.Fightvalue, }); err != nil { this.module.Errorf("mergeAddProperty err %v", err) } From d60039220d3b3b3051be41cb026ebf86d105ffb5 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 23 Jan 2024 17:30:37 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8E=A0=E5=A4=BA=E8=88=AA=E6=B5=B7?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/plunder/api_challengeover.go | 18 ++ modules/plunder/api_pvpchallengeover.go | 21 ++- modules/plunder/model_land.go | 2 +- modules/plunder/model_record.go | 45 +++++ modules/plunder/module.go | 2 + modules/plunder/plunder_test.go | 26 +++ pb/chat_db.pb.go | 2 +- pb/plunder_db.pb.go | 217 +++++++++++++++++++++--- pb/plunder_msg.pb.go | 212 ++++++++++++++++++----- 9 files changed, 473 insertions(+), 72 deletions(-) create mode 100644 modules/plunder/model_record.go create mode 100644 modules/plunder/plunder_test.go diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go index 1bf88e71e..f5df47973 100644 --- a/modules/plunder/api_challengeover.go +++ b/modules/plunder/api_challengeover.go @@ -221,6 +221,24 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha Atno: atno, Heroexp: changExp, }) + + // 运输记录 + var info []*pb.PlunderRecordData + info = append(info, &pb.PlunderRecordData{ + Itype: 1, // 1 出发 + P1: session.GetUserId(), + P2: "", + Cid: list.Source[req.Index], + Ctime: configure.Now().Unix(), + }) + info = append(info, &pb.PlunderRecordData{ + Itype: 3, // 3 到达 + P1: session.GetUserId(), + P2: "", + Cid: list.Source[req.Index], + Ctime: configure.Now().Unix() + int64(conf.Extime), + }) + err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PlunderChallengeOverReq", atno) }) diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go index d94c0225b..bbbf7d9e5 100644 --- a/modules/plunder/api_pvpchallengeover.go +++ b/modules/plunder/api_pvpchallengeover.go @@ -31,7 +31,9 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder lock *redis.RedisMutex changeShip map[string]*pb.ShipData // 数据变化通知 atno []*pb.UserAtno // 打赢奖励 + info []*pb.PlunderRecordData // 运输记录 ) + if errdata = this.PvpChallengeOverCheck(session, req); errdata != nil { return } @@ -97,6 +99,16 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ Atno: []*pb.UserAtno{}, }) + + info = append(info, &pb.PlunderRecordData{ + Itype: 2, // 2 被战败 + P1: session.GetUserId(), + P2: land.Ship[req.Oid].Uid, + Cid: land.Ship[req.Oid].Line.Cid, + Ctime: configure.Now().Unix(), + }) + err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) + return } land.Ship[req.Oid].Status = 3 @@ -127,6 +139,13 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder session.SendMsg(string(this.module.GetType()), "pvpchallengeover", &pb.PlunderPvpChallengeOverResp{ Atno: atno, }) - + info = append(info, &pb.PlunderRecordData{ + Itype: 4, // 4 掠夺成功 + P1: session.GetUserId(), + P2: land.Ship[req.Oid].Uid, + Cid: land.Ship[req.Oid].Line.Cid, + Ctime: configure.Now().Unix(), + }) + err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) return } diff --git a/modules/plunder/model_land.go b/modules/plunder/model_land.go index 65556fffd..21d57e3c3 100644 --- a/modules/plunder/model_land.go +++ b/modules/plunder/model_land.go @@ -104,7 +104,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand land.Uinfo[int32(sz[k])] = v } err = this.AddList(comm.RDS_EMPTY, land.Id, land) - + this.module.modelRecord.getPlunderRecordData(land.Id) // 创建一条记录数据 return } diff --git a/modules/plunder/model_record.go b/modules/plunder/model_record.go new file mode 100644 index 000000000..93638922b --- /dev/null +++ b/modules/plunder/model_record.go @@ -0,0 +1,45 @@ +package plunder + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" +) + +type modelRecord struct { + modules.MCompModel + module *Plunder +} + +func (this *modelRecord) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompModel.Init(service, module, comp, options) + this.TableName = comm.TablePlunderRecord + this.module = module.(*Plunder) + return +} + +func (this *modelRecord) getPlunderRecordData(id string) (info *pb.DBPlunderRecord, err error) { + info = &pb.DBPlunderRecord{} + if err = this.Get(id, info); err == mgo.MongodbNil { + info.Id = id + err = this.Add(id, info) + return + } + return +} + +func (this *modelRecord) changePlunderRecordData(id string, update map[string]interface{}) (err error) { + err = this.Change(id, update) + return +} + +// 新增一条记录 +func (this *modelRecord) AddRecordData(id string, info []*pb.PlunderRecordData) (err error) { + if record, err := this.getPlunderRecordData(id); err != nil { + record.Data = append(record.Data, info...) + err = this.changePlunderRecordData(id, map[string]interface{}{"data": record.Data}) + } + return +} diff --git a/modules/plunder/module.go b/modules/plunder/module.go index badd148b7..498054b9d 100644 --- a/modules/plunder/module.go +++ b/modules/plunder/module.go @@ -23,6 +23,7 @@ type Plunder struct { modelPlunder *modelPlunder modelLand *modelLand battle comm.IBattle + modelRecord *modelRecord } // 模块名 @@ -56,6 +57,7 @@ func (this *Plunder) OnInstallComp() { this.configure = this.RegisterComp(new(configureComp)).(*configureComp) this.modelPlunder = this.RegisterComp(new(modelPlunder)).(*modelPlunder) this.modelLand = this.RegisterComp(new(modelLand)).(*modelLand) + this.modelRecord = this.RegisterComp(new(modelRecord)).(*modelRecord) } func (this *Plunder) CreatePlunderLand(uid string) (land *pb.DBPlunderLand, err error) { diff --git a/modules/plunder/plunder_test.go b/modules/plunder/plunder_test.go new file mode 100644 index 000000000..d17f6795a --- /dev/null +++ b/modules/plunder/plunder_test.go @@ -0,0 +1,26 @@ +package plunder + +import "sort" + +//根据value排序 +type Pair struct { + Key string + Value int +} + +type PairList []Pair + +func (p PairList) Swap(i, j int) { p[i], p[j] = p[j], p[i] } +func (p PairList) Len() int { return len(p) } +func (p PairList) Less(i, j int) bool { return p[i].Value < p[j].Value } + +func sortMap(m map[string]int) PairList { + p := make(PairList, len(m)) + i := 0 + for k, v := range m { + p[i] = Pair{k, v} + i++ + } + sort.Sort(p) + return p +} diff --git a/pb/chat_db.pb.go b/pb/chat_db.pb.go index 491fc39d9..d1c8b51a7 100644 --- a/pb/chat_db.pb.go +++ b/pb/chat_db.pb.go @@ -87,7 +87,7 @@ const ( ChatType_ItemShare ChatType = 5 //道具分享 ChatType_Parkour ChatType = 6 //捕羊大赛邀请 ChatType_Questionnaire ChatType = 7 //问答分享 - ChatType_XxlRoom ChatType = 8 // 三消房间分享类型 + ChatType_XxlRoom ChatType = 8 //三消房间分享类型 ) // Enum value maps for ChatType. diff --git a/pb/plunder_db.pb.go b/pb/plunder_db.pb.go index 8051063a7..6659db1e0 100644 --- a/pb/plunder_db.pb.go +++ b/pb/plunder_db.pb.go @@ -453,6 +453,141 @@ func (x *DBPlunderLand) GetEtime() int64 { return 0 } +type PlunderRecordData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Itype int32 `protobuf:"varint,1,opt,name=itype,proto3" json:"itype"` // + P1 string `protobuf:"bytes,2,opt,name=p1,proto3" json:"p1"` // 玩家1 + P2 string `protobuf:"bytes,3,opt,name=p2,proto3" json:"p2"` + Cid int32 `protobuf:"varint,4,opt,name=cid,proto3" json:"cid"` // 配置表id + Ctime int64 `protobuf:"varint,5,opt,name=ctime,proto3" json:"ctime"` //记录时间 +} + +func (x *PlunderRecordData) Reset() { + *x = PlunderRecordData{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_db_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordData) ProtoMessage() {} + +func (x *PlunderRecordData) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_db_proto_msgTypes[5] + 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 PlunderRecordData.ProtoReflect.Descriptor instead. +func (*PlunderRecordData) Descriptor() ([]byte, []int) { + return file_plunder_plunder_db_proto_rawDescGZIP(), []int{5} +} + +func (x *PlunderRecordData) GetItype() int32 { + if x != nil { + return x.Itype + } + return 0 +} + +func (x *PlunderRecordData) GetP1() string { + if x != nil { + return x.P1 + } + return "" +} + +func (x *PlunderRecordData) GetP2() string { + if x != nil { + return x.P2 + } + return "" +} + +func (x *PlunderRecordData) GetCid() int32 { + if x != nil { + return x.Cid + } + return 0 +} + +func (x *PlunderRecordData) GetCtime() int64 { + if x != nil { + return x.Ctime + } + return 0 +} + +// 掠夺记录 +type DBPlunderRecord struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Data []*PlunderRecordData `protobuf:"bytes,2,rep,name=data,proto3" json:"data"` // 记录详情 +} + +func (x *DBPlunderRecord) Reset() { + *x = DBPlunderRecord{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_db_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DBPlunderRecord) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DBPlunderRecord) ProtoMessage() {} + +func (x *DBPlunderRecord) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_db_proto_msgTypes[6] + 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 DBPlunderRecord.ProtoReflect.Descriptor instead. +func (*DBPlunderRecord) Descriptor() ([]byte, []int) { + return file_plunder_plunder_db_proto_rawDescGZIP(), []int{6} +} + +func (x *DBPlunderRecord) GetId() string { + if x != nil { + return x.Id + } + return "" +} + +func (x *DBPlunderRecord) GetData() []*PlunderRecordData { + if x != nil { + return x.Data + } + return nil +} + var File_plunder_plunder_db_proto protoreflect.FileDescriptor var file_plunder_plunder_db_proto_rawDesc = []byte{ @@ -525,8 +660,19 @@ var file_plunder_plunder_db_proto_rawDesc = []byte{ 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x69, 0x70, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, - 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x38, 0x01, 0x22, 0x71, 0x0a, 0x11, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x31, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x31, 0x12, 0x0e, 0x0a, + 0x02, 0x70, 0x32, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x70, 0x32, 0x12, 0x10, 0x0a, + 0x03, 0x63, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, + 0x14, 0x0a, 0x05, 0x63, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, + 0x63, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x49, 0x0a, 0x0f, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, + 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -541,33 +687,36 @@ func file_plunder_plunder_db_proto_rawDescGZIP() []byte { return file_plunder_plunder_db_proto_rawDescData } -var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_plunder_plunder_db_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_plunder_plunder_db_proto_goTypes = []interface{}{ (*DBPlunder)(nil), // 0: DBPlunder (*TransportLine)(nil), // 1: TransportLine (*PlunderLine)(nil), // 2: PlunderLine (*ShipData)(nil), // 3: ShipData (*DBPlunderLand)(nil), // 4: DBPlunderLand - nil, // 5: DBPlunder.DevelopEntry - nil, // 6: DBPlunderLand.UinfoEntry - nil, // 7: DBPlunderLand.ShipEntry - (*DBPlayerBattleFormt)(nil), // 8: DBPlayerBattleFormt - (*BaseUserInfo)(nil), // 9: BaseUserInfo + (*PlunderRecordData)(nil), // 5: PlunderRecordData + (*DBPlunderRecord)(nil), // 6: DBPlunderRecord + nil, // 7: DBPlunder.DevelopEntry + nil, // 8: DBPlunderLand.UinfoEntry + nil, // 9: DBPlunderLand.ShipEntry + (*DBPlayerBattleFormt)(nil), // 10: DBPlayerBattleFormt + (*BaseUserInfo)(nil), // 11: BaseUserInfo } var file_plunder_plunder_db_proto_depIdxs = []int32{ - 1, // 0: DBPlunder.line:type_name -> TransportLine - 5, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry - 2, // 2: ShipData.line:type_name -> PlunderLine - 8, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt - 6, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry - 7, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry - 9, // 6: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo - 3, // 7: DBPlunderLand.ShipEntry.value:type_name -> ShipData - 8, // [8:8] is the sub-list for method output_type - 8, // [8:8] is the sub-list for method input_type - 8, // [8:8] is the sub-list for extension type_name - 8, // [8:8] is the sub-list for extension extendee - 0, // [0:8] is the sub-list for field type_name + 1, // 0: DBPlunder.line:type_name -> TransportLine + 7, // 1: DBPlunder.develop:type_name -> DBPlunder.DevelopEntry + 2, // 2: ShipData.line:type_name -> PlunderLine + 10, // 3: ShipData.defend:type_name -> DBPlayerBattleFormt + 8, // 4: DBPlunderLand.uinfo:type_name -> DBPlunderLand.UinfoEntry + 9, // 5: DBPlunderLand.ship:type_name -> DBPlunderLand.ShipEntry + 5, // 6: DBPlunderRecord.data:type_name -> PlunderRecordData + 11, // 7: DBPlunderLand.UinfoEntry.value:type_name -> BaseUserInfo + 3, // 8: DBPlunderLand.ShipEntry.value:type_name -> ShipData + 9, // [9:9] is the sub-list for method output_type + 9, // [9:9] is the sub-list for method input_type + 9, // [9:9] is the sub-list for extension type_name + 9, // [9:9] is the sub-list for extension extendee + 0, // [0:9] is the sub-list for field type_name } func init() { file_plunder_plunder_db_proto_init() } @@ -638,6 +787,30 @@ func file_plunder_plunder_db_proto_init() { return nil } } + file_plunder_plunder_db_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_db_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBPlunderRecord); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -645,7 +818,7 @@ func file_plunder_plunder_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_db_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/plunder_msg.pb.go b/pb/plunder_msg.pb.go index e2f040037..9581d37ce 100644 --- a/pb/plunder_msg.pb.go +++ b/pb/plunder_msg.pb.go @@ -1127,6 +1127,91 @@ func (x *PlunderDevelopResp) GetDevelop() map[int32]int32 { return nil } +type PlunderRecordReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *PlunderRecordReq) Reset() { + *x = PlunderRecordReq{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[21] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordReq) ProtoMessage() {} + +func (x *PlunderRecordReq) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_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 PlunderRecordReq.ProtoReflect.Descriptor instead. +func (*PlunderRecordReq) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{21} +} + +type PlunderRecordResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Info *DBPlunderRecord `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` // 航海要事 +} + +func (x *PlunderRecordResp) Reset() { + *x = PlunderRecordResp{} + if protoimpl.UnsafeEnabled { + mi := &file_plunder_plunder_msg_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PlunderRecordResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PlunderRecordResp) ProtoMessage() {} + +func (x *PlunderRecordResp) ProtoReflect() protoreflect.Message { + mi := &file_plunder_plunder_msg_proto_msgTypes[22] + 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 PlunderRecordResp.ProtoReflect.Descriptor instead. +func (*PlunderRecordResp) Descriptor() ([]byte, []int) { + return file_plunder_plunder_msg_proto_rawDescGZIP(), []int{22} +} + +func (x *PlunderRecordResp) GetInfo() *DBPlunderRecord { + if x != nil { + return x.Info + } + return nil +} + var File_plunder_plunder_msg_proto protoreflect.FileDescriptor var file_plunder_plunder_msg_proto_rawDesc = []byte{ @@ -1261,8 +1346,13 @@ var file_plunder_plunder_msg_proto_rawDesc = []byte{ 0x44, 0x65, 0x76, 0x65, 0x6c, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, - 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x12, 0x0a, 0x10, 0x50, 0x6c, 0x75, 0x6e, + 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x39, 0x0a, 0x11, + 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x24, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x10, 0x2e, 0x44, 0x42, 0x50, 0x6c, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x52, 0x65, 0x63, 0x6f, 0x72, + 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1277,7 +1367,7 @@ func file_plunder_plunder_msg_proto_rawDescGZIP() []byte { return file_plunder_plunder_msg_proto_rawDescData } -var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 27) +var file_plunder_plunder_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29) var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderGetListReq)(nil), // 0: PlunderGetListReq (*PlunderGetListResp)(nil), // 1: PlunderGetListResp @@ -1300,51 +1390,55 @@ var file_plunder_plunder_msg_proto_goTypes = []interface{}{ (*PlunderUnlockResp)(nil), // 18: PlunderUnlockResp (*PlunderDevelopReq)(nil), // 19: PlunderDevelopReq (*PlunderDevelopResp)(nil), // 20: PlunderDevelopResp - nil, // 21: PlunderChallengeOverResp.ShipEntry - nil, // 22: PlunderChallengeOverResp.HeroexpEntry - nil, // 23: PlunderReachResp.ShipEntry - nil, // 24: PlunderClientTagResp.ShipEntry - nil, // 25: PlunderChangePush.ShipEntry - nil, // 26: PlunderDevelopResp.DevelopEntry - (*DBPlunder)(nil), // 27: DBPlunder - (*DBPlunderLand)(nil), // 28: DBPlunderLand - (*BattleFormation)(nil), // 29: BattleFormation - (*BattleInfo)(nil), // 30: BattleInfo - (*BattleReport)(nil), // 31: BattleReport - (*TransportLine)(nil), // 32: TransportLine - (*UserAtno)(nil), // 33: UserAtno - (*ShipData)(nil), // 34: ShipData + (*PlunderRecordReq)(nil), // 21: PlunderRecordReq + (*PlunderRecordResp)(nil), // 22: PlunderRecordResp + nil, // 23: PlunderChallengeOverResp.ShipEntry + nil, // 24: PlunderChallengeOverResp.HeroexpEntry + nil, // 25: PlunderReachResp.ShipEntry + nil, // 26: PlunderClientTagResp.ShipEntry + nil, // 27: PlunderChangePush.ShipEntry + nil, // 28: PlunderDevelopResp.DevelopEntry + (*DBPlunder)(nil), // 29: DBPlunder + (*DBPlunderLand)(nil), // 30: DBPlunderLand + (*BattleFormation)(nil), // 31: BattleFormation + (*BattleInfo)(nil), // 32: BattleInfo + (*BattleReport)(nil), // 33: BattleReport + (*TransportLine)(nil), // 34: TransportLine + (*UserAtno)(nil), // 35: UserAtno + (*DBPlunderRecord)(nil), // 36: DBPlunderRecord + (*ShipData)(nil), // 37: ShipData } var file_plunder_plunder_msg_proto_depIdxs = []int32{ - 27, // 0: PlunderGetListResp.list:type_name -> DBPlunder - 28, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand - 29, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation - 30, // 3: PlunderChallengeResp.info:type_name -> BattleInfo - 31, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport - 32, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine - 21, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry - 33, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno - 22, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry - 29, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation - 30, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo - 31, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport - 33, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno - 32, // 13: PlunderReachResp.line:type_name -> TransportLine - 23, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry - 33, // 15: PlunderReachResp.atno:type_name -> UserAtno - 24, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry - 25, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry - 32, // 18: PlunderUnlockResp.line:type_name -> TransportLine - 26, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry - 34, // 20: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData - 34, // 21: PlunderReachResp.ShipEntry.value:type_name -> ShipData - 34, // 22: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData - 34, // 23: PlunderChangePush.ShipEntry.value:type_name -> ShipData - 24, // [24:24] is the sub-list for method output_type - 24, // [24:24] is the sub-list for method input_type - 24, // [24:24] is the sub-list for extension type_name - 24, // [24:24] is the sub-list for extension extendee - 0, // [0:24] is the sub-list for field type_name + 29, // 0: PlunderGetListResp.list:type_name -> DBPlunder + 30, // 1: PlunderGetListResp.land:type_name -> DBPlunderLand + 31, // 2: PlunderChallengeReq.battle:type_name -> BattleFormation + 32, // 3: PlunderChallengeResp.info:type_name -> BattleInfo + 33, // 4: PlunderChallengeOverReq.report:type_name -> BattleReport + 34, // 5: PlunderChallengeOverResp.line:type_name -> TransportLine + 23, // 6: PlunderChallengeOverResp.ship:type_name -> PlunderChallengeOverResp.ShipEntry + 35, // 7: PlunderChallengeOverResp.atno:type_name -> UserAtno + 24, // 8: PlunderChallengeOverResp.heroexp:type_name -> PlunderChallengeOverResp.HeroexpEntry + 31, // 9: PlunderPvpChallengeReq.battle:type_name -> BattleFormation + 32, // 10: PlunderPvpChallengeResp.info:type_name -> BattleInfo + 33, // 11: PlunderPvpChallengeOverReq.report:type_name -> BattleReport + 35, // 12: PlunderPvpChallengeOverResp.atno:type_name -> UserAtno + 34, // 13: PlunderReachResp.line:type_name -> TransportLine + 25, // 14: PlunderReachResp.ship:type_name -> PlunderReachResp.ShipEntry + 35, // 15: PlunderReachResp.atno:type_name -> UserAtno + 26, // 16: PlunderClientTagResp.ship:type_name -> PlunderClientTagResp.ShipEntry + 27, // 17: PlunderChangePush.ship:type_name -> PlunderChangePush.ShipEntry + 34, // 18: PlunderUnlockResp.line:type_name -> TransportLine + 28, // 19: PlunderDevelopResp.develop:type_name -> PlunderDevelopResp.DevelopEntry + 36, // 20: PlunderRecordResp.info:type_name -> DBPlunderRecord + 37, // 21: PlunderChallengeOverResp.ShipEntry.value:type_name -> ShipData + 37, // 22: PlunderReachResp.ShipEntry.value:type_name -> ShipData + 37, // 23: PlunderClientTagResp.ShipEntry.value:type_name -> ShipData + 37, // 24: PlunderChangePush.ShipEntry.value:type_name -> ShipData + 25, // [25:25] is the sub-list for method output_type + 25, // [25:25] is the sub-list for method input_type + 25, // [25:25] is the sub-list for extension type_name + 25, // [25:25] is the sub-list for extension extendee + 0, // [0:25] is the sub-list for field type_name } func init() { file_plunder_plunder_msg_proto_init() } @@ -1608,6 +1702,30 @@ func file_plunder_plunder_msg_proto_init() { return nil } } + file_plunder_plunder_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_plunder_plunder_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PlunderRecordResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1615,7 +1733,7 @@ func file_plunder_plunder_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_plunder_plunder_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 27, + NumMessages: 29, NumExtensions: 0, NumServices: 0, }, From 22bcc92e0dc3e09c89c01fd0869968ce2f7212a6 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 23 Jan 2024 17:37:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=88=98=E6=96=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/plunder/api_challengeover.go | 2 +- modules/plunder/api_pvpchallengeover.go | 4 ++-- modules/plunder/model_record.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go index f5df47973..fbbcfe397 100644 --- a/modules/plunder/api_challengeover.go +++ b/modules/plunder/api_challengeover.go @@ -238,7 +238,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha Cid: list.Source[req.Index], Ctime: configure.Now().Unix() + int64(conf.Extime), }) - err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) + err = this.module.modelRecord.AddRecordData(land.Id, info) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { this.module.WriteUserLog(session.GetUserId(), req, comm.GMResAddType, "PlunderChallengeOverReq", atno) }) diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go index bbbf7d9e5..5c53f1766 100644 --- a/modules/plunder/api_pvpchallengeover.go +++ b/modules/plunder/api_pvpchallengeover.go @@ -107,7 +107,7 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder Cid: land.Ship[req.Oid].Line.Cid, Ctime: configure.Now().Unix(), }) - err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) + err = this.module.modelRecord.AddRecordData(land.Id, info) return } @@ -146,6 +146,6 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder Cid: land.Ship[req.Oid].Line.Cid, Ctime: configure.Now().Unix(), }) - err = this.module.modelRecord.AddRecordData(session.GetUserId(), info) + err = this.module.modelRecord.AddRecordData(land.Id, info) return } diff --git a/modules/plunder/model_record.go b/modules/plunder/model_record.go index 93638922b..2b3b3727b 100644 --- a/modules/plunder/model_record.go +++ b/modules/plunder/model_record.go @@ -37,7 +37,7 @@ func (this *modelRecord) changePlunderRecordData(id string, update map[string]in // 新增一条记录 func (this *modelRecord) AddRecordData(id string, info []*pb.PlunderRecordData) (err error) { - if record, err := this.getPlunderRecordData(id); err != nil { + if record, err := this.getPlunderRecordData(id); err == nil { record.Data = append(record.Data, info...) err = this.changePlunderRecordData(id, map[string]interface{}{"data": record.Data}) } From 692d69d0bad85cbd98a3e0ecded343fe2d7aaa3c Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Tue, 23 Jan 2024 18:08:03 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=8E=B7=E5=BE=97=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/imodule.go | 2 ++ modules/plunder/model_land.go | 2 +- modules/plunder/model_plunder.go | 2 +- modules/user/model_user.go | 36 ++++++++++++++++++++++++++++++++ modules/user/module.go | 3 +++ 5 files changed, 43 insertions(+), 2 deletions(-) diff --git a/comm/imodule.go b/comm/imodule.go index d4e44aec6..2183856e8 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -221,6 +221,8 @@ type ( PsConvertExp(ps int32) (res *cfg.Gameatn) CleanUserConsumeMoney(session IUserSession) (err error) + // 增加隐藏分 + AddUserHidenum(session IUserSession, score int32) (err error) } //武器模块 IEquipment interface { diff --git a/modules/plunder/model_land.go b/modules/plunder/model_land.go index 21d57e3c3..523775b97 100644 --- a/modules/plunder/model_land.go +++ b/modules/plunder/model_land.go @@ -71,7 +71,7 @@ func (this *modelLand) createPlunderLandData(uid string) (land *pb.DBPlunderLand } uids = append(uids, uid) // 优先加入自己 uInfos = append(uInfos, comm.GetUserBaseInfo(user)) - cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"gold": bson.M{"$gte": limtSocre}, "name": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30))) + cur, err := this.DB.Find(core.SqlTable(comm.TableUser), bson.M{"plunder": bson.M{"$gte": limtSocre}, "name": bson.M{"$ne": ""}}, options.Find().SetSkip(int64(0)).SetLimit(int64(30))) for cur.Next(context.TODO()) { tmp := &pb.DBUser{} if err = cur.Decode(tmp); err == nil { diff --git a/modules/plunder/model_plunder.go b/modules/plunder/model_plunder.go index bbbbb732c..a2838c0f1 100644 --- a/modules/plunder/model_plunder.go +++ b/modules/plunder/model_plunder.go @@ -136,7 +136,7 @@ func (this *modelPlunder) queryPlunderInfos(uids []string, landid string) (data results = make([]*pb.DBPlunder, 0) mp = make(map[string]struct{}) - if _, err = this.Gets(uids, &results); err != nil { + if _, err = this.GetByUids(uids, &results); err != nil { this.module.Errorln(err) return } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index 86012de06..566cc8865 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -45,6 +45,9 @@ func (this *ModelUser) Init(service core.IService, module core.IModule, comp cor this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "merchantmoney", Value: bsonx.Int32(1)}}, }) + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "plunder", Value: bsonx.Int32(1)}}, + }) return } @@ -420,3 +423,36 @@ func (this *ModelUser) CleanUserConsumeMoney(session comm.IUserSession) (err err } return } + +func (this *ModelUser) AddUserHidenum(uid string, score int32) (err error) { + var ( + user *pb.DBUser + ) + user = &pb.DBUser{} + + if this.module.IsCross() { + var model *db.DBModel + if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil { + this.module.Errorln(err) + } else { + if err = model.Get(uid, user); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + if err = model.Change(uid, map[string]interface{}{ + "plunder": user.Plunder + score, + }); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + } + } else { + if err = this.Get(uid, user); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + if err = this.Change(uid, map[string]interface{}{ + "plunder": user.Plunder + score, + }); err != nil { + this.module.Errorf("uid:%s err:%v", uid, err) + } + } + return +} diff --git a/modules/user/module.go b/modules/user/module.go index 08bf331b5..34620324a 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -1476,3 +1476,6 @@ func (this *User) PsConvertExp(ps int32) (res *cfg.Gameatn) { func (this *User) CleanUserConsumeMoney(session comm.IUserSession) (err error) { return this.modelUser.CleanUserConsumeMoney(session) } +func (this *User) AddUserHidenum(session comm.IUserSession, score int32) (err error) { + return this.modelUser.AddUserHidenum(session.GetUserId(), score) +}