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