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

# Conflicts:
#	Excel2Json/Excel/skill.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/SkillConfig.json

@@ -14,13 +14,18 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        1.0
       ]
     },
     {
@@ -37,13 +42,18 @@
       "SkillType": 1,
       "level": 2,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        2.0
       ]
     },
     {
@@ -60,13 +70,18 @@
       "SkillType": 1,
       "level": 3,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        3.0
       ]
     },
     {
@@ -83,13 +98,18 @@
       "SkillType": 1,
       "level": 4,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        4.0
       ]
     },
     {
@@ -106,13 +126,18 @@
       "SkillType": 1,
       "level": 5,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        5.0
       ]
     },
     {
@@ -129,13 +154,18 @@
       "SkillType": 1,
       "level": 6,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        6.0
       ]
     },
     {
@@ -152,13 +182,18 @@
       "SkillType": 1,
       "level": 7,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        7.0
       ]
     },
     {
@@ -175,13 +210,18 @@
       "SkillType": 1,
       "level": 8,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        8.0
       ]
     },
     {
@@ -198,13 +238,18 @@
       "SkillType": 1,
       "level": 9,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        9.0
       ]
     },
     {
@@ -221,17 +266,22 @@
       "SkillType": 1,
       "level": 10,
       "effectValue": [
-        9.0,
-        20.0,
+        6.0,
+        60.0,
         30.0
       ],
       "intensifierIndex": [
-        2,
-        3
+        2
+      ],
+      "addPropertyType": [
+        101
+      ],
+      "addPropertyValue": [
+        10.0
       ]
     },
     {
-      "ID": 20011,
+      "ID": 20010,
       "power": 100.0,
       "name": null,
       "dec": null,
@@ -244,11 +294,200 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        100.0,
-        10.0
+        360.0,
+        48.0
       ],
       "intensifierIndex": [
-        0
+        2
+      ]
+    },
+    {
+      "ID": 20011,
+      "power": 110.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 2,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20012,
+      "power": 120.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 3,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20013,
+      "power": 130.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 4,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20014,
+      "power": 140.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 5,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20015,
+      "power": 150.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 6,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20016,
+      "power": 160.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 7,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20017,
+      "power": 170.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 8,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20018,
+      "power": 180.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 9,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
+      ]
+    },
+    {
+      "ID": 20019,
+      "power": 190.0,
+      "name": null,
+      "dec": null,
+      "attribute": 2,
+      "icon": "icon_skill_10001",
+      "scriptName": "S2001",
+      "IDGroup": 2001,
+      "timelineName": "lieyanjian_timeline_TD",
+      "cd": 1,
+      "SkillType": 1,
+      "level": 10,
+      "effectValue": [
+        360.0,
+        48.0
+      ],
+      "intensifierIndex": [
+        2
       ]
     },
     {
@@ -266,10 +505,11 @@
       "level": 1,
       "effectValue": [
         2.0,
-        10.0
+        180.0,
+        24.0
       ],
       "intensifierIndex": [
-        0
+        2
       ]
     },
     {
@@ -286,10 +526,12 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        17.0
+        3.0,
+        120.0,
+        16.0
       ],
       "intensifierIndex": [
-        0
+        2
       ]
     },
     {
@@ -306,10 +548,12 @@
       "SkillType": 1,
       "level": 1,
       "effectValue": [
-        20.0
+        3.0,
+        120.0,
+        16.0
       ],
       "intensifierIndex": [
-        0
+        2
       ]
     },
     {
@@ -326,10 +570,10 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        0.1
+        15.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -346,10 +590,10 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        10.0
+        15.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -366,11 +610,11 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        1.0,
-        20.0
+        10.0,
+        10.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -387,10 +631,10 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        20.0
+        15.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -407,11 +651,11 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        10.0,
-        2.0
+        15.0,
+        6.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -428,7 +672,10 @@
       "SkillType": 2,
       "level": 1,
       "effectValue": [
-        5.0
+        30.0
+      ],
+      "intensifierIndex": [
+        1
       ]
     },
     {
@@ -548,7 +795,7 @@
         100.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -566,10 +813,10 @@
       "level": 1,
       "effectValue": [
         50.0,
-        10.0
+        9.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -586,11 +833,10 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        10.0,
-        10.0
+        30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -608,10 +854,10 @@
       "level": 1,
       "effectValue": [
         1.0,
-        10.0
+        9.0
       ],
       "intensifierIndex": [
-        0
+        2
       ]
     },
     {
@@ -628,10 +874,10 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        10.0
+        9.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -648,11 +894,11 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        200.0,
-        1.0
+        100.0,
+        5.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -669,11 +915,11 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        200.0,
-        1.0
+        3.0,
+        6.0
       ],
       "intensifierIndex": [
-        0
+        2
       ]
     },
     {
@@ -690,11 +936,11 @@
       "SkillType": 3,
       "level": 1,
       "effectValue": [
-        200.0,
-        1.0
+        6.0,
+        30.0
       ],
       "intensifierIndex": [
-        0
+        1
       ]
     },
     {
@@ -714,7 +960,8 @@
         10.0,
         100.0,
         50.0,
-        3.0
+        50.0,
+        9.0
       ],
       "intensifierIndex": [
         0
@@ -735,14 +982,14 @@
       "level": 1,
       "effectValue": [
         3.0,
+        3.0,
+        30.0,
+        5.0,
         1.0,
-        10.0,
-        2.0,
-        1.0,
-        1.0,
-        10.0,
-        1.0,
-        10.0
+        3.0,
+        30.0,
+        3.0,
+        30.0
       ],
       "intensifierIndex": [
         0
@@ -762,7 +1009,7 @@
       "SkillType": 4,
       "level": 1,
       "effectValue": [
-        50.0,
+        30.0,
         1.0
       ],
       "intensifierIndex": [