diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index e2987e70d..39a3ca1bb 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -19836,7 +19836,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_846", - "text": "本周竞技场挑战{0}次" + "text": "本周竞技场挑战10次" }, "type": 130, "valid": 10, @@ -19853,7 +19853,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_847", - "text": "本周竞技场挑战{0}次" + "text": "本周竞技场挑战30次" }, "type": 130, "valid": 30, @@ -19870,7 +19870,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_848", - "text": "本周竞技场挑战{0}次" + "text": "本周竞技场挑战50次" }, "type": 130, "valid": 50, @@ -19887,7 +19887,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_849", - "text": "本周竞技场胜利{0}次" + "text": "本周竞技场胜利10次" }, "type": 130, "valid": 10, @@ -19904,7 +19904,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_850", - "text": "本周竞技场胜利{0}次" + "text": "本周竞技场胜利20次" }, "type": 130, "valid": 20, @@ -19921,7 +19921,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_851", - "text": "本周竞技场胜利{0}次" + "text": "本周竞技场胜利30次" }, "type": 130, "valid": 30, @@ -19938,7 +19938,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_852", - "text": "本周累计经验副本消耗{0}体力" + "text": "本周累计经验副本消耗300体力" }, "type": 130, "valid": 300, @@ -19955,7 +19955,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_853", - "text": "本周累计经验副本消耗{0}体力" + "text": "本周累计经验副本消耗600体力" }, "type": 130, "valid": 600, @@ -19972,7 +19972,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_854", - "text": "本周累计经验副本消耗{0}体力" + "text": "本周累计经验副本消耗1000体力" }, "type": 130, "valid": 1000, @@ -19989,7 +19989,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_855", - "text": "本周累计消耗{0}点金币" + "text": "本周累计消耗3000000点金币" }, "type": 130, "valid": 3000000, @@ -20006,7 +20006,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_856", - "text": "本周累计消耗{0}点金币" + "text": "本周累计消耗6000000点金币" }, "type": 130, "valid": 6000000, @@ -20023,7 +20023,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_857", - "text": "本周累计消耗{0}点金币" + "text": "本周累计消耗10000000点金币" }, "type": 130, "valid": 10000000, @@ -20040,7 +20040,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_858", - "text": "本周累计装备副本消耗{0}体力" + "text": "本周累计装备副本消耗300体力" }, "type": 130, "valid": 300, @@ -20057,7 +20057,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_859", - "text": "本周累计装备副本消耗{0}体力" + "text": "本周累计装备副本消耗600体力" }, "type": 130, "valid": 600, @@ -20074,7 +20074,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_860", - "text": "本周累计装备副本消耗{0}体力" + "text": "本周累计装备副本消耗1000体力" }, "type": 130, "valid": 1000, @@ -20091,7 +20091,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_861", - "text": "本周累计回响副本消耗{0}体力" + "text": "本周累计回响副本消耗300体力" }, "type": 130, "valid": 300, @@ -20108,7 +20108,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_862", - "text": "本周累计回响副本消耗{0}体力" + "text": "本周累计回响副本消耗600体力" }, "type": 130, "valid": 600, @@ -20125,7 +20125,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_863", - "text": "本周累计回响副本消耗{0}体力" + "text": "本周累计回响副本消耗1000体力" }, "type": 130, "valid": 1000, diff --git a/bin/json/game_drawpool.json b/bin/json/game_drawpool.json index 22a156da4..0586d078c 100644 --- a/bin/json/game_drawpool.json +++ b/bin/json/game_drawpool.json @@ -19,12 +19,12 @@ "star4w": 94, "star5w": 6, "protect": 0, - "p3pool": "base_pool7", - "p4pool": "base_pool8", - "p5pool": "base_pool9", - "n3pool": "base_pool10", - "n4pool": "base_pool11", - "n5pool": "base_pool12", + "p3pool": "base_pool5", + "p4pool": "base_pool6", + "p5pool": "base_pool7", + "n3pool": "base_pool5", + "n4pool": "base_pool6", + "n5pool": "base_pool7", "baodi4": 10, "baidi5": 90, "etime": -1, @@ -36,7 +36,13 @@ "n": 1 } ], - "consumeB": [] + "consumeB": [ + { + "a": "item", + "t": "10000001", + "n": 10 + } + ] }, { "key": 2, @@ -58,12 +64,12 @@ "star4w": 94, "star5w": 6, "protect": 50, - "p3pool": "base_pool7", - "p4pool": "base_pool8", - "p5pool": "base_pool9", - "n3pool": "base_pool10", - "n4pool": "base_pool11", - "n5pool": "base_pool12", + "p3pool": "base_pool6", + "p4pool": "base_pool7", + "p5pool": "base_pool8", + "n3pool": "base_pool6", + "n4pool": "base_pool7", + "n5pool": "base_pool8", "baodi4": 10, "baidi5": 0, "etime": -1, @@ -75,7 +81,13 @@ "n": 2 } ], - "consumeB": [] + "consumeB": [ + { + "a": "item", + "t": "10000001", + "n": 11 + } + ] }, { "key": 3, @@ -100,9 +112,9 @@ "p3pool": "base_pool7", "p4pool": "base_pool8", "p5pool": "base_pool9", - "n3pool": "base_pool10", - "n4pool": "base_pool11", - "n5pool": "base_pool12", + "n3pool": "base_pool7", + "n4pool": "base_pool8", + "n5pool": "base_pool9", "baodi4": 10, "baidi5": 0, "etime": -1, @@ -114,7 +126,13 @@ "n": 3 } ], - "consumeB": [] + "consumeB": [ + { + "a": "item", + "t": "10000001", + "n": 12 + } + ] }, { "key": 4, @@ -136,12 +154,12 @@ "star4w": 94, "star5w": 6, "protect": 50, - "p3pool": "base_pool7", - "p4pool": "base_pool8", - "p5pool": "base_pool9", - "n3pool": "base_pool10", - "n4pool": "base_pool11", - "n5pool": "base_pool12", + "p3pool": "base_pool8", + "p4pool": "base_pool9", + "p5pool": "base_pool10", + "n3pool": "base_pool8", + "n4pool": "base_pool9", + "n5pool": "base_pool10", "baodi4": 10, "baidi5": 0, "etime": -1, @@ -153,7 +171,13 @@ "n": 4 } ], - "consumeB": [] + "consumeB": [ + { + "a": "item", + "t": "10000001", + "n": 13 + } + ] }, { "key": 5, @@ -175,12 +199,12 @@ "star4w": 94, "star5w": 6, "protect": 50, - "p3pool": "base_pool7", - "p4pool": "base_pool8", - "p5pool": "base_pool9", - "n3pool": "base_pool10", - "n4pool": "base_pool11", - "n5pool": "base_pool12", + "p3pool": "base_pool9", + "p4pool": "base_pool10", + "p5pool": "base_pool11", + "n3pool": "base_pool9", + "n4pool": "base_pool10", + "n5pool": "base_pool11", "baodi4": 10, "baidi5": 0, "etime": -1, @@ -192,6 +216,12 @@ "n": 5 } ], - "consumeB": [] + "consumeB": [ + { + "a": "item", + "t": "10000001", + "n": 14 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json index 02e9a41c8..e3a57df64 100644 --- a/bin/json/game_hero.json +++ b/bin/json/game_hero.json @@ -34,7 +34,7 @@ "z": 0 }, "capskillrule": 101, - "skill": 11300011, + "skill": 113001011, "skill1": 113001111, "skill2": 113001211, "skill3": 113001311, diff --git a/bin/json/game_herostargrow.json b/bin/json/game_herostargrow.json index dc5fa48bb..76ccde655 100644 --- a/bin/json/game_herostargrow.json +++ b/bin/json/game_herostargrow.json @@ -15,7 +15,7 @@ "starup_hp": 15, "starup_atk": 15, "starup_def": 15, - "starup_speed": 15 + "starup_speed": 0 }, { "star": 3, @@ -24,33 +24,33 @@ "starup_hp": 25, "starup_atk": 25, "starup_def": 25, - "starup_speed": 25 + "starup_speed": 0 }, { "star": 4, "level": 30, "maxlevel": 40, - "starup_hp": 55, - "starup_atk": 55, - "starup_def": 55, - "starup_speed": 55 + "starup_hp": 90, + "starup_atk": 90, + "starup_def": 90, + "starup_speed": 0 }, { "star": 5, "level": 40, "maxlevel": 50, - "starup_hp": 95, - "starup_atk": 95, - "starup_def": 95, - "starup_speed": 95 + "starup_hp": 210, + "starup_atk": 210, + "starup_def": 210, + "starup_speed": 0 }, { "star": 6, "level": 50, "maxlevel": 60, - "starup_hp": 145, - "starup_atk": 145, - "starup_def": 145, - "starup_speed": 145 + "starup_hp": 320, + "starup_atk": 320, + "starup_def": 320, + "starup_speed": 0 } ] \ No newline at end of file diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json index 63f193da0..23081326e 100644 --- a/bin/json/game_huntingboss.json +++ b/bin/json/game_huntingboss.json @@ -650,7 +650,7 @@ "drop": 10011000, "bossmodel": 53001, "boss": [ - 401027 + 401033 ], "ps_consume": [ { @@ -715,7 +715,7 @@ "drop": 10012000, "bossmodel": 53001, "boss": [ - 401030 + 401036 ], "ps_consume": [ { @@ -1390,7 +1390,7 @@ "drop": 20011000, "bossmodel": 51004, "boss": [ - 402027 + 402033 ], "ps_consume": [ { @@ -1455,7 +1455,7 @@ "drop": 20012000, "bossmodel": 51004, "boss": [ - 402030 + 402036 ], "ps_consume": [ { @@ -2130,7 +2130,7 @@ "drop": 30011000, "bossmodel": 51005, "boss": [ - 403027 + 403033 ], "ps_consume": [ { @@ -2195,7 +2195,7 @@ "drop": 30012000, "bossmodel": 51005, "boss": [ - 403030 + 403036 ], "ps_consume": [ { @@ -2870,7 +2870,7 @@ "drop": 40011000, "bossmodel": 51002, "boss": [ - 404027 + 404033 ], "ps_consume": [ { @@ -2935,7 +2935,7 @@ "drop": 40012000, "bossmodel": 51002, "boss": [ - 404030 + 404036 ], "ps_consume": [ { diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json index 5cd65c124..4c4e4f454 100644 --- a/bin/json/game_huntingopentime.json +++ b/bin/json/game_huntingopentime.json @@ -2,8 +2,13 @@ { "type": 1, "opentime": [ + 0, 1, - 2 + 2, + 3, + 4, + 5, + 6 ], "name": { "key": "hunting_opentime_name_1", @@ -24,8 +29,13 @@ { "type": 2, "opentime": [ + 0, + 1, + 2, 3, - 4 + 4, + 5, + 6 ], "name": { "key": "hunting_opentime_name_2", @@ -46,6 +56,11 @@ { "type": 3, "opentime": [ + 0, + 1, + 2, + 3, + 4, 5, 6 ], @@ -68,8 +83,13 @@ { "type": 4, "opentime": [ + 0, 1, - 0 + 2, + 3, + 4, + 5, + 6 ], "name": { "key": "hunting_opentime_name_4", diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 2cd0dcf2c..4a1c39757 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -145,7 +145,7 @@ "img": "item_10000004", "intr": { "key": "item_item_intr_4", - "text": "用于提升守护者等级的道具" + "text": "用于提升稀有守护者技能等级的道具" }, "sale": [ { @@ -184,7 +184,7 @@ "img": "item_10000005", "intr": { "key": "item_item_intr_5", - "text": "用于提升守护者等级的道具" + "text": "用于提升完美守护者技能等级的道具" }, "sale": [] }, @@ -217,7 +217,7 @@ "img": "item_10000006", "intr": { "key": "item_item_intr_6", - "text": "用于提升守护者等级的道具" + "text": "用于提升史诗守护者技能等级的道具" }, "sale": [ { @@ -289,7 +289,7 @@ "img": "item_10000008", "intr": { "key": "item_item_intr_8", - "text": "用于提升稀有守护者技能等级的道具" + "text": "用于提升守护者等级的道具" }, "sale": [ { @@ -328,7 +328,7 @@ "img": "item_10000009", "intr": { "key": "item_item_intr_9", - "text": "用于提升完美守护者技能等级的道具" + "text": "用于提升守护者等级的道具" }, "sale": [ { @@ -367,7 +367,7 @@ "img": "item_10000010", "intr": { "key": "item_item_intr_10", - "text": "用于提升史诗守护者技能等级的道具" + "text": "用于提升守护者等级的道具" }, "sale": [ { diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index c4109793c..f2683cca6 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -330,7 +330,7 @@ "equip": [], "newskill": [], "lv": 2, - "hppro": 0.3, + "hppro": 0.2, "atkpro": 0.8, "defpro": 0.4, "skill1": 1, @@ -128009,7 +128009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128029,7 +128029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128049,7 +128049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128069,7 +128069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128089,7 +128089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128109,7 +128109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128129,7 +128129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128149,7 +128149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128169,7 +128169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128189,7 +128189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128209,7 +128209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128229,7 +128229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128249,7 +128249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128269,9 +128269,9 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 2, - "atkpro": 1.5, + "atkpro": 1, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -128289,7 +128289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128309,7 +128309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128329,7 +128329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128349,7 +128349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128369,7 +128369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128389,7 +128389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128409,7 +128409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128429,7 +128429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128449,7 +128449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128469,7 +128469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128489,7 +128489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128509,7 +128509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128529,7 +128529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128549,7 +128549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 1, "atkpro": 0.5, "defpro": 0.8, @@ -128569,9 +128569,9 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, - "hppro": 10, - "atkpro": 1.5, + "lv": 15, + "hppro": 2.5, + "atkpro": 1.2, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -128589,7 +128589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 1, "atkpro": 0.5, "defpro": 0.8, @@ -128609,7 +128609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128629,7 +128629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128649,7 +128649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128669,7 +128669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128689,7 +128689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128709,7 +128709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128729,7 +128729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128749,7 +128749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128769,7 +128769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128789,7 +128789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128809,7 +128809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128829,7 +128829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128849,7 +128849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 1.5, "atkpro": 0.5, "defpro": 0.8, @@ -128869,9 +128869,9 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 3, - "atkpro": 1.5, + "atkpro": 1.3, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -128889,7 +128889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 1.5, "atkpro": 0.5, "defpro": 0.8, @@ -128909,7 +128909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128929,7 +128929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128949,7 +128949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128969,7 +128969,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -128989,7 +128989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129009,7 +129009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129029,7 +129029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129049,7 +129049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129069,7 +129069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129089,7 +129089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129109,7 +129109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129129,7 +129129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129149,7 +129149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 2, "atkpro": 0.5, "defpro": 0.8, @@ -129169,9 +129169,9 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 4, - "atkpro": 1.5, + "atkpro": 1.4, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -129189,7 +129189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 2, "atkpro": 0.5, "defpro": 0.8, @@ -129209,7 +129209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129229,7 +129229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129249,7 +129249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129269,7 +129269,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129289,7 +129289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129309,7 +129309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129329,7 +129329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129349,7 +129349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129369,7 +129369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129389,7 +129389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129409,7 +129409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129429,7 +129429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129449,7 +129449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 2.5, "atkpro": 0.5, "defpro": 0.8, @@ -129469,7 +129469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 5, "atkpro": 1.5, "defpro": 0.1, @@ -129489,7 +129489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 2.5, "atkpro": 0.5, "defpro": 0.8, @@ -129509,7 +129509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129529,7 +129529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129549,7 +129549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129569,7 +129569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129589,7 +129589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129609,7 +129609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129629,7 +129629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129649,7 +129649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129669,7 +129669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129689,7 +129689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129709,7 +129709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129729,7 +129729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129749,7 +129749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 3.5, "atkpro": 0.5, "defpro": 0.8, @@ -129769,18 +129769,318 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, + "hppro": 6, + "atkpro": 1.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 92, + "modelsize": 1 + }, + { + "Id": 401018, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51022, + "star": 5, + "equip": [], + "newskill": [], + "lv": 35, + "hppro": 3.5, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 88, + "modelsize": 1 + }, + { + "Id": 401019, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 96, + "modelsize": 1 + }, + { + "Id": 401019, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 95, + "modelsize": 1 + }, + { + "Id": 401019, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 93, + "modelsize": 1 + }, + { + "Id": 401019, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 97, + "modelsize": 1 + }, + { + "Id": 401019, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 97, + "modelsize": 1 + }, + { + "Id": 401020, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 93, + "modelsize": 1 + }, + { + "Id": 401020, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 98, + "modelsize": 1 + }, + { + "Id": 401020, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 96, + "modelsize": 1 + }, + { + "Id": 401020, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 14003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 91, + "modelsize": 1 + }, + { + "Id": 401020, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 95, + "modelsize": 1 + }, + { + "Id": 401021, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 94, + "modelsize": 1 + }, + { + "Id": 401021, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 99, + "modelsize": 1 + }, + { + "Id": 401021, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51021, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, + "hppro": 4.5, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 93, + "modelsize": 1 + }, + { + "Id": 401021, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 40, "hppro": 7, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 92, + "speed": 95, "modelsize": 1 }, { - "Id": 401018, + "Id": 401021, "pos": 5, "captainId": 0, "IsBoss": 0, @@ -129789,18 +130089,18 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 3.5, + "lv": 40, + "hppro": 4.5, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 88, + "speed": 92, "modelsize": 1 }, { - "Id": 401019, + "Id": 401022, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -129809,127 +130109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 96, - "modelsize": 1 - }, - { - "Id": 401019, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 95, - "modelsize": 1 - }, - { - "Id": 401019, - "pos": 3, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 93, - "modelsize": 1 - }, - { - "Id": 401019, - "pos": 4, - "captainId": 1, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 24004, - "star": 5, - "equip": [], - "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 97, - "modelsize": 1 - }, - { - "Id": 401019, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 97, - "modelsize": 1 - }, - { - "Id": 401020, - "pos": 1, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 93, - "modelsize": 1 - }, - { - "Id": 401020, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 35, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -129940,7 +130120,27 @@ "modelsize": 1 }, { - "Id": 401020, + "Id": 401022, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 100, + "modelsize": 1 + }, + { + "Id": 401022, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -129949,47 +130149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 96, - "modelsize": 1 - }, - { - "Id": 401020, - "pos": 4, - "captainId": 1, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 14003, - "star": 5, - "equip": [], - "newskill": [], - "lv": 35, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 91, - "modelsize": 1 - }, - { - "Id": 401020, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 35, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130000,7 +130160,47 @@ "modelsize": 1 }, { - "Id": 401021, + "Id": 401022, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 100, + "modelsize": 1 + }, + { + "Id": 401022, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 401023, "pos": 1, "captainId": 0, "IsBoss": 0, @@ -130009,7 +130209,67 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 95, + "modelsize": 1 + }, + { + "Id": 401023, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 100, + "modelsize": 1 + }, + { + "Id": 401023, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 98, + "modelsize": 1 + }, + { + "Id": 401023, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 14003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130020,7 +130280,47 @@ "modelsize": 1 }, { - "Id": 401021, + "Id": 401023, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 98, + "modelsize": 1 + }, + { + "Id": 401024, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 97, + "modelsize": 1 + }, + { + "Id": 401024, "pos": 2, "captainId": 0, "IsBoss": 0, @@ -130029,7 +130329,127 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 45, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 101, + "modelsize": 1 + }, + { + "Id": 401024, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51021, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 5, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 95, + "modelsize": 1 + }, + { + "Id": 401024, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 8, + "atkpro": 1.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 98, + "modelsize": 1 + }, + { + "Id": 401024, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51022, + "star": 5, + "equip": [], + "newskill": [], + "lv": 45, + "hppro": 5, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 95, + "modelsize": 1 + }, + { + "Id": 401025, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 103, + "modelsize": 1 + }, + { + "Id": 401025, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 401025, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130040,7 +130460,187 @@ "modelsize": 1 }, { - "Id": 401021, + "Id": 401025, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 401025, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 105, + "modelsize": 1 + }, + { + "Id": 401026, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 98, + "modelsize": 1 + }, + { + "Id": 401026, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 105, + "modelsize": 1 + }, + { + "Id": 401026, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 100, + "modelsize": 1 + }, + { + "Id": 401026, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 14003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 97, + "modelsize": 1 + }, + { + "Id": 401026, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 103, + "modelsize": 1 + }, + { + "Id": 401027, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 401027, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 50, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 106, + "modelsize": 1 + }, + { + "Id": 401027, "pos": 3, "captainId": 0, "IsBoss": 0, @@ -130049,18 +130649,18 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 4.5, + "lv": 50, + "hppro": 5.5, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 93, + "speed": 97, "modelsize": 1 }, { - "Id": 401021, + "Id": 401027, "pos": 4, "captainId": 1, "IsBoss": 1, @@ -130069,613 +130669,13 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 50, "hppro": 9, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, - "speed": 95, - "modelsize": 1 - }, - { - "Id": 401021, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51022, - "star": 5, - "equip": [], - "newskill": [], - "lv": 35, - "hppro": 4.5, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 92, - "modelsize": 1 - }, - { - "Id": 401022, - "pos": 1, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 98, - "modelsize": 1 - }, - { - "Id": 401022, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 100, - "modelsize": 1 - }, - { - "Id": 401022, - "pos": 3, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 95, - "modelsize": 1 - }, - { - "Id": 401022, - "pos": 4, - "captainId": 1, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 24004, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 100, - "modelsize": 1 - }, - { - "Id": 401022, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 102, - "modelsize": 1 - }, - { - "Id": 401023, - "pos": 1, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 95, - "modelsize": 1 - }, - { - "Id": 401023, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 100, - "modelsize": 1 - }, - { - "Id": 401023, - "pos": 3, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 98, - "modelsize": 1 - }, - { - "Id": 401023, - "pos": 4, - "captainId": 1, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 14003, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 94, - "modelsize": 1 - }, - { - "Id": 401023, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 98, - "modelsize": 1 - }, - { - "Id": 401024, - "pos": 1, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 97, - "modelsize": 1 - }, - { - "Id": 401024, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 101, - "modelsize": 1 - }, - { - "Id": 401024, - "pos": 3, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51021, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 5, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 95, - "modelsize": 1 - }, - { - "Id": 401024, - "pos": 4, - "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, - "heroid": 55002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 10, - "atkpro": 1.5, - "defpro": 0.1, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 98, - "modelsize": 1 - }, - { - "Id": 401024, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51022, - "star": 5, - "equip": [], - "newskill": [], - "lv": 40, - "hppro": 5, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 95, - "modelsize": 1 - }, - { - "Id": 401025, - "pos": 1, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 103, - "modelsize": 1 - }, - { - "Id": 401025, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 102, - "modelsize": 1 - }, - { - "Id": 401025, - "pos": 3, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 99, - "modelsize": 1 - }, - { - "Id": 401025, - "pos": 4, - "captainId": 1, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 24004, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 102, - "modelsize": 1 - }, - { - "Id": 401025, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 105, - "modelsize": 1 - }, - { - "Id": 401026, - "pos": 1, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 98, - "modelsize": 1 - }, - { - "Id": 401026, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 105, - "modelsize": 1 - }, - { - "Id": 401026, - "pos": 3, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 100, - "modelsize": 1 - }, - { - "Id": 401026, - "pos": 4, - "captainId": 1, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 14003, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 97, - "modelsize": 1 - }, - { - "Id": 401026, - "pos": 5, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 103, - "modelsize": 1 - }, - { - "Id": 401027, - "pos": 1, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 102, - "modelsize": 1 - }, - { - "Id": 401027, - "pos": 2, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": -1, - "star": 3, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 0.6, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 106, - "modelsize": 1 - }, - { - "Id": 401027, - "pos": 3, - "captainId": 0, - "IsBoss": 0, - "bossHpCnt": 0, - "heroid": 51021, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 5.5, - "atkpro": 0.5, - "defpro": 0.8, - "skill1": 1, - "skill2": 1, - "skill3": 1, - "speed": 97, - "modelsize": 1 - }, - { - "Id": 401027, - "pos": 4, - "captainId": 1, - "IsBoss": 1, - "bossHpCnt": 4, - "heroid": 55002, - "star": 5, - "equip": [], - "newskill": [], - "lv": 45, - "hppro": 11, - "atkpro": 1.5, - "defpro": 0.1, - "skill1": 1, - "skill2": 1, - "skill3": 1, "speed": 102, "modelsize": 1 }, @@ -130689,7 +130689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 5.5, "atkpro": 0.5, "defpro": 0.8, @@ -130709,7 +130709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130729,7 +130729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130749,7 +130749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130769,7 +130769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130789,7 +130789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130809,7 +130809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130829,7 +130829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130849,7 +130849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130869,7 +130869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130889,7 +130889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130909,7 +130909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130929,7 +130929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -130949,7 +130949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -130969,8 +130969,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 12, + "lv": 55, + "hppro": 10, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -130989,7 +130989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -131009,7 +131009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131029,7 +131029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131049,7 +131049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131069,7 +131069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131089,7 +131089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131109,7 +131109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131129,7 +131129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131149,7 +131149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131169,7 +131169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131189,7 +131189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131209,7 +131209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131229,7 +131229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131249,7 +131249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -131269,8 +131269,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 12, + "lv": 60, + "hppro": 11, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -131289,7 +131289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 60, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -131309,7 +131309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131329,7 +131329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131349,7 +131349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131369,7 +131369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131389,7 +131389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131409,7 +131409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131429,7 +131429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131449,7 +131449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131469,7 +131469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131489,7 +131489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131509,7 +131509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131529,7 +131529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131549,7 +131549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -131569,7 +131569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 12, "atkpro": 1.5, "defpro": 0.1, @@ -131589,7 +131589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 65, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -131609,7 +131609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131629,7 +131629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131649,7 +131649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131669,7 +131669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131689,7 +131689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131709,7 +131709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131729,7 +131729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131749,7 +131749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131769,7 +131769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131789,7 +131789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131809,7 +131809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131829,7 +131829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131849,7 +131849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 1, "atkpro": 0.5, "defpro": 0.8, @@ -131869,7 +131869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 2, "atkpro": 1.5, "defpro": 0.1, @@ -131889,7 +131889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 1, "atkpro": 0.5, "defpro": 0.8, @@ -131909,7 +131909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131929,7 +131929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131949,7 +131949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131969,7 +131969,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -131989,7 +131989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132009,7 +132009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132029,7 +132029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132049,7 +132049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132069,7 +132069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132089,7 +132089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132109,7 +132109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132129,7 +132129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132149,7 +132149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 1.5, "atkpro": 0.5, "defpro": 0.8, @@ -132169,8 +132169,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, - "hppro": 3, + "lv": 15, + "hppro": 2.5, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -132189,7 +132189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 1.5, "atkpro": 0.5, "defpro": 0.8, @@ -132209,7 +132209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132229,7 +132229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132249,7 +132249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132269,7 +132269,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132289,7 +132289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132309,7 +132309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132329,7 +132329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132349,7 +132349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132369,7 +132369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132389,7 +132389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132409,7 +132409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132429,7 +132429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132449,7 +132449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 2, "atkpro": 0.5, "defpro": 0.8, @@ -132469,8 +132469,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, - "hppro": 4, + "lv": 20, + "hppro": 3, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -132489,7 +132489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 2, "atkpro": 0.5, "defpro": 0.8, @@ -132509,7 +132509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132529,7 +132529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132549,7 +132549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132569,7 +132569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132589,7 +132589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132609,7 +132609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132629,7 +132629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132649,7 +132649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132669,7 +132669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132689,7 +132689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132709,7 +132709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132729,7 +132729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132749,7 +132749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 2.5, "atkpro": 0.5, "defpro": 0.8, @@ -132769,8 +132769,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, - "hppro": 5, + "lv": 25, + "hppro": 4, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -132789,7 +132789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 2.5, "atkpro": 0.5, "defpro": 0.8, @@ -132809,7 +132809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132829,7 +132829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132849,7 +132849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132869,7 +132869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132889,7 +132889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132909,7 +132909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132929,7 +132929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132949,7 +132949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132969,7 +132969,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -132989,7 +132989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133009,7 +133009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133029,7 +133029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133049,7 +133049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 3, "atkpro": 0.5, "defpro": 0.8, @@ -133069,8 +133069,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, - "hppro": 6, + "lv": 30, + "hppro": 5, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -133089,7 +133089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 3, "atkpro": 0.5, "defpro": 0.8, @@ -133109,7 +133109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133129,7 +133129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133149,7 +133149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133169,7 +133169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133189,7 +133189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133209,7 +133209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133229,7 +133229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133249,7 +133249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133269,7 +133269,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133289,7 +133289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133309,7 +133309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133329,7 +133329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133349,7 +133349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 4, "atkpro": 0.5, "defpro": 0.8, @@ -133369,8 +133369,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 8, + "lv": 35, + "hppro": 6, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -133389,7 +133389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 4, "atkpro": 0.5, "defpro": 0.8, @@ -133409,7 +133409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133429,7 +133429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133449,7 +133449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133469,7 +133469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133489,7 +133489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133509,7 +133509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133529,7 +133529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133549,7 +133549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133569,7 +133569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133589,7 +133589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133609,7 +133609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133629,7 +133629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133649,7 +133649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 4.5, "atkpro": 0.5, "defpro": 0.8, @@ -133669,8 +133669,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 9, + "lv": 40, + "hppro": 7, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -133689,7 +133689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 4.5, "atkpro": 0.5, "defpro": 0.8, @@ -133709,7 +133709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133729,7 +133729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133749,7 +133749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133769,7 +133769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133789,7 +133789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133809,7 +133809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133829,7 +133829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133849,7 +133849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133869,7 +133869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133889,7 +133889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133909,7 +133909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133929,7 +133929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -133949,7 +133949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 5, "atkpro": 0.5, "defpro": 0.8, @@ -133969,8 +133969,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, - "hppro": 10, + "lv": 45, + "hppro": 8, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -133989,7 +133989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 5, "atkpro": 0.5, "defpro": 0.8, @@ -134009,7 +134009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134029,7 +134029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134049,7 +134049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134069,7 +134069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134089,7 +134089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134109,7 +134109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134129,7 +134129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134149,7 +134149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134169,7 +134169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134189,7 +134189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134209,7 +134209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134229,7 +134229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134249,7 +134249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -134269,8 +134269,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, - "hppro": 12, + "lv": 50, + "hppro": 9, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -134289,7 +134289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 6, "atkpro": 0.5, "defpro": 0.8, @@ -134309,7 +134309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134329,7 +134329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134349,7 +134349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134369,7 +134369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134389,7 +134389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134409,7 +134409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134429,7 +134429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134449,7 +134449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134469,7 +134469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134489,7 +134489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134509,7 +134509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134529,7 +134529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134549,7 +134549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 7, "atkpro": 0.5, "defpro": 0.8, @@ -134569,8 +134569,8 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 14, + "lv": 55, + "hppro": 10, "atkpro": 1.5, "defpro": 0.1, "skill1": 1, @@ -134589,7 +134589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 7, "atkpro": 0.5, "defpro": 0.8, @@ -134599,6 +134599,606 @@ "speed": 131, "modelsize": 1 }, + { + "Id": 402031, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402031, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402031, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402031, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 34006, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402031, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402032, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402032, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402032, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402032, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 34006, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402032, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402033, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402033, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 112, + "modelsize": 1 + }, + { + "Id": 402033, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51025, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 6, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 122, + "modelsize": 1 + }, + { + "Id": 402033, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55001, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 11, + "atkpro": 1.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 119, + "modelsize": 1 + }, + { + "Id": 402033, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51026, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 6, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 126, + "modelsize": 1 + }, + { + "Id": 402034, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402034, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402034, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402034, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 34006, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402034, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402035, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402035, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402035, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402035, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 34006, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402035, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402036, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402036, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 402036, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51025, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 7, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 127, + "modelsize": 1 + }, + { + "Id": 402036, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55001, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 12, + "atkpro": 1.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 124, + "modelsize": 1 + }, + { + "Id": 402036, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51026, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 7, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 131, + "modelsize": 1 + }, { "Id": 403001, "pos": 1, @@ -134609,7 +135209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134629,7 +135229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134649,7 +135249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134669,7 +135269,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134689,7 +135289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134709,7 +135309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134729,7 +135329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134749,7 +135349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134769,7 +135369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134789,7 +135389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134809,7 +135409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134829,7 +135429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134849,10 +135449,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 1, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -134869,10 +135469,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 2, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -134889,10 +135489,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 1, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -134909,7 +135509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134929,7 +135529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134949,7 +135549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134969,7 +135569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -134989,7 +135589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135009,7 +135609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135029,7 +135629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135049,7 +135649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135069,7 +135669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135089,7 +135689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135109,7 +135709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135129,7 +135729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135149,10 +135749,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 1.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135169,10 +135769,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 3, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135189,10 +135789,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 1.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135209,7 +135809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135229,7 +135829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135249,7 +135849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135269,7 +135869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135289,7 +135889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135309,7 +135909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135329,7 +135929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135349,7 +135949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135369,7 +135969,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135389,7 +135989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135409,7 +136009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135429,7 +136029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135449,10 +136049,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 2, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135469,10 +136069,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 4, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135489,10 +136089,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 2, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135509,7 +136109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135529,7 +136129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135549,7 +136149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135569,7 +136169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135589,7 +136189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135609,7 +136209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135629,7 +136229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135649,7 +136249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135669,7 +136269,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135689,7 +136289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135709,7 +136309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135729,7 +136329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135749,10 +136349,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 2.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135769,10 +136369,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 5, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135789,10 +136389,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 2.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -135809,7 +136409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135829,7 +136429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135849,7 +136449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135869,7 +136469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135889,7 +136489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135909,7 +136509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135929,7 +136529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135949,7 +136549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135969,7 +136569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -135989,7 +136589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136009,7 +136609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136029,7 +136629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136049,10 +136649,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136069,10 +136669,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 6, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136089,10 +136689,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136109,7 +136709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136129,7 +136729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136149,7 +136749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136169,7 +136769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136189,7 +136789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136209,7 +136809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136229,7 +136829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136249,7 +136849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136269,7 +136869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136289,7 +136889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136309,7 +136909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136329,7 +136929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136349,10 +136949,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 4, + "lv": 35, + "hppro": 3.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136369,10 +136969,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 8, + "lv": 35, + "hppro": 7, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136389,10 +136989,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 4, + "lv": 35, + "hppro": 3.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136409,7 +137009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136429,7 +137029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136449,7 +137049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136469,7 +137069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136489,7 +137089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136509,7 +137109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136529,7 +137129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136549,7 +137149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136569,7 +137169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136589,7 +137189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136609,7 +137209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136629,7 +137229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136649,10 +137249,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 4.5, + "lv": 40, + "hppro": 4, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136669,10 +137269,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 9, + "lv": 40, + "hppro": 8, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136689,10 +137289,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 4.5, + "lv": 40, + "hppro": 4, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136709,7 +137309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136729,7 +137329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136749,7 +137349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136769,7 +137369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136789,7 +137389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136809,7 +137409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136829,7 +137429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136849,7 +137449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136869,7 +137469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136889,7 +137489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136909,7 +137509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136929,7 +137529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -136949,10 +137549,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, - "hppro": 5, + "lv": 45, + "hppro": 4.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136969,10 +137569,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, - "hppro": 10, + "lv": 45, + "hppro": 9, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -136989,10 +137589,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, - "hppro": 5, + "lv": 45, + "hppro": 4.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -137009,7 +137609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137029,7 +137629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137049,7 +137649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137069,7 +137669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137089,7 +137689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137109,7 +137709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137129,7 +137729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137149,7 +137749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137169,7 +137769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137189,7 +137789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137209,7 +137809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137229,7 +137829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137249,10 +137849,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, - "hppro": 6, + "lv": 50, + "hppro": 5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -137269,10 +137869,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, - "hppro": 12, + "lv": 50, + "hppro": 10, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -137289,10 +137889,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, - "hppro": 6, + "lv": 50, + "hppro": 5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -137309,7 +137909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137329,7 +137929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137349,7 +137949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137369,7 +137969,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137389,7 +137989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137409,7 +138009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137429,7 +138029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137449,7 +138049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137469,7 +138069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137489,7 +138089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137509,7 +138109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137529,7 +138129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137549,10 +138149,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 7, + "lv": 55, + "hppro": 5.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.1, "skill1": 1, "skill2": 1, "skill3": 1, @@ -137569,10 +138169,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 14, + "lv": 55, + "hppro": 11, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 0.3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -137589,13 +138189,613 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 7, + "lv": 55, + "hppro": 5.5, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 124, + "modelsize": 1 + }, + { + "Id": 403031, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, "skill2": 1, "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403031, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403031, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403031, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403031, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403032, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403032, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403032, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403032, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 14003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403032, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403033, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403033, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 403033, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51023, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 5, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 403033, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 12, + "atkpro": 1.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 109, + "modelsize": 1 + }, + { + "Id": 403033, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51024, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 5, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 119, + "modelsize": 1 + }, + { + "Id": 403034, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403034, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403034, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403034, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403034, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403035, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403035, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403035, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403035, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 14003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403035, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403036, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403036, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 403036, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51023, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 5.5, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 122, + "modelsize": 1 + }, + { + "Id": 403036, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 13, + "atkpro": 1.5, + "defpro": 0.3, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 114, + "modelsize": 1 + }, + { + "Id": 403036, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51024, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 5.5, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, "speed": 124, "modelsize": 1 }, @@ -137609,7 +138809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137629,7 +138829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137649,7 +138849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137669,7 +138869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137689,7 +138889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137709,7 +138909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137729,7 +138929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137749,7 +138949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137769,7 +138969,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137789,7 +138989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137809,7 +139009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137829,7 +139029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137849,7 +139049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 1, "atkpro": 0.5, "defpro": 0.8, @@ -137869,10 +139069,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, - "hppro": 2, - "atkpro": 1.5, - "defpro": 0.1, + "lv": 10, + "hppro": 1, + "atkpro": 1, + "defpro": 3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -137889,7 +139089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 5, + "lv": 10, "hppro": 1, "atkpro": 0.5, "defpro": 0.8, @@ -137909,7 +139109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137929,7 +139129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137949,7 +139149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137969,7 +139169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -137989,7 +139189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138009,7 +139209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138029,7 +139229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138049,7 +139249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138069,7 +139269,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138089,7 +139289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138109,7 +139309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138129,7 +139329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 10, + "lv": 15, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138149,10 +139349,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, - "hppro": 1.5, + "lv": 15, + "hppro": 2, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138169,10 +139369,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, - "hppro": 3, - "atkpro": 1.5, - "defpro": 0.1, + "lv": 15, + "hppro": 1.5, + "atkpro": 1, + "defpro": 3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138189,10 +139389,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 10, - "hppro": 1.5, + "lv": 15, + "hppro": 2, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138209,7 +139409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138229,7 +139429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138249,7 +139449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138269,7 +139469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138289,7 +139489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138309,7 +139509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138329,7 +139529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138349,7 +139549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138369,7 +139569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138389,7 +139589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138409,7 +139609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138429,7 +139629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 15, + "lv": 20, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138449,10 +139649,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, - "hppro": 2, + "lv": 20, + "hppro": 3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138469,10 +139669,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, - "hppro": 4, - "atkpro": 1.5, - "defpro": 0.1, + "lv": 20, + "hppro": 2, + "atkpro": 1.1, + "defpro": 3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138489,10 +139689,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 15, - "hppro": 2, + "lv": 20, + "hppro": 3, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138509,7 +139709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138529,7 +139729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138549,7 +139749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138569,7 +139769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138589,7 +139789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138609,7 +139809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138629,7 +139829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138649,7 +139849,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138669,7 +139869,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138689,7 +139889,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138709,7 +139909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138729,7 +139929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 20, + "lv": 25, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138749,10 +139949,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, - "hppro": 2.5, + "lv": 25, + "hppro": 4, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138769,10 +139969,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, - "hppro": 5, - "atkpro": 1.5, - "defpro": 0.1, + "lv": 25, + "hppro": 2.5, + "atkpro": 1.2, + "defpro": 3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138789,10 +139989,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 20, - "hppro": 2.5, + "lv": 25, + "hppro": 4, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -138809,7 +140009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138829,7 +140029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138849,7 +140049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138869,7 +140069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138889,7 +140089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138909,7 +140109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138929,7 +140129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138949,7 +140149,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138969,7 +140169,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -138989,7 +140189,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139009,7 +140209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139029,7 +140229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 25, + "lv": 30, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139049,10 +140249,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, - "hppro": 3, + "lv": 30, + "hppro": 4.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139069,10 +140269,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, - "hppro": 6, - "atkpro": 1.5, - "defpro": 0.1, + "lv": 30, + "hppro": 3, + "atkpro": 1.3, + "defpro": 3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139089,10 +140289,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 25, - "hppro": 3, + "lv": 30, + "hppro": 4.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139109,7 +140309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139129,7 +140329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139149,7 +140349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139169,7 +140369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139189,7 +140389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139209,7 +140409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139229,7 +140429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139249,7 +140449,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139269,7 +140469,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139289,7 +140489,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139309,7 +140509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139329,7 +140529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 30, + "lv": 35, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139349,10 +140549,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 4, + "lv": 35, + "hppro": 5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139369,10 +140569,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 8, - "atkpro": 1.5, - "defpro": 0.1, + "lv": 35, + "hppro": 3.5, + "atkpro": 1.4, + "defpro": 3, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139389,10 +140589,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 30, - "hppro": 4, + "lv": 35, + "hppro": 5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139409,7 +140609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139429,7 +140629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139449,7 +140649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139469,7 +140669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139489,7 +140689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139509,7 +140709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139529,7 +140729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139549,7 +140749,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139569,7 +140769,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139589,7 +140789,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139609,7 +140809,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139629,7 +140829,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 35, + "lv": 40, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139649,10 +140849,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 4.5, + "lv": 40, + "hppro": 5.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139669,10 +140869,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 9, + "lv": 40, + "hppro": 4, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 3.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139689,10 +140889,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 35, - "hppro": 4.5, + "lv": 40, + "hppro": 5.5, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139709,7 +140909,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139729,7 +140929,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139749,7 +140949,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139769,7 +140969,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139789,7 +140989,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139809,7 +141009,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139829,7 +141029,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139849,7 +141049,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139869,7 +141069,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139889,7 +141089,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139909,7 +141109,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139929,7 +141129,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 40, + "lv": 45, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -139949,10 +141149,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, - "hppro": 5, + "lv": 45, + "hppro": 6, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139969,10 +141169,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, - "hppro": 10, + "lv": 45, + "hppro": 5, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 3.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -139989,10 +141189,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 40, - "hppro": 5, + "lv": 45, + "hppro": 6, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -140009,7 +141209,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140029,7 +141229,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140049,7 +141249,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140069,7 +141269,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140089,7 +141289,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140109,7 +141309,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140129,7 +141329,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140149,7 +141349,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140169,7 +141369,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140189,7 +141389,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140209,7 +141409,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140229,7 +141429,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 45, + "lv": 50, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140249,10 +141449,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, - "hppro": 6, + "lv": 50, + "hppro": 8, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -140269,10 +141469,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, - "hppro": 12, + "lv": 50, + "hppro": 5.5, "atkpro": 1.5, - "defpro": 0.1, + "defpro": 3.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -140289,10 +141489,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 45, - "hppro": 6, + "lv": 50, + "hppro": 8, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -140309,7 +141509,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140329,7 +141529,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140349,7 +141549,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140369,7 +141569,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140389,7 +141589,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140409,7 +141609,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140429,7 +141629,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140449,7 +141649,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140469,7 +141669,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140489,7 +141689,7 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140509,7 +141709,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140529,7 +141729,7 @@ "star": 3, "equip": [], "newskill": [], - "lv": 50, + "lv": 55, "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, @@ -140549,10 +141749,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 7, + "lv": 55, + "hppro": 10, "atkpro": 0.5, - "defpro": 0.8, + "defpro": 0.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -140569,10 +141769,10 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 14, - "atkpro": 1.5, - "defpro": 0.1, + "lv": 55, + "hppro": 6, + "atkpro": 1.6, + "defpro": 3.5, "skill1": 1, "skill2": 1, "skill3": 1, @@ -140589,13 +141789,613 @@ "star": 5, "equip": [], "newskill": [], - "lv": 50, - "hppro": 7, + "lv": 55, + "hppro": 10, + "atkpro": 0.5, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 124, + "modelsize": 1 + }, + { + "Id": 404031, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, "atkpro": 0.5, "defpro": 0.8, "skill1": 1, "skill2": 1, "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404031, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404031, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404031, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404031, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404032, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404032, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404032, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404032, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 14003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404032, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404033, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404033, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 102, + "modelsize": 1 + }, + { + "Id": 404033, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51027, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 11, + "atkpro": 0.5, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 117, + "modelsize": 1 + }, + { + "Id": 404033, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 7, + "atkpro": 1.7, + "defpro": 4, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 109, + "modelsize": 1 + }, + { + "Id": 404033, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51028, + "star": 5, + "equip": [], + "newskill": [], + "lv": 60, + "hppro": 11, + "atkpro": 0.5, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 119, + "modelsize": 1 + }, + { + "Id": 404034, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404034, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404034, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404034, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 24004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404034, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404035, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404035, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404035, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404035, + "pos": 4, + "captainId": 1, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 14003, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404035, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51002, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404036, + "pos": 1, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404036, + "pos": 2, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": -1, + "star": 3, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 0.6, + "atkpro": 0.5, + "defpro": 0.8, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 107, + "modelsize": 1 + }, + { + "Id": 404036, + "pos": 3, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51027, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 12, + "atkpro": 0.5, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 122, + "modelsize": 1 + }, + { + "Id": 404036, + "pos": 4, + "captainId": 1, + "IsBoss": 1, + "bossHpCnt": 4, + "heroid": 55004, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 8, + "atkpro": 2, + "defpro": 4, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 114, + "modelsize": 1 + }, + { + "Id": 404036, + "pos": 5, + "captainId": 0, + "IsBoss": 0, + "bossHpCnt": 0, + "heroid": 51028, + "star": 5, + "equip": [], + "newskill": [], + "lv": 65, + "hppro": 12, + "atkpro": 0.5, + "defpro": 0.5, + "skill1": 1, + "skill2": 1, + "skill3": 1, "speed": 124, "modelsize": 1 }, @@ -230611,7 +232411,7 @@ "newskill": [], "lv": 1, "hppro": 0.2, - "atkpro": 0.5, + "atkpro": 0.2, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -230631,7 +232431,7 @@ "newskill": [], "lv": 1, "hppro": 0.2, - "atkpro": 0.5, + "atkpro": 0.2, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -230651,7 +232451,7 @@ "newskill": [], "lv": 1, "hppro": 0.2, - "atkpro": 0.5, + "atkpro": 0.2, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -230671,7 +232471,7 @@ "newskill": [], "lv": 1, "hppro": 0.2, - "atkpro": 0.5, + "atkpro": 0.2, "defpro": 0.1, "skill1": 1, "skill2": 1, @@ -230691,7 +232491,7 @@ "newskill": [], "lv": 1, "hppro": 0.2, - "atkpro": 0.5, + "atkpro": 0.2, "defpro": 0.1, "skill1": 1, "skill2": 1, diff --git a/bin/json/game_playerlv.json b/bin/json/game_playerlv.json index 9cffd4107..677ddb1b2 100644 --- a/bin/json/game_playerlv.json +++ b/bin/json/game_playerlv.json @@ -14,6 +14,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -27,6 +32,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -40,6 +50,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -53,6 +68,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -66,6 +86,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -79,6 +104,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -92,6 +122,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -105,6 +140,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -118,6 +158,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -131,6 +176,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -144,6 +194,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -157,6 +212,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -170,6 +230,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -183,6 +248,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -196,6 +266,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -209,6 +284,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -222,6 +302,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -235,6 +320,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -248,6 +338,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -261,6 +356,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -274,6 +374,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -287,6 +392,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -300,6 +410,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -313,6 +428,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -326,6 +446,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -339,6 +464,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -352,6 +482,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -365,6 +500,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -378,6 +518,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -391,6 +536,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -404,6 +554,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -417,6 +572,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -430,6 +590,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -443,6 +608,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -456,6 +626,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -469,6 +644,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -482,6 +662,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -495,6 +680,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -508,6 +698,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -521,6 +716,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -534,6 +734,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -547,6 +752,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -560,6 +770,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -573,6 +788,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -586,6 +806,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -599,6 +824,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -612,6 +842,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -625,6 +860,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -638,6 +878,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -651,6 +896,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -664,6 +914,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -677,6 +932,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -690,6 +950,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -703,6 +968,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -716,6 +986,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -729,6 +1004,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -742,6 +1022,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -755,6 +1040,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, @@ -768,6 +1058,11 @@ "a": "attr", "t": "ps", "n": 30 + }, + { + "a": "attr", + "t": "starcoin", + "n": 40 } ], "ps_ceiling": 180, diff --git a/bin/json/game_signextra.json b/bin/json/game_signextra.json index 5c784852d..633a546e7 100644 --- a/bin/json/game_signextra.json +++ b/bin/json/game_signextra.json @@ -3,7 +3,7 @@ "id": 1, "txt": { "key": "sign_sign_extra_txt_1", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{0}次领取" }, "day": 7, "groups": 1, @@ -19,7 +19,7 @@ "id": 2, "txt": { "key": "sign_sign_extra_txt_2", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{1}次领取" }, "day": 14, "groups": 1, @@ -35,7 +35,7 @@ "id": 3, "txt": { "key": "sign_sign_extra_txt_3", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{2}次领取" }, "day": 21, "groups": 1, @@ -51,7 +51,7 @@ "id": 4, "txt": { "key": "sign_sign_extra_txt_4", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{3}次领取" }, "day": 7, "groups": 2, @@ -67,7 +67,7 @@ "id": 5, "txt": { "key": "sign_sign_extra_txt_5", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{4}次领取" }, "day": 14, "groups": 2, @@ -83,7 +83,7 @@ "id": 6, "txt": { "key": "sign_sign_extra_txt_6", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{5}次领取" }, "day": 21, "groups": 2, @@ -99,7 +99,7 @@ "id": 7, "txt": { "key": "sign_sign_extra_txt_7", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{6}次领取" }, "day": 7, "groups": 3, @@ -115,7 +115,7 @@ "id": 8, "txt": { "key": "sign_sign_extra_txt_8", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{7}次领取" }, "day": 14, "groups": 3, @@ -131,7 +131,7 @@ "id": 9, "txt": { "key": "sign_sign_extra_txt_9", - "text": "累计签到{0}天领取" + "text": "累计完成拼图{8}次领取" }, "day": 21, "groups": 3, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index e2dd80a3b..0bd5bc743 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -52,7 +52,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_125004111_1", - "text": "对敌方1个目标造成3次攻击力30%的伤害,有40%概率为自身附加2回合[color=#37d8a9]免疫[/color]状态。" + "text": "对敌方1个目标造成3次攻击力30%的伤害,有40%概率为自身附加2回合的[color=#37d8a9]免疫[/color]状态。" }, "buffid": [ 390001111 @@ -240,7 +240,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_125004211_1", - "text": "清除己方所有减益状态,并平均分配己方生命值,为己方附加2回合[color=#37d8a9]攻击提升[/color]状态。" + "text": "清除己方所有减益状态,并平均分配己方生命值,为己方附加2回合的[color=#37d8a9]攻击提升[/color]状态。" }, "buffid": [ 390001001 @@ -1642,7 +1642,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134006111_1", - "text": "对敌方1个目标造成2次攻击力50%的伤害,有60%概率为目标附加2回合[color=#e5621b]速度下降[/color]。" + "text": "对敌方1个目标造成2次攻击力50%伤害,60%概率为目标附加2回合[color=#e5621b]速度下降[/color]。" }, "buffid": [ 390001008 @@ -1797,7 +1797,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134006211_1", - "text": "攻击敌方,伤害为自身攻击力210%,70%概率降低目标30%行动值;。" + "text": "攻击敌方,伤害为自身攻击力210%,70%概率降低目标30%行动值。" }, "buffid": [], "map": "" @@ -2444,7 +2444,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_125001211_1", - "text": "回合结束时获得1回合[color=#37d8a9]玄御[/color],效果期间回合开始时攻击敌方,伤害为自身防御力90%。" + "text": "回合结束时,获得1回合[color=#37d8a9]玄御[/color]状态,效果期间的回合开始时会攻击敌方,伤害为自身防御力90%。" }, "buffid": [ 390001210 @@ -4120,7 +4120,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135001311_1", - "text": "攻击敌方2次,每次伤害为自身攻击360%。" + "text": "攻击敌方2次,伤害为自身攻击360%。" }, "buffid": [ 390001119, @@ -8091,7 +8091,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_145003111_1", - "text": "对敌方1个目标造成攻击力90%的伤害,附加自身最大生命在5。" + "text": "对敌方1个目标造成攻击力90%和自身生命值5%伤害。" }, "buffid": [], "map": "" @@ -9409,7 +9409,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135005111_1", - "text": "幸运·普雷斯科特对敌方1个目标造成攻击力140%的伤害,每点速度可额外造成攻击力0。" + "text": "幸运·普雷斯科特对敌方1个目标造成攻击力140%的伤害,每点速度可额外造成攻击力0.4%的伤害。" }, "buffid": [], "map": "" @@ -9701,7 +9701,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_135005311_1", - "text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]免疫[/color]和[color=#37d8a9]防御提升[/color]状态,并对敌方目标造成攻击力500%的伤害,并附加2回合[color=#e5621b]攻击下降[/color]状态。" + "text": "幸运·普雷斯科特为己方附加2回合[color=#37d8a9]免疫[/color]和[color=#37d8a9]防御提升[/color]状态,并对敌方目标造成攻击力500%的伤害,并附加2回合[color=#e5621b]攻击下降[/color]的状态。" }, "buffid": [ 390001111, @@ -10665,7 +10665,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_114001211_1", - "text": "史图依克每次受到攻击时,自身获得1层[color=#37d8a9]酋长之怒[/color],每层可提升自身10%的基础防御力和5%的效果抵抗,最多可叠加10层。" + "text": "史图依克每次受到攻击时,获得1层[color=#37d8a9]酋长之怒[/color],每层可提升自身10%的基础防御力和5%的效果抵抗,最多可叠加10层。" }, "buffid": [ 390001202 @@ -13675,7 +13675,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_134002311_1", - "text": "蒂姆·邓普顿为己方1名队友附加1回合[color=#37d8a9]无敌[/color]状态,同时为己方附加2回合[color=#37d8a9]免疫[/color]状态。" + "text": "蒂姆·邓普顿为己方1名队友附加1回合[color=#37d8a9]无敌[/color]状态,同时为己方附加2回合的[color=#37d8a9]免疫[/color]状态。" }, "buffid": [ 390001103, @@ -17816,7 +17816,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_113001311_1", - "text": "闪闪对敌方所有目标造成攻击力350%的伤害,并为己方附加2回合[color=#37d8a9]防御提升[/color]状态。" + "text": "闪闪对敌方造成攻击力350%的伤害,并为己方附加2回合[color=#37d8a9]防御提升[/color]状态。" }, "buffid": [ 390001002 @@ -23316,7 +23316,7 @@ }, "Desc": { "key": "skill_skill_atk_Desc_123004211_1", - "text": "攻击随机3个敌方,伤害为自身造成攻击力240%,75%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。" + "text": "攻击随机3个敌方,伤害为自身攻击力240%,75%概率为目标附加1回合[color=#e5621b]眩晕[/color] 。" }, "buffid": [ 390001105 diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index fd72ddbc5..d417df254 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -382,7 +382,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001101", - "text": "被攻击时,受到的伤害提高15%。" + "text": "受到的伤害提高15%。" }, "BuffType": 10, "EffectArgu": [ @@ -647,7 +647,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001110", - "text": "回合开始时,会被迫发起攻击,向附加状态者释放基础技能。" + "text": "回合开始时,会被迫向附加状态者释放基础技能。" }, "BuffType": 19, "EffectArgu": [], @@ -1296,7 +1296,7 @@ }, "Desc": { "key": "skill_skill_buff_Desc_390001202", - "text": "每层使自身基础防御提升10%,效果抵抗提升5%,最多可叠加10层。。" + "text": "每层使自身基础防御提升10%,效果抵抗提升5%,最多可叠加10层。" }, "BuffType": 46, "EffectArgu": [ diff --git a/bin/json/game_taskround.json b/bin/json/game_taskround.json index 96db0fc8a..c91d66098 100644 --- a/bin/json/game_taskround.json +++ b/bin/json/game_taskround.json @@ -5,7 +5,7 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_1", - "text": "本周竞技场挑战{0}次" + "text": "本周竞技场挑战10次" }, "type_id": 13000001, "active": 10, @@ -31,7 +31,7 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_2", - "text": "本周竞技场挑战{0}次" + "text": "本周竞技场挑战30次" }, "type_id": 13000002, "active": 10, @@ -57,7 +57,7 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_3", - "text": "本周竞技场挑战{0}次" + "text": "本周竞技场挑战50次" }, "type_id": 13000003, "active": 10, @@ -83,7 +83,7 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_4", - "text": "本周竞技场胜利{0}次" + "text": "本周竞技场胜利10次" }, "type_id": 13000004, "active": 10, @@ -109,7 +109,7 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_5", - "text": "本周竞技场胜利{0}次" + "text": "本周竞技场胜利20次" }, "type_id": 13000005, "active": 10, @@ -135,7 +135,7 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_6", - "text": "本周竞技场胜利{0}次" + "text": "本周竞技场胜利30次" }, "type_id": 13000006, "active": 10, @@ -161,9 +161,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_7", - "text": "本周累计经验副本消耗{0}体力" + "text": "本周累计经验副本消耗300体力" }, - "type_id": 13000006, + "type_id": 13000007, "active": 10, "id_after": 0, "jump_interface": 11012, @@ -187,9 +187,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_8", - "text": "本周累计经验副本消耗{0}体力" + "text": "本周累计经验副本消耗600体力" }, - "type_id": 13000006, + "type_id": 13000008, "active": 10, "id_after": 0, "jump_interface": 11012, @@ -213,9 +213,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_9", - "text": "本周累计经验副本消耗{0}体力" + "text": "本周累计经验副本消耗1000体力" }, - "type_id": 13000006, + "type_id": 13000009, "active": 10, "id_after": 0, "jump_interface": 11012, @@ -239,9 +239,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_10", - "text": "本周累计消耗{0}点金币" + "text": "本周累计消耗3000000点金币" }, - "type_id": 13000006, + "type_id": 13000010, "active": 10, "id_after": 0, "jump_interface": 122, @@ -265,9 +265,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_11", - "text": "本周累计消耗{0}点金币" + "text": "本周累计消耗6000000点金币" }, - "type_id": 13000006, + "type_id": 13000011, "active": 10, "id_after": 0, "jump_interface": 122, @@ -291,9 +291,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_12", - "text": "本周累计消耗{0}点金币" + "text": "本周累计消耗10000000点金币" }, - "type_id": 13000006, + "type_id": 13000012, "active": 10, "id_after": 0, "jump_interface": 122, @@ -317,9 +317,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_13", - "text": "本周累计装备副本消耗{0}体力" + "text": "本周累计装备副本消耗300体力" }, - "type_id": 13000006, + "type_id": 13000013, "active": 10, "id_after": 0, "jump_interface": 11012, @@ -343,9 +343,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_14", - "text": "本周累计装备副本消耗{0}体力" + "text": "本周累计装备副本消耗600体力" }, - "type_id": 13000006, + "type_id": 13000014, "active": 10, "id_after": 0, "jump_interface": 11012, @@ -369,9 +369,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_15", - "text": "本周累计装备副本消耗{0}体力" + "text": "本周累计装备副本消耗1000体力" }, - "type_id": 13000006, + "type_id": 13000015, "active": 10, "id_after": 0, "jump_interface": 11012, @@ -395,9 +395,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_16", - "text": "本周累计回响副本消耗{0}体力" + "text": "本周累计回响副本消耗300体力" }, - "type_id": 13000006, + "type_id": 13000016, "active": 10, "id_after": 0, "jump_interface": 168, @@ -421,9 +421,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_17", - "text": "本周累计回响副本消耗{0}体力" + "text": "本周累计回响副本消耗600体力" }, - "type_id": 13000006, + "type_id": 13000017, "active": 10, "id_after": 0, "jump_interface": 168, @@ -447,9 +447,9 @@ "id_tag": 2, "task_display": { "key": "task_task_round_task_display_18", - "text": "本周累计回响副本消耗{0}体力" + "text": "本周累计回响副本消耗1000体力" }, - "type_id": 13000006, + "type_id": 13000018, "active": 10, "id_after": 0, "jump_interface": 168, diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go index 90e7a2493..0bff66560 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -6,8 +6,8 @@ import ( cfg "go_dreamfactory/sys/configure/structs" ) -func (this *apiComp) DrawCardV2Check(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) { - if req.DrawType < 0 && (req.DrawCount == 1 || req.DrawCount == 10) { // 只能是单抽或10抽 +func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) { + if req.DrawType < 0 || (req.DrawCount != 1 && req.DrawCount != 10) { // 只能是单抽或10抽 errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, Title: pb.ErrorCode_ReqParameterError.ToString(), @@ -17,7 +17,7 @@ func (this *apiComp) DrawCardV2Check(session comm.IUserSession, req *pb.HeroDraw } //抽卡 -func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) { +func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (errdata *pb.ErrorData) { var ( szCards []string // 最终抽到的卡牌 drawCount int32 // 抽卡次数 @@ -51,7 +51,7 @@ func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardR } // 准备数据 ///////////////////////////////////// - drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType) // 获取新的抽卡配置 + drawConf, err = this.module.configure.GetHeroDrawConfigByType(req.DrawType + 1) // 获取新的抽卡配置 if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_ReqParameterError, @@ -71,7 +71,7 @@ func (this *apiComp) DrawCardV2(session comm.IUserSession, req *pb.HeroDrawCardR if cfgGlobal == nil { return } - if errdata = this.DrawCardV2Check(session, req); errdata != nil { + if errdata = this.DrawCardCheck(session, req); errdata != nil { return } diff --git a/modules/hero/api_drawCardFloor.go b/modules/hero/api_drawCardFloor.go index d4692b62d..4f38b6e65 100644 --- a/modules/hero/api_drawCardFloor.go +++ b/modules/hero/api_drawCardFloor.go @@ -14,8 +14,8 @@ func (this *apiComp) DrawCardFloorCheck(session comm.IUserSession, req *pb.HeroD func (this *apiComp) DrawCardFloor(session comm.IUserSession, req *pb.HeroDrawCardFloorReq) (errdata *pb.ErrorData) { rsp := &pb.HeroDrawCardFloorResp{} if heroRecord, err := this.module.modelRecord.GetHeroRecord(session.GetUserId()); err == nil { - rsp.Star4 = heroRecord.Star4 - rsp.Star5 = heroRecord.Star5 + rsp.Baodi4 = heroRecord.Baodi4 + rsp.Baodi5 = heroRecord.Baodi5 rsp.Onebuy = heroRecord.Onebuy rsp.Tenbuy = heroRecord.Tenbuy } diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index 2ec567f4d..8bcab530d 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -445,7 +445,7 @@ func (this *configureComp) GetHeroDrawConfigByType(id int32) (data *cfg.GameDraw if v, err = this.GetConfigure(hero_draw); err == nil { if conf, ok := v.(*cfg.GameDrawPool); ok { - if data = conf.Get(id - 1); data != nil { + if data = conf.Get(id); data != nil { return } @@ -461,7 +461,7 @@ func (this *configureComp) GetHeroDrawWeightConfigById(dtype int32, key int32) i // 通过卡池获取 英雄 func (this *configureComp) GetHeroByPool(pool string) (hid string, err error) { - if v, ok := this.cardPool[pool]; !ok { + if v, ok := this.cardPool[pool]; ok { var sz []int32 for _, v1 := range v { sz = append(sz, v1.Weight) diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go index 2683e9124..13206f571 100644 --- a/pb/hero_db.pb.go +++ b/pb/hero_db.pb.go @@ -319,24 +319,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星英雄 - Inevitable1 int32 `protobuf:"varint,14,opt,name=inevitable1,proto3" json:"inevitable1"` //第30-50次抽奖必出一个5星英雄 - Race map[int32]int32 `protobuf:"bytes,15,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营类型 value count - Baodi4 map[int32]int32 `protobuf:"bytes,16,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count - Baodi5 map[int32]int32 `protobuf:"bytes,17,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count - Count map[int32]int32 `protobuf:"bytes,18,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count + 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 + Mtime int64 `protobuf:"varint,3,opt,name=mtime,proto3" json:"mtime"` // 修改时间 + Drawcount int32 `protobuf:"varint,4,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数 + Condition map[string]int32 `protobuf:"bytes,5,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,6,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,7,opt,name=totalcount,proto3" json:"totalcount"` // 总的累计抽卡次数 + Daycount int32 `protobuf:"varint,8,opt,name=daycount,proto3" json:"daycount"` // 今天抽卡次数 + Onebuy int32 `protobuf:"varint,9,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,10,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 + Race map[int32]int32 `protobuf:"bytes,11,rep,name=race,proto3" json:"race" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key 阵营类型 value count + Baodi4 map[int32]int32 `protobuf:"bytes,12,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count + Baodi5 map[int32]int32 `protobuf:"bytes,13,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count + Count map[int32]int32 `protobuf:"bytes,14,rep,name=count,proto3" json:"count" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 抽卡次数 key 阵营类型 value count } func (x *DBHeroRecord) Reset() { @@ -385,20 +381,6 @@ func (x *DBHeroRecord) GetUid() string { return "" } -func (x *DBHeroRecord) GetStar4() int32 { - if x != nil { - return x.Star4 - } - return 0 -} - -func (x *DBHeroRecord) GetStar5() int32 { - if x != nil { - return x.Star5 - } - return 0 -} - func (x *DBHeroRecord) GetMtime() int64 { if x != nil { return x.Mtime @@ -455,20 +437,6 @@ func (x *DBHeroRecord) GetTenbuy() int32 { return 0 } -func (x *DBHeroRecord) GetInevitable() int32 { - if x != nil { - return x.Inevitable - } - return 0 -} - -func (x *DBHeroRecord) GetInevitable1() int32 { - if x != nil { - return x.Inevitable1 - } - return 0 -} - func (x *DBHeroRecord) GetRace() map[int32]int32 { if x != nil { return x.Race @@ -658,85 +626,78 @@ var file_hero_hero_db_proto_rawDesc = []byte{ 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 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, 0xde, 0x07, 0x0a, 0x0c, + 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xf0, 0x06, 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, 0x72, 0x34, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, - 0x74, 0x61, 0x72, 0x34, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x35, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74, - 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, - 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, - 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x03, 0x28, + 0x0a, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, + 0x74, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, + 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x09, 0x63, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3a, 0x0a, 0x09, 0x73, 0x74, - 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, - 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x53, 0x74, 0x61, - 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x09, 0x73, 0x74, 0x61, - 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, - 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x74, 0x6f, 0x74, 0x61, - 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, 0x79, 0x63, 0x6f, 0x75, - 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x18, 0x0b, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x06, 0x6f, 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, 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, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0f, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, 0x61, 0x63, - 0x65, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x18, 0x10, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x62, 0x61, - 0x6f, 0x64, 0x69, 0x34, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x18, 0x11, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, - 0x6f, 0x72, 0x64, 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, - 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x12, 0x2e, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, - 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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, + 0x2e, 0x53, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, + 0x09, 0x73, 0x74, 0x61, 0x72, 0x35, 0x48, 0x65, 0x72, 0x6f, 0x12, 0x1e, 0x0a, 0x0a, 0x74, 0x6f, + 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, + 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x64, 0x61, + 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x64, 0x61, + 0x79, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, + 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6f, 0x6e, 0x65, 0x62, 0x75, 0x79, 0x12, 0x16, + 0x0a, 0x06, 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x74, 0x65, 0x6e, 0x62, 0x75, 0x79, 0x12, 0x2b, 0x0a, 0x04, 0x72, 0x61, 0x63, 0x65, 0x18, 0x0b, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, + 0x6f, 0x72, 0x64, 0x2e, 0x52, 0x61, 0x63, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x72, + 0x61, 0x63, 0x65, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x18, 0x0c, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, + 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x12, 0x31, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, + 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, + 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x12, 0x2e, 0x0a, 0x05, 0x63, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, + 0x6f, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x6e, 0x74, + 0x72, 0x79, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 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, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 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, 0x1a, 0x39, 0x0a, 0x0b, - 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, + 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x52, 0x61, 0x63, 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, 0x1a, 0x39, + 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x34, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, + 0x64, 0x69, 0x35, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 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, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, - 0x35, 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, 0x1a, 0x38, 0x0a, 0x0a, 0x43, 0x6f, 0x75, 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, 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, + 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 2eb582619..f88e2f4a8 100644 --- a/pb/hero_msg.pb.go +++ b/pb/hero_msg.pb.go @@ -1193,10 +1193,10 @@ type HeroDrawCardFloorResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Star4 int32 `protobuf:"varint,1,opt,name=star4,proto3" json:"star4"` - Star5 int32 `protobuf:"varint,2,opt,name=star5,proto3" json:"star5"` - Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 - Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 + Baodi4 map[int32]int32 `protobuf:"bytes,1,rep,name=baodi4,proto3" json:"baodi4" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 4星保底次数 key 阵营类型 value count + Baodi5 map[int32]int32 `protobuf:"bytes,2,rep,name=baodi5,proto3" json:"baodi5" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 5星保底次数 key 阵营类型 value count + Onebuy int32 `protobuf:"varint,3,opt,name=onebuy,proto3" json:"onebuy"` // 单次购买次数 + Tenbuy int32 `protobuf:"varint,4,opt,name=tenbuy,proto3" json:"tenbuy"` // 十连购买次数 } func (x *HeroDrawCardFloorResp) Reset() { @@ -1231,18 +1231,18 @@ func (*HeroDrawCardFloorResp) Descriptor() ([]byte, []int) { return file_hero_hero_msg_proto_rawDescGZIP(), []int{23} } -func (x *HeroDrawCardFloorResp) GetStar4() int32 { +func (x *HeroDrawCardFloorResp) GetBaodi4() map[int32]int32 { if x != nil { - return x.Star4 + return x.Baodi4 } - return 0 + return nil } -func (x *HeroDrawCardFloorResp) GetStar5() int32 { +func (x *HeroDrawCardFloorResp) GetBaodi5() map[int32]int32 { if x != nil { - return x.Star5 + return x.Baodi5 } - return 0 + return nil } func (x *HeroDrawCardFloorResp) GetOnebuy() int32 { @@ -1940,63 +1940,75 @@ var file_hero_hero_msg_proto_rawDesc = []byte{ 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, + 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x22, 0xb5, 0x02, 0x0a, 0x15, 0x48, 0x65, + 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, + 0x65, 0x73, 0x70, 0x12, 0x3a, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, + 0x72, 0x64, 0x46, 0x6c, 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42, 0x61, 0x6f, 0x64, + 0x69, 0x34, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x34, 0x12, + 0x3a, 0x0a, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x22, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x44, 0x72, 0x61, 0x77, 0x43, 0x61, 0x72, 0x64, 0x46, 0x6c, + 0x6f, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x2e, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x06, 0x62, 0x61, 0x6f, 0x64, 0x69, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x42, + 0x61, 0x6f, 0x64, 0x69, 0x34, 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, 0x1a, 0x39, 0x0a, 0x0b, 0x42, 0x61, 0x6f, 0x64, 0x69, 0x35, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 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 ( @@ -2011,7 +2023,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, 40) +var file_hero_hero_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 42) var file_hero_hero_msg_proto_goTypes = []interface{}{ (*HeroInfoReq)(nil), // 0: HeroInfoReq (*HeroInfoResp)(nil), // 1: HeroInfoResp @@ -2052,36 +2064,40 @@ var file_hero_hero_msg_proto_goTypes = []interface{}{ nil, // 36: HeroStrengthenUpSkillReq.ItemEntry nil, // 37: HeroPropertyPush.PropertyEntry nil, // 38: HeroPropertyPush.AddPropertyEntry - nil, // 39: HeroFusionReq.HerosEntry - (*DBHero)(nil), // 40: DBHero - (*UserAtno)(nil), // 41: UserAtno - (*DBHeroTalent)(nil), // 42: DBHeroTalent + nil, // 39: HeroDrawCardFloorResp.Baodi4Entry + nil, // 40: HeroDrawCardFloorResp.Baodi5Entry + nil, // 41: HeroFusionReq.HerosEntry + (*DBHero)(nil), // 42: DBHero + (*UserAtno)(nil), // 43: UserAtno + (*DBHeroTalent)(nil), // 44: DBHeroTalent } var file_hero_hero_msg_proto_depIdxs = []int32{ - 40, // 0: HeroInfoResp.base:type_name -> DBHero - 40, // 1: HeroListResp.list:type_name -> DBHero + 42, // 0: HeroInfoResp.base:type_name -> DBHero + 42, // 1: HeroListResp.list:type_name -> DBHero 35, // 2: HeroStrengthenUplvReq.item:type_name -> HeroStrengthenUplvReq.ItemEntry - 40, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero - 40, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero + 42, // 3: HeroStrengthenUplvResp.hero:type_name -> DBHero + 42, // 4: HeroStrengthenUpStarResp.hero:type_name -> DBHero 36, // 5: HeroStrengthenUpSkillReq.item:type_name -> HeroStrengthenUpSkillReq.ItemEntry - 40, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero - 40, // 7: HeroAwakenResp.hero:type_name -> DBHero + 42, // 6: HeroStrengthenUpSkillResp.hero:type_name -> DBHero + 42, // 7: HeroAwakenResp.hero:type_name -> DBHero 37, // 8: HeroPropertyPush.property:type_name -> HeroPropertyPush.PropertyEntry 38, // 9: HeroPropertyPush.addProperty:type_name -> HeroPropertyPush.AddPropertyEntry - 40, // 10: HeroLockResp.hero:type_name -> DBHero - 40, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero - 41, // 12: AtnoData.atno:type_name -> UserAtno + 42, // 10: HeroLockResp.hero:type_name -> DBHero + 42, // 11: HeroGetSpecifiedResp.hero:type_name -> DBHero + 43, // 12: AtnoData.atno:type_name -> UserAtno 19, // 13: HeroDrawCardResp.data:type_name -> AtnoData - 40, // 14: HeroChangePush.list:type_name -> DBHero - 39, // 15: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry - 42, // 16: HeroTalentListResp.telnet:type_name -> DBHeroTalent - 42, // 17: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent - 42, // 18: HeroTalentResetResp.telnet:type_name -> DBHeroTalent - 19, // [19:19] is the sub-list for method output_type - 19, // [19:19] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 42, // 14: HeroChangePush.list:type_name -> DBHero + 39, // 15: HeroDrawCardFloorResp.baodi4:type_name -> HeroDrawCardFloorResp.Baodi4Entry + 40, // 16: HeroDrawCardFloorResp.baodi5:type_name -> HeroDrawCardFloorResp.Baodi5Entry + 41, // 17: HeroFusionReq.heros:type_name -> HeroFusionReq.HerosEntry + 44, // 18: HeroTalentListResp.telnet:type_name -> DBHeroTalent + 44, // 19: HeroTalentLearnResp.telnet:type_name -> DBHeroTalent + 44, // 20: HeroTalentResetResp.telnet:type_name -> DBHeroTalent + 21, // [21:21] is the sub-list for method output_type + 21, // [21:21] is the sub-list for method input_type + 21, // [21:21] is the sub-list for extension type_name + 21, // [21:21] is the sub-list for extension extendee + 0, // [0:21] is the sub-list for field type_name } func init() { file_hero_hero_msg_proto_init() } @@ -2519,7 +2535,7 @@ func file_hero_hero_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_hero_hero_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 40, + NumMessages: 42, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/items_db.pb.go b/pb/items_db.pb.go index de5a87120..1530730aa 100644 --- a/pb/items_db.pb.go +++ b/pb/items_db.pb.go @@ -28,12 +28,13 @@ type DB_UserItemData struct { GridId string `protobuf:"bytes,1,opt,name=gridId,proto3" json:"gridId" bson:"_id"` // 背包格子Id UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id - ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id + ItemId string `protobuf:"bytes,3,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id Amount uint32 `protobuf:"varint,4,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量 - CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间 - ETime int64 `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间 - IsNewItem bool `protobuf:"varint,7,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的 - Lastopt int64 `protobuf:"varint,8,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间 + Change int32 `protobuf:"varint,5,opt,name=change,proto3" json:"change" bson:"change"` // 最后一次变化量 + CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间 + ETime int64 `protobuf:"varint,7,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间 + IsNewItem bool `protobuf:"varint,8,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的 + Lastopt int64 `protobuf:"varint,9,opt,name=lastopt,proto3" json:"lastopt" bson:"lastopt"` // 最后操作时间 } func (x *DB_UserItemData) Reset() { @@ -96,6 +97,13 @@ func (x *DB_UserItemData) GetAmount() uint32 { return 0 } +func (x *DB_UserItemData) GetChange() int32 { + if x != nil { + return x.Change + } + return 0 +} + func (x *DB_UserItemData) GetCTime() int64 { if x != nil { return x.CTime @@ -128,21 +136,22 @@ var File_items_items_db_proto protoreflect.FileDescriptor var file_items_items_db_proto_rawDesc = []byte{ 0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe7, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d, - 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, - 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x14, 0x0a, 0x05, + 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, + 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, 0x4e, 0x65, + 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x4e, + 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x18, 0x0a, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, + 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6c, 0x61, 0x73, 0x74, 0x6f, 0x70, 0x74, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/shop_msg.pb.go b/pb/shop_msg.pb.go index 29bfa5231..570a3c1fe 100644 --- a/pb/shop_msg.pb.go +++ b/pb/shop_msg.pb.go @@ -174,6 +174,7 @@ type ShopGetListResp struct { IsManualRefresh bool `protobuf:"varint,2,opt,name=IsManualRefresh,proto3" json:"IsManualRefresh"` //是否手动刷新 Goods []*ShopItem `protobuf:"bytes,4,rep,name=Goods,proto3" json:"Goods"` //商品列表 SurplusRefreshNum int32 `protobuf:"varint,5,opt,name=SurplusRefreshNum,proto3" json:"SurplusRefreshNum"` //剩余手动刷新次数 + Lastrefreshtime int64 `protobuf:"varint,6,opt,name=lastrefreshtime,proto3" json:"lastrefreshtime"` //上一次刷新时间 } func (x *ShopGetListResp) Reset() { @@ -236,6 +237,13 @@ func (x *ShopGetListResp) GetSurplusRefreshNum() int32 { return 0 } +func (x *ShopGetListResp) GetLastrefreshtime() int64 { + if x != nil { + return x.Lastrefreshtime + } + return 0 +} + //购买商品 请求 type ShopBuyReq struct { state protoimpl.MessageState @@ -374,7 +382,7 @@ var file_shop_shop_msg_proto_rawDesc = []byte{ 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x49, 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x49, - 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xab, + 0x73, 0x4d, 0x61, 0x6e, 0x75, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x22, 0xd5, 0x01, 0x0a, 0x0f, 0x53, 0x68, 0x6f, 0x70, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1f, 0x0a, 0x05, 0x73, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x73, 0x54, @@ -385,17 +393,20 @@ var file_shop_shop_msg_proto_rawDesc = []byte{ 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x53, 0x75, 0x72, 0x70, 0x6c, - 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x22, 0x65, 0x0a, 0x0a, - 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68, - 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, - 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x18, 0x0a, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, - 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, - 0x4e, 0x75, 0x6d, 0x22, 0x25, 0x0a, 0x0b, 0x53, 0x68, 0x6f, 0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x73, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x4e, 0x75, 0x6d, 0x12, 0x28, 0x0a, 0x0f, + 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x6c, 0x61, 0x73, 0x74, 0x72, 0x65, 0x66, 0x72, 0x65, + 0x73, 0x68, 0x74, 0x69, 0x6d, 0x65, 0x22, 0x65, 0x0a, 0x0a, 0x53, 0x68, 0x6f, 0x70, 0x42, 0x75, + 0x79, 0x52, 0x65, 0x71, 0x12, 0x25, 0x0a, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, + 0x65, 0x52, 0x08, 0x53, 0x68, 0x6f, 0x70, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x47, + 0x6f, 0x6f, 0x64, 0x73, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x47, 0x6f, + 0x6f, 0x64, 0x73, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x42, 0x75, 0x79, 0x4e, 0x75, 0x6d, 0x22, 0x25, 0x0a, + 0x0b, 0x53, 0x68, 0x6f, 0x70, 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, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var (