From 1f2a67d5919e37235a9c881e653968ea20961ccf Mon Sep 17 00:00:00 2001 From: liwei <2211068034@qq.com> Date: Fri, 28 Jul 2023 15:43:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_annulartask_library.json | 36 --- bin/json/game_asklibrary.json | 70 ++--- bin/json/game_gamesummary.json | 110 +++---- bin/json/game_gamesummarytab.json | 106 ++----- bin/json/game_huntingboss.json | 144 ++++----- bin/json/game_stonebuff.json | 320 ++++++++++---------- bin/json/game_stoneevent.json | 24 +- bin/json/game_worldtask.json | 24 +- pb/battle_db.pb.go | 391 ++++++++++++++++--------- pb/dailytask_db.pb.go | 22 +- 10 files changed, 620 insertions(+), 627 deletions(-) diff --git a/bin/json/game_annulartask_library.json b/bin/json/game_annulartask_library.json index 2df6c550d..cc2c4e155 100644 --- a/bin/json/game_annulartask_library.json +++ b/bin/json/game_annulartask_library.json @@ -8,15 +8,6 @@ "itemwt": 1000, "min": 0 }, - { - "id": 2, - "assembleid": 60000010, - "lvstart": 1, - "lvend": 999, - "itemid": 1020, - "itemwt": 1000, - "min": 0 - }, { "id": 3, "assembleid": 60000010, @@ -26,15 +17,6 @@ "itemwt": 1000, "min": 0 }, - { - "id": 4, - "assembleid": 60000010, - "lvstart": 1, - "lvend": 999, - "itemid": 1040, - "itemwt": 1000, - "min": 0 - }, { "id": 5, "assembleid": 60000010, @@ -44,24 +26,6 @@ "itemwt": 1000, "min": 0 }, - { - "id": 6, - "assembleid": 60000010, - "lvstart": 1, - "lvend": 999, - "itemid": 1060, - "itemwt": 1000, - "min": 0 - }, - { - "id": 7, - "assembleid": 60000010, - "lvstart": 1, - "lvend": 999, - "itemid": 1070, - "itemwt": 1000, - "min": 0 - }, { "id": 8, "assembleid": 60000020, diff --git a/bin/json/game_asklibrary.json b/bin/json/game_asklibrary.json index 17e0e1a25..f79135c84 100644 --- a/bin/json/game_asklibrary.json +++ b/bin/json/game_asklibrary.json @@ -24,7 +24,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -55,7 +55,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -86,7 +86,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -117,7 +117,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -148,7 +148,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -179,7 +179,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -210,7 +210,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -241,7 +241,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -272,7 +272,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -303,7 +303,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 1, @@ -334,7 +334,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -365,7 +365,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -396,7 +396,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -427,7 +427,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -458,7 +458,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -489,7 +489,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -520,7 +520,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -551,7 +551,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -582,7 +582,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -613,7 +613,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -644,7 +644,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -675,7 +675,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -706,7 +706,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -737,7 +737,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -768,7 +768,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -799,7 +799,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -830,7 +830,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -861,7 +861,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -892,7 +892,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -923,7 +923,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -954,7 +954,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -985,7 +985,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -1016,7 +1016,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -1047,7 +1047,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, @@ -1078,7 +1078,7 @@ "text": "乌龟大师" }, "weight": 1000, - "pic": "", + "pic": "rw_rc_img", "True": "", "flase": "", "fraction": 3, diff --git a/bin/json/game_gamesummary.json b/bin/json/game_gamesummary.json index 2d609b7fd..b2fafa38c 100644 --- a/bin/json/game_gamesummary.json +++ b/bin/json/game_gamesummary.json @@ -7,8 +7,8 @@ }, "tabId": 2, "mapPos": { - "x": 400, - "y": 400 + "x": 3665, + "y": 1922 }, "type": 1, "params": "", @@ -35,8 +35,8 @@ }, "tabId": 10, "mapPos": { - "x": 200, - "y": 1900 + "x": 4513, + "y": 1528 }, "type": 3, "params": "", @@ -63,12 +63,12 @@ }, "tabId": 4, "mapPos": { - "x": 600, - "y": 1200 + "x": 2871, + "y": 2511 }, "type": 2, "params": "1", - "jumpId": 10026, + "jumpId": 10023, "introduce": { "key": "gamesummary_node_introdunce_3", "text": "狩猎-巨型猩猩" @@ -101,8 +101,8 @@ }, "tabId": 4, "mapPos": { - "x": 800, - "y": 1100 + "x": 2220, + "y": 1490 }, "type": 2, "params": "2", @@ -139,12 +139,12 @@ }, "tabId": 4, "mapPos": { - "x": 300, - "y": 1250 + "x": 4062, + "y": 912 }, "type": 2, "params": "3", - "jumpId": 168, + "jumpId": 10026, "introduce": { "key": "gamesummary_node_introdunce_5", "text": "狩猎-太空海星" @@ -177,8 +177,8 @@ }, "tabId": 4, "mapPos": { - "x": 400, - "y": 900 + "x": 5211, + "y": 1680 }, "type": 2, "params": "4", @@ -215,8 +215,8 @@ }, "tabId": 3, "mapPos": { - "x": 860, - "y": 100 + "x": 2051, + "y": 676 }, "type": 4, "params": "", @@ -258,8 +258,8 @@ }, "tabId": 3, "mapPos": { - "x": 1060, - "y": 200 + "x": 2412, + "y": 453 }, "type": 4, "params": "", @@ -301,8 +301,8 @@ }, "tabId": 3, "mapPos": { - "x": 660, - "y": 300 + "x": 2740, + "y": 624 }, "type": 4, "params": "", @@ -344,8 +344,8 @@ }, "tabId": 5, "mapPos": { - "x": 2500, - "y": 1000 + "x": 2212, + "y": 165 }, "type": 4, "params": "", @@ -380,10 +380,10 @@ "key": "gamesummary_node_name_11", "text": "功夫大师挑战塔" }, - "tabId": 7, + "tabId": 6, "mapPos": { - "x": 2250, - "y": 1700 + "x": 5080, + "y": 1252 }, "type": 4, "params": "", @@ -406,19 +406,19 @@ "id": 12, "name": { "key": "gamesummary_node_name_12", - "text": "循环塔" + "text": "功夫大师循环塔" }, - "tabId": 8, + "tabId": 6, "mapPos": { - "x": 2300, - "y": 1900 + "x": 5827, + "y": 1560 }, "type": 4, "params": "", "jumpId": 10017, "introduce": { "key": "gamesummary_node_introdunce_12", - "text": "循环塔" + "text": "功夫大师循环塔" }, "bg": "hkz_wftj_wjyz01", "icon": "fb_rk_wj1", @@ -434,19 +434,19 @@ "id": 13, "name": { "key": "gamesummary_node_name_13", - "text": "阵营塔" + "text": "功夫大师阵营塔" }, - "tabId": 9, + "tabId": 6, "mapPos": { - "x": 2500, - "y": 2040 + "x": 6048, + "y": 1855 }, "type": 4, "params": "", "jumpId": 10018, "introduce": { "key": "gamesummary_node_introdunce_13", - "text": "阵营塔" + "text": "功夫大师阵营塔" }, "bg": "hkz_wftj_wjyz01", "icon": "fb_rk_wj1", @@ -466,8 +466,8 @@ }, "tabId": 12, "mapPos": { - "x": 2400, - "y": 1000 + "x": 5531, + "y": 1050 }, "type": 4, "params": "", @@ -486,34 +486,6 @@ } ] }, - { - "id": 15, - "name": { - "key": "gamesummary_node_name_15", - "text": "旧时光" - }, - "tabId": 13, - "mapPos": { - "x": 2200, - "y": 1100 - }, - "type": 4, - "params": "", - "jumpId": 10019, - "introduce": { - "key": "gamesummary_node_introdunce_15", - "text": "旧时光" - }, - "bg": "hkz_wftj_jsg", - "icon": "rw_cj_icon05", - "dropshow": [ - { - "a": "attr", - "t": "gold", - "n": 1 - } - ] - }, { "id": 16, "name": { @@ -522,15 +494,15 @@ }, "tabId": 11, "mapPos": { - "x": 600, - "y": 1900 + "x": 1700, + "y": 2700 }, "type": 4, "params": "", - "jumpId": 10019, + "jumpId": 10027, "introduce": { "key": "gamesummary_node_introdunce_16", - "text": "迷宫玩法" + "text": "石阵秘境" }, "bg": "hkz_wftj_jsg", "icon": "rw_cj_icon01", diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index eb9caf047..1665e0fee 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -7,10 +7,10 @@ "text": "探险旅程" }, "mapPos": { - "x": 0, - "y": 0 + "x": -2000, + "y": 2100 }, - "scale": 1 + "scale": 0.8 }, { "tabId": 2, @@ -20,10 +20,10 @@ "text": "冒险关卡" }, "mapPos": { - "x": -100, - "y": 100 + "x": -2363, + "y": 1272 }, - "scale": 1 + "scale": 0.8 }, { "tabId": 3, @@ -33,10 +33,10 @@ "text": "维京远征" }, "mapPos": { - "x": -300, - "y": 0 + "x": -1500, + "y": 243 }, - "scale": 1 + "scale": 0.85 }, { "tabId": 4, @@ -46,10 +46,10 @@ "text": "狩猎挑战" }, "mapPos": { - "x": 0, - "y": 860 + "x": -629, + "y": 237 }, - "scale": 1 + "scale": 0.34 }, { "tabId": 5, @@ -59,10 +59,10 @@ "text": "梦境回廊" }, "mapPos": { - "x": -2000, - "y": 800 + "x": -1324, + "y": 0 }, - "scale": 1 + "scale": 0.8 }, { "tabId": 6, @@ -72,49 +72,10 @@ "text": "功夫训练" }, "mapPos": { - "x": -2000, - "y": 1600 + "x": -3065, + "y": 754 }, - "scale": 1 - }, - { - "tabId": 7, - "layer": 1, - "name": { - "key": "gamesummary_fathernode_name_7", - "text": "功夫大师挑战塔" - }, - "mapPos": { - "x": -2000, - "y": 1600 - }, - "scale": 1 - }, - { - "tabId": 8, - "layer": 1, - "name": { - "key": "gamesummary_fathernode_name_8", - "text": "功夫大师循环塔" - }, - "mapPos": { - "x": -2000, - "y": 1600 - }, - "scale": 1 - }, - { - "tabId": 9, - "layer": 1, - "name": { - "key": "gamesummary_fathernode_name_9", - "text": "功夫大师阵营塔" - }, - "mapPos": { - "x": -2000, - "y": 1600 - }, - "scale": 1 + "scale": 0.65 }, { "tabId": 10, @@ -124,10 +85,10 @@ "text": "竞技挑战" }, "mapPos": { - "x": 0, - "y": 1600 + "x": -3055, + "y": 967 }, - "scale": 1 + "scale": 0.8 }, { "tabId": 11, @@ -137,10 +98,10 @@ "text": "迷宫玩法" }, "mapPos": { - "x": 0, - "y": 1600 + "x": -1037, + "y": 1864 }, - "scale": 1 + "scale": 0.8 }, { "tabId": 12, @@ -150,22 +111,9 @@ "text": "巨怪商队" }, "mapPos": { - "x": -1600, - "y": 800 + "x": -3897, + "y": 603 }, - "scale": 1 - }, - { - "tabId": 13, - "layer": 0, - "name": { - "key": "gamesummary_fathernode_name_13", - "text": "旧时光" - }, - "mapPos": { - "x": -1600, - "y": 800 - }, - "scale": 1 + "scale": 0.8 } ] \ No newline at end of file diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json index c485afe82..9919310a7 100644 --- a/bin/json/game_huntingboss.json +++ b/bin/json/game_huntingboss.json @@ -4,7 +4,7 @@ "type": 1, "name": { "key": "hunting_boss_name_1", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 1, "BattleReadyID": 122, @@ -29,7 +29,7 @@ ], "drop": 10001000, "heroexp": 200, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401003 ], @@ -60,7 +60,7 @@ "type": 1, "name": { "key": "hunting_boss_name_2", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 2, "BattleReadyID": 122, @@ -85,7 +85,7 @@ ], "drop": 10002000, "heroexp": 242, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401006 ], @@ -116,7 +116,7 @@ "type": 1, "name": { "key": "hunting_boss_name_3", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 3, "BattleReadyID": 122, @@ -146,7 +146,7 @@ ], "drop": 10003000, "heroexp": 288, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401009 ], @@ -177,7 +177,7 @@ "type": 1, "name": { "key": "hunting_boss_name_4", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 4, "BattleReadyID": 122, @@ -207,7 +207,7 @@ ], "drop": 10004000, "heroexp": 338, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401012 ], @@ -238,7 +238,7 @@ "type": 1, "name": { "key": "hunting_boss_name_5", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 5, "BattleReadyID": 122, @@ -268,7 +268,7 @@ ], "drop": 10005000, "heroexp": 392, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401015 ], @@ -299,7 +299,7 @@ "type": 1, "name": { "key": "hunting_boss_name_6", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 6, "BattleReadyID": 122, @@ -329,7 +329,7 @@ ], "drop": 10006000, "heroexp": 450, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401018 ], @@ -360,7 +360,7 @@ "type": 1, "name": { "key": "hunting_boss_name_7", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 7, "BattleReadyID": 122, @@ -395,7 +395,7 @@ ], "drop": 10007000, "heroexp": 512, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401021 ], @@ -426,7 +426,7 @@ "type": 1, "name": { "key": "hunting_boss_name_8", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 8, "BattleReadyID": 122, @@ -461,7 +461,7 @@ ], "drop": 10008000, "heroexp": 578, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401024 ], @@ -492,7 +492,7 @@ "type": 1, "name": { "key": "hunting_boss_name_9", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 9, "BattleReadyID": 122, @@ -527,7 +527,7 @@ ], "drop": 10009000, "heroexp": 648, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401027 ], @@ -558,7 +558,7 @@ "type": 1, "name": { "key": "hunting_boss_name_10", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 10, "BattleReadyID": 122, @@ -593,7 +593,7 @@ ], "drop": 10010000, "heroexp": 722, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401030 ], @@ -624,7 +624,7 @@ "type": 1, "name": { "key": "hunting_boss_name_11", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 11, "BattleReadyID": 122, @@ -659,7 +659,7 @@ ], "drop": 10011000, "heroexp": 800, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401033 ], @@ -690,7 +690,7 @@ "type": 1, "name": { "key": "hunting_boss_name_12", - "text": "巨型猩猩" + "text": "巨型猩猩怪兽" }, "difficulty": 12, "BattleReadyID": 122, @@ -725,7 +725,7 @@ ], "drop": 10012000, "heroexp": 800, - "bossmodel": 53001, + "bossmodel": 55002, "boss": [ 401036 ], @@ -781,7 +781,7 @@ ], "drop": 20001000, "heroexp": 200, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402003 ], @@ -837,7 +837,7 @@ ], "drop": 20002000, "heroexp": 242, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402006 ], @@ -898,7 +898,7 @@ ], "drop": 20003000, "heroexp": 288, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402009 ], @@ -959,7 +959,7 @@ ], "drop": 20004000, "heroexp": 338, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402012 ], @@ -1020,7 +1020,7 @@ ], "drop": 20005000, "heroexp": 392, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402015 ], @@ -1081,7 +1081,7 @@ ], "drop": 20006000, "heroexp": 450, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402018 ], @@ -1147,7 +1147,7 @@ ], "drop": 20007000, "heroexp": 512, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402021 ], @@ -1213,7 +1213,7 @@ ], "drop": 20008000, "heroexp": 578, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402024 ], @@ -1279,7 +1279,7 @@ ], "drop": 20009000, "heroexp": 648, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402027 ], @@ -1345,7 +1345,7 @@ ], "drop": 20010000, "heroexp": 722, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402030 ], @@ -1411,7 +1411,7 @@ ], "drop": 20011000, "heroexp": 800, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402033 ], @@ -1477,7 +1477,7 @@ ], "drop": 20012000, "heroexp": 800, - "bossmodel": 51004, + "bossmodel": 55001, "boss": [ 402036 ], @@ -1533,7 +1533,7 @@ ], "drop": 30001000, "heroexp": 200, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403003 ], @@ -1589,7 +1589,7 @@ ], "drop": 30002000, "heroexp": 242, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403006 ], @@ -1650,7 +1650,7 @@ ], "drop": 30003000, "heroexp": 288, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403009 ], @@ -1711,7 +1711,7 @@ ], "drop": 30004000, "heroexp": 338, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403012 ], @@ -1772,7 +1772,7 @@ ], "drop": 30005000, "heroexp": 392, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403015 ], @@ -1833,7 +1833,7 @@ ], "drop": 30006000, "heroexp": 450, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403018 ], @@ -1899,7 +1899,7 @@ ], "drop": 30007000, "heroexp": 512, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403021 ], @@ -1965,7 +1965,7 @@ ], "drop": 30008000, "heroexp": 578, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403024 ], @@ -2031,7 +2031,7 @@ ], "drop": 30009000, "heroexp": 648, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403027 ], @@ -2097,7 +2097,7 @@ ], "drop": 30010000, "heroexp": 722, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403030 ], @@ -2163,7 +2163,7 @@ ], "drop": 30011000, "heroexp": 800, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403033 ], @@ -2229,7 +2229,7 @@ ], "drop": 30012000, "heroexp": 800, - "bossmodel": 51005, + "bossmodel": 55004, "boss": [ 403036 ], @@ -2260,7 +2260,7 @@ "type": 4, "name": { "key": "hunting_boss_name_37", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 1, "BattleReadyID": 125, @@ -2285,7 +2285,7 @@ ], "drop": 40001000, "heroexp": 200, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404003 ], @@ -2316,7 +2316,7 @@ "type": 4, "name": { "key": "hunting_boss_name_38", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 2, "BattleReadyID": 125, @@ -2341,7 +2341,7 @@ ], "drop": 40002000, "heroexp": 242, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404006 ], @@ -2372,7 +2372,7 @@ "type": 4, "name": { "key": "hunting_boss_name_39", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 3, "BattleReadyID": 125, @@ -2402,7 +2402,7 @@ ], "drop": 40003000, "heroexp": 288, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404009 ], @@ -2433,7 +2433,7 @@ "type": 4, "name": { "key": "hunting_boss_name_40", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 4, "BattleReadyID": 125, @@ -2463,7 +2463,7 @@ ], "drop": 40004000, "heroexp": 338, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404012 ], @@ -2494,7 +2494,7 @@ "type": 4, "name": { "key": "hunting_boss_name_41", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 5, "BattleReadyID": 125, @@ -2524,7 +2524,7 @@ ], "drop": 40005000, "heroexp": 392, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404015 ], @@ -2555,7 +2555,7 @@ "type": 4, "name": { "key": "hunting_boss_name_42", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 6, "BattleReadyID": 125, @@ -2585,7 +2585,7 @@ ], "drop": 40006000, "heroexp": 450, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404018 ], @@ -2616,7 +2616,7 @@ "type": 4, "name": { "key": "hunting_boss_name_43", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 7, "BattleReadyID": 125, @@ -2651,7 +2651,7 @@ ], "drop": 40007000, "heroexp": 512, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404021 ], @@ -2682,7 +2682,7 @@ "type": 4, "name": { "key": "hunting_boss_name_44", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 8, "BattleReadyID": 125, @@ -2717,7 +2717,7 @@ ], "drop": 40008000, "heroexp": 578, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404024 ], @@ -2748,7 +2748,7 @@ "type": 4, "name": { "key": "hunting_boss_name_45", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 9, "BattleReadyID": 125, @@ -2783,7 +2783,7 @@ ], "drop": 40009000, "heroexp": 648, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404027 ], @@ -2814,7 +2814,7 @@ "type": 4, "name": { "key": "hunting_boss_name_46", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 10, "BattleReadyID": 125, @@ -2849,7 +2849,7 @@ ], "drop": 40010000, "heroexp": 722, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404030 ], @@ -2880,7 +2880,7 @@ "type": 4, "name": { "key": "hunting_boss_name_47", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 11, "BattleReadyID": 125, @@ -2915,7 +2915,7 @@ ], "drop": 40011000, "heroexp": 800, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404033 ], @@ -2946,7 +2946,7 @@ "type": 4, "name": { "key": "hunting_boss_name_48", - "text": "太空海星" + "text": "格尔族" }, "difficulty": 12, "BattleReadyID": 125, @@ -2981,7 +2981,7 @@ ], "drop": 40012000, "heroexp": 800, - "bossmodel": 51002, + "bossmodel": 55003, "boss": [ 404036 ], diff --git a/bin/json/game_stonebuff.json b/bin/json/game_stonebuff.json index b8497940b..6b6ddc5e4 100644 --- a/bin/json/game_stonebuff.json +++ b/bin/json/game_stonebuff.json @@ -505,7 +505,7 @@ "SkillId": 770001111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -530,7 +530,7 @@ "SkillId": 770001111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -555,7 +555,7 @@ "SkillId": 770002111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -580,7 +580,7 @@ "SkillId": 770002111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -605,7 +605,7 @@ "SkillId": 770003111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -630,7 +630,7 @@ "SkillId": 770003111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -655,7 +655,7 @@ "SkillId": 770004111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -680,7 +680,7 @@ "SkillId": 770004111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -705,7 +705,7 @@ "SkillId": 770005111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -730,7 +730,7 @@ "SkillId": 770005111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -755,7 +755,7 @@ "SkillId": 770006111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -780,7 +780,7 @@ "SkillId": 770006111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -805,7 +805,7 @@ "SkillId": 770007111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -830,7 +830,7 @@ "SkillId": 770007111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -855,7 +855,7 @@ "SkillId": 770008111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -880,7 +880,7 @@ "SkillId": 770008111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -905,7 +905,7 @@ "SkillId": 770009111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -930,7 +930,7 @@ "SkillId": 770009111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -955,7 +955,7 @@ "SkillId": 770010111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -980,7 +980,7 @@ "SkillId": 770010111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1005,7 +1005,7 @@ "SkillId": 770011111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1030,7 +1030,7 @@ "SkillId": 770011111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1055,7 +1055,7 @@ "SkillId": 770012111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1080,7 +1080,7 @@ "SkillId": 770012111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1105,7 +1105,7 @@ "SkillId": 770013111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1130,7 +1130,7 @@ "SkillId": 770013111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1155,7 +1155,7 @@ "SkillId": 770014111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1180,7 +1180,7 @@ "SkillId": 770014111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1205,7 +1205,7 @@ "SkillId": 770015111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1230,7 +1230,7 @@ "SkillId": 770015111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1255,7 +1255,7 @@ "SkillId": 770016111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1280,7 +1280,7 @@ "SkillId": 770016111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1305,7 +1305,7 @@ "SkillId": 770017111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1330,7 +1330,7 @@ "SkillId": 770017111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1355,7 +1355,7 @@ "SkillId": 770018111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1380,7 +1380,7 @@ "SkillId": 770018111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1405,7 +1405,7 @@ "SkillId": 770019111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1430,7 +1430,7 @@ "SkillId": 770019111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1455,7 +1455,7 @@ "SkillId": 770020111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1480,7 +1480,7 @@ "SkillId": 770020111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1505,7 +1505,7 @@ "SkillId": 770021111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1530,7 +1530,7 @@ "SkillId": 770021111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1555,7 +1555,7 @@ "SkillId": 770022111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1580,7 +1580,7 @@ "SkillId": 770022111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1605,7 +1605,7 @@ "SkillId": 770023111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1630,7 +1630,7 @@ "SkillId": 770023111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1655,7 +1655,7 @@ "SkillId": 770024111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1680,7 +1680,7 @@ "SkillId": 770024111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1705,7 +1705,7 @@ "SkillId": 770025111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1730,7 +1730,7 @@ "SkillId": 770025111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1755,7 +1755,7 @@ "SkillId": 770026111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1780,7 +1780,7 @@ "SkillId": 770026111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1805,7 +1805,7 @@ "SkillId": 770027111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1830,7 +1830,7 @@ "SkillId": 770027111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1855,7 +1855,7 @@ "SkillId": 770028111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1880,7 +1880,7 @@ "SkillId": 770028111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1905,7 +1905,7 @@ "SkillId": 770029111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1930,7 +1930,7 @@ "SkillId": 770029111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1955,7 +1955,7 @@ "SkillId": 770030111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1980,7 +1980,7 @@ "SkillId": 770030111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2005,7 +2005,7 @@ "SkillId": 770031111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2030,7 +2030,7 @@ "SkillId": 770031111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2055,7 +2055,7 @@ "SkillId": 770032111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -2080,7 +2080,7 @@ "SkillId": 770032111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -2105,7 +2105,7 @@ "SkillId": 770033111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2130,7 +2130,7 @@ "SkillId": 770033111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2155,7 +2155,7 @@ "SkillId": 770034111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2180,7 +2180,7 @@ "SkillId": 770034111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2205,7 +2205,7 @@ "SkillId": 770035111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2230,7 +2230,7 @@ "SkillId": 770035111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2255,7 +2255,7 @@ "SkillId": 770036111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2280,7 +2280,7 @@ "SkillId": 770036111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2305,7 +2305,7 @@ "SkillId": 770037111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2330,7 +2330,7 @@ "SkillId": 770037111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2355,7 +2355,7 @@ "SkillId": 770038111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2380,7 +2380,7 @@ "SkillId": 770038111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2405,7 +2405,7 @@ "SkillId": 770039111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2430,7 +2430,7 @@ "SkillId": 770039111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2455,7 +2455,7 @@ "SkillId": 770040111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2480,7 +2480,7 @@ "SkillId": 770040111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2505,7 +2505,7 @@ "SkillId": 770041111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2530,7 +2530,7 @@ "SkillId": 770041111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2555,7 +2555,7 @@ "SkillId": 770042111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2580,7 +2580,7 @@ "SkillId": 770042111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2605,7 +2605,7 @@ "SkillId": 770043111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2630,7 +2630,7 @@ "SkillId": 770043111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2655,7 +2655,7 @@ "SkillId": 770044111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2680,7 +2680,7 @@ "SkillId": 770044111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2705,7 +2705,7 @@ "SkillId": 770045111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2730,7 +2730,7 @@ "SkillId": 770045111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2755,7 +2755,7 @@ "SkillId": 770046111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2780,7 +2780,7 @@ "SkillId": 770046111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2805,7 +2805,7 @@ "SkillId": 770047111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2830,7 +2830,7 @@ "SkillId": 770047111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2855,7 +2855,7 @@ "SkillId": 770048111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2880,7 +2880,7 @@ "SkillId": 770048111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2905,7 +2905,7 @@ "SkillId": 770049111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2930,7 +2930,7 @@ "SkillId": 770049111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2955,7 +2955,7 @@ "SkillId": 770050111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2980,7 +2980,7 @@ "SkillId": 770050111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3005,7 +3005,7 @@ "SkillId": 770051111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3030,7 +3030,7 @@ "SkillId": 770051111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3055,7 +3055,7 @@ "SkillId": 770052111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3080,7 +3080,7 @@ "SkillId": 770052111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3105,7 +3105,7 @@ "SkillId": 770053111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3130,7 +3130,7 @@ "SkillId": 770053111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3155,7 +3155,7 @@ "SkillId": 770054111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3180,7 +3180,7 @@ "SkillId": 770054111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3205,7 +3205,7 @@ "SkillId": 770055111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3230,7 +3230,7 @@ "SkillId": 770055111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3255,7 +3255,7 @@ "SkillId": 770056111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3280,7 +3280,7 @@ "SkillId": 770056111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3305,7 +3305,7 @@ "SkillId": 770057111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3330,7 +3330,7 @@ "SkillId": 770057111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3355,7 +3355,7 @@ "SkillId": 770058111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3380,7 +3380,7 @@ "SkillId": 770058111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3405,7 +3405,7 @@ "SkillId": 770059111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3430,7 +3430,7 @@ "SkillId": 770059111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "2", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3455,7 +3455,7 @@ "SkillId": 770060111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -3480,7 +3480,7 @@ "SkillId": 770060111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -3505,7 +3505,7 @@ "SkillId": 770061111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3530,7 +3530,7 @@ "SkillId": 770061111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3555,7 +3555,7 @@ "SkillId": 770062111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3580,7 +3580,7 @@ "SkillId": 770062111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3605,7 +3605,7 @@ "SkillId": 770063111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3630,7 +3630,7 @@ "SkillId": 770063111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3655,7 +3655,7 @@ "SkillId": 770064111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3680,7 +3680,7 @@ "SkillId": 770064111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3705,7 +3705,7 @@ "SkillId": 770065111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3730,7 +3730,7 @@ "SkillId": 770065111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3755,7 +3755,7 @@ "SkillId": 770066111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3780,7 +3780,7 @@ "SkillId": 770066111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3805,7 +3805,7 @@ "SkillId": 770067111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3830,7 +3830,7 @@ "SkillId": 770067111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3855,7 +3855,7 @@ "SkillId": 770068111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3880,7 +3880,7 @@ "SkillId": 770068111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3905,7 +3905,7 @@ "SkillId": 770069111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3930,7 +3930,7 @@ "SkillId": 770069111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3955,7 +3955,7 @@ "SkillId": 770070111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3980,7 +3980,7 @@ "SkillId": 770070111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4005,7 +4005,7 @@ "SkillId": 770071111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4030,7 +4030,7 @@ "SkillId": 770071111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4055,7 +4055,7 @@ "SkillId": 770072111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4080,7 +4080,7 @@ "SkillId": 770072111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4105,7 +4105,7 @@ "SkillId": 770073111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4130,7 +4130,7 @@ "SkillId": 770073111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4155,7 +4155,7 @@ "SkillId": 770074111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4180,7 +4180,7 @@ "SkillId": 770074111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "1", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4205,7 +4205,7 @@ "SkillId": 770075111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4230,7 +4230,7 @@ "SkillId": 770075111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4255,7 +4255,7 @@ "SkillId": 770076111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4280,7 +4280,7 @@ "SkillId": 770076111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4305,7 +4305,7 @@ "SkillId": 770077111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4330,7 +4330,7 @@ "SkillId": 770077111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4355,7 +4355,7 @@ "SkillId": 770078111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4380,7 +4380,7 @@ "SkillId": 770078111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "3", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4405,7 +4405,7 @@ "SkillId": 770079111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4430,7 +4430,7 @@ "SkillId": 770079111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "", + "BuffIcon": "5", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4455,7 +4455,7 @@ "SkillId": 770080111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4480,7 +4480,7 @@ "SkillId": 770080111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "", + "BuffIcon": "4", "TargetType": 1, "CampType": 0, "TakeDataType": 0, diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json index bbc7e6366..e605bc151 100644 --- a/bin/json/game_stoneevent.json +++ b/bin/json/game_stoneevent.json @@ -12,8 +12,8 @@ "Value3": 0, "Value4": 0, "CostItem": [], - "PostEvent": 25100001, - "probability": 1000 + "PostEvent": 0, + "probability": 0 }, { "EventId": 14110101, @@ -28,8 +28,8 @@ "Value3": 0, "Value4": 0, "CostItem": [], - "PostEvent": 0, - "probability": 0 + "PostEvent": 25100001, + "probability": 1000 }, { "EventId": 14110102, @@ -44,8 +44,8 @@ "Value3": 0, "Value4": 0, "CostItem": [], - "PostEvent": 0, - "probability": 0 + "PostEvent": 25100001, + "probability": 1000 }, { "EventId": 14110103, @@ -60,8 +60,8 @@ "Value3": 0, "Value4": 0, "CostItem": [], - "PostEvent": 0, - "probability": 0 + "PostEvent": 25100001, + "probability": 500 }, { "EventId": 14110104, @@ -76,8 +76,8 @@ "Value3": 0, "Value4": 0, "CostItem": [], - "PostEvent": 0, - "probability": 0 + "PostEvent": 25100001, + "probability": 500 }, { "EventId": 14110105, @@ -92,8 +92,8 @@ "Value3": 0, "Value4": 0, "CostItem": [], - "PostEvent": 0, - "probability": 0 + "PostEvent": 25100001, + "probability": 500 }, { "EventId": 25100001, diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 933eaca33..0a8fbdf23 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -5900,7 +5900,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 0, + "id_after": 100020, "group": 1010, "exgroup": 110, "des": 1, @@ -5941,9 +5941,9 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 0, + "ontxe": 100010, "id_after": 0, - "group": 1020, + "group": 1010, "exgroup": 110, "des": 1, "icon": "25001", @@ -5984,7 +5984,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 0, + "id_after": 100040, "group": 1030, "exgroup": 110, "des": 1, @@ -6025,9 +6025,9 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 0, + "ontxe": 100030, "id_after": 0, - "group": 1040, + "group": 1030, "exgroup": 110, "des": 1, "icon": "25001", @@ -6068,7 +6068,7 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 0, + "id_after": 100060, "group": 1050, "exgroup": 110, "des": 1, @@ -6109,9 +6109,9 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 0, - "id_after": 0, - "group": 1060, + "ontxe": 100050, + "id_after": 100070, + "group": 1050, "exgroup": 110, "des": 1, "icon": "25001", @@ -6151,9 +6151,9 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 0, + "ontxe": 100060, "id_after": 0, - "group": 1070, + "group": 1050, "exgroup": 110, "des": 1, "icon": "25001", diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go index 762c0f69d..f8953cc6a 100644 --- a/pb/battle_db.pb.go +++ b/pb/battle_db.pb.go @@ -103,6 +103,7 @@ const ( PlayType_race PlayType = 15 // 阵营 塔 PlayType_cycle PlayType = 16 // 循环塔 PlayType_guildgve PlayType = 17 //工会gve + PlayType_stone PlayType = 18 // 石阵秘境 ) // Enum value maps for PlayType. @@ -126,6 +127,7 @@ var ( 15: "race", 16: "cycle", 17: "guildgve", + 18: "stone", } PlayType_value = map[string]int32{ "null": 0, @@ -146,6 +148,7 @@ var ( "race": 15, "cycle": 16, "guildgve": 17, + "stone": 18, } ) @@ -273,33 +276,98 @@ func (DBBattleComp) EnumDescriptor() ([]byte, []int) { return file_battle_battle_db_proto_rawDescGZIP(), []int{3} } +//动态技能 +type DySkillData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + SkillID int32 `protobuf:"varint,1,opt,name=skillID,proto3" json:"skillID"` + SkillLv int32 `protobuf:"varint,2,opt,name=skillLv,proto3" json:"skillLv"` + Param int32 `protobuf:"varint,3,opt,name=param,proto3" json:"param"` +} + +func (x *DySkillData) Reset() { + *x = DySkillData{} + if protoimpl.UnsafeEnabled { + mi := &file_battle_battle_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DySkillData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DySkillData) ProtoMessage() {} + +func (x *DySkillData) ProtoReflect() protoreflect.Message { + mi := &file_battle_battle_db_proto_msgTypes[0] + 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 DySkillData.ProtoReflect.Descriptor instead. +func (*DySkillData) Descriptor() ([]byte, []int) { + return file_battle_battle_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DySkillData) GetSkillID() int32 { + if x != nil { + return x.SkillID + } + return 0 +} + +func (x *DySkillData) GetSkillLv() int32 { + if x != nil { + return x.SkillLv + } + return 0 +} + +func (x *DySkillData) GetParam() int32 { + if x != nil { + return x.Param + } + return 0 +} + type BattleRole struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` // 临时id - Oid string `protobuf:"bytes,2,opt,name=oid,proto3" json:"oid"` // 玩家英雄数据库id - Pos int32 `protobuf:"varint,3,opt,name=pos,proto3" json:"pos"` // 站位坐标 - HeroID string `protobuf:"bytes,4,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` //英雄的配置表ID - Star int32 `protobuf:"varint,5,opt,name=star,proto3" json:"star"` // 英雄星级 - Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"` // 英雄等级 - CaptainSkill int32 `protobuf:"varint,7,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能 - MainSuitSkill int32 `protobuf:"varint,8,opt,name=mainSuitSkill,proto3" json:"mainSuitSkill" bson:"mainSuitSkill"` /// 主套装技能 - SubSuitSkill int32 `protobuf:"varint,9,opt,name=subSuitSkill,proto3" json:"subSuitSkill" bson:"subSuitSkill"` /// 副套装技能 - NormalSkill []*SkillData `protobuf:"bytes,10,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能 - EquipSkill []*SkillData `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"` //普通技能 - Property map[int32]int32 `protobuf:"bytes,13,rep,name=property,proto3" json:"property" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //基础属性 - Ishelp bool `protobuf:"varint,14,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄 - Isboos int32 `protobuf:"varint,15,opt,name=isboos,proto3" json:"isboos"` //是否是boos - Monsterid int32 `protobuf:"varint,16,opt,name=monsterid,proto3" json:"monsterid"` //怪物id - Currhp int32 `protobuf:"varint,17,opt,name=currhp,proto3" json:"currhp"` //当前血量 + Tid int32 `protobuf:"varint,1,opt,name=tid,proto3" json:"tid"` // 临时id + Oid string `protobuf:"bytes,2,opt,name=oid,proto3" json:"oid"` // 玩家英雄数据库id + Pos int32 `protobuf:"varint,3,opt,name=pos,proto3" json:"pos"` // 站位坐标 + HeroID string `protobuf:"bytes,4,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` //英雄的配置表ID + Star int32 `protobuf:"varint,5,opt,name=star,proto3" json:"star"` // 英雄星级 + Lv int32 `protobuf:"varint,6,opt,name=lv,proto3" json:"lv"` // 英雄等级 + CaptainSkill int32 `protobuf:"varint,7,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能 + MainSuitSkill int32 `protobuf:"varint,8,opt,name=mainSuitSkill,proto3" json:"mainSuitSkill" bson:"mainSuitSkill"` /// 主套装技能 + SubSuitSkill int32 `protobuf:"varint,9,opt,name=subSuitSkill,proto3" json:"subSuitSkill" bson:"subSuitSkill"` /// 副套装技能 + NormalSkill []*SkillData `protobuf:"bytes,10,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能 + EquipSkill []*SkillData `protobuf:"bytes,11,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"` //装备技能 + BattleBeforeSkill []*DySkillData `protobuf:"bytes,12,rep,name=battleBeforeSkill,proto3" json:"battleBeforeSkill" bson:"battleBeforeSkill"` //战前技能 + Property map[int32]int32 `protobuf:"bytes,13,rep,name=property,proto3" json:"property" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //基础属性 + Ishelp bool `protobuf:"varint,14,opt,name=ishelp,proto3" json:"ishelp"` //是否是助战英雄 + Isboos int32 `protobuf:"varint,15,opt,name=isboos,proto3" json:"isboos"` //是否是boos + Monsterid int32 `protobuf:"varint,16,opt,name=monsterid,proto3" json:"monsterid"` //怪物id + Currhp int32 `protobuf:"varint,17,opt,name=currhp,proto3" json:"currhp"` //当前血量 } func (x *BattleRole) Reset() { *x = BattleRole{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_db_proto_msgTypes[0] + mi := &file_battle_battle_db_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -312,7 +380,7 @@ func (x *BattleRole) String() string { func (*BattleRole) ProtoMessage() {} func (x *BattleRole) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_db_proto_msgTypes[0] + mi := &file_battle_battle_db_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -325,7 +393,7 @@ func (x *BattleRole) ProtoReflect() protoreflect.Message { // Deprecated: Use BattleRole.ProtoReflect.Descriptor instead. func (*BattleRole) Descriptor() ([]byte, []int) { - return file_battle_battle_db_proto_rawDescGZIP(), []int{0} + return file_battle_battle_db_proto_rawDescGZIP(), []int{1} } func (x *BattleRole) GetTid() int32 { @@ -405,6 +473,13 @@ func (x *BattleRole) GetEquipSkill() []*SkillData { return nil } +func (x *BattleRole) GetBattleBeforeSkill() []*DySkillData { + if x != nil { + return x.BattleBeforeSkill + } + return nil +} + func (x *BattleRole) GetProperty() map[int32]int32 { if x != nil { return x.Property @@ -455,7 +530,7 @@ type DBBattleFormt struct { func (x *DBBattleFormt) Reset() { *x = DBBattleFormt{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_db_proto_msgTypes[1] + mi := &file_battle_battle_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -468,7 +543,7 @@ func (x *DBBattleFormt) String() string { func (*DBBattleFormt) ProtoMessage() {} func (x *DBBattleFormt) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_db_proto_msgTypes[1] + mi := &file_battle_battle_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -481,7 +556,7 @@ func (x *DBBattleFormt) ProtoReflect() protoreflect.Message { // Deprecated: Use DBBattleFormt.ProtoReflect.Descriptor instead. func (*DBBattleFormt) Descriptor() ([]byte, []int) { - return file_battle_battle_db_proto_rawDescGZIP(), []int{1} + return file_battle_battle_db_proto_rawDescGZIP(), []int{2} } func (x *DBBattleFormt) GetLeadpos() int32 { @@ -536,7 +611,7 @@ type DBBattleRecord struct { func (x *DBBattleRecord) Reset() { *x = DBBattleRecord{} if protoimpl.UnsafeEnabled { - mi := &file_battle_battle_db_proto_msgTypes[2] + mi := &file_battle_battle_db_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -549,7 +624,7 @@ func (x *DBBattleRecord) String() string { func (*DBBattleRecord) ProtoMessage() {} func (x *DBBattleRecord) ProtoReflect() protoreflect.Message { - mi := &file_battle_battle_db_proto_msgTypes[2] + mi := &file_battle_battle_db_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -562,7 +637,7 @@ func (x *DBBattleRecord) ProtoReflect() protoreflect.Message { // Deprecated: Use DBBattleRecord.ProtoReflect.Descriptor instead. func (*DBBattleRecord) Descriptor() ([]byte, []int) { - return file_battle_battle_db_proto_rawDescGZIP(), []int{2} + return file_battle_battle_db_proto_rawDescGZIP(), []int{3} } func (x *DBBattleRecord) GetId() string { @@ -661,100 +736,110 @@ var File_battle_battle_db_proto protoreflect.FileDescriptor var file_battle_battle_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa0, 0x04, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, - 0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, - 0x6f, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, - 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, - 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70, - 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x69, - 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, - 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, - 0x69, 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, - 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, - 0x6c, 0x12, 0x2a, 0x0a, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, - 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, - 0x61, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x35, 0x0a, - 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x19, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x2e, 0x50, 0x72, 0x6f, - 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x0e, - 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, 0x70, 0x12, 0x16, 0x0a, 0x06, - 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x69, 0x73, - 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, 0x69, - 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x6f, 0x6e, 0x73, 0x74, 0x65, 0x72, - 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x18, 0x11, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, - 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x9e, 0x01, 0x0a, 0x0d, 0x44, 0x42, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, - 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, - 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, - 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, - 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x2b, 0x0a, 0x0a, 0x62, - 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x0a, 0x62, 0x61, - 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xbd, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x42, - 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x74, - 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, - 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x62, - 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, - 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x23, 0x0a, - 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x42, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x05, 0x73, 0x74, 0x61, - 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, - 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x08, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, - 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, - 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2c, 0x0a, 0x09, - 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, - 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, - 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x0b, 0x72, 0x6f, - 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0e, 0x32, - 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x0b, - 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, - 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, - 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, - 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2a, 0x4e, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, - 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, - 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x76, - 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76, 0x70, 0x10, 0x05, 0x12, 0x08, - 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0xf8, 0x01, 0x0a, 0x08, 0x50, 0x6c, 0x61, - 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, - 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, - 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, - 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, - 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, - 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x12, 0x09, - 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x61, 0x63, 0x61, - 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, 0x65, 0x72, 0x6f, 0x74, 0x65, - 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x62, - 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x10, - 0x0b, 0x12, 0x0b, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x10, 0x0c, 0x12, 0x0f, - 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x6d, 0x65, 0x65, 0x74, 0x10, 0x0d, 0x12, - 0x0f, 0x0a, 0x0b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, 0x6e, 0x70, 0x63, 0x10, 0x0e, - 0x12, 0x08, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x10, 0x0f, 0x12, 0x09, 0x0a, 0x05, 0x63, 0x79, - 0x63, 0x6c, 0x65, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x67, 0x76, - 0x65, 0x10, 0x11, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x57, 0x0a, 0x0b, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, + 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x12, 0x18, 0x0a, + 0x07, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xdc, 0x04, + 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x10, 0x0a, 0x03, + 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x10, + 0x0a, 0x03, 0x6f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6f, 0x69, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x70, + 0x6f, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, + 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, + 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x12, 0x22, + 0x0a, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x63, 0x61, 0x70, 0x74, 0x61, 0x69, 0x6e, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x12, 0x24, 0x0a, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, + 0x69, 0x6c, 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6d, 0x61, 0x69, 0x6e, 0x53, + 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x75, 0x62, 0x53, + 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, + 0x73, 0x75, 0x62, 0x53, 0x75, 0x69, 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x0b, + 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0a, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, + 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x2a, 0x0a, 0x0a, 0x65, 0x71, + 0x75, 0x69, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, + 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0a, 0x65, 0x71, 0x75, 0x69, + 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x12, 0x3a, 0x0a, 0x11, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x79, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, + 0x11, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x53, 0x6b, 0x69, + 0x6c, 0x6c, 0x12, 0x35, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x18, 0x0d, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, + 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x68, + 0x65, 0x6c, 0x70, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x68, 0x65, 0x6c, + 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x06, 0x69, 0x73, 0x62, 0x6f, 0x6f, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x6f, 0x6e, + 0x73, 0x74, 0x65, 0x72, 0x69, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6d, 0x6f, + 0x6e, 0x73, 0x74, 0x65, 0x72, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, + 0x70, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x75, 0x72, 0x72, 0x68, 0x70, 0x1a, + 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x9e, 0x01, 0x0a, + 0x0d, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x12, 0x18, + 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x1f, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, + 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x12, 0x25, 0x0a, 0x07, 0x73, 0x79, 0x73, + 0x74, 0x65, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, + 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x07, 0x73, 0x79, 0x73, 0x74, 0x65, 0x61, 0x6d, + 0x12, 0x2b, 0x0a, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x6f, 0x6c, + 0x65, 0x52, 0x0a, 0x62, 0x61, 0x63, 0x6b, 0x75, 0x70, 0x74, 0x65, 0x61, 0x6d, 0x22, 0xbd, 0x03, + 0x0a, 0x0e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x21, 0x0a, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, + 0x70, 0x65, 0x52, 0x05, 0x62, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x05, 0x70, 0x74, 0x79, + 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x50, 0x6c, 0x61, 0x79, 0x54, + 0x79, 0x70, 0x65, 0x52, 0x05, 0x70, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x6c, + 0x65, 0x76, 0x65, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x6c, 0x65, 0x76, + 0x65, 0x6c, 0x12, 0x23, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x0e, 0x32, 0x0d, 0x2e, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, + 0x52, 0x05, 0x73, 0x74, 0x61, 0x74, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x64, 0x43, 0x6f, + 0x6d, 0x70, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x64, 0x43, + 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x12, 0x2a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, + 0x74, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x08, 0x72, 0x65, 0x64, 0x66, 0x6c, 0x69, 0x73, + 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, 0x64, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x62, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x49, + 0x64, 0x12, 0x2c, 0x0a, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x0a, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, + 0x6f, 0x72, 0x6d, 0x74, 0x52, 0x09, 0x62, 0x75, 0x6c, 0x65, 0x66, 0x6c, 0x69, 0x73, 0x74, 0x12, + 0x2f, 0x0a, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0b, + 0x20, 0x03, 0x28, 0x0e, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, + 0x6f, 0x6d, 0x70, 0x52, 0x0b, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, + 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0e, + 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x52, + 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, + 0x18, 0x0d, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2a, 0x4e, 0x0a, + 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, + 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, + 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x62, 0x10, 0x03, 0x12, + 0x07, 0x0a, 0x03, 0x65, 0x76, 0x65, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x70, 0x76, + 0x70, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x6c, 0x70, 0x65, 0x76, 0x10, 0x06, 0x2a, 0x83, 0x02, + 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, + 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, + 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, + 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, + 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, + 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, + 0x79, 0x10, 0x06, 0x12, 0x09, 0x0a, 0x05, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x10, 0x07, 0x12, 0x0b, + 0x0a, 0x07, 0x61, 0x63, 0x61, 0x64, 0x65, 0x6d, 0x79, 0x10, 0x08, 0x12, 0x10, 0x0a, 0x0c, 0x68, + 0x65, 0x72, 0x6f, 0x74, 0x65, 0x61, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x10, 0x09, 0x12, 0x0a, 0x0a, + 0x06, 0x63, 0x6f, 0x6d, 0x62, 0x61, 0x74, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x65, 0x6e, 0x63, + 0x68, 0x61, 0x6e, 0x74, 0x10, 0x0b, 0x12, 0x0b, 0x0a, 0x07, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x10, 0x0c, 0x12, 0x0f, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x73, 0x6d, 0x65, + 0x65, 0x74, 0x10, 0x0d, 0x12, 0x0f, 0x0a, 0x0b, 0x70, 0x72, 0x61, 0x63, 0x74, 0x69, 0x63, 0x65, + 0x6e, 0x70, 0x63, 0x10, 0x0e, 0x12, 0x08, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x10, 0x0f, 0x12, + 0x09, 0x0a, 0x05, 0x63, 0x79, 0x63, 0x6c, 0x65, 0x10, 0x10, 0x12, 0x0c, 0x0a, 0x08, 0x67, 0x75, + 0x69, 0x6c, 0x64, 0x67, 0x76, 0x65, 0x10, 0x11, 0x12, 0x09, 0x0a, 0x05, 0x73, 0x74, 0x6f, 0x6e, + 0x65, 0x10, 0x12, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, @@ -776,37 +861,39 @@ func file_battle_battle_db_proto_rawDescGZIP() []byte { } var file_battle_battle_db_proto_enumTypes = make([]protoimpl.EnumInfo, 4) -var file_battle_battle_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_battle_battle_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_battle_battle_db_proto_goTypes = []interface{}{ (BattleType)(0), // 0: BattleType (PlayType)(0), // 1: PlayType (BBattleState)(0), // 2: BBattleState (DBBattleComp)(0), // 3: DBBattleComp - (*BattleRole)(nil), // 4: BattleRole - (*DBBattleFormt)(nil), // 5: DBBattleFormt - (*DBBattleRecord)(nil), // 6: DBBattleRecord - nil, // 7: BattleRole.PropertyEntry - (*SkillData)(nil), // 8: SkillData + (*DySkillData)(nil), // 4: DySkillData + (*BattleRole)(nil), // 5: BattleRole + (*DBBattleFormt)(nil), // 6: DBBattleFormt + (*DBBattleRecord)(nil), // 7: DBBattleRecord + nil, // 8: BattleRole.PropertyEntry + (*SkillData)(nil), // 9: SkillData } var file_battle_battle_db_proto_depIdxs = []int32{ - 8, // 0: BattleRole.normalSkill:type_name -> SkillData - 8, // 1: BattleRole.equipSkill:type_name -> SkillData - 7, // 2: BattleRole.property:type_name -> BattleRole.PropertyEntry - 4, // 3: DBBattleFormt.team:type_name -> BattleRole - 4, // 4: DBBattleFormt.systeam:type_name -> BattleRole - 4, // 5: DBBattleFormt.backupteam:type_name -> BattleRole - 0, // 6: DBBattleRecord.btype:type_name -> BattleType - 1, // 7: DBBattleRecord.ptype:type_name -> PlayType - 2, // 8: DBBattleRecord.state:type_name -> BBattleState - 5, // 9: DBBattleRecord.redflist:type_name -> DBBattleFormt - 5, // 10: DBBattleRecord.buleflist:type_name -> DBBattleFormt - 3, // 11: DBBattleRecord.roundresult:type_name -> DBBattleComp - 3, // 12: DBBattleRecord.result:type_name -> DBBattleComp - 13, // [13:13] is the sub-list for method output_type - 13, // [13:13] is the sub-list for method input_type - 13, // [13:13] is the sub-list for extension type_name - 13, // [13:13] is the sub-list for extension extendee - 0, // [0:13] is the sub-list for field type_name + 9, // 0: BattleRole.normalSkill:type_name -> SkillData + 9, // 1: BattleRole.equipSkill:type_name -> SkillData + 4, // 2: BattleRole.battleBeforeSkill:type_name -> DySkillData + 8, // 3: BattleRole.property:type_name -> BattleRole.PropertyEntry + 5, // 4: DBBattleFormt.team:type_name -> BattleRole + 5, // 5: DBBattleFormt.systeam:type_name -> BattleRole + 5, // 6: DBBattleFormt.backupteam:type_name -> BattleRole + 0, // 7: DBBattleRecord.btype:type_name -> BattleType + 1, // 8: DBBattleRecord.ptype:type_name -> PlayType + 2, // 9: DBBattleRecord.state:type_name -> BBattleState + 6, // 10: DBBattleRecord.redflist:type_name -> DBBattleFormt + 6, // 11: DBBattleRecord.buleflist:type_name -> DBBattleFormt + 3, // 12: DBBattleRecord.roundresult:type_name -> DBBattleComp + 3, // 13: DBBattleRecord.result:type_name -> DBBattleComp + 14, // [14:14] is the sub-list for method output_type + 14, // [14:14] is the sub-list for method input_type + 14, // [14:14] is the sub-list for extension type_name + 14, // [14:14] is the sub-list for extension extendee + 0, // [0:14] is the sub-list for field type_name } func init() { file_battle_battle_db_proto_init() } @@ -817,7 +904,7 @@ func file_battle_battle_db_proto_init() { file_comm_proto_init() if !protoimpl.UnsafeEnabled { file_battle_battle_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*BattleRole); i { + switch v := v.(*DySkillData); i { case 0: return &v.state case 1: @@ -829,7 +916,7 @@ func file_battle_battle_db_proto_init() { } } file_battle_battle_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DBBattleFormt); i { + switch v := v.(*BattleRole); i { case 0: return &v.state case 1: @@ -841,6 +928,18 @@ func file_battle_battle_db_proto_init() { } } file_battle_battle_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DBBattleFormt); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_battle_battle_db_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBBattleRecord); i { case 0: return &v.state @@ -859,7 +958,7 @@ func file_battle_battle_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_battle_battle_db_proto_rawDesc, NumEnums: 4, - NumMessages: 4, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/dailytask_db.pb.go b/pb/dailytask_db.pb.go index 00950e2e0..ef4ed8bc6 100644 --- a/pb/dailytask_db.pb.go +++ b/pb/dailytask_db.pb.go @@ -168,8 +168,9 @@ type DBDailytaskGroupProgress struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Group int32 `protobuf:"varint,3,opt,name=group,proto3" json:"group"` - Tasks []*DBWTaskItem `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks"` + Group int32 `protobuf:"varint,1,opt,name=group,proto3" json:"group"` + Tasks []*DBWTaskItem `protobuf:"bytes,2,rep,name=tasks,proto3" json:"tasks"` + Complete bool `protobuf:"varint,3,opt,name=complete,proto3" json:"complete"` } func (x *DBDailytaskGroupProgress) Reset() { @@ -218,6 +219,13 @@ func (x *DBDailytaskGroupProgress) GetTasks() []*DBWTaskItem { return nil } +func (x *DBDailytaskGroupProgress) GetComplete() bool { + if x != nil { + return x.Complete + } + return false +} + var File_dailytask_dailytask_db_proto protoreflect.FileDescriptor var file_dailytask_dailytask_db_proto_rawDesc = []byte{ @@ -238,13 +246,15 @@ var file_dailytask_dailytask_db_proto_rawDesc = []byte{ 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f, 0x6d, - 0x70, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x54, 0x0a, 0x18, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79, + 0x70, 0x6c, 0x65, 0x74, 0x65, 0x22, 0x70, 0x0a, 0x18, 0x44, 0x42, 0x44, 0x61, 0x69, 0x6c, 0x79, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, - 0x73, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, + 0x73, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x22, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, - 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x63, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, + 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var (