assets/bundles/first/config/Hero.json

@@ -249,8 +249,13 @@
         "res": "金4096",
         "number": 4096,
         "level": 13,
+<<<<<<< HEAD
+        "atk": 4096,
+        "atk_range": 140,
+=======
         "atk": 243,
         "atk_range": 130,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
@@ -269,8 +274,13 @@
         "res": "金8192",
         "number": 8192,
         "level": 14,
+<<<<<<< HEAD
+        "atk": 9182,
+        "atk_range": 140,
+=======
         "atk": 365,
         "atk_range": 130,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
@@ -529,8 +539,13 @@
         "res": "木4096",
         "number": 4096,
         "level": 13,
+<<<<<<< HEAD
+        "atk": 4096,
+        "atk_range": 220,
+=======
         "atk": 243,
         "atk_range": 180,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
@@ -549,8 +564,13 @@
         "res": "木8192",
         "number": 8192,
         "level": 14,
+<<<<<<< HEAD
+        "atk": 9182,
+        "atk_range": 220,
+=======
         "atk": 365,
         "atk_range": 180,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
@@ -809,8 +829,13 @@
         "res": "水4096",
         "number": 4096,
         "level": 13,
+<<<<<<< HEAD
+        "atk": 4096,
+        "atk_range": 260,
+=======
         "atk": 243,
         "atk_range": 250,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
@@ -829,8 +854,13 @@
         "res": "水8192",
         "number": 8192,
         "level": 14,
+<<<<<<< HEAD
+        "atk": 9182,
+        "atk_range": 260,
+=======
         "atk": 365,
         "atk_range": 250,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "size": 1,
         "critical_chance": 1000,
         "critical_dam": 20000,
@@ -1083,13 +1113,21 @@
         "id": 413,
         "name": "火4096",
         "type": 2,
+<<<<<<< HEAD
+        "herotype": 1,
+=======
         "herotype": 4,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "quality": 0,
         "icon": "",
         "res": "火4096",
         "number": 4096,
         "level": 13,
+<<<<<<< HEAD
+        "atk": 4096,
+=======
         "atk": 243,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "atk_range": 300,
         "size": 1,
         "critical_chance": 1000,
@@ -1103,13 +1141,21 @@
         "id": 414,
         "name": "火9182",
         "type": 2,
+<<<<<<< HEAD
+        "herotype": 1,
+=======
         "herotype": 4,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "quality": 0,
         "icon": "",
         "res": "火8192",
         "number": 8192,
         "level": 14,
+<<<<<<< HEAD
+        "atk": 9182,
+=======
         "atk": 365,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "atk_range": 300,
         "size": 1,
         "critical_chance": 1000,
@@ -1369,7 +1415,11 @@
         "res": "土4096",
         "number": 4096,
         "level": 13,
+<<<<<<< HEAD
+        "atk": 4096,
+=======
         "atk": 243,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "atk_range": 180,
         "size": 1,
         "critical_chance": 1000,
@@ -1389,7 +1439,11 @@
         "res": "土8192",
         "number": 8192,
         "level": 14,
+<<<<<<< HEAD
+        "atk": 9182,
+=======
         "atk": 365,
+>>>>>>> 90840f9f6b32939b29ddecaa3ba02bd7cdf3e5c5
         "atk_range": 180,
         "size": 1,
         "critical_chance": 1000,