diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 542df64ab..8841ff1ad 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -22056,8 +22056,8 @@ "t": "gold", "n": 1 }, - "Npc_event_type": 0, - "NPC": -102, + "Npc_event_type": 1, + "NPC": 102, "value": 5, "filter": [ 24004 @@ -22175,8 +22175,8 @@ "t": "gold", "n": 1 }, - "Npc_event_type": 0, - "NPC": -102, + "Npc_event_type": 1, + "NPC": 102, "value": 1, "filter": [ 1 @@ -22196,7 +22196,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_758", - "text": "3件装备强化到3级" + "text": "1件装备强化到3级" }, "type": 43, "valid": 0, @@ -22205,9 +22205,9 @@ "t": "gold", "n": 1 }, - "Npc_event_type": 0, - "NPC": -102, - "value": 3, + "Npc_event_type": 1, + "NPC": 102, + "value": 1, "filter": [ 3 ], @@ -22562,7 +22562,7 @@ "n": 1 }, "Npc_event_type": 0, - "NPC": 10284, + "NPC": 10254, "value": 1, "filter": [ 1100224 @@ -22776,7 +22776,7 @@ "NPC": 10334, "value": 1, "filter": [ - 1100305 + 1100312 ], "filter2": [ "关卡ID", diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index be09ecd7d..52089e3da 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -401,7 +401,7 @@ "access": [ 158 ], - "img": "attr_integral", + "img": "wp_icon_10021", "intr": { "key": "item_coin_intr_16", "text": "用于在巨怪商队内进行消费的货币。巨怪们并不会使用常规意义的黄金宝石之类的货币，反倒是小型又量产的人类工艺品更受他们青睐。" diff --git a/bin/json/game_heroupstorychapter.json b/bin/json/game_heroupstorychapter.json index 226dcfb06..d4f39ec64 100644 --- a/bin/json/game_heroupstorychapter.json +++ b/bin/json/game_heroupstorychapter.json @@ -17,7 +17,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -41,8 +41,8 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 2 + "x": 1, + "y": 1 }, "level": 102, "levellink": [ @@ -54,7 +54,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -73,13 +73,13 @@ }, { "key": 3, - "onlevel": 1, + "onlevel": 2, "chapter": 2500101, "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 3 + "x": 2, + "y": 1 }, "level": 103, "levellink": [ @@ -91,7 +91,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -115,8 +115,8 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 4 + "x": 3, + "y": 1 }, "level": 104, "levellink": [ @@ -128,7 +128,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -152,20 +152,20 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 5 + "x": 4, + "y": 1 }, "level": 105, "levellink": [ 4 ], - "leveltype": 2, + "leveltype": 1, "startstory": 301054, "battle": 0, "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -184,7 +184,7 @@ }, { "key": 6, - "onlevel": 4, + "onlevel": 5, "chapter": 2500102, "hero": 15005, "onlevelstory": [], @@ -200,7 +200,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -224,8 +224,8 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 2 + "x": 1, + "y": 1 }, "level": 102, "levellink": [ @@ -237,7 +237,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -256,13 +256,13 @@ }, { "key": 8, - "onlevel": 6, + "onlevel": 7, "chapter": 2500102, "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 3 + "x": 2, + "y": 1 }, "level": 103, "levellink": [ @@ -274,7 +274,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -298,8 +298,8 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 4 + "x": 3, + "y": 1 }, "level": 104, "levellink": [ @@ -311,7 +311,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -330,13 +330,13 @@ }, { "key": 10, - "onlevel": 7, + "onlevel": 9, "chapter": 2500102, "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 5 + "x": 4, + "y": 1 }, "level": 105, "levellink": [ @@ -348,7 +348,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -367,7 +367,7 @@ }, { "key": 11, - "onlevel": 9, + "onlevel": 10, "chapter": 2500103, "hero": 15005, "onlevelstory": [], @@ -383,7 +383,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -407,8 +407,8 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 2 + "x": 1, + "y": 1 }, "level": 102, "levellink": [ @@ -420,7 +420,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -439,13 +439,13 @@ }, { "key": 13, - "onlevel": 11, + "onlevel": 12, "chapter": 2500103, "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 3 + "x": 2, + "y": 1 }, "level": 103, "levellink": [ @@ -457,7 +457,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -481,8 +481,8 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 4 + "x": 3, + "y": 1 }, "level": 104, "levellink": [ @@ -494,7 +494,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], @@ -518,8 +518,8 @@ "hero": 15005, "onlevelstory": [], "point": { - "x": 0, - "y": 5 + "x": 4, + "y": 1 }, "level": 105, "levellink": [ @@ -531,7 +531,7 @@ "reward": [ { "a": "attr", - "t": "glod", + "t": "gold", "n": 3000 } ], diff --git a/bin/json/game_heroupstorychaptertxt.json b/bin/json/game_heroupstorychaptertxt.json index 2977bc005..f1ac8db12 100644 --- a/bin/json/game_heroupstorychaptertxt.json +++ b/bin/json/game_heroupstorychaptertxt.json @@ -4,7 +4,7 @@ "hero": 15005, "chaptername": { "key": "heroupstory_heroupstory_chapter_chaptername_01", - "text": "第一章：武斗大会" + "text": "第一章:初到中轴城" }, "chaptericon": "hd_qihd_img_01", "onchapter": 0, @@ -15,7 +15,7 @@ "hero": 15005, "chaptername": { "key": "heroupstory_heroupstory_chapter_chaptername_06", - "text": "第二章：武侠汇聚" + "text": "第二章:再找表演场所" }, "chaptericon": "hd_qihd_img_02", "onchapter": 2500101, @@ -26,7 +26,7 @@ "hero": 15005, "chaptername": { "key": "heroupstory_heroupstory_chapter_chaptername_11", - "text": "第三章：大龙归来" + "text": "第三章:演出成功" }, "chaptericon": "hd_qihd_img_03", "onchapter": 2500102, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 29841670e..36d4e34b6 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -12365,7 +12365,7 @@ "access": [ 168 ], - "use_skip": 10050, + "use_skip": 10052, "upper_limit": 999, "img": "item_15000102", "intr": { @@ -12425,7 +12425,7 @@ "access": [ 168 ], - "use_skip": 10051, + "use_skip": 10055, "upper_limit": 999, "img": "item_15000103", "intr": { @@ -12485,7 +12485,7 @@ "access": [ 168 ], - "use_skip": 10052, + "use_skip": 10058, "upper_limit": 999, "img": "item_15000104", "intr": { @@ -12557,7 +12557,7 @@ "access": [ 168 ], - "use_skip": 10053, + "use_skip": 10050, "upper_limit": 999, "img": "item_15000201", "intr": { @@ -12629,7 +12629,7 @@ "access": [ 168 ], - "use_skip": 10054, + "use_skip": 10053, "upper_limit": 999, "img": "item_15000202", "intr": { @@ -12701,7 +12701,7 @@ "access": [ 168 ], - "use_skip": 10055, + "use_skip": 10056, "upper_limit": 999, "img": "item_15000203", "intr": { @@ -12773,7 +12773,7 @@ "access": [ 168 ], - "use_skip": 10056, + "use_skip": 10059, "upper_limit": 999, "img": "item_15000204", "intr": { @@ -12833,7 +12833,7 @@ "access": [ 168 ], - "use_skip": 10057, + "use_skip": 10051, "upper_limit": 999, "img": "item_15000301", "intr": { @@ -12893,7 +12893,7 @@ "access": [ 168 ], - "use_skip": 10058, + "use_skip": 10054, "upper_limit": 999, "img": "item_15000302", "intr": { @@ -12953,7 +12953,7 @@ "access": [ 168 ], - "use_skip": 10059, + "use_skip": 10057, "upper_limit": 999, "img": "item_15000303", "intr": { diff --git a/bin/json/game_loading.json b/bin/json/game_loading.json index 690445f34..f27942a2c 100644 --- a/bin/json/game_loading.json +++ b/bin/json/game_loading.json @@ -102,8 +102,8 @@ { "id": 1011, "scene": "WorldMapScene", - "image": "ld_boss_bg", - "icon": "loading_icon_gfxm", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", "prompt": { "key": "loading_Sheet1_prompt_11", "text": "在这个融合首都里，似乎隐藏着什么危机......" @@ -112,8 +112,8 @@ { "id": 1012, "scene": "scenesfight_06", - "image": "ld_5v5_bg", - "icon": "loading_icon_gfxm", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", "prompt": { "key": "loading_Sheet1_prompt_12", "text": "疯狂原始人 力气大是原始人的特点之一。" @@ -122,8 +122,8 @@ { "id": 1013, "scene": "scenesfight_05_01", - "image": "loading_2", - "icon": "loading_icon_gfxm", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", "prompt": { "key": "loading_Sheet1_prompt_13", "text": "相信自己是特别的，是习得绝世神功的秘钥。" @@ -132,8 +132,8 @@ { "id": 1014, "scene": "scenesfight_07", - "image": "ld_5v5_bg1", - "icon": "loading_icon_gfxm", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", "prompt": { "key": "loading_Sheet1_prompt_14", "text": "坏蛋联盟心中有一朵善良之花，花开时，全身蔓延着愉快的刺激感。" @@ -142,8 +142,8 @@ { "id": 1015, "scene": "bossfight_naturetitan_01", - "image": "ld_boss_bg", - "icon": "loading_icon_gfxm", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", "prompt": { "key": "loading_Sheet1_prompt_15", "text": "森林深处的巨型猩猩身上似乎藏着很多觉醒材料。" @@ -152,8 +152,8 @@ { "id": 1016, "scene": "bossfight_spinymandrilla_02", - "image": "ld_boss_bg", - "icon": "loading_icon_gfxm", + "image": "ld_mh_bg_fc", + "icon": "loading_icon_fc", "prompt": { "key": "loading_Sheet1_prompt_16", "text": "打败森林泰坦就能获得打造辅助套装的材料。" diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 21cdfa660..ae41f90f7 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -1977,7 +1977,7 @@ "main": [ { "key": 1, - "param": 6 + "param": 10 } ], "wkqbx": 2, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index d5677355a..5778285a1 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -2084,9 +2084,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "CommandScene", - "功能入口_主线", - "137" + "GameMain", + "熊猫_圣桃树_常驻", + "901" ], "event": [ 2, @@ -2099,11 +2099,13 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 0 + 2, + 10230 ], "goto": 0 }, @@ -2112,11 +2114,13 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 0 + 2, + 10330 ], "goto": 0 }, @@ -2327,13 +2331,13 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "云朵先生", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10220 + 10570 ], "goto": 0 }, @@ -2598,13 +2602,13 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "SmithyScene", - "打造", - "139" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, - 10230 + 10580 ], "goto": 0 }, @@ -2628,11 +2632,13 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ - 0 + 2, + 10590 ], "goto": 0 }, @@ -2647,7 +2653,7 @@ ], "event": [ 2, - 10220 + 10640 ], "goto": 0 }, @@ -2942,9 +2948,9 @@ "heroid": 25001, "Levelid": 0, "datas": [ - "GameMain", - "20030_熊猫2", - "901" + "CommandScene", + "功能入口_主线", + "905" ], "event": [ 2, diff --git a/bin/json/game_recharge.json b/bin/json/game_recharge.json index 49c1f42ae..41bbc06b5 100644 --- a/bin/json/game_recharge.json +++ b/bin/json/game_recharge.json @@ -24,7 +24,7 @@ "text": "0", "show": "6元", "image": "cz_zs_01", - "integral": 500 + "integral": 600 }, { "id": "gold30", @@ -51,7 +51,7 @@ "text": "0", "show": "30元", "image": "cz_zs_02", - "integral": 600 + "integral": 3000 }, { "id": "gold68", @@ -78,7 +78,7 @@ "text": "0", "show": "68元", "image": "cz_zs_02", - "integral": 700 + "integral": 6800 }, { "id": "gold128", @@ -105,7 +105,7 @@ "text": "0", "show": "98元", "image": "cz_zs_02", - "integral": 800 + "integral": 9800 }, { "id": "gold198", @@ -132,7 +132,7 @@ "text": "0", "show": "128元", "image": "cz_zs_03", - "integral": 900 + "integral": 12800 }, { "id": "gold328", @@ -159,7 +159,7 @@ "text": "0", "show": "198元", "image": "cz_zs_03", - "integral": 1000 + "integral": 19800 }, { "id": "gold448", @@ -186,7 +186,7 @@ "text": "0", "show": "328元", "image": "cz_zs_03", - "integral": 1100 + "integral": 32800 }, { "id": "gold648", @@ -213,7 +213,7 @@ "text": "0", "show": "648元", "image": "cz_zs_03", - "integral": 1200 + "integral": 64800 }, { "id": "lb6_1", @@ -228,7 +228,7 @@ "text": "0", "show": "6元", "image": "", - "integral": 1300 + "integral": 600 }, { "id": "day_1", @@ -243,7 +243,7 @@ "text": "0", "show": "6元", "image": "", - "integral": 1400 + "integral": 600 }, { "id": "day_2", @@ -258,7 +258,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 1500 + "integral": 3000 }, { "id": "day_3", @@ -273,7 +273,7 @@ "text": "0", "show": "68元", "image": "", - "integral": 1600 + "integral": 6800 }, { "id": "day_4", @@ -288,7 +288,7 @@ "text": "0", "show": "128元", "image": "", - "integral": 1700 + "integral": 12800 }, { "id": "week_1", @@ -303,7 +303,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 1800 + "integral": 3000 }, { "id": "week_2", @@ -318,7 +318,7 @@ "text": "0", "show": "98元", "image": "", - "integral": 1900 + "integral": 9800 }, { "id": "week_3", @@ -333,7 +333,7 @@ "text": "0", "show": "198元", "image": "", - "integral": 2000 + "integral": 19800 }, { "id": "week_4", @@ -348,7 +348,7 @@ "text": "0", "show": "328元", "image": "", - "integral": 2100 + "integral": 32800 }, { "id": "week_5", @@ -363,7 +363,7 @@ "text": "0", "show": "448元", "image": "", - "integral": 2200 + "integral": 44800 }, { "id": "week_6", @@ -378,7 +378,7 @@ "text": "0", "show": "648元", "image": "", - "integral": 2300 + "integral": 64800 }, { "id": "month_1", @@ -393,7 +393,7 @@ "text": "0", "show": "128元", "image": "", - "integral": 2400 + "integral": 12800 }, { "id": "month_2", @@ -408,7 +408,7 @@ "text": "0", "show": "198元", "image": "", - "integral": 2500 + "integral": 19800 }, { "id": "month_3", @@ -423,7 +423,7 @@ "text": "0", "show": "328元", "image": "", - "integral": 2600 + "integral": 32800 }, { "id": "yueka_lv1", @@ -444,7 +444,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 2700 + "integral": 3000 }, { "id": "yueka_lv2", @@ -465,7 +465,7 @@ "text": "0", "show": "98元", "image": "", - "integral": 2800 + "integral": 9800 }, { "id": "passcheck_1", @@ -480,7 +480,7 @@ "text": "0", "show": "98元", "image": "", - "integral": 2900 + "integral": 9800 }, { "id": "passcheck_2", @@ -495,7 +495,7 @@ "text": "0", "show": "98元", "image": "", - "integral": 3000 + "integral": 9800 }, { "id": "drawcard_pack1", @@ -510,7 +510,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3100 + "integral": 3000 }, { "id": "passcheck_3", @@ -525,7 +525,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3200 + "integral": 3000 }, { "id": "passcheck_4", @@ -540,7 +540,7 @@ "text": "0", "show": "68元", "image": "", - "integral": 3300 + "integral": 6800 }, { "id": "fund_1", @@ -555,7 +555,7 @@ "text": "0", "show": "128元", "image": "", - "integral": 3400 + "integral": 3000 }, { "id": "fund_2", @@ -570,7 +570,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 0 + "integral": 3000 }, { "id": "fund_3", @@ -585,7 +585,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 0 + "integral": 3000 }, { "id": "fund_4", @@ -600,7 +600,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3500 + "integral": 3000 }, { "id": "fund_5", @@ -615,7 +615,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3600 + "integral": 3000 }, { "id": "fund_6", @@ -630,7 +630,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3700 + "integral": 3000 }, { "id": "fund_7", @@ -645,7 +645,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3800 + "integral": 3000 }, { "id": "fund_8", @@ -660,7 +660,7 @@ "text": "0", "show": "6元", "image": "", - "integral": 3600 + "integral": 6000 }, { "id": "fund_9", @@ -675,7 +675,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3700 + "integral": 3000 }, { "id": "fund_10", @@ -690,7 +690,7 @@ "text": "0", "show": "68元", "image": "", - "integral": 3800 + "integral": 6800 }, { "id": "drawcard_pack2", @@ -705,7 +705,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3100 + "integral": 3000 }, { "id": "drawcard_pack3", @@ -720,7 +720,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3100 + "integral": 3000 }, { "id": "drawcard_pack4", @@ -735,7 +735,7 @@ "text": "0", "show": "30元", "image": "", - "integral": 3100 + "integral": 3000 }, { "id": "passcheckPro_4", diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 6fd2b6cf4..2bab06350 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -47159,7 +47159,7 @@ "CorrectPos": 0, "IsMelee": 0, "act": "", - "Type": 2, + "Type": 4, "CD": 0, "Where": [], "Target": 2, @@ -47191,7 +47191,7 @@ "CorrectPos": 0, "IsMelee": 0, "act": "", - "Type": 2, + "Type": 4, "CD": 0, "Where": [], "Target": 2, diff --git a/bin/json/game_stonebuff.json b/bin/json/game_stonebuff.json index 06db7d8a0..053b58f99 100644 --- a/bin/json/game_stonebuff.json +++ b/bin/json/game_stonebuff.json @@ -421,7 +421,7 @@ "SkillId": 770009111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770009111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -447,7 +447,7 @@ "SkillId": 770009111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770009111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -525,7 +525,7 @@ "SkillId": 770011111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770011111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -551,7 +551,7 @@ "SkillId": 770011111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770011111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -629,7 +629,7 @@ "SkillId": 770013111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770013111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -655,7 +655,7 @@ "SkillId": 770013111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770013111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -681,7 +681,7 @@ "SkillId": 770014111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770014111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -707,7 +707,7 @@ "SkillId": 770014111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770014111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -993,7 +993,7 @@ "SkillId": 770020111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770020111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1019,7 +1019,7 @@ "SkillId": 770020111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770020111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1045,7 +1045,7 @@ "SkillId": 770021111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770021111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1071,7 +1071,7 @@ "SkillId": 770021111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770021111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1201,7 +1201,7 @@ "SkillId": 770024111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770024111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1227,7 +1227,7 @@ "SkillId": 770024111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770024111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1409,7 +1409,7 @@ "SkillId": 770028111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770028111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1435,7 +1435,7 @@ "SkillId": 770028111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770028111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1461,7 +1461,7 @@ "SkillId": 770029111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770029111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1487,7 +1487,7 @@ "SkillId": 770029111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770029111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1513,7 +1513,7 @@ "SkillId": 770030111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770030111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1539,7 +1539,7 @@ "SkillId": 770030111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770030111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1565,7 +1565,7 @@ "SkillId": 770031111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770031111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1591,7 +1591,7 @@ "SkillId": 770031111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770031111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1617,7 +1617,7 @@ "SkillId": 770032111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770032111", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -1643,7 +1643,7 @@ "SkillId": 770032111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770032111", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -1669,7 +1669,7 @@ "SkillId": 770033111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770033111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1695,7 +1695,7 @@ "SkillId": 770033111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770033111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1773,7 +1773,7 @@ "SkillId": 770035111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770035111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1799,7 +1799,7 @@ "SkillId": 770035111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770035111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1825,7 +1825,7 @@ "SkillId": 770036111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770036111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1851,7 +1851,7 @@ "SkillId": 770036111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770036111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1877,7 +1877,7 @@ "SkillId": 770037111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770037111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1903,7 +1903,7 @@ "SkillId": 770037111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770037111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1929,7 +1929,7 @@ "SkillId": 770038111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770038111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1955,7 +1955,7 @@ "SkillId": 770038111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770038111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -1981,7 +1981,7 @@ "SkillId": 770039111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770039111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2007,7 +2007,7 @@ "SkillId": 770039111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770039111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2033,7 +2033,7 @@ "SkillId": 770040111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770040111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2059,7 +2059,7 @@ "SkillId": 770040111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770040111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2189,7 +2189,7 @@ "SkillId": 770043111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770043111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2215,7 +2215,7 @@ "SkillId": 770043111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770043111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2345,7 +2345,7 @@ "SkillId": 770046111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770046111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2371,7 +2371,7 @@ "SkillId": 770046111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770046111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2449,7 +2449,7 @@ "SkillId": 770048111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770048111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2475,7 +2475,7 @@ "SkillId": 770048111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770048111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2501,7 +2501,7 @@ "SkillId": 770049111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770049111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2527,7 +2527,7 @@ "SkillId": 770049111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770049111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2553,7 +2553,7 @@ "SkillId": 770050111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770050111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2579,7 +2579,7 @@ "SkillId": 770050111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770050111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2605,7 +2605,7 @@ "SkillId": 770051111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770051111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2631,7 +2631,7 @@ "SkillId": 770051111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770051111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2657,7 +2657,7 @@ "SkillId": 770052111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770052111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2683,7 +2683,7 @@ "SkillId": 770052111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770052111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2709,7 +2709,7 @@ "SkillId": 770053111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770053111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2735,7 +2735,7 @@ "SkillId": 770053111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770053111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2761,7 +2761,7 @@ "SkillId": 770054111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770054111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2787,7 +2787,7 @@ "SkillId": 770054111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770054111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2813,7 +2813,7 @@ "SkillId": 770055111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770055111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2839,7 +2839,7 @@ "SkillId": 770055111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770055111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2865,7 +2865,7 @@ "SkillId": 770056111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770056111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2891,7 +2891,7 @@ "SkillId": 770056111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770056111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2917,7 +2917,7 @@ "SkillId": 770057111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770057111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2943,7 +2943,7 @@ "SkillId": 770057111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770057111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2969,7 +2969,7 @@ "SkillId": 770058111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770058111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -2995,7 +2995,7 @@ "SkillId": 770058111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770058111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3021,7 +3021,7 @@ "SkillId": 770059111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770059111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3047,7 +3047,7 @@ "SkillId": 770059111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770059111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3073,7 +3073,7 @@ "SkillId": 770060111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770060111", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -3099,7 +3099,7 @@ "SkillId": 770060111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770060111", "TargetType": 1, "CampType": 0, "TakeDataType": 1, @@ -3281,7 +3281,7 @@ "SkillId": 770064111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770064111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3307,7 +3307,7 @@ "SkillId": 770064111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770064111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3333,7 +3333,7 @@ "SkillId": 770065111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770065111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3359,7 +3359,7 @@ "SkillId": 770065111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770065111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3385,7 +3385,7 @@ "SkillId": 770066111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770066111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3411,7 +3411,7 @@ "SkillId": 770066111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770066111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3437,7 +3437,7 @@ "SkillId": 770067111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770067111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3463,7 +3463,7 @@ "SkillId": 770067111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770067111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3489,7 +3489,7 @@ "SkillId": 770068111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770068111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3515,7 +3515,7 @@ "SkillId": 770068111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770068111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3541,7 +3541,7 @@ "SkillId": 770069111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770069111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3567,7 +3567,7 @@ "SkillId": 770069111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770069111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3593,7 +3593,7 @@ "SkillId": 770070111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770070111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3619,7 +3619,7 @@ "SkillId": 770070111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770070111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3645,7 +3645,7 @@ "SkillId": 770071111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770071111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3671,7 +3671,7 @@ "SkillId": 770071111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770071111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3749,7 +3749,7 @@ "SkillId": 770073111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770073111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3775,7 +3775,7 @@ "SkillId": 770073111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770073111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3853,7 +3853,7 @@ "SkillId": 770075111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770075111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3879,7 +3879,7 @@ "SkillId": 770075111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770075111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3905,7 +3905,7 @@ "SkillId": 770076111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770076111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3931,7 +3931,7 @@ "SkillId": 770076111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770076111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3957,7 +3957,7 @@ "SkillId": 770077111, "BuffLevel": 1, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770077111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -3983,7 +3983,7 @@ "SkillId": 770077111, "BuffLevel": 2, "Quality": 1, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770077111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4009,7 +4009,7 @@ "SkillId": 770078111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770078111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4035,7 +4035,7 @@ "SkillId": 770078111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770078111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4061,7 +4061,7 @@ "SkillId": 770079111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770079111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4087,7 +4087,7 @@ "SkillId": 770079111, "BuffLevel": 2, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770079111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4113,7 +4113,7 @@ "SkillId": 770080111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770080111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4139,7 +4139,7 @@ "SkillId": 770080111, "BuffLevel": 2, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770080111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4191,7 +4191,7 @@ "SkillId": 782001111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_782001111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4295,7 +4295,7 @@ "SkillId": 782005111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_782005111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4321,7 +4321,7 @@ "SkillId": 782006111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_782006111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4347,7 +4347,7 @@ "SkillId": 782007111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_782007111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4373,7 +4373,7 @@ "SkillId": 782008111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_782008111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4399,7 +4399,7 @@ "SkillId": 782009111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_782009111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4425,7 +4425,7 @@ "SkillId": 791000111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791000111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4451,7 +4451,7 @@ "SkillId": 791001111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791001111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4477,7 +4477,7 @@ "SkillId": 791002111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791002111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4503,7 +4503,7 @@ "SkillId": 791003111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791003111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4529,7 +4529,7 @@ "SkillId": 791004111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791004111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4555,7 +4555,7 @@ "SkillId": 791005111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791005111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4581,7 +4581,7 @@ "SkillId": 791006111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791006111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4607,7 +4607,7 @@ "SkillId": 791007111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791007111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4633,7 +4633,7 @@ "SkillId": 791008111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791008111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4659,7 +4659,7 @@ "SkillId": 791009111, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791009111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4685,7 +4685,7 @@ "SkillId": 791000211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791000211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4711,7 +4711,7 @@ "SkillId": 791001211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791001211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4737,7 +4737,7 @@ "SkillId": 791002211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791002211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4763,7 +4763,7 @@ "SkillId": 791003211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791003211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4789,7 +4789,7 @@ "SkillId": 791004211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791004211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4815,7 +4815,7 @@ "SkillId": 791005211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791005211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4841,7 +4841,7 @@ "SkillId": 791006211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791006211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4867,7 +4867,7 @@ "SkillId": 791007211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791007211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4893,7 +4893,7 @@ "SkillId": 791008211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791008211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4919,7 +4919,7 @@ "SkillId": 791009211, "BuffLevel": 1, "Quality": 2, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_791009211", "TargetType": 1, "CampType": 0, "TakeDataType": 0, @@ -4945,7 +4945,7 @@ "SkillId": 770076111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770076111", "TargetType": 2, "CampType": 0, "TakeDataType": 0, @@ -4971,7 +4971,7 @@ "SkillId": 770077111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770077111", "TargetType": 2, "CampType": 0, "TakeDataType": 0, @@ -4997,7 +4997,7 @@ "SkillId": 770070111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770070111", "TargetType": 2, "CampType": 0, "TakeDataType": 0, @@ -5023,7 +5023,7 @@ "SkillId": 770071111, "BuffLevel": 1, "Quality": 3, - "BuffIcon": "stonehengebuff_770001111", + "BuffIcon": "stonehengebuff_770071111", "TargetType": 1, "CampType": 0, "TakeDataType": 0, diff --git a/bin/json/game_venturegiftstask.json b/bin/json/game_venturegiftstask.json index 668ceddd4..842a97932 100644 --- a/bin/json/game_venturegiftstask.json +++ b/bin/json/game_venturegiftstask.json @@ -12,6 +12,11 @@ "a": "attr", "t": "gold", "n": 1 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -28,6 +33,11 @@ "a": "attr", "t": "gold", "n": 2 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -44,6 +54,11 @@ "a": "attr", "t": "gold", "n": 3 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -60,6 +75,11 @@ "a": "attr", "t": "gold", "n": 4 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -76,6 +96,11 @@ "a": "attr", "t": "gold", "n": 5 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -92,6 +117,11 @@ "a": "attr", "t": "gold", "n": 6 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -108,6 +138,11 @@ "a": "attr", "t": "gold", "n": 7 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -124,6 +159,11 @@ "a": "attr", "t": "gold", "n": 8 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -140,6 +180,11 @@ "a": "attr", "t": "gold", "n": 9 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -156,6 +201,11 @@ "a": "attr", "t": "gold", "n": 10 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -172,6 +222,11 @@ "a": "attr", "t": "gold", "n": 11 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -188,6 +243,11 @@ "a": "attr", "t": "gold", "n": 12 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -204,6 +264,11 @@ "a": "attr", "t": "gold", "n": 13 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -220,6 +285,11 @@ "a": "attr", "t": "gold", "n": 14 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -236,6 +306,11 @@ "a": "attr", "t": "gold", "n": 15 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -252,6 +327,11 @@ "a": "attr", "t": "gold", "n": 16 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -268,6 +348,11 @@ "a": "attr", "t": "gold", "n": 17 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -284,6 +369,11 @@ "a": "attr", "t": "gold", "n": 18 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -300,6 +390,11 @@ "a": "attr", "t": "gold", "n": 19 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -316,6 +411,11 @@ "a": "attr", "t": "gold", "n": 20 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -332,6 +432,11 @@ "a": "attr", "t": "gold", "n": 21 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -348,6 +453,11 @@ "a": "attr", "t": "gold", "n": 22 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -364,6 +474,11 @@ "a": "attr", "t": "gold", "n": 23 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -380,6 +495,11 @@ "a": "attr", "t": "gold", "n": 24 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -396,6 +516,11 @@ "a": "attr", "t": "gold", "n": 25 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -412,6 +537,11 @@ "a": "attr", "t": "gold", "n": 26 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -428,6 +558,11 @@ "a": "attr", "t": "gold", "n": 27 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -444,6 +579,11 @@ "a": "attr", "t": "gold", "n": 28 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -460,6 +600,11 @@ "a": "attr", "t": "gold", "n": 29 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -476,6 +621,11 @@ "a": "attr", "t": "gold", "n": 30 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -492,6 +642,11 @@ "a": "attr", "t": "gold", "n": 31 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -508,6 +663,11 @@ "a": "attr", "t": "gold", "n": 32 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -524,6 +684,11 @@ "a": "attr", "t": "gold", "n": 33 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -540,6 +705,11 @@ "a": "attr", "t": "gold", "n": 34 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -556,6 +726,11 @@ "a": "attr", "t": "gold", "n": 35 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] }, @@ -572,6 +747,11 @@ "a": "attr", "t": "gold", "n": 36 + }, + { + "a": "item", + "t": "23000001", + "n": 100 } ] } diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index f8e59ac26..6013e1ab6 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -975,7 +975,7 @@ "lock": 1, "lockend": 999, "ontxe": 20130, - "id_after": 20280, + "id_after": 20300, "group": 20, "exgroup": 210, "des": 2, @@ -995,8 +995,10 @@ "get_item": [], "trigger": 0, "npc": 10250, - "completetask": [], - "deliver_npc": 0, + "completetask": [ + 12070300 + ], + "deliver_npc": 10258, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 0, @@ -1025,70 +1027,12 @@ ], "module": [] }, - { - "key": 20280, - "opencond": "", - "lock": 1, - "lockend": 999, - "ontxe": 20250, - "id_after": 20300, - "group": 20, - "exgroup": 210, - "des": 2, - "icon": "25001", - "task_name": { - "key": "worldtask_world_task_task_name_32", - "text": "月光原石新动向" - }, - "task_details": { - "key": "worldtask_world_task_task_details_32", - "text": "前往功夫熊猫世界，寻找月光原石。" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_32", - "text": "与骇客蛛对话" - }, - "get_item": [], - "trigger": 0, - "npc": 10280, - "completetask": [ - 12070300 - ], - "deliver_npc": 0, - "taskend_removeitem": [], - "auto_accept": 0, - "tasktips": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - }, - { - "a": "item", - "t": "10000008", - "n": 3 - }, - { - "a": "attr", - "t": "diamond", - "n": 20 - }, - { - "a": "item", - "t": "10000001", - "n": 1 - } - ], - "module": [] - }, { "key": 20300, "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20290, + "ontxe": 20250, "id_after": 20360, "group": 30, "exgroup": 210, @@ -1109,7 +1053,9 @@ "get_item": [], "trigger": 0, "npc": 10300, - "completetask": [], + "completetask": [ + 12070180 + ], "deliver_npc": 0, "taskend_removeitem": [], "auto_accept": 0, @@ -1168,7 +1114,7 @@ "completetask": [ 12070380 ], - "deliver_npc": 0, + "deliver_npc": 10368, "taskend_removeitem": [], "auto_accept": 0, "tasktips": 0, @@ -1203,7 +1149,7 @@ "lock": 1, "lockend": 999, "ontxe": 20360, - "id_after": 20430, + "id_after": 20440, "group": 40, "exgroup": 210, "des": 2, @@ -1223,57 +1169,6 @@ "get_item": [], "trigger": 0, "npc": 10370, - "completetask": [], - "deliver_npc": 0, - "taskend_removeitem": [], - "auto_accept": 0, - "tasktips": 0, - "lock_add": 0, - "reword": [ - { - "a": "attr", - "t": "gold", - "n": 10000 - }, - { - "a": "item", - "t": "10000008", - "n": 3 - }, - { - "a": "attr", - "t": "diamond", - "n": 20 - } - ], - "module": [] - }, - { - "key": 20430, - "opencond": "", - "lock": 1, - "lockend": 999, - "ontxe": 20370, - "id_after": 20440, - "group": 40, - "exgroup": 210, - "des": 2, - "icon": "25001", - "task_name": { - "key": "worldtask_world_task_task_name_47", - "text": "前往怪物史莱克世界" - }, - "task_details": { - "key": "worldtask_world_task_task_details_47", - "text": "通关冒险关卡【4-1】-【4-8】。" - }, - "npctxt": { - "key": "worldtask_world_task_npctxt_47", - "text": "和邦尼兔聊聊" - }, - "get_item": [], - "trigger": 0, - "npc": 10430, "completetask": [ 12070450 ], @@ -1306,7 +1201,7 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 20430, + "ontxe": 20370, "id_after": 20450, "group": 50, "exgroup": 210, diff --git a/modules/capturesheep/api_allweekreward.go b/modules/capturesheep/api_allweekreward.go new file mode 100644 index 000000000..2007be53c --- /dev/null +++ b/modules/capturesheep/api_allweekreward.go @@ -0,0 +1,74 @@ +package capturesheep + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) AllWeekRewardCheck(session comm.IUserSession, req *pb.CapturesheepAllWeekRewardReq) (errdata *pb.ErrorData) { + + return +} + +// /获取自己的排行榜信息 +func (this *apiComp) AllWeekReward(session comm.IUserSession, req *pb.CapturesheepAllWeekRewardReq) (errdata *pb.ErrorData) { + var ( + conf []*cfg.GameDragonWeeklyrewardData + info *pb.DBCaptureSheep + award []*pb.UserAtno + temp []*pb.UserAtno + ok bool + err error + ) + + if errdata = this.AllWeekRewardCheck(session, req); errdata != nil { + return + } + if conf, err = this.module.configure.getGameDragonWeeklyrewards(); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if info, err = this.module.modelCaptureSheep.queryInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + + for _, v := range conf { + if ok = info.Weekreward[v.Id]; ok { + continue + } + + if info.Weekintegral < v.Point { + continue + } + if errdata, temp = this.module.DispenseAtno(session, v.Rewarditem, true); errdata != nil { + return + } + award = append(award, temp...) + info.Weekreward[v.Id] = true + } + + if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{ + "weekreward": info.Weekreward, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), "allweekreward", &pb.CapturesheepAllWeekRewardResp{Weekreward: info.Weekreward, Award: award}) + return +} diff --git a/modules/capturesheep/api_info.go b/modules/capturesheep/api_info.go index 9d25e5c17..d3bdcf4f0 100644 --- a/modules/capturesheep/api_info.go +++ b/modules/capturesheep/api_info.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" + "go_dreamfactory/utils" ) // 参数校验 @@ -57,6 +58,11 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.CapturesheepInfoReq } } + if !utils.IsSameWeek(info.Weektime) { + info.Weekintegral = 0 + update["weekintegral"] = 0 + } + info.Lv = user.Lv info.Name = user.Name info.Sex = user.Gender diff --git a/modules/capturesheep/api_over.go b/modules/capturesheep/api_over.go index 795f87b5e..484469661 100644 --- a/modules/capturesheep/api_over.go +++ b/modules/capturesheep/api_over.go @@ -4,6 +4,7 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/pb" + "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" ) @@ -18,6 +19,7 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq var ( redScores, blueScores int32 info *pb.DBCaptureSheep + lvconf *cfg.GameBuzkashiLvData conf *cfg.GameQualifyingData isred bool iswin bool @@ -46,6 +48,16 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq } return } + + if lvconf, err = this.module.configure.getGameBuzkashiLv(req.Rating); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + for _, v := range req.Race.Redmember { redScores += v.Scores if v.Uid == session.GetUserId() { @@ -77,6 +89,7 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq awards = conf.RankwinReward } } else { + info.Integral += conf.FailValue info.Integral += conf.FailValue if req.Race.Rtype == pb.CaptureSheepRaceType_train { awards = conf.MatefailReward @@ -97,10 +110,13 @@ func (this *apiComp) Over(session comm.IUserSession, req *pb.CapturesheepOverReq if errdata, award = this.module.DispenseAtno(session, awards, true); errdata != nil { return } - + info.Weekintegral += lvconf.Point + info.Weektime = configure.Now().Unix() if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{ - "integral": info.Integral, - "dan": info.Dan, + "integral": info.Integral, + "dan": info.Dan, + "weekintegral": info.Weekintegral, + "weektime": info.Weektime, }); err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, diff --git a/modules/capturesheep/api_weekreward.go b/modules/capturesheep/api_weekreward.go new file mode 100644 index 000000000..cc393612f --- /dev/null +++ b/modules/capturesheep/api_weekreward.go @@ -0,0 +1,77 @@ +package capturesheep + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" +) + +// 参数校验 +func (this *apiComp) WeekRewardCheck(session comm.IUserSession, req *pb.CapturesheepWeekRewardReq) (errdata *pb.ErrorData) { + + return +} + +// /获取自己的排行榜信息 +func (this *apiComp) WeekReward(session comm.IUserSession, req *pb.CapturesheepWeekRewardReq) (errdata *pb.ErrorData) { + var ( + conf *cfg.GameDragonWeeklyrewardData + info *pb.DBCaptureSheep + award []*pb.UserAtno + ok bool + err error + ) + + if errdata = this.WeekRewardCheck(session, req); errdata != nil { + return + } + if conf, err = this.module.configure.getGameDragonWeeklyreward(req.Id); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + if info, err = this.module.modelCaptureSheep.queryInfo(session.GetUserId()); err != nil && err != mgo.MongodbNil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + if ok = info.Weekreward[req.Id]; ok { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "Already claimed !", + } + return + } + + if info.Weekintegral < conf.Point { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ReqParameterError, + Title: pb.ErrorCode_ReqParameterError.ToString(), + Message: "Not enough points !", + } + } + if errdata, award = this.module.DispenseAtno(session, conf.Rewarditem, true); errdata != nil { + return + } + info.Weekreward[req.Id] = true + if err = this.module.modelCaptureSheep.Change(session.GetUserId(), map[string]interface{}{ + "weekreward": info.Weekreward, + }); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + session.SendMsg(string(this.module.GetType()), "weekreward", &pb.CapturesheepWeekRewardResp{Id: req.Id, Award: award}) + return +} diff --git a/modules/capturesheep/configure.go b/modules/capturesheep/configure.go index a27f686d3..642995ed6 100644 --- a/modules/capturesheep/configure.go +++ b/modules/capturesheep/configure.go @@ -10,9 +10,11 @@ import ( ) const ( - game_buzkashiopen = "game_buzkashiopen.json" - game_arenarobot = "game_arenarobot.json" //ai配置表 - game_qualifying = "game_qualifying.json" //段位 + game_buzkashiopen = "game_buzkashiopen.json" + game_arenarobot = "game_arenarobot.json" //ai配置表 + game_qualifying = "game_qualifying.json" //段位 + game_buzkashilv = "game_buzkashilv.json" //评级表 + game_dragonweeklyreward = "game_dragonweeklyreward.json" //周长 ) type configureComp struct { @@ -24,9 +26,11 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*CaptureSheep) err = this.LoadMultiConfigure(map[string]interface{}{ - game_arenarobot: cfg.NewGameArenaRobot, - game_buzkashiopen: cfg.NewGameBuzkashiOpen, - game_qualifying: cfg.NewGameQualifying, + game_arenarobot: cfg.NewGameArenaRobot, + game_buzkashiopen: cfg.NewGameBuzkashiOpen, + game_qualifying: cfg.NewGameQualifying, + game_buzkashilv: cfg.NewGameBuzkashiLv, + game_dragonweeklyreward: cfg.NewGameDragonWeeklyreward, }) return } @@ -78,6 +82,53 @@ func (this *configureComp) getActiveReward(integral int32) (result *cfg.GameQual return } +//查询积分段位信息 +func (this *configureComp) getGameDragonWeeklyreward(id int32) (result *cfg.GameDragonWeeklyrewardData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_dragonweeklyreward); err != nil { + this.module.Errorln(err) + } else { + if result, ok = v.(*cfg.GameDragonWeeklyreward).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_dragonweeklyreward, id) + this.module.Errorln(err) + } + } + return +} + +//查询积分段位信息 +func (this *configureComp) getGameDragonWeeklyrewards() (confs []*cfg.GameDragonWeeklyrewardData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(game_dragonweeklyreward); err != nil { + this.module.Errorln(err) + } else { + confs = v.(*cfg.GameDragonWeeklyreward).GetDataList() + } + return +} + +//查询积分段位信息 +func (this *configureComp) getGameBuzkashiLv(id int32) (result *cfg.GameBuzkashiLvData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(game_buzkashilv); err != nil { + this.module.Errorln(err) + } else { + if result, ok = v.(*cfg.GameBuzkashiLv).GetDataMap()[id]; !ok { + err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_buzkashilv, id) + this.module.Errorln(err) + } + } + return +} + //查询积分段位信息 func (this *configureComp) getActiveRewardById(lv int32) (result *cfg.GameQualifyingData, err error) { var ( diff --git a/modules/capturesheep/modelCaptureSheep.go b/modules/capturesheep/modelCaptureSheep.go index c27ab31d6..d4acab401 100644 --- a/modules/capturesheep/modelCaptureSheep.go +++ b/modules/capturesheep/modelCaptureSheep.go @@ -43,7 +43,8 @@ func (this *ModelCaptureSheep) queryInfo(uid string) (results *pb.DBCaptureSheep } if err == mgo.MongodbNil { results = &pb.DBCaptureSheep{ - Uid: uid, + Uid: uid, + Weekreward: map[int32]bool{}, } if results.Dan, err = this.computedan(results.Integral); err != nil { return diff --git a/pb/capturesheep_db.pb.go b/pb/capturesheep_db.pb.go index a2fff885d..854e00894 100644 --- a/pb/capturesheep_db.pb.go +++ b/pb/capturesheep_db.pb.go @@ -72,15 +72,18 @@ type DBCaptureSheep struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //名字 - Lv int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"` //等级 - Sex int32 `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"` //性别 - Skin string `protobuf:"bytes,5,opt,name=skin,proto3" json:"skin"` //时装 - Dan int32 `protobuf:"varint,6,opt,name=dan,proto3" json:"dan"` //段位 - Integral int32 `protobuf:"varint,7,opt,name=integral,proto3" json:"integral"` //当前积分 - Defmts string `protobuf:"bytes,8,opt,name=defmts,proto3" json:"defmts"` //默认坐骑 - Loc []float64 `protobuf:"fixed64,9,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` //用户id + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name"` //名字 + Lv int32 `protobuf:"varint,3,opt,name=lv,proto3" json:"lv"` //等级 + Sex int32 `protobuf:"varint,4,opt,name=sex,proto3" json:"sex"` //性别 + Skin string `protobuf:"bytes,5,opt,name=skin,proto3" json:"skin"` //时装 + Dan int32 `protobuf:"varint,6,opt,name=dan,proto3" json:"dan"` //段位 + Integral int32 `protobuf:"varint,7,opt,name=integral,proto3" json:"integral"` //当前积分 + Weekintegral int32 `protobuf:"varint,8,opt,name=weekintegral,proto3" json:"weekintegral"` //周积分 + Defmts string `protobuf:"bytes,9,opt,name=defmts,proto3" json:"defmts"` //默认坐骑 + Weektime int64 `protobuf:"varint,10,opt,name=weektime,proto3" json:"weektime"` //周积分重置使用 + Weekreward map[int32]bool `protobuf:"bytes,11,rep,name=weekreward,proto3" json:"weekreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取 + Loc []float64 `protobuf:"fixed64,12,rep,packed,name=loc,proto3" json:"loc"` //地图索引 匹配系统使用 } func (x *DBCaptureSheep) Reset() { @@ -164,6 +167,13 @@ func (x *DBCaptureSheep) GetIntegral() int32 { return 0 } +func (x *DBCaptureSheep) GetWeekintegral() int32 { + if x != nil { + return x.Weekintegral + } + return 0 +} + func (x *DBCaptureSheep) GetDefmts() string { if x != nil { return x.Defmts @@ -171,6 +181,20 @@ func (x *DBCaptureSheep) GetDefmts() string { return "" } +func (x *DBCaptureSheep) GetWeektime() int64 { + if x != nil { + return x.Weektime + } + return 0 +} + +func (x *DBCaptureSheep) GetWeekreward() map[int32]bool { + if x != nil { + return x.Weekreward + } + return nil +} + func (x *DBCaptureSheep) GetLoc() []float64 { if x != nil { return x.Loc @@ -422,7 +446,7 @@ var File_capturesheep_capturesheep_db_proto protoreflect.FileDescriptor var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{ 0x0a, 0x22, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x2f, 0x63, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x5f, 0x64, 0x62, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc4, 0x01, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x84, 0x03, 0x0a, 0x0e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, @@ -432,9 +456,21 @@ var file_capturesheep_capturesheep_db_proto_rawDesc = []byte{ 0x6b, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, - 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, 0x63, - 0x18, 0x09, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x22, 0xf2, 0x02, 0x0a, 0x16, + 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, + 0x6c, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, + 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x66, 0x6d, 0x74, 0x73, 0x12, 0x1a, 0x0a, + 0x08, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, + 0x08, 0x77, 0x65, 0x65, 0x6b, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x3f, 0x0a, 0x0a, 0x77, 0x65, 0x65, + 0x6b, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, + 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x2e, 0x57, + 0x65, 0x65, 0x6b, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, + 0x77, 0x65, 0x65, 0x6b, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f, + 0x63, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x01, 0x52, 0x03, 0x6c, 0x6f, 0x63, 0x1a, 0x3d, 0x0a, 0x0f, + 0x57, 0x65, 0x65, 0x6b, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 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, 0x08, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf2, 0x02, 0x0a, 0x16, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, @@ -491,22 +527,24 @@ func file_capturesheep_capturesheep_db_proto_rawDescGZIP() []byte { } var file_capturesheep_capturesheep_db_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_capturesheep_capturesheep_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_capturesheep_capturesheep_db_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_capturesheep_capturesheep_db_proto_goTypes = []interface{}{ (CaptureSheepRaceType)(0), // 0: CaptureSheepRaceType (*DBCaptureSheep)(nil), // 1: DBCaptureSheep (*CaptureSheepRaceMember)(nil), // 2: CaptureSheepRaceMember (*DBCaptureSheepRace)(nil), // 3: DBCaptureSheepRace + nil, // 4: DBCaptureSheep.WeekrewardEntry } var file_capturesheep_capturesheep_db_proto_depIdxs = []int32{ - 0, // 0: DBCaptureSheepRace.rtype:type_name -> CaptureSheepRaceType - 2, // 1: DBCaptureSheepRace.redmember:type_name -> CaptureSheepRaceMember - 2, // 2: DBCaptureSheepRace.bulemember:type_name -> CaptureSheepRaceMember - 3, // [3:3] is the sub-list for method output_type - 3, // [3:3] is the sub-list for method input_type - 3, // [3:3] is the sub-list for extension type_name - 3, // [3:3] is the sub-list for extension extendee - 0, // [0:3] is the sub-list for field type_name + 4, // 0: DBCaptureSheep.weekreward:type_name -> DBCaptureSheep.WeekrewardEntry + 0, // 1: DBCaptureSheepRace.rtype:type_name -> CaptureSheepRaceType + 2, // 2: DBCaptureSheepRace.redmember:type_name -> CaptureSheepRaceMember + 2, // 3: DBCaptureSheepRace.bulemember:type_name -> CaptureSheepRaceMember + 4, // [4:4] is the sub-list for method output_type + 4, // [4:4] is the sub-list for method input_type + 4, // [4:4] is the sub-list for extension type_name + 4, // [4:4] is the sub-list for extension extendee + 0, // [0:4] is the sub-list for field type_name } func init() { file_capturesheep_capturesheep_db_proto_init() } @@ -558,7 +596,7 @@ func file_capturesheep_capturesheep_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_capturesheep_capturesheep_db_proto_rawDesc, NumEnums: 1, - NumMessages: 3, + NumMessages: 4, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/capturesheep_msg.pb.go b/pb/capturesheep_msg.pb.go index 67ad65e96..8765de627 100644 --- a/pb/capturesheep_msg.pb.go +++ b/pb/capturesheep_msg.pb.go @@ -407,7 +407,8 @@ type CapturesheepOverReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Race *DBCaptureSheepRace `protobuf:"bytes,1,opt,name=race,proto3" json:"race"` //比赛数据 + Race *DBCaptureSheepRace `protobuf:"bytes,1,opt,name=race,proto3" json:"race"` //比赛数据 + Rating int32 `protobuf:"varint,2,opt,name=rating,proto3" json:"rating"` //评级id } func (x *CapturesheepOverReq) Reset() { @@ -449,16 +450,24 @@ func (x *CapturesheepOverReq) GetRace() *DBCaptureSheepRace { return nil } +func (x *CapturesheepOverReq) GetRating() int32 { + if x != nil { + return x.Rating + } + return 0 +} + //捕养大赛使用道具 type CapturesheepOverResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Iswin bool `protobuf:"varint,1,opt,name=iswin,proto3" json:"iswin"` - Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 - Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //当前积分 - Award []*UserAtno `protobuf:"bytes,5,rep,name=award,proto3" json:"award"` //奖励 + Iswin bool `protobuf:"varint,1,opt,name=iswin,proto3" json:"iswin"` + Dan int32 `protobuf:"varint,2,opt,name=dan,proto3" json:"dan"` //段位 + Integral int32 `protobuf:"varint,4,opt,name=integral,proto3" json:"integral"` //当前积分 + Weekintegral int32 `protobuf:"varint,5,opt,name=weekintegral,proto3" json:"weekintegral"` //当前周积分 + Award []*UserAtno `protobuf:"bytes,6,rep,name=award,proto3" json:"award"` //奖励 } func (x *CapturesheepOverResp) Reset() { @@ -514,6 +523,13 @@ func (x *CapturesheepOverResp) GetIntegral() int32 { return 0 } +func (x *CapturesheepOverResp) GetWeekintegral() int32 { + if x != nil { + return x.Weekintegral + } + return 0 +} + func (x *CapturesheepOverResp) GetAward() []*UserAtno { if x != nil { return x.Award @@ -521,6 +537,205 @@ func (x *CapturesheepOverResp) GetAward() []*UserAtno { return nil } +//周长奖励请求 +type CapturesheepWeekRewardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` +} + +func (x *CapturesheepWeekRewardReq) Reset() { + *x = CapturesheepWeekRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[10] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CapturesheepWeekRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CapturesheepWeekRewardReq) ProtoMessage() {} + +func (x *CapturesheepWeekRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[10] + 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 CapturesheepWeekRewardReq.ProtoReflect.Descriptor instead. +func (*CapturesheepWeekRewardReq) Descriptor() ([]byte, []int) { + return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{10} +} + +func (x *CapturesheepWeekRewardReq) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +//捕养大赛使用道具 +type CapturesheepWeekRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id"` + Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *CapturesheepWeekRewardResp) Reset() { + *x = CapturesheepWeekRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[11] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CapturesheepWeekRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CapturesheepWeekRewardResp) ProtoMessage() {} + +func (x *CapturesheepWeekRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[11] + 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 CapturesheepWeekRewardResp.ProtoReflect.Descriptor instead. +func (*CapturesheepWeekRewardResp) Descriptor() ([]byte, []int) { + return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{11} +} + +func (x *CapturesheepWeekRewardResp) GetId() int32 { + if x != nil { + return x.Id + } + return 0 +} + +func (x *CapturesheepWeekRewardResp) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + +//周长奖励请求 +type CapturesheepAllWeekRewardReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *CapturesheepAllWeekRewardReq) Reset() { + *x = CapturesheepAllWeekRewardReq{} + if protoimpl.UnsafeEnabled { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[12] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CapturesheepAllWeekRewardReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CapturesheepAllWeekRewardReq) ProtoMessage() {} + +func (x *CapturesheepAllWeekRewardReq) ProtoReflect() protoreflect.Message { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[12] + 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 CapturesheepAllWeekRewardReq.ProtoReflect.Descriptor instead. +func (*CapturesheepAllWeekRewardReq) Descriptor() ([]byte, []int) { + return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{12} +} + +//捕养大赛使用道具 +type CapturesheepAllWeekRewardResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Weekreward map[int32]bool `protobuf:"bytes,1,rep,name=weekreward,proto3" json:"weekreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取 + Award []*UserAtno `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 +} + +func (x *CapturesheepAllWeekRewardResp) Reset() { + *x = CapturesheepAllWeekRewardResp{} + if protoimpl.UnsafeEnabled { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[13] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CapturesheepAllWeekRewardResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CapturesheepAllWeekRewardResp) ProtoMessage() {} + +func (x *CapturesheepAllWeekRewardResp) ProtoReflect() protoreflect.Message { + mi := &file_capturesheep_capturesheep_msg_proto_msgTypes[13] + 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 CapturesheepAllWeekRewardResp.ProtoReflect.Descriptor instead. +func (*CapturesheepAllWeekRewardResp) Descriptor() ([]byte, []int) { + return file_capturesheep_capturesheep_msg_proto_rawDescGZIP(), []int{13} +} + +func (x *CapturesheepAllWeekRewardResp) GetWeekreward() map[int32]bool { + if x != nil { + return x.Weekreward + } + return nil +} + +func (x *CapturesheepAllWeekRewardResp) GetAward() []*UserAtno { + if x != nil { + return x.Award + } + return nil +} + var File_capturesheep_capturesheep_msg_proto protoreflect.FileDescriptor var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{ @@ -556,20 +771,47 @@ var file_capturesheep_capturesheep_msg_proto_rawDesc = []byte{ 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, - 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x3e, + 0x65, 0x65, 0x70, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x22, 0x56, 0x0a, 0x13, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x27, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x44, 0x42, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x53, - 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x22, 0x7b, - 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4f, 0x76, - 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, - 0x64, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, - 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, - 0x61, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, - 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x68, 0x65, 0x65, 0x70, 0x52, 0x61, 0x63, 0x65, 0x52, 0x04, 0x72, 0x61, 0x63, 0x65, 0x12, 0x16, + 0x0a, 0x06, 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x72, 0x61, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x9f, 0x01, 0x0a, 0x14, 0x43, 0x61, 0x70, 0x74, 0x75, + 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x4f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, + 0x14, 0x0a, 0x05, 0x69, 0x73, 0x77, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, + 0x69, 0x73, 0x77, 0x69, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x64, 0x61, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, + 0x72, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x65, 0x67, + 0x72, 0x61, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, 0x6e, 0x74, 0x65, 0x67, + 0x72, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x77, 0x65, 0x65, 0x6b, 0x69, + 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x6c, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, + 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, + 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2b, 0x0a, 0x19, 0x43, 0x61, 0x70, 0x74, + 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4d, 0x0a, 0x1a, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, + 0x73, 0x68, 0x65, 0x65, 0x70, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, + 0x77, 0x61, 0x72, 0x64, 0x22, 0x1e, 0x0a, 0x1c, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, 0x73, + 0x68, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x6c, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x52, 0x65, 0x71, 0x22, 0xcf, 0x01, 0x0a, 0x1d, 0x43, 0x61, 0x70, 0x74, 0x75, 0x72, 0x65, + 0x73, 0x68, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x6c, 0x57, 0x65, 0x65, 0x6b, 0x52, 0x65, 0x77, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x4e, 0x0a, 0x0a, 0x77, 0x65, 0x65, 0x6b, 0x72, 0x65, + 0x77, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x43, 0x61, 0x70, + 0x74, 0x75, 0x72, 0x65, 0x73, 0x68, 0x65, 0x65, 0x70, 0x41, 0x6c, 0x6c, 0x57, 0x65, 0x65, 0x6b, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x57, 0x65, 0x65, 0x6b, 0x72, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x77, 0x65, 0x65, 0x6b, + 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, + 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x1a, 0x3d, 0x0a, 0x0f, 0x57, 0x65, 0x65, 0x6b, 0x72, + 0x65, 0x77, 0x61, 0x72, 0x64, 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, 0x08, 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 ( @@ -584,34 +826,42 @@ func file_capturesheep_capturesheep_msg_proto_rawDescGZIP() []byte { return file_capturesheep_capturesheep_msg_proto_rawDescData } -var file_capturesheep_capturesheep_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_capturesheep_capturesheep_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15) var file_capturesheep_capturesheep_msg_proto_goTypes = []interface{}{ - (*CapturesheepInfoReq)(nil), // 0: CapturesheepInfoReq - (*CapturesheepInfoResp)(nil), // 1: CapturesheepInfoResp - (*CapturesheepChangeMtsReq)(nil), // 2: CapturesheepChangeMtsReq - (*CapturesheepChangeMtsResp)(nil), // 3: CapturesheepChangeMtsResp - (*CapturesheepMatcheReq)(nil), // 4: CapturesheepMatcheReq - (*CapturesheepMatcheResp)(nil), // 5: CapturesheepMatcheResp - (*CapturesheepUseItemReq)(nil), // 6: CapturesheepUseItemReq - (*CapturesheepUseItemResp)(nil), // 7: CapturesheepUseItemResp - (*CapturesheepOverReq)(nil), // 8: CapturesheepOverReq - (*CapturesheepOverResp)(nil), // 9: CapturesheepOverResp - (*DBCaptureSheep)(nil), // 10: DBCaptureSheep - (CaptureSheepRaceType)(0), // 11: CaptureSheepRaceType - (*DBCaptureSheepRace)(nil), // 12: DBCaptureSheepRace - (*UserAtno)(nil), // 13: UserAtno + (*CapturesheepInfoReq)(nil), // 0: CapturesheepInfoReq + (*CapturesheepInfoResp)(nil), // 1: CapturesheepInfoResp + (*CapturesheepChangeMtsReq)(nil), // 2: CapturesheepChangeMtsReq + (*CapturesheepChangeMtsResp)(nil), // 3: CapturesheepChangeMtsResp + (*CapturesheepMatcheReq)(nil), // 4: CapturesheepMatcheReq + (*CapturesheepMatcheResp)(nil), // 5: CapturesheepMatcheResp + (*CapturesheepUseItemReq)(nil), // 6: CapturesheepUseItemReq + (*CapturesheepUseItemResp)(nil), // 7: CapturesheepUseItemResp + (*CapturesheepOverReq)(nil), // 8: CapturesheepOverReq + (*CapturesheepOverResp)(nil), // 9: CapturesheepOverResp + (*CapturesheepWeekRewardReq)(nil), // 10: CapturesheepWeekRewardReq + (*CapturesheepWeekRewardResp)(nil), // 11: CapturesheepWeekRewardResp + (*CapturesheepAllWeekRewardReq)(nil), // 12: CapturesheepAllWeekRewardReq + (*CapturesheepAllWeekRewardResp)(nil), // 13: CapturesheepAllWeekRewardResp + nil, // 14: CapturesheepAllWeekRewardResp.WeekrewardEntry + (*DBCaptureSheep)(nil), // 15: DBCaptureSheep + (CaptureSheepRaceType)(0), // 16: CaptureSheepRaceType + (*DBCaptureSheepRace)(nil), // 17: DBCaptureSheepRace + (*UserAtno)(nil), // 18: UserAtno } var file_capturesheep_capturesheep_msg_proto_depIdxs = []int32{ - 10, // 0: CapturesheepInfoResp.info:type_name -> DBCaptureSheep - 11, // 1: CapturesheepMatcheReq.rtype:type_name -> CaptureSheepRaceType - 12, // 2: CapturesheepMatcheResp.race:type_name -> DBCaptureSheepRace - 12, // 3: CapturesheepOverReq.race:type_name -> DBCaptureSheepRace - 13, // 4: CapturesheepOverResp.award:type_name -> UserAtno - 5, // [5:5] is the sub-list for method output_type - 5, // [5:5] is the sub-list for method input_type - 5, // [5:5] is the sub-list for extension type_name - 5, // [5:5] is the sub-list for extension extendee - 0, // [0:5] is the sub-list for field type_name + 15, // 0: CapturesheepInfoResp.info:type_name -> DBCaptureSheep + 16, // 1: CapturesheepMatcheReq.rtype:type_name -> CaptureSheepRaceType + 17, // 2: CapturesheepMatcheResp.race:type_name -> DBCaptureSheepRace + 17, // 3: CapturesheepOverReq.race:type_name -> DBCaptureSheepRace + 18, // 4: CapturesheepOverResp.award:type_name -> UserAtno + 18, // 5: CapturesheepWeekRewardResp.award:type_name -> UserAtno + 14, // 6: CapturesheepAllWeekRewardResp.weekreward:type_name -> CapturesheepAllWeekRewardResp.WeekrewardEntry + 18, // 7: CapturesheepAllWeekRewardResp.award:type_name -> UserAtno + 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_capturesheep_capturesheep_msg_proto_init() } @@ -742,6 +992,54 @@ func file_capturesheep_capturesheep_msg_proto_init() { return nil } } + file_capturesheep_capturesheep_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CapturesheepWeekRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_capturesheep_capturesheep_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CapturesheepWeekRewardResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_capturesheep_capturesheep_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CapturesheepAllWeekRewardReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_capturesheep_capturesheep_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*CapturesheepAllWeekRewardResp); 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{ @@ -749,7 +1047,7 @@ func file_capturesheep_capturesheep_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_capturesheep_capturesheep_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 15, NumExtensions: 0, NumServices: 0, },