Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

# Conflicts:
#	Assets/Scenes/testCombat.scene   resolved by master version

Assets/Res/Config/FabaoPowerupConfig.json

@@ -49,9 +49,6 @@
         100,
         100
       ],
-      "PromotePieceNum": [
-        10
-      ],
       "SkillLevel": 1
     },
     {
@@ -157,9 +154,6 @@
         100,
         100
       ],
-      "PromotePieceNum": [
-        10
-      ],
       "SkillLevel": 2
     },
     {
@@ -265,9 +259,6 @@
         100,
         100
       ],
-      "PromotePieceNum": [
-        10
-      ],
       "SkillLevel": 3
     },
     {
@@ -373,9 +364,6 @@
         100,
         100
       ],
-      "PromotePieceNum": [
-        10
-      ],
       "SkillLevel": 4
     },
     {
@@ -481,9 +469,6 @@
         100,
         100
       ],
-      "PromotePieceNum": [
-        10
-      ],
       "SkillLevel": 5
     },
     {