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

# Conflicts:
#	Assets/Res/Config/InitialPlayerConfig.json   resolved by origin/master(远端) version

Assets/Res/Config/InitialPlayerConfig.json

@@ -8,9 +8,9 @@
         1006
       ],
       "itemAmount": [
+        50000,
         10000,
-        1000,
-        1000
+        10000
       ],
       "fabaoId": [
         10002