Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Res/Config/HeroModelConfig.json   resolved by master version
#	Excel2Json/Excel/FabaoConfig.xlsx   resolved by origin/master(远端) version
#	Excel2Json/Excel/HeroModel.xlsx   resolved by master version
#	Excel2Json/Excel/修仙游戏数据规划表.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/FabaoPowerupConfig.json

@@ -3,9 +3,9 @@
     {
       "ID": 1,
       "Power": 100,
-      "HP": 452.63,
+      "HP": 375.0,
       "DEF": 15.0,
-      "ATK": 30.0,
+      "ATK": 37.5,
       "NeedLv": 11,
       "PowerupItemIDs": [
         1001,
@@ -20,9 +20,9 @@
     {
       "ID": 2,
       "Power": 126,
-      "HP": 544.51,
+      "HP": 441.68,
       "DEF": 17.15,
-      "ATK": 34.3,
+      "ATK": 42.88,
       "NeedLv": 21,
       "PowerupItemIDs": [
         1001,
@@ -37,9 +37,9 @@
     {
       "ID": 3,
       "Power": 159,
-      "HP": 722.6,
+      "HP": 573.55,
       "DEF": 21.57,
-      "ATK": 43.14,
+      "ATK": 53.93,
       "NeedLv": 31,
       "PowerupItemIDs": [
         1001,
@@ -54,9 +54,9 @@
     {
       "ID": 4,
       "Power": 200,
-      "HP": 956.33,
+      "HP": 744.05,
       "DEF": 27.13,
-      "ATK": 54.26,
+      "ATK": 67.83,
       "NeedLv": 41,
       "PowerupItemIDs": [
         1001,
@@ -71,9 +71,9 @@
     {
       "ID": 5,
       "Power": 252,
-      "HP": 1721.61,
+      "HP": 1315.02,
       "DEF": 46.53,
-      "ATK": 93.06,
+      "ATK": 116.33,
       "NeedLv": 51,
       "PowerupItemIDs": [
         1001,
@@ -88,9 +88,9 @@
     {
       "ID": 6,
       "Power": 318,
-      "HP": 2267.84,
-      "DEF": 58.53,
-      "ATK": 117.05,
+      "HP": 1702.87,
+      "DEF": 58.52,
+      "ATK": 146.31,
       "NeedLv": 61,
       "PowerupItemIDs": [
         1001,
@@ -108,9 +108,9 @@
     {
       "ID": 7,
       "Power": 401,
-      "HP": 2981.0,
+      "HP": 2203.29,
       "DEF": 73.61,
-      "ATK": 147.21,
+      "ATK": 184.02,
       "NeedLv": 71,
       "PowerupItemIDs": [
         1001,
@@ -125,9 +125,9 @@
     {
       "ID": 8,
       "Power": 505,
-      "HP": 5333.64,
+      "HP": 3884.38,
       "DEF": 126.24,
-      "ATK": 252.48,
+      "ATK": 315.61,
       "NeedLv": 81,
       "PowerupItemIDs": [
         1001,
@@ -142,9 +142,9 @@
     {
       "ID": 9,
       "Power": 636,
-      "HP": 6986.32,
+      "HP": 5018.26,
       "DEF": 158.78,
-      "ATK": 317.56,
+      "ATK": 396.95,
       "NeedLv": 91,
       "PowerupItemIDs": [
         1001,
@@ -159,9 +159,9 @@
     {
       "ID": 10,
       "Power": 801,
-      "HP": 9136.28,
+      "HP": 6478.58,
       "DEF": 199.7,
-      "ATK": 399.4,
+      "ATK": 499.25,
       "NeedLv": 101,
       "PowerupItemIDs": [
         1001,
@@ -176,9 +176,9 @@
     {
       "ID": 11,
       "Power": 1009,
-      "HP": 16268.99,
-      "DEF": 342.51,
-      "ATK": 685.01,
+      "HP": 11397.69,
+      "DEF": 342.5,
+      "ATK": 856.26,
       "NeedLv": 111,
       "PowerupItemIDs": [
         1001,
@@ -193,9 +193,9 @@
     {
       "ID": 12,
       "Power": 1271,
-      "HP": 21215.67,
+      "HP": 14695.39,
       "DEF": 430.78,
-      "ATK": 861.55,
+      "ATK": 1076.94,
       "NeedLv": 121,
       "PowerupItemIDs": [
         1001,
@@ -213,9 +213,9 @@
     {
       "ID": 13,
       "Power": 1601,
-      "HP": 27631.8,
+      "HP": 18935.82,
       "DEF": 541.8,
-      "ATK": 1083.6,
+      "ATK": 1354.5,
       "NeedLv": 131,
       "PowerupItemIDs": [
         1001,
@@ -230,9 +230,9 @@
     {
       "ID": 14,
       "Power": 2017,
-      "HP": 49017.15,
-      "DEF": 929.24,
-      "ATK": 1858.47,
+      "HP": 33253.5,
+      "DEF": 929.23,
+      "ATK": 2323.08,
       "NeedLv": 141,
       "PowerupItemIDs": [
         1001,
@@ -247,9 +247,9 @@
     {
       "ID": 15,
       "Power": 2541,
-      "HP": 63695.51,
-      "DEF": 1168.73,
-      "ATK": 2337.45,
+      "HP": 42801.08,
+      "DEF": 1168.72,
+      "ATK": 2921.81,
       "NeedLv": 151,
       "PowerupItemIDs": [
         1001,
@@ -264,9 +264,9 @@
     {
       "ID": 16,
       "Power": 3202,
-      "HP": 82683.84,
+      "HP": 55061.2,
       "DEF": 1469.94,
-      "ATK": 2939.87,
+      "ATK": 3674.84,
       "NeedLv": 161,
       "PowerupItemIDs": [
         1001,
@@ -281,9 +281,9 @@
     {
       "ID": 17,
       "Power": 4035,
-      "HP": 146222.063,
+      "HP": 96542.55,
       "DEF": 2521.07,
-      "ATK": 5042.14,
+      "ATK": 6302.67,
       "NeedLv": 171,
       "PowerupItemIDs": [
         1001,
@@ -298,9 +298,9 @@
     {
       "ID": 18,
       "Power": 5084,
-      "HP": 189456.5,
+      "HP": 124075.563,
       "DEF": 3170.82,
-      "ATK": 6341.64,
+      "ATK": 7927.05,
       "NeedLv": 181,
       "PowerupItemIDs": [
         1001,
@@ -318,9 +318,9 @@
     {
       "ID": 19,
       "Power": 6406,
-      "HP": 245263.844,
+      "HP": 159387.9,
       "DEF": 3988.03,
-      "ATK": 7976.06,
+      "ATK": 9970.08,
       "NeedLv": 191,
       "PowerupItemIDs": [
         1001,
@@ -335,9 +335,9 @@
     {
       "ID": 20,
       "Power": 8072,
-      "HP": 432618.3,
-      "DEF": 6839.82,
-      "ATK": 13679.63,
+      "HP": 279082.7,
+      "DEF": 6839.81,
+      "ATK": 17099.53,
       "NeedLv": 201,
       "PowerupItemIDs": [
         1001,
@@ -352,9 +352,9 @@
     {
       "ID": 21,
       "Power": 10171,
-      "HP": 559170.938,
+      "HP": 358203.219,
       "DEF": 8602.63,
-      "ATK": 17205.26,
+      "ATK": 21506.58,
       "NeedLv": 211,
       "PowerupItemIDs": [
         1001,
@@ -369,9 +369,9 @@
     {
       "ID": 22,
       "Power": 12815,
-      "HP": 722220.3,
+      "HP": 459569.219,
       "DEF": 10819.78,
-      "ATK": 21639.56,
+      "ATK": 27049.45,
       "NeedLv": 221,
       "PowerupItemIDs": [
         1001,
@@ -386,9 +386,9 @@
     {
       "ID": 23,
       "Power": 16147,
-      "HP": 1271143.5,
+      "HP": 803716.0,
       "DEF": 18556.84,
-      "ATK": 37113.68,
+      "ATK": 46392.1,
       "NeedLv": 231,
       "PowerupItemIDs": [
         1001,
@@ -403,9 +403,9 @@
     {
       "ID": 24,
       "Power": 20345,
-      "HP": 1639598.13,
+      "HP": 1030371.5,
       "DEF": 23339.48,
-      "ATK": 46678.95,
+      "ATK": 58348.69,
       "NeedLv": 241,
       "PowerupItemIDs": [
         1001,
@@ -423,9 +423,9 @@
     {
       "ID": 25,
       "Power": 25635,
-      "HP": 2113541.0,
-      "DEF": 29354.74,
-      "ATK": 58709.47,
+      "HP": 1320472.13,
+      "DEF": 29354.73,
+      "ATK": 73386.84,
       "NeedLv": 251,
       "PowerupItemIDs": [
         1001,
@@ -440,9 +440,9 @@
     {
       "ID": 26,
       "Power": 32300,
-      "HP": 3713007.5,
-      "DEF": 50345.87,
-      "ATK": 100691.727,
+      "HP": 2306817.25,
+      "DEF": 50345.86,
+      "ATK": 125864.656,
       "NeedLv": 261,
       "PowerupItemIDs": [
         1001,
@@ -457,9 +457,9 @@
     {
       "ID": 27,
       "Power": 40698,
-      "HP": 4780769.5,
+      "HP": 2954295.25,
       "DEF": 63321.45,
-      "ATK": 126642.9,
+      "ATK": 158303.625,
       "NeedLv": 271,
       "PowerupItemIDs": [
         1001,
@@ -474,9 +474,9 @@
     {
       "ID": 28,
       "Power": 51279,
-      "HP": 6152284.5,
-      "DEF": 79641.23,
-      "ATK": 159282.453,
+      "HP": 3782292.25,
+      "DEF": 79641.22,
+      "ATK": 199103.063,
       "NeedLv": 281,
       "PowerupItemIDs": [
         1001,
@@ -491,9 +491,9 @@
     {
       "ID": 29,
       "Power": 64612,
-      "HP": 10790726.0,
+      "HP": 6601159.5,
       "DEF": 136591.469,
-      "ATK": 273182.938,
+      "ATK": 341478.656,
       "NeedLv": 291,
       "PowerupItemIDs": [
         1001,
@@ -508,9 +508,9 @@
     {
       "ID": 30,
       "Power": 81411,
-      "HP": 1.387245E+07,
+      "HP": 8446111.0,
       "DEF": 171795.047,
-      "ATK": 343590.1,
+      "ATK": 429487.625,
       "NeedLv": 300,
       "PowerupItemIDs": [
         1001,
@@ -528,9 +528,9 @@
     {
       "ID": 31,
       "Power": 102578,
-      "HP": 17825908.0,
+      "HP": 1.080358E+07,
       "DEF": 216071.609,
-      "ATK": 432143.219,
+      "ATK": 540179.0,
       "NeedLv": 310,
       "PowerupItemIDs": [
         1001,