diff --git a/bin/json/game_arenachallengenpc.json b/bin/json/game_arenachallengenpc.json index 3d5b4f096..d519208d1 100644 --- a/bin/json/game_arenachallengenpc.json +++ b/bin/json/game_arenachallengenpc.json @@ -3,6 +3,7 @@ "id": 1, "open_cond": 1, "open_value": 10, + "BattleReadyID": 110, "monsterformat_id": [ 301011, 301027 @@ -33,6 +34,7 @@ "id": 2, "open_cond": 1, "open_value": 11, + "BattleReadyID": 110, "monsterformat_id": [ 301012 ], @@ -62,6 +64,7 @@ "id": 3, "open_cond": 1, "open_value": 12, + "BattleReadyID": 110, "monsterformat_id": [ 301013 ], @@ -91,6 +94,7 @@ "id": 4, "open_cond": 1, "open_value": 13, + "BattleReadyID": 110, "monsterformat_id": [ 301014 ], @@ -120,6 +124,7 @@ "id": 5, "open_cond": 1, "open_value": 14, + "BattleReadyID": 110, "monsterformat_id": [ 301015 ], @@ -149,6 +154,7 @@ "id": 6, "open_cond": 1, "open_value": 15, + "BattleReadyID": 110, "monsterformat_id": [ 301016 ], @@ -178,6 +184,7 @@ "id": 7, "open_cond": 1, "open_value": 16, + "BattleReadyID": 110, "monsterformat_id": [ 301017 ], @@ -207,6 +214,7 @@ "id": 8, "open_cond": 1, "open_value": 17, + "BattleReadyID": 110, "monsterformat_id": [ 301018 ], @@ -236,6 +244,7 @@ "id": 9, "open_cond": 1, "open_value": 18, + "BattleReadyID": 110, "monsterformat_id": [ 301019 ], @@ -265,6 +274,7 @@ "id": 10, "open_cond": 1, "open_value": 19, + "BattleReadyID": 110, "monsterformat_id": [ 301020 ], @@ -294,6 +304,7 @@ "id": 11, "open_cond": 1, "open_value": 20, + "BattleReadyID": 110, "monsterformat_id": [ 301021 ], @@ -323,6 +334,7 @@ "id": 12, "open_cond": 1, "open_value": 21, + "BattleReadyID": 110, "monsterformat_id": [ 301022 ], @@ -352,6 +364,7 @@ "id": 13, "open_cond": 1, "open_value": 22, + "BattleReadyID": 110, "monsterformat_id": [ 301023 ], @@ -381,6 +394,7 @@ "id": 14, "open_cond": 1, "open_value": 23, + "BattleReadyID": 110, "monsterformat_id": [ 301024 ], @@ -410,6 +424,7 @@ "id": 15, "open_cond": 1, "open_value": 24, + "BattleReadyID": 110, "monsterformat_id": [ 301025 ], @@ -439,6 +454,7 @@ "id": 16, "open_cond": 1, "open_value": 25, + "BattleReadyID": 110, "monsterformat_id": [ 301026 ], diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json new file mode 100644 index 000000000..ad4babbd0 --- /dev/null +++ b/bin/json/game_battleready.json @@ -0,0 +1,112 @@ +[ + { + "id": 100, + "PlayType": "WorldTask", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 1 + }, + { + "id": 101, + "PlayType": "MysteryMoon", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 102, + "PlayType": "MainLine", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 103, + "PlayType": "Pagoda", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 104, + "PlayType": "ViKing", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 105, + "PlayType": "Arena", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 106, + "PlayType": "ArenaDef", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 107, + "PlayType": "Hunting", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 108, + "PlayType": "EnchantBoss", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 109, + "PlayType": "Combat", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + }, + { + "id": 110, + "PlayType": "ArenaNpc", + "HeroCount": 5, + "DefaultHero": 0, + "DisableHero": [], + "LockSlots": [], + "AssistTeam": 0, + "CanFriendHelp": 0 + } +] \ No newline at end of file diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index 1cd022fda..07e638431 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -167,5 +167,18 @@ "ico": "wp_icon_10009", "intr": "Currency used to purchase goods", "tipstxt": "Lack of experience" + }, + { + "key": "moongold", + "name": "moongold", + "color": 5, + "effects": "", + "access": 107, + "star": 0, + "race": 0, + "img": "wp_icon_10009", + "ico": "wp_icon_10009", + "intr": "Currency used to purchase goods", + "tipstxt": "Lack of experience" } ] \ No newline at end of file diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index cc16cf915..4a158a6dc 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -8,6 +8,7 @@ ], "time": 3, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720001 ], @@ -28,6 +29,7 @@ ], "time": 3, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720003 ], @@ -48,6 +50,7 @@ ], "time": 3, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720004 ], @@ -68,6 +71,7 @@ ], "time": 3, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720002 ], @@ -88,6 +92,7 @@ ], "time": 3, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720005 ], @@ -105,6 +110,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720006 ], @@ -122,6 +128,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720007 ], @@ -139,6 +146,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720008 ], @@ -156,6 +164,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720009 ], @@ -173,6 +182,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720010 ], @@ -190,6 +200,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720011 ], @@ -207,6 +218,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720012 ], @@ -224,6 +236,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 101072 ], @@ -241,6 +254,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 101072 ], @@ -258,6 +272,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 101072 ], @@ -275,6 +290,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 101072 ], @@ -292,6 +308,7 @@ "sencenstory": [], "time": 0, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 101072 ], @@ -312,6 +329,7 @@ ], "time": 3, "clickstory": 100002, + "BattleReadyID": 109, "formatList": [], "award": [] }, @@ -324,6 +342,7 @@ ], "time": 3, "clickstory": 100002, + "BattleReadyID": 109, "formatList": [], "award": [] }, @@ -336,6 +355,7 @@ ], "time": 3, "clickstory": 100002, + "BattleReadyID": 109, "formatList": [], "award": [] }, @@ -345,6 +365,7 @@ "sencenstory": [], "time": 3, "clickstory": 0, + "BattleReadyID": 109, "formatList": [ 720013 ], diff --git a/bin/json/game_dreamlandboos.json b/bin/json/game_dreamlandboos.json index 0e7645be3..6e835fcfe 100644 --- a/bin/json/game_dreamlandboos.json +++ b/bin/json/game_dreamlandboos.json @@ -11,6 +11,7 @@ "n": 1 } ], + "BattleReadyID": 101, "monsterformatid": [ 201011 ], @@ -42,6 +43,7 @@ "n": 1 } ], + "BattleReadyID": 101, "monsterformatid": [ 201012 ], diff --git a/bin/json/game_enchantboss.json b/bin/json/game_enchantboss.json index 2fef073ec..a7187a278 100644 --- a/bin/json/game_enchantboss.json +++ b/bin/json/game_enchantboss.json @@ -6,6 +6,7 @@ "key": "viking_boss_1001", "text": "火焰泰坦" }, + "BattleReadyID": 108, "grade": "SSS", "score_low": 6666667, "score_up": 99999999, @@ -116,6 +117,7 @@ "key": "viking_boss_1001", "text": "火焰泰坦" }, + "BattleReadyID": 108, "grade": "SS", "score_low": 3500001, "score_up": 6666666, @@ -226,6 +228,7 @@ "key": "viking_boss_1001", "text": "火焰泰坦" }, + "BattleReadyID": 108, "grade": "S", "score_low": 1800001, "score_up": 3500000, @@ -336,6 +339,7 @@ "key": "viking_boss_1001", "text": "火焰泰坦" }, + "BattleReadyID": 108, "grade": "A+", "score_low": 800001, "score_up": 1800000, @@ -446,6 +450,7 @@ "key": "viking_boss_1001", "text": "火焰泰坦" }, + "BattleReadyID": 108, "grade": "A", "score_low": 350001, "score_up": 800000, @@ -556,6 +561,7 @@ "key": "viking_boss_1001", "text": "火焰泰坦" }, + "BattleReadyID": 108, "grade": "B", "score_low": 100001, "score_up": 350000, @@ -666,6 +672,7 @@ "key": "viking_boss_1001", "text": "火焰泰坦" }, + "BattleReadyID": 108, "grade": "C", "score_low": 0, "score_up": 100000, @@ -776,6 +783,7 @@ "key": "viking_boss_1002", "text": "冰霜泰坦" }, + "BattleReadyID": 108, "grade": "SSS", "score_low": 6666667, "score_up": 99999999, @@ -886,6 +894,7 @@ "key": "viking_boss_1002", "text": "冰霜泰坦" }, + "BattleReadyID": 108, "grade": "SS", "score_low": 3500001, "score_up": 6666666, @@ -996,6 +1005,7 @@ "key": "viking_boss_1002", "text": "冰霜泰坦" }, + "BattleReadyID": 108, "grade": "S", "score_low": 1800001, "score_up": 3500000, @@ -1106,6 +1116,7 @@ "key": "viking_boss_1002", "text": "冰霜泰坦" }, + "BattleReadyID": 108, "grade": "A+", "score_low": 800001, "score_up": 1800000, @@ -1216,6 +1227,7 @@ "key": "viking_boss_1002", "text": "冰霜泰坦" }, + "BattleReadyID": 108, "grade": "A", "score_low": 350001, "score_up": 800000, @@ -1326,6 +1338,7 @@ "key": "viking_boss_1002", "text": "冰霜泰坦" }, + "BattleReadyID": 108, "grade": "B", "score_low": 100001, "score_up": 350000, @@ -1436,6 +1449,7 @@ "key": "viking_boss_1002", "text": "冰霜泰坦" }, + "BattleReadyID": 108, "grade": "C", "score_low": 0, "score_up": 100000, @@ -1546,6 +1560,7 @@ "key": "viking_boss_1003", "text": "森林泰坦" }, + "BattleReadyID": 108, "grade": "SSS", "score_low": 6666667, "score_up": 99999999, @@ -1656,6 +1671,7 @@ "key": "viking_boss_1003", "text": "森林泰坦" }, + "BattleReadyID": 108, "grade": "SS", "score_low": 3500001, "score_up": 6666666, @@ -1766,6 +1782,7 @@ "key": "viking_boss_1003", "text": "森林泰坦" }, + "BattleReadyID": 108, "grade": "S", "score_low": 1800001, "score_up": 3500000, @@ -1876,6 +1893,7 @@ "key": "viking_boss_1003", "text": "森林泰坦" }, + "BattleReadyID": 108, "grade": "A+", "score_low": 800001, "score_up": 1800000, @@ -1986,6 +2004,7 @@ "key": "viking_boss_1003", "text": "森林泰坦" }, + "BattleReadyID": 108, "grade": "A", "score_low": 350001, "score_up": 800000, @@ -2096,6 +2115,7 @@ "key": "viking_boss_1003", "text": "森林泰坦" }, + "BattleReadyID": 108, "grade": "B", "score_low": 100001, "score_up": 350000, @@ -2206,6 +2226,7 @@ "key": "viking_boss_1003", "text": "森林泰坦" }, + "BattleReadyID": 108, "grade": "C", "score_low": 0, "score_up": 100000, diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json index 3e9597205..957faa2c3 100644 --- a/bin/json/game_extservers.json +++ b/bin/json/game_extservers.json @@ -11,6 +11,16 @@ }, { "index": 2, + "name": { + "key": "server_10002", + "text": "本地测试服2" + }, + "ips": "10.0.0.9:7691", + "debug": true, + "sid": "df02" + }, + { + "index": 3, "name": { "key": "debug_server_01", "text": "lw" @@ -20,7 +30,7 @@ "sid": "dfli" }, { - "index": 3, + "index": 4, "name": { "key": "debug_server_02", "text": "zcy" @@ -30,7 +40,7 @@ "sid": "dfz" }, { - "index": 4, + "index": 5, "name": { "key": "debug_server_03", "text": "mxf" @@ -38,45 +48,5 @@ "ips": "10.0.0.85:7891", "debug": true, "sid": "dfmxf" - }, - { - "index": 5, - "name": { - "key": "server_10004", - "text": "凤凰城" - }, - "ips": "119.3.89.14:9891", - "debug": true, - "sid": "df01" - }, - { - "index": 6, - "name": { - "key": "server_10005", - "text": "翡翠宫" - }, - "ips": "119.3.89.14:9891", - "debug": true, - "sid": "df01" - }, - { - "index": 7, - "name": { - "key": "server_10006", - "text": "乌鸦岭" - }, - "ips": "119.3.89.14:9891", - "debug": true, - "sid": "df01" - }, - { - "index": 8, - "name": { - "key": "server_10003", - "text": "和平谷" - }, - "ips": "119.3.89.14:7891", - "debug": false, - "sid": "df02" } ] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 972ddd2cd..99c6ca3c1 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -364,6 +364,12 @@ 29, 5 ], + "DrawCard_5StarsInRange1": [ + 30, + 49, + 5 + ], + "DrawCard_5StarsInRange1_pool": "base_pool7", "DrawCard_ContinuousRestriction_Star5": 20, "DrawCard_ContinuousRestriction_Camp": 2, "EquipmentConsumption": [ @@ -525,6 +531,13 @@ "GuildBoss_MaxBuyNum": 5, "GuildBoss_troop2": 45, "GuildBoss_troop3": 60, - "zhayantime": 5 + "zhayantime": 5, + "rotateAngle": 360, + "rotateDizzyTime": 1, + "moonshopmoney": [ + 10, + 20, + 30 + ] } ] \ No newline at end of file diff --git a/bin/json/game_growtask.json b/bin/json/game_growtask.json index 23a64eaf5..362fa7e83 100644 --- a/bin/json/game_growtask.json +++ b/bin/json/game_growtask.json @@ -9,11 +9,11 @@ "onetask": 0, "txt": { "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" + "text": "冒险从这一步开始" }, "portrait": "N6_0002_图层-31253", "fstask": 106, - "jump": 107, + "jump": 113, "reward": [ { "a": "attr", @@ -32,15 +32,15 @@ "type": 1, "title": { "key": "ClearanceThread", - "text": "通关1-2" + "text": "累计登录1天" }, "onetask": 1, "txt": { "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" + "text": "冒险从这一步开始" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, + "fstask": 108, "jump": 107, "reward": [ { @@ -65,11 +65,11 @@ "onetask": 2, "txt": { "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" + "text": "冒险从这一步开始" }, "portrait": "N6_0002_图层-31253", "fstask": 106, - "jump": 107, + "jump": 113, "reward": [ { "a": "attr", @@ -93,11 +93,11 @@ "onetask": 3, "txt": { "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" + "text": "冒险从这一步开始" }, "portrait": "N6_0002_图层-31253", "fstask": 106, - "jump": 107, + "jump": 113, "reward": [ { "a": "attr", @@ -121,151 +121,11 @@ "onetask": 4, "txt": { "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" + "text": "冒险从这一步开始" }, "portrait": "N6_0002_图层-31253", "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 6, - "type": 1, - "title": { - "key": "ClearanceThread", - "text": "通关1-6" - }, - "onetask": 5, - "txt": { - "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 7, - "type": 1, - "title": { - "key": "ClearanceThread", - "text": "通关1-7" - }, - "onetask": 6, - "txt": { - "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 8, - "type": 1, - "title": { - "key": "ClearanceThread", - "text": "通关1-8" - }, - "onetask": 7, - "txt": { - "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 9, - "type": 1, - "title": { - "key": "ClearanceThread", - "text": "通关1-9" - }, - "onetask": 8, - "txt": { - "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 10, - "type": 1, - "title": { - "key": "ClearanceThread", - "text": "通关1-10" - }, - "onetask": 9, - "txt": { - "key": "Growtxtone", - "text": "位置的丛林充满了危险，赶快带上你的小伙伴去探索一番吧~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "jump": 113, "reward": [ { "a": "attr", @@ -284,15 +144,15 @@ "type": 2, "title": { "key": "CharacterGrowth", - "text": "阿宝升1级" + "text": "获得阿宝" }, "onetask": 10, "txt": { "key": "Growtxttwo", - "text": "阿宝需要变强，快去帮助他把~" + "text": "去寻找那个会武功的熊猫吧。" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, + "fstask": 101, "jump": 107, "reward": [ { @@ -312,7 +172,7 @@ "type": 2, "title": { "key": "CharacterGrowth", - "text": "阿宝升2级" + "text": "将一名3星英雄升到4星" }, "onetask": 11, "txt": { @@ -320,8 +180,8 @@ "text": "阿宝需要变强，快去帮助他把~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 126, + "jump": 127, "reward": [ { "a": "attr", @@ -340,7 +200,7 @@ "type": 2, "title": { "key": "CharacterGrowth", - "text": "阿宝升3级" + "text": "将一名4星英雄升到5星" }, "onetask": 12, "txt": { @@ -348,8 +208,8 @@ "text": "阿宝需要变强，快去帮助他把~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 127, + "jump": 127, "reward": [ { "a": "attr", @@ -368,7 +228,7 @@ "type": 2, "title": { "key": "CharacterGrowth", - "text": "阿宝升4级" + "text": "将一名5星英雄升到6星" }, "onetask": 13, "txt": { @@ -376,8 +236,8 @@ "text": "阿宝需要变强，快去帮助他把~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 128, + "jump": 127, "reward": [ { "a": "attr", @@ -396,7 +256,7 @@ "type": 2, "title": { "key": "CharacterGrowth", - "text": "阿宝升5级" + "text": "消耗1000枚金币" }, "onetask": 14, "txt": { @@ -404,148 +264,8 @@ "text": "阿宝需要变强，快去帮助他把~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 16, - "type": 2, - "title": { - "key": "CharacterGrowth", - "text": "阿宝升6级" - }, - "onetask": 15, - "txt": { - "key": "Growtxttwo", - "text": "阿宝需要变强，快去帮助他把~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 17, - "type": 2, - "title": { - "key": "CharacterGrowth", - "text": "阿宝升7级" - }, - "onetask": 16, - "txt": { - "key": "Growtxttwo", - "text": "阿宝需要变强，快去帮助他把~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 18, - "type": 2, - "title": { - "key": "CharacterGrowth", - "text": "阿宝升8级" - }, - "onetask": 17, - "txt": { - "key": "Growtxttwo", - "text": "阿宝需要变强，快去帮助他把~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 19, - "type": 2, - "title": { - "key": "CharacterGrowth", - "text": "阿宝升9级" - }, - "onetask": 18, - "txt": { - "key": "Growtxttwo", - "text": "阿宝需要变强，快去帮助他把~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 20, - "type": 2, - "title": { - "key": "CharacterGrowth", - "text": "阿宝升10级" - }, - "onetask": 19, - "txt": { - "key": "Growtxttwo", - "text": "阿宝需要变强，快去帮助他把~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 168, + "jump": 122, "reward": [ { "a": "attr", @@ -564,7 +284,7 @@ "type": 3, "title": { "key": "CharacterIpgrading", - "text": "波比升1级" + "text": "强化成功一次装备" }, "onetask": 20, "txt": { @@ -572,8 +292,8 @@ "text": "你们都变强了，我也需要变强，请助我一臂之力~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 2047001, + "jump": 127, "reward": [ { "a": "attr", @@ -592,7 +312,7 @@ "type": 3, "title": { "key": "CharacterIpgrading", - "text": "波比升2级" + "text": "通关主线1-9" }, "onetask": 21, "txt": { @@ -600,8 +320,8 @@ "text": "你们都变强了，我也需要变强，请助我一臂之力~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 161, + "jump": 113, "reward": [ { "a": "attr", @@ -620,7 +340,7 @@ "type": 3, "title": { "key": "CharacterIpgrading", - "text": "波比升3级" + "text": "在铁匠铺获得1次1星装备" }, "onetask": 22, "txt": { @@ -628,8 +348,8 @@ "text": "你们都变强了，我也需要变强，请助我一臂之力~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 151, + "jump": 129, "reward": [ { "a": "attr", @@ -648,7 +368,7 @@ "type": 3, "title": { "key": "CharacterIpgrading", - "text": "波比升4级" + "text": "将2件装备强化到2级" }, "onetask": 23, "txt": { @@ -656,8 +376,8 @@ "text": "你们都变强了，我也需要变强，请助我一臂之力~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 143, + "jump": 113, "reward": [ { "a": "attr", @@ -676,7 +396,7 @@ "type": 3, "title": { "key": "CharacterIpgrading", - "text": "波比升5级" + "text": "5个英雄觉醒到2阶" }, "onetask": 24, "txt": { @@ -684,148 +404,8 @@ "text": "你们都变强了，我也需要变强，请助我一臂之力~" }, "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 26, - "type": 3, - "title": { - "key": "CharacterIpgrading", - "text": "波比升6级" - }, - "onetask": 25, - "txt": { - "key": "Growtxtthree", - "text": "你们都变强了，我也需要变强，请助我一臂之力~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 27, - "type": 3, - "title": { - "key": "CharacterIpgrading", - "text": "波比升7级" - }, - "onetask": 26, - "txt": { - "key": "Growtxtthree", - "text": "你们都变强了，我也需要变强，请助我一臂之力~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 28, - "type": 3, - "title": { - "key": "CharacterIpgrading", - "text": "波比升8级" - }, - "onetask": 27, - "txt": { - "key": "Growtxtthree", - "text": "你们都变强了，我也需要变强，请助我一臂之力~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 29, - "type": 3, - "title": { - "key": "CharacterIpgrading", - "text": "波比升9级" - }, - "onetask": 28, - "txt": { - "key": "Growtxtthree", - "text": "你们都变强了，我也需要变强，请助我一臂之力~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - }, - { - "a": "attr", - "t": "diamond", - "n": 1000 - } - ] - }, - { - "id": 30, - "type": 3, - "title": { - "key": "CharacterIpgrading", - "text": "波比升9级" - }, - "onetask": 29, - "txt": { - "key": "Growtxtthree", - "text": "你们都变强了，我也需要变强，请助我一臂之力~" - }, - "portrait": "N6_0002_图层-31253", - "fstask": 106, - "jump": 107, + "fstask": 134, + "jump": 113, "reward": [ { "a": "attr", diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json new file mode 100644 index 000000000..7e2855dda --- /dev/null +++ b/bin/json/game_guide.json @@ -0,0 +1,871 @@ +[ + { + "id": 10, + "group": 10, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20011", + "followtj": "", + "followguide": 20, + "finger": [], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "500", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 20, + "group": 20, + "type": 5, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "GuideFinish10", + "followtj": "", + "followguide": 0, + "finger": [ + "gesture", + "circle" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 1, + "lock": 1, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 40, + "group": 40, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20050", + "followtj": "", + "followguide": 0, + "finger": [], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "501", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 50, + "group": 50, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20060", + "followtj": "", + "followguide": 0, + "finger": [], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "503", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 60, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20170", + "followtj": "OpenRecruit", + "followguide": 70, + "finger": [ + "3d", + "Root/程序/EntityInteraction/Middle/Recruit" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 1, + "objSize": { + "x": 200, + "y": 200 + }, + "objOffset": { + "x": -100, + "y": -100 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 70, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "OpenRecruittendraw", + "followguide": 80, + "finger": [ + "recruit", + "btn_onedraw$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 1, + "reward": [] + }, + { + "id": 80, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 90, + "finger": [ + "recruittendraw", + "btn_return$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 90, + "group": 60, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "OpenMaininterFace", + "followguide": 0, + "finger": [ + "recruit", + "btn_back$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 1, + "reward": [] + }, + { + "id": 120, + "group": 70, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20190", + "followtj": "", + "followguide": 130, + "finger": [ + "swipe", + "right" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 1, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 130, + "group": 70, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "OpenSmithyMain", + "followguide": 140, + "finger": [ + "3d", + "Root/程序/EntityInteraction/Right/GeBoTieJiangPu" + ], + "offset": { + "x": 0, + "y": -15 + }, + "fingerTime": 1, + "objSize": { + "x": 300, + "y": 300 + }, + "objOffset": { + "x": -150, + "y": -150 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 140, + "group": 70, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "3d", + "暴夫纳特铁匠铺" + ], + "offset": { + "x": 0, + "y": -15 + }, + "fingerTime": 1, + "objSize": { + "x": 200, + "y": 200 + }, + "objOffset": { + "x": -150, + "y": -200 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 150, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20200", + "followtj": "", + "followguide": 160, + "finger": [ + "3d", + "Root/程序/Interaction/Workbench0" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.8, + "objSize": { + "x": 200, + "y": 200 + }, + "objOffset": { + "x": -100, + "y": -100 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 160, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 170, + "finger": [ + "smithy", + "btn_order$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 170, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 180, + "finger": [ + "smithy", + "right$.listForgingTable$", + "0", + "laAdd$.btnPlus$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 180, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 190, + "finger": [ + "smithy", + "right$.btnUp$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 190, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 200, + "finger": [ + "smithy", + "comPrompt$.comPromptitem$.btnDetermine$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 200, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 210, + "finger": [ + "smithy", + "btn_back$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 210, + "group": 80, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "3d", + "暴夫纳特铁匠铺" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 200, + "y": 200 + }, + "objOffset": { + "x": -150, + "y": -200 + }, + "txt": "303", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 10000, + "skip": 0, + "skipgroup": 1, + "reward": [] + }, + { + "id": 220, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "worldtask_20150", + "followtj": "", + "followguide": 230, + "finger": [ + "maininterface", + "btn_card$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 230, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 240, + "finger": [ + "herocard", + "roleListCom$.heroList.heroList$", + "1" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 1.5, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 240, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 250, + "finger": [ + "herocard", + "com_heroInfo$.upenter" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.8, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 250, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 260, + "finger": [ + "herocard", + "heroInfoCom$.chooselistgcom$.list", + "0" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.8, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + }, + { + "id": 260, + "group": 90, + "type": 3, + "startPar": "", + "parameter": "", + "interface": "", + "condition": "", + "followtj": "", + "followguide": 0, + "finger": [ + "herocard", + "heroInfoCom$.upbtn$" + ], + "offset": { + "x": 0, + "y": 0 + }, + "fingerTime": 0.8, + "objSize": { + "x": 0, + "y": 0 + }, + "objOffset": { + "x": 0, + "y": 0 + }, + "txt": "", + "speakerface": 0, + "sound": "", + "mask": 0, + "lock": 0, + "uishow": 0, + "skiptime": 0, + "skip": 0, + "skipgroup": 0, + "reward": [] + } +] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 4c96cbc7b..ce3acf7b0 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -58,7 +58,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "13002", @@ -119,7 +137,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "13003", @@ -180,7 +216,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "13004", @@ -241,7 +295,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "13005", @@ -302,7 +374,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "14001", @@ -363,7 +453,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "14002", @@ -424,7 +532,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "14003", @@ -485,7 +611,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "14004", @@ -546,7 +690,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "14005", @@ -607,7 +769,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "14006", @@ -668,7 +848,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "14007", @@ -729,7 +927,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "15001", @@ -790,7 +1006,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "15002", @@ -851,7 +1085,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "15003", @@ -912,7 +1164,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "15004", @@ -973,7 +1243,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "23001", @@ -1034,7 +1322,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "23002", @@ -1095,7 +1401,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "23003", @@ -1156,7 +1480,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "23004", @@ -1217,7 +1559,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24001", @@ -1278,7 +1638,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24002", @@ -1339,7 +1717,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24003", @@ -1400,7 +1796,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24004", @@ -1461,7 +1875,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24005", @@ -1522,7 +1954,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24006", @@ -1583,7 +2033,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24007", @@ -1644,7 +2112,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24008", @@ -1705,7 +2191,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "24009", @@ -1766,7 +2270,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "25001", @@ -1827,7 +2349,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "25002", @@ -1888,7 +2428,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "25003", @@ -1949,7 +2507,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "25004", @@ -2010,7 +2586,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "33001", @@ -2071,7 +2665,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "33002", @@ -2132,7 +2744,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "33003", @@ -2193,7 +2823,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "33004", @@ -2254,7 +2902,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "33005", @@ -2315,7 +2981,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "33006", @@ -2376,7 +3060,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34001", @@ -2437,7 +3139,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34002", @@ -2498,7 +3218,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34003", @@ -2559,7 +3297,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34004", @@ -2620,7 +3376,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34005", @@ -2681,7 +3455,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34006", @@ -2742,7 +3534,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34007", @@ -2803,7 +3613,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "34008", @@ -2864,7 +3692,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "35001", @@ -2925,7 +3771,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "35002", @@ -2986,7 +3850,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "35003", @@ -3047,7 +3929,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "35004", @@ -3108,7 +4008,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "35005", @@ -3169,7 +4087,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "35006", @@ -3230,7 +4166,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43001", @@ -3291,7 +4245,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43002", @@ -3352,7 +4324,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43003", @@ -3413,7 +4403,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43004", @@ -3474,7 +4482,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43005", @@ -3535,7 +4561,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43006", @@ -3596,7 +4640,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43007", @@ -3657,7 +4719,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44001", @@ -3718,7 +4798,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44002", @@ -3779,7 +4877,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44003", @@ -3840,7 +4956,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44004", @@ -3901,7 +5035,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44006", @@ -3962,7 +5114,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "45001", @@ -4023,7 +5193,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "45002", @@ -4084,7 +5272,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "45003", @@ -4145,7 +5351,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "45004", @@ -4206,7 +5430,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44005", @@ -4267,7 +5509,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "15005", @@ -4328,7 +5588,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43901", @@ -4389,7 +5667,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43902", @@ -4450,7 +5746,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43903", @@ -4511,7 +5825,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "42911", @@ -4572,7 +5904,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43911", @@ -4633,7 +5983,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44911", @@ -4694,7 +6062,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "43921", @@ -4755,7 +6141,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "44921", @@ -4816,7 +6220,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "45921", @@ -4877,7 +6299,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51001", @@ -4938,7 +6378,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51002", @@ -4999,7 +6457,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51003", @@ -5060,7 +6536,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51004", @@ -5121,7 +6615,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51005", @@ -5182,7 +6694,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51006", @@ -5243,7 +6773,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51007", @@ -5304,7 +6852,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "54005", @@ -5365,7 +6931,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51010", @@ -5426,7 +7010,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51011", @@ -5487,7 +7089,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51012", @@ -5548,7 +7168,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51013", @@ -5609,7 +7247,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "51014", @@ -5670,7 +7326,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "54001", @@ -5731,7 +7405,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "53001", @@ -5792,7 +7484,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "53002", @@ -5853,7 +7563,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "53003", @@ -5914,7 +7642,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "54002", @@ -5975,7 +7721,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "53005", @@ -6036,7 +7800,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "53006", @@ -6097,7 +7879,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "55001", @@ -6158,7 +7958,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "55002", @@ -6219,7 +8037,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "55003", @@ -6280,7 +8116,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "55004", @@ -6341,7 +8195,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "55005", @@ -6402,7 +8274,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "55006", @@ -6463,7 +8353,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "55007", @@ -6524,7 +8432,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "11021", @@ -6585,7 +8511,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "12003", @@ -6648,7 +8592,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "63002", @@ -6709,7 +8671,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "63003", @@ -6770,7 +8750,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "63004", @@ -6831,7 +8829,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "64003", @@ -6892,7 +8908,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "74002", @@ -6953,7 +8987,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "74003", @@ -7014,7 +9066,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "74004", @@ -7075,7 +9145,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "83002", @@ -7136,7 +9224,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "83006", @@ -7197,7 +9303,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "84002", @@ -7258,7 +9382,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "94002", @@ -7319,7 +9461,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "94005", @@ -7380,7 +9540,25 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 }, { "hid": "101004", @@ -7441,6 +9619,24 @@ ], "angle": 0, "deviation": 0, - "show": 1 + "show": 1, + "herofrag": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "heroskillup": [ + "625001" + ], + "expitem": [ + { + "a": "item", + "t": "625001", + "n": 1 + } + ], + "expitemnum": 3 } ] \ No newline at end of file diff --git a/bin/json/game_heroexp.json b/bin/json/game_heroexp.json index fd4632d4f..97402e739 100644 --- a/bin/json/game_heroexp.json +++ b/bin/json/game_heroexp.json @@ -1,56 +1,7 @@ [ { - "hid": "42911", - "name": "初级经验精灵", - "star": 2, - "color": 1, - "heroexp": 4630, - "skilllevelup": 0, - "needgold": 5663 - }, - { - "hid": "43911", - "name": "中级经验精灵", - "star": 3, - "color": 2, - "heroexp": 9259, - "skilllevelup": 0, - "needgold": 11951 - }, - { - "hid": "44911", - "name": "高级经验精灵", - "star": 4, - "color": 3, - "heroexp": 18510, - "skilllevelup": 0, - "needgold": 23324 - }, - { - "hid": "43921", - "name": "技能精灵·稀有", - "star": 3, - "color": 2, - "heroexp": 0, - "skilllevelup": 1, - "needgold": 5663 - }, - { - "hid": "44921", - "name": "技能精灵·史诗", - "star": 4, - "color": 3, - "heroexp": 0, - "skilllevelup": 1, - "needgold": 11951 - }, - { - "hid": "45921", - "name": "技能精灵·传说", - "star": 5, - "color": 4, - "heroexp": 0, - "skilllevelup": 1, - "needgold": 23324 + "itemid": "625002", + "exp": 1000, + "needgold": 10000 } ] \ No newline at end of file diff --git a/bin/json/game_heroskill.json b/bin/json/game_heroskill.json new file mode 100644 index 000000000..cee903472 --- /dev/null +++ b/bin/json/game_heroskill.json @@ -0,0 +1,62 @@ +[ + { + "star": 1, + "needgold": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] + }, + { + "star": 2, + "needgold": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] + }, + { + "star": 3, + "needgold": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] + }, + { + "star": 4, + "needgold": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] + }, + { + "star": 5, + "needgold": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] + }, + { + "star": 6, + "needgold": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index 92b5c56dd..9c194671c 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -3,18 +3,18 @@ "key": 1, "id": "13001", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -27,18 +27,18 @@ "key": 2, "id": "13001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -51,18 +51,18 @@ "key": 3, "id": "13001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -75,31 +75,25 @@ "key": 4, "id": "13001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, "starup": [] }, { "key": 5, "id": "13002", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -112,18 +106,18 @@ "key": 6, "id": "13002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -136,18 +130,18 @@ "key": 7, "id": "13002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -160,31 +154,36 @@ "key": 8, "id": "13002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 9, "id": "13003", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -197,18 +196,18 @@ "key": 10, "id": "13003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -221,18 +220,18 @@ "key": 11, "id": "13003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -245,31 +244,36 @@ "key": 12, "id": "13003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 13, "id": "13004", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -282,18 +286,18 @@ "key": 14, "id": "13004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -306,18 +310,18 @@ "key": 15, "id": "13004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -330,31 +334,36 @@ "key": 16, "id": "13004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 17, "id": "13005", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -367,18 +376,18 @@ "key": 18, "id": "13005", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -391,18 +400,18 @@ "key": 19, "id": "13005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -415,31 +424,36 @@ "key": 20, "id": "13005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 21, "id": "14001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -452,18 +466,18 @@ "key": 22, "id": "14001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -476,31 +490,36 @@ "key": 23, "id": "14001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 24, "id": "14002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -513,18 +532,18 @@ "key": 25, "id": "14002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -537,31 +556,36 @@ "key": 26, "id": "14002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 27, "id": "14003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -574,18 +598,18 @@ "key": 28, "id": "14003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -598,31 +622,36 @@ "key": 29, "id": "14003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 30, "id": "14004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -635,18 +664,18 @@ "key": 31, "id": "14004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -659,31 +688,36 @@ "key": 32, "id": "14004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 33, "id": "14005", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -696,18 +730,18 @@ "key": 34, "id": "14005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -720,31 +754,36 @@ "key": 35, "id": "14005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 36, "id": "14006", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -757,18 +796,18 @@ "key": 37, "id": "14006", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -781,31 +820,36 @@ "key": 38, "id": "14006", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 39, "id": "14007", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -818,18 +862,18 @@ "key": 40, "id": "14007", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -842,31 +886,36 @@ "key": 41, "id": "14007", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 42, "id": "15001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -879,31 +928,36 @@ "key": 43, "id": "15001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 44, "id": "15002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -916,31 +970,36 @@ "key": 45, "id": "15002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 46, "id": "15003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -953,31 +1012,36 @@ "key": 47, "id": "15003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 48, "id": "15004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -990,31 +1054,36 @@ "key": 49, "id": "15004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 50, "id": "23001", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -1027,18 +1096,18 @@ "key": 51, "id": "23001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1051,18 +1120,18 @@ "key": 52, "id": "23001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1075,31 +1144,36 @@ "key": 53, "id": "23001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 54, "id": "23002", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -1112,18 +1186,18 @@ "key": 55, "id": "23002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1136,18 +1210,18 @@ "key": 56, "id": "23002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1160,31 +1234,36 @@ "key": 57, "id": "23002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 58, "id": "23003", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -1197,18 +1276,18 @@ "key": 59, "id": "23003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1221,18 +1300,18 @@ "key": 60, "id": "23003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1245,31 +1324,36 @@ "key": 61, "id": "23003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 62, "id": "23004", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -1282,18 +1366,18 @@ "key": 63, "id": "23004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1306,18 +1390,18 @@ "key": 64, "id": "23004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1330,31 +1414,36 @@ "key": 65, "id": "23004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 66, "id": "24001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1367,18 +1456,18 @@ "key": 67, "id": "24001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1391,31 +1480,36 @@ "key": 68, "id": "24001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 69, "id": "24002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1428,18 +1522,18 @@ "key": 70, "id": "24002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1452,31 +1546,36 @@ "key": 71, "id": "24002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 72, "id": "24003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1489,18 +1588,18 @@ "key": 73, "id": "24003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1513,31 +1612,36 @@ "key": 74, "id": "24003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 75, "id": "24004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1550,18 +1654,18 @@ "key": 76, "id": "24004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1574,31 +1678,36 @@ "key": 77, "id": "24004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 78, "id": "24005", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1611,18 +1720,18 @@ "key": 79, "id": "24005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1635,31 +1744,36 @@ "key": 80, "id": "24005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 81, "id": "24006", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1672,18 +1786,18 @@ "key": 82, "id": "24006", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1696,31 +1810,36 @@ "key": 83, "id": "24006", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 84, "id": "24007", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1733,18 +1852,18 @@ "key": 85, "id": "24007", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1757,31 +1876,36 @@ "key": 86, "id": "24007", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 87, "id": "24008", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1794,18 +1918,18 @@ "key": 88, "id": "24008", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1818,31 +1942,36 @@ "key": 89, "id": "24008", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 90, "id": "24009", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -1855,18 +1984,18 @@ "key": 91, "id": "24009", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1879,31 +2008,36 @@ "key": 92, "id": "24009", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 93, "id": "25001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1916,31 +2050,36 @@ "key": 94, "id": "25001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 95, "id": "25002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1953,31 +2092,36 @@ "key": 96, "id": "25002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 97, "id": "25003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -1990,31 +2134,36 @@ "key": 98, "id": "25003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 99, "id": "25004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2027,31 +2176,36 @@ "key": 100, "id": "25004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 101, "id": "33001", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -2064,18 +2218,18 @@ "key": 102, "id": "33001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2088,18 +2242,18 @@ "key": 103, "id": "33001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2112,31 +2266,36 @@ "key": 104, "id": "33001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 105, "id": "33002", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -2149,18 +2308,18 @@ "key": 106, "id": "33002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2173,18 +2332,18 @@ "key": 107, "id": "33002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2197,31 +2356,36 @@ "key": 108, "id": "33002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 109, "id": "33003", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -2234,18 +2398,18 @@ "key": 110, "id": "33003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2258,18 +2422,18 @@ "key": 111, "id": "33003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2282,31 +2446,36 @@ "key": 112, "id": "33003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 113, "id": "33004", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -2319,18 +2488,18 @@ "key": 114, "id": "33004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2343,18 +2512,18 @@ "key": 115, "id": "33004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2367,31 +2536,36 @@ "key": 116, "id": "33004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 117, "id": "33005", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -2404,18 +2578,18 @@ "key": 118, "id": "33005", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2428,18 +2602,18 @@ "key": 119, "id": "33005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2452,31 +2626,36 @@ "key": 120, "id": "33005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 121, "id": "33006", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -2489,18 +2668,18 @@ "key": 122, "id": "33006", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2513,18 +2692,18 @@ "key": 123, "id": "33006", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2537,31 +2716,36 @@ "key": 124, "id": "33006", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 125, "id": "34001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2574,18 +2758,18 @@ "key": 126, "id": "34001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2598,31 +2782,36 @@ "key": 127, "id": "34001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 128, "id": "34002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2635,18 +2824,18 @@ "key": 129, "id": "34002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2659,31 +2848,36 @@ "key": 130, "id": "34002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 131, "id": "34003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2696,18 +2890,18 @@ "key": 132, "id": "34003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2720,31 +2914,36 @@ "key": 133, "id": "34003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 134, "id": "34004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2757,18 +2956,18 @@ "key": 135, "id": "34004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2781,31 +2980,36 @@ "key": 136, "id": "34004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 137, "id": "34005", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2818,18 +3022,18 @@ "key": 138, "id": "34005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2842,31 +3046,36 @@ "key": 139, "id": "34005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 140, "id": "34006", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2879,18 +3088,18 @@ "key": 141, "id": "34006", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2903,31 +3112,36 @@ "key": 142, "id": "34006", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 143, "id": "34007", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -2940,18 +3154,18 @@ "key": 144, "id": "34007", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -2964,31 +3178,36 @@ "key": 145, "id": "34007", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 146, "id": "34008", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3001,18 +3220,18 @@ "key": 147, "id": "34008", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3025,31 +3244,36 @@ "key": 148, "id": "34008", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 149, "id": "35001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3062,31 +3286,36 @@ "key": 150, "id": "35001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 151, "id": "35002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3099,31 +3328,36 @@ "key": 152, "id": "35002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 153, "id": "35003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3136,31 +3370,36 @@ "key": 154, "id": "35003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 155, "id": "35004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3173,31 +3412,36 @@ "key": 156, "id": "35004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 157, "id": "35005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3210,31 +3454,36 @@ "key": 158, "id": "35005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 159, "id": "35006", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3247,31 +3496,36 @@ "key": 160, "id": "35006", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 161, "id": "43001", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -3284,18 +3538,18 @@ "key": 162, "id": "43001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3308,18 +3562,18 @@ "key": 163, "id": "43001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3332,31 +3586,36 @@ "key": 164, "id": "43001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 165, "id": "43002", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -3369,18 +3628,18 @@ "key": 166, "id": "43002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3393,18 +3652,18 @@ "key": 167, "id": "43002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3417,31 +3676,36 @@ "key": 168, "id": "43002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 169, "id": "43003", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -3454,18 +3718,18 @@ "key": 170, "id": "43003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3478,18 +3742,18 @@ "key": 171, "id": "43003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3502,31 +3766,36 @@ "key": 172, "id": "43003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 173, "id": "43004", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -3539,18 +3808,18 @@ "key": 174, "id": "43004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3563,18 +3832,18 @@ "key": 175, "id": "43004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3587,31 +3856,36 @@ "key": 176, "id": "43004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 177, "id": "43005", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -3624,18 +3898,18 @@ "key": 178, "id": "43005", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3648,18 +3922,18 @@ "key": 179, "id": "43005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3672,31 +3946,36 @@ "key": 180, "id": "43005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 181, "id": "43006", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -3709,18 +3988,18 @@ "key": 182, "id": "43006", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3733,18 +4012,18 @@ "key": 183, "id": "43006", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3757,31 +4036,36 @@ "key": 184, "id": "43006", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 185, "id": "43007", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -3794,18 +4078,18 @@ "key": 186, "id": "43007", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3818,18 +4102,18 @@ "key": 187, "id": "43007", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3842,31 +4126,36 @@ "key": 188, "id": "43007", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 189, "id": "44001", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3879,18 +4168,18 @@ "key": 190, "id": "44001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3903,31 +4192,36 @@ "key": 191, "id": "44001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 192, "id": "44002", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -3940,18 +4234,18 @@ "key": 193, "id": "44002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -3964,31 +4258,36 @@ "key": 194, "id": "44002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 195, "id": "44003", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -4001,18 +4300,18 @@ "key": 196, "id": "44003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4025,31 +4324,36 @@ "key": 197, "id": "44003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 198, "id": "44004", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -4062,18 +4366,18 @@ "key": 199, "id": "44004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4086,31 +4390,36 @@ "key": 200, "id": "44004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 201, "id": "44006", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -4123,18 +4432,18 @@ "key": 202, "id": "44006", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4147,31 +4456,36 @@ "key": 203, "id": "44006", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 204, "id": "45001", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4184,31 +4498,36 @@ "key": 205, "id": "45001", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 206, "id": "45002", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4221,31 +4540,36 @@ "key": 207, "id": "45002", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 208, "id": "45003", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4258,31 +4582,36 @@ "key": 209, "id": "45003", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 210, "id": "45004", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4295,31 +4624,36 @@ "key": 211, "id": "45004", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 212, "id": "44005", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -4332,18 +4666,18 @@ "key": 213, "id": "44005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4356,31 +4690,36 @@ "key": 214, "id": "44005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 215, "id": "15005", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4393,31 +4732,36 @@ "key": 216, "id": "15005", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 217, "id": "43901", "star": 3, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 3, - "needracenum": 3, - "gold": 10000, "starup": [ { "a": "item", @@ -4430,18 +4774,18 @@ "key": 218, "id": "43901", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -4454,18 +4798,18 @@ "key": 219, "id": "43901", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4478,31 +4822,36 @@ "key": 220, "id": "43901", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 221, "id": "43902", "star": 4, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 4, - "needracenum": 4, - "gold": 10000, "starup": [ { "a": "item", @@ -4515,18 +4864,18 @@ "key": 222, "id": "43902", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4539,31 +4888,36 @@ "key": 223, "id": "43902", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] }, { "key": 224, "id": "43903", "star": 5, - "needhero": "", - "needherostar": 0, - "needheronum": 0, "needrace": [ - 1, - 2, - 3, - 4 + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } ], - "needracestar": 5, - "needracenum": 5, - "gold": 10000, "starup": [ { "a": "item", @@ -4576,13 +4930,18 @@ "key": 225, "id": "43903", "star": 6, - "needhero": "", - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0, - "gold": 0, + "needrace": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + }, + { + "a": "item", + "t": "625001", + "n": 1 + } + ], "starup": [] } ] \ No newline at end of file diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json index 825d782a7..ff585981d 100644 --- a/bin/json/game_huntingboss.json +++ b/bin/json/game_huntingboss.json @@ -7,6 +7,7 @@ "text": "巨型猩猩" }, "difficulty": 1, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -51,6 +52,7 @@ "text": "巨型猩猩" }, "difficulty": 2, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -100,6 +102,7 @@ "text": "巨型猩猩" }, "difficulty": 3, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -149,6 +152,7 @@ "text": "巨型猩猩" }, "difficulty": 4, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -198,6 +202,7 @@ "text": "巨型猩猩" }, "difficulty": 5, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -252,6 +257,7 @@ "text": "巨型猩猩" }, "difficulty": 6, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -306,6 +312,7 @@ "text": "巨型猩猩" }, "difficulty": 7, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -360,6 +367,7 @@ "text": "巨型猩猩" }, "difficulty": 8, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -414,6 +422,7 @@ "text": "巨型猩猩" }, "difficulty": 9, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -468,6 +477,7 @@ "text": "巨型猩猩" }, "difficulty": 10, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -522,6 +532,7 @@ "text": "火龙" }, "difficulty": 1, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -566,6 +577,7 @@ "text": "火龙" }, "difficulty": 2, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -615,6 +627,7 @@ "text": "火龙" }, "difficulty": 3, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -664,6 +677,7 @@ "text": "火龙" }, "difficulty": 4, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -713,6 +727,7 @@ "text": "火龙" }, "difficulty": 5, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -767,6 +782,7 @@ "text": "火龙" }, "difficulty": 6, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -821,6 +837,7 @@ "text": "火龙" }, "difficulty": 7, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -875,6 +892,7 @@ "text": "火龙" }, "difficulty": 8, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -929,6 +947,7 @@ "text": "火龙" }, "difficulty": 9, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -983,6 +1002,7 @@ "text": "火龙" }, "difficulty": 10, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1037,6 +1057,7 @@ "text": "大厨" }, "difficulty": 1, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1081,6 +1102,7 @@ "text": "大厨" }, "difficulty": 2, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1130,6 +1152,7 @@ "text": "大厨" }, "difficulty": 3, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1179,6 +1202,7 @@ "text": "大厨" }, "difficulty": 4, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1228,6 +1252,7 @@ "text": "大厨" }, "difficulty": 5, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1282,6 +1307,7 @@ "text": "大厨" }, "difficulty": 6, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1336,6 +1362,7 @@ "text": "大厨" }, "difficulty": 7, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1390,6 +1417,7 @@ "text": "大厨" }, "difficulty": 8, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1444,6 +1472,7 @@ "text": "大厨" }, "difficulty": 9, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1498,6 +1527,7 @@ "text": "大厨" }, "difficulty": 10, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1552,6 +1582,7 @@ "text": "太空海星" }, "difficulty": 1, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1596,6 +1627,7 @@ "text": "太空海星" }, "difficulty": 2, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1645,6 +1677,7 @@ "text": "太空海星" }, "difficulty": 3, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1694,6 +1727,7 @@ "text": "太空海星" }, "difficulty": 4, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1743,6 +1777,7 @@ "text": "太空海星" }, "difficulty": 5, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1797,6 +1832,7 @@ "text": "太空海星" }, "difficulty": 6, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1851,6 +1887,7 @@ "text": "太空海星" }, "difficulty": 7, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1905,6 +1942,7 @@ "text": "太空海星" }, "difficulty": 8, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -1959,6 +1997,7 @@ "text": "太空海星" }, "difficulty": 9, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", @@ -2013,6 +2052,7 @@ "text": "太空海星" }, "difficulty": 10, + "BattleReadyID": 107, "firstprize": [ { "a": "attr", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 52886d0d3..af7d50423 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -6332,5 +6332,93 @@ "key": "itemtipstxt_10017", "text": "体力药剂不足" } + }, + { + "id": "625001", + "name": { + "key": "itemname_90001", + "text": "阿宝碎片" + }, + "usetype": 3, + "color": 5, + "bagtype": 1, + "index": 99, + "special_type": 0, + "time": 0, + "effects": "effect_ui_wuping_2", + "box_id": 0, + "synthetize_num": 0, + "access": [ + 155 + ], + "use_skip": 155, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 0, + "race": 0, + "img": "ytx_js_25001", + "ico": "ytx_js_25001", + "intr": { + "key": "itemdesc_625001", + "text": "阿宝天赋点" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "synthetize_deplete": [], + "decompose_deplete": [], + "tipstxt": { + "key": "itemtipstxt_625001", + "text": "阿宝的天赋点不足" + } + }, + { + "id": "625002", + "name": { + "key": "itemname_90001", + "text": "经验道具" + }, + "usetype": 12, + "color": 3, + "bagtype": 1, + "index": 99, + "special_type": 0, + "time": 0, + "effects": "", + "box_id": 0, + "synthetize_num": 0, + "access": [ + 155 + ], + "use_skip": 155, + "upper_limit": 999, + "uselv": 0, + "isani": 0, + "star": 0, + "race": 0, + "img": "ytx_js_25001", + "ico": "ytx_js_25001", + "intr": { + "key": "itemdesc_625002", + "text": "经验道具" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "synthetize_deplete": [], + "decompose_deplete": [], + "tipstxt": { + "key": "itemtipstxt_625002", + "text": "阿宝的天赋点不足" + } } ] \ No newline at end of file diff --git a/bin/json/game_kungfumasterworker.json b/bin/json/game_kungfumasterworker.json index 642d9cc74..04bb6bf10 100644 --- a/bin/json/game_kungfumasterworker.json +++ b/bin/json/game_kungfumasterworker.json @@ -14,7 +14,7 @@ }, "exp": 60, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln1", "text": "教习效率+50%" @@ -52,7 +52,7 @@ }, "exp": 120, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln2", "text": "教习效率+51%" @@ -90,7 +90,7 @@ }, "exp": 240, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln3", "text": "教习效率+52%" @@ -128,7 +128,7 @@ }, "exp": 480, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln4", "text": "教习效率+53%" @@ -166,7 +166,7 @@ }, "exp": 1020, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln5", "text": "教习效率+50%" @@ -204,7 +204,7 @@ }, "exp": 1080, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln6", "text": "教习效率+51%" @@ -242,7 +242,7 @@ }, "exp": 2940, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln13", "text": "教习效率+50%" @@ -280,7 +280,7 @@ }, "exp": 3000, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln14", "text": "教习效率+51%" @@ -318,7 +318,7 @@ }, "exp": 3120, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln15", "text": "教习效率+52%" @@ -356,7 +356,7 @@ }, "exp": 3360, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln16", "text": "教习效率+53%" @@ -394,7 +394,7 @@ }, "exp": 3900, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln17", "text": "教习效率+50%" @@ -432,7 +432,7 @@ }, "exp": 3960, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln18", "text": "教习效率+51%" @@ -470,7 +470,7 @@ }, "exp": 5820, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln25", "text": "教习效率+50%" @@ -508,7 +508,7 @@ }, "exp": 5880, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln26", "text": "教习效率+51%" @@ -546,7 +546,7 @@ }, "exp": 6000, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln27", "text": "教习效率+52%" @@ -584,7 +584,7 @@ }, "exp": 6240, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln28", "text": "教习效率+53%" @@ -622,7 +622,7 @@ }, "exp": 6780, "model": "35001", - "ornament": "Muzhuang1", + "ornament": "Level1", "affix": { "key": "gourmet_ln29", "text": "教习效率+50%" @@ -660,7 +660,7 @@ }, "exp": 6840, "model": "35001", - "ornament": "Muzhuang2", + "ornament": "Level2", "affix": { "key": "gourmet_ln30", "text": "教习效率+51%" diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json index d153b733b..b8c8e0738 100644 --- a/bin/json/game_mainline.json +++ b/bin/json/game_mainline.json @@ -17,6 +17,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [], "exp": 0, @@ -57,6 +58,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -120,6 +122,7 @@ 101021 ], "captainId": "240025", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -186,6 +189,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -242,6 +246,7 @@ 101031 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -310,6 +315,7 @@ 101041 ], "captainId": "240025", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -376,6 +382,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -433,6 +440,7 @@ 101052 ], "captainId": "530013", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -502,6 +510,7 @@ 101062 ], "captainId": "440053", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -571,6 +580,7 @@ 101072 ], "captainId": "440063", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -637,6 +647,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [], "exp": 0, @@ -678,6 +689,7 @@ 101082 ], "captainId": "250013", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -747,6 +759,7 @@ 101092 ], "captainId": "450033", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -813,6 +826,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -870,6 +884,7 @@ 101102 ], "captainId": "250011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -939,6 +954,7 @@ 102021 ], "captainId": "240023", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1008,6 +1024,7 @@ 102032 ], "captainId": "530013", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1074,6 +1091,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1131,6 +1149,7 @@ 102042 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1201,6 +1220,7 @@ 102032 ], "captainId": "530013", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1267,6 +1287,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [], "exp": 0, @@ -1308,6 +1329,7 @@ 102062 ], "captainId": "450033", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1377,6 +1399,7 @@ 102072 ], "captainId": "250043", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1443,6 +1466,7 @@ }, "FormatList": [], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1500,6 +1524,7 @@ 102082 ], "captainId": "140033", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1569,6 +1594,7 @@ 102092 ], "captainId": "450033", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1638,6 +1664,7 @@ 102102 ], "captainId": "350014", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1707,6 +1734,7 @@ 103021 ], "captainId": "240023", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1776,6 +1804,7 @@ 103032 ], "captainId": "530013", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1846,6 +1875,7 @@ 101103 ], "captainId": "340064", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -1914,6 +1944,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [], "exp": 0, @@ -1966,6 +1997,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2024,6 +2056,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2083,6 +2116,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2142,6 +2176,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2201,6 +2236,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2260,6 +2296,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2319,6 +2356,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2378,6 +2416,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2438,6 +2477,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2496,6 +2536,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2554,6 +2595,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2612,6 +2654,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2671,6 +2714,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2730,6 +2774,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2789,6 +2834,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2848,6 +2894,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2907,6 +2954,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -2966,6 +3014,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3026,6 +3075,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3084,6 +3134,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3142,6 +3193,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3200,6 +3252,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3259,6 +3312,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3318,6 +3372,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3377,6 +3432,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3436,6 +3492,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3495,6 +3552,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3554,6 +3612,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3614,6 +3673,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3672,6 +3732,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3730,6 +3791,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3788,6 +3850,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3847,6 +3910,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3906,6 +3970,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -3965,6 +4030,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4024,6 +4090,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4083,6 +4150,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4142,6 +4210,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4202,6 +4271,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4260,6 +4330,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4318,6 +4389,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4376,6 +4448,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4435,6 +4508,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4494,6 +4568,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4553,6 +4628,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4612,6 +4688,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4671,6 +4748,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4730,6 +4808,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4790,6 +4869,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4848,6 +4928,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4906,6 +4987,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -4964,6 +5046,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5023,6 +5106,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5082,6 +5166,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5141,6 +5226,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5200,6 +5286,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5259,6 +5346,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5318,6 +5406,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5378,6 +5467,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5436,6 +5526,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5494,6 +5585,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5552,6 +5644,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5611,6 +5704,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5670,6 +5764,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5729,6 +5824,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5788,6 +5884,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5847,6 +5944,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5906,6 +6004,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -5966,6 +6065,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6024,6 +6124,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6082,6 +6183,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6140,6 +6242,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6199,6 +6302,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6258,6 +6362,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6317,6 +6422,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6376,6 +6482,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6435,6 +6542,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6494,6 +6602,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6554,6 +6663,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6612,6 +6722,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6670,6 +6781,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6728,6 +6840,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6787,6 +6900,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6846,6 +6960,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6905,6 +7020,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -6964,6 +7080,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7023,6 +7140,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7082,6 +7200,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7142,6 +7261,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7200,6 +7320,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7258,6 +7379,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7316,6 +7438,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7375,6 +7498,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7434,6 +7558,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7493,6 +7618,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7552,6 +7678,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7611,6 +7738,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7670,6 +7798,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7730,6 +7859,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7788,6 +7918,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7846,6 +7977,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7904,6 +8036,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -7963,6 +8096,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8022,6 +8156,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8081,6 +8216,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8140,6 +8276,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8199,6 +8336,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8258,6 +8396,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8318,6 +8457,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8376,6 +8516,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8434,6 +8575,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8492,6 +8634,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8551,6 +8694,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8610,6 +8754,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8669,6 +8814,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8728,6 +8874,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8787,6 +8934,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8846,6 +8994,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8906,6 +9055,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -8964,6 +9114,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9022,6 +9173,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9080,6 +9232,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9139,6 +9292,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9198,6 +9352,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9257,6 +9412,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9316,6 +9472,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9375,6 +9532,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9434,6 +9592,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9494,6 +9653,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9552,6 +9712,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9610,6 +9771,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9668,6 +9830,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9727,6 +9890,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9786,6 +9950,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9845,6 +10010,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9904,6 +10070,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -9963,6 +10130,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10022,6 +10190,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10082,6 +10251,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10140,6 +10310,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10198,6 +10369,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10256,6 +10428,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10315,6 +10488,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10374,6 +10548,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10433,6 +10608,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10492,6 +10668,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10551,6 +10728,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10610,6 +10788,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10670,6 +10849,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10728,6 +10908,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10786,6 +10967,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10844,6 +11026,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10903,6 +11086,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -10962,6 +11146,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11021,6 +11206,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11080,6 +11266,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11139,6 +11326,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11198,6 +11386,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11258,6 +11447,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11316,6 +11506,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11374,6 +11565,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11432,6 +11624,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11491,6 +11684,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11550,6 +11744,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11609,6 +11804,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11668,6 +11864,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11727,6 +11924,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11786,6 +11984,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11846,6 +12045,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11904,6 +12104,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -11962,6 +12163,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12020,6 +12222,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12079,6 +12282,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12138,6 +12342,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12197,6 +12402,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12256,6 +12462,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12315,6 +12522,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12374,6 +12582,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12434,6 +12643,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12492,6 +12702,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12550,6 +12761,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12608,6 +12820,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12667,6 +12880,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12726,6 +12940,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12785,6 +13000,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12844,6 +13060,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12903,6 +13120,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -12962,6 +13180,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13022,6 +13241,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13080,6 +13300,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13138,6 +13359,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13196,6 +13418,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13255,6 +13478,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13314,6 +13538,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13373,6 +13598,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13432,6 +13658,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13491,6 +13718,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13550,6 +13778,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13610,6 +13839,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13668,6 +13898,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13726,6 +13957,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13784,6 +14016,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13843,6 +14076,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13902,6 +14136,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -13961,6 +14196,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14020,6 +14256,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14079,6 +14316,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14138,6 +14376,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14198,6 +14437,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14256,6 +14496,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14314,6 +14555,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14372,6 +14614,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14431,6 +14674,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14490,6 +14734,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14549,6 +14794,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14608,6 +14854,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14667,6 +14914,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14726,6 +14974,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14786,6 +15035,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14844,6 +15094,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14902,6 +15153,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -14960,6 +15212,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15019,6 +15272,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15078,6 +15332,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15137,6 +15392,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15196,6 +15452,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15255,6 +15512,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15314,6 +15572,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15374,6 +15633,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15432,6 +15692,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15490,6 +15751,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15548,6 +15810,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15607,6 +15870,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15666,6 +15930,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15725,6 +15990,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15784,6 +16050,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15843,6 +16110,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15902,6 +16170,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -15962,6 +16231,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16020,6 +16290,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16078,6 +16349,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16136,6 +16408,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16195,6 +16468,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16254,6 +16528,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16313,6 +16588,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16372,6 +16648,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16431,6 +16708,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16490,6 +16768,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16550,6 +16829,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16608,6 +16888,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16666,6 +16947,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16724,6 +17006,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16783,6 +17066,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16842,6 +17126,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16901,6 +17186,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -16960,6 +17246,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17019,6 +17306,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17078,6 +17366,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17138,6 +17427,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17196,6 +17486,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17254,6 +17545,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17312,6 +17604,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17371,6 +17664,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17430,6 +17724,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17489,6 +17784,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17548,6 +17844,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17607,6 +17904,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17666,6 +17964,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17726,6 +18025,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17784,6 +18084,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17842,6 +18143,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17900,6 +18202,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -17959,6 +18262,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18018,6 +18322,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18077,6 +18382,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18136,6 +18442,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18195,6 +18502,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18254,6 +18562,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18314,6 +18623,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18372,6 +18682,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18430,6 +18741,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18488,6 +18800,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18547,6 +18860,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18606,6 +18920,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18665,6 +18980,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18724,6 +19040,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18783,6 +19100,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18842,6 +19160,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18902,6 +19221,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -18960,6 +19280,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19018,6 +19339,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19076,6 +19398,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19135,6 +19458,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19194,6 +19518,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19253,6 +19578,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19312,6 +19638,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19371,6 +19698,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19430,6 +19758,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19490,6 +19819,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19548,6 +19878,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19606,6 +19937,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19664,6 +19996,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19723,6 +20056,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19782,6 +20116,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19841,6 +20176,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19900,6 +20236,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -19959,6 +20296,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20018,6 +20356,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20078,6 +20417,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20136,6 +20476,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20194,6 +20535,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20252,6 +20594,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20311,6 +20654,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20370,6 +20714,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20429,6 +20774,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20488,6 +20834,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20547,6 +20894,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20606,6 +20954,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20666,6 +21015,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20724,6 +21074,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20782,6 +21133,7 @@ 101011 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20840,6 +21192,7 @@ 101021 ], "captainId": "340061", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20899,6 +21252,7 @@ 101032 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -20958,6 +21312,7 @@ 101042 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -21017,6 +21372,7 @@ 101052 ], "captainId": "440051", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -21076,6 +21432,7 @@ 101062 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -21135,6 +21492,7 @@ 101072 ], "captainId": "240031", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -21194,6 +21552,7 @@ 101082 ], "captainId": "", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { @@ -21254,6 +21613,7 @@ 101103 ], "captainId": "350011", + "BattleReadyID": 102, "battlescene": "bg_zhandoulmboss", "award": [ { diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index bd5aa227a..07bd3f984 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -58,6 +58,7 @@ "n": 1650 } ], + "BattleReadyID": 102, "FormatList": [ 101011 ], @@ -142,6 +143,7 @@ "n": 2640 } ], + "BattleReadyID": 102, "FormatList": [ 101021 ], @@ -226,6 +228,7 @@ "n": 3630 } ], + "BattleReadyID": 102, "FormatList": [ 101031, 101032 @@ -311,6 +314,7 @@ "n": 20395 } ], + "BattleReadyID": 102, "FormatList": [ 101041, 101042 @@ -396,6 +400,7 @@ "n": 22675 } ], + "BattleReadyID": 102, "FormatList": [ 101051, 101052 @@ -481,6 +486,7 @@ "n": 18140 } ], + "BattleReadyID": 102, "FormatList": [ 101061, 101062 @@ -566,6 +572,7 @@ "n": 20560 } ], + "BattleReadyID": 102, "FormatList": [ 102011 ], @@ -650,6 +657,7 @@ "n": 26930 } ], + "BattleReadyID": 102, "FormatList": [ 102021 ], @@ -734,6 +742,7 @@ "n": 33260 } ], + "BattleReadyID": 102, "FormatList": [ 102031, 102032 @@ -819,6 +828,7 @@ "n": 39600 } ], + "BattleReadyID": 102, "FormatList": [ 102041, 102042 @@ -904,6 +914,7 @@ "n": 45935 } ], + "BattleReadyID": 102, "FormatList": [ 102051, 102052 @@ -989,6 +1000,7 @@ "n": 57650 } ], + "BattleReadyID": 102, "FormatList": [ 102061, 102062 @@ -1074,6 +1086,7 @@ "n": 68615 } ], + "BattleReadyID": 102, "FormatList": [ 103011 ], @@ -1158,6 +1171,7 @@ "n": 76035 } ], + "BattleReadyID": 102, "FormatList": [ 103021 ], @@ -1242,6 +1256,7 @@ "n": 83455 } ], + "BattleReadyID": 102, "FormatList": [ 103031, 103032 @@ -1327,6 +1342,7 @@ "n": 90875 } ], + "BattleReadyID": 102, "FormatList": [ 103041, 103042 @@ -1412,6 +1428,7 @@ "n": 106640 } ], + "BattleReadyID": 102, "FormatList": [ 103051, 103052 @@ -1497,6 +1514,7 @@ "n": 128695 } ], + "BattleReadyID": 102, "FormatList": [ 103061, 103062 @@ -1582,6 +1600,7 @@ "n": 137725 } ], + "BattleReadyID": 102, "FormatList": [ 104011 ], @@ -1666,6 +1685,7 @@ "n": 146755 } ], + "BattleReadyID": 102, "FormatList": [ 104021 ], @@ -1750,6 +1770,7 @@ "n": 155795 } ], + "BattleReadyID": 102, "FormatList": [ 104031, 104032 @@ -1835,6 +1856,7 @@ "n": 179335 } ], + "BattleReadyID": 102, "FormatList": [ 104041, 104042 @@ -1920,6 +1942,7 @@ "n": 220415 } ], + "BattleReadyID": 102, "FormatList": [ 104051, 104052 @@ -2005,6 +2028,7 @@ "n": 241915 } ], + "BattleReadyID": 102, "FormatList": [ 104061, 104062 diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 2f31504c2..54e480d28 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -9,6 +9,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -31,6 +35,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -53,6 +61,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -75,6 +87,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -97,6 +113,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -119,6 +139,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -141,6 +165,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -163,6 +191,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -185,6 +217,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -207,6 +243,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -229,6 +269,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -251,6 +295,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -273,6 +321,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -295,6 +347,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -317,6 +373,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -339,6 +399,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -361,6 +425,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -383,6 +451,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -405,6 +477,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -427,6 +503,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -449,6 +529,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -471,6 +555,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -493,6 +581,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -515,6 +607,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -537,6 +633,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -559,6 +659,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -581,6 +685,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -603,6 +711,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -647,6 +759,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -669,6 +785,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -691,6 +811,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -713,6 +837,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -735,6 +863,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -757,6 +889,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -779,6 +915,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -801,6 +941,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -823,6 +967,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -845,6 +993,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -867,6 +1019,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -889,6 +1045,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -911,6 +1071,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -933,6 +1097,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -955,6 +1123,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -977,6 +1149,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -999,6 +1175,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1021,6 +1201,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1109,6 +1293,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1131,6 +1319,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1153,6 +1345,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1175,6 +1371,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1197,6 +1397,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1219,6 +1423,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1241,6 +1449,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1263,6 +1475,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1285,6 +1501,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1307,6 +1527,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", @@ -1329,6 +1553,10 @@ { "key": 1, "param": 1 + }, + { + "key": 2, + "param": 1100101 } ], "optional": "", diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json index 9c5c17376..e6cc05976 100644 --- a/bin/json/game_pagoda.json +++ b/bin/json/game_pagoda.json @@ -4,6 +4,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 1, + "BattleReadyID": 103, "monster_id": [ 501001, 501002, @@ -29,6 +30,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 2, + "BattleReadyID": 103, "monster_id": [ 501004, 501005, @@ -54,6 +56,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 3, + "BattleReadyID": 103, "monster_id": [ 501007, 501008, @@ -79,6 +82,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 4, + "BattleReadyID": 103, "monster_id": [ 501010, 501011, @@ -104,6 +108,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 5, + "BattleReadyID": 103, "monster_id": [ 501013, 501014, @@ -129,6 +134,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 6, + "BattleReadyID": 103, "monster_id": [ 501016, 501017, @@ -154,6 +160,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 7, + "BattleReadyID": 103, "monster_id": [ 501019, 501020, @@ -179,6 +186,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 8, + "BattleReadyID": 103, "monster_id": [ 501022, 501023, @@ -204,6 +212,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 9, + "BattleReadyID": 103, "monster_id": [ 501025, 501026, @@ -229,6 +238,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 10, + "BattleReadyID": 103, "monster_id": [ 501028, 501029, @@ -254,6 +264,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 11, + "BattleReadyID": 103, "monster_id": [ 501031, 501032, @@ -279,6 +290,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 12, + "BattleReadyID": 103, "monster_id": [ 501034, 501035, @@ -304,6 +316,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 13, + "BattleReadyID": 103, "monster_id": [ 501037, 501038, @@ -329,6 +342,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 14, + "BattleReadyID": 103, "monster_id": [ 501040, 501041, @@ -354,6 +368,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 15, + "BattleReadyID": 103, "monster_id": [ 501043, 501044, @@ -379,6 +394,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 16, + "BattleReadyID": 103, "monster_id": [ 501046, 501047, @@ -404,6 +420,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 17, + "BattleReadyID": 103, "monster_id": [ 501049, 501050, @@ -429,6 +446,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 18, + "BattleReadyID": 103, "monster_id": [ 501052, 501053, @@ -454,6 +472,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 19, + "BattleReadyID": 103, "monster_id": [ 501055, 501056, @@ -479,6 +498,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 20, + "BattleReadyID": 103, "monster_id": [ 501058, 501059, @@ -504,6 +524,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 21, + "BattleReadyID": 103, "monster_id": [ 501061, 501062, @@ -529,6 +550,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 22, + "BattleReadyID": 103, "monster_id": [ 501064, 501065, @@ -554,6 +576,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 23, + "BattleReadyID": 103, "monster_id": [ 501067, 501068, @@ -579,6 +602,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 24, + "BattleReadyID": 103, "monster_id": [ 501070, 501071, @@ -604,6 +628,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 25, + "BattleReadyID": 103, "monster_id": [ 501073, 501074, @@ -629,6 +654,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 26, + "BattleReadyID": 103, "monster_id": [ 501076, 501077, @@ -654,6 +680,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 27, + "BattleReadyID": 103, "monster_id": [ 501079, 501080, @@ -679,6 +706,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 28, + "BattleReadyID": 103, "monster_id": [ 501082, 501083, @@ -704,6 +732,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 29, + "BattleReadyID": 103, "monster_id": [ 501085, 501086, @@ -729,6 +758,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 30, + "BattleReadyID": 103, "monster_id": [ 501088, 501089, @@ -754,6 +784,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 31, + "BattleReadyID": 103, "monster_id": [ 501091, 501092, @@ -779,6 +810,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 32, + "BattleReadyID": 103, "monster_id": [ 501094, 501095, @@ -804,6 +836,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 33, + "BattleReadyID": 103, "monster_id": [ 501097, 501098, @@ -829,6 +862,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 34, + "BattleReadyID": 103, "monster_id": [ 501100, 501101, @@ -854,6 +888,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 35, + "BattleReadyID": 103, "monster_id": [ 501103, 501104, @@ -879,6 +914,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 36, + "BattleReadyID": 103, "monster_id": [ 501106, 501107, @@ -904,6 +940,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 37, + "BattleReadyID": 103, "monster_id": [ 501109, 501110, @@ -929,6 +966,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 38, + "BattleReadyID": 103, "monster_id": [ 501112, 501113, @@ -954,6 +992,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 39, + "BattleReadyID": 103, "monster_id": [ 501115, 501116, @@ -979,6 +1018,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 40, + "BattleReadyID": 103, "monster_id": [ 501118, 501119, @@ -1004,6 +1044,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 41, + "BattleReadyID": 103, "monster_id": [ 501121, 501122, @@ -1029,6 +1070,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 42, + "BattleReadyID": 103, "monster_id": [ 501124, 501125, @@ -1054,6 +1096,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 43, + "BattleReadyID": 103, "monster_id": [ 501127, 501128, @@ -1079,6 +1122,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 44, + "BattleReadyID": 103, "monster_id": [ 501130, 501131, @@ -1104,6 +1148,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 45, + "BattleReadyID": 103, "monster_id": [ 501133, 501134, @@ -1129,6 +1174,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 46, + "BattleReadyID": 103, "monster_id": [ 501136, 501137, @@ -1154,6 +1200,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 47, + "BattleReadyID": 103, "monster_id": [ 501139, 501140, @@ -1179,6 +1226,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 48, + "BattleReadyID": 103, "monster_id": [ 501142, 501143, @@ -1204,6 +1252,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 49, + "BattleReadyID": 103, "monster_id": [ 501145, 501146, @@ -1229,6 +1278,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 50, + "BattleReadyID": 103, "monster_id": [ 501148, 501149, @@ -1254,6 +1304,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 51, + "BattleReadyID": 103, "monster_id": [ 501151, 501152, @@ -1279,6 +1330,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 52, + "BattleReadyID": 103, "monster_id": [ 501154, 501155, @@ -1304,6 +1356,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 53, + "BattleReadyID": 103, "monster_id": [ 501157, 501158, @@ -1329,6 +1382,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 54, + "BattleReadyID": 103, "monster_id": [ 501160, 501161, @@ -1354,6 +1408,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 55, + "BattleReadyID": 103, "monster_id": [ 501163, 501164, @@ -1379,6 +1434,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 56, + "BattleReadyID": 103, "monster_id": [ 501166, 501167, @@ -1404,6 +1460,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 57, + "BattleReadyID": 103, "monster_id": [ 501169, 501170, @@ -1429,6 +1486,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 58, + "BattleReadyID": 103, "monster_id": [ 501172, 501173, @@ -1454,6 +1512,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 59, + "BattleReadyID": 103, "monster_id": [ 501175, 501176, @@ -1479,6 +1538,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 60, + "BattleReadyID": 103, "monster_id": [ 501178, 501179, @@ -1504,6 +1564,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 61, + "BattleReadyID": 103, "monster_id": [ 501181, 501182, @@ -1529,6 +1590,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 62, + "BattleReadyID": 103, "monster_id": [ 501184, 501185, @@ -1554,6 +1616,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 63, + "BattleReadyID": 103, "monster_id": [ 501187, 501188, @@ -1579,6 +1642,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 64, + "BattleReadyID": 103, "monster_id": [ 501190, 501191, @@ -1604,6 +1668,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 65, + "BattleReadyID": 103, "monster_id": [ 501193, 501194, @@ -1629,6 +1694,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 66, + "BattleReadyID": 103, "monster_id": [ 501196, 501197, @@ -1654,6 +1720,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 67, + "BattleReadyID": 103, "monster_id": [ 501199, 501200, @@ -1679,6 +1746,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 68, + "BattleReadyID": 103, "monster_id": [ 501202, 501203, @@ -1704,6 +1772,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 69, + "BattleReadyID": 103, "monster_id": [ 501205, 501206, @@ -1729,6 +1798,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 70, + "BattleReadyID": 103, "monster_id": [ 501208, 501209, @@ -1754,6 +1824,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 71, + "BattleReadyID": 103, "monster_id": [ 501211, 501212, @@ -1779,6 +1850,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 72, + "BattleReadyID": 103, "monster_id": [ 501214, 501215, @@ -1804,6 +1876,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 73, + "BattleReadyID": 103, "monster_id": [ 501217, 501218, @@ -1829,6 +1902,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 74, + "BattleReadyID": 103, "monster_id": [ 501220, 501221, @@ -1854,6 +1928,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 75, + "BattleReadyID": 103, "monster_id": [ 501223, 501224, @@ -1879,6 +1954,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 76, + "BattleReadyID": 103, "monster_id": [ 501226, 501227, @@ -1904,6 +1980,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 77, + "BattleReadyID": 103, "monster_id": [ 501229, 501230, @@ -1929,6 +2006,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 78, + "BattleReadyID": 103, "monster_id": [ 501232, 501233, @@ -1954,6 +2032,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 79, + "BattleReadyID": 103, "monster_id": [ 501235, 501236, @@ -1979,6 +2058,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 80, + "BattleReadyID": 103, "monster_id": [ 501238, 501239, @@ -2004,6 +2084,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 81, + "BattleReadyID": 103, "monster_id": [ 501241, 501242, @@ -2029,6 +2110,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 82, + "BattleReadyID": 103, "monster_id": [ 501244, 501245, @@ -2054,6 +2136,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 83, + "BattleReadyID": 103, "monster_id": [ 501247, 501248, @@ -2079,6 +2162,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 84, + "BattleReadyID": 103, "monster_id": [ 501250, 501251, @@ -2104,6 +2188,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 85, + "BattleReadyID": 103, "monster_id": [ 501253, 501254, @@ -2129,6 +2214,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 86, + "BattleReadyID": 103, "monster_id": [ 501256, 501257, @@ -2154,6 +2240,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 87, + "BattleReadyID": 103, "monster_id": [ 501259, 501260, @@ -2179,6 +2266,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 88, + "BattleReadyID": 103, "monster_id": [ 501262, 501263, @@ -2204,6 +2292,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 89, + "BattleReadyID": 103, "monster_id": [ 501265, 501266, @@ -2229,6 +2318,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 90, + "BattleReadyID": 103, "monster_id": [ 501268, 501269, @@ -2254,6 +2344,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 91, + "BattleReadyID": 103, "monster_id": [ 501271, 501272, @@ -2279,6 +2370,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 92, + "BattleReadyID": 103, "monster_id": [ 501274, 501275, @@ -2304,6 +2396,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 93, + "BattleReadyID": 103, "monster_id": [ 501277, 501278, @@ -2329,6 +2422,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 94, + "BattleReadyID": 103, "monster_id": [ 501280, 501281, @@ -2354,6 +2448,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 95, + "BattleReadyID": 103, "monster_id": [ 501283, 501284, @@ -2379,6 +2474,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 96, + "BattleReadyID": 103, "monster_id": [ 501286, 501287, @@ -2404,6 +2500,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 97, + "BattleReadyID": 103, "monster_id": [ 501289, 501290, @@ -2429,6 +2526,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 98, + "BattleReadyID": 103, "monster_id": [ 501292, 501293, @@ -2454,6 +2552,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 99, + "BattleReadyID": 103, "monster_id": [ 501295, 501296, @@ -2479,6 +2578,7 @@ "pagoda_type": 101, "Level_type": 1, "layer_num": 100, + "BattleReadyID": 103, "monster_id": [ 501298, 501299, @@ -2504,6 +2604,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 1, + "BattleReadyID": 103, "monster_id": [ 601001, 601002, @@ -2534,6 +2635,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 2, + "BattleReadyID": 103, "monster_id": [ 601004, 601005, @@ -2564,6 +2666,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 3, + "BattleReadyID": 103, "monster_id": [ 601007, 601008, @@ -2594,6 +2697,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 4, + "BattleReadyID": 103, "monster_id": [ 601010, 601011, @@ -2624,6 +2728,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 5, + "BattleReadyID": 103, "monster_id": [ 601013, 601014, @@ -2654,6 +2759,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 6, + "BattleReadyID": 103, "monster_id": [ 601016, 601017, @@ -2684,6 +2790,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 7, + "BattleReadyID": 103, "monster_id": [ 601019, 601020, @@ -2714,6 +2821,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 8, + "BattleReadyID": 103, "monster_id": [ 601022, 601023, @@ -2744,6 +2852,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 9, + "BattleReadyID": 103, "monster_id": [ 601025, 601026, @@ -2774,6 +2883,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 10, + "BattleReadyID": 103, "monster_id": [ 601028, 601029, @@ -2804,6 +2914,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 11, + "BattleReadyID": 103, "monster_id": [ 601031, 601032, @@ -2834,6 +2945,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 12, + "BattleReadyID": 103, "monster_id": [ 601034, 601035, @@ -2864,6 +2976,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 13, + "BattleReadyID": 103, "monster_id": [ 601037, 601038, @@ -2894,6 +3007,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 14, + "BattleReadyID": 103, "monster_id": [ 601040, 601041, @@ -2924,6 +3038,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 15, + "BattleReadyID": 103, "monster_id": [ 601043, 601044, @@ -2954,6 +3069,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 16, + "BattleReadyID": 103, "monster_id": [ 601046, 601047, @@ -2984,6 +3100,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 17, + "BattleReadyID": 103, "monster_id": [ 601049, 601050, @@ -3014,6 +3131,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 18, + "BattleReadyID": 103, "monster_id": [ 601052, 601053, @@ -3044,6 +3162,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 19, + "BattleReadyID": 103, "monster_id": [ 601055, 601056, @@ -3074,6 +3193,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 20, + "BattleReadyID": 103, "monster_id": [ 601058, 601059, @@ -3104,6 +3224,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 21, + "BattleReadyID": 103, "monster_id": [ 601061, 601062, @@ -3134,6 +3255,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 22, + "BattleReadyID": 103, "monster_id": [ 601064, 601065, @@ -3164,6 +3286,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 23, + "BattleReadyID": 103, "monster_id": [ 601067, 601068, @@ -3194,6 +3317,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 24, + "BattleReadyID": 103, "monster_id": [ 601070, 601071, @@ -3224,6 +3348,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 25, + "BattleReadyID": 103, "monster_id": [ 601073, 601074, @@ -3254,6 +3379,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 26, + "BattleReadyID": 103, "monster_id": [ 601076, 601077, @@ -3284,6 +3410,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 27, + "BattleReadyID": 103, "monster_id": [ 601079, 601080, @@ -3314,6 +3441,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 28, + "BattleReadyID": 103, "monster_id": [ 601082, 601083, @@ -3344,6 +3472,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 29, + "BattleReadyID": 103, "monster_id": [ 601085, 601086, @@ -3374,6 +3503,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 30, + "BattleReadyID": 103, "monster_id": [ 601088, 601089, @@ -3404,6 +3534,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 31, + "BattleReadyID": 103, "monster_id": [ 601091, 601092, @@ -3434,6 +3565,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 32, + "BattleReadyID": 103, "monster_id": [ 601094, 601095, @@ -3464,6 +3596,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 33, + "BattleReadyID": 103, "monster_id": [ 601097, 601098, @@ -3494,6 +3627,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 34, + "BattleReadyID": 103, "monster_id": [ 601100, 601101, @@ -3524,6 +3658,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 35, + "BattleReadyID": 103, "monster_id": [ 601103, 601104, @@ -3554,6 +3689,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 36, + "BattleReadyID": 103, "monster_id": [ 601106, 601107, @@ -3584,6 +3720,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 37, + "BattleReadyID": 103, "monster_id": [ 601109, 601110, @@ -3614,6 +3751,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 38, + "BattleReadyID": 103, "monster_id": [ 601112, 601113, @@ -3644,6 +3782,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 39, + "BattleReadyID": 103, "monster_id": [ 601115, 601116, @@ -3674,6 +3813,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 40, + "BattleReadyID": 103, "monster_id": [ 601118, 601119, @@ -3704,6 +3844,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 41, + "BattleReadyID": 103, "monster_id": [ 601121, 601122, @@ -3734,6 +3875,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 42, + "BattleReadyID": 103, "monster_id": [ 601124, 601125, @@ -3764,6 +3906,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 43, + "BattleReadyID": 103, "monster_id": [ 601127, 601128, @@ -3794,6 +3937,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 44, + "BattleReadyID": 103, "monster_id": [ 601130, 601131, @@ -3824,6 +3968,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 45, + "BattleReadyID": 103, "monster_id": [ 601133, 601134, @@ -3854,6 +3999,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 46, + "BattleReadyID": 103, "monster_id": [ 601136, 601137, @@ -3884,6 +4030,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 47, + "BattleReadyID": 103, "monster_id": [ 601139, 601140, @@ -3914,6 +4061,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 48, + "BattleReadyID": 103, "monster_id": [ 601142, 601143, @@ -3944,6 +4092,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 49, + "BattleReadyID": 103, "monster_id": [ 601145, 601146, @@ -3974,6 +4123,7 @@ "pagoda_type": 201, "Level_type": 1, "layer_num": 50, + "BattleReadyID": 103, "monster_id": [ 601148, 601149, diff --git a/bin/json/game_privilege.json b/bin/json/game_privilege.json index 6082d6e20..b26e55b3e 100644 --- a/bin/json/game_privilege.json +++ b/bin/json/game_privilege.json @@ -13,66 +13,66 @@ "privilege_parameter": 60 }, { - "privilege_id": 10201, + "privilege_id": 10102, "privilege_type": 2, "privilege_DescribeFront": { - "key": "privilege_10201", + "key": "privilege_10102", "text": "金币商店每日" }, "privilege_DescribeAfter": { - "key": "PrivilegeAfter_10201", + "key": "PrivilegeAfter_10102", "text": "免费刷新次数+1" }, "privilege_parameter": 1 }, { - "privilege_id": 10301, + "privilege_id": 10103, "privilege_type": 7, "privilege_DescribeFront": { - "key": "privilege_10301", + "key": "privilege_10103", "text": "巨怪商队" }, "privilege_DescribeAfter": { - "key": "PrivilegeAfter_10301", + "key": "PrivilegeAfter_10103", "text": "背包容量+1" }, "privilege_parameter": 1 }, { - "privilege_id": 10104, + "privilege_id": 10201, "privilege_type": 1, "privilege_DescribeFront": { - "key": "privilege_10104", + "key": "privilege_10201", "text": "每日获得" }, "privilege_DescribeAfter": { - "key": "PrivilegeAfter_10104", + "key": "PrivilegeAfter_10201", "text": "90钻石" }, - "privilege_parameter": 0 + "privilege_parameter": 90 }, { - "privilege_id": 10205, + "privilege_id": 10202, "privilege_type": 2, "privilege_DescribeFront": { - "key": "privilege_10205", + "key": "privilege_10202", "text": "金币商店每日" }, "privilege_DescribeAfter": { - "key": "PrivilegeAfter_10205", + "key": "PrivilegeAfter_10202", "text": "免费刷新次数+1" }, "privilege_parameter": 1 }, { - "privilege_id": 10306, + "privilege_id": 10203, "privilege_type": 7, "privilege_DescribeFront": { - "key": "privilege_10306", + "key": "privilege_10203", "text": "巨怪商队" }, "privilege_DescribeAfter": { - "key": "PrivilegeAfter_10306", + "key": "PrivilegeAfter_10203", "text": "背包容量+1" }, "privilege_parameter": 1 diff --git a/bin/json/game_privilegecard.json b/bin/json/game_privilegecard.json index 460b2ca84..2ad4df13e 100644 --- a/bin/json/game_privilegecard.json +++ b/bin/json/game_privilegecard.json @@ -21,8 +21,8 @@ ], "privilege_id": [ 10101, - 10201, - 10301 + 10102, + 10103 ] }, { @@ -46,9 +46,9 @@ } ], "privilege_id": [ - 10401, - 10501, - 10601 + 10201, + 10202, + 10203 ] }, { diff --git a/bin/json/game_shop.json b/bin/json/game_shop.json index b6b4e8119..7284bdf66 100644 --- a/bin/json/game_shop.json +++ b/bin/json/game_shop.json @@ -183,5 +183,37 @@ 50006, 50007 ] + }, + { + "shopid": 6, + "tab": 6, + "shopname": { + "key": "shop_6", + "text": "英雄商店" + }, + "upper_shop": { + "key": "shop_title1", + "text": "玩法商店" + }, + "needshow": [ + { + "a": "attr", + "t": "moongold", + "n": 1 + } + ], + "rtype": 3, + "rtime": 1, + "rnum": -1, + "rneed": [], + "shopitem": [ + 50001, + 50002, + 50003, + 50004, + 50005, + 50006, + 50007 + ] } ] \ No newline at end of file diff --git a/bin/json/game_shopitem.json b/bin/json/game_shopitem.json index e614f26d0..3b55803a6 100644 --- a/bin/json/game_shopitem.json +++ b/bin/json/game_shopitem.json @@ -7054,5 +7054,41 @@ "lvmax": 60, "mapidmin": 101, "mapidmax": 9999 + }, + { + "key": 197, + "id": 60001, + "iteminfo": [ + { + "a": "item", + "t": "30001", + "n": 10 + } + ], + "preview": false, + "probability": 1000, + "need": [ + { + "a": "attr", + "t": "moongold", + "n": 1 + } + ], + "sale": 1000, + "salelist": [ + 1000, + 1000, + 1000, + 1000, + 1000, + 1000 + ], + "buyminnum": 1, + "buymaxnum": 1, + "vip": 0, + "lvmin": 1, + "lvmax": 60, + "mapidmin": 101, + "mapidmax": 9999 } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 33eca1267..2183370ac 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -5164,7 +5164,7 @@ { "Id": 235001113, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 2, @@ -5294,7 +5294,7 @@ { "Id": 235001123, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 2, @@ -5340,7 +5340,7 @@ { "Id": 235001133, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 2, @@ -5386,7 +5386,7 @@ { "Id": 235001143, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 2, @@ -5432,7 +5432,7 @@ { "Id": 235001153, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 2, @@ -5478,7 +5478,7 @@ { "Id": 235001163, "EmitPR": 1000, - "From": 2, + "From": 11, "Where": [], "Order": "Type=Rand", "Limit": 2, @@ -9486,7 +9486,7 @@ "ExecuteCnt": 1, "Type": 3, "Argu": [ - 390001401, + 390001008, 1000, 1, 2 @@ -10636,7 +10636,7 @@ { "Id": 214003113, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 42608a77b..eccb9224f 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -2376,7 +2376,7 @@ "ico": "jn_icon_x002", "CorrectPos": 0, "IsMelee": 1, - "act": "Skill_1", + "act": "Skill_2", "Type": 0, "CD": 0, "Target": 1, @@ -2404,7 +2404,7 @@ "ico": "jn_icon_x002", "CorrectPos": 0, "IsMelee": 1, - "act": "Skill_1", + "act": "Skill_2", "Type": 0, "CD": 0, "Target": 1, @@ -2432,7 +2432,7 @@ "ico": "jn_icon_x002", "CorrectPos": 0, "IsMelee": 1, - "act": "Skill_1", + "act": "Skill_2", "Type": 0, "CD": 0, "Target": 1, @@ -2460,7 +2460,7 @@ "ico": "jn_icon_x002", "CorrectPos": 0, "IsMelee": 1, - "act": "Skill_1", + "act": "Skill_2", "Type": 0, "CD": 0, "Target": 1, @@ -2488,7 +2488,7 @@ "ico": "jn_icon_x002", "CorrectPos": 0, "IsMelee": 1, - "act": "Skill_1", + "act": "Skill_2", "Type": 0, "CD": 0, "Target": 1, @@ -6322,13 +6322,12 @@ "Target": 1, "ChildSkill": { "Id": [ - 224002211, - 224002212 + 224002211 ] }, "Desc": { "key": "skill_1240022111", - "text": "攻击时，若目标有【童真】，附加2回合【中毒】。受击时，若攻击者有【童真】，50%概率反击。" + "text": "攻击时，若目标有【童真】，附加2回合【速度下降】。受击时，若攻击者有【童真】，50%概率反击。" }, "buffid": [], "map": "" diff --git a/bin/json/game_vikingboss.json b/bin/json/game_vikingboss.json index d0efc0d28..65deec0ad 100644 --- a/bin/json/game_vikingboss.json +++ b/bin/json/game_vikingboss.json @@ -8,6 +8,7 @@ "text": "火焰泰坦" }, "difficulty": 1, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -85,6 +86,7 @@ "text": "火焰泰坦" }, "difficulty": 2, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -162,6 +164,7 @@ "text": "火焰泰坦" }, "difficulty": 3, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -239,6 +242,7 @@ "text": "火焰泰坦" }, "difficulty": 4, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -316,6 +320,7 @@ "text": "火焰泰坦" }, "difficulty": 5, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -393,6 +398,7 @@ "text": "火焰泰坦" }, "difficulty": 6, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -470,6 +476,7 @@ "text": "火焰泰坦" }, "difficulty": 7, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -547,6 +554,7 @@ "text": "火焰泰坦" }, "difficulty": 8, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -624,6 +632,7 @@ "text": "火焰泰坦" }, "difficulty": 9, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -701,6 +710,7 @@ "text": "火焰泰坦" }, "difficulty": 10, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -778,6 +788,7 @@ "text": "冰之泰坦" }, "difficulty": 1, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -855,6 +866,7 @@ "text": "冰之泰坦" }, "difficulty": 2, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -932,6 +944,7 @@ "text": "冰之泰坦" }, "difficulty": 3, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1009,6 +1022,7 @@ "text": "冰之泰坦" }, "difficulty": 4, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1086,6 +1100,7 @@ "text": "冰之泰坦" }, "difficulty": 5, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1163,6 +1178,7 @@ "text": "冰之泰坦" }, "difficulty": 6, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1240,6 +1256,7 @@ "text": "冰之泰坦" }, "difficulty": 7, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1317,6 +1334,7 @@ "text": "冰之泰坦" }, "difficulty": 8, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1394,6 +1412,7 @@ "text": "冰之泰坦" }, "difficulty": 9, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1471,6 +1490,7 @@ "text": "冰之泰坦" }, "difficulty": 10, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1548,6 +1568,7 @@ "text": "森林泰坦" }, "difficulty": 1, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1625,6 +1646,7 @@ "text": "森林泰坦" }, "difficulty": 2, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1702,6 +1724,7 @@ "text": "森林泰坦" }, "difficulty": 3, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1779,6 +1802,7 @@ "text": "森林泰坦" }, "difficulty": 4, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1856,6 +1880,7 @@ "text": "森林泰坦" }, "difficulty": 5, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -1933,6 +1958,7 @@ "text": "森林泰坦" }, "difficulty": 6, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2010,6 +2036,7 @@ "text": "森林泰坦" }, "difficulty": 7, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2087,6 +2114,7 @@ "text": "森林泰坦" }, "difficulty": 8, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2164,6 +2192,7 @@ "text": "森林泰坦" }, "difficulty": 9, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2241,6 +2270,7 @@ "text": "森林泰坦" }, "difficulty": 10, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2318,6 +2348,7 @@ "text": "武器BOSS" }, "difficulty": 1, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2385,6 +2416,7 @@ "text": "武器BOSS" }, "difficulty": 2, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2452,6 +2484,7 @@ "text": "武器BOSS" }, "difficulty": 3, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2519,6 +2552,7 @@ "text": "武器BOSS" }, "difficulty": 4, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2586,6 +2620,7 @@ "text": "武器BOSS" }, "difficulty": 5, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2653,6 +2688,7 @@ "text": "武器BOSS" }, "difficulty": 6, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2720,6 +2756,7 @@ "text": "武器BOSS" }, "difficulty": 7, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2787,6 +2824,7 @@ "text": "武器BOSS" }, "difficulty": 8, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2854,6 +2892,7 @@ "text": "武器BOSS" }, "difficulty": 9, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2921,6 +2960,7 @@ "text": "武器BOSS" }, "difficulty": 10, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -2988,6 +3028,7 @@ "text": "饰品BOSS" }, "difficulty": 1, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3055,6 +3096,7 @@ "text": "饰品BOSS" }, "difficulty": 2, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3122,6 +3164,7 @@ "text": "饰品BOSS" }, "difficulty": 3, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3189,6 +3232,7 @@ "text": "饰品BOSS" }, "difficulty": 4, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3256,6 +3300,7 @@ "text": "饰品BOSS" }, "difficulty": 5, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3323,6 +3368,7 @@ "text": "饰品BOSS" }, "difficulty": 6, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3390,6 +3436,7 @@ "text": "饰品BOSS" }, "difficulty": 7, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3457,6 +3504,7 @@ "text": "饰品BOSS" }, "difficulty": 8, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3524,6 +3572,7 @@ "text": "饰品BOSS" }, "difficulty": 9, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, @@ -3591,6 +3640,7 @@ "text": "饰品BOSS" }, "difficulty": 10, + "BattleReadyID": 104, "captionrecommend": [ 25001, 25004, diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 784affda8..f722da58b 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -4,10 +4,7 @@ "FormatList": [ 700011 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [ 21 ], @@ -22,10 +19,7 @@ "FormatList": [ 700012 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -38,10 +32,7 @@ "FormatList": [ 700013 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -54,10 +45,7 @@ "FormatList": [ 700014 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -70,10 +58,7 @@ "FormatList": [ 700015 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -86,10 +71,7 @@ "FormatList": [ 700016 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -102,10 +84,7 @@ "FormatList": [ 700017 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -118,10 +97,7 @@ "FormatList": [ 700018 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -134,10 +110,7 @@ "FormatList": [ 700019 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -150,10 +123,7 @@ "FormatList": [ 700020 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -166,10 +136,7 @@ "FormatList": [ 700021 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -182,10 +149,7 @@ "FormatList": [ 700022 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -198,10 +162,7 @@ "FormatList": [ 700023 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", @@ -214,10 +175,7 @@ "FormatList": [ 700024 ], - "DefaultHero": 0, - "SelectableHero": [], - "LockSlots": [], - "AssistTeam": 0, + "BattleReadyID": 100, "EventList": [], "playexp": { "a": "attr", diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 708b03ba8..2587f1600 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -34,12 +34,6 @@ var ( subType: hero.StrengthenUplv, req: &pb.HeroStrengthenUplvReq{ HeroObjID: "62e778117cc92ac48c4b2464", - ExpCards: []*pb.MapStringInt32{ - { - Key: "62e778117cc92ac48c4b2479", - Value: 1, - }, - }, }, rsp: &pb.HeroStrengthenUplvResp{}, // enabled: true, @@ -67,18 +61,6 @@ var ( subType: hero.StrengthenUpStar, req: &pb.HeroStrengthenUpStarReq{ HeroObjID: selHero.Id, - HeroRace: []*pb.CostCardData{ - { - CostCardObj: heroId, - Amount: 1, - }, - }, - Hero: []*pb.CostCardData{ - { - CostCardObj: heroId, - Amount: 1, - }, - }, }, rsp: &pb.HeroStrengthenUpStarResp{}, // enabled: true, @@ -91,12 +73,6 @@ var ( subType: hero.StrengthenUplv, req: &pb.HeroStrengthenUplvReq{ HeroObjID: heroId, - ExpCards: []*pb.MapStringInt32{ - { - Key: "62da19017944b60fd473df61", - Value: 1, - }, - }, }, rsp: &pb.HeroStrengthenUplvResp{}, enabled: true, @@ -131,7 +107,7 @@ var ( } ) -//声明加入到构建器并发起请求 +// 声明加入到构建器并发起请求 func (r *Robot) RunHero() { r.addBuilders(heroBuilders) } diff --git a/cmd/v2/FyneApp.toml b/cmd/v2/FyneApp.toml index c552525f7..7add2c04c 100644 --- a/cmd/v2/FyneApp.toml +++ b/cmd/v2/FyneApp.toml @@ -4,5 +4,5 @@ Website = "http://legu.cc" Icon = "app.png" Name = "RobotGUI" ID = "cc.legu.app" - Version = "1.2.7" - Build = 37 + Version = "1.2.8" + Build = 38 diff --git a/cmd/v2/lib/common/lang.go b/cmd/v2/lib/common/lang.go index 865c2b1d6..7751e24e1 100644 --- a/cmd/v2/lib/common/lang.go +++ b/cmd/v2/lib/common/lang.go @@ -97,6 +97,7 @@ const ( TOOLBAR_PB = "protobuf" TOOLBAR_AUTO = "自动化" TOOLBAR_PING = "端口扫描" + TOOLBAR_MGODB = "MongoDB" TOOLBAR_PERF_TIP = "开始" TOOLBAR_PERF_CONF = "配置" diff --git a/cmd/v2/lib/storage/config.go b/cmd/v2/lib/storage/config.go index e5e1f6788..b36b86507 100644 --- a/cmd/v2/lib/storage/config.go +++ b/cmd/v2/lib/storage/config.go @@ -1,5 +1,7 @@ package storage +import "go_dreamfactory/pb" + //默认配置 func NewDefaultConfig() *Config { return &Config{ @@ -26,16 +28,27 @@ func NewDefaultConfig() *Config { } type Config struct { - Pressure PressureConfig `json:"Pressure,omitempty"` - UserCount int32 `json:"UserCount,omitempty"` //用户数 - SId string `json:"sid,omitempty"` //区服ID - WsAddr string `json:"wsAddr,omitempty"` //websocket addr - IntervalS int32 `json:"intervalS,omitempty"` //间隔时间s - LubanConf *LubanConfig `json:"lubanConf,omitempty"` //luban工具配置 - PbConf *ProtobufConfig `json:"pbConf,omitempty"` //Pb配置 - SyncConf *SyncConfig `json:"syncConf,omitempty"` //同步配置 - UpgradeUrl string `json:"upgradeUrl,omitempty"` //升级服务 - Servers []*ServerConfig `json:"servers,omitempty"` //区服配置 + Pressure PressureConfig `json:"Pressure,omitempty"` + UserCount int32 `json:"UserCount,omitempty"` //用户数 + SId string `json:"sid,omitempty"` //区服ID + WsAddr string `json:"wsAddr,omitempty"` //websocket addr + IntervalS int32 `json:"intervalS,omitempty"` //间隔时间s + LubanConf *LubanConfig `json:"lubanConf,omitempty"` //luban工具配置 + PbConf *ProtobufConfig `json:"pbConf,omitempty"` //Pb配置 + SyncConf *SyncConfig `json:"syncConf,omitempty"` //同步配置 + UpgradeUrl string `json:"upgradeUrl,omitempty"` //升级服务 + Servers []*ServerConfig `json:"servers,omitempty"` //区服配置 + MgoDB *MgoDB `json:"mgoDB,omitempty"` //MongoDB配置 + ServiceDBInfo *pb.ServiceDBInfo `json:"serviceDBInfo,omitempty"` // +} + +type MgoDB struct { + Name string `json:"name,omitempty"` // + Host string `json:"host,omitempty"` + Port int32 `json:"port,omitempty"` + User string `json:"user,omitempty"` + Password string `json:"password,omitempty"` + Database string `json:"database,omitempty"` } //压测配置 diff --git a/cmd/v2/ui/app_interface.go b/cmd/v2/ui/app_interface.go index fa3f39373..e0e3769a1 100644 --- a/cmd/v2/ui/app_interface.go +++ b/cmd/v2/ui/app_interface.go @@ -33,6 +33,7 @@ var ( &appLock{}, &appTerm{}, &appPing{}, + &appMgo{}, } perfRegister = []appInterface{ diff --git a/cmd/v2/ui/mainwindow.go b/cmd/v2/ui/mainwindow.go index 26a6a6652..aa5d2df25 100644 --- a/cmd/v2/ui/mainwindow.go +++ b/cmd/v2/ui/mainwindow.go @@ -10,7 +10,6 @@ import ( "go_dreamfactory/modules/user" "go_dreamfactory/pb" "strings" - "time" "fyne.io/fyne/v2" "fyne.io/fyne/v2/container" @@ -313,14 +312,23 @@ func (ui *MainWindowImpl) createLoginWin(sid, sname string) { return } - go func() { - timer := time.NewTimer(10 * time.Second) - for { - timer.Reset(10 * time.Second) - <-timer.C - ui.pttService.Ping(sid, account.Text) - } - }() + // go func() { + // timer := time.NewTimer(10 * time.Second) + // for { + // if !timer.Stop() { + // select { + // case <-timer.C: + // default: + // } + // } + // timer.Reset(10 * time.Second) + // select { + // case <-timer.C: + // ui.pttService.Ping(sid, account.Text) + // continue + // } + // } + // }() // reset main window title subTitle := fmt.Sprintf("%s[%s]", sname, sid) ui.w.SetTitle(fmt.Sprintf(common.APP_WIN_TITLE, subTitle, ui.app.Metadata().Version, ui.app.Metadata().Build, common.APP_NAME)) diff --git a/cmd/v2/ui/protocol.go b/cmd/v2/ui/protocol.go index 4ffc79776..13cdc6dca 100644 --- a/cmd/v2/ui/protocol.go +++ b/cmd/v2/ui/protocol.go @@ -102,14 +102,9 @@ var ( // pagoda ff(comm.ModulePagoda, "getlist"): &formview.PagodaListView{}, // rtask - ff(comm.ModuleRtask, rtask.RtaskSubTypeList): &formview.RtaskListView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeApply): &formview.RtaskDoitView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose): &formview.RtaskChooseView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeReward): &formview.RtaskRewardView{}, - ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart): &formview.RtaskBattlestartView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): &formview.RtaskBattleFinishView{}, - ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): &formview.RtaskRecordView{}, + ff(comm.ModuleRtask, rtask.RtaskSubTypeList): &formview.RtaskListView{}, + ff(comm.ModuleRtask, "rtest"): &formview.RtaskTestView{}, + ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): &formview.RtaskRecordView{}, // linestory ff(comm.ModuleLinestory, linestory.LinestorySubTypeChapter): &formview.LinestoryMineView{}, ff(comm.ModuleLibrary, library.LibraryFetterstoryTaskResp): &formview.FetterstoryView{}, @@ -227,12 +222,6 @@ var ( }, "rtask": { ff(comm.ModuleRtask, rtask.RtaskSubTypeList), - ff(comm.ModuleRtask, rtask.RtaskSubTypeApply), - ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose), - ff(comm.ModuleRtask, rtask.RtaskSubTypeReward), - - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart), - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish), ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord), ff(comm.ModuleRtask, "rtest"), }, @@ -770,41 +759,6 @@ var ( return "" }, }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeApply): { - NavLabel: "做任务", - Desc: "执行随机任务", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeApply, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeChoose): { - NavLabel: "情景对答", - Desc: "情景对答", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeChoose, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeReward): { - NavLabel: "领奖", - Desc: "领奖", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeReward, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleStart): { - NavLabel: "战斗开始", - Desc: "战斗开始", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeBattleStart, - Enabled: true, - }, - ff(comm.ModuleRtask, rtask.RtaskSubTypeBattleFinish): { - NavLabel: "战斗结束", - Desc: "战斗结束", - MainType: string(comm.ModuleRtask), - SubType: rtask.RtaskSubTypeBattleFinish, - Enabled: true, - }, ff(comm.ModuleRtask, rtask.RtaskSubTypeGetrecord): { NavLabel: "任务数据", Desc: "任务数据", diff --git a/cmd/v2/ui/tool_mgo.go b/cmd/v2/ui/tool_mgo.go new file mode 100644 index 000000000..4a30fc8c5 --- /dev/null +++ b/cmd/v2/ui/tool_mgo.go @@ -0,0 +1,246 @@ +package ui + +import ( + "context" + "errors" + "fmt" + "go_dreamfactory/cmd/v2/lib/common" + os_storage "go_dreamfactory/cmd/v2/lib/storage" + "go_dreamfactory/cmd/v2/service" + "go_dreamfactory/cmd/v2/service/observer" + "go_dreamfactory/pb" + "strings" + + "fyne.io/fyne/v2" + "fyne.io/fyne/v2/container" + "fyne.io/fyne/v2/dialog" + "fyne.io/fyne/v2/layout" + "fyne.io/fyne/v2/theme" + "fyne.io/fyne/v2/widget" + "github.com/sirupsen/logrus" + "github.com/spf13/cast" + + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/mongo/options" +) + +type appMgo struct { + appAdapter + conf *os_storage.Config + storage os_storage.Storage + db *mongo.Database + client *mongo.Client + scriptEntry *widget.Entry +} + +func (this *appMgo) LazyInit(ptService service.PttService, obs observer.Observer) error { + this.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_MGODB, theme.DownloadIcon(), nil) + content := container.NewMax() + content.Objects = []fyne.CanvasObject{} + + this.scriptEntry = widget.NewMultiLineEntry() + + connWinBtn := widget.NewButton("连接设置", this.showConWin) + openConnBtn := widget.NewButton("打开连接", this.openConn) + closeConnBtn := widget.NewButton("关闭连接", this.closeConn) + createServerConfBtn := widget.NewButton("创建服务配置", this.createServerConf) + btns := container.NewHBox(connWinBtn, openConnBtn, createServerConfBtn, layout.NewSpacer(), closeConnBtn) + content.Objects = append(content.Objects, container.NewBorder(btns, nil, nil, nil, this.scriptEntry)) + this.tabItem.Content = content + this.storage, _ = os_storage.NewOSStorage() + var err error + this.conf, err = this.storage.LoadConfig() + if err != nil { + logrus.Error(err) + return err + } + return nil +} + +func (this *appMgo) openConn() { + if this.conf.MgoDB == nil { + dialog.ShowError(errors.New("MgoDB没有配置"), toolWin.w) + return + } + var option *options.ClientOptions + if (this.conf.MgoDB.User == "" && this.conf.MgoDB.Password == "") && + this.conf.MgoDB.Host != "" && this.conf.MgoDB.Port != 0 && this.conf.MgoDB.Database != "" { + option = options.Client().ApplyURI(fmt.Sprintf("mongodb://%s:%d", this.conf.MgoDB.Host, this.conf.MgoDB.Port)) + } else { + option = options.Client().ApplyURI(fmt.Sprintf("mongodb://%s:%s@%s:%d", this.conf.MgoDB.User, this.conf.MgoDB.Password, + this.conf.MgoDB.Host, this.conf.MgoDB.Port)) + } + client, err := mongo.Connect(context.TODO(), option) + if err != nil { + logrus.Error(err) + return + } + if err2 := client.Ping(context.TODO(), nil); err2 != nil { + logrus.Error("Mongo连接失败", err2) + return + } + this.db = client.Database(this.conf.MgoDB.Database) + + this.scriptEntry.Text = this.db.Name() + " 连接成功" + this.scriptEntry.Refresh() +} + +func (this *appMgo) closeConn() { + if this.db != nil { + if err := this.db.Client().Disconnect(context.TODO()); err != nil { + this.scriptEntry.Text = "连接关闭失败" + } else { + this.scriptEntry.Text = "连接关闭成功" + } + this.scriptEntry.Refresh() + } +} + +func (this *appMgo) createServerConf() { + serverId := widget.NewEntry() + serverName := widget.NewEntry() + owner := widget.NewEntry() + cross := widget.NewEntry() + crossId := widget.NewEntry() + singleserver := widget.NewEntry() + opentime := widget.NewEntry() + redisIsCluster := widget.NewEntry() + redisAddr := widget.NewEntry() + redisPassword := widget.NewEntry() + redisDb := widget.NewEntry() + mongoUrl := widget.NewEntry() + mongoDatabase := widget.NewEntry() + + form := widget.NewForm( + widget.NewFormItem("serverid", serverId), + widget.NewFormItem("serverName", serverName), + widget.NewFormItem("owner", owner), + widget.NewFormItem("cross", cross), + widget.NewFormItem("crossId", crossId), + widget.NewFormItem("singleserver", singleserver), + widget.NewFormItem("opentime", opentime), + widget.NewFormItem("redisIsCluster", redisIsCluster), + widget.NewFormItem("redisAddr", redisAddr), + widget.NewFormItem("redisPassword", redisPassword), + widget.NewFormItem("redisDb", redisDb), + widget.NewFormItem("mongoUrl", mongoUrl), + widget.NewFormItem("mongoDatabase", mongoDatabase), + ) + + if this.conf.ServiceDBInfo != nil { + serverId.Text = this.conf.ServiceDBInfo.Serverid + serverName.Text = this.conf.ServiceDBInfo.ServerName + owner.Text = this.conf.ServiceDBInfo.Owner + cross.Text = this.conf.ServiceDBInfo.Cross + crossId.Text = this.conf.ServiceDBInfo.CrossId + singleserver.Text = this.conf.ServiceDBInfo.Singleserver + opentime.Text = cast.ToString(this.conf.ServiceDBInfo.Opentime) + redisIsCluster.Text = cast.ToString(this.conf.ServiceDBInfo.RedisIsCluster) + redisAddr.Text = strings.Join(this.conf.ServiceDBInfo.RedisAddr, ",") + redisPassword.Text = this.conf.ServiceDBInfo.RedisPassword + redisDb.Text = cast.ToString(this.conf.ServiceDBInfo.RedisDb) + mongoUrl.Text = this.conf.ServiceDBInfo.MongodbUrl + mongoDatabase.Text = this.conf.ServiceDBInfo.MongodbDatabase + } + + subBtn := widget.NewButton("保存", func() { + this.conf.ServiceDBInfo = &pb.ServiceDBInfo{ + Serverid: serverId.Text, + ServerName: serverName.Text, + Owner: owner.Text, + Cross: cross.Text, + CrossId: crossId.Text, + Singleserver: singleserver.Text, + Opentime: cast.ToInt64(opentime.Text), + RedisIsCluster: cast.ToBool(redisIsCluster.Text), + RedisAddr: strings.Split(redisAddr.Text, ","), + RedisPassword: redisPassword.Text, + RedisDb: cast.ToInt32(redisDb.Text), + MongodbUrl: mongoUrl.Text, + MongodbDatabase: mongoDatabase.Text, + } + if err := this.storage.StoreConfig(this.conf); err != nil { + logrus.Error(err) + } + }) + subBtn.Importance = widget.HighImportance + + execBtn := widget.NewButton("插入", func() { + if this.db == nil { + common.ShowTip("请先打开连接") + return + } + c := this.db.Collection("serverdata") + if _, err := c.InsertOne(context.TODO(), this.conf.ServiceDBInfo); err != nil { + logrus.Error(err) + return + } + + this.scriptEntry.Text = "插入成功" + this.scriptEntry.Refresh() + }) + dconf := dialog.NewCustom("配置", "关闭", container.NewVBox(form, container.NewHBox(layout.NewSpacer(), subBtn, execBtn)), toolWin.w) + dconf.Resize(fyne.NewSize(400, 600)) + dconf.Show() + +} + +func (this *appMgo) showConWin() { + + connName := widget.NewEntry() + + address := widget.NewEntry() + + port := widget.NewEntry() + + user := widget.NewEntry() + password := widget.NewPasswordEntry() + + database := widget.NewEntry() + + form := widget.NewForm( + widget.NewFormItem("Name", connName), + widget.NewFormItem("Address", container.NewBorder(nil, nil, nil, port, address)), + widget.NewFormItem("User", user), + widget.NewFormItem("Password", password), + widget.NewFormItem("Database", database), + ) + + if this.conf.MgoDB != nil { + connName.Text = this.conf.MgoDB.Name + address.Text = this.conf.MgoDB.Host + port.Text = cast.ToString(this.conf.MgoDB.Port) + user.Text = this.conf.MgoDB.User + password.Text = this.conf.MgoDB.Password + database.Text = this.conf.MgoDB.Database + } + form.OnSubmit = func() { + this.conf.MgoDB = &os_storage.MgoDB{ + Name: connName.Text, + Host: address.Text, + Port: cast.ToInt32(port.Text), + User: user.Text, + Password: password.Text, + Database: database.Text, + } + + if connName.Text == "" || address.Text == "" || port.Text == "" { + common.ShowTip("请填写完整") + return + } + if err := this.storage.StoreConfig(this.conf); err != nil { + logrus.Error(err) + return + } + dialog.ShowInformation("提示", "保存成功", toolWin.w) + } + form.SubmitText = "保存" + + dconf := dialog.NewCustom("设置链接", "关闭", form, toolWin.w) + dconf.Resize(fyne.NewSize(400, 200)) + dconf.Show() +} + +func (a *appMgo) GetAppName() string { + return common.TOOLBAR_MGODB +} diff --git a/cmd/v2/ui/toolwindow.go b/cmd/v2/ui/toolwindow.go index 9abc7ab3e..48bb2d3f7 100644 --- a/cmd/v2/ui/toolwindow.go +++ b/cmd/v2/ui/toolwindow.go @@ -56,6 +56,9 @@ func NewToolWindow(ui *UIImpl, parent fyne.Window) ToolWindow { widget.NewToolbarAction(theme.ComputerIcon(), func() { openApp2(mw.at, common.TOOLBAR_PING) }), + widget.NewToolbarAction(theme.SettingsIcon(), func() { + openApp2(mw.at, common.TOOLBAR_MGODB) + }), widget.NewToolbarSpacer(), widget.NewToolbarAction(theme.HelpIcon(), func() { diff --git a/cmd/v2/ui/views/bingoview.go b/cmd/v2/ui/views/bingoview.go index f381b2eab..98597aaac 100644 --- a/cmd/v2/ui/views/bingoview.go +++ b/cmd/v2/ui/views/bingoview.go @@ -37,7 +37,7 @@ func (this *BingoView) CreateView(t *model.TestCase) fyne.CanvasObject { nEntry.PlaceHolder = "数量" attrSel := &widget.Select{} - attrSel.Options = []string{"选择", "gold", "diamond", "exp", "friendPoint", "ps", "guildcoin", "arenacoin"} + attrSel.Options = []string{"选择", "gold", "diamond", "exp", "moongold", "friendPoint", "ps", "guildcoin", "arenacoin"} attrSel.SetSelected("选择") attrSel.OnChanged = func(s string) { ttxt = s diff --git a/cmd/v2/ui/views/hero_strengthenUpStar.go b/cmd/v2/ui/views/hero_strengthenUpStar.go index ed1ffe8b2..5b29e7077 100644 --- a/cmd/v2/ui/views/hero_strengthenUpStar.go +++ b/cmd/v2/ui/views/hero_strengthenUpStar.go @@ -10,7 +10,6 @@ import ( "fyne.io/fyne/v2/container" "fyne.io/fyne/v2/widget" "github.com/sirupsen/logrus" - "github.com/spf13/cast" ) type HeroStrengthenUpStarView struct { @@ -49,43 +48,9 @@ func (this *HeroStrengthenUpStarView) CreateView(t *model.TestCase) fyne.CanvasO this.form.AppendItem(widget.NewFormItem(common.APP_TESTCASE_FORM_LABEL_CARD, hero)) this.form.OnSubmit = func() { - // heroRace - var heroRace []*pb.CostCardData - if heroRaceId.Text != "" && heroRaceAmount.Text != "" { - heroRace = append(heroRace, &pb.CostCardData{ - CostCardObj: heroRaceId.Text, - Amount: cast.ToInt32(heroRaceAmount.Text), - }) - } - - if heroRaceId2.Text != "" && heroRaceAmount2.Text != "" { - heroRace = append(heroRace, &pb.CostCardData{ - CostCardObj: heroRaceId2.Text, - Amount: cast.ToInt32(heroRaceAmount2.Text), - }) - } - - //hero - var hero []*pb.CostCardData - if heroId.Text != "" && heroAmount.Text != "" { - hero = append(hero, &pb.CostCardData{ - CostCardObj: heroId.Text, - Amount: cast.ToInt32(heroAmount.Text), - }) - } - - if heroId2.Text != "" && heroAmount2.Text != "" { - hero = append(hero, &pb.CostCardData{ - CostCardObj: heroId2.Text, - Amount: cast.ToInt32(heroAmount2.Text), - }) - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.HeroStrengthenUpStarReq{ HeroObjID: heroObjID.Text, - HeroRace: heroRace, - Hero: hero, }); err != nil { logrus.Error(err) return diff --git a/cmd/v2/ui/views/hero_strengthenUplv.go b/cmd/v2/ui/views/hero_strengthenUplv.go index 98dfa347a..ea9fc33cb 100644 --- a/cmd/v2/ui/views/hero_strengthenUplv.go +++ b/cmd/v2/ui/views/hero_strengthenUplv.go @@ -55,8 +55,7 @@ func (this *HeroStrengthenUplvView) CreateView(t *model.TestCase) fyne.CanvasObj if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.HeroStrengthenUplvReq{ - HeroObjID: heroObjID.Text, - ExpCards: cards}); err != nil { + HeroObjID: heroObjID.Text}); err != nil { logrus.Error(err) return } diff --git a/cmd/v2/ui/views/rtask_apply.go b/cmd/v2/ui/views/rtask_apply.go deleted file mode 100644 index eff997d7f..000000000 --- a/cmd/v2/ui/views/rtask_apply.go +++ /dev/null @@ -1,44 +0,0 @@ -package formview - -import ( - "errors" - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskDoitView struct { - BaseformView -} - -func (this *RtaskDoitView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - taskId.PlaceHolder = "任务ID" - - subTaskId := widget.NewEntry() - subTaskId.PlaceHolder = "支线任务ID" - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - this.form.AppendItem(widget.NewFormItem("支线任务ID", subTaskId)) - - this.form.OnSubmit = func() { - if taskId.Text == "" { - dialog.ShowError(errors.New("请填写任务ID"), this.w) - return - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtaskApplyReq{ - RtaskId: cast.ToInt32(taskId.Text), - RtaskSubId: cast.ToInt32(subTaskId.Text), - }); err != nil { - logrus.Error(err) - } - } - - return this.form -} diff --git a/cmd/v2/ui/views/rtask_battlefinish.go b/cmd/v2/ui/views/rtask_battlefinish.go deleted file mode 100644 index 581af854f..000000000 --- a/cmd/v2/ui/views/rtask_battlefinish.go +++ /dev/null @@ -1,33 +0,0 @@ -package formview - -import ( - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskBattleFinishView struct { - BaseformView -} - -func (this *RtaskBattleFinishView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - - this.form.OnSubmit = func() { - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, - &pb.RtaskBattleFinishReq{ - RtaskId: cast.ToInt32(taskId.Text), - }); err != nil { - logrus.Error(err) - } - } - - return this.form -} diff --git a/cmd/v2/ui/views/rtask_battlestart.go b/cmd/v2/ui/views/rtask_battlestart.go deleted file mode 100644 index 09715e014..000000000 --- a/cmd/v2/ui/views/rtask_battlestart.go +++ /dev/null @@ -1,43 +0,0 @@ -package formview - -import ( - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - "strings" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskBattlestartView struct { - BaseformView -} - -func (this *RtaskBattlestartView) CreateView(t *model.TestCase) fyne.CanvasObject { - confId := widget.NewEntry() - - leadpos := widget.NewEntry() - - teamIds := widget.NewEntry() - teamIds.PlaceHolder = ",号分隔" - - this.form.AppendItem(widget.NewFormItem("关卡ID", confId)) - this.form.AppendItem(widget.NewFormItem("队长位置", leadpos)) - this.form.AppendItem(widget.NewFormItem("阵容信息", teamIds)) - - this.form.OnSubmit = func() { - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, - - &pb.RtaskBattleStartReq{ - BattleConfId: cast.ToInt32(confId.Text), - Leadpos: cast.ToInt32(leadpos.Text), - Teamids: strings.Split(teamIds.Text, ","), - }); err != nil { - logrus.Error(err) - } - } - return this.form -} diff --git a/cmd/v2/ui/views/rtask_choose.go b/cmd/v2/ui/views/rtask_choose.go deleted file mode 100644 index b78cb690e..000000000 --- a/cmd/v2/ui/views/rtask_choose.go +++ /dev/null @@ -1,52 +0,0 @@ -package formview - -import ( - "errors" - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskChooseView struct { - BaseformView -} - -func (this *RtaskChooseView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - taskId.PlaceHolder = "任务ID" - - subTaskId := widget.NewEntry() - subTaskId.PlaceHolder = "支线任务ID" - - chooseId := widget.NewEntry() - chooseId.PlaceHolder = "选项ID" - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - this.form.AppendItem(widget.NewFormItem("支线任务ID", subTaskId)) - this.form.AppendItem(widget.NewFormItem("选项ID", chooseId)) - - this.form.OnSubmit = func() { - if taskId.Text == "" { - dialog.ShowError(errors.New("请填写任务ID"), this.w) - return - } - if chooseId.Text == "" { - dialog.ShowError(errors.New("请填写选项ID"), this.w) - return - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtaskChooseReq{ - RtaskId: cast.ToInt32(taskId.Text), - RtaskSubId: cast.ToInt32(subTaskId.Text), - ChooseId: cast.ToInt32(chooseId.Text), - }); err != nil { - logrus.Error(err) - } - } - return this.form -} diff --git a/cmd/v2/ui/views/rtask_reward.go b/cmd/v2/ui/views/rtask_reward.go deleted file mode 100644 index 16b4cb0fc..000000000 --- a/cmd/v2/ui/views/rtask_reward.go +++ /dev/null @@ -1,37 +0,0 @@ -package formview - -import ( - "errors" - "go_dreamfactory/cmd/v2/model" - "go_dreamfactory/cmd/v2/service" - "go_dreamfactory/pb" - - "fyne.io/fyne/v2" - "fyne.io/fyne/v2/dialog" - "fyne.io/fyne/v2/widget" - "github.com/sirupsen/logrus" - "github.com/spf13/cast" -) - -type RtaskRewardView struct { - BaseformView -} - -func (this *RtaskRewardView) CreateView(t *model.TestCase) fyne.CanvasObject { - taskId := widget.NewEntry() - taskId.PlaceHolder = "任务ID" - - this.form.AppendItem(widget.NewFormItem("任务ID", taskId)) - this.form.OnSubmit = func() { - if taskId.Text == "" { - dialog.ShowError(errors.New("请填写任务ID"), this.w) - return - } - if err := service.GetPttService().SendToClient(t.MainType, t.SubType, &pb.RtaskGetRewardReq{ - RtaskId: cast.ToInt32(taskId.Text), - }); err != nil { - logrus.Error(err) - } - } - return this.form -} diff --git a/comm/const.go b/comm/const.go index 1ee2da523..062807bdd 100644 --- a/comm/const.go +++ b/comm/const.go @@ -26,13 +26,13 @@ const ( RDS_EMPTY = "" ) -//ERR +// ERR const ( MainTypeNotify = "notify" //通知 SubTypeErrorNotify = "errornotify" //错误通知 ) -//模块名定义处 +// 模块名定义处 const ( ModuleSys core.M_Modules = "sys" //系统 ModuleGate core.M_Modules = "gateway" //gate模块 网关服务模块 @@ -81,7 +81,7 @@ const ( ModulePvp core.M_Modules = "pvp" //实时pvp ) -//数据表名定义处 +// 数据表名定义处 const ( TableSys = "sys" ///数据日志表 @@ -219,7 +219,7 @@ const ( TableMline = "mline" ) -//RPC服务接口定义处 +// RPC服务接口定义处 const ( //Rpc //Gateway 网关消息 Rpc_GatewayRoute core.Rpc_Key = "Rpc_GatewayRoute" //网关路由 @@ -272,7 +272,7 @@ const ( //Rpc Rpc_Mail core.Rpc_Key = "Rpc_Mail" ) -//事件类型定义处 +// 事件类型定义处 const ( EventUserLogin core.Event_Key = "Event_UserLogin" //登录事件 EventCreateUser core.Event_Key = "Event_CreateUser" //创建角色事件 @@ -331,13 +331,14 @@ const ( SociatyCoin = "guildcoin" //公会币 ArenaCoin = "arenacoin" //竞技场币 ResPs = "ps" // 体力 + Moongold = "moongold" //纯净月髓 ) const ( Gold int32 = 1 //金币 Diamond int32 = 2 //钻石 ) -//门票 +// 门票 const ( ArenaTicket string = "100004" //竞技场入场券 MoonFantasyTicket string = "100003" //梦境场入场券 @@ -345,7 +346,7 @@ const ( UnifiedTicket string = "100100" //统一门票 ) -//红点枚举 +// 红点枚举 type ReddotType int32 const ( @@ -393,7 +394,7 @@ const ( TaskTypeUpHeroLevel TaskType = 103 //获取英雄等级 ) -//任务标签:日常/周常/成就 +// 任务标签:日常/周常/成就 type TaskTag int32 const ( @@ -562,6 +563,10 @@ const ( Rtype155 TaskType = 155 //调整助战英雄n次 Rtype156 TaskType = 156 //完成工会任务n次 Rtype157 TaskType = 157 //战斗在xx系统中完成xx事件 + Rtype158 TaskType = 158 //主线第X章关卡总星数达到N星 + Rtype159 TaskType = 159 //主线第X章关卡全部达到三星 + Rtype160 TaskType = 160 //主线总星数达到X星 + Rtype161 TaskType = 161 //在自动战斗过程中完成另一场战斗 ) const ( @@ -601,7 +606,7 @@ const ( MainLineBoss = 3 ) -///聊天消息公告类型 +// /聊天消息公告类型 type ChatSystemType int8 const ( diff --git a/go.mod b/go.mod index 7be7df068..2b8ace255 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,6 @@ require ( github.com/Pallinder/go-randomdata v1.2.0 github.com/atotto/clipboard v0.1.4 github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 - github.com/boltdb/bolt v1.3.1 github.com/gin-gonic/gin v1.8.1 github.com/go-playground/validator/v10 v10.10.1 github.com/go-redis/redis/v8 v8.11.5 @@ -30,13 +29,11 @@ require ( github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.12.0 github.com/tidwall/gjson v1.14.1 github.com/ugorji/go/codec v1.2.7 github.com/valyala/fastrand v1.1.0 go.mongodb.org/mongo-driver v1.5.1 go.uber.org/multierr v1.6.0 - golang.design/x/hotkey v0.4.0 golang.org/x/net v0.2.0 google.golang.org/grpc v1.46.2 google.golang.org/protobuf v1.28.0 @@ -85,7 +82,7 @@ require ( github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 // indirect + github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 github.com/go-playground/locales v0.14.0 // indirect github.com/go-playground/universal-translator v0.18.0 // indirect github.com/go-redis/redis_rate/v9 v9.1.2 // indirect @@ -107,7 +104,6 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect - github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/serf v0.9.7 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect @@ -122,7 +118,6 @@ require ( github.com/leodido/go-urn v1.2.1 // indirect github.com/lucas-clemente/quic-go v0.27.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/magiconair/properties v1.8.6 // indirect github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect @@ -135,7 +130,6 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/nxadm/tail v1.4.8 // indirect github.com/onsi/ginkgo v1.16.5 // indirect - github.com/pelletier/go-toml v1.9.5 // indirect github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pkg/errors v0.9.1 @@ -150,12 +144,9 @@ require ( github.com/smallnest/quick v0.0.0-20220103065406-780def6371e6 // indirect github.com/smartystreets/goconvey v1.7.2 github.com/soheilhy/cmux v0.1.5 // indirect - github.com/spf13/afero v1.8.2 // indirect - github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 // indirect github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 // indirect github.com/stretchr/testify v1.8.0 // indirect - github.com/subosito/gotenv v1.4.0 // indirect github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect github.com/tevino/abool v1.2.0 // indirect @@ -187,7 +178,6 @@ require ( golang.org/x/sys v0.2.0 // indirect golang.org/x/text v0.4.0 golang.org/x/tools v0.3.0 // indirect - gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index f06e13ad0..f50605580 100644 --- a/go.sum +++ b/go.sum @@ -5,7 +5,6 @@ cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgo cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -18,7 +17,6 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= @@ -40,7 +38,6 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU= @@ -98,8 +95,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= @@ -330,7 +325,6 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= @@ -343,7 +337,6 @@ github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= @@ -401,7 +394,6 @@ github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= -github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= @@ -490,8 +482,6 @@ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= -github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= @@ -590,8 +580,6 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= -github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/peterbourgon/g2s v0.0.0-20140925154142-ec76db4c1ac1 h1:5Dl+ADmsGerAqHwWzyLqkNaUBQ+48DQwfDCaW1gHAQM= @@ -604,7 +592,6 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/sftp v1.13.5 h1:a3RLUqkyjYRtBTZJZ1VRrKbN3zhuPLlUc3sphVz81go= github.com/pkg/sftp v1.13.5/go.mod h1:wHDZ0IZX6JcBYRK1TH9bcVq8G7TLpVHYIGJRFnmPfxg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -713,8 +700,6 @@ github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= @@ -722,14 +707,11 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= -github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 h1:HunZiaEKNGVdhTRQOVpMmj5MQnGnv+e8uZNu3xFLgyM= github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4= github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 h1:m59mIOBO4kfcNCEzJNy71UkeF4XIx2EVmL9KLwDQdmM= @@ -750,8 +732,6 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= -github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= @@ -845,9 +825,6 @@ go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= -golang.design/x/hotkey v0.4.0 h1:jmY6QJdakEdYn0KBm48IZRw3emBpDXRhIWUHqPVsWBY= -golang.design/x/hotkey v0.4.0/go.mod h1:M8SGcwFYHnKRa83FpTFQoZvPO5vVT+kWPztFqTQKmXA= -golang.design/x/mainthread v0.3.0 h1:UwFus0lcPodNpMOGoQMe87jSFwbSsEY//CA7yVmu4j8= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -865,10 +842,8 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220408190544-5352b0902921/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM= @@ -960,7 +935,6 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= @@ -1062,7 +1036,6 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1071,7 +1044,6 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1167,7 +1139,6 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= @@ -1255,9 +1226,7 @@ google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1318,8 +1287,6 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= -gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index d9834ebe6..1b6bc19d9 100644 --- a/modules/hero/api_awaken.go +++ b/modules/hero/api_awaken.go @@ -125,12 +125,9 @@ func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (c //xx英雄满级、共鸣、觉醒至最高状态 nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) if nextAwaken == nil { // 达到满级觉醒 - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star) - if resonConfig != nil && resonConfig.Maxnum == _hero.ResonateNum { - if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { - this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) - this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) - } + if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) + this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) } } } diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 51a6bd3d1..4c2b5b99e 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -29,7 +29,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq cfgDraw *cfg.GameGlobalData costAtn *cfg.Gameatn heroRecord *pb.DBHeroRecord - pool string + pool string // 当前抽对应的卡池 _mapAddHero map[string]int32 strPool []string // 10连跨多个卡池情况 update map[string]interface{} @@ -65,8 +65,9 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq } for i := 0; i < int(req.DrawCount); i++ { - pool = this.module.modelHero.CheckPool(drawCount, cfgDraw) drawCount += 1 + pool = this.module.modelHero.CheckPool(drawCount, cfgDraw) + strPool = append(strPool, pool) ret := this.module.CheckCondition(session.GetUserId()) if ret == true { // 命中插入5星英雄 @@ -128,7 +129,56 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq } } } - + inRangeConf1 := this.module.configure.GetGlobalConf().DrawCard5StarsInRange1 + if len(inRangeConf1) == 3 { + iStart := inRangeConf1[0] // 抽卡开始 + iEnd := inRangeConf1[1] // 抽卡结束 + star := inRangeConf1[2] + if star >= 3 { // 保底必须三星+ + if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart { + n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart))) + if n.Int64() < 1 { // 抽中 + starIndex = star + heroRecord.Inevitable = heroRecord.Drawcount + update["inevitable1"] = heroRecord.Drawcount + szStar = append(szStar, star) + if star == 4 { + heroRecord.Star4 = 0 + star4Max++ + } else if star == 5 { + star5Max++ + heroRecord.Star5 = 0 + } + // 修改卡池 + newPoll := this.module.configure.GetGlobalConf().DrawCard5StarsInRange1Pool + if newPoll != "" { + strPool[len(strPool)-1] = newPoll + } + continue + } + } + // 保底情况 + if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 { + starIndex = star + heroRecord.Inevitable1 = heroRecord.Drawcount + update["inevitable1"] = heroRecord.Drawcount + szStar = append(szStar, star) + if star == 4 { + heroRecord.Star4 = 0 + star4Max++ + } else if star == 5 { + star5Max++ + heroRecord.Star5 = 0 + } + // 修改卡池 + newPoll := this.module.configure.GetGlobalConf().DrawCard5StarsInRange1Pool + if newPoll != "" { + strPool[len(strPool)-1] = newPoll + } + continue + } + } + } heroRecord.Star4++ // 4星保底数量+1 heroRecord.Star5++ // 5星保底数量+1 if starIndex == 1 { diff --git a/modules/hero/api_resonance.go b/modules/hero/api_resonance.go deleted file mode 100644 index dbcd45254..000000000 --- a/modules/hero/api_resonance.go +++ /dev/null @@ -1,180 +0,0 @@ -package hero - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/pb" - cfg "go_dreamfactory/sys/configure/structs" - "go_dreamfactory/utils" - - "google.golang.org/protobuf/proto" -) - -//参数校验 -func (this *apiComp) ResonanceCheck(session comm.IUserSession, req *pb.HeroResonanceReq) (code pb.ErrorCode) { - if req.HeroObjID == "" || len(req.CostObjID) == 0 { - code = pb.ErrorCode_ReqParameterError - return - } - - return -} - -/// 英雄共鸣 -func (this *apiComp) Resonance(session comm.IUserSession, req *pb.HeroResonanceReq) (code pb.ErrorCode, data proto.Message) { - var ( - szCostHero map[string]int32 // k 卡牌配置id v 数量 - _hero *pb.DBHero - ChangeList []*pb.DBHero // 变化的英雄数据 - _costMaphero map[string]*pb.DBHero - count int32 // 共鸣升级次数 - ) - ChangeList = make([]*pb.DBHero, 0) - szCostHero = make(map[string]int32, 0) - _costMaphero = make(map[string]*pb.DBHero, 0) - code = this.ResonanceCheck(session, req) // check - if code != pb.ErrorCode_Success { - return - } - - _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 - if code != pb.ErrorCode_Success { - return - } - //获取原始星级 - conf := this.module.configure.GetHeroConfig(_hero.HeroID) - if conf == nil { - code = pb.ErrorCode_ConfigNoFound - return - } - // 共鸣次数判断 - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, conf.Star) - if resonConfig == nil { - code = pb.ErrorCode_ConfigNoFound - return - } - - for _, k := range req.CostObjID { - _costHero, c := this.module.GetHeroByObjID(session.GetUserId(), k) // 查询消耗卡是否存在 - if c != pb.ErrorCode_Success { - code = c // 英雄被锁不能消耗 - return - } - if _costHero.Block { - code = pb.ErrorCode_HeroIsLock - } - _costMaphero[k] = _costHero - szCostHero[_costHero.HeroID] += 1 - } - // 一次升级多级 - for _, v := range resonConfig.Heroneed { - for k, v1 := range szCostHero { - if k == v.T { - if v1%v.N == 0 { - if count == 0 { - count = v1 / v.N - } - if count != v1/v.N { - code = pb.ErrorCode_ReqParameterError - return - } - } else { - code = pb.ErrorCode_ReqParameterError - return - } - } - } - } - if count == 0 { - code = pb.ErrorCode_ReqParameterError - return - } - if resonConfig.Maxnum < _hero.ResonateNum+count { - code = pb.ErrorCode_HeroMaxResonate // 共鸣次数已满 - return - } - for k, v := range _costMaphero { - code = this.module.DelCard(session.GetUserId(), v, szCostHero[v.HeroID]) - if code != pb.ErrorCode_Success { - return - } - ChangeList = append(ChangeList, _costMaphero[k]) - } - sz := make([]*cfg.Gameatn, 0) // 计算升级多次的消耗 - for _, v := range resonConfig.Need { - sz = append(sz, &cfg.Gameatn{ - A: v.A, - T: v.T, - N: v.N * count, - }) - } - code = this.module.ConsumeRes(session, sz, true) - if code != pb.ErrorCode_Success { - return - } - - for k := range _costMaphero { - if k == _hero.Id { - _hero.SameCount = _costMaphero[k].SameCount - break - } - } - if _hero.SameCount == 0 { - code = pb.ErrorCode_ReqParameterError - return - } - if _hero.SameCount > 1 { - _hero.SameCount -= 1 - newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) - ChangeList = append(ChangeList, newHero) - } - _hero.SameCount = 1 - _hero.ResonateNum += count - _hero.DistributionResonate += resonConfig.Energy * count - _hero.IsOverlying = false - _heroMap := map[string]interface{}{ - "resonateNum": _hero.ResonateNum, - "distributionResonate": _hero.DistributionResonate, - "isOverlying": false, - "sameCount": 1, - "horoscopeProperty": _hero.HoroscopeProperty, - } - err := this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息 - if err != nil { - this.module.Errorf("update hero skill failed:%v", err) - code = pb.ErrorCode_DBError - return - } - // 返还对应初始星级的卡 - ChangeList = append(ChangeList, _hero) - session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) - this.module.DispenseRes(session, resonConfig.Prize, true) - session.SendMsg(string(this.module.GetType()), Resonance, &pb.HeroResonanceResp{Hero: _hero}) - - //英雄共鸣 【玩家名称】已将【英雄名称】共鸣至满级！ - if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { - this.chat.SendSysChatToWorld(comm.ChatSystem10, nil, _hero.ResonateNum, 0, user.Name, _hero.HeroID) - } else { - this.module.Errorf("no found userdata uid:%s", session.GetUserId()) - } - // 任务相关 - this.module.ModuleRtask.SendToRtask(session, comm.Rtype39, 1) - this.module.ModuleRtask.SendToRtask(session, comm.Rtype127, _hero.Star, utils.ToInt32(_hero.HeroID), _hero.ResonateNum) //A星英雄共鸣N级 - this.module.ModuleRtask.SendToRtask(session, comm.Rtype40, 1, 1) - cfg := this.module.configure.GetHeroConfig(_hero.HeroID) - if cfg != nil { - this.module.ModuleRtask.SendToRtask(session, comm.Rtype126, cfg.Race, _hero.ResonateNum) - this.module.ModuleRtask.SendToRtask(session, comm.Rtype36, 1, cfg.Color, cfg.Job, cfg.Race, _hero.ResonateNum) - //xx英雄满级、共鸣、觉醒至最高状态 - nextAwaken := this.module.configure.GetHeroAwakenConfig(_hero.HeroID, _hero.JuexingLv+1) - if nextAwaken == nil { // 达到满级觉醒 - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, cfg.Star) - if resonConfig != nil && resonConfig.Maxnum == _hero.ResonateNum { // 共鸣满 - if _hero.Lv == _hero.Star*comm.HeroStarLvRatio { - this.module.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) - this.module.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) - } - } - } - } - return -} diff --git a/modules/hero/api_resonanceReset.go b/modules/hero/api_resonanceReset.go deleted file mode 100644 index 078b752e9..000000000 --- a/modules/hero/api_resonanceReset.go +++ /dev/null @@ -1,87 +0,0 @@ -package hero - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" -) - -//参数校验 -func (this *apiComp) ResonanceResetCheck(session comm.IUserSession, req *pb.HeroResonanceResetReq) (code pb.ErrorCode) { - if req.HeroObjID == "" { - code = pb.ErrorCode_ReqParameterError - return - } - - return -} - -/// 英雄共鸣 -func (this *apiComp) ResonanceReset(session comm.IUserSession, req *pb.HeroResonanceResetReq) (code pb.ErrorCode, data proto.Message) { - var ( - _hero *pb.DBHero - ) - code = this.ResonanceResetCheck(session, req) // check - if code != pb.ErrorCode_Success { - return - } - - _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 - if code != pb.ErrorCode_Success { - code = pb.ErrorCode_HeroNoExist - return - } - - if _hero.ResonateNum <= 0 { // 没有共鸣 不允许重置 - code = pb.ErrorCode_HeroNoResonate - return - } - - // 共鸣次数判断 - //获取原始星级 - conf := this.module.configure.GetHeroConfig(_hero.HeroID) - if conf == nil { - code = pb.ErrorCode_ConfigNoFound - return - } - resonConfig := this.module.configure.GetHeroResonanceConfig(_hero.HeroID, conf.Star) - if resonConfig == nil { - code = pb.ErrorCode_ConfigNoFound - return - } - - if _hero.ResonateNum*resonConfig.Energy == _hero.DistributionResonate { - code = pb.ErrorCode_HeroNotNeedResonate // 已经是重置状态 - return - } - - _costConfig, err1 := this.module.configure.GetHeroResonanceRestConfig() - if err1 != nil { - code = pb.ErrorCode_ConfigNoFound // 没找到配置消耗 - return - } - // 消耗校验 - code = this.module.ConsumeRes(session, _costConfig.Var, true) - if code != pb.ErrorCode_Success { - return - } - _hero.EnergyProperty = make(map[string]int32, 0) - _hero.Energy = make(map[string]int32) - _hero.DistributionResonate = _hero.ResonateNum * resonConfig.Energy - _heroMap := map[string]interface{}{ - "distributionResonate": _hero.DistributionResonate, - "energy": _hero.Energy, - "isOverlying": false, - "energyProperty": _hero.EnergyProperty, - } - - err1 = this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息 - if err1 != nil { - this.module.Errorf("update hero skill failed:%v", err1) - code = pb.ErrorCode_DBError - return - } - session.SendMsg(string(this.module.GetType()), ResonanceReset, &pb.HeroResonanceResetResp{Hero: _hero, Energy: _hero.ResonateNum}) - return -} diff --git a/modules/hero/api_resonanceSelect.go b/modules/hero/api_resonanceSelect.go deleted file mode 100644 index 9e483e905..000000000 --- a/modules/hero/api_resonanceSelect.go +++ /dev/null @@ -1,65 +0,0 @@ -package hero - -import ( - "go_dreamfactory/comm" - "go_dreamfactory/pb" - - "google.golang.org/protobuf/proto" -) - -//参数校验 -func (this *apiComp) ResonanceUseEnergyCheck(session comm.IUserSession, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode) { - if len(req.HeroObjID) == 0 || len(req.Energy) == 0 { - code = pb.ErrorCode_ReqParameterError - return - } - - return -} - -func (this *apiComp) ResonanceUseEnergy(session comm.IUserSession, req *pb.HeroResonanceUseEnergyReq) (code pb.ErrorCode, data proto.Message) { - var ( - _hero *pb.DBHero - totalEnergy int32 - ) - code = this.ResonanceUseEnergyCheck(session, req) // check - if code != pb.ErrorCode_Success { - return - } - - _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) // 查询目标卡是否存在 - if code != pb.ErrorCode_Success { - return - } - for _, v := range req.Energy { - totalEnergy += v.UseEnergy - } - - if _hero.DistributionResonate < totalEnergy { // 能量点数不够 - code = pb.ErrorCode_HeroNoEnergy - return - } - for _, v := range req.Energy { - if v.UseEnergy > 0 { - _hero.Energy[v.UseType] += v.UseEnergy - } - } - _hero.DistributionResonate -= totalEnergy - _heroMap := map[string]interface{}{ - "distributionResonate": _hero.DistributionResonate, // 减没有分配的能量 - "energy": _hero.Energy, - "isOverlying": false, - } - - err1 := this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息 - if err1 != nil { - code = pb.ErrorCode_DBError - this.module.Errorf("update hero skill failed:%v", err1) - return - } - conf := this.module.configure.GetHeroConfig(_hero.HeroID) - // 计算属性 - this.module.modelHero.setEnergyProperty(_hero, conf.Star) - session.SendMsg(string(this.module.GetType()), ResonanceUseEnergy, &pb.HeroResonanceUseEnergyResp{Hero: _hero}) - return -} diff --git a/modules/hero/api_specified.go b/modules/hero/api_specified.go index 6680dc7a0..301ef9462 100644 --- a/modules/hero/api_specified.go +++ b/modules/hero/api_specified.go @@ -25,7 +25,7 @@ func (this *apiComp) GetSpecified(session comm.IUserSession, req *pb.HeroGetSpec if code != pb.ErrorCode_Success { return } - hero, err := this.module.modelHero.createOneHero(session.GetUserId(), req.HeroCoinfigID) + hero, err := this.module.modelHero.createSpecialHero(session.GetUserId(), req.HeroCoinfigID) if err == nil { code = pb.ErrorCode_HeroNoExist } diff --git a/modules/hero/api_strengthenUpSkill.go b/modules/hero/api_strengthenUpSkill.go index a7b103380..bf58b673c 100644 --- a/modules/hero/api_strengthenUpSkill.go +++ b/modules/hero/api_strengthenUpSkill.go @@ -3,6 +3,7 @@ package hero import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/utils" "google.golang.org/protobuf/proto" @@ -10,7 +11,7 @@ import ( //参数校验 func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode) { - if req.HeroObjID == "" || len(req.CostCardObj) == 0 { + if req.HeroObjID == "" || len(req.Item) == 0 { code = pb.ErrorCode_ReqParameterError return } @@ -21,17 +22,11 @@ func (this *apiComp) StrengthenUpSkillCheck(session comm.IUserSession, req *pb.H /// 英雄技能升级 func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroStrengthenUpSkillReq) (code pb.ErrorCode, data proto.Message) { var ( - upSkillPos int32 // 升级的技能位置 - _hero *pb.DBHero // 操作的英雄 - ChangeList []*pb.DBHero // 推送 改变的英雄 - mapCostHero map[string]int32 // 消耗的技能卡 - mapCostObj map[string]*pb.DBHero // 消耗的技能卡对象 - costGold int64 // 金币消耗 - lvUpCount int32 // 技能升级的次数 + upSkillPos int32 // 升级的技能位置 + _hero *pb.DBHero // 操作的英雄 + cost []*cfg.Gameatn // 技能升级消耗 + lvUpCount int32 // 技能升级的次数 ) - mapCostHero = make(map[string]int32, 0) - mapCostObj = make(map[string]*pb.DBHero, 0) - ChangeList = make([]*pb.DBHero, 0) code = this.StrengthenUpSkillCheck(session, req) // check if code != pb.ErrorCode_Success { @@ -47,50 +42,36 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt code = pb.ErrorCode_HeroNoExist return } - - for _, v := range req.CostCardObj { // 数组转 map - mapCostHero[v]++ + for _, v1 := range req.Item { + bFind := false + for _, v := range heroCfg.Heroskillup { + if v == v1 { + bFind = true + lvUpCount++ // 升级次数 + break + } + } + if !bFind { + code = pb.ErrorCode_ReqParameterError + return + } + cost = append(cost, &cfg.Gameatn{ + A: "item", + T: v1, + N: 1, + }) } - for k, v := range mapCostHero { - costHero, c := this.module.GetHeroByObjID(session.GetUserId(), k) // 查询消耗卡是否存在 - if c != pb.ErrorCode_Success { - code = c - return + // 消耗获取 + for i := 0; i < int(lvUpCount); i++ { + if atn := this.module.configure.GetHeroSkillCost(heroCfg.Star); len(atn) > 0 { + cost = append(cost, atn...) } - if costHero.Block { // 锁定的卡不允许被消耗 - code = pb.ErrorCode_HeroIsLock - return - } - if costHero.SameCount < v { // 数量校验 - code = pb.ErrorCode_HeroNoEnough - return - } - tmp := this.module.configure.GetHeroConfig(costHero.HeroID) // 星级校验 - if tmp.Color != heroCfg.Color { - code = pb.ErrorCode_HeroColorErr - return - } - if tmp.Type != comm.CardTypeSkill { // 查看是不是升级卡 - code = pb.ErrorCode_HeroTypeErr - return - } - expConf := this.module.configure.GetHeroExp(costHero.HeroID) // 消耗多少金币 - if expConf != nil { - costGold += int64(expConf.Needgold * v) - lvUpCount += expConf.Skilllevelup * v - } else { - lvUpCount += v // 计算技能升级次数 - } - - mapCostObj[k] = costHero } - // 检查金币消耗 - curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.ResGold) - if curGold < costGold { // 金币不足 - code = pb.ErrorCode_GoldNoEnough + + // 检查消耗 + if code = this.module.CheckRes(session, cost); code != pb.ErrorCode_Success { return } - for i := 0; i < int(lvUpCount); i++ { // 升级技能 szIndex := make([]int32, 0) sz := make([]int32, 0) @@ -115,54 +96,20 @@ func (this *apiComp) StrengthenUpSkill(session comm.IUserSession, req *pb.HeroSt _hero.NormalSkill[szIndex[upSkillPos]].SkillLv += 1 } - code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -int32(costGold), true) - if code != pb.ErrorCode_Success { // 金币不足 - code = pb.ErrorCode_GoldNoEnough + if code = this.module.ConsumeRes(session, cost, true); code != pb.ErrorCode_Success { return } - for k, v := range mapCostObj { - code = this.module.DelCard(session.GetUserId(), v, mapCostHero[k]) - if code != pb.ErrorCode_Success { - code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, int32(costGold), true) - return - } - ChangeList = append(ChangeList, v) - } - // 堆叠情况 - if _hero.SameCount > 1 { - _hero.SameCount -= 1 - sz := make([]*pb.SkillData, 0) - - for _, v := range _hero.NormalSkill { - sz = append(sz, &pb.SkillData{ - SkillID: v.SkillID, - SkillLv: v.SkillLv, - }) - v.SkillLv = 1 - } - newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) - ChangeList = append(ChangeList, newHero) - _hero.NormalSkill = sz - } - _heroMap := map[string]interface{}{ "normalSkill": _hero.NormalSkill, - "isOverlying": false, - "sameCount": 1, "horoscopeProperty": _hero.HoroscopeProperty, } - _hero.SameCount = 1 err1 := this.module.modelHero.ChangeList(session.GetUserId(), req.HeroObjID, _heroMap) // 修改英雄信息 if err1 != nil { this.module.Errorf("update hero skill failed:%v", err1) code = pb.ErrorCode_DBError return } - - //this.module.modelHero.ChangeHeroProperty(session, _hero) // 推送属性变化 - ChangeList = append(ChangeList, _hero) - session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: ChangeList}) session.SendMsg(string(this.module.GetType()), StrengthenUpSkill, &pb.HeroStrengthenUpSkillResp{Hero: _hero}) //英雄技能培养 【玩家名称】已将【英雄名称】技能培养至满级！ if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index 4329ffd9d..09530340b 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -11,7 +11,7 @@ import ( //参数校验 func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode) { - if req.HeroObjID == "" || len(req.HeroRace) == 0 { + if req.HeroObjID == "" { code = pb.ErrorCode_ReqParameterError } @@ -21,25 +21,9 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He /// 英雄升星 func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data proto.Message) { var ( - starConf *cfg.GameHeroStarupData // 配置表目标升星英雄信息 - costNeedHeroCount int32 // 消耗指定英雄的数量 - costRaceHeroCount int32 // 消耗种族英雄的数量 - _hero *pb.DBHero // 目标英雄 - tagHero *pb.DBHero // 消耗指定英雄 - mapCostHero map[string]int32 // 所有消耗英雄分类 - chanegCard []*pb.DBHero // 变化的英雄数据 - CostHeroObj map[string]*pb.DBHero // 所有消耗英雄分类 + starConf *cfg.GameHeroStarupData // 配置表目标升星英雄信息 + _hero *pb.DBHero // 目标英雄 ) - mapCostHero = make(map[string]int32, 0) - CostHeroObj = make(map[string]*pb.DBHero, 0) - for _, v := range req.Hero { - mapCostHero[v.CostCardObj] += v.Amount - costNeedHeroCount += v.Amount - } - for _, v := range req.HeroRace { - mapCostHero[v.CostCardObj] += v.Amount - costRaceHeroCount += v.Amount - } code = this.StrengthenUpStarCheck(session, req) // check if code != pb.ErrorCode_Success { @@ -63,111 +47,34 @@ func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStr return } - // 优先校验数量对不对 - if starConf.Needheronum != costNeedHeroCount || starConf.Needracenum != costRaceHeroCount { - code = pb.ErrorCode_ReqParameterError - return - } - costNeedHeroCount = 0 - costRaceHeroCount = 0 - // 遍历所有消耗英雄 - for k, v := range mapCostHero { - if tagHero, code = this.module.GetHeroByObjID(session.GetUserId(), k); code != pb.ErrorCode_Success { // 没有这个英雄 - return - } else { - if tagHero.Block { // 锁定的卡不允许被消耗 - code = pb.ErrorCode_HeroIsLock - return - } - if tagHero.SameCount < v { // 校验数量 - code = pb.ErrorCode_ReqParameterError - return - } - - if tagHero.HeroID == starConf.Needhero && tagHero.Star == starConf.Needherostar && tagHero.SameCount >= starConf.Needheronum { - costNeedHeroCount += v - } - - for _, value := range starConf.Needrace { // 阵营校验 - // 获取配置表英雄阵营 - cfg := this.module.configure.GetHeroConfig(tagHero.HeroID) - if cfg != nil { - if cfg.Race == value { - costRaceHeroCount += v - } - } - } - } - CostHeroObj[k] = tagHero - } - - if starConf.Needheronum > costNeedHeroCount || starConf.Needracenum > costRaceHeroCount { - code = pb.ErrorCode_ReqParameterError + if code = this.module.ConsumeRes(session, starConf.Needrace, true); code != pb.ErrorCode_Success { return } - // 金币消耗判断 - curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.ResGold) - if curGold < int64(starConf.Gold) { // 金币不足 - code = pb.ErrorCode_GoldNoEnough - return - } - - // 消耗道具 - code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -starConf.Gold, true) // 减少金币 - if code != pb.ErrorCode_Success { - this.module.Errorf("cost gold failed ,count = %d", starConf.Gold) - code = pb.ErrorCode_GoldNoEnough - return - } - for k, v := range mapCostHero { - code = this.module.DelCard(session.GetUserId(), CostHeroObj[k], v) - if code != pb.ErrorCode_Success { - this.module.Errorf("del hero err card:%s,count = %d", k, v) - this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, starConf.Gold, true) // 回退金币 - return - } - chanegCard = append(chanegCard, CostHeroObj[k]) - } // 加对应的天赋点数 if len(starConf.Starup) > 0 { if code = this.module.DispenseRes(session, starConf.Starup, true); code != pb.ErrorCode_Success { // 加天赋点{ this.module.Errorf("DispenseRes err:uid:%s,res:%v", session.GetUserId(), starConf.Starup) } } - if _hero.SameCount > 1 { //有堆叠的情况 - // 克隆一个新的 - _hero.SameCount -= 1 - newHero := this.module.modelHero.CloneNewHero(session.GetUserId(), _hero) - chanegCard = append(chanegCard, newHero) - } _hero.Star += 1 - _hero.SameCount = 1 + this.module.modelHero.PropertyCompute(_hero) // 重新计算属性 _heroMap := map[string]interface{}{ "star": _hero.Star, - "sameCount": 1, - "isOverlying": false, + "talentProperty": _hero.TalentProperty, + "juexProperty": _hero.JuexProperty, "horoscopeProperty": _hero.HoroscopeProperty, } - if heroConf != nil && heroConf.Type == comm.CardTypeStar { // 升星卡升星 修改heroid - hid := this.module.configure.GetHeroSpriteStar(_hero.HeroID) - if hid != "" { - _hero.HeroID = hid - _heroMap["heroID"] = _hero.HeroID - } - } // 保存数据 err := this.module.modelHero.ChangeList(session.GetUserId(), _hero.Id, _heroMap) if err != nil { code = pb.ErrorCode_DBError - this.module.Errorf("update hero skill failed:%v", err) + this.module.Errorf("update hero star failed:%v", err) } this.module.modelHero.ChangeHeroProperty(session, _hero) // 重新计算属性 - chanegCard = append(chanegCard, _hero) - session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: chanegCard}) session.SendMsg(string(this.module.GetType()), StrengthenUpStar, &pb.HeroStrengthenUpStarResp{Hero: _hero}) //英雄升星 【玩家名称】已将【英雄名称】培养至6星！ diff --git a/modules/hero/api_strengthenUplv.go b/modules/hero/api_strengthenUplv.go index cdeb0aa20..f8ed24448 100644 --- a/modules/hero/api_strengthenUplv.go +++ b/modules/hero/api_strengthenUplv.go @@ -3,22 +3,17 @@ package hero import ( "go_dreamfactory/comm" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "google.golang.org/protobuf/proto" ) //参数校验 func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode) { - if req.HeroObjID == "" || len(req.ExpCards) == 0 { + if req.HeroObjID == "" || len(req.Item) == 0 { code = pb.ErrorCode_ReqParameterError return } - for _, v := range req.ExpCards { - if v.Value <= 0 || v.Key == "" { - code = pb.ErrorCode_ReqParameterError - return - } - } return } @@ -27,73 +22,45 @@ func (this *apiComp) StrengthenUplvCheck(session comm.IUserSession, req *pb.Hero func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStrengthenUplvReq) (code pb.ErrorCode, data proto.Message) { var ( - addExp int32 // 需要增加的经验 - costGold int64 // 需要消耗的资源 - _hero *pb.DBHero // 目标英雄 - _costExpHero map[string]*pb.DBHero // 消耗英雄 - minAddExp int32 - _changeHero []*pb.DBHero // 变化的英雄 - _mapCost map[string]int32 // + addExp int32 // 需要增加的经验 + costGold int32 // 需要消耗的资源 + _hero *pb.DBHero // 目标英雄 + cost []*cfg.Gameatn // 消耗的道具 ) - _costExpHero = make(map[string]*pb.DBHero, 0) - _mapCost = make(map[string]int32, 0) - for _, v := range req.ExpCards { // 数组转map - _mapCost[v.Key] += v.Value - } code = this.StrengthenUplvCheck(session, req) // check if code != pb.ErrorCode_Success { return } + _hero, code = this.module.GetHeroByObjID(session.GetUserId(), req.HeroObjID) if code != pb.ErrorCode_Success { return } - // 只有英雄卡才能升级 - if _hero.CardType != comm.CardTypeHero && _hero.CardType != comm.CardTypeStar { - code = pb.ErrorCode_HeroTypeErr - return - } - for k, v := range _mapCost { - _expHero, c := this.module.GetHeroByObjID(session.GetUserId(), k) // 校验需要消耗经验卡牌的对象是否存在 - code = c - if code != pb.ErrorCode_Success { - return - } - if _expHero.Block { // 锁定的卡不允许被消耗 - code = pb.ErrorCode_HeroIsLock - return - } - if _expHero.CardType != comm.CardTypeLevel { - code = pb.ErrorCode_HeroTypeErr - return - } - if v > _expHero.SameCount { // 校验数量 - code = pb.ErrorCode_HeroNoEnough - return + for k, v := range req.Item { + if v == 0 { + continue } + cost = append(cost, &cfg.Gameatn{ + A: "item", + T: k, + N: v, + }) // 查询 本次消耗会获得多少经验 - expConf := this.module.configure.GetHeroExp(_expHero.HeroID) - if expConf != nil { - addExp += expConf.Heroexp * v + if expConf := this.module.configure.GetHeroExp(k); expConf != nil { + addExp += expConf.Exp * v + costGold += expConf.Needgold * v } - costGold += int64(expConf.Needgold * v) // 需要消耗的金币 - if _expHero.SameCount < v { // 消耗经验卡片数量不足 - code = pb.ErrorCode_HeroNoEnough - return - } - if minAddExp == 0 { - minAddExp = expConf.Heroexp //初始化 - } else if minAddExp > expConf.Heroexp { - minAddExp = expConf.Heroexp // 取出最小的经验卡 - } - _costExpHero[k] = _expHero } + cost = append(cost, &cfg.Gameatn{ + A: "attr", + T: "gold", + N: costGold, + }) // 金币消耗判断 - curGold := this.module.ModuleUser.QueryAttributeValue(session.GetUserId(), comm.ResGold) - if curGold < costGold { // 金币不足 - code = pb.ErrorCode_GoldNoEnough + if code = this.module.CheckRes(session, cost); code != pb.ErrorCode_Success { return } + if addExp == 0 { code = pb.ErrorCode_HeroExpTypeErr return @@ -105,44 +72,27 @@ func (this *apiComp) StrengthenUplv(session comm.IUserSession, req *pb.HeroStren } curLv := _hero.Lv // 执行升级逻辑 - newhero, _, code := this.module.modelHero.AddCardExp(session, _hero, addExp) // 加经验 + _, code = this.module.modelHero.AddCardExp(session, _hero, addExp) // 加经验 if code != pb.ErrorCode_Success { return } iLvUp := _hero.Lv - curLv // 消耗金币 - code = this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, -int32(costGold), true) - if code != pb.ErrorCode_Success { // 金币不足 - code = pb.ErrorCode_GoldNoEnough + if code = this.module.ConsumeRes(session, cost, true); code != pb.ErrorCode_Success { //道具扣除 + code = pb.ErrorCode_ItemsNoEnough return } - // 删除经验卡 - for k, v := range _mapCost { - err1 := this.module.modelHero.consumeHeroCard(session.GetUserId(), _costExpHero[k], v) - if err1 != nil { - code = pb.ErrorCode_HeroNoEnough - this.module.Errorf("delete err failed err:%T!", err1) - this.module.ModuleUser.AddAttributeValue(session, comm.ResGold, int32(costGold), true) // 回退金币 - return - } - _changeHero = append(_changeHero, _costExpHero[k]) - } if iLvUp > 0 { this.module.modelHero.ChangeHeroProperty(session, _hero) // 重新计算属性值 } - _changeHero = append(_changeHero, _hero) // 升级后的英雄 hero id 不变 - if newhero != nil { - _changeHero = append(_changeHero, newhero) // 原来的英雄 只是数量变化了 - } //英雄升级 【玩家名称】已将【英雄名称】培养至60级！ if user := this.module.ModuleUser.GetUser(session.GetUserId()); user != nil { this.chat.SendSysChatToWorld(comm.ChatSystem7, nil, _hero.Lv, 0, user.Name, _hero.HeroID) } else { this.module.Errorf("no found userdata uid:%s", session.GetUserId()) } - session.SendMsg(string(this.module.GetType()), "change", &pb.HeroChangePush{List: _changeHero}) session.SendMsg(string(this.module.GetType()), StrengthenUplv, &pb.HeroStrengthenUplvResp{Hero: _hero}) return } diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 01e68c73a..d49e8ff80 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -6,44 +6,46 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" + "sync" "go_dreamfactory/lego/core" "go_dreamfactory/utils" ) const ( - equip_suit = "game_equipsuit.json" //装备套装表 - new_hero = "game_hero.json" //英雄 - hero_stargrow = "game_herostargrow.json" //英雄品质系数 - hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数 - hero_starup = "game_herostarup.json" // 升星 - hero_levelup = "game_herolevelup.json" //英雄等级基础属性 - hero_exp = "game_heroexp.json" // 升级 - hero_skillup = "game_heroskilllevel.json" // 英雄技能升级 - game_skillatk = "game_skillatk.json" // 英雄技能 - hero_resonance = "game_heroresonance.json" // 英雄共鸣 - hero_comatn = "game_comatn.json" // 英雄共鸣重置 - hero_awaken = "game_heroawaken.json" // 英雄觉醒 - hero_drawcard = "game_drawcard.json" // 抽卡 - hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整 - hero_drawcost = "game_drawcost.json" // 抽卡消耗 - hero_fusion = "game_herofusion.json" // 卡牌融合 - hero_starupsp = "game_herostarupsp.json" // 精灵升星 - hero_talentskill = "game_talentskill.json" // 天赋 - hero_talent = "game_herotalent.json" // 天赋详细数据 - hero_itembox = "game_itembox.json" // 天赋详细数据 + equip_suit = "game_equipsuit.json" //装备套装表 + new_hero = "game_hero.json" //英雄 + hero_stargrow = "game_herostargrow.json" //英雄品质系数 + hero_levelgrow = "game_herolevelgrow.json" //英雄成长系数 + hero_starup = "game_herostarup.json" // 升星 + hero_levelup = "game_herolevelup.json" //英雄等级基础属性 + hero_exp = "game_heroexp.json" // 升级 + hero_skillup = "game_heroskilllevel.json" // 英雄技能升级 + game_skillatk = "game_skillatk.json" // 英雄技能 + //hero_resonance = "game_heroresonance.json" // 英雄共鸣 + //hero_comatn = "game_comatn.json" // 英雄共鸣重置 + hero_awaken = "game_heroawaken.json" // 英雄觉醒 + hero_drawcard = "game_drawcard.json" // 抽卡 + hero_drawupdraw = "game_drawupdraw.json" // 抽卡概率调整 + hero_drawcost = "game_drawcost.json" // 抽卡消耗 + hero_fusion = "game_herofusion.json" // 卡牌融合 + hero_starupsp = "game_herostarupsp.json" // 精灵升星 + hero_talentskill = "game_talentskill.json" // 天赋 + hero_talent = "game_herotalent.json" // 天赋详细数据 + hero_itembox = "game_itembox.json" // 天赋详细数据 game_shopitem = "game_shopitem.json" + hero_skill = "game_heroskill.json" ) ///配置管理组件 type configureComp struct { modules.MCompConfigure + hlock sync.RWMutex drawCardCfg map[string]map[int32][]*cfg.GameDrawCardData // 第一个key 卡池id 第二个key 星级 - //map["base_pool1"]map[3]*cfg.Game_drawCardData - awakenMap map[int64]*cfg.GameHeroAwakenData - resonanceMap map[int64]*cfg.GameHeroResonanceData - starMap map[int64]*cfg.GameHeroStarupData - module *Hero + awakenMap map[int64]*cfg.GameHeroAwakenData + + starMap map[int64]*cfg.GameHeroStarupData + module *Hero } //组件初始化接口 @@ -52,15 +54,15 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*Hero) err = this.LoadMultiConfigure(map[string]interface{}{ - equip_suit: cfg.NewGameEquipSuit, - new_hero: cfg.NewGameHero, - hero_stargrow: cfg.NewGameHeroStargrow, - hero_levelgrow: cfg.NewGameHeroLevelgrow, - hero_levelup: cfg.NewGameHeroLevelup, - hero_exp: cfg.NewGameHeroExp, - hero_skillup: cfg.NewGameHeroSkillLevel, - game_skillatk: cfg.NewGameSkillAtk, - hero_comatn: cfg.NewGameComAtn, + equip_suit: cfg.NewGameEquipSuit, + new_hero: cfg.NewGameHero, + hero_stargrow: cfg.NewGameHeroStargrow, + hero_levelgrow: cfg.NewGameHeroLevelgrow, + hero_levelup: cfg.NewGameHeroLevelup, + hero_exp: cfg.NewGameHeroExp, + hero_skillup: cfg.NewGameHeroSkillLevel, + game_skillatk: cfg.NewGameSkillAtk, + //hero_comatn: cfg.NewGameComAtn, hero_drawcard: cfg.NewGameDrawCard, hero_fusion: cfg.NewGameHerofusion, hero_starupsp: cfg.NewGameHeroStarupSp, @@ -68,12 +70,15 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp hero_talent: cfg.NewGameHeroTalent, hero_itembox: cfg.NewGameItemBox, game_shopitem: cfg.NewGameShopitem, + hero_skill: cfg.NewGameHeroSkill, }) this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0) configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, this.SetHeroDrawConfig) this.awakenMap = make(map[int64]*cfg.GameHeroAwakenData, 0) configure.RegisterConfigure(hero_awaken, cfg.NewGameHeroAwaken, func() { if v, err := this.GetConfigure(hero_awaken); err == nil { + this.hlock.Lock() + defer this.hlock.Unlock() if _configure, ok := v.(*cfg.GameHeroAwaken); ok { for _, v := range _configure.GetDataList() { this.awakenMap[int64(utils.ToInt32(v.Hid)<<8)+int64(v.Phase)] = v @@ -85,26 +90,14 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) } }) - // 共鸣 - this.resonanceMap = make(map[int64]*cfg.GameHeroResonanceData, 0) - configure.RegisterConfigure(hero_resonance, cfg.NewGameHeroResonance, func() { - if v, err := this.GetConfigure(hero_resonance); err == nil { - if _configure, ok := v.(*cfg.GameHeroResonance); ok { - for _, v := range _configure.GetDataList() { - this.resonanceMap[int64(utils.ToInt32(v.Hid)<<8)+int64(v.Star)] = v - } - return - } - } else { - err = fmt.Errorf("%T no is *cfg.Game_drawCard", v) - } - }) // 升星 this.starMap = make(map[int64]*cfg.GameHeroStarupData, 0) configure.RegisterConfigure(hero_starup, cfg.NewGameHeroStarup, func() { if v, err := this.GetConfigure(hero_starup); err == nil { if _configure, ok := v.(*cfg.GameHeroStarup); ok { + this.hlock.Lock() + defer this.hlock.Unlock() for _, v := range _configure.GetDataList() { this.starMap[int64(utils.ToInt32(v.Id)<<8)+int64(v.Star)] = v } @@ -124,9 +117,15 @@ func (this *configureComp) GetHeroStarupConfig(hid string, star int32) *cfg.Game return this.starMap[int64(utils.ToInt32(hid)<<8)+int64(star)] } -// 通过英雄配置ID获取共鸣配置信息 -func (this *configureComp) GetHeroResonanceConfig(hid string, star int32) *cfg.GameHeroResonanceData { - return this.resonanceMap[int64(utils.ToInt32(hid)<<8)+int64(star)] +// 获取当前英雄最高星级 +func (this *configureComp) GetHeroMaxStar(hid string, curStar int32) int32 { + var star int32 + for star = curStar; star < 100; star++ { + if _, ok := this.starMap[int64(utils.ToInt32(hid)<<8)+int64(star+1)]; !ok { + return star + } + } + return star } func (this *configureComp) GetHeroAwakenConfig(hid string, phase int32) *cfg.GameHeroAwakenData { @@ -376,20 +375,6 @@ func (this *configureComp) GetHeroSkillMaxLvConfig(skillId uint32) int32 { return 0 } -func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.GameComAtnData, err error) { - var ( - v interface{} - ) - if v, err = this.GetConfigure(hero_comatn); err == nil { - if configure, ok := v.(*cfg.GameComAtn); ok { - data = configure.Get("hero_reset") - return - } - } - this.module.Errorf("cfg.GameComAtnData GetHeroResonanceRestConfig:id = hero_reset") - return -} - // 获取卡牌合成配置 func (this *configureComp) GetHeroFucionConfig(cid string) (data *cfg.GameHerofusionData) { @@ -516,3 +501,15 @@ func (this *configureComp) GetEquipsuit(id int32) (configure *cfg.GameEquipSuitD } return } + +func (this *configureComp) GetHeroSkillCost(star int32) (cost []*cfg.Gameatn) { + + if v, err := this.GetConfigure(hero_skill); err == nil { + if configure, ok := v.(*cfg.GameHeroSkill); ok { + return configure.Get(star).Needgold + } + } else { + err = fmt.Errorf("%T no is *cfg.GameHeroExp", v) + } + return +} diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index d5a4ab5d5..1697337f3 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -72,6 +72,12 @@ func GetMonthStartEnd() (int64, int64) { return _d1, _d2 } func Test_Main(t *testing.T) { + + sz := make([]string, 0) + for i := 0; i < 10; i++ { + sz = append(sz, "1") + } + sz[len(sz)-1] = "xxxx" //创建trace文件 f, err := os.Create("trace.out") if err != nil { diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index c1508f357..daa54e1b6 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -96,7 +96,14 @@ func (this *ModelHero) initHeroSkill(hero *pb.DBHero) []*pb.SkillData { } //创建一个指定的英雄 -func (this *ModelHero) createOneHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) { +func (this *ModelHero) createSpecialHero(uid string, heroCfgId string) (hero *pb.DBHero, err error) { + list := this.getHeroList(uid) + for _, v := range list { + if v.HeroID == heroCfgId { + hero = v + return + } + } hero = this.InitHero(uid, heroCfgId) if hero != nil { if err = this.AddList(uid, hero.Id, hero); err != nil { @@ -135,7 +142,7 @@ func (this *ModelHero) initHeroOverlying(uid string, heroCfgId string, count int ) hero = this.InitHero(uid, heroCfgId) if hero != nil { - hero.SameCount = count + hero.SameCount = 1 // 新需求 不需要判断叠加 if this.moduleHero.IsCross() { if model, err = this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { this.moduleHero.Errorln(err) @@ -171,35 +178,38 @@ func (this *ModelHero) createHeroOverlying(uid string, heroCfgId string, count i this.moduleHero.Errorf("err:%v", err) } } + for _, obj := range heros { + if obj.HeroID == heroCfgId { // z + return + } + } + for _, h := range heros { + if h.HeroID == heroCfgId && + h.IsOverlying { + h.SameCount += count + data := map[string]interface{}{ + "sameCount": h.SameCount, //叠加数 + } + hero = h - if len(heros) >= 0 { - for _, h := range heros { - if h.HeroID == heroCfgId && - h.IsOverlying { - h.SameCount += count - data := map[string]interface{}{ - "sameCount": h.SameCount, //叠加数 - } - hero = h - - if this.moduleHero.IsCross() { - if model, err := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { - this.moduleHero.Errorln(err) - } else { - if err := model.ChangeList(uid, h.Id, data); err != nil { - return nil, err - } - } + if this.moduleHero.IsCross() { + if model, err := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { + this.moduleHero.Errorln(err) } else { - if err := this.ChangeList(uid, h.Id, data); err != nil { + if err := model.ChangeList(uid, h.Id, data); err != nil { return nil, err } } - - return + } else { + if err := this.ChangeList(uid, h.Id, data); err != nil { + return nil, err + } } + + return } } + return this.initHeroOverlying(uid, heroCfgId, count) } @@ -308,30 +318,6 @@ func (this *ModelHero) setJuexingProperty(hero *pb.DBHero, key string, value int } } -// 设置共鸣能量点数属性 -func (this *ModelHero) setEnergyProperty(hero *pb.DBHero, star int32) { - - resonConfig := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID, star) - if resonConfig == nil { - return - } - EnergyProperty := make(map[string]int32) //副属性 - for k, v := range hero.Energy { - if k == comm.ResonanceHpPro { - EnergyProperty[comm.Hp] += int32(math.Floor(float64(resonConfig.Hppro*v) / 1000 * float64(hero.Property[comm.Hp]))) - } else if k == comm.ResonanceAtkPro { - EnergyProperty[comm.Atk] += int32(math.Floor(float64(resonConfig.Atkpro*v) / 1000 * float64(hero.Property[comm.Atk]))) - } else if k == comm.ResonanceDefPro { - EnergyProperty[comm.Def] += int32(math.Floor(float64(resonConfig.Defpro*v) / 1000 * float64(hero.Property[comm.Def]))) - } - } - _heroMap := make(map[string]interface{}, 0) - _heroMap["enegryProperty"] = EnergyProperty - if err := this.ChangeList(hero.Uid, hero.Id, _heroMap); err != nil { - this.moduleHero.Errorf("mergeenegryProperty err %v", err) - } -} - // 设置装备属性 func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipment) { @@ -557,7 +543,7 @@ func (this *ModelHero) cleanData(uid string) { } } -func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, exp int32) (newhero *pb.DBHero, curAddExp int32, code pb.ErrorCode) { +func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, exp int32) (curAddExp int32, code pb.ErrorCode) { var ( preLv int32 //加经验之前的等级 curExp int32 // 加经验之后的经验 @@ -613,10 +599,7 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex if curAddExp != 0 { curAddExp = exp // 真正加的经验 } - if hero.SameCount > 1 { //有堆叠的情况 - hero.SameCount -= 1 - newhero = this.CloneNewHero(session.GetUserId(), hero) // 克隆一个新的 - } + this.moduleHero.Debugf("add hero exp :old lv:%d,old exp:%d,new lv:%d,new exp:%d,addexp:%d", hero.Lv, hero.Exp, curLv, curExp, exp) update["lv"] = curLv update["exp"] = curExp @@ -648,12 +631,9 @@ func (this *ModelHero) AddCardExp(session comm.IUserSession, hero *pb.DBHero, ex //xx英雄满级、共鸣、觉醒至最高状态 nextAwaken := this.moduleHero.configure.GetHeroAwakenConfig(hero.HeroID, hero.JuexingLv+1) if nextAwaken == nil { // 达到满级觉醒 - resonConfig := this.moduleHero.configure.GetHeroResonanceConfig(hero.HeroID, cfg.Star) - if resonConfig != nil && resonConfig.Maxnum == hero.ResonateNum { // 共鸣满 - if hero.Lv == hero.Star*comm.HeroStarLvRatio { - this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) - this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) - } + if hero.Lv == hero.Star*comm.HeroStarLvRatio { + this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype37, 1, cfg.Color) + this.moduleHero.ModuleRtask.SendToRtask(session, comm.Rtype38, 1) } } } @@ -881,3 +861,52 @@ func (this *ModelHero) resetTalentProperty(hero *pb.DBHero) { } } + +// 创建一条英雄信息,如果有这个英雄 则转换成对应的碎片 +func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, count int32) (hero *pb.DBHero, bFirst bool, err error) { + heros := make([]*pb.DBHero, 0) + uid := session.GetUserId() + if this.moduleHero.IsCross() { + if dbModel, err := this.moduleHero.GetDBModuleByUid(uid, this.TableName, this.Expired); err != nil { + this.moduleHero.Errorln(err) + + } else { + if err = dbModel.GetList(uid, &heros); err != nil { + this.moduleHero.Errorf("err:%v", err) + } + } + } else { + if err = this.GetList(uid, &heros); err != nil { + this.moduleHero.Errorf("err:%v", err) + } + } + bFirst = true + for _, obj := range heros { + if obj.HeroID == heroCfgId { + hero = obj + bFirst = false + break + } + } + if bFirst { // 没有当前英雄 + count -= 1 + hero, err = this.initHeroOverlying(uid, heroCfgId, 1) + if err != nil { + return + } + } + + // 转碎片处理 + if count > 0 { + heroCfg := this.moduleHero.configure.GetHeroConfig(heroCfgId) + if heroCfg != nil { + res := make([]*cfg.Gameatn, 0) + for i := 0; i < int(count); i++ { + res = append(res, heroCfg.Herofrag...) + } + this.moduleHero.DispenseRes(session, res, true) + } + } + + return +} diff --git a/modules/hero/module.go b/modules/hero/module.go index faf671c6b..9087ac0c5 100644 --- a/modules/hero/module.go +++ b/modules/hero/module.go @@ -76,10 +76,12 @@ func (this *Hero) Start() (err error) { } //创建单个叠加英雄 -func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string, num int32) (hero *pb.DBHero, code pb.ErrorCode) { - var err error - hero, err = this.modelHero.createHeroOverlying(session.GetUserId(), heroCfgId, num) - if err == nil { +func (this *Hero) createRepeatHero(session comm.IUserSession, heroCfgId string, num int32) (hero *pb.DBHero, bFirst bool, code pb.ErrorCode) { + var ( + err error + ) + hero, bFirst, err = this.modelHero.createHero(session, heroCfgId, num) + if err == nil && bFirst { //go func(uid string, heroCfgId string) { // 携程处理 图鉴数据 if db.IsCross() { this.moduleFetter.SendRpcAddHero(session, heroCfgId) @@ -216,23 +218,14 @@ func (this *Hero) GetSpecifiedHero(session comm.IUserSession, heroConfId string, return } // 获取最大星级 - for i := 1; ; i++ { - starConf := this.configure.GetHeroStarupConfig(cid, conf.Star+int32(i)) - if starConf == nil { - break - } - if starConf != nil && starConf.Gold == 0 { - maxStar = star + int32(i) - break - } - } + maxStar = this.configure.GetHeroMaxStar(cid, conf.Star) maxLv := this.configure.GetHeroStargrowConfigByStar(maxStar) // 最大等级 if star > maxStar || lv > maxLv { code = pb.ErrorCode_ReqParameterError return } - hero, err := this.modelHero.createOneHero(session.GetUserId(), heroConfId) + hero, err := this.modelHero.createSpecialHero(session.GetUserId(), heroConfId) if err != nil { return pb.ErrorCode_HeroCreate } @@ -267,47 +260,33 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string] var ( changeList []*pb.DBHero firstGet []string + bFirst bool ) for heroCfgId, num := range heros { if num == 0 { // 数量为0 不做处理 continue } - if hero, code = this.createRepeatHero(session, heroCfgId, num); code != pb.ErrorCode_Success { + if hero, bFirst, code = this.createRepeatHero(session, heroCfgId, num); code != pb.ErrorCode_Success { this.Errorf("create hero %s failed", heroCfgId) - return + continue } - if result, err1 := this.ModuleUser.GetUserExpand(session.GetUserId()); err1 == nil { - initUpdate := map[string]interface{}{} - sz := result.GetTujian() - if len(sz) == 0 { - sz = make(map[string]int32, 0) - } - - if _, ok := result.GetTujian()[heroCfgId]; !ok { - heroConf := this.modelHero.moduleHero.configure.GetHeroConfig(heroCfgId) - if heroConf != nil { - if heroConf.Handbook == -1 { - sz[heroCfgId] = 0 - } else { - sz[heroCfgId] = 1 - } - initUpdate["tujian"] = sz - this.ModuleUser.ChangeUserExpand(session.GetUserId(), initUpdate) - firstGet = append(firstGet, heroCfgId) - } - } + if bFirst { + firstGet = append(firstGet, heroCfgId) + changeList = append(changeList, hero) } - changeList = append(changeList, hero) } - if bPush && len(changeList) > 0 { //推送 - session.SendMsg("hero", "change", &pb.HeroChangePush{List: changeList}) - } - // 首次获得英雄 则推送 - if len(firstGet) > 0 { - session.SendMsg("hero", "firstget", &pb.HeroFirstGetPush{ - HeroId: firstGet, - }) + if bPush { //推送 + if len(changeList) > 0 { + session.SendMsg("hero", "change", &pb.HeroChangePush{List: changeList}) + } + + // 首次获得英雄 则推送 + if len(firstGet) > 0 { + session.SendMsg("hero", "firstget", &pb.HeroFirstGetPush{ + HeroId: firstGet, + }) + } } return @@ -316,7 +295,6 @@ func (this *Hero) CreateRepeatHeros(session comm.IUserSession, heros map[string] func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp int32) (curAddExp int32, code pb.ErrorCode) { var ( _hero *pb.DBHero - newhero *pb.DBHero _changeHero []*pb.DBHero // 变化的英雄 ) if heroObjID == "" { @@ -327,14 +305,12 @@ func (this *Hero) AddHeroExp(session comm.IUserSession, heroObjID string, exp in return } - newhero, curAddExp, code = this.modelHero.AddCardExp(session, _hero, exp) + curAddExp, code = this.modelHero.AddCardExp(session, _hero, exp) if code != pb.ErrorCode_Success { return } _changeHero = append(_changeHero, _hero) // 升级后的英雄 hero id 不变 - if newhero != nil { - _changeHero = append(_changeHero, newhero) // 原来的英雄 只是数量变化了 - } + session.SendMsg(string(this.GetType()), "change", &pb.HeroChangePush{List: _changeHero}) return } @@ -628,11 +604,7 @@ func (this *Hero) CheckLvNum(uid string, lv int32) int32 { } func (this *Hero) GetTujianHeroNum(uid string) int32 { - if result, err1 := this.ModuleUser.GetUserExpand(uid); err1 == nil { - tujian := result.GetTujian() - return int32(len(tujian)) - } - return 0 + return int32(len(this.modelHero.getHeroList(uid))) } ////拥有觉醒至A级的B星英雄N个 @@ -672,16 +644,7 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) { continue // 走到这里说明配置表没有配置数据 } // 获取最大星级 - for i := 1; ; i++ { - starConf := this.configure.GetHeroStarupConfig(cid, v.Star+int32(i)) - if starConf == nil { - break - } - if starConf != nil && starConf.Gold == 0 { - maxStar = v.Star + int32(i) - break - } - } + maxStar = this.configure.GetHeroMaxStar(cid, v.Star) maxLv := this.configure.GetHeroStargrowConfigByStar(maxStar) // 最大等级 @@ -695,7 +658,7 @@ func (this *Hero) GetAllMaxHero(session comm.IUserSession) (code pb.ErrorCode) { } // 开始创建英雄 - hero, err := this.modelHero.createOneHero(session.GetUserId(), v.Hid) + hero, err := this.modelHero.createSpecialHero(session.GetUserId(), v.Hid) if err != nil { return pb.ErrorCode_HeroCreate } @@ -786,3 +749,34 @@ func (this *Hero) SendTaskMsg(session comm.IUserSession, szStar []int32, drawCou } this.ModuleRtask.SendToRtask(session, comm.Rtype89, drawCount) } + +func (this Hero) newCondition(heroRecord *pb.DBHeroRecord) (get bool, starIndex int32) { + inRangeConf := this.configure.GetGlobalConf().DrawCard5StarsInRange + if len(inRangeConf) == 3 { + iStart := inRangeConf[0] // 抽卡开始 + iEnd := inRangeConf[1] // 抽卡结束 + star := inRangeConf[2] + if star >= 3 { // 保底必须三星+ + if heroRecord.Inevitable == 0 && heroRecord.Drawcount > iStart && heroRecord.Drawcount < iEnd && iEnd >= iStart { + n, _ := rand.Int(rand.Reader, big.NewInt(int64(iEnd-iStart))) + if n.Int64() < 1 { // 抽中 + starIndex = star + heroRecord.Inevitable = heroRecord.Drawcount + update := make(map[string]interface{}) + update["inevitable"] = heroRecord.Drawcount + + get = true + } + } + // 保底情况 + if heroRecord.Drawcount == iEnd && heroRecord.Inevitable == 0 { + starIndex = star + heroRecord.Inevitable = heroRecord.Drawcount + + get = true + } + } + } + get = false + return +} diff --git a/modules/mline/api_challengeover.go b/modules/mline/api_challengeover.go index f3fdeb987..3dc3cbc0c 100644 --- a/modules/mline/api_challengeover.go +++ b/modules/mline/api_challengeover.go @@ -175,18 +175,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall }) } } - // 加主角经验 - // if stageConf.Exp > 0 { - // res := make([]*cfg.Gameatn, 0) - // res = append(res, &cfg.Gameatn{ - // A: "attr", - // T: "exp", - // N: stageConf.Exp, - // }) - // if code = this.module.DispenseRes(session, res, true); code != pb.ErrorCode_Success { - // this.module.Debugf("Mline Commonaward DispenseRes err:+%v", res) - // } - // } + // 加英雄经验 if stageConf.HeroExp > 0 { if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { @@ -203,5 +192,38 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.MlineChall // 主线任务统计 Rtype60 this.module.ModuleRtask.SendToRtask(session, comm.Rtype60, 1) this.module.ModuleRtask.SendToRtask(session, comm.Rtype61, int32(req.StageId)) + var ( + ChapterStar int32 + bAll3Star bool + allStar int32 + ) + bAll3Star = true + for _, v1 := range curChapter.Star { + star := 0 + for _, v := range szStar { + if v1&v == v { + ChapterStar++ + star++ + } + } + if star != 3 && bAll3Star { + bAll3Star = false + } + } + + this.module.ModuleRtask.SendToRtask(session, comm.Rtype158, curChapter.ChapterId, ChapterStar) + if bAll3Star { + this.module.ModuleRtask.SendToRtask(session, comm.Rtype159, curChapter.ChapterId) + } + for _, v2 := range list { + for _, v1 := range v2.Star { + for _, v := range szStar { + if v1&v == v { + allStar++ + } + } + } + } + this.module.ModuleRtask.SendToRtask(session, comm.Rtype160, allStar) return } diff --git a/modules/mline/comp_configure.go b/modules/mline/comp_configure.go index 6d71dc235..d89060acb 100644 --- a/modules/mline/comp_configure.go +++ b/modules/mline/comp_configure.go @@ -5,7 +5,6 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" - "sync" ) const ( @@ -18,7 +17,6 @@ const ( type configureComp struct { modules.MCompConfigure module *Mline - hlock sync.RWMutex } //组件初始化接口 diff --git a/modules/modulebase.go b/modules/modulebase.go index 79aea3105..9d0008fff 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -238,26 +238,38 @@ func (this *ModuleBase) SendMsgToCUsers(mainType, subType string, msg proto.Mess // 只校验资源 参数 atn格式 func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn) (code pb.ErrorCode) { - //校验消费资源是否充足 + var ( + items map[string]int32 // 道具背包 批量处理 + attrs map[string]int32 // 属性 + ) + items = make(map[string]int32, 0) + attrs = make(map[string]int32, 0) for _, v := range res { - if v.A == comm.AttrType { //用户属性资源 - if amount := this.ModuleUser.QueryAttributeValue(session.GetUserId(), v.T); amount < int64(v.N) { - code = pb.ErrorCode_ResNoEnough - this.Warnf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N) - return - } - } else if v.A == comm.ItemType { //道具资源 - // if resID, err = strconv.Atoi(v.T); err != nil { - // code = pb.ErrorCode_ConfigurationException - // return - // } - if amount := this.ModuleItems.QueryItemAmount(session.GetUserId(), v.T); amount < uint32(v.N) { - code = pb.ErrorCode_ResNoEnough - this.Warnf("道具不足:A:%s,T:%s,N:%d", v.A, v.T, v.N) - return - } + switch v.A { + case comm.AttrType: + attrs[v.T] = v.N + case comm.ItemType: + items[v.T] = v.N + default: + this.Errorf("not found res type") // 找不到资源类型 } } + // 校验数量 + for k, v := range attrs { + if this.ModuleUser.QueryAttributeValue(session.GetUserId(), k) < int64(v) { + code = pb.ErrorCode_ResNoEnough + this.Warnf("资源不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) + return + } + } + for k, v := range items { //校验消费资源是否充足 + if int32(this.ModuleItems.QueryItemAmount(session.GetUserId(), k)) < v { + code = pb.ErrorCode_ResNoEnough + this.Warnf("道具不足", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "T", Value: k}, log.Field{Key: "N", Value: v}) + return + } + } + return } @@ -274,6 +286,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn switch v.A { case comm.AttrType: attrs[v.T] -= v.N + case comm.ItemType: items[v.T] -= v.N default: diff --git a/modules/rtask/api.go b/modules/rtask/api.go index 861698558..7e0350733 100644 --- a/modules/rtask/api.go +++ b/modules/rtask/api.go @@ -6,13 +6,9 @@ import ( ) const ( - RtaskSubTypeChoose = "choose" //选择 - RtaskSubTypeList = "list" //随机任务列表 - RtaskSubTypeApply = "apply" //做任务 - RtaskSubTypeReward = "getreward" //奖励 - RtaskSubTypeBattleStart = "battlestart" //战斗开始 - RtaskSubTypeBattleFinish = "battlefinish" //战斗完成 - RtaskSubTypeGetrecord = "getrecord" //任务数据 + RtaskSubTypeList = "list" //随机任务列表 + RtaskSubTypeGetrecord = "getrecord" //任务数据 + RtaskSubTypeSend = "send" //触发任务 ) type apiComp struct { diff --git a/modules/rtask/api_send.go b/modules/rtask/api_send.go new file mode 100644 index 000000000..c0d5ffef8 --- /dev/null +++ b/modules/rtask/api_send.go @@ -0,0 +1,29 @@ +package rtask + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.RtaskSendReq) (code pb.ErrorCode) { + if len(req.Params) == 0 || req.TaskType == 0 { + code = pb.ErrorCode_ReqParameterError + } + return +} + +func (this *apiComp) Send(session comm.IUserSession, req *pb.RtaskSendReq) (code pb.ErrorCode, data proto.Message) { + if code = this.moduleRtask.SendToRtask(session, comm.TaskType(req.TaskType), req.Params...); code != pb.ErrorCode_Success { + return + } + + rsp := &pb.RtaskSendResp{ + IsSucc: true, + } + if err := session.SendMsg(string(this.moduleRtask.GetType()), RtaskSubTypeSend, rsp); err != nil { + code = pb.ErrorCode_SystemError + } + return +} diff --git a/modules/sociaty/api_cross_applycancel.go b/modules/sociaty/api_cross_applycancel.go new file mode 100644 index 000000000..10dfac468 --- /dev/null +++ b/modules/sociaty/api_cross_applycancel.go @@ -0,0 +1,52 @@ +package sociaty + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +// 取消公会申请 + +func (this *apiComp) ApplyCancelCheck(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (code pb.ErrorCode) { + if req.SociatyId == "" { + code = pb.ErrorCode_ReqParameterError + this.module.Error("公会申请取消参数错误", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "params", Value: req.String()}) + } + return +} + +func (this *apiComp) ApplyCancel(session comm.IUserSession, req *pb.SociatyApplyCancelReq) (code pb.ErrorCode, data proto.Message) { + if code = this.ApplyCancelCheck(session, req); code != pb.ErrorCode_Success { + return + } + uid := session.GetUserId() + + sociaty := this.module.modelSociaty.getSociaty(req.SociatyId) + if sociaty != nil && sociaty.Id == "" { + code = pb.ErrorCode_SociatyNoFound + this.module.Error("公会未找到", log.Field{Key: "uid", Value: uid}, log.Field{Key: "sociatyId", Value: req.SociatyId}) + return + } + + if err := this.module.modelSociaty.applyCancel(uid, sociaty); err != nil { + code = pb.ErrorCode_DBError + this.module.Error("申请撤销", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "sociatyId", Value: req.SociatyId}, + log.Field{Key: "err", Value: err.Error()}, + ) + return + } + + rsp := &pb.SociatyApplyResp{ + Uid: uid, + ScoiatyId: req.SociatyId, + } + if err := session.SendMsg(string(this.module.GetType()), SociatySubTypeApplyCanel, rsp); err != nil { + code = pb.ErrorCode_SystemError + } + return +} diff --git a/modules/sys/model_sys.go b/modules/sys/model_sys.go index c5d467292..49e4ba6b1 100644 --- a/modules/sys/model_sys.go +++ b/modules/sys/model_sys.go @@ -48,7 +48,7 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri } if user.Lv >= conf.Param { flag = true - }else{ + } else { flag = false } case 2: //关卡ID @@ -66,10 +66,10 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri if v, ok := ex.Mline[1]; ok { if v >= conf.Param { flag = true - }else{ + } else { flag = false } - }else{ + } else { flag = false } @@ -82,12 +82,13 @@ func (this *ModelSys) validCond(uid string, condData *cfg.GameOpencondData) stri } if i, ok := module.(comm.IWorldtask); ok { d := i.GetMyWorldtask(uid) - if _, ok := d.LastTaskIds[conf.Param]; ok { - flag = true - }else{ - flag = false + for _, v := range d.LastTaskIds { + if v.TaskId >= conf.Param { + flag = true + continue + } } - }else{ + } else { flag = false } } diff --git a/modules/user/api_gettujian.go b/modules/user/api_gettujian.go index 7a75b1a1a..81b3b193b 100644 --- a/modules/user/api_gettujian.go +++ b/modules/user/api_gettujian.go @@ -2,7 +2,6 @@ package user import ( "go_dreamfactory/comm" - "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" "google.golang.org/protobuf/proto" @@ -17,21 +16,12 @@ func (this *apiComp) GetTujian(session comm.IUserSession, req *pb.UserGetTujianR return } - uid := session.GetUserId() rsp := &pb.UserGetTujianResp{} - if result, err := this.module.modelExpand.GetUserExpand(uid); err != nil { - this.module.Error("玩家扩展数据", - log.Field{Key: "uid", Value: uid}, - log.Field{Key: "err", Value: err.Error()}, - ) - return - } else { - for k, v := range result.Tujian { - if v == 0 { - rsp.Heroids = append(rsp.Heroids, k) - } - } + list := this.module.ModuleHero.GetHeroList(session.GetUserId()) + for _, v := range list { + rsp.Heroids = append(rsp.Heroids, v.HeroID) } + err := session.SendMsg(string(this.module.GetType()), UserGetTujianResp, rsp) if err != nil { code = pb.ErrorCode_SystemError diff --git a/modules/user/module.go b/modules/user/module.go index 6c8bfbfc4..29db3a3db 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -97,7 +97,7 @@ func (this *User) OnInstallComp() { this.configure = this.RegisterComp(new(configureComp)).(*configureComp) } -//获取用户数据 +// 获取用户数据 func (this *User) GetUser(uid string) (user *pb.DBUser) { var err error if this.IsCross() { @@ -132,7 +132,7 @@ func (this *User) getRemoteUser(uid string) (*pb.DBUser, error) { return reply, nil } -//获取用户会话 +// 获取用户会话 func (this *User) GetUserSession(uid string) *pb.CacheUser { return this.modelSession.getUserSession(uid) } @@ -211,7 +211,7 @@ func (this *User) CrossUserSession(uid string) *pb.CacheUser { return cacheUser } -//跨服搜索用户 +// 跨服搜索用户 func (this *User) CrossSearchUser(nickName string) ([]*pb.DBUser, error) { name := strings.TrimSpace(nickName) if name == "" { @@ -236,7 +236,7 @@ func (this *User) SearchRmoteUser(nickname string) ([]*pb.DBUser, error) { return reply.Users, nil } -//查询用户属性值 例如 金币 经验 +// 查询用户属性值 例如 金币 经验 func (this *User) QueryAttributeValue(uid string, attr string) (value int64) { var ( user *pb.DBUser @@ -272,6 +272,8 @@ func (this *User) QueryAttributeValue(uid string, attr string) (value int64) { return int64(userEx.Arenacoin) case comm.ResFriend: return int64(userEx.FriendPoint) + case comm.Moongold: + return int64(user.Moongold) } return } @@ -315,6 +317,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha Guildcoin: userEx.Guildcoin, Arenacoin: userEx.Arenacoin, Ps: user.Ps, + Moongold: user.Moongold, } switch attr { @@ -350,6 +353,14 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha } } change.Diamond += int64(add) + case comm.Moongold: + if add < 0 { + if user.Moongold+int32(add) < 0 { + code = pb.ErrorCode_UserMoongoldNoEnough + pb.ErrorCode_PayRenewTimeErr.Enum().Descriptor().ReservedNames() + } + } + change.Moongold += int32(add) case comm.ResFriend: if add < 0 { if userEx.FriendPoint+add < 0 { @@ -411,6 +422,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha comm.VipExp: change.Vipexp, comm.StarCoin: change.Starcoin, comm.ResPs: change.Ps, + comm.Moongold: change.Moongold, } //user ex @@ -433,7 +445,7 @@ func (this *User) change(session comm.IUserSession, attr string, add int32) (cha return } -//用户资源 +// 用户资源 func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add int32, bPush bool) (code pb.ErrorCode) { var _change *pb.UserResChangedPush @@ -452,7 +464,7 @@ func (this *User) AddAttributeValue(session comm.IUserSession, attr string, add return } -//用户资源 +// 用户资源 func (this *User) AddAttributeValues(session comm.IUserSession, attrs map[string]int32, bPush bool) (code pb.ErrorCode) { for key, add := range attrs { var _change *pb.UserResChangedPush @@ -628,16 +640,18 @@ func (this *User) RpcQueryUser(ctx context.Context, req *pb.NameReq, reply *pb.U } func (this *User) CheckTujianHero(session comm.IUserSession, heros []string) []bool { sz := make([]bool, len(heros)) - - userEx, err := this.GetUserExpand(session.GetUserId()) - if err != nil { - return sz - } - for i, heroid := range heros { - if _, ok := userEx.Tujian[heroid]; ok { - sz[i] = true + index := 0 + list := this.ModuleHero.GetHeroList(session.GetUserId()) + for _, v1 := range heros { + for _, h := range list { + if v1 == h.HeroID { + sz[index] = true + index++ + break + } } } + return sz } diff --git a/modules/worldtask/api_battlestart.go b/modules/worldtask/api_battlestart.go index 642f9e9f3..f54079ab0 100644 --- a/modules/worldtask/api_battlestart.go +++ b/modules/worldtask/api_battlestart.go @@ -47,11 +47,11 @@ func (this *apiComp) Battlestart(session comm.IUserSession, req *pb.WorldtaskBat resp *pb.WorldtaskBattleStartResp ) code, record = b.CreateEveBattle(session, &pb.BattleEVEReq{ - Ptype: pb.PlayType_rtask, - Format: req.Battle, - Sysformat: []int32{battleConf.DefaultHero}, - Backupformat: []int32{battleConf.AssistTeam}, - Buleformat: battleConf.FormatList, + Ptype: pb.PlayType_rtask, + Format: req.Battle, + // Sysformat: []int32{battleConf.DefaultHero}, + // Backupformat: []int32{battleConf.AssistTeam}, + Buleformat: battleConf.FormatList, }) if code != pb.ErrorCode_Success { diff --git a/pb/arena_msg.pb.go b/pb/arena_msg.pb.go index 1d8ebd269..77e1cbeb5 100644 --- a/pb/arena_msg.pb.go +++ b/pb/arena_msg.pb.go @@ -1292,6 +1292,224 @@ func (x *ArenaPlotRewardResp) GetNpc() map[int32]*DBNpc { return nil } +<<<<<<< HEAD +======= +//实时pvp推送 +type ArenaRTimePvpPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RoomId string `protobuf:"bytes,1,opt,name=RoomId,proto3" json:"RoomId"` + ServicePath string `protobuf:"bytes,2,opt,name=servicePath,proto3" json:"servicePath"` + Info *BattleInfo `protobuf:"bytes,3,opt,name=info,proto3" json:"info"` +} + +func (x *ArenaRTimePvpPush) Reset() { + *x = ArenaRTimePvpPush{} + if protoimpl.UnsafeEnabled { + mi := &file_arena_arena_msg_proto_msgTypes[24] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ArenaRTimePvpPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ArenaRTimePvpPush) ProtoMessage() {} + +func (x *ArenaRTimePvpPush) ProtoReflect() protoreflect.Message { + mi := &file_arena_arena_msg_proto_msgTypes[24] + 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 ArenaRTimePvpPush.ProtoReflect.Descriptor instead. +func (*ArenaRTimePvpPush) Descriptor() ([]byte, []int) { + return file_arena_arena_msg_proto_rawDescGZIP(), []int{24} +} + +func (x *ArenaRTimePvpPush) GetRoomId() string { + if x != nil { + return x.RoomId + } + return "" +} + +func (x *ArenaRTimePvpPush) GetServicePath() string { + if x != nil { + return x.ServicePath + } + return "" +} + +func (x *ArenaRTimePvpPush) GetInfo() *BattleInfo { + if x != nil { + return x.Info + } + return nil +} + +//实时pvp 指令请求 +type ArenaRtPvpCmdReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + RoomId string `protobuf:"bytes,1,opt,name=RoomId,proto3" json:"RoomId"` + CmdType string `protobuf:"bytes,2,opt,name=CmdType,proto3" json:"CmdType"` + Cmd []byte `protobuf:"bytes,3,opt,name=Cmd,proto3" json:"Cmd"` +} + +func (x *ArenaRtPvpCmdReq) Reset() { + *x = ArenaRtPvpCmdReq{} + if protoimpl.UnsafeEnabled { + mi := &file_arena_arena_msg_proto_msgTypes[25] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ArenaRtPvpCmdReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ArenaRtPvpCmdReq) ProtoMessage() {} + +func (x *ArenaRtPvpCmdReq) ProtoReflect() protoreflect.Message { + mi := &file_arena_arena_msg_proto_msgTypes[25] + 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 ArenaRtPvpCmdReq.ProtoReflect.Descriptor instead. +func (*ArenaRtPvpCmdReq) Descriptor() ([]byte, []int) { + return file_arena_arena_msg_proto_rawDescGZIP(), []int{25} +} + +func (x *ArenaRtPvpCmdReq) GetRoomId() string { + if x != nil { + return x.RoomId + } + return "" +} + +func (x *ArenaRtPvpCmdReq) GetCmdType() string { + if x != nil { + return x.CmdType + } + return "" +} + +func (x *ArenaRtPvpCmdReq) GetCmd() []byte { + if x != nil { + return x.Cmd + } + return nil +} + +//实时pvp 指令请求回应 +type ArenaRtPvpCmdResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + IsSucc bool `protobuf:"varint,1,opt,name=IsSucc,proto3" json:"IsSucc"` +} + +func (x *ArenaRtPvpCmdResp) Reset() { + *x = ArenaRtPvpCmdResp{} + if protoimpl.UnsafeEnabled { + mi := &file_arena_arena_msg_proto_msgTypes[26] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ArenaRtPvpCmdResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ArenaRtPvpCmdResp) ProtoMessage() {} + +func (x *ArenaRtPvpCmdResp) ProtoReflect() protoreflect.Message { + mi := &file_arena_arena_msg_proto_msgTypes[26] + 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 ArenaRtPvpCmdResp.ProtoReflect.Descriptor instead. +func (*ArenaRtPvpCmdResp) Descriptor() ([]byte, []int) { + return file_arena_arena_msg_proto_rawDescGZIP(), []int{26} +} + +func (x *ArenaRtPvpCmdResp) GetIsSucc() bool { + if x != nil { + return x.IsSucc + } + return false +} + +//实时Pvp 指令推送 +type ArenaRtPvpCmdPush struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *ArenaRtPvpCmdPush) Reset() { + *x = ArenaRtPvpCmdPush{} + if protoimpl.UnsafeEnabled { + mi := &file_arena_arena_msg_proto_msgTypes[27] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *ArenaRtPvpCmdPush) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*ArenaRtPvpCmdPush) ProtoMessage() {} + +func (x *ArenaRtPvpCmdPush) ProtoReflect() protoreflect.Message { + mi := &file_arena_arena_msg_proto_msgTypes[27] + 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 ArenaRtPvpCmdPush.ProtoReflect.Descriptor instead. +func (*ArenaRtPvpCmdPush) Descriptor() ([]byte, []int) { + return file_arena_arena_msg_proto_rawDescGZIP(), []int{27} +} + +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 var File_arena_arena_msg_proto protoreflect.FileDescriptor var file_arena_arena_msg_proto_rawDesc = []byte{ @@ -1406,8 +1624,29 @@ var file_arena_arena_msg_proto_rawDesc = []byte{ 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x06, 0x2e, 0x44, 0x42, 0x4e, 0x70, 0x63, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, +<<<<<<< HEAD 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +======= + 0x01, 0x22, 0x6e, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x54, 0x69, 0x6d, 0x65, 0x50, + 0x76, 0x70, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x20, + 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x61, 0x74, 0x68, + 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, + 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, + 0x6f, 0x22, 0x56, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, 0x74, 0x50, 0x76, 0x70, 0x43, + 0x6d, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x52, 0x6f, 0x6f, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, + 0x07, 0x43, 0x6d, 0x64, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, + 0x43, 0x6d, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x43, 0x6d, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x43, 0x6d, 0x64, 0x22, 0x2b, 0x0a, 0x11, 0x41, 0x72, 0x65, + 0x6e, 0x61, 0x52, 0x74, 0x50, 0x76, 0x70, 0x43, 0x6d, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, + 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, + 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x13, 0x0a, 0x11, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x52, + 0x74, 0x50, 0x76, 0x70, 0x43, 0x6d, 0x64, 0x50, 0x75, 0x73, 0x68, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 } var ( @@ -1422,7 +1661,11 @@ func file_arena_arena_msg_proto_rawDescGZIP() []byte { return file_arena_arena_msg_proto_rawDescData } +<<<<<<< HEAD var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 25) +======= +var file_arena_arena_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 29) +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 var file_arena_arena_msg_proto_goTypes = []interface{}{ (*ArenaInfoReq)(nil), // 0: ArenaInfoReq (*ArenaInfoResp)(nil), // 1: ArenaInfoResp @@ -1448,6 +1691,7 @@ var file_arena_arena_msg_proto_goTypes = []interface{}{ (*ArenaPlotResp)(nil), // 21: ArenaPlotResp (*ArenaPlotRewardReq)(nil), // 22: ArenaPlotRewardReq (*ArenaPlotRewardResp)(nil), // 23: ArenaPlotRewardResp +<<<<<<< HEAD nil, // 24: ArenaPlotRewardResp.NpcEntry (*DBArenaUser)(nil), // 25: DBArenaUser (*ArenaPlayer)(nil), // 26: ArenaPlayer @@ -1478,6 +1722,43 @@ var file_arena_arena_msg_proto_depIdxs = []int32{ 15, // [15:15] is the sub-list for extension type_name 15, // [15:15] is the sub-list for extension extendee 0, // [0:15] is the sub-list for field type_name +======= + (*ArenaRTimePvpPush)(nil), // 24: ArenaRTimePvpPush + (*ArenaRtPvpCmdReq)(nil), // 25: ArenaRtPvpCmdReq + (*ArenaRtPvpCmdResp)(nil), // 26: ArenaRtPvpCmdResp + (*ArenaRtPvpCmdPush)(nil), // 27: ArenaRtPvpCmdPush + nil, // 28: ArenaPlotRewardResp.NpcEntry + (*DBArenaUser)(nil), // 29: DBArenaUser + (*ArenaPlayer)(nil), // 30: ArenaPlayer + (*BattleFormation)(nil), // 31: BattleFormation + (ErrorCode)(0), // 32: ErrorCode + (*BattleInfo)(nil), // 33: BattleInfo + (*BattleReport)(nil), // 34: BattleReport + (*DBNpc)(nil), // 35: DBNpc +} +var file_arena_arena_msg_proto_depIdxs = []int32{ + 29, // 0: ArenaInfoResp.info:type_name -> DBArenaUser + 29, // 1: ArenaOtherInfoResp.info:type_name -> DBArenaUser + 30, // 2: ArenaMatcheResp.players:type_name -> ArenaPlayer + 31, // 3: ArenaChallengeReq.battle:type_name -> BattleFormation + 32, // 4: ArenaChallengeResp.code:type_name -> ErrorCode + 33, // 5: ArenaChallengeResp.info:type_name -> BattleInfo + 34, // 6: ArenaChallengeRewardReq.report:type_name -> BattleReport + 30, // 7: ArenaRankResp.players:type_name -> ArenaPlayer + 29, // 8: ArenaRankResp.info:type_name -> DBArenaUser + 31, // 9: ArenaPlotReq.battle:type_name -> BattleFormation + 32, // 10: ArenaPlotResp.code:type_name -> ErrorCode + 33, // 11: ArenaPlotResp.info:type_name -> BattleInfo + 34, // 12: ArenaPlotRewardReq.report:type_name -> BattleReport + 28, // 13: ArenaPlotRewardResp.npc:type_name -> ArenaPlotRewardResp.NpcEntry + 33, // 14: ArenaRTimePvpPush.info:type_name -> BattleInfo + 35, // 15: ArenaPlotRewardResp.NpcEntry.value:type_name -> DBNpc + 16, // [16:16] is the sub-list for method output_type + 16, // [16:16] is the sub-list for method input_type + 16, // [16:16] is the sub-list for extension type_name + 16, // [16:16] is the sub-list for extension extendee + 0, // [0:16] is the sub-list for field type_name +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 } func init() { file_arena_arena_msg_proto_init() } @@ -1777,6 +2058,57 @@ func file_arena_arena_msg_proto_init() { return nil } } +<<<<<<< HEAD +======= + file_arena_arena_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ArenaRTimePvpPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_arena_arena_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ArenaRtPvpCmdReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_arena_arena_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ArenaRtPvpCmdResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_arena_arena_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ArenaRtPvpCmdPush); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 } type x struct{} out := protoimpl.TypeBuilder{ @@ -1784,7 +2116,11 @@ func file_arena_arena_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_arena_arena_msg_proto_rawDesc, NumEnums: 0, +<<<<<<< HEAD NumMessages: 25, +======= + NumMessages: 29, +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 NumExtensions: 0, NumServices: 0, }, diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index e5617e963..2e3cc1f51 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -69,6 +69,7 @@ const ( ErrorCode_UserArenaCoinNoEnough ErrorCode = 1016 //竞技场币不足 ErrorCode_UserVitNoEnough ErrorCode = 1017 //体力不足 ErrorCode_UserVitLimit ErrorCode = 1018 //体力达到最大上限 + ErrorCode_UserMoongoldNoEnough ErrorCode = 1019 //纯净月髓不足 // friend ErrorCode_FriendNotSelf ErrorCode = 1100 //不能是自己 ErrorCode_FriendSelfMax ErrorCode = 1101 //超出好友最大数量 @@ -355,6 +356,7 @@ var ( 1016: "UserArenaCoinNoEnough", 1017: "UserVitNoEnough", 1018: "UserVitLimit", + 1019: "UserMoongoldNoEnough", 1100: "FriendNotSelf", 1101: "FriendSelfMax", 1102: "FriendTargetMax", @@ -609,6 +611,7 @@ var ( "UserArenaCoinNoEnough": 1016, "UserVitNoEnough": 1017, "UserVitLimit": 1018, + "UserMoongoldNoEnough": 1019, "FriendNotSelf": 1100, "FriendSelfMax": 1101, "FriendTargetMax": 1102, @@ -851,7 +854,11 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, +<<<<<<< HEAD 0x6f, 0x2a, 0xbc, 0x2d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, +======= + 0x6f, 0x2a, 0xa6, 0x2d, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -907,172 +914,146 @@ var file_errorcode_proto_rawDesc = []byte{ 0x69, 0x6e, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf8, 0x07, 0x12, 0x14, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x74, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xf9, 0x07, 0x12, 0x11, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x74, 0x4c, 0x69, - 0x6d, 0x69, 0x74, 0x10, 0xfa, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x4e, 0x6f, 0x74, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, - 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, - 0x78, 0x10, 0xce, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, - 0x6c, 0x66, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, - 0x61, 0x10, 0xd0, 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, - 0x74, 0x10, 0xd1, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, - 0x70, 0x6c, 0x79, 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, - 0xd3, 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, - 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x10, 0xd5, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, - 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x10, 0xd7, 0x08, 0x12, 0x10, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, - 0x61, 0x6e, 0x65, 0x64, 0x10, 0xd8, 0x08, 0x12, 0x16, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, - 0x64, 0x5a, 0x61, 0x6e, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, - 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, - 0x10, 0xda, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, - 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, - 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, - 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, - 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, - 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, - 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, - 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, - 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, - 0x70, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, - 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, - 0xb5, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x75, 0x79, 0x50, 0x73, - 0x55, 0x70, 0x70, 0x65, 0x72, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xb6, 0x09, 0x12, 0x10, 0x0a, - 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12, - 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, - 0x95, 0x0a, 0x12, 0x0e, 0x0a, 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, - 0x96, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x10, 0x97, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, - 0x6c, 0x6f, 0x72, 0x45, 0x72, 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, - 0x6f, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14, - 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, - 0x65, 0x10, 0x9a, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, - 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72, - 0x6f, 0x4e, 0x6f, 0x74, 0x4e, 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, - 0x10, 0x9c, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65, - 0x72, 0x67, 0x79, 0x10, 0x9d, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x10, 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45, - 0x71, 0x75, 0x69, 0x70, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a, - 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, - 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, - 0xa1, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, - 0x6e, 0x74, 0x10, 0xa2, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73, - 0x74, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, - 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a, - 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12, - 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, - 0x72, 0x10, 0xa6, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d, - 0x61, 0x78, 0x45, 0x78, 0x70, 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, - 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d, - 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a, - 0x12, 0x19, 0x0a, 0x14, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, - 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, - 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a, - 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b, - 0x6f, 0x6e, 0x67, 0x46, 0x75, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x13, - 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, - 0x10, 0xad, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, - 0x4f, 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, - 0x10, 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, - 0x4c, 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, - 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, - 0x57, 0x6f, 0x72, 0x6e, 0x10, 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, - 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, - 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, - 0x69, 0x6e, 0x64, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, - 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, - 0x64, 0x10, 0xdd, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, - 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, - 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, - 0x6e, 0x64, 0x10, 0xdf, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, - 0x65, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, - 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, - 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x19, 0x0a, - 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, - 0x68, 0x53, 0x74, 0x61, 0x72, 0x10, 0xe2, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, - 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, - 0x65, 0x73, 0x65, 0x74, 0x10, 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, - 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, - 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, - 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, - 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, - 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, - 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, - 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, - 0x68, 0x65, 0x64, 0x10, 0xc7, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, - 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, - 0x6b, 0x54, 0x61, 0x67, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, - 0x54, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, - 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, - 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, - 0x53, 0x6f, 0x6c, 0x64, 0x4f, 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, - 0x6f, 0x70, 0x4e, 0x6f, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, - 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, - 0x45, 0x72, 0x72, 0x10, 0x88, 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, - 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, - 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, - 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, - 0x72, 0x64, 0x45, 0x72, 0x72, 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, - 0x64, 0x61, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, - 0x0e, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, - 0x4e, 0x6f, 0x74, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, - 0x0a, 0x10, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, - 0x73, 0x65, 0x10, 0xd1, 0x0f, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, - 0x68, 0x61, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, - 0x1a, 0x0a, 0x15, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, - 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, - 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, - 0x69, 0x6d, 0x65, 0x10, 0xb5, 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, - 0x74, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, - 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, - 0x99, 0x11, 0x12, 0x14, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, - 0x6b, 0x4e, 0x6f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, - 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, - 0x15, 0x0a, 0x10, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, - 0x69, 0x73, 0x68, 0x10, 0x9d, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, - 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, - 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, - 0x10, 0x9f, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, - 0x69, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, - 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, - 0x0e, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, - 0xfe, 0x11, 0x12, 0x16, 0x0a, 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, - 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, - 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, - 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, - 0x64, 0x10, 0xe1, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, - 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, - 0x70, 0x10, 0xe3, 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, - 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, - 0x12, 0x12, 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, - 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, - 0x6f, 0x69, 0x6e, 0x10, 0xe6, 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, - 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x73, 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, - 0x6c, 0x65, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, - 0xc5, 0x13, 0x12, 0x1a, 0x0a, 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, - 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, - 0x0a, 0x12, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, - 0x65, 0x69, 0x76, 0x65, 0x10, 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, - 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, - 0x45, 0x6e, 0x74, 0x65, 0x72, 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, - 0x73, 0x74, 0x6f, 0x72, 0x79, 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, - 0x65, 0x6e, 0x10, 0xac, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, - 0x72, 0x79, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, - 0xad, 0x14, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, - 0x72, 0x72, 0x10, 0x8d, 0x15, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, - 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, - 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x10, 0x8f, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, + 0x6d, 0x69, 0x74, 0x10, 0xfa, 0x07, 0x12, 0x19, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, + 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xfb, + 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, 0x53, 0x65, + 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, + 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, 0x72, 0x69, + 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, 0x08, 0x12, + 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, 0x6f, 0x44, + 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, 0x08, 0x12, + 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, 0x08, 0x12, + 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x59, 0x65, + 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, + 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, 0x19, 0x0a, + 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, 0x6c, 0x61, + 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, 0x08, 0x12, + 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x4d, 0x61, + 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, + 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xd7, 0x08, + 0x12, 0x10, 0x0a, 0x0b, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x65, 0x64, 0x10, + 0xd8, 0x08, 0x12, 0x16, 0x0a, 0x11, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xd9, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x5a, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xda, 0x08, 0x12, 0x15, + 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x69, 0x6d, + 0x69, 0x74, 0x10, 0xdb, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, + 0x6f, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x64, 0x10, 0xdc, 0x08, 0x12, 0x12, 0x0a, 0x0d, + 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, + 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, + 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, + 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, + 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, + 0x65, 0x6d, 0x73, 0x55, 0x73, 0x65, 0x4e, 0x6f, 0x74, 0x53, 0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, + 0x65, 0x64, 0x10, 0xb4, 0x09, 0x12, 0x16, 0x0a, 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x55, 0x73, + 0x65, 0x4e, 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xb5, 0x09, 0x12, 0x19, 0x0a, + 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x75, 0x79, 0x50, 0x73, 0x55, 0x70, 0x70, 0x65, 0x72, + 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xb6, 0x09, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, + 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, + 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x95, 0x0a, 0x12, 0x0e, 0x0a, + 0x09, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0x96, 0x0a, 0x12, 0x12, 0x0a, + 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x6e, 0x69, 0x74, 0x43, 0x72, 0x65, 0x61, 0x74, 0x10, 0x97, + 0x0a, 0x12, 0x11, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x45, 0x72, + 0x72, 0x10, 0x98, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 0x55, 0x70, 0x45, 0x72, 0x72, 0x10, 0x99, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, + 0x6f, 0x4d, 0x61, 0x78, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9a, 0x0a, 0x12, + 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, + 0x65, 0x10, 0x9b, 0x0a, 0x12, 0x18, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x74, 0x4e, + 0x65, 0x65, 0x64, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x74, 0x65, 0x10, 0x9c, 0x0a, 0x12, 0x11, + 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x10, 0x9d, + 0x0a, 0x12, 0x0f, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x10, + 0x9e, 0x0a, 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x71, 0x75, 0x69, 0x70, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x10, 0x9f, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, + 0x4d, 0x61, 0x78, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x10, 0xa0, 0x0a, 0x12, 0x0f, 0x0a, 0x0a, + 0x48, 0x65, 0x72, 0x6f, 0x49, 0x73, 0x4c, 0x6f, 0x63, 0x6b, 0x10, 0xa1, 0x0a, 0x12, 0x11, 0x0a, + 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xa2, 0x0a, + 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x73, 0x74, 0x54, 0x79, 0x70, 0x65, + 0x45, 0x72, 0x72, 0x10, 0xa3, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, + 0x61, 0x72, 0x45, 0x72, 0x72, 0x10, 0xa4, 0x0a, 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, + 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa5, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, + 0x72, 0x6f, 0x45, 0x78, 0x70, 0x54, 0x79, 0x70, 0x65, 0x45, 0x72, 0x72, 0x10, 0xa6, 0x0a, 0x12, + 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x64, 0x64, 0x4d, 0x61, 0x78, 0x45, 0x78, 0x70, + 0x10, 0xa7, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x61, 0x72, 0x4c, + 0x76, 0x45, 0x72, 0x72, 0x10, 0xa8, 0x0a, 0x12, 0x12, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x4d, + 0x61, 0x78, 0x53, 0x74, 0x61, 0x72, 0x4c, 0x76, 0x10, 0xa9, 0x0a, 0x12, 0x19, 0x0a, 0x14, 0x44, + 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0xaa, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x4d, 0x61, + 0x78, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x4c, 0x76, 0x10, 0xab, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x48, + 0x65, 0x72, 0x6f, 0x41, 0x6c, 0x72, 0x65, 0x61, 0x64, 0x79, 0x4b, 0x6f, 0x6e, 0x67, 0x46, 0x75, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x10, 0xac, 0x0a, 0x12, 0x13, 0x0a, 0x0e, 0x48, 0x65, 0x72, + 0x6f, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xad, 0x0a, 0x12, 0x1e, + 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, 0x46, 0x6f, 0x75, + 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, 0x0a, 0x12, 0x1c, + 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, 0x6c, 0x69, 0x6d, + 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x12, 0x14, 0x0a, 0x0f, + 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x73, 0x57, 0x6f, 0x72, 0x6e, 0x10, + 0xfa, 0x0a, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4e, + 0x6f, 0x43, 0x61, 0x6e, 0x53, 0x65, 0x6c, 0x6c, 0x10, 0xfb, 0x0a, 0x12, 0x1b, 0x0a, 0x16, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x69, 0x6e, 0x64, 0x43, 0x68, + 0x61, 0x70, 0x74, 0x65, 0x72, 0x10, 0xdc, 0x0b, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xdd, 0x0b, 0x12, + 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0xde, 0x0b, 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, + 0x6e, 0x65, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xdf, 0x0b, + 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x70, 0x65, + 0x61, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe0, 0x0b, 0x12, 0x1b, 0x0a, 0x16, 0x4d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe1, 0x0b, 0x12, 0x19, 0x0a, 0x14, 0x4d, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x53, 0x74, 0x61, 0x72, + 0x10, 0xe2, 0x0b, 0x12, 0x0d, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x49, 0x6e, 0x69, 0x74, 0x10, + 0xc0, 0x0c, 0x12, 0x0e, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x73, 0x65, 0x74, 0x10, + 0xc1, 0x0c, 0x12, 0x0f, 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, + 0x10, 0xc2, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x64, 0x10, 0xc3, 0x0c, 0x12, 0x13, 0x0a, 0x0e, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, + 0x74, 0x69, 0x76, 0x65, 0x49, 0x6e, 0x69, 0x74, 0x10, 0xc4, 0x0c, 0x12, 0x16, 0x0a, 0x11, 0x54, + 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x4e, 0x6f, 0x66, 0x6f, 0x75, 0x6e, 0x64, + 0x10, 0xc5, 0x0c, 0x12, 0x17, 0x0a, 0x12, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x76, + 0x65, 0x4e, 0x6f, 0x65, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xc6, 0x0c, 0x12, 0x13, 0x0a, 0x0e, + 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xc7, + 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, + 0x64, 0x10, 0xc8, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x61, 0x67, 0x45, + 0x6d, 0x70, 0x74, 0x79, 0x10, 0xc9, 0x0c, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x61, 0x73, 0x6b, 0x49, + 0x64, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, 0xca, 0x0c, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x61, 0x73, + 0x6b, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xcb, 0x0c, 0x12, 0x17, 0x0a, 0x12, + 0x53, 0x68, 0x6f, 0x70, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x73, 0x53, 0x6f, 0x6c, 0x64, 0x4f, + 0x75, 0x74, 0x10, 0xa4, 0x0d, 0x12, 0x1c, 0x0a, 0x17, 0x53, 0x68, 0x6f, 0x70, 0x4e, 0x6f, 0x53, + 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, + 0x10, 0xa5, 0x0d, 0x12, 0x0c, 0x0a, 0x07, 0x4d, 0x61, 0x69, 0x6c, 0x45, 0x72, 0x72, 0x10, 0x88, + 0x0e, 0x12, 0x13, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x4e, 0x6f, 0x74, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0xec, 0x0e, 0x12, 0x12, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, + 0x4c, 0x65, 0x76, 0x6c, 0x45, 0x72, 0x72, 0x10, 0xed, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, + 0x67, 0x6f, 0x64, 0x61, 0x47, 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x72, 0x72, + 0x10, 0xee, 0x0e, 0x12, 0x17, 0x0a, 0x12, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x43, 0x6f, 0x6e, + 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x72, 0x72, 0x10, 0xef, 0x0e, 0x12, 0x1b, 0x0a, 0x16, + 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x74, 0x55, 0x6e, + 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd0, 0x0f, 0x12, 0x15, 0x0a, 0x10, 0x4d, 0x61, 0x72, + 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x49, 0x6e, 0x55, 0x73, 0x65, 0x10, 0xd1, 0x0f, + 0x12, 0x18, 0x0a, 0x13, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x55, + 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x10, 0xd2, 0x0f, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x61, + 0x72, 0x74, 0x69, 0x61, 0x6c, 0x68, 0x61, 0x6c, 0x6c, 0x4e, 0x6f, 0x55, 0x6e, 0x6c, 0x6f, 0x63, + 0x6b, 0x65, 0x64, 0x10, 0xd3, 0x0f, 0x12, 0x19, 0x0a, 0x14, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, + 0x74, 0x4d, 0x6f, 0x72, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x10, 0xb5, + 0x10, 0x12, 0x16, 0x0a, 0x11, 0x47, 0x6f, 0x75, 0x72, 0x6d, 0x65, 0x74, 0x53, 0x6b, 0x69, 0x6c, + 0x6c, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xb6, 0x10, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, + 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0x99, 0x11, 0x12, 0x14, 0x0a, + 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x55, 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, + 0x10, 0x9a, 0x11, 0x12, 0x11, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x52, 0x74, + 0x61, 0x73, 0x6b, 0x10, 0x9b, 0x11, 0x12, 0x12, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, + 0x65, 0x77, 0x61, 0x72, 0x64, 0x65, 0x64, 0x10, 0x9c, 0x11, 0x12, 0x15, 0x0a, 0x10, 0x52, 0x74, + 0x61, 0x73, 0x6b, 0x50, 0x72, 0x65, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0x9d, + 0x11, 0x12, 0x16, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, + 0x6f, 0x52, 0x65, 0x61, 0x63, 0x68, 0x10, 0x9e, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x52, 0x74, 0x61, + 0x73, 0x6b, 0x4e, 0x6f, 0x4c, 0x61, 0x73, 0x74, 0x4f, 0x6e, 0x65, 0x10, 0x9f, 0x11, 0x12, 0x16, + 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x4e, 0x6f, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0xa0, 0x11, 0x12, 0x10, 0x0a, 0x0b, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, + 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0xfd, 0x11, 0x12, 0x13, 0x0a, 0x0e, 0x56, 0x69, 0x6b, 0x69, + 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, 0x70, 0x65, 0x10, 0xfe, 0x11, 0x12, 0x16, 0x0a, + 0x11, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x10, 0xff, 0x11, 0x12, 0x1c, 0x0a, 0x17, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, +<<<<<<< HEAD 0x10, 0x90, 0x15, 0x12, 0x1c, 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, 0x72, @@ -1216,6 +1197,177 @@ var file_errorcode_proto_rawDesc = []byte{ 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +======= + 0x10, 0x80, 0x12, 0x12, 0x1a, 0x0a, 0x15, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, + 0x73, 0x79, 0x48, 0x61, 0x73, 0x45, 0x78, 0x70, 0x69, 0x72, 0x65, 0x64, 0x10, 0xe1, 0x12, 0x12, + 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4a, 0x6f, + 0x69, 0x6e, 0x55, 0x70, 0x10, 0xe2, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, + 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x44, 0x61, 0x72, 0x65, 0x55, 0x70, 0x10, 0xe3, 0x12, 0x12, + 0x1b, 0x0a, 0x16, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, + 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x45, 0x6e, 0x64, 0x10, 0xe4, 0x12, 0x12, 0x1b, 0x0a, 0x16, + 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xe5, 0x12, 0x12, 0x16, 0x0a, 0x11, 0x4d, 0x6f, 0x6f, + 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x4e, 0x6f, 0x4a, 0x6f, 0x69, 0x6e, 0x10, 0xe6, + 0x12, 0x12, 0x20, 0x0a, 0x1b, 0x4d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, + 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x73, + 0x10, 0xe7, 0x12, 0x12, 0x18, 0x0a, 0x13, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x46, + 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x10, 0xc5, 0x13, 0x12, 0x1a, 0x0a, + 0x15, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x46, 0x69, + 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xa9, 0x14, 0x12, 0x17, 0x0a, 0x12, 0x4c, 0x69, 0x6e, + 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x4e, 0x6f, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, + 0xaa, 0x14, 0x12, 0x1f, 0x0a, 0x1a, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x54, + 0x61, 0x73, 0x6b, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x45, 0x6e, 0x74, 0x65, 0x72, + 0x10, 0xab, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, + 0x43, 0x68, 0x61, 0x70, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x4f, 0x70, 0x65, 0x6e, 0x10, 0xac, 0x14, + 0x12, 0x1b, 0x0a, 0x16, 0x4c, 0x69, 0x6e, 0x65, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x65, + 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x10, 0xad, 0x14, 0x12, 0x11, 0x0a, + 0x0c, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x8d, 0x15, + 0x12, 0x14, 0x0a, 0x0f, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x42, 0x6f, 0x6f, 0x73, 0x54, + 0x79, 0x70, 0x65, 0x10, 0x8e, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, + 0x67, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x8f, 0x15, 0x12, + 0x1d, 0x0a, 0x18, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, + 0x6c, 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x90, 0x15, 0x12, 0x1c, + 0x0a, 0x17, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, + 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x91, 0x15, 0x12, 0x11, 0x0a, 0x0c, + 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4c, 0x76, 0x45, 0x72, 0x72, 0x10, 0x97, 0x15, 0x12, + 0x14, 0x0a, 0x0f, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x42, 0x6f, 0x6f, 0x73, 0x54, 0x79, + 0x70, 0x65, 0x10, 0x98, 0x15, 0x12, 0x17, 0x0a, 0x12, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, + 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x99, 0x15, 0x12, 0x1d, + 0x0a, 0x18, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4d, 0x61, 0x78, 0x43, 0x68, 0x61, 0x6c, + 0x6c, 0x65, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9a, 0x15, 0x12, 0x1c, 0x0a, + 0x17, 0x45, 0x6e, 0x63, 0x68, 0x61, 0x6e, 0x74, 0x4e, 0x6f, 0x43, 0x68, 0x61, 0x6c, 0x6c, 0x65, + 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x9b, 0x15, 0x12, 0x11, 0x0a, 0x0c, 0x4c, + 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4d, 0x61, 0x78, 0x4c, 0x76, 0x10, 0xf1, 0x15, 0x12, 0x12, + 0x0a, 0x0d, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, + 0xf2, 0x15, 0x12, 0x16, 0x0a, 0x11, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xf3, 0x15, 0x12, 0x12, 0x0a, 0x0d, 0x4c, 0x69, + 0x62, 0x72, 0x61, 0x72, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xf4, 0x15, 0x12, 0x14, + 0x0a, 0x0f, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x4c, 0x76, 0x52, 0x65, 0x77, 0x61, 0x72, + 0x64, 0x10, 0xf5, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x46, + 0x65, 0x74, 0x74, 0x65, 0x72, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, + 0x10, 0xf6, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x4c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x50, 0x72, + 0x65, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, + 0xf7, 0x15, 0x12, 0x1b, 0x0a, 0x16, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x69, + 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x10, 0xd5, 0x16, 0x12, + 0x10, 0x0a, 0x0b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x57, 0x69, 0x6e, 0x10, 0xd6, + 0x16, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, 0x6f, + 0x75, 0x6e, 0x64, 0x10, 0xb8, 0x17, 0x12, 0x11, 0x0a, 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x41, 0x64, 0x64, 0x65, 0x64, 0x10, 0xb9, 0x17, 0x12, 0x1b, 0x0a, 0x16, 0x53, 0x6f, 0x63, + 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x61, 0x6d, 0x6f, 0x6e, 0x64, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0xba, 0x17, 0x12, 0x14, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4e, 0x6f, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x10, 0xbb, 0x17, 0x12, 0x13, 0x0a, 0x0e, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x52, 0x69, 0x67, 0x68, 0x74, 0x10, 0xbc, + 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x41, 0x64, + 0x64, 0x65, 0x64, 0x10, 0xbd, 0x17, 0x12, 0x13, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, 0x73, 0x10, 0xbe, 0x17, 0x12, 0x10, 0x0a, 0x0b, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x10, 0xbf, 0x17, 0x12, 0x11, 0x0a, + 0x0c, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x67, 0x72, 0x65, 0x65, 0x10, 0xc0, 0x17, + 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x66, 0x75, 0x73, + 0x65, 0x10, 0xc1, 0x17, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, + 0x6f, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x10, 0xba, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x6f, 0x44, + 0x69, 0x73, 0x73, 0x10, 0xbb, 0xea, 0x01, 0x12, 0x17, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x4a, 0x6f, 0x62, 0x10, 0xbc, 0xea, 0x01, + 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x74, 0x74, 0x69, + 0x6e, 0x67, 0x10, 0xbd, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x75, 0x73, 0x65, 0x10, 0xbe, 0xea, 0x01, 0x12, 0x11, 0x0a, + 0x0b, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x10, 0xbf, 0xea, 0x01, + 0x12, 0x13, 0x0a, 0x0d, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x69, 0x67, 0x6e, 0x65, + 0x64, 0x10, 0xc0, 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x43, 0x44, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x4d, 0x61, 0x78, 0x10, 0xc2, + 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x65, 0x6c, + 0x66, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x10, 0xc3, 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x10, 0xc4, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x64, 0x10, 0xc5, 0xea, 0x01, 0x12, 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, + 0x10, 0xc6, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x52, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x10, 0xc7, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x42, 0x65, 0x6c, 0x6f, 0x6e, 0x67, 0x54, 0x6f, 0x10, 0xc9, + 0xea, 0x01, 0x12, 0x14, 0x0a, 0x0e, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, + 0x6c, 0x69, 0x65, 0x64, 0x10, 0xca, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, + 0x61, 0x74, 0x79, 0x41, 0x70, 0x70, 0x79, 0x4c, 0x76, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, + 0x68, 0x10, 0xcb, 0xea, 0x01, 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x54, 0x61, 0x73, 0x6b, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xcc, + 0xea, 0x01, 0x12, 0x1d, 0x0a, 0x17, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x74, + 0x69, 0x76, 0x69, 0x74, 0x79, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xcd, 0xea, + 0x01, 0x12, 0x1c, 0x0a, 0x16, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x41, 0x63, 0x69, 0x74, + 0x76, 0x69, 0x74, 0x79, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0xce, 0xea, 0x01, 0x12, + 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x44, 0x69, 0x73, 0x6d, 0x69, 0x73, + 0x73, 0x65, 0x64, 0x10, 0xcf, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, + 0x74, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0xd0, 0xea, 0x01, 0x12, + 0x1a, 0x0a, 0x14, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x51, 0x75, 0x69, 0x74, 0x4e, 0x6f, + 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x65, 0x64, 0x10, 0xd1, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x0f, 0x53, + 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x4d, 0x61, 0x73, 0x74, 0x65, 0x72, 0x10, 0xd2, + 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4e, 0x6f, 0x46, + 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0xd3, 0xea, 0x01, 0x12, 0x1c, 0x0a, 0x16, + 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x73, 0x4e, 0x6f, + 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xd4, 0xea, 0x01, 0x12, 0x19, 0x0a, 0x13, 0x53, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x4e, 0x6f, 0x69, 0x6e, 0x69, + 0x74, 0x10, 0xd5, 0xea, 0x01, 0x12, 0x16, 0x0a, 0x10, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x53, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x45, 0x6e, 0x64, 0x10, 0xd6, 0xea, 0x01, 0x12, 0x17, 0x0a, + 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x65, 0x61, 0x6d, 0x55, 0x6e, 0x6c, 0x6f, + 0x63, 0x6b, 0x10, 0xd7, 0xea, 0x01, 0x12, 0x18, 0x0a, 0x12, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, + 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xd8, 0xea, 0x01, + 0x12, 0x1b, 0x0a, 0x15, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, + 0x6f, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xd9, 0xea, 0x01, 0x12, 0x19, 0x0a, + 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, + 0x69, 0x76, 0x65, 0x64, 0x10, 0xda, 0xea, 0x01, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x72, 0x65, 0x6e, + 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x55, 0x70, 0x10, 0x9d, 0x18, 0x12, + 0x19, 0x0a, 0x14, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x6f, + 0x74, 0x45, 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x9e, 0x18, 0x12, 0x17, 0x0a, 0x12, 0x41, 0x72, + 0x65, 0x6e, 0x61, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x4e, 0x70, 0x63, 0x49, 0x6e, 0x43, 0x64, + 0x10, 0x9f, 0x18, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x70, + 0x65, 0x61, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, 0x10, 0x81, 0x19, 0x12, 0x12, 0x0a, 0x0d, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x44, 0x61, 0x74, 0x61, 0x10, 0x82, 0x19, 0x12, + 0x19, 0x0a, 0x14, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x4c, 0x6f, 0x63, 0x6b, 0x65, + 0x72, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x10, 0x83, 0x19, 0x12, 0x15, 0x0a, 0x10, 0x54, 0x61, + 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x10, 0x84, + 0x19, 0x12, 0x10, 0x0a, 0x0b, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x42, 0x75, 0x79, 0x4d, 0x61, 0x78, + 0x10, 0xe5, 0x19, 0x12, 0x11, 0x0a, 0x0c, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x53, 0x65, 0x6c, 0x6c, + 0x4d, 0x61, 0x78, 0x10, 0xe6, 0x19, 0x12, 0x16, 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, + 0x61, 0x78, 0x53, 0x65, 0x6c, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0xe7, 0x19, 0x12, 0x16, + 0x0a, 0x11, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x4d, 0x61, 0x78, 0x49, 0x74, 0x65, 0x6d, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x10, 0xe8, 0x19, 0x12, 0x18, 0x0a, 0x13, 0x54, 0x72, 0x6f, 0x6c, 0x6c, 0x52, + 0x65, 0x70, 0x65, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe9, 0x19, + 0x12, 0x19, 0x0a, 0x14, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x4e, 0x6f, 0x74, + 0x54, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x4f, 0x6e, 0x10, 0xc9, 0x1a, 0x12, 0x19, 0x0a, 0x14, 0x48, + 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x52, 0x65, 0x73, 0x74, 0x43, 0x44, 0x4e, 0x6f, + 0x45, 0x6e, 0x64, 0x10, 0xca, 0x1a, 0x12, 0x16, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, + 0x65, 0x67, 0x65, 0x4e, 0x6f, 0x74, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x10, 0xad, 0x1b, 0x12, 0x17, + 0x0a, 0x12, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x52, 0x65, 0x6e, 0x65, 0x77, + 0x54, 0x69, 0x6d, 0x65, 0x10, 0xae, 0x1b, 0x12, 0x0f, 0x0a, 0x0a, 0x56, 0x69, 0x70, 0x4c, 0x76, + 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xaf, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, 0x69, 0x70, 0x47, + 0x69, 0x66, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xb0, 0x1b, 0x12, 0x11, 0x0a, 0x0c, 0x56, + 0x69, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x70, 0x65, 0x61, 0x74, 0x10, 0xb1, 0x1b, 0x12, 0x14, + 0x0a, 0x0f, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, + 0x65, 0x10, 0x91, 0x1c, 0x12, 0x17, 0x0a, 0x12, 0x47, 0x72, 0x6f, 0x77, 0x74, 0x61, 0x73, 0x6b, + 0x41, 0x64, 0x76, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x10, 0x92, 0x1c, 0x12, 0x17, 0x0a, + 0x12, 0x50, 0x61, 0x79, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0xf5, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x79, 0x52, 0x65, 0x6e, + 0x65, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x45, 0x72, 0x72, 0x10, 0xf6, 0x1c, 0x12, 0x16, 0x0a, 0x11, + 0x50, 0x61, 0x79, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, + 0x64, 0x10, 0xf7, 0x1c, 0x12, 0x14, 0x0a, 0x0f, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, + 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x10, 0xd9, 0x1d, 0x12, 0x19, 0x0a, 0x14, 0x57, 0x6f, + 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x76, 0x4e, 0x6f, 0x74, 0x45, 0x6e, 0x6f, 0x75, + 0x67, 0x68, 0x10, 0xda, 0x1d, 0x12, 0x16, 0x0a, 0x11, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, + 0x73, 0x6b, 0x4e, 0x6f, 0x41, 0x63, 0x63, 0x65, 0x70, 0x74, 0x10, 0xdb, 0x1d, 0x12, 0x18, 0x0a, + 0x13, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, + 0x6c, 0x65, 0x74, 0x65, 0x10, 0xdc, 0x1d, 0x12, 0x15, 0x0a, 0x10, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x68, 0x65, 0x64, 0x10, 0xdd, 0x1d, 0x12, 0x1c, + 0x0a, 0x17, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x4c, 0x61, 0x73, 0x74, 0x55, + 0x6e, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x65, 0x64, 0x10, 0xde, 0x1d, 0x12, 0x1b, 0x0a, 0x16, + 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, + 0x4e, 0x6f, 0x73, 0x61, 0x6d, 0x65, 0x10, 0xdf, 0x1d, 0x12, 0x1e, 0x0a, 0x19, 0x41, 0x63, 0x61, + 0x64, 0x65, 0x6d, 0x79, 0x54, 0x61, 0x73, 0x6b, 0x4e, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, + 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x10, 0xbd, 0x1e, 0x12, 0x15, 0x0a, 0x10, 0x41, 0x75, 0x74, + 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xa1, 0x1f, + 0x12, 0x18, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, + 0x61, 0x74, 0x65, 0x73, 0x45, 0x72, 0x72, 0x10, 0xa2, 0x1f, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +>>>>>>> 14d69fdd11a16b463c659ef89af1683c8c04e043 } var ( diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index d5e32eafa..93d70a009 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -375,19 +375,20 @@ type DBHeroRecord struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底 - Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底 - Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间 - Drawcount int32 `protobuf:"varint,6,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数 - Condition map[string]int32 `protobuf:"bytes,7,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数 - Star5Hero map[string]int32 `protobuf:"bytes,8,rep,name=star5Hero,proto3" json:"star5Hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 第totalcount 次抽到的5星英雄 key 英雄id - Totalcount int32 `protobuf:"varint,9,opt,name=totalcount,proto3" json:"totalcount"` // 总的累计抽卡次数 - Daycount int32 `protobuf:"varint,10,opt,name=daycount,proto3" json:"daycount"` // 今天抽卡次数 - Onebuy int32 `protobuf:"varint,11,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 - Tenbuy int32 `protobuf:"varint,12,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 - Inevitable int32 `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"` //第2-30次抽奖必出一个5星英雄 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID 主键id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Star4 int32 `protobuf:"varint,3,opt,name=star4,proto3" json:"star4"` // 4星保底 + Star5 int32 `protobuf:"varint,4,opt,name=star5,proto3" json:"star5"` // 5星保底 + Mtime int64 `protobuf:"varint,5,opt,name=mtime,proto3" json:"mtime"` // 修改时间 + Drawcount int32 `protobuf:"varint,6,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数 + Condition map[string]int32 `protobuf:"bytes,7,rep,name=condition,proto3" json:"condition" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key recharge、login 等 value 累计抽卡次数 + Star5Hero map[string]int32 `protobuf:"bytes,8,rep,name=star5Hero,proto3" json:"star5Hero" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 第totalcount 次抽到的5星英雄 key 英雄id + Totalcount int32 `protobuf:"varint,9,opt,name=totalcount,proto3" json:"totalcount"` // 总的累计抽卡次数 + Daycount int32 `protobuf:"varint,10,opt,name=daycount,proto3" json:"daycount"` // 今天抽卡次数 + Onebuy int32 `protobuf:"varint,11,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,12,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 + Inevitable int32 `protobuf:"varint,13,opt,name=inevitable,proto3" json:"inevitable"` //第2-30次抽奖必出一个5星英雄 + Inevitable1 int32 `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"` //第30-50次抽奖必出一个5星英雄 } func (x *DBHeroRecord) Reset() { @@ -513,6 +514,13 @@ func (x *DBHeroRecord) GetInevitable() int32 { return 0 } +func (x *DBHeroRecord) GetInevitable1() int32 { + if x != nil { + return x.Inevitable1 + } + return 0 +} + // 英雄天赋系统 type DBHeroTalent struct { state protoimpl.MessageState @@ -693,7 +701,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x90, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb2, 0x04, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, @@ -718,31 +726,33 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x1a, 0x3c, 0x0a, - 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, + 0x05, 0x52, 0x0a, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x20, 0x0a, + 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x18, 0x0e, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0b, 0x69, 0x6e, 0x65, 0x76, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x31, 0x1a, + 0x3c, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x1a, 0x3c, 0x0a, + 0x0e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x1a, 0x3c, 0x0a, 0x0e, 0x53, - 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0xb6, 0x01, 0x0a, 0x0c, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, - 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, - 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x18, 0x04, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, - 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0f, - 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, 0x00, 0x12, - 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, 0x67, 0x46, - 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xb6, 0x01, 0x0a, 0x0c, + 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, + 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, + 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, + 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x2e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x06, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x1a, 0x39, 0x0a, 0x0b, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 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, 0x2a, 0x2f, 0x0a, 0x08, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, + 0x12, 0x0f, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4e, 0x69, 0x6c, 0x10, + 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x79, 0x70, 0x65, 0x4b, 0x6f, 0x6e, + 0x67, 0x46, 0x75, 0x10, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/hero_msg.pb.go b/pb/hero_msg.pb.go index 6e46f151f..b575e0b05 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -278,8 +278,8 @@ type HeroStrengthenUplvReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - ExpCards []*MapStringInt32 `protobuf:"bytes,2,rep,name=expCards,proto3" json:"expCards"` + HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID + Item map[string]int32 `protobuf:"bytes,2,rep,name=item,proto3" json:"item" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key itemid value 数量 } func (x *HeroStrengthenUplvReq) Reset() { @@ -321,9 +321,9 @@ func (x *HeroStrengthenUplvReq) GetHeroObjID() string { return "" } -func (x *HeroStrengthenUplvReq) GetExpCards() []*MapStringInt32 { +func (x *HeroStrengthenUplvReq) GetItem() map[string]int32 { if x != nil { - return x.ExpCards + return x.Item } return nil } @@ -376,76 +376,19 @@ func (x *HeroStrengthenUplvResp) GetHero() *DBHero { return nil } -type CostCardData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - CostCardObj string `protobuf:"bytes,1,opt,name=costCardObj,proto3" json:"costCardObj"` // 对象ID - Amount int32 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount"` // 数量 -} - -func (x *CostCardData) Reset() { - *x = CostCardData{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CostCardData) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CostCardData) ProtoMessage() {} - -func (x *CostCardData) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[7] - 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 CostCardData.ProtoReflect.Descriptor instead. -func (*CostCardData) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{7} -} - -func (x *CostCardData) GetCostCardObj() string { - if x != nil { - return x.CostCardObj - } - return "" -} - -func (x *CostCardData) GetAmount() int32 { - if x != nil { - return x.Amount - } - return 0 -} - // 卡牌升星 type HeroStrengthenUpStarReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - Hero []*CostCardData `protobuf:"bytes,2,rep,name=hero,proto3" json:"hero"` // 消耗卡牌对象ID - HeroRace []*CostCardData `protobuf:"bytes,3,rep,name=heroRace,proto3" json:"heroRace"` // 消耗种族卡牌对象ID + HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID } func (x *HeroStrengthenUpStarReq) Reset() { *x = HeroStrengthenUpStarReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[8] + mi := &file_hero_hero_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -458,7 +401,7 @@ func (x *HeroStrengthenUpStarReq) String() string { func (*HeroStrengthenUpStarReq) ProtoMessage() {} func (x *HeroStrengthenUpStarReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[8] + mi := &file_hero_hero_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -471,7 +414,7 @@ func (x *HeroStrengthenUpStarReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroStrengthenUpStarReq.ProtoReflect.Descriptor instead. func (*HeroStrengthenUpStarReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{8} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{7} } func (x *HeroStrengthenUpStarReq) GetHeroObjID() string { @@ -481,20 +424,6 @@ func (x *HeroStrengthenUpStarReq) GetHeroObjID() string { return "" } -func (x *HeroStrengthenUpStarReq) GetHero() []*CostCardData { - if x != nil { - return x.Hero - } - return nil -} - -func (x *HeroStrengthenUpStarReq) GetHeroRace() []*CostCardData { - if x != nil { - return x.HeroRace - } - return nil -} - // 卡牌升星返回 type HeroStrengthenUpStarResp struct { state protoimpl.MessageState @@ -507,7 +436,7 @@ type HeroStrengthenUpStarResp struct { func (x *HeroStrengthenUpStarResp) Reset() { *x = HeroStrengthenUpStarResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[9] + mi := &file_hero_hero_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -520,7 +449,7 @@ func (x *HeroStrengthenUpStarResp) String() string { func (*HeroStrengthenUpStarResp) ProtoMessage() {} func (x *HeroStrengthenUpStarResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[9] + mi := &file_hero_hero_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -533,7 +462,7 @@ func (x *HeroStrengthenUpStarResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroStrengthenUpStarResp.ProtoReflect.Descriptor instead. func (*HeroStrengthenUpStarResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{9} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{8} } func (x *HeroStrengthenUpStarResp) GetHero() *DBHero { @@ -549,14 +478,14 @@ type HeroStrengthenUpSkillReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - CostCardObj []string `protobuf:"bytes,2,rep,name=costCardObj,proto3" json:"costCardObj"` // 消耗技能升级卡 + HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID + Item []string `protobuf:"bytes,2,rep,name=item,proto3" json:"item"` // } func (x *HeroStrengthenUpSkillReq) Reset() { *x = HeroStrengthenUpSkillReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[10] + mi := &file_hero_hero_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -569,7 +498,7 @@ func (x *HeroStrengthenUpSkillReq) String() string { func (*HeroStrengthenUpSkillReq) ProtoMessage() {} func (x *HeroStrengthenUpSkillReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[10] + mi := &file_hero_hero_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -582,7 +511,7 @@ func (x *HeroStrengthenUpSkillReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroStrengthenUpSkillReq.ProtoReflect.Descriptor instead. func (*HeroStrengthenUpSkillReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{10} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{9} } func (x *HeroStrengthenUpSkillReq) GetHeroObjID() string { @@ -592,9 +521,9 @@ func (x *HeroStrengthenUpSkillReq) GetHeroObjID() string { return "" } -func (x *HeroStrengthenUpSkillReq) GetCostCardObj() []string { +func (x *HeroStrengthenUpSkillReq) GetItem() []string { if x != nil { - return x.CostCardObj + return x.Item } return nil } @@ -611,7 +540,7 @@ type HeroStrengthenUpSkillResp struct { func (x *HeroStrengthenUpSkillResp) Reset() { *x = HeroStrengthenUpSkillResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[11] + mi := &file_hero_hero_msg_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -624,7 +553,7 @@ func (x *HeroStrengthenUpSkillResp) String() string { func (*HeroStrengthenUpSkillResp) ProtoMessage() {} func (x *HeroStrengthenUpSkillResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[11] + mi := &file_hero_hero_msg_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -637,7 +566,7 @@ func (x *HeroStrengthenUpSkillResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroStrengthenUpSkillResp.ProtoReflect.Descriptor instead. func (*HeroStrengthenUpSkillResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{11} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{10} } func (x *HeroStrengthenUpSkillResp) GetHero() *DBHero { @@ -647,339 +576,6 @@ func (x *HeroStrengthenUpSkillResp) GetHero() *DBHero { return nil } -// 共鸣英雄 -type HeroResonanceReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - CostObjID []string `protobuf:"bytes,2,rep,name=costObjID,proto3" json:"costObjID"` // 消耗对象 -} - -func (x *HeroResonanceReq) Reset() { - *x = HeroResonanceReq{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroResonanceReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroResonanceReq) ProtoMessage() {} - -func (x *HeroResonanceReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_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 HeroResonanceReq.ProtoReflect.Descriptor instead. -func (*HeroResonanceReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{12} -} - -func (x *HeroResonanceReq) GetHeroObjID() string { - if x != nil { - return x.HeroObjID - } - return "" -} - -func (x *HeroResonanceReq) GetCostObjID() []string { - if x != nil { - return x.CostObjID - } - return nil -} - -type HeroResonanceResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 - Energy int32 `protobuf:"varint,2,opt,name=energy,proto3" json:"energy"` // 共鸣成功 获得的能量点数 - UpStarCard *DBHero `protobuf:"bytes,3,opt,name=upStarCard,proto3" json:"upStarCard"` //共鸣成功 获得的升星卡 -} - -func (x *HeroResonanceResp) Reset() { - *x = HeroResonanceResp{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroResonanceResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroResonanceResp) ProtoMessage() {} - -func (x *HeroResonanceResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_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 HeroResonanceResp.ProtoReflect.Descriptor instead. -func (*HeroResonanceResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{13} -} - -func (x *HeroResonanceResp) GetHero() *DBHero { - if x != nil { - return x.Hero - } - return nil -} - -func (x *HeroResonanceResp) GetEnergy() int32 { - if x != nil { - return x.Energy - } - return 0 -} - -func (x *HeroResonanceResp) GetUpStarCard() *DBHero { - if x != nil { - return x.UpStarCard - } - return nil -} - -// 重置共鸣属性 -type HeroResonanceResetReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID -} - -func (x *HeroResonanceResetReq) Reset() { - *x = HeroResonanceResetReq{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[14] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroResonanceResetReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroResonanceResetReq) ProtoMessage() {} - -func (x *HeroResonanceResetReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[14] - 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 HeroResonanceResetReq.ProtoReflect.Descriptor instead. -func (*HeroResonanceResetReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{14} -} - -func (x *HeroResonanceResetReq) GetHeroObjID() string { - if x != nil { - return x.HeroObjID - } - return "" -} - -type HeroResonanceResetResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Hero *DBHero `protobuf:"bytes,1,opt,name=hero,proto3" json:"hero"` // 英雄对象 - Energy int32 `protobuf:"varint,2,opt,name=energy,proto3" json:"energy"` // 能量点数 -} - -func (x *HeroResonanceResetResp) Reset() { - *x = HeroResonanceResetResp{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[15] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroResonanceResetResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroResonanceResetResp) ProtoMessage() {} - -func (x *HeroResonanceResetResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[15] - 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 HeroResonanceResetResp.ProtoReflect.Descriptor instead. -func (*HeroResonanceResetResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{15} -} - -func (x *HeroResonanceResetResp) GetHero() *DBHero { - if x != nil { - return x.Hero - } - return nil -} - -func (x *HeroResonanceResetResp) GetEnergy() int32 { - if x != nil { - return x.Energy - } - return 0 -} - -type EnergyData struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - UseEnergy int32 `protobuf:"varint,1,opt,name=useEnergy,proto3" json:"useEnergy"` // 使用的能量点数 - UseType string `protobuf:"bytes,2,opt,name=useType,proto3" json:"useType"` // 使用的类型 （攻击、血量、防御） -} - -func (x *EnergyData) Reset() { - *x = EnergyData{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[16] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *EnergyData) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*EnergyData) ProtoMessage() {} - -func (x *EnergyData) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[16] - 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 EnergyData.ProtoReflect.Descriptor instead. -func (*EnergyData) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{16} -} - -func (x *EnergyData) GetUseEnergy() int32 { - if x != nil { - return x.UseEnergy - } - return 0 -} - -func (x *EnergyData) GetUseType() string { - if x != nil { - return x.UseType - } - return "" -} - -// 使用能量点数 -type HeroResonanceUseEnergyReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - HeroObjID string `protobuf:"bytes,1,opt,name=heroObjID,proto3" json:"heroObjID"` // 英雄对象ID - Energy []*EnergyData `protobuf:"bytes,2,rep,name=energy,proto3" json:"energy"` -} - -func (x *HeroResonanceUseEnergyReq) Reset() { - *x = HeroResonanceUseEnergyReq{} - if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[17] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *HeroResonanceUseEnergyReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*HeroResonanceUseEnergyReq) ProtoMessage() {} - -func (x *HeroResonanceUseEnergyReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[17] - 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 HeroResonanceUseEnergyReq.ProtoReflect.Descriptor instead. -func (*HeroResonanceUseEnergyReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} -} - -func (x *HeroResonanceUseEnergyReq) GetHeroObjID() string { - if x != nil { - return x.HeroObjID - } - return "" -} - -func (x *HeroResonanceUseEnergyReq) GetEnergy() []*EnergyData { - if x != nil { - return x.Energy - } - return nil -} - type HeroResonanceUseEnergyResp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -991,7 +587,7 @@ type HeroResonanceUseEnergyResp struct { func (x *HeroResonanceUseEnergyResp) Reset() { *x = HeroResonanceUseEnergyResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[18] + mi := &file_hero_hero_msg_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1004,7 +600,7 @@ func (x *HeroResonanceUseEnergyResp) String() string { func (*HeroResonanceUseEnergyResp) ProtoMessage() {} func (x *HeroResonanceUseEnergyResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[18] + mi := &file_hero_hero_msg_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1017,7 +613,7 @@ func (x *HeroResonanceUseEnergyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroResonanceUseEnergyResp.ProtoReflect.Descriptor instead. func (*HeroResonanceUseEnergyResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{18} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{11} } func (x *HeroResonanceUseEnergyResp) GetHero() *DBHero { @@ -1039,7 +635,7 @@ type HeroAwakenReq struct { func (x *HeroAwakenReq) Reset() { *x = HeroAwakenReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[19] + mi := &file_hero_hero_msg_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1052,7 +648,7 @@ func (x *HeroAwakenReq) String() string { func (*HeroAwakenReq) ProtoMessage() {} func (x *HeroAwakenReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[19] + mi := &file_hero_hero_msg_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1065,7 +661,7 @@ func (x *HeroAwakenReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroAwakenReq.ProtoReflect.Descriptor instead. func (*HeroAwakenReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{19} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{12} } func (x *HeroAwakenReq) GetHeroObjID() string { @@ -1087,7 +683,7 @@ type HeroAwakenResp struct { func (x *HeroAwakenResp) Reset() { *x = HeroAwakenResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[20] + mi := &file_hero_hero_msg_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1100,7 +696,7 @@ func (x *HeroAwakenResp) String() string { func (*HeroAwakenResp) ProtoMessage() {} func (x *HeroAwakenResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[20] + mi := &file_hero_hero_msg_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1113,7 +709,7 @@ func (x *HeroAwakenResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroAwakenResp.ProtoReflect.Descriptor instead. func (*HeroAwakenResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{20} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{13} } func (x *HeroAwakenResp) GetHero() *DBHero { @@ -1137,7 +733,7 @@ type HeroPropertyPush struct { func (x *HeroPropertyPush) Reset() { *x = HeroPropertyPush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[21] + mi := &file_hero_hero_msg_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1150,7 +746,7 @@ func (x *HeroPropertyPush) String() string { func (*HeroPropertyPush) ProtoMessage() {} func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[21] + mi := &file_hero_hero_msg_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1163,7 +759,7 @@ func (x *HeroPropertyPush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroPropertyPush.ProtoReflect.Descriptor instead. func (*HeroPropertyPush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{21} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{14} } func (x *HeroPropertyPush) GetHeroId() string { @@ -1199,7 +795,7 @@ type HeroLockReq struct { func (x *HeroLockReq) Reset() { *x = HeroLockReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[22] + mi := &file_hero_hero_msg_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1212,7 +808,7 @@ func (x *HeroLockReq) String() string { func (*HeroLockReq) ProtoMessage() {} func (x *HeroLockReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[22] + mi := &file_hero_hero_msg_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1225,7 +821,7 @@ func (x *HeroLockReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockReq.ProtoReflect.Descriptor instead. func (*HeroLockReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{22} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{15} } func (x *HeroLockReq) GetHeroid() string { @@ -1247,7 +843,7 @@ type HeroLockResp struct { func (x *HeroLockResp) Reset() { *x = HeroLockResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[23] + mi := &file_hero_hero_msg_proto_msgTypes[16] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1260,7 +856,7 @@ func (x *HeroLockResp) String() string { func (*HeroLockResp) ProtoMessage() {} func (x *HeroLockResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[23] + mi := &file_hero_hero_msg_proto_msgTypes[16] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1273,7 +869,7 @@ func (x *HeroLockResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroLockResp.ProtoReflect.Descriptor instead. func (*HeroLockResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{23} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{16} } func (x *HeroLockResp) GetHero() *DBHero { @@ -1298,7 +894,7 @@ type HeroGetSpecifiedReq struct { func (x *HeroGetSpecifiedReq) Reset() { *x = HeroGetSpecifiedReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[24] + mi := &file_hero_hero_msg_proto_msgTypes[17] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1311,7 +907,7 @@ func (x *HeroGetSpecifiedReq) String() string { func (*HeroGetSpecifiedReq) ProtoMessage() {} func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[24] + mi := &file_hero_hero_msg_proto_msgTypes[17] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1324,7 +920,7 @@ func (x *HeroGetSpecifiedReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedReq.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{24} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{17} } func (x *HeroGetSpecifiedReq) GetHeroCoinfigID() string { @@ -1366,7 +962,7 @@ type HeroGetSpecifiedResp struct { func (x *HeroGetSpecifiedResp) Reset() { *x = HeroGetSpecifiedResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[25] + mi := &file_hero_hero_msg_proto_msgTypes[18] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1379,7 +975,7 @@ func (x *HeroGetSpecifiedResp) String() string { func (*HeroGetSpecifiedResp) ProtoMessage() {} func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[25] + mi := &file_hero_hero_msg_proto_msgTypes[18] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1392,7 +988,7 @@ func (x *HeroGetSpecifiedResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroGetSpecifiedResp.ProtoReflect.Descriptor instead. func (*HeroGetSpecifiedResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{25} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{18} } func (x *HeroGetSpecifiedResp) GetHero() *DBHero { @@ -1415,7 +1011,7 @@ type HeroDrawCardReq struct { func (x *HeroDrawCardReq) Reset() { *x = HeroDrawCardReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[26] + mi := &file_hero_hero_msg_proto_msgTypes[19] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1428,7 +1024,7 @@ func (x *HeroDrawCardReq) String() string { func (*HeroDrawCardReq) ProtoMessage() {} func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[26] + mi := &file_hero_hero_msg_proto_msgTypes[19] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1441,7 +1037,7 @@ func (x *HeroDrawCardReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardReq.ProtoReflect.Descriptor instead. func (*HeroDrawCardReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{26} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{19} } func (x *HeroDrawCardReq) GetDrawType() int32 { @@ -1469,7 +1065,7 @@ type HeroDrawCardResp struct { func (x *HeroDrawCardResp) Reset() { *x = HeroDrawCardResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[27] + mi := &file_hero_hero_msg_proto_msgTypes[20] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1482,7 +1078,7 @@ func (x *HeroDrawCardResp) String() string { func (*HeroDrawCardResp) ProtoMessage() {} func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[27] + mi := &file_hero_hero_msg_proto_msgTypes[20] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1495,7 +1091,7 @@ func (x *HeroDrawCardResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardResp.ProtoReflect.Descriptor instead. func (*HeroDrawCardResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{27} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{20} } func (x *HeroDrawCardResp) GetHeroes() []string { @@ -1517,7 +1113,7 @@ type HeroChangePush struct { func (x *HeroChangePush) Reset() { *x = HeroChangePush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[28] + mi := &file_hero_hero_msg_proto_msgTypes[21] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1530,7 +1126,7 @@ func (x *HeroChangePush) String() string { func (*HeroChangePush) ProtoMessage() {} func (x *HeroChangePush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[28] + mi := &file_hero_hero_msg_proto_msgTypes[21] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1543,7 +1139,7 @@ func (x *HeroChangePush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroChangePush.ProtoReflect.Descriptor instead. func (*HeroChangePush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{28} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{21} } func (x *HeroChangePush) GetList() []*DBHero { @@ -1562,7 +1158,7 @@ type HeroDrawCardFloorReq struct { func (x *HeroDrawCardFloorReq) Reset() { *x = HeroDrawCardFloorReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[29] + mi := &file_hero_hero_msg_proto_msgTypes[22] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1575,7 +1171,7 @@ func (x *HeroDrawCardFloorReq) String() string { func (*HeroDrawCardFloorReq) ProtoMessage() {} func (x *HeroDrawCardFloorReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[29] + mi := &file_hero_hero_msg_proto_msgTypes[22] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1588,7 +1184,7 @@ func (x *HeroDrawCardFloorReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardFloorReq.ProtoReflect.Descriptor instead. func (*HeroDrawCardFloorReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{29} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{22} } // 获取抽卡保底次数 @@ -1606,7 +1202,7 @@ type HeroDrawCardFloorResp struct { func (x *HeroDrawCardFloorResp) Reset() { *x = HeroDrawCardFloorResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[30] + mi := &file_hero_hero_msg_proto_msgTypes[23] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1619,7 +1215,7 @@ func (x *HeroDrawCardFloorResp) String() string { func (*HeroDrawCardFloorResp) ProtoMessage() {} func (x *HeroDrawCardFloorResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[30] + mi := &file_hero_hero_msg_proto_msgTypes[23] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1632,7 +1228,7 @@ func (x *HeroDrawCardFloorResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroDrawCardFloorResp.ProtoReflect.Descriptor instead. func (*HeroDrawCardFloorResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{30} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{23} } func (x *HeroDrawCardFloorResp) GetStar4() int32 { @@ -1676,7 +1272,7 @@ type HeroFusionReq struct { func (x *HeroFusionReq) Reset() { *x = HeroFusionReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[31] + mi := &file_hero_hero_msg_proto_msgTypes[24] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1689,7 +1285,7 @@ func (x *HeroFusionReq) String() string { func (*HeroFusionReq) ProtoMessage() {} func (x *HeroFusionReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[31] + mi := &file_hero_hero_msg_proto_msgTypes[24] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1702,7 +1298,7 @@ func (x *HeroFusionReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroFusionReq.ProtoReflect.Descriptor instead. func (*HeroFusionReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{31} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{24} } func (x *HeroFusionReq) GetHeroId() string { @@ -1730,7 +1326,7 @@ type HeroFusionResp struct { func (x *HeroFusionResp) Reset() { *x = HeroFusionResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[32] + mi := &file_hero_hero_msg_proto_msgTypes[25] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1743,7 +1339,7 @@ func (x *HeroFusionResp) String() string { func (*HeroFusionResp) ProtoMessage() {} func (x *HeroFusionResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[32] + mi := &file_hero_hero_msg_proto_msgTypes[25] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1756,7 +1352,7 @@ func (x *HeroFusionResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroFusionResp.ProtoReflect.Descriptor instead. func (*HeroFusionResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{32} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{25} } func (x *HeroFusionResp) GetHeroid() string { @@ -1776,7 +1372,7 @@ type HeroTalentListReq struct { func (x *HeroTalentListReq) Reset() { *x = HeroTalentListReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[33] + mi := &file_hero_hero_msg_proto_msgTypes[26] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1789,7 +1385,7 @@ func (x *HeroTalentListReq) String() string { func (*HeroTalentListReq) ProtoMessage() {} func (x *HeroTalentListReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[33] + mi := &file_hero_hero_msg_proto_msgTypes[26] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1802,7 +1398,7 @@ func (x *HeroTalentListReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroTalentListReq.ProtoReflect.Descriptor instead. func (*HeroTalentListReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{33} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{26} } type HeroTalentListResp struct { @@ -1816,7 +1412,7 @@ type HeroTalentListResp struct { func (x *HeroTalentListResp) Reset() { *x = HeroTalentListResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[34] + mi := &file_hero_hero_msg_proto_msgTypes[27] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1829,7 +1425,7 @@ func (x *HeroTalentListResp) String() string { func (*HeroTalentListResp) ProtoMessage() {} func (x *HeroTalentListResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[34] + mi := &file_hero_hero_msg_proto_msgTypes[27] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1842,7 +1438,7 @@ func (x *HeroTalentListResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroTalentListResp.ProtoReflect.Descriptor instead. func (*HeroTalentListResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{34} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{27} } func (x *HeroTalentListResp) GetTelnet() []*DBHeroTalent { @@ -1866,7 +1462,7 @@ type HeroTalentLearnReq struct { func (x *HeroTalentLearnReq) Reset() { *x = HeroTalentLearnReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[35] + mi := &file_hero_hero_msg_proto_msgTypes[28] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1879,7 +1475,7 @@ func (x *HeroTalentLearnReq) String() string { func (*HeroTalentLearnReq) ProtoMessage() {} func (x *HeroTalentLearnReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[35] + mi := &file_hero_hero_msg_proto_msgTypes[28] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1892,7 +1488,7 @@ func (x *HeroTalentLearnReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroTalentLearnReq.ProtoReflect.Descriptor instead. func (*HeroTalentLearnReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{35} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{28} } func (x *HeroTalentLearnReq) GetTalentID() int32 { @@ -1928,7 +1524,7 @@ type HeroTalentLearnResp struct { func (x *HeroTalentLearnResp) Reset() { *x = HeroTalentLearnResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[36] + mi := &file_hero_hero_msg_proto_msgTypes[29] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1941,7 +1537,7 @@ func (x *HeroTalentLearnResp) String() string { func (*HeroTalentLearnResp) ProtoMessage() {} func (x *HeroTalentLearnResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[36] + mi := &file_hero_hero_msg_proto_msgTypes[29] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1954,7 +1550,7 @@ func (x *HeroTalentLearnResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroTalentLearnResp.ProtoReflect.Descriptor instead. func (*HeroTalentLearnResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{36} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{29} } func (x *HeroTalentLearnResp) GetTelnet() *DBHeroTalent { @@ -1983,7 +1579,7 @@ type HeroTalentResetReq struct { func (x *HeroTalentResetReq) Reset() { *x = HeroTalentResetReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[37] + mi := &file_hero_hero_msg_proto_msgTypes[30] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1996,7 +1592,7 @@ func (x *HeroTalentResetReq) String() string { func (*HeroTalentResetReq) ProtoMessage() {} func (x *HeroTalentResetReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[37] + mi := &file_hero_hero_msg_proto_msgTypes[30] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2009,7 +1605,7 @@ func (x *HeroTalentResetReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroTalentResetReq.ProtoReflect.Descriptor instead. func (*HeroTalentResetReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{37} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{30} } func (x *HeroTalentResetReq) GetObjId() string { @@ -2030,7 +1626,7 @@ type HeroTalentResetResp struct { func (x *HeroTalentResetResp) Reset() { *x = HeroTalentResetResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[38] + mi := &file_hero_hero_msg_proto_msgTypes[31] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2043,7 +1639,7 @@ func (x *HeroTalentResetResp) String() string { func (*HeroTalentResetResp) ProtoMessage() {} func (x *HeroTalentResetResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[38] + mi := &file_hero_hero_msg_proto_msgTypes[31] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2056,7 +1652,7 @@ func (x *HeroTalentResetResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroTalentResetResp.ProtoReflect.Descriptor instead. func (*HeroTalentResetResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{38} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{31} } func (x *HeroTalentResetResp) GetTelnet() *DBHeroTalent { @@ -2078,7 +1674,7 @@ type HeroBuyReq struct { func (x *HeroBuyReq) Reset() { *x = HeroBuyReq{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[39] + mi := &file_hero_hero_msg_proto_msgTypes[32] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2091,7 +1687,7 @@ func (x *HeroBuyReq) String() string { func (*HeroBuyReq) ProtoMessage() {} func (x *HeroBuyReq) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[39] + mi := &file_hero_hero_msg_proto_msgTypes[32] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2104,7 +1700,7 @@ func (x *HeroBuyReq) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroBuyReq.ProtoReflect.Descriptor instead. func (*HeroBuyReq) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{39} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{32} } func (x *HeroBuyReq) GetBuyType() int32 { @@ -2134,7 +1730,7 @@ type HeroBuyResp struct { func (x *HeroBuyResp) Reset() { *x = HeroBuyResp{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[40] + mi := &file_hero_hero_msg_proto_msgTypes[33] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2147,7 +1743,7 @@ func (x *HeroBuyResp) String() string { func (*HeroBuyResp) ProtoMessage() {} func (x *HeroBuyResp) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[40] + mi := &file_hero_hero_msg_proto_msgTypes[33] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2160,7 +1756,7 @@ func (x *HeroBuyResp) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroBuyResp.ProtoReflect.Descriptor instead. func (*HeroBuyResp) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{40} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{33} } func (x *HeroBuyResp) GetIsSucc() bool { @@ -2196,7 +1792,7 @@ type HeroFirstGetPush struct { func (x *HeroFirstGetPush) Reset() { *x = HeroFirstGetPush{} if protoimpl.UnsafeEnabled { - mi := &file_hero_hero_msg_proto_msgTypes[41] + mi := &file_hero_hero_msg_proto_msgTypes[34] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -2209,7 +1805,7 @@ func (x *HeroFirstGetPush) String() string { func (*HeroFirstGetPush) ProtoMessage() {} func (x *HeroFirstGetPush) ProtoReflect() protoreflect.Message { - mi := &file_hero_hero_msg_proto_msgTypes[41] + mi := &file_hero_hero_msg_proto_msgTypes[34] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -2222,7 +1818,7 @@ func (x *HeroFirstGetPush) ProtoReflect() protoreflect.Message { // Deprecated: Use HeroFirstGetPush.ProtoReflect.Descriptor instead. func (*HeroFirstGetPush) Descriptor() ([]byte, []int) { - return file_hero_hero_msg_proto_rawDescGZIP(), []int{41} + return file_hero_hero_msg_proto_rawDescGZIP(), []int{34} } func (x *HeroFirstGetPush) GetHeroId() []string { @@ -2252,186 +1848,149 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 0x0e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x74, 0x33, 0x32, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x62, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x53, - 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x71, - 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x2b, - 0x0a, 0x08, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x0f, 0x2e, 0x4d, 0x61, 0x70, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x74, 0x33, - 0x32, 0x52, 0x08, 0x65, 0x78, 0x70, 0x43, 0x61, 0x72, 0x64, 0x73, 0x22, 0x35, 0x0a, 0x16, 0x48, - 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, - 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, - 0x72, 0x6f, 0x22, 0x48, 0x0a, 0x0c, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, - 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, - 0x6a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, - 0x64, 0x4f, 0x62, 0x6a, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x85, 0x01, 0x0a, - 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, - 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, - 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, - 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x21, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x02, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, - 0x61, 0x74, 0x61, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x29, 0x0a, 0x08, 0x68, 0x65, 0x72, - 0x6f, 0x52, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x43, 0x6f, - 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x44, 0x61, 0x74, 0x61, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, - 0x52, 0x61, 0x63, 0x65, 0x22, 0x37, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, - 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, - 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x5a, 0x0a, - 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, - 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, - 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, - 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6f, 0x73, 0x74, 0x43, - 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, - 0x73, 0x74, 0x43, 0x61, 0x72, 0x64, 0x4f, 0x62, 0x6a, 0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, 0x72, - 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, - 0x6c, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, - 0x65, 0x72, 0x6f, 0x22, 0x4e, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, - 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, - 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, - 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, 0x6a, - 0x49, 0x44, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6f, 0x73, 0x74, 0x4f, 0x62, - 0x6a, 0x49, 0x44, 0x22, 0x71, 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, - 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, + 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xa4, 0x01, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, + 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, + 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, + 0x34, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, + 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, + 0x6c, 0x76, 0x52, 0x65, 0x71, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x04, 0x69, 0x74, 0x65, 0x6d, 0x1a, 0x37, 0x0a, 0x09, 0x49, 0x74, 0x65, 0x6d, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x35, + 0x0a, 0x16, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, + 0x55, 0x70, 0x6c, 0x76, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, - 0x04, 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x27, 0x0a, - 0x0a, 0x75, 0x70, 0x53, 0x74, 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x0a, 0x75, 0x70, 0x53, 0x74, - 0x61, 0x72, 0x43, 0x61, 0x72, 0x64, 0x22, 0x35, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, - 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, - 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x4d, 0x0a, - 0x16, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x65, - 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, - 0x68, 0x65, 0x72, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x22, 0x44, 0x0a, 0x0a, - 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x73, - 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x75, - 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x54, - 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x75, 0x73, 0x65, 0x54, 0x79, - 0x70, 0x65, 0x22, 0x5e, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, - 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x71, 0x12, - 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x12, 0x23, 0x0a, - 0x06, 0x65, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, - 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x44, 0x61, 0x74, 0x61, 0x52, 0x06, 0x65, 0x6e, 0x65, 0x72, - 0x67, 0x79, 0x22, 0x39, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, - 0x6e, 0x63, 0x65, 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, - 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, - 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, - 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, - 0x48, 0x65, 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, - 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, - 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0xaa, 0x02, 0x0a, 0x10, - 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, - 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, - 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 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, 0x44, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, - 0x65, 0x72, 0x74, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, - 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, - 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, - 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x09, 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, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 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, 0x09, 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, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, - 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, - 0x2b, 0x0a, 0x0c, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, - 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, - 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, - 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x52, 0x65, 0x71, 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, - 0x69, 0x67, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, - 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x04, 0x73, 0x74, 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, - 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, + 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x37, 0x0a, 0x17, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, + 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, + 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x37, + 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, + 0x55, 0x70, 0x53, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, + 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4c, 0x0a, 0x18, 0x48, 0x65, 0x72, 0x6f, 0x53, + 0x74, 0x72, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, + 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, + 0x44, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x04, 0x69, 0x74, 0x65, 0x6d, 0x22, 0x38, 0x0a, 0x19, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x74, 0x72, + 0x65, 0x6e, 0x67, 0x74, 0x68, 0x65, 0x6e, 0x55, 0x70, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, + 0x39, 0x0a, 0x1a, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x73, 0x6f, 0x6e, 0x61, 0x6e, 0x63, 0x65, + 0x55, 0x73, 0x65, 0x45, 0x6e, 0x65, 0x72, 0x67, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, - 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, - 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x08, 0x64, 0x72, 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, - 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, - 0x61, 0x77, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, - 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, - 0x65, 0x72, 0x6f, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, - 0x6f, 0x65, 0x73, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, - 0x73, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, - 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x73, 0x0a, 0x15, 0x48, 0x65, - 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, - 0x72, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, - 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, - 0x92, 0x01, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, - 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x68, 0x65, 0x72, - 0x6f, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, - 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x73, 0x45, 0x6e, - 0x74, 0x72, 0x79, 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x48, 0x65, - 0x72, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x28, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x13, - 0x0a, 0x11, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, - 0x52, 0x65, 0x71, 0x22, 0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, - 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, - 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, - 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, - 0x22, 0x5e, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, - 0x61, 0x72, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, - 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, - 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, - 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, - 0x22, 0x58, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, - 0x61, 0x72, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, - 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, - 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x12, 0x1a, - 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65, - 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, - 0x12, 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, - 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, - 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, - 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, - 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x42, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, - 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, - 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, - 0x62, 0x75, 0x79, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, - 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, - 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, - 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, - 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x2d, 0x0a, 0x0d, 0x48, 0x65, + 0x72, 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x68, + 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x44, 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, + 0x6f, 0x41, 0x77, 0x61, 0x6b, 0x65, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, + 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, + 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0xaa, 0x02, 0x0a, 0x10, 0x48, 0x65, 0x72, + 0x6f, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x12, 0x16, 0x0a, + 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, + 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x3b, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 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, 0x44, 0x0a, 0x0b, 0x61, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, + 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x41, 0x64, 0x64, 0x50, 0x72, + 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0b, 0x61, 0x64, 0x64, + 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 0x09, 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, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 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, 0x09, 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, 0x25, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, + 0x6b, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x2b, 0x0a, 0x0c, + 0x48, 0x65, 0x72, 0x6f, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, + 0x68, 0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x77, 0x0a, 0x13, 0x48, 0x65, 0x72, + 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x71, + 0x12, 0x24, 0x0a, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, 0x6e, 0x66, 0x69, 0x67, 0x49, + 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x68, 0x65, 0x72, 0x6f, 0x43, 0x6f, 0x69, + 0x6e, 0x66, 0x69, 0x67, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, + 0x0a, 0x04, 0x73, 0x74, 0x61, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x73, 0x74, + 0x61, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, + 0x6c, 0x76, 0x22, 0x33, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x47, 0x65, 0x74, 0x53, 0x70, 0x65, + 0x63, 0x69, 0x66, 0x69, 0x65, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, + 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x4b, 0x0a, 0x0f, 0x48, 0x65, 0x72, 0x6f, 0x44, + 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x72, + 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x72, + 0x61, 0x77, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x2a, 0x0a, 0x10, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, + 0x43, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, + 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x65, 0x73, + 0x22, 0x2d, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, + 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, + 0x16, 0x0a, 0x14, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, + 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0x73, 0x0a, 0x15, 0x48, 0x65, 0x72, 0x6f, 0x44, + 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x73, 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x16, 0x0a, 0x06, + 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, + 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, 0x92, 0x01, 0x0a, + 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x16, + 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x18, + 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, + 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, + 0x52, 0x05, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 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, 0x28, 0x0a, 0x0e, 0x48, 0x65, 0x72, 0x6f, 0x46, 0x75, 0x73, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x48, + 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x22, 0x3b, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x69, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x22, 0x5e, 0x0a, + 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, + 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x12, + 0x14, 0x0a, 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x58, 0x0a, + 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x4c, 0x65, 0x61, 0x72, 0x6e, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, + 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x74, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x49, 0x44, 0x22, 0x2a, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x54, + 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, + 0x05, 0x6f, 0x62, 0x6a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x62, + 0x6a, 0x49, 0x64, 0x22, 0x3c, 0x0a, 0x13, 0x48, 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, + 0x74, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x25, 0x0a, 0x06, 0x74, 0x65, + 0x6c, 0x6e, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x48, + 0x65, 0x72, 0x6f, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x65, 0x6c, 0x6e, 0x65, + 0x74, 0x22, 0x42, 0x0a, 0x0a, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, + 0x18, 0x0a, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x07, 0x62, 0x75, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x79, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x62, 0x75, 0x79, + 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x55, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x42, 0x75, 0x79, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x12, 0x16, 0x0a, 0x06, + 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, + 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x04, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x22, 0x2a, 0x0a, 0x10, + 0x48, 0x65, 0x72, 0x6f, 0x46, 0x69, 0x72, 0x73, 0x74, 0x47, 0x65, 0x74, 0x50, 0x75, 0x73, 0x68, + 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -2446,7 +2005,7 @@ func file_hero_hero_msg_proto_rawDescGZIP() []byte { return file_hero_hero_msg_proto_rawDescData } -var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 45) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 39) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -2455,76 +2014,64 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ (*MapStringInt32)(nil), // 4: MapStringInt32 (*HeroStrengthenUplvReq)(nil), // 5: HeroStrengthenUplvReq (*HeroStrengthenUplvResp)(nil), // 6: HeroStrengthenUplvResp - (*CostCardData)(nil), // 7: CostCardData - (*HeroStrengthenUpStarReq)(nil), // 8: HeroStrengthenUpStarReq - (*HeroStrengthenUpStarResp)(nil), // 9: HeroStrengthenUpStarResp - (*HeroStrengthenUpSkillReq)(nil), // 10: HeroStrengthenUpSkillReq - (*HeroStrengthenUpSkillResp)(nil), // 11: HeroStrengthenUpSkillResp - (*HeroResonanceReq)(nil), // 12: HeroResonanceReq - (*HeroResonanceResp)(nil), // 13: HeroResonanceResp - (*HeroResonanceResetReq)(nil), // 14: HeroResonanceResetReq - (*HeroResonanceResetResp)(nil), // 15: HeroResonanceResetResp - (*EnergyData)(nil), // 16: EnergyData - (*HeroResonanceUseEnergyReq)(nil), // 17: HeroResonanceUseEnergyReq - (*HeroResonanceUseEnergyResp)(nil), // 18: HeroResonanceUseEnergyResp - (*HeroAwakenReq)(nil), // 19: HeroAwakenReq - (*HeroAwakenResp)(nil), // 20: HeroAwakenResp - (*HeroPropertyPush)(nil), // 21: HeroPropertyPush - (*HeroLockReq)(nil), // 22: HeroLockReq - (*HeroLockResp)(nil), // 23: HeroLockResp - (*HeroGetSpecifiedReq)(nil), // 24: HeroGetSpecifiedReq - (*HeroGetSpecifiedResp)(nil), // 25: HeroGetSpecifiedResp - (*HeroDrawCardReq)(nil), // 26: HeroDrawCardReq - (*HeroDrawCardResp)(nil), // 27: HeroDrawCardResp - (*HeroChangePush)(nil), // 28: HeroChangePush - (*HeroDrawCardFloorReq)(nil), // 29: HeroDrawCardFloorReq - (*HeroDrawCardFloorResp)(nil), // 30: HeroDrawCardFloorResp - (*HeroFusionReq)(nil), // 31: HeroFusionReq - (*HeroFusionResp)(nil), // 32: HeroFusionResp - (*HeroTalentListReq)(nil), // 33: HeroTalentListReq - (*HeroTalentListResp)(nil), // 34: HeroTalentListResp - (*HeroTalentLearnReq)(nil), // 35: HeroTalentLearnReq - (*HeroTalentLearnResp)(nil), // 36: HeroTalentLearnResp - (*HeroTalentResetReq)(nil), // 37: HeroTalentResetReq - (*HeroTalentResetResp)(nil), // 38: HeroTalentResetResp - (*HeroBuyReq)(nil), // 39: HeroBuyReq - (*HeroBuyResp)(nil), // 40: HeroBuyResp - (*HeroFirstGetPush)(nil), // 41: HeroFirstGetPush - nil, // 42: HeroPropertyPush.PropertyEntry - nil, // 43: HeroPropertyPush.AddPropertyEntry - nil, // 44: HeroFusionReq.HerosEntry - (*DBHero)(nil), // 45: DBHero - (*DBHeroTalent)(nil), // 46: DBHeroTalent + (*HeroStrengthenUpStarReq)(nil), // 7: HeroStrengthenUpStarReq + (*HeroStrengthenUpStarResp)(nil), // 8: HeroStrengthenUpStarResp + (*HeroStrengthenUpSkillReq)(nil), // 9: HeroStrengthenUpSkillReq + (*HeroStrengthenUpSkillResp)(nil), // 10: HeroStrengthenUpSkillResp + (*HeroResonanceUseEnergyResp)(nil), // 11: HeroResonanceUseEnergyResp + (*HeroAwakenReq)(nil), // 12: HeroAwakenReq + (*HeroAwakenResp)(nil), // 13: HeroAwakenResp + (*HeroPropertyPush)(nil), // 14: HeroPropertyPush + (*HeroLockReq)(nil), // 15: HeroLockReq + (*HeroLockResp)(nil), // 16: HeroLockResp + (*HeroGetSpecifiedReq)(nil), // 17: HeroGetSpecifiedReq + (*HeroGetSpecifiedResp)(nil), // 18: HeroGetSpecifiedResp + (*HeroDrawCardReq)(nil), // 19: HeroDrawCardReq + (*HeroDrawCardResp)(nil), // 20: HeroDrawCardResp + (*HeroChangePush)(nil), // 21: HeroChangePush + (*HeroDrawCardFloorReq)(nil), // 22: HeroDrawCardFloorReq + (*HeroDrawCardFloorResp)(nil), // 23: HeroDrawCardFloorResp + (*HeroFusionReq)(nil), // 24: HeroFusionReq + (*HeroFusionResp)(nil), // 25: HeroFusionResp + (*HeroTalentListReq)(nil), // 26: HeroTalentListReq + (*HeroTalentListResp)(nil), // 27: HeroTalentListResp + (*HeroTalentLearnReq)(nil), // 28: HeroTalentLearnReq + (*HeroTalentLearnResp)(nil), // 29: HeroTalentLearnResp + (*HeroTalentResetReq)(nil), // 30: HeroTalentResetReq + (*HeroTalentResetResp)(nil), // 31: HeroTalentResetResp + (*HeroBuyReq)(nil), // 32: HeroBuyReq + (*HeroBuyResp)(nil), // 33: HeroBuyResp + (*HeroFirstGetPush)(nil), // 34: HeroFirstGetPush + nil, // 35: HeroStrengthenUplvReq.ItemEntry + nil, // 36: HeroPropertyPush.PropertyEntry + nil, // 37: HeroPropertyPush.AddPropertyEntry + nil, // 38: HeroFusionReq.HerosEntry + (*DBHero)(nil), // 39: DBHero + (*DBHeroTalent)(nil), // 40: DBHeroTalent } var file_hero_hero_msg_proto_depIdxs = []int32{ - 45, // 0: HeroInfoResp.base:type_name -> DBHero - 45, // 1: HeroListResp.list:type_name -> DBHero - 4, // 2: HeroStrengthenUplvReq.expCards:type_name -> MapStringInt32 - 45, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero - 7, // 4: HeroStrengthenUpStarReq.hero:type_name -> CostCardData - 7, // 5: HeroStrengthenUpStarReq.heroRace:type_name -> CostCardData - 45, // 6: HeroStrengthenUpStarResp.hero:type_name -> DBHero - 45, // 7: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 45, // 8: HeroResonanceResp.hero:type_name -> DBHero - 45, // 9: HeroResonanceResp.upStarCard:type_name -> DBHero - 45, // 10: HeroResonanceResetResp.hero:type_name -> DBHero - 16, // 11: HeroResonanceUseEnergyReq.energy:type_name -> EnergyData - 45, // 12: HeroResonanceUseEnergyResp.hero:type_name -> DBHero - 45, // 13: HeroAwakenResp.hero:type_name -> DBHero - 42, // 14: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry - 43, // 15: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 45, // 16: HeroLockResp.hero:type_name -> DBHero - 45, // 17: HeroGetSpecifiedResp.hero:type_name -> DBHero - 45, // 18: HeroChangePush.list:type_name -> DBHero - 44, // 19: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry - 46, // 20: HeroTalentListResp.telnet:type_name -> DBHeroTalent - 46, // 21: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent - 46, // 22: HeroTalentResetResp.telnet:type_name -> DBHeroTalent - 23, // [23:23] is the sub-list for method output_type - 23, // [23:23] is the sub-list for method input_type - 23, // [23:23] is the sub-list for extension type_name - 23, // [23:23] is the sub-list for extension extendee - 0, // [0:23] is the sub-list for field type_name + 39, // 0: HeroInfoResp.base:type_name -> DBHero + 39, // 1: HeroListResp.list:type_name -> DBHero + 35, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry + 39, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 39, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 39, // 5: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 39, // 6: HeroResonanceUseEnergyResp.hero:type_name -> DBHero + 39, // 7: HeroAwakenResp.hero:type_name -> DBHero + 36, // 8: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry + 37, // 9: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry + 39, // 10: HeroLockResp.hero:type_name -> DBHero + 39, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero + 39, // 12: HeroChangePush.list:type_name -> DBHero + 38, // 13: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry + 40, // 14: HeroTalentListResp.telnet:type_name -> DBHeroTalent + 40, // 15: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent + 40, // 16: HeroTalentResetResp.telnet:type_name -> DBHeroTalent + 17, // [17:17] is the sub-list for method output_type + 17, // [17:17] is the sub-list for method input_type + 17, // [17:17] is the sub-list for extension type_name + 17, // [17:17] is the sub-list for extension extendee + 0, // [0:17] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -2619,18 +2166,6 @@ func file_hero_hero_msg_proto_init() { } } file_hero_hero_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CostCardData); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroStrengthenUpStarReq); i { case 0: return &v.state @@ -2642,7 +2177,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroStrengthenUpStarResp); i { case 0: return &v.state @@ -2654,7 +2189,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroStrengthenUpSkillReq); i { case 0: return &v.state @@ -2666,7 +2201,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroStrengthenUpSkillResp); i { case 0: return &v.state @@ -2678,79 +2213,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroResonanceReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroResonanceResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroResonanceResetReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroResonanceResetResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*EnergyData); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*HeroResonanceUseEnergyReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_hero_hero_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroResonanceUseEnergyResp); i { case 0: return &v.state @@ -2762,7 +2225,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroAwakenReq); i { case 0: return &v.state @@ -2774,7 +2237,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroAwakenResp); i { case 0: return &v.state @@ -2786,7 +2249,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroPropertyPush); i { case 0: return &v.state @@ -2798,7 +2261,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroLockReq); i { case 0: return &v.state @@ -2810,7 +2273,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroLockResp); i { case 0: return &v.state @@ -2822,7 +2285,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroGetSpecifiedReq); i { case 0: return &v.state @@ -2834,7 +2297,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroGetSpecifiedResp); i { case 0: return &v.state @@ -2846,7 +2309,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroDrawCardReq); i { case 0: return &v.state @@ -2858,7 +2321,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroDrawCardResp); i { case 0: return &v.state @@ -2870,7 +2333,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroChangePush); i { case 0: return &v.state @@ -2882,7 +2345,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroDrawCardFloorReq); i { case 0: return &v.state @@ -2894,7 +2357,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroDrawCardFloorResp); i { case 0: return &v.state @@ -2906,7 +2369,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroFusionReq); i { case 0: return &v.state @@ -2918,7 +2381,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroFusionResp); i { case 0: return &v.state @@ -2930,7 +2393,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroTalentListReq); i { case 0: return &v.state @@ -2942,7 +2405,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroTalentListResp); i { case 0: return &v.state @@ -2954,7 +2417,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroTalentLearnReq); i { case 0: return &v.state @@ -2966,7 +2429,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroTalentLearnResp); i { case 0: return &v.state @@ -2978,7 +2441,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroTalentResetReq); i { case 0: return &v.state @@ -2990,7 +2453,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroTalentResetResp); i { case 0: return &v.state @@ -3002,7 +2465,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroBuyReq); i { case 0: return &v.state @@ -3014,7 +2477,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroBuyResp); i { case 0: return &v.state @@ -3026,7 +2489,7 @@ func file_hero_hero_msg_proto_init() { return nil } } - file_hero_hero_msg_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} { + file_hero_hero_msg_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*HeroFirstGetPush); i { case 0: return &v.state @@ -3045,7 +2508,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 45, + NumMessages: 39, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/rtask_msg.pb.go b/pb/rtask_msg.pb.go index b6250b6da..245389389 100644 --- a/pb/rtask_msg.pb.go +++ b/pb/rtask_msg.pb.go @@ -20,109 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// 申请做任务 -type RtaskApplyReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskApplyReq) Reset() { - *x = RtaskApplyReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskApplyReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskApplyReq) ProtoMessage() {} - -func (x *RtaskApplyReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_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 RtaskApplyReq.ProtoReflect.Descriptor instead. -func (*RtaskApplyReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{0} -} - -func (x *RtaskApplyReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskApplyReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -type RtaskApplyResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` -} - -func (x *RtaskApplyResp) Reset() { - *x = RtaskApplyResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskApplyResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskApplyResp) ProtoMessage() {} - -func (x *RtaskApplyResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[1] - 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 RtaskApplyResp.ProtoReflect.Descriptor instead. -func (*RtaskApplyResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{1} -} - -func (x *RtaskApplyResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - // 任务列表 type RtasklistReq struct { state protoimpl.MessageState @@ -135,7 +32,7 @@ type RtasklistReq struct { func (x *RtasklistReq) Reset() { *x = RtasklistReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[2] + mi := &file_rtask_rtask_msg_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -148,7 +45,7 @@ func (x *RtasklistReq) String() string { func (*RtasklistReq) ProtoMessage() {} func (x *RtasklistReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[2] + mi := &file_rtask_rtask_msg_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -161,7 +58,7 @@ func (x *RtasklistReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RtasklistReq.ProtoReflect.Descriptor instead. func (*RtasklistReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{2} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{0} } func (x *RtasklistReq) GetGroupId() int32 { @@ -183,7 +80,7 @@ type RtasklistResp struct { func (x *RtasklistResp) Reset() { *x = RtasklistResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[3] + mi := &file_rtask_rtask_msg_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -196,7 +93,7 @@ func (x *RtasklistResp) String() string { func (*RtasklistResp) ProtoMessage() {} func (x *RtasklistResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[3] + mi := &file_rtask_rtask_msg_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -209,7 +106,7 @@ func (x *RtasklistResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RtasklistResp.ProtoReflect.Descriptor instead. func (*RtasklistResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{3} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{1} } func (x *RtasklistResp) GetRtaskIds() []int32 { @@ -226,133 +123,6 @@ func (x *RtasklistResp) GetGroupId() int32 { return 0 } -// 对话选项 -type RtaskChooseReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - ChooseId int32 `protobuf:"varint,2,opt,name=chooseId,proto3" json:"chooseId"` //选项配置ID - RtaskSubId int32 `protobuf:"varint,3,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskChooseReq) Reset() { - *x = RtaskChooseReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskChooseReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskChooseReq) ProtoMessage() {} - -func (x *RtaskChooseReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[4] - 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 RtaskChooseReq.ProtoReflect.Descriptor instead. -func (*RtaskChooseReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{4} -} - -func (x *RtaskChooseReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskChooseReq) GetChooseId() int32 { - if x != nil { - return x.ChooseId - } - return 0 -} - -func (x *RtaskChooseReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -type RtaskChooseResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - ChooseId int32 `protobuf:"varint,2,opt,name=chooseId,proto3" json:"chooseId"` //选项配置ID - RtaskSubId int32 `protobuf:"varint,3,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskChooseResp) Reset() { - *x = RtaskChooseResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskChooseResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskChooseResp) ProtoMessage() {} - -func (x *RtaskChooseResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RtaskChooseResp.ProtoReflect.Descriptor instead. -func (*RtaskChooseResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{5} -} - -func (x *RtaskChooseResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskChooseResp) GetChooseId() int32 { - if x != nil { - return x.ChooseId - } - return 0 -} - -func (x *RtaskChooseResp) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - // 任务完成推送 type RtaskFinishPush struct { state protoimpl.MessageState @@ -365,7 +135,7 @@ type RtaskFinishPush struct { func (x *RtaskFinishPush) Reset() { *x = RtaskFinishPush{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[6] + mi := &file_rtask_rtask_msg_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -378,7 +148,7 @@ func (x *RtaskFinishPush) String() string { func (*RtaskFinishPush) ProtoMessage() {} func (x *RtaskFinishPush) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[6] + mi := &file_rtask_rtask_msg_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -391,7 +161,7 @@ func (x *RtaskFinishPush) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskFinishPush.ProtoReflect.Descriptor instead. func (*RtaskFinishPush) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{6} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{2} } func (x *RtaskFinishPush) GetRtaskId() int32 { @@ -414,7 +184,7 @@ type RtaskFinishIdsPush struct { func (x *RtaskFinishIdsPush) Reset() { *x = RtaskFinishIdsPush{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[7] + mi := &file_rtask_rtask_msg_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -427,7 +197,7 @@ func (x *RtaskFinishIdsPush) String() string { func (*RtaskFinishIdsPush) ProtoMessage() {} func (x *RtaskFinishIdsPush) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[7] + mi := &file_rtask_rtask_msg_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -440,7 +210,7 @@ func (x *RtaskFinishIdsPush) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskFinishIdsPush.ProtoReflect.Descriptor instead. func (*RtaskFinishIdsPush) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{7} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{3} } func (x *RtaskFinishIdsPush) GetRtaskId() []int32 { @@ -457,347 +227,6 @@ func (x *RtaskFinishIdsPush) GetGroupId() int32 { return 0 } -// 领奖 -type RtaskGetRewardReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskGetRewardReq) Reset() { - *x = RtaskGetRewardReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskGetRewardReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskGetRewardReq) ProtoMessage() {} - -func (x *RtaskGetRewardReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[8] - 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 RtaskGetRewardReq.ProtoReflect.Descriptor instead. -func (*RtaskGetRewardReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{8} -} - -func (x *RtaskGetRewardReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskGetRewardReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -type RtaskGetRewardResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskGetRewardResp) Reset() { - *x = RtaskGetRewardResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskGetRewardResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskGetRewardResp) ProtoMessage() {} - -func (x *RtaskGetRewardResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[9] - 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 RtaskGetRewardResp.ProtoReflect.Descriptor instead. -func (*RtaskGetRewardResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9} -} - -func (x *RtaskGetRewardResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskGetRewardResp) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -// 开始战斗 -type RtaskBattleStartReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID - Leadpos int32 `protobuf:"varint,3,opt,name=leadpos,proto3" json:"leadpos"` //队长位置 - Teamids []string `protobuf:"bytes,4,rep,name=teamids,proto3" json:"teamids"` //阵容信息 -} - -func (x *RtaskBattleStartReq) Reset() { - *x = RtaskBattleStartReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleStartReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleStartReq) ProtoMessage() {} - -func (x *RtaskBattleStartReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_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 RtaskBattleStartReq.ProtoReflect.Descriptor instead. -func (*RtaskBattleStartReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{10} -} - -func (x *RtaskBattleStartReq) GetBattleConfId() int32 { - if x != nil { - return x.BattleConfId - } - return 0 -} - -func (x *RtaskBattleStartReq) GetLeadpos() int32 { - if x != nil { - return x.Leadpos - } - return 0 -} - -func (x *RtaskBattleStartReq) GetTeamids() []string { - if x != nil { - return x.Teamids - } - return nil -} - -type RtaskBattleStartResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Info *BattleInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info"` //战斗信息 -} - -func (x *RtaskBattleStartResp) Reset() { - *x = RtaskBattleStartResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleStartResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleStartResp) ProtoMessage() {} - -func (x *RtaskBattleStartResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_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 RtaskBattleStartResp.ProtoReflect.Descriptor instead. -func (*RtaskBattleStartResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{11} -} - -func (x *RtaskBattleStartResp) GetInfo() *BattleInfo { - if x != nil { - return x.Info - } - return nil -} - -// 战斗完成 -type RtaskBattleFinishReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID - ChooseId int32 `protobuf:"varint,3,opt,name=chooseId,proto3" json:"chooseId"` //选项配置ID -} - -func (x *RtaskBattleFinishReq) Reset() { - *x = RtaskBattleFinishReq{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleFinishReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleFinishReq) ProtoMessage() {} - -func (x *RtaskBattleFinishReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_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 RtaskBattleFinishReq.ProtoReflect.Descriptor instead. -func (*RtaskBattleFinishReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{12} -} - -func (x *RtaskBattleFinishReq) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskBattleFinishReq) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - -func (x *RtaskBattleFinishReq) GetChooseId() int32 { - if x != nil { - return x.ChooseId - } - return 0 -} - -type RtaskBattleFinishResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - RtaskId int32 `protobuf:"varint,1,opt,name=rtaskId,proto3" json:"rtaskId"` //任务ID - RtaskSubId int32 `protobuf:"varint,2,opt,name=rtaskSubId,proto3" json:"rtaskSubId"` //支线任务ID -} - -func (x *RtaskBattleFinishResp) Reset() { - *x = RtaskBattleFinishResp{} - if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[13] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RtaskBattleFinishResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RtaskBattleFinishResp) ProtoMessage() {} - -func (x *RtaskBattleFinishResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_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 RtaskBattleFinishResp.ProtoReflect.Descriptor instead. -func (*RtaskBattleFinishResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{13} -} - -func (x *RtaskBattleFinishResp) GetRtaskId() int32 { - if x != nil { - return x.RtaskId - } - return 0 -} - -func (x *RtaskBattleFinishResp) GetRtaskSubId() int32 { - if x != nil { - return x.RtaskSubId - } - return 0 -} - //获取玩家任务记录 type RtaskGetrecordReq struct { state protoimpl.MessageState @@ -808,7 +237,7 @@ type RtaskGetrecordReq struct { func (x *RtaskGetrecordReq) Reset() { *x = RtaskGetrecordReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[14] + mi := &file_rtask_rtask_msg_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -821,7 +250,7 @@ func (x *RtaskGetrecordReq) String() string { func (*RtaskGetrecordReq) ProtoMessage() {} func (x *RtaskGetrecordReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[14] + mi := &file_rtask_rtask_msg_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -834,7 +263,7 @@ func (x *RtaskGetrecordReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskGetrecordReq.ProtoReflect.Descriptor instead. func (*RtaskGetrecordReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{14} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{4} } type RtaskGetrecordResp struct { @@ -848,7 +277,7 @@ type RtaskGetrecordResp struct { func (x *RtaskGetrecordResp) Reset() { *x = RtaskGetrecordResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[15] + mi := &file_rtask_rtask_msg_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -861,7 +290,7 @@ func (x *RtaskGetrecordResp) String() string { func (*RtaskGetrecordResp) ProtoMessage() {} func (x *RtaskGetrecordResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[15] + mi := &file_rtask_rtask_msg_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -874,7 +303,7 @@ func (x *RtaskGetrecordResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskGetrecordResp.ProtoReflect.Descriptor instead. func (*RtaskGetrecordResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{15} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{5} } func (x *RtaskGetrecordResp) GetRecord() *DBRtaskRecord { @@ -884,6 +313,109 @@ func (x *RtaskGetrecordResp) GetRecord() *DBRtaskRecord { return nil } +//任务触发 +type RtaskSendReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + TaskType int32 `protobuf:"varint,1,opt,name=taskType,proto3" json:"taskType"` //任务类型 + Params []int32 `protobuf:"varint,2,rep,packed,name=params,proto3" json:"params"` //任务参数 +} + +func (x *RtaskSendReq) Reset() { + *x = RtaskSendReq{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[6] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskSendReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskSendReq) ProtoMessage() {} + +func (x *RtaskSendReq) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_msg_proto_msgTypes[6] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RtaskSendReq.ProtoReflect.Descriptor instead. +func (*RtaskSendReq) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{6} +} + +func (x *RtaskSendReq) GetTaskType() int32 { + if x != nil { + return x.TaskType + } + return 0 +} + +func (x *RtaskSendReq) GetParams() []int32 { + if x != nil { + return x.Params + } + return nil +} + +type RtaskSendResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + IsSucc bool `protobuf:"varint,1,opt,name=isSucc,proto3" json:"isSucc"` +} + +func (x *RtaskSendResp) Reset() { + *x = RtaskSendResp{} + if protoimpl.UnsafeEnabled { + mi := &file_rtask_rtask_msg_proto_msgTypes[7] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RtaskSendResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RtaskSendResp) ProtoMessage() {} + +func (x *RtaskSendResp) ProtoReflect() protoreflect.Message { + mi := &file_rtask_rtask_msg_proto_msgTypes[7] + 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 RtaskSendResp.ProtoReflect.Descriptor instead. +func (*RtaskSendResp) Descriptor() ([]byte, []int) { + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{7} +} + +func (x *RtaskSendResp) GetIsSucc() bool { + if x != nil { + return x.IsSucc + } + return false +} + // 测试使用 type RtaskTestReq struct { state protoimpl.MessageState @@ -900,7 +432,7 @@ type RtaskTestReq struct { func (x *RtaskTestReq) Reset() { *x = RtaskTestReq{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[16] + mi := &file_rtask_rtask_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -913,7 +445,7 @@ func (x *RtaskTestReq) String() string { func (*RtaskTestReq) ProtoMessage() {} func (x *RtaskTestReq) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[16] + mi := &file_rtask_rtask_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -926,7 +458,7 @@ func (x *RtaskTestReq) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskTestReq.ProtoReflect.Descriptor instead. func (*RtaskTestReq) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{16} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{8} } func (x *RtaskTestReq) GetRtaskType() int32 { @@ -976,7 +508,7 @@ type RtaskTestResp struct { func (x *RtaskTestResp) Reset() { *x = RtaskTestResp{} if protoimpl.UnsafeEnabled { - mi := &file_rtask_rtask_msg_proto_msgTypes[17] + mi := &file_rtask_rtask_msg_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -989,7 +521,7 @@ func (x *RtaskTestResp) String() string { func (*RtaskTestResp) ProtoMessage() {} func (x *RtaskTestResp) ProtoReflect() protoreflect.Message { - mi := &file_rtask_rtask_msg_proto_msgTypes[17] + mi := &file_rtask_rtask_msg_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1002,7 +534,7 @@ func (x *RtaskTestResp) ProtoReflect() protoreflect.Message { // Deprecated: Use RtaskTestResp.ProtoReflect.Descriptor instead. func (*RtaskTestResp) Descriptor() ([]byte, []int) { - return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{17} + return file_rtask_rtask_msg_proto_rawDescGZIP(), []int{9} } func (x *RtaskTestResp) GetFlag() bool { @@ -1026,94 +558,48 @@ var file_rtask_rtask_msg_proto_rawDesc = []byte{ 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x5f, 0x6d, 0x73, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x2f, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, - 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, - 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, - 0x64, 0x22, 0x2a, 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x28, 0x0a, - 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, - 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x45, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, - 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x66, - 0x0a, 0x0e, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x71, - 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, - 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, - 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, - 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x67, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x43, - 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, - 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, - 0x6b, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x12, - 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, - 0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, - 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, - 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, - 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, - 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, - 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x4d, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, - 0x65, 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, - 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, - 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x4e, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, - 0x74, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, - 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, - 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, - 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x6d, 0x0a, 0x13, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, - 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x22, 0x0a, 0x0c, - 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, - 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x07, 0x6c, 0x65, 0x61, 0x64, 0x70, 0x6f, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x65, - 0x61, 0x6d, 0x69, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x74, 0x65, 0x61, - 0x6d, 0x69, 0x64, 0x73, 0x22, 0x37, 0x0a, 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x04, - 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, - 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6c, 0x0a, - 0x14, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, - 0x73, 0x68, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, - 0x1e, 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x63, 0x68, 0x6f, 0x6f, 0x73, 0x65, 0x49, 0x64, 0x22, 0x51, 0x0a, 0x15, 0x52, - 0x74, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x12, 0x1e, - 0x0a, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x0a, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x75, 0x62, 0x49, 0x64, 0x22, 0x13, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, + 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, + 0x22, 0x45, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x12, 0x18, 0x0a, + 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x2b, 0x0a, 0x0f, 0x52, 0x74, 0x61, 0x73, 0x6b, + 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x46, 0x69, 0x6e, + 0x69, 0x73, 0x68, 0x49, 0x64, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x22, 0x13, 0x0a, 0x11, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x22, 0x3c, 0x0a, 0x12, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x65, 0x74, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x22, 0x94, 0x01, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, - 0x65, 0x71, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, - 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, - 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, - 0x69, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, - 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, - 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x3f, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, - 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, - 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x12, 0x1a, 0x0a, - 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, - 0x08, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x22, 0x42, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x27, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x53, 0x65, + 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x94, + 0x01, 0x0a, 0x0c, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, + 0x1c, 0x0a, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x49, 0x64, 0x12, + 0x18, 0x0a, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x07, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x74, 0x61, + 0x73, 0x6b, 0x49, 0x64, 0x73, 0x22, 0x3f, 0x0a, 0x0d, 0x52, 0x74, 0x61, 0x73, 0x6b, 0x54, 0x65, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x72, 0x74, + 0x61, 0x73, 0x6b, 0x49, 0x64, 0x73, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1128,37 +614,27 @@ func file_rtask_rtask_msg_proto_rawDescGZIP() []byte { return file_rtask_rtask_msg_proto_rawDescData } -var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 18) +var file_rtask_rtask_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_rtask_rtask_msg_proto_goTypes = []interface{}{ - (*RtaskApplyReq)(nil), // 0: RtaskApplyReq - (*RtaskApplyResp)(nil), // 1: RtaskApplyResp - (*RtasklistReq)(nil), // 2: RtasklistReq - (*RtasklistResp)(nil), // 3: RtasklistResp - (*RtaskChooseReq)(nil), // 4: RtaskChooseReq - (*RtaskChooseResp)(nil), // 5: RtaskChooseResp - (*RtaskFinishPush)(nil), // 6: RtaskFinishPush - (*RtaskFinishIdsPush)(nil), // 7: RtaskFinishIdsPush - (*RtaskGetRewardReq)(nil), // 8: RtaskGetRewardReq - (*RtaskGetRewardResp)(nil), // 9: RtaskGetRewardResp - (*RtaskBattleStartReq)(nil), // 10: RtaskBattleStartReq - (*RtaskBattleStartResp)(nil), // 11: RtaskBattleStartResp - (*RtaskBattleFinishReq)(nil), // 12: RtaskBattleFinishReq - (*RtaskBattleFinishResp)(nil), // 13: RtaskBattleFinishResp - (*RtaskGetrecordReq)(nil), // 14: RtaskGetrecordReq - (*RtaskGetrecordResp)(nil), // 15: RtaskGetrecordResp - (*RtaskTestReq)(nil), // 16: RtaskTestReq - (*RtaskTestResp)(nil), // 17: RtaskTestResp - (*BattleInfo)(nil), // 18: BattleInfo - (*DBRtaskRecord)(nil), // 19: DBRtaskRecord + (*RtasklistReq)(nil), // 0: RtasklistReq + (*RtasklistResp)(nil), // 1: RtasklistResp + (*RtaskFinishPush)(nil), // 2: RtaskFinishPush + (*RtaskFinishIdsPush)(nil), // 3: RtaskFinishIdsPush + (*RtaskGetrecordReq)(nil), // 4: RtaskGetrecordReq + (*RtaskGetrecordResp)(nil), // 5: RtaskGetrecordResp + (*RtaskSendReq)(nil), // 6: RtaskSendReq + (*RtaskSendResp)(nil), // 7: RtaskSendResp + (*RtaskTestReq)(nil), // 8: RtaskTestReq + (*RtaskTestResp)(nil), // 9: RtaskTestResp + (*DBRtaskRecord)(nil), // 10: DBRtaskRecord } var file_rtask_rtask_msg_proto_depIdxs = []int32{ - 18, // 0: RtaskBattleStartResp.info:type_name -> BattleInfo - 19, // 1: RtaskGetrecordResp.record:type_name -> DBRtaskRecord - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 10, // 0: RtaskGetrecordResp.record:type_name -> DBRtaskRecord + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_rtask_rtask_msg_proto_init() } @@ -1170,30 +646,6 @@ func file_rtask_rtask_msg_proto_init() { file_rtask_rtask_db_proto_init() if !protoimpl.UnsafeEnabled { file_rtask_rtask_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskApplyReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskApplyResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtasklistReq); i { case 0: return &v.state @@ -1205,7 +657,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtasklistResp); i { case 0: return &v.state @@ -1217,31 +669,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskChooseReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskChooseResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskFinishPush); i { case 0: return &v.state @@ -1253,7 +681,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskFinishIdsPush); i { case 0: return &v.state @@ -1265,79 +693,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskGetRewardReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskGetRewardResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleStartReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleStartResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleFinishReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RtaskBattleFinishResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_rtask_rtask_msg_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskGetrecordReq); i { case 0: return &v.state @@ -1349,7 +705,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskGetrecordResp); i { case 0: return &v.state @@ -1361,7 +717,31 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskSendReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RtaskSendResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_rtask_rtask_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskTestReq); i { case 0: return &v.state @@ -1373,7 +753,7 @@ func file_rtask_rtask_msg_proto_init() { return nil } } - file_rtask_rtask_msg_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_rtask_rtask_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RtaskTestResp); i { case 0: return &v.state @@ -1392,7 +772,7 @@ func file_rtask_rtask_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_rtask_rtask_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 18, + NumMessages: 10, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 7cc7d14a1..0f29b8494 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -130,6 +130,7 @@ type DBUser struct { Bgp string `protobuf:"bytes,24,opt,name=bgp,proto3" json:"bgp" bson:"bgp"` //背景 Ps int32 `protobuf:"varint,25,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 LastRecoverPsSec int64 `protobuf:"varint,26,opt,name=lastRecoverPsSec,proto3" json:"lastRecoverPsSec" bson:"lastRecoverPsSec"` // 上次体会恢复时间 + Moongold int32 `protobuf:"varint,27,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 } func (x *DBUser) Reset() { @@ -346,6 +347,13 @@ func (x *DBUser) GetLastRecoverPsSec() int64 { return 0 } +func (x *DBUser) GetMoongold() int32 { + if x != nil { + return x.Moongold + } + return 0 +} + type DBUserSetting struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -598,8 +606,8 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x61, 0x67, 0x12, 0x2a, 0x0a, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0xee, - 0x04, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x0a, 0x02, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x70, 0x22, 0x8a, + 0x05, 0x0a, 0x06, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x75, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x75, 0x69, 0x64, 0x12, @@ -637,39 +645,41 @@ var file_user_user_db_proto_rawDesc = []byte{ 0x62, 0x67, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x6c, 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x73, 0x53, 0x65, 0x63, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x6c, - 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x73, 0x53, 0x65, 0x63, 0x22, - 0xc7, 0x02, 0x0a, 0x0d, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, - 0x67, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, - 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, - 0x6b, 0x61, 0x6e, 0x67, 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, - 0x67, 0x75, 0x61, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, - 0x67, 0x75, 0x61, 0x6e, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, - 0x69, 0x63, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, - 0x16, 0x0a, 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x06, 0x65, 0x66, 0x66, 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, - 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, - 0x62, 0x65, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, - 0x75, 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, - 0x6f, 0x64, 0x6f, 0x6e, 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, - 0x6e, 0x67, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, - 0x61, 0x6e, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xa2, 0x01, 0x0a, 0x06, 0x44, 0x42, - 0x53, 0x69, 0x67, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, - 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, - 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, - 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x54, 0x69, 0x6d, - 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x73, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x50, 0x73, 0x53, 0x65, 0x63, 0x12, + 0x1a, 0x0a, 0x08, 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x1b, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x08, 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x22, 0xc7, 0x02, 0x0a, 0x0d, + 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x0a, + 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, + 0x16, 0x0a, 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x06, 0x68, 0x75, 0x61, 0x7a, 0x68, 0x69, 0x12, 0x1c, 0x0a, 0x09, 0x6b, 0x61, 0x6e, 0x67, 0x6a, + 0x75, 0x63, 0x68, 0x69, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x6b, 0x61, 0x6e, 0x67, + 0x6a, 0x75, 0x63, 0x68, 0x69, 0x12, 0x1a, 0x0a, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, + 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x67, 0x61, 0x6f, 0x67, 0x75, 0x61, 0x6e, + 0x67, 0x12, 0x12, 0x0a, 0x04, 0x77, 0x75, 0x6c, 0x69, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x04, 0x77, 0x75, 0x6c, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x06, 0x65, + 0x66, 0x66, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x65, 0x66, 0x66, + 0x65, 0x63, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x18, 0x09, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x05, 0x67, 0x75, 0x61, 0x6a, 0x69, 0x12, 0x14, 0x0a, 0x05, 0x66, 0x75, 0x62, + 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x66, 0x75, 0x62, 0x65, 0x6e, 0x12, + 0x16, 0x0a, 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, + 0x06, 0x74, 0x61, 0x6e, 0x73, 0x75, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, + 0x6e, 0x67, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68, 0x75, 0x6f, 0x64, 0x6f, 0x6e, + 0x67, 0x12, 0x1c, 0x0a, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x18, 0x0d, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x78, 0x75, 0x61, 0x6e, 0x73, 0x68, 0x61, 0x6e, 0x67, 0x12, + 0x14, 0x0a, 0x05, 0x73, 0x61, 0x69, 0x6a, 0x69, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, + 0x73, 0x61, 0x69, 0x6a, 0x69, 0x22, 0xa2, 0x01, 0x0a, 0x06, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, + 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x69, 0x67, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, + 0x0a, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x09, 0x73, 0x69, 0x67, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x03, 0x63, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x05, 0x72, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, + 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index 7ef020739..f6e23a9d5 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -594,6 +594,7 @@ type UserResChangedPush struct { Guildcoin int32 `protobuf:"varint,7,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 Arenacoin int32 `protobuf:"varint,8,opt,name=arenacoin,proto3" json:"arenacoin" bson:"arenacoin"` //竞技场币 Ps int32 `protobuf:"varint,9,opt,name=ps,proto3" json:"ps" bson:"ps"` //体力 + Moongold int32 `protobuf:"varint,10,opt,name=moongold,proto3" json:"moongold" bson:"moongold"` //纯净月髓 } func (x *UserResChangedPush) Reset() { @@ -691,6 +692,13 @@ func (x *UserResChangedPush) GetPs() int32 { return 0 } +func (x *UserResChangedPush) GetMoongold() int32 { + if x != nil { + return x.Moongold + } + return 0 +} + // 玩家在其它终端登录的通知 type UserOtherTermLoginPush struct { state protoimpl.MessageState @@ -2511,7 +2519,7 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x67, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x22, 0x28, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0xec, 0x01, + 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x49, 0x73, 0x53, 0x75, 0x63, 0x63, 0x22, 0x88, 0x02, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x67, 0x6f, 0x6c, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, @@ -2526,127 +2534,129 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, - 0x70, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x22, 0x2a, 0x0a, 0x16, - 0x55, 0x73, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, - 0x69, 0x6e, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, - 0x50, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, - 0x02, 0x70, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x22, 0x13, 0x0a, - 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, - 0x65, 0x71, 0x22, 0x3e, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, - 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, - 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, - 0x6e, 0x67, 0x22, 0x40, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, - 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, - 0x74, 0x69, 0x6e, 0x67, 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, - 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, - 0x65, 0x71, 0x22, 0x26, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, - 0x64, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, - 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, - 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, - 0x65, 0x22, 0x24, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, - 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, - 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x22, 0x50, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, - 0x6d, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, - 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, - 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, - 0x6d, 0x65, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, - 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, - 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, - 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, - 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, - 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, - 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, - 0x62, 0x67, 0x70, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, - 0x49, 0x64, 0x22, 0x31, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, - 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, - 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, - 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, - 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x55, - 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, - 0x2d, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x47, - 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, - 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x03, 0x52, 0x03, 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, - 0x69, 0x70, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, - 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x06, 0x76, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, - 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, - 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, - 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, - 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, - 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, - 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, - 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, - 0x02, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, - 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x0c, - 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x52, 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x12, 0x34, 0x0a, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, - 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, - 0x74, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, - 0x44, 0x42, 0x56, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, - 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, - 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, - 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, - 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, - 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, - 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, - 0x12, 0x1e, 0x0a, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, - 0x22, 0x32, 0x0a, 0x0e, 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, - 0x73, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x0a, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, - 0x73, 0x65, 0x72, 0x73, 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, - 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, - 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, - 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, - 0x3a, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, - 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, - 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, - 0x73, 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x0c, 0x55, 0x73, - 0x65, 0x72, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, - 0x6e, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x12, 0x1a, 0x0a, 0x08, + 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, + 0x6d, 0x6f, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x64, 0x22, 0x2a, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, + 0x4f, 0x74, 0x68, 0x65, 0x72, 0x54, 0x65, 0x72, 0x6d, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x50, 0x75, + 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x75, 0x69, 0x64, 0x22, 0x23, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x50, 0x73, 0x43, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x0e, 0x0a, 0x02, 0x70, 0x73, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x70, 0x73, 0x22, 0x13, 0x0a, 0x11, 0x55, 0x73, 0x65, + 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x22, 0x3e, + 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x22, 0x40, + 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, 0x74, 0x74, + 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x12, 0x28, 0x0a, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, + 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, + 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x07, 0x73, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, + 0x22, 0x29, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x65, + 0x74, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, + 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, 0x71, 0x22, 0x26, + 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x56, 0x65, 0x72, 0x69, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x25, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, + 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x22, 0x24, 0x0a, + 0x10, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x69, 0x74, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x73, + 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, + 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x50, 0x0a, 0x12, + 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x52, 0x65, + 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x31, + 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, 0x76, 0x61, 0x74, + 0x61, 0x72, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, + 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x61, + 0x76, 0x61, 0x74, 0x61, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x61, + 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x61, + 0x76, 0x61, 0x74, 0x61, 0x72, 0x49, 0x64, 0x22, 0x28, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x4d, + 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, 0x67, 0x70, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x62, + 0x67, 0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, + 0x64, 0x22, 0x3b, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x62, + 0x67, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x67, 0x70, 0x49, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x67, 0x70, 0x49, 0x64, 0x22, 0x31, + 0x0a, 0x13, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, 0x69, 0x67, 0x75, + 0x72, 0x65, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, + 0x64, 0x22, 0x44, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x66, + 0x69, 0x67, 0x75, 0x72, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, + 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, + 0x69, 0x67, 0x75, 0x72, 0x65, 0x49, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x47, + 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x2d, 0x0a, 0x11, 0x55, + 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x52, 0x65, 0x73, 0x70, + 0x12, 0x18, 0x0a, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x07, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x73, 0x22, 0x47, 0x0a, 0x11, 0x55, 0x73, + 0x65, 0x72, 0x4c, 0x76, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, + 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, + 0x64, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, + 0x65, 0x78, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x02, 0x6c, 0x76, 0x22, 0x54, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x56, 0x69, 0x70, 0x43, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x64, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x76, + 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x76, 0x69, 0x70, + 0x45, 0x78, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x76, 0x69, 0x70, 0x4c, 0x76, 0x22, 0x27, 0x0a, 0x11, 0x55, 0x73, 0x65, + 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x12, + 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, 0x69, + 0x67, 0x6e, 0x22, 0x26, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, + 0x73, 0x69, 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x13, 0x55, 0x73, + 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, + 0x75, 0x69, 0x64, 0x22, 0xf0, 0x01, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, + 0x73, 0x65, 0x72, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x1d, 0x0a, 0x02, 0x65, 0x78, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, + 0x70, 0x61, 0x6e, 0x64, 0x52, 0x02, 0x65, 0x78, 0x12, 0x33, 0x0a, 0x0c, 0x70, 0x61, 0x67, 0x6f, + 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, + 0x2e, 0x44, 0x42, 0x50, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, + 0x0c, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x34, 0x0a, + 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x48, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, + 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0d, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x12, 0x31, 0x0a, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x56, 0x69, + 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x0c, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, + 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, + 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x27, 0x0a, 0x13, + 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x74, 0x74, 0x69, 0x6e, 0x67, 0x74, 0x65, 0x61, 0x6d, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x03, 0x75, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x53, 0x68, 0x6f, + 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x22, 0x32, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, + 0x53, 0x68, 0x6f, 0x77, 0x74, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, + 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, + 0x52, 0x0a, 0x68, 0x65, 0x72, 0x6f, 0x4f, 0x62, 0x6a, 0x49, 0x64, 0x73, 0x22, 0x32, 0x0a, 0x0e, + 0x55, 0x73, 0x65, 0x72, 0x4f, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, + 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, + 0x43, 0x61, 0x63, 0x68, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, + 0x22, 0x31, 0x0a, 0x10, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x75, 0x73, + 0x65, 0x72, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x55, 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, + 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x22, 0x3a, 0x0a, 0x15, 0x55, + 0x73, 0x65, 0x72, 0x47, 0x65, 0x74, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x21, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, + 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x0d, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, + 0x69, 0x67, 0x6e, 0x52, 0x65, 0x71, 0x22, 0x43, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x53, 0x69, + 0x67, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x53, 0x69, 0x67, 0x6e, 0x52, 0x04, 0x64, + 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, + 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/userexpand.pb.go b/pb/userexpand.pb.go index 9203c6dac..aaa69f7c9 100644 --- a/pb/userexpand.pb.go +++ b/pb/userexpand.pb.go @@ -26,36 +26,36 @@ type DBUserExpand struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id - Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间 - LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间 - InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 - Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 - ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数 - Tujian map[string]int32 `protobuf:"bytes,8,rep,name=tujian,proto3" json:"tujian" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //图鉴 - Activeday int32 `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"` //日活跃度 - Activeweek int32 `protobuf:"varint,12,opt,name=activeweek,proto3" json:"activeweek"` //周活跃度 - Sign string `protobuf:"bytes,13,opt,name=sign,proto3" json:"sign"` //用户签名 - FriendPoint int32 `protobuf:"varint,14,opt,name=friendPoint,proto3" json:"friendPoint" bson:"friendPoint"` //友情点 - FriendPointID int32 `protobuf:"varint,15,opt,name=friendPointID,proto3" json:"friendPointID" bson:"friendPointID"` //每日获赠友情点 - FriendPointOD int32 `protobuf:"varint,16,opt,name=friendPointOD,proto3" json:"friendPointOD" bson:"friendPointOD"` //每日送出友情点 - LoginAddCount int32 `protobuf:"varint,19,opt,name=loginAddCount,proto3" json:"loginAddCount"` //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数 - LoginContinueCount int32 `protobuf:"varint,20,opt,name=loginContinueCount,proto3" json:"loginContinueCount"` //@go_tasgs(`bson:"loginContinueCount"`) 连续登录天数 - RtaskId int32 `protobuf:"varint,21,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID - TeamHeroIds []string `protobuf:"bytes,22,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs - SociatyId string `protobuf:"bytes,23,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"` //公会ID - SociatyCd int64 `protobuf:"varint,24,opt,name=sociatyCd,proto3" json:"sociatyCd" bson:"sociatyCd"` //主动退出CD - Guildcoin int32 `protobuf:"varint,25,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 - Arenacoin int32 `protobuf:"varint,26,opt,name=arenacoin,proto3" json:"arenacoin" bson:"arenacoin"` //竞技场币 - Physicalbuynum int32 `protobuf:"varint,27,opt,name=physicalbuynum,proto3" json:"physicalbuynum"` //@go_tags(`bson:"physicalbuynum"`)体力购买次数 - PhysicalbuyLasttime int64 `protobuf:"varint,28,opt,name=physicalbuyLasttime,proto3" json:"physicalbuyLasttime"` //@go_tags(`bson:"physicalbuyLasttime"`)最后购买体力事件 - Buyunifiedticket int32 `protobuf:"varint,29,opt,name=buyunifiedticket,proto3" json:"buyunifiedticket"` //@go_tags(`bson:"buyunifiedticket"`)购买统一入场门票次数 - Lasttimeunifiedticket int64 `protobuf:"varint,30,opt,name=lasttimeunifiedticket,proto3" json:"lasttimeunifiedticket"` //@go_tags(`bson:"lasttimeunifiedticket"`)最后购买统一入场门票时间 - Recovertimeunifiedticket int64 `protobuf:"varint,31,opt,name=recovertimeunifiedticket,proto3" json:"recovertimeunifiedticket"` //@go_tags(`bson:"recovertimeunifiedticket"`)同意门票恢复时间 - SociatyTicketBuyNum int32 `protobuf:"varint,32,opt,name=sociatyTicketBuyNum,proto3" json:"sociatyTicketBuyNum" bson:"sociatyTicketBuyNum"` //公会boss挑战券购买次数 - SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量 - Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id"` //主键id + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` //用户id + Lastreadnotiftime int64 `protobuf:"varint,3,opt,name=lastreadnotiftime,proto3" json:"lastreadnotiftime"` //最后阅读公告时间 + LastInitdataTime int64 `protobuf:"varint,4,opt,name=lastInitdataTime,proto3" json:"lastInitdataTime"` //上次初始数据时间 + InitdataCount uint32 `protobuf:"varint,5,opt,name=initdataCount,proto3" json:"initdataCount"` //今日初始累计次数 + Chatchannel int32 `protobuf:"varint,6,opt,name=chatchannel,proto3" json:"chatchannel"` //跨服聊天频道 + ModifynameCount int32 `protobuf:"varint,7,opt,name=modifynameCount,proto3" json:"modifynameCount"` //修改昵称次数 + //map tujian = 8; //图鉴 + Activeday int32 `protobuf:"varint,11,opt,name=activeday,proto3" json:"activeday"` //日活跃度 + Activeweek int32 `protobuf:"varint,12,opt,name=activeweek,proto3" json:"activeweek"` //周活跃度 + Sign string `protobuf:"bytes,13,opt,name=sign,proto3" json:"sign"` //用户签名 + FriendPoint int32 `protobuf:"varint,14,opt,name=friendPoint,proto3" json:"friendPoint" bson:"friendPoint"` //友情点 + FriendPointID int32 `protobuf:"varint,15,opt,name=friendPointID,proto3" json:"friendPointID" bson:"friendPointID"` //每日获赠友情点 + FriendPointOD int32 `protobuf:"varint,16,opt,name=friendPointOD,proto3" json:"friendPointOD" bson:"friendPointOD"` //每日送出友情点 + LoginAddCount int32 `protobuf:"varint,19,opt,name=loginAddCount,proto3" json:"loginAddCount"` //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数 + LoginContinueCount int32 `protobuf:"varint,20,opt,name=loginContinueCount,proto3" json:"loginContinueCount"` //@go_tasgs(`bson:"loginContinueCount"`) 连续登录天数 + RtaskId int32 `protobuf:"varint,21,opt,name=rtaskId,proto3" json:"rtaskId" bson:"rtaskId"` // 当前完成的随机任务ID + TeamHeroIds []string `protobuf:"bytes,22,rep,name=teamHeroIds,proto3" json:"teamHeroIds" bson:"teamHeroIds"` //阵容英雄IDs + SociatyId string `protobuf:"bytes,23,opt,name=sociatyId,proto3" json:"sociatyId" bson:"sociatyId"` //公会ID + SociatyCd int64 `protobuf:"varint,24,opt,name=sociatyCd,proto3" json:"sociatyCd" bson:"sociatyCd"` //主动退出CD + Guildcoin int32 `protobuf:"varint,25,opt,name=guildcoin,proto3" json:"guildcoin" bson:"guildcoin"` //公会币 + Arenacoin int32 `protobuf:"varint,26,opt,name=arenacoin,proto3" json:"arenacoin" bson:"arenacoin"` //竞技场币 + Physicalbuynum int32 `protobuf:"varint,27,opt,name=physicalbuynum,proto3" json:"physicalbuynum"` //@go_tags(`bson:"physicalbuynum"`)体力购买次数 + PhysicalbuyLasttime int64 `protobuf:"varint,28,opt,name=physicalbuyLasttime,proto3" json:"physicalbuyLasttime"` //@go_tags(`bson:"physicalbuyLasttime"`)最后购买体力事件 + Buyunifiedticket int32 `protobuf:"varint,29,opt,name=buyunifiedticket,proto3" json:"buyunifiedticket"` //@go_tags(`bson:"buyunifiedticket"`)购买统一入场门票次数 + Lasttimeunifiedticket int64 `protobuf:"varint,30,opt,name=lasttimeunifiedticket,proto3" json:"lasttimeunifiedticket"` //@go_tags(`bson:"lasttimeunifiedticket"`)最后购买统一入场门票时间 + Recovertimeunifiedticket int64 `protobuf:"varint,31,opt,name=recovertimeunifiedticket,proto3" json:"recovertimeunifiedticket"` //@go_tags(`bson:"recovertimeunifiedticket"`)同意门票恢复时间 + SociatyTicketBuyNum int32 `protobuf:"varint,32,opt,name=sociatyTicketBuyNum,proto3" json:"sociatyTicketBuyNum" bson:"sociatyTicketBuyNum"` //公会boss挑战券购买次数 + SociatyTicket int32 `protobuf:"varint,33,opt,name=sociatyTicket,proto3" json:"sociatyTicket" bson:"sociatyTicket"` //公会boss挑战券数量 + Mline map[int32]int32 `protobuf:"bytes,34,rep,name=mline,proto3" json:"mline" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"mline"` //主线关卡最大进度 key难度val是关卡ID } func (x *DBUserExpand) Reset() { @@ -139,13 +139,6 @@ func (x *DBUserExpand) GetModifynameCount() int32 { return 0 } -func (x *DBUserExpand) GetTujian() map[string]int32 { - if x != nil { - return x.Tujian - } - return nil -} - func (x *DBUserExpand) GetActiveday() int32 { if x != nil { return x.Activeday @@ -304,7 +297,7 @@ var File_userexpand_proto protoreflect.FileDescriptor var file_userexpand_proto_rawDesc = []byte{ 0x0a, 0x10, 0x75, 0x73, 0x65, 0x72, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x22, 0xee, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, + 0x74, 0x6f, 0x22, 0x80, 0x09, 0x0a, 0x0c, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x11, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x61, @@ -320,71 +313,64 @@ var file_userexpand_proto_rawDesc = []byte{ 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x6e, 0x61, 0x6d, 0x65, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x12, 0x31, 0x0a, 0x06, 0x74, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x18, 0x08, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, - 0x2e, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x74, 0x75, - 0x6a, 0x69, 0x61, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x64, 0x61, - 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x64, - 0x61, 0x79, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, 0x65, 0x65, 0x6b, - 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, 0x65, - 0x65, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x66, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x72, 0x69, 0x65, - 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x24, - 0x0a, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4f, 0x44, 0x18, - 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, - 0x6e, 0x74, 0x4f, 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x64, 0x64, - 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6c, 0x6f, 0x67, - 0x69, 0x6e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x6f, - 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, - 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, - 0x61, 0x73, 0x6b, 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, - 0x73, 0x6b, 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, - 0x49, 0x64, 0x73, 0x18, 0x16, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, - 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x49, 0x64, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, - 0x74, 0x79, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, - 0x64, 0x18, 0x18, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, - 0x43, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x18, - 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, - 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x1a, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x26, - 0x0a, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, - 0x18, 0x1b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, - 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x12, 0x30, 0x0a, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, - 0x61, 0x6c, 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x1c, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, - 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x62, 0x75, 0x79, 0x75, - 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1d, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x10, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, - 0x63, 0x6b, 0x65, 0x74, 0x12, 0x34, 0x0a, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, - 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1e, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, - 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x3a, 0x0a, 0x18, 0x72, 0x65, - 0x63, 0x6f, 0x76, 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x72, 0x65, - 0x63, 0x6f, 0x76, 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, - 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, - 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x20, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x13, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, - 0x65, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x6f, 0x63, 0x69, - 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x21, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x0d, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x2e, - 0x0a, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, - 0x44, 0x42, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x4d, 0x6c, 0x69, - 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x39, - 0x0a, 0x0b, 0x54, 0x75, 0x6a, 0x69, 0x61, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, - 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, 0x6c, 0x69, - 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x64, 0x61, 0x79, 0x18, 0x0b, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x64, 0x61, 0x79, 0x12, + 0x1e, 0x0a, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, 0x65, 0x65, 0x6b, 0x18, 0x0c, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x77, 0x65, 0x65, 0x6b, 0x12, + 0x12, 0x0a, 0x04, 0x73, 0x69, 0x67, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x73, + 0x69, 0x67, 0x6e, 0x12, 0x20, 0x0a, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, + 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, + 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x49, 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x66, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4f, 0x44, 0x18, 0x10, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x0d, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x50, 0x6f, 0x69, 0x6e, 0x74, 0x4f, + 0x44, 0x12, 0x24, 0x0a, 0x0d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x64, 0x64, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x41, + 0x64, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x2e, 0x0a, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, + 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x14, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x12, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x69, 0x6e, + 0x75, 0x65, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, + 0x49, 0x64, 0x18, 0x15, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x49, + 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, 0x49, 0x64, 0x73, + 0x18, 0x16, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x65, 0x61, 0x6d, 0x48, 0x65, 0x72, 0x6f, + 0x49, 0x64, 0x73, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, + 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, + 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64, 0x18, 0x18, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x43, 0x64, 0x12, + 0x1c, 0x0a, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x19, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x09, 0x67, 0x75, 0x69, 0x6c, 0x64, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, + 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x09, 0x61, 0x72, 0x65, 0x6e, 0x61, 0x63, 0x6f, 0x69, 0x6e, 0x12, 0x26, 0x0a, 0x0e, 0x70, + 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x6e, 0x75, 0x6d, 0x18, 0x1b, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0e, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, + 0x6e, 0x75, 0x6d, 0x12, 0x30, 0x0a, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, + 0x75, 0x79, 0x4c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x13, 0x70, 0x68, 0x79, 0x73, 0x69, 0x63, 0x61, 0x6c, 0x62, 0x75, 0x79, 0x4c, 0x61, 0x73, + 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x69, 0x66, + 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x10, 0x62, 0x75, 0x79, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, + 0x74, 0x12, 0x34, 0x0a, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, + 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x03, + 0x52, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, + 0x64, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x3a, 0x0a, 0x18, 0x72, 0x65, 0x63, 0x6f, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, + 0x6b, 0x65, 0x74, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x03, 0x52, 0x18, 0x72, 0x65, 0x63, 0x6f, 0x76, + 0x65, 0x72, 0x74, 0x69, 0x6d, 0x65, 0x75, 0x6e, 0x69, 0x66, 0x69, 0x65, 0x64, 0x74, 0x69, 0x63, + 0x6b, 0x65, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, + 0x63, 0x6b, 0x65, 0x74, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x20, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x13, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, + 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x12, 0x24, 0x0a, 0x0d, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, + 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x21, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x73, 0x6f, + 0x63, 0x69, 0x61, 0x74, 0x79, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x2e, 0x0a, 0x05, 0x6d, + 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x22, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x55, + 0x73, 0x65, 0x72, 0x45, 0x78, 0x70, 0x61, 0x6e, 0x64, 0x2e, 0x4d, 0x6c, 0x69, 0x6e, 0x65, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6d, 0x6c, 0x69, 0x6e, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x4d, + 0x6c, 0x69, 0x6e, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, + 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -399,20 +385,18 @@ func file_userexpand_proto_rawDescGZIP() []byte { return file_userexpand_proto_rawDescData } -var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_userexpand_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_userexpand_proto_goTypes = []interface{}{ (*DBUserExpand)(nil), // 0: DBUserExpand - nil, // 1: DBUserExpand.TujianEntry - nil, // 2: DBUserExpand.MlineEntry + nil, // 1: DBUserExpand.MlineEntry } var file_userexpand_proto_depIdxs = []int32{ - 1, // 0: DBUserExpand.tujian:type_name -> DBUserExpand.TujianEntry - 2, // 1: DBUserExpand.mline:type_name -> DBUserExpand.MlineEntry - 2, // [2:2] is the sub-list for method output_type - 2, // [2:2] is the sub-list for method input_type - 2, // [2:2] is the sub-list for extension type_name - 2, // [2:2] is the sub-list for extension extendee - 0, // [0:2] is the sub-list for field type_name + 1, // 0: DBUserExpand.mline:type_name -> DBUserExpand.MlineEntry + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_userexpand_proto_init() } @@ -440,7 +424,7 @@ func file_userexpand_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_userexpand_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 2, NumExtensions: 0, NumServices: 0, }, diff --git a/sys/configure/structs/Game.ArenaChallengeNpcData.go b/sys/configure/structs/Game.ArenaChallengeNpcData.go index 1fcdd3cf5..f2a5b7521 100644 --- a/sys/configure/structs/Game.ArenaChallengeNpcData.go +++ b/sys/configure/structs/Game.ArenaChallengeNpcData.go @@ -14,6 +14,7 @@ type GameArenaChallengeNpcData struct { Id int32 OpenCond int32 OpenValue int32 + BattleReadyID int32 MonsterformatId []int32 StroyIdFront int32 StroyIdAfter int32 @@ -33,6 +34,7 @@ func (_v *GameArenaChallengeNpcData)Deserialize(_buf map[string]interface{}) (er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open_cond"].(float64); !_ok_ { err = errors.New("open_cond error"); return }; _v.OpenCond = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open_value"].(float64); !_ok_ { err = errors.New("open_value error"); return }; _v.OpenValue = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.BattleReady.go b/sys/configure/structs/Game.BattleReady.go new file mode 100644 index 000000000..67fa1e09f --- /dev/null +++ b/sys/configure/structs/Game.BattleReady.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameBattleReady struct { + _dataMap map[int32]*GameBattleReadyData + _dataList []*GameBattleReadyData +} + +func NewGameBattleReady(_buf []map[string]interface{}) (*GameBattleReady, error) { + _dataList := make([]*GameBattleReadyData, 0, len(_buf)) + dataMap := make(map[int32]*GameBattleReadyData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameBattleReadyData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameBattleReady{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameBattleReady) GetDataMap() map[int32]*GameBattleReadyData { + return table._dataMap +} + +func (table *GameBattleReady) GetDataList() []*GameBattleReadyData { + return table._dataList +} + +func (table *GameBattleReady) Get(key int32) *GameBattleReadyData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.BattleReadyData.go b/sys/configure/structs/Game.BattleReadyData.go new file mode 100644 index 000000000..976524dd8 --- /dev/null +++ b/sys/configure/structs/Game.BattleReadyData.go @@ -0,0 +1,75 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameBattleReadyData struct { + Id int32 + PlayType string + HeroCount int32 + DefaultHero int32 + DisableHero []string + LockSlots []int32 + AssistTeam int32 + CanFriendHelp int32 +} + +const TypeId_GameBattleReadyData = -266091495 + +func (*GameBattleReadyData) GetTypeId() int32 { + return -266091495 +} + +func (_v *GameBattleReadyData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; if _v.PlayType, _ok_ = _buf["PlayType"].(string); !_ok_ { err = errors.New("PlayType error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HeroCount"].(float64); !_ok_ { err = errors.New("HeroCount error"); return }; _v.HeroCount = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["DisableHero"].([]interface{}); !_ok_ { err = errors.New("DisableHero error"); return } + + _v.DisableHero = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.DisableHero = append(_v.DisableHero, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["LockSlots"].([]interface{}); !_ok_ { err = errors.New("LockSlots error"); return } + + _v.LockSlots = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.LockSlots = append(_v.LockSlots, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CanFriendHelp"].(float64); !_ok_ { err = errors.New("CanFriendHelp error"); return }; _v.CanFriendHelp = int32(_tempNum_) } + return +} + +func DeserializeGameBattleReadyData(_buf map[string]interface{}) (*GameBattleReadyData, error) { + v := &GameBattleReadyData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.CombatMansterData.go b/sys/configure/structs/Game.CombatMansterData.go index acf8c9548..f82c273ee 100644 --- a/sys/configure/structs/Game.CombatMansterData.go +++ b/sys/configure/structs/Game.CombatMansterData.go @@ -16,6 +16,7 @@ type GameCombatMansterData struct { Sencenstory []int32 Time int32 Clickstory int32 + BattleReadyID int32 FormatList []int32 Award []*Gameatn } @@ -45,6 +46,7 @@ func (_v *GameCombatMansterData)Deserialize(_buf map[string]interface{}) (err er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["clickstory"].(float64); !_ok_ { err = errors.New("clickstory error"); return }; _v.Clickstory = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.DreamlandBoosData.go b/sys/configure/structs/Game.DreamlandBoosData.go index 62179e4e1..4e33bdf4b 100644 --- a/sys/configure/structs/Game.DreamlandBoosData.go +++ b/sys/configure/structs/Game.DreamlandBoosData.go @@ -16,6 +16,7 @@ type GameDreamlandBoosData struct { Fightnum int32 Challengenum int32 Prize []*Gameatn + BattleReadyID int32 Monsterformatid []int32 DreamlandLimit int32 PsConsume []*Gameatn @@ -47,6 +48,7 @@ func (_v *GameDreamlandBoosData)Deserialize(_buf map[string]interface{}) (err er } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.EnchantBossData.go b/sys/configure/structs/Game.EnchantBossData.go index 0a5b9d1fe..8d6e6de44 100644 --- a/sys/configure/structs/Game.EnchantBossData.go +++ b/sys/configure/structs/Game.EnchantBossData.go @@ -14,6 +14,7 @@ type GameEnchantBossData struct { Id int32 Bossid int32 Name string + BattleReadyID int32 Grade string ScoreLow int32 ScoreUp int32 @@ -41,6 +42,7 @@ func (_v *GameEnchantBossData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _ok_ bool; if _v.Grade, _ok_ = _buf["grade"].(string); !_ok_ { err = errors.New("grade error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_low"].(float64); !_ok_ { err = errors.New("score_low error"); return }; _v.ScoreLow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score_up"].(float64); !_ok_ { err = errors.New("score_up error"); return }; _v.ScoreUp = int32(_tempNum_) } diff --git a/sys/configure/structs/Game.Guide.go b/sys/configure/structs/Game.Guide.go new file mode 100644 index 000000000..38af2420d --- /dev/null +++ b/sys/configure/structs/Game.Guide.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameGuide struct { + _dataMap map[int32]*GameGuideData + _dataList []*GameGuideData +} + +func NewGameGuide(_buf []map[string]interface{}) (*GameGuide, error) { + _dataList := make([]*GameGuideData, 0, len(_buf)) + dataMap := make(map[int32]*GameGuideData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameGuideData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameGuide{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameGuide) GetDataMap() map[int32]*GameGuideData { + return table._dataMap +} + +func (table *GameGuide) GetDataList() []*GameGuideData { + return table._dataList +} + +func (table *GameGuide) Get(key int32) *GameGuideData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.GuideData.go b/sys/configure/structs/Game.GuideData.go new file mode 100644 index 000000000..1c363fecf --- /dev/null +++ b/sys/configure/structs/Game.GuideData.go @@ -0,0 +1,126 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" +import "bright/serialization" + +type GameGuideData struct { + Id int32 + Group int32 + Type int32 + StartPar string + Parameter string + Interface string + Condition string + Followtj string + Followguide int32 + Finger []string + Offset serialization.Vector2 + FingerTime float32 + ObjSize serialization.Vector2 + ObjOffset serialization.Vector2 + Txt string + Speakerface int32 + Sound string + Mask int32 + Lock int32 + Uishow int32 + Skiptime int32 + Skip int32 + Skipgroup int32 + Reward []*Gameatn +} + +const TypeId_GameGuideData = -371227190 + +func (*GameGuideData) GetTypeId() int32 { + return -371227190 +} + +func (_v *GameGuideData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; if _v.StartPar, _ok_ = _buf["startPar"].(string); !_ok_ { err = errors.New("startPar error"); return } } + { var _ok_ bool; if _v.Parameter, _ok_ = _buf["parameter"].(string); !_ok_ { err = errors.New("parameter error"); return } } + { var _ok_ bool; if _v.Interface, _ok_ = _buf["interface"].(string); !_ok_ { err = errors.New("interface error"); return } } + { var _ok_ bool; if _v.Condition, _ok_ = _buf["condition"].(string); !_ok_ { err = errors.New("condition error"); return } } + { var _ok_ bool; if _v.Followtj, _ok_ = _buf["followtj"].(string); !_ok_ { err = errors.New("followtj error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["followguide"].(float64); !_ok_ { err = errors.New("followguide error"); return }; _v.Followguide = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["finger"].([]interface{}); !_ok_ { err = errors.New("finger error"); return } + + _v.Finger = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Finger = append(_v.Finger, _list_v_) + } + } + + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["offset"].(map[string]interface{}); !_ok_ { err = errors.New("offset error"); return } + var _x_, _y_ float32; + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } + _v.Offset = serialization.NewVector2(_x_, _y_) + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fingerTime"].(float64); !_ok_ { err = errors.New("fingerTime error"); return }; _v.FingerTime = float32(_tempNum_) } + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["objSize"].(map[string]interface{}); !_ok_ { err = errors.New("objSize error"); return } + var _x_, _y_ float32; + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } + _v.ObjSize = serialization.NewVector2(_x_, _y_) + } + + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["objOffset"].(map[string]interface{}); !_ok_ { err = errors.New("objOffset error"); return } + var _x_, _y_ float32; + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } + _v.ObjOffset = serialization.NewVector2(_x_, _y_) + } + + { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speakerface"].(float64); !_ok_ { err = errors.New("speakerface error"); return }; _v.Speakerface = int32(_tempNum_) } + { var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mask"].(float64); !_ok_ { err = errors.New("mask error"); return }; _v.Mask = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lock"].(float64); !_ok_ { err = errors.New("lock error"); return }; _v.Lock = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["uishow"].(float64); !_ok_ { err = errors.New("uishow error"); return }; _v.Uishow = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skiptime"].(float64); !_ok_ { err = errors.New("skiptime error"); return }; _v.Skiptime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skip"].(float64); !_ok_ { err = errors.New("skip error"); return }; _v.Skip = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skipgroup"].(float64); !_ok_ { err = errors.New("skipgroup error"); return }; _v.Skipgroup = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return } + + _v.Reward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Reward = append(_v.Reward, _list_v_) + } + } + + return +} + +func DeserializeGameGuideData(_buf map[string]interface{}) (*GameGuideData, error) { + v := &GameGuideData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.HeroSkill.go b/sys/configure/structs/Game.HeroSkill.go new file mode 100644 index 000000000..471c45431 --- /dev/null +++ b/sys/configure/structs/Game.HeroSkill.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameHeroSkill struct { + _dataMap map[int32]*GameHeroSkillData + _dataList []*GameHeroSkillData +} + +func NewGameHeroSkill(_buf []map[string]interface{}) (*GameHeroSkill, error) { + _dataList := make([]*GameHeroSkillData, 0, len(_buf)) + dataMap := make(map[int32]*GameHeroSkillData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameHeroSkillData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Star] = _v + } + } + return &GameHeroSkill{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameHeroSkill) GetDataMap() map[int32]*GameHeroSkillData { + return table._dataMap +} + +func (table *GameHeroSkill) GetDataList() []*GameHeroSkillData { + return table._dataList +} + +func (table *GameHeroSkill) Get(key int32) *GameHeroSkillData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.comAtnData.go b/sys/configure/structs/Game.HeroSkillData.go similarity index 54% rename from sys/configure/structs/game.comAtnData.go rename to sys/configure/structs/Game.HeroSkillData.go index d5e7f2084..9682d2c8a 100644 --- a/sys/configure/structs/game.comAtnData.go +++ b/sys/configure/structs/Game.HeroSkillData.go @@ -10,38 +10,38 @@ package cfg import "errors" -type GameComAtnData struct { - Index string - Var []*Gameatn +type GameHeroSkillData struct { + Star int32 + Needgold []*Gameatn } -const TypeId_GameComAtnData = -2026469472 +const TypeId_GameHeroSkillData = 1863510469 -func (*GameComAtnData) GetTypeId() int32 { - return -2026469472 +func (*GameHeroSkillData) GetTypeId() int32 { + return 1863510469 } -func (_v *GameComAtnData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } } +func (_v *GameHeroSkillData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["var"].([]interface{}); !_ok_ { err = errors.New("var error"); return } + if _arr_, _ok_ = _buf["needgold"].([]interface{}); !_ok_ { err = errors.New("needgold error"); return } - _v.Var = make([]*Gameatn, 0, len(_arr_)) + _v.Needgold = make([]*Gameatn, 0, len(_arr_)) for _, _e_ := range _arr_ { var _list_v_ *Gameatn { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } - _v.Var = append(_v.Var, _list_v_) + _v.Needgold = append(_v.Needgold, _list_v_) } } return } -func DeserializeGameComAtnData(_buf map[string]interface{}) (*GameComAtnData, error) { - v := &GameComAtnData{} +func DeserializeGameHeroSkillData(_buf map[string]interface{}) (*GameHeroSkillData, error) { + v := &GameHeroSkillData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/Game.HuntingBossData.go b/sys/configure/structs/Game.HuntingBossData.go index 75f7a0c97..2715280ca 100644 --- a/sys/configure/structs/Game.HuntingBossData.go +++ b/sys/configure/structs/Game.HuntingBossData.go @@ -15,6 +15,7 @@ type GameHuntingBossData struct { Type int32 Name string Difficulty int32 + BattleReadyID int32 Firstprize []*Gameatn Dropshow []*Gameatn Drop int32 @@ -35,6 +36,7 @@ func (_v *GameHuntingBossData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.MainStageData.go b/sys/configure/structs/Game.MainStageData.go index dc3b02f4d..e89659772 100644 --- a/sys/configure/structs/Game.MainStageData.go +++ b/sys/configure/structs/Game.MainStageData.go @@ -28,6 +28,7 @@ type GameMainStageData struct { PsMg []*Gameatn Firstaward []*Gameatn Commonaward []*Gameatn + BattleReadyID int32 FormatList []int32 CaptainId int32 Star []int32 @@ -117,6 +118,7 @@ func (_v *GameMainStageData)Deserialize(_buf map[string]interface{}) (err error) } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.MainlineData.go b/sys/configure/structs/Game.MainlineData.go index bb24d36ab..6ce2635d8 100644 --- a/sys/configure/structs/Game.MainlineData.go +++ b/sys/configure/structs/Game.MainlineData.go @@ -23,6 +23,7 @@ type GameMainlineData struct { Episodelocation serialization.Vector2 FormatList []int32 CaptainId string + BattleReadyID int32 Battlescene string Award []*Gameatn Exp int32 @@ -71,6 +72,7 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error) } { var _ok_ bool; if _v.CaptainId, _ok_ = _buf["captainId"].(string); !_ok_ { err = errors.New("captainId error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _ok_ bool; if _v.Battlescene, _ok_ = _buf["battlescene"].(string); !_ok_ { err = errors.New("battlescene error"); return } } { var _arr_ []interface{} diff --git a/sys/configure/structs/Game.VikingBossData.go b/sys/configure/structs/Game.VikingBossData.go index eb2a97cdf..57acfb4ef 100644 --- a/sys/configure/structs/Game.VikingBossData.go +++ b/sys/configure/structs/Game.VikingBossData.go @@ -16,6 +16,7 @@ type GameVikingBossData struct { Bossid int32 Name string Difficulty int32 + BattleReadyID int32 Captionrecommend []int32 Firstprize []*Gameatn Dropshow []*Gameatn @@ -40,6 +41,7 @@ func (_v *GameVikingBossData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossid"].(float64); !_ok_ { err = errors.New("bossid error"); return }; _v.Bossid = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["difficulty"].(float64); !_ok_ { err = errors.New("difficulty error"); return }; _v.Difficulty = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index 3477fa389..e67dbac39 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -13,10 +13,7 @@ import "errors" type GameWorldBattleData struct { Id int32 FormatList []int32 - DefaultHero int32 - SelectableHero []string - LockSlots []int32 - AssistTeam int32 + BattleReadyID int32 EventList []int32 Playexp *Gameatn } @@ -43,36 +40,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DefaultHero"].(float64); !_ok_ { err = errors.New("DefaultHero error"); return }; _v.DefaultHero = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["SelectableHero"].([]interface{}); !_ok_ { err = errors.New("SelectableHero error"); return } - - _v.SelectableHero = make([]string, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.SelectableHero = append(_v.SelectableHero, _list_v_) - } - } - - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["LockSlots"].([]interface{}); !_ok_ { err = errors.New("LockSlots error"); return } - - _v.LockSlots = make([]int32, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } - _v.LockSlots = append(_v.LockSlots, _list_v_) - } - } - - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["AssistTeam"].(float64); !_ok_ { err = errors.New("AssistTeam error"); return }; _v.AssistTeam = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 564044c81..08f904c55 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -21,6 +21,7 @@ type Tables struct { HeroStargrow *GameHeroStargrow HeroLevelgrow *GameHeroLevelgrow HeroStarup *GameHeroStarup + HeroSkill *GameHeroSkill HeroExp *GameHeroExp HeroLevelup *GameHeroLevelup Equip *GameEquip @@ -117,6 +118,7 @@ type Tables struct { GuildActivity *GameGuildActivity GuildSign *GameGuildSign GuildTask *GameGuildTask + GuildBossTask *GameGuildBossTask TrollRule *GameTrollRule TrollGoods *GameTrollGoods TrollTrain *GameTrollTrain @@ -146,7 +148,7 @@ type Tables struct { CombatBox *GameCombatBox Help *GameHelp GM *GameGM - Newguide *GameNewguide + Guide *GameGuide Vip *GameVip EnchantShop *GameEnchantShop EnchantBoss *GameEnchantBoss @@ -156,6 +158,7 @@ type Tables struct { MainStarreward *GameMainStarreward MainStartype *GameMainStartype Battletasktesting *GameBattletasktesting + BattleReady *GameBattleReady } func NewTables(loader JsonLoader) (*Tables, error) { @@ -223,6 +226,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.HeroStarup, err = NewGameHeroStarup(buf) ; err != nil { return nil, err } + if buf, err = loader("game_heroskill") ; err != nil { + return nil, err + } + if tables.HeroSkill, err = NewGameHeroSkill(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_heroexp") ; err != nil { return nil, err } @@ -799,6 +808,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.GuildTask, err = NewGameGuildTask(buf) ; err != nil { return nil, err } + if buf, err = loader("game_guildbosstask") ; err != nil { + return nil, err + } + if tables.GuildBossTask, err = NewGameGuildBossTask(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_trollrule") ; err != nil { return nil, err } @@ -973,10 +988,10 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.GM, err = NewGameGM(buf) ; err != nil { return nil, err } - if buf, err = loader("game_newguide") ; err != nil { + if buf, err = loader("game_guide") ; err != nil { return nil, err } - if tables.Newguide, err = NewGameNewguide(buf) ; err != nil { + if tables.Guide, err = NewGameGuide(buf) ; err != nil { return nil, err } if buf, err = loader("game_vip") ; err != nil { @@ -1033,5 +1048,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Battletasktesting, err = NewGameBattletasktesting(buf) ; err != nil { return nil, err } + if buf, err = loader("game_battleready") ; err != nil { + return nil, err + } + if tables.BattleReady, err = NewGameBattleReady(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.comAtn.go b/sys/configure/structs/game.comAtn.go deleted file mode 100644 index 7317c611f..000000000 --- a/sys/configure/structs/game.comAtn.go +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -type GameComAtn struct { - _dataMap map[string]*GameComAtnData - _dataList []*GameComAtnData -} - -func NewGameComAtn(_buf []map[string]interface{}) (*GameComAtn, error) { - _dataList := make([]*GameComAtnData, 0, len(_buf)) - dataMap := make(map[string]*GameComAtnData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGameComAtnData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Index] = _v - } - } - return &GameComAtn{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameComAtn) GetDataMap() map[string]*GameComAtnData { - return table._dataMap -} - -func (table *GameComAtn) GetDataList() []*GameComAtnData { - return table._dataList -} - -func (table *GameComAtn) Get(key string) *GameComAtnData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 6b499b1b0..6c66806e8 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -143,6 +143,8 @@ type GameGlobalData struct { DrawCardRechargeReward []int32 DrawCardRegressionReward []int32 DrawCard5StarsInRange []int32 + DrawCard5StarsInRange1 []int32 + DrawCard5StarsInRange1Pool string DrawCardContinuousRestrictionStar5 int32 DrawCardContinuousRestrictionCamp int32 EquipmentConsumption []int32 @@ -169,6 +171,9 @@ type GameGlobalData struct { GuildBossTroop2 int32 GuildBossTroop3 int32 Zhayantime float32 + RotateAngle float32 + RotateDizzyTime float32 + Moonshopmoney []int32 } const TypeId_GameGlobalData = 477542761 @@ -622,6 +627,21 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["DrawCard_5StarsInRange1"].([]interface{}); !_ok_ { err = errors.New("DrawCard_5StarsInRange1 error"); return } + + _v.DrawCard5StarsInRange1 = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.DrawCard5StarsInRange1 = append(_v.DrawCard5StarsInRange1, _list_v_) + } + } + + { var _ok_ bool; if _v.DrawCard5StarsInRange1Pool, _ok_ = _buf["DrawCard_5StarsInRange1_pool"].(string); !_ok_ { err = errors.New("DrawCard_5StarsInRange1_pool error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Star5"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Star5 error"); return }; _v.DrawCardContinuousRestrictionStar5 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["DrawCard_ContinuousRestriction_Camp"].(float64); !_ok_ { err = errors.New("DrawCard_ContinuousRestriction_Camp error"); return }; _v.DrawCardContinuousRestrictionCamp = int32(_tempNum_) } { @@ -700,6 +720,22 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_troop2"].(float64); !_ok_ { err = errors.New("GuildBoss_troop2 error"); return }; _v.GuildBossTroop2 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GuildBoss_troop3"].(float64); !_ok_ { err = errors.New("GuildBoss_troop3 error"); return }; _v.GuildBossTroop3 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["zhayantime"].(float64); !_ok_ { err = errors.New("zhayantime error"); return }; _v.Zhayantime = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateAngle"].(float64); !_ok_ { err = errors.New("rotateAngle error"); return }; _v.RotateAngle = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rotateDizzyTime"].(float64); !_ok_ { err = errors.New("rotateDizzyTime error"); return }; _v.RotateDizzyTime = float32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["moonshopmoney"].([]interface{}); !_ok_ { err = errors.New("moonshopmoney error"); return } + + _v.Moonshopmoney = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Moonshopmoney = append(_v.Moonshopmoney, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.heroAwaken.go b/sys/configure/structs/game.heroAwaken.go index 5f74eff6e..5d1bc6f11 100644 --- a/sys/configure/structs/game.heroAwaken.go +++ b/sys/configure/structs/game.heroAwaken.go @@ -9,34 +9,26 @@ package cfg type GameHeroAwaken struct { - _dataMap map[int32]*GameHeroAwakenData _dataList []*GameHeroAwakenData } func NewGameHeroAwaken(_buf []map[string]interface{}) (*GameHeroAwaken, error) { _dataList := make([]*GameHeroAwakenData, 0, len(_buf)) - dataMap := make(map[int32]*GameHeroAwakenData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameHeroAwakenData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Key] = _v } } - return &GameHeroAwaken{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameHeroAwaken) GetDataMap() map[int32]*GameHeroAwakenData { - return table._dataMap + return &GameHeroAwaken{_dataList:_dataList}, nil } func (table *GameHeroAwaken) GetDataList() []*GameHeroAwakenData { return table._dataList } -func (table *GameHeroAwaken) Get(key int32) *GameHeroAwakenData { - return table._dataMap[key] +func (table *GameHeroAwaken) Get(index int) *GameHeroAwakenData { + return table._dataList[index] } - diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index 9f5b847df..bf46f541e 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -43,6 +43,10 @@ type GameHeroData struct { Angle int32 Deviation int32 Show int32 + Herofrag []*Gameatn + Heroskillup []string + Expitem []*Gameatn + Expitemnum int32 } const TypeId_GameHeroData = 1513828672 @@ -129,6 +133,49 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["angle"].(float64); !_ok_ { err = errors.New("angle error"); return }; _v.Angle = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["deviation"].(float64); !_ok_ { err = errors.New("deviation error"); return }; _v.Deviation = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show"].(float64); !_ok_ { err = errors.New("show error"); return }; _v.Show = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["herofrag"].([]interface{}); !_ok_ { err = errors.New("herofrag error"); return } + + _v.Herofrag = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Herofrag = append(_v.Herofrag, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["heroskillup"].([]interface{}); !_ok_ { err = errors.New("heroskillup error"); return } + + _v.Heroskillup = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Heroskillup = append(_v.Heroskillup, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["expitem"].([]interface{}); !_ok_ { err = errors.New("expitem error"); return } + + _v.Expitem = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Expitem = append(_v.Expitem, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["expitemnum"].(float64); !_ok_ { err = errors.New("expitemnum error"); return }; _v.Expitemnum = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.heroExp.go b/sys/configure/structs/game.heroExp.go index d25d07f38..9c41f97ff 100644 --- a/sys/configure/structs/game.heroExp.go +++ b/sys/configure/structs/game.heroExp.go @@ -21,7 +21,7 @@ func NewGameHeroExp(_buf []map[string]interface{}) (*GameHeroExp, error) { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Hid] = _v + dataMap[_v.Itemid] = _v } } return &GameHeroExp{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.heroExpData.go b/sys/configure/structs/game.heroExpData.go index 0a2780c8d..a40c763be 100644 --- a/sys/configure/structs/game.heroExpData.go +++ b/sys/configure/structs/game.heroExpData.go @@ -11,12 +11,8 @@ package cfg import "errors" type GameHeroExpData struct { - Hid string - Name string - Star int32 - Color int32 - Heroexp int32 - Skilllevelup int32 + Itemid string + Exp int32 Needgold int32 } @@ -27,12 +23,8 @@ func (*GameHeroExpData) GetTypeId() int32 { } func (_v *GameHeroExpData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } - { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroexp"].(float64); !_ok_ { err = errors.New("heroexp error"); return }; _v.Heroexp = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilllevelup"].(float64); !_ok_ { err = errors.New("skilllevelup error"); return }; _v.Skilllevelup = int32(_tempNum_) } + { var _ok_ bool; if _v.Itemid, _ok_ = _buf["itemid"].(string); !_ok_ { err = errors.New("itemid error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needgold"].(float64); !_ok_ { err = errors.New("needgold error"); return }; _v.Needgold = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.heroStarupData.go b/sys/configure/structs/game.heroStarupData.go index 718eec93f..70e949f39 100644 --- a/sys/configure/structs/game.heroStarupData.go +++ b/sys/configure/structs/game.heroStarupData.go @@ -14,13 +14,7 @@ type GameHeroStarupData struct { Key int32 Id string Star int32 - Needhero string - Needherostar int32 - Needheronum int32 - Needrace []int32 - Needracestar int32 - Needracenum int32 - Gold int32 + Needrace []*Gameatn Starup []*Gameatn } @@ -34,26 +28,20 @@ func (_v *GameHeroStarupData)Deserialize(_buf map[string]interface{}) (err error { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; if _v.Needhero, _ok_ = _buf["needhero"].(string); !_ok_ { err = errors.New("needhero error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needherostar"].(float64); !_ok_ { err = errors.New("needherostar error"); return }; _v.Needherostar = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needheronum"].(float64); !_ok_ { err = errors.New("needheronum error"); return }; _v.Needheronum = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool if _arr_, _ok_ = _buf["needrace"].([]interface{}); !_ok_ { err = errors.New("needrace error"); return } - _v.Needrace = make([]int32, 0, len(_arr_)) + _v.Needrace = make([]*Gameatn, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ int32 - { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } _v.Needrace = append(_v.Needrace, _list_v_) } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracestar"].(float64); !_ok_ { err = errors.New("needracestar error"); return }; _v.Needracestar = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needracenum"].(float64); !_ok_ { err = errors.New("needracenum error"); return }; _v.Needracenum = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gold"].(float64); !_ok_ { err = errors.New("gold error"); return }; _v.Gold = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.pagodaData.go b/sys/configure/structs/game.pagodaData.go index 60032f021..ed7e129a6 100644 --- a/sys/configure/structs/game.pagodaData.go +++ b/sys/configure/structs/game.pagodaData.go @@ -15,6 +15,7 @@ type GamePagodaData struct { PagodaType int32 LevelType int32 LayerNum int32 + BattleReadyID int32 MonsterId []int32 Reward []*Gameatn Exp int32 @@ -34,6 +35,7 @@ func (_v *GamePagodaData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pagoda_type"].(float64); !_ok_ { err = errors.New("pagoda_type error"); return }; _v.PagodaType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Level_type"].(float64); !_ok_ { err = errors.New("Level_type error"); return }; _v.LevelType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["layer_num"].(float64); !_ok_ { err = errors.New("layer_num error"); return }; _v.LayerNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BattleReadyID"].(float64); !_ok_ { err = errors.New("BattleReadyID error"); return }; _v.BattleReadyID = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool