Merge tag '初版整合开发和maser分支' into develop

此版本为了同步master和develop,非实际版本

project.config.json

@@ -17,7 +17,8 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    }
+    },
+    "ignoreUploadUnusedFiles": true
   },
   "condition": {},
   "editorSetting": {