Merge remote-tracking branch 'origin/master'

Assets/Res/Config/GroupConfig.json

@@ -1057,7 +1057,7 @@
         100
       ],
       "attQiangDu": [
-        1000
+        100
       ],
       "duipingQiangDu": [
         100
@@ -1132,7 +1132,7 @@
         100
       ],
       "attQiangDu": [
-        1000
+        100
       ],
       "duipingQiangDu": [
         100