Merge branch 'dev' into datasheet

assets/scripts/utils/Global.js

@@ -12,7 +12,7 @@ window.Global = {
     // 建筑管理
     BuildingManager: BuildingManager.instance,
 
-    debug: false,
+    debug: true,
 
     ver: 120, //游戏版本号发版时需要核对
     

tools/local.js

@@ -66,7 +66,8 @@ const getSheet = function (filename) {
 const writeToAssets = function (filename, content) {
     let writeFileName = filename.replace(/\.xlsx|\.xls/, '.js').replace(dataPrefix, "")
     let writePath = path.join(__dirname, dataPath, writeFileName)
-    fs.writeFile(writePath, 'module.exports=' + JSON.stringify(content))
+    let string = JSON.stringify(content);
+    fs.writeFile(writePath, 'module.exports=' + string)
     // console.log(JSON.stringify(content, null, 2));
 }