Merge branch 'master' into qq

# Conflicts:
#	settings/builder.json

assets/scene/login.fire

@@ -1054,7 +1054,7 @@
     "_id": "46zyxZHutP6ZBDOdCK8srX"
   },
   {
-    "__type__": "92fe3yYmypJhroGUfWBAS8i",
+    "__type__": "bbcca339h9HZZ2myUzg0HJd",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -1078,6 +1078,6 @@
     },
     "_updating": false,
     "_canRetry": false,
-    "_id": "5crQZtSm1Ay74X6Z9xw3n4"
+    "_id": "37O7msDM9HpLBBvNmpzvH1"
   }
 ]

assets/scripts/utils/Global.js

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

settings/builder.json

@@ -37,7 +37,7 @@
   "title": "taptapstar",
   "webOrientation": "auto",
   "wechatgame": {
-    "REMOTE_SERVER_ROOT": "https://pub.dwstatic.com/wxgame/taptapstar_test_dev",
+    "REMOTE_SERVER_ROOT": "https://pub.dwstatic.com/wxgame/taptapstar_test",
     "appid": "wx36581990a2e76fba",
     "isSubdomain": false,
     "orientation": "portrait",