Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev

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": 2,
+    "mChannel": 1,
     "_id": "0bgHBOec9KwKaHnqUeqff5"
   },
   {

assets/resources/prefab/map/map1.prefab

@@ -25608,12 +25608,12 @@
     "_offset": {
       "__type__": "cc.Vec2",
       "x": -5.1,
-      "y": -94.9
+      "y": -95.3
     },
     "_size": {
       "__type__": "cc.Size",
-      "width": 20,
-      "height": 20
+      "width": 4.8,
+      "height": 4.5
     },
     "_id": ""
   },
@@ -32066,8 +32066,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        486.449,
-        1869.916,
+        473.537,
+        1908.04,
         0,
         0,
         0,

local/local.json

@@ -21,7 +21,11 @@
     "3d970ea4-c1a7-4b5e-a794-be2a897474f0",
     "1fbc18b8-3bde-4f5f-8f1d-e7ce637b6616",
     "1dd1b738-6fcc-472c-aef0-635d214a6118",
+<<<<<<< HEAD
     "2d2f792f-a40c-49bb-a189-ed176a246e49",
     "35b14081-9e0f-45a5-a804-a787c942ff47"
+=======
+    "2d2f792f-a40c-49bb-a189-ed176a246e49"
+>>>>>>> 93e7033bc2ecbb29aee4038c576291045fbf47b2
   ]
 }