Merge branch 'dev' of chelios/xsdmx-CocosCreator into master

assets/Scene/main.fire

@@ -3770,7 +3770,7 @@
     "url_dev": "http://192.168.0.108:9999",
     "url_test": "http://47.106.87.53:9999",
     "url_prod": "http://xsdmx.funqueuehk.com/xsdmx",
-    "mChannel": 1,
+    "mChannel": 2,
     "_id": "0bgHBOec9KwKaHnqUeqff5"
   },
   {

assets/resources/prefab/map/map1.prefab

@@ -16677,7 +16677,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "DJ0102",
+    "_name": "119",
     "_objFlags": 0,
     "_parent": {
       "__id__": 43

local/local.json

@@ -17,10 +17,10 @@
     "d68bf72b-7bdb-48f0-be9a-3b0a4de7f2ce",
     "1edbf86f-3486-408d-97ec-bc31fb6395d1",
     "ff982981-097a-4e0e-8734-bfc340c5f129",
-    "2d2f792f-a40c-49bb-a189-ed176a246e49",
     "aa4d574e-420c-47ae-bfa1-768309e25aa0",
     "3d970ea4-c1a7-4b5e-a794-be2a897474f0",
     "1fbc18b8-3bde-4f5f-8f1d-e7ce637b6616",
+    "2d2f792f-a40c-49bb-a189-ed176a246e49",
     "1dd1b738-6fcc-472c-aef0-635d214a6118"
   ]
 }