Merge branch 'master' of http://gitlab.llewan.com/llewan/cdn

fengkuangguaishouche-weixin/v1.1.0/res/atlas/test.atlas

-{"frames":{"1.png":{"frame":{"h":485,"idx":0,"w":675,"x":611,"y":0},"sourceSize":{"h":485,"w":675},"spriteSourceSize":{"x":0,"y":0}},"2.png":{"frame":{"h":757,"idx":0,"w":610,"x":0,"y":0},"sourceSize":{"h":757,"w":610},"spriteSourceSize":{"x":0,"y":0}},"3.png":{"frame":{"h":99,"idx":0,"w":556,"x":0,"y":758},"sourceSize":{"h":99,"w":556},"spriteSourceSize":{"x":0,"y":0}},"4.png":{"frame":{"h":120,"idx":0,"w":120,"x":557,"y":758},"sourceSize":{"h":120,"w":120},"spriteSourceSize":{"x":0,"y":0}},"c1.png":{"frame":{"h":96,"idx":0,"w":96,"x":0,"y":858},"sourceSize":{"h":96,"w":96},"spriteSourceSize":{"x":0,"y":0}}},"meta":{"image":"test.png","prefix":"test/"}}
+{
\ No newline at end of file
+    "frames": {
+        "c1.png": {
+            "frame": {
+                "h": 94,
+                "idx": 0,
+                "w": 94,
+                "x": 163,
+                "y": 0
+            },
+            "sourceSize": {
+                "h": 96,
+                "w": 96
+            },
+            "spriteSourceSize": {
+                "x": 1,
+                "y": 1
+            }
+        },
+        "phb_dikuang1.png": {
+            "frame": {
+                "h": 125,
+                "idx": 0,
+                "w": 162,
+                "x": 0,
+                "y": 128
+            },
+            "sourceSize": {
+                "h": 127,
+                "w": 164
+            },
+            "spriteSourceSize": {
+                "x": 1,
+                "y": 1
+            }
+        },
+        "phb_dikuang2.png": {
+            "frame": {
+                "h": 127,
+                "idx": 0,
+                "w": 162,
+                "x": 0,
+                "y": 0
+            },
+            "sourceSize": {
+                "h": 129,
+                "w": 164
+            },
+            "spriteSourceSize": {
+                "x": 1,
+                "y": 1
+            }
+        }
+    },
+    "meta": {
+        "image": "test.png",
+        "prefix": "test/"
+    }
+}

fengkuangguaishouche-weixin/v1.1.0/version.json

 {
   "fileconfig.json": "fileconfig-3e81e47a28.json",
   "index.js": "index-dde61521e9.js",
-  "js/bundle.js": "js/bundle-ed3e151b27.js",
+  "js/bundle.js": "js/bundle-afcdf1443e.js",
   "libs/fairygui.js": "libs/fairygui-346a15031b.js",
   "libs/laya.core.js": "libs/laya-d40660bc9b.core.js",
   "libs/laya.d3.js": "libs/laya-33a5f81acf.d3.js",
@@ -199,8 +199,6 @@
   "res/3d/road/Conventional/Assets/combine/MeshBaker-LayaAir3D-Mesh-Unlit-LM-2-mat-_MainTex-atlas0.png": "res/3d/road/Conventional/Assets/combine/MeshBaker-LayaAir3D-Mesh-Unlit-LM-2-mat-_MainTex-atlas0-998a356115.png",
   "res/3d/road/Conventional/Assets/combine/MeshBaker-LayaAir3D-Mesh-Unlit-LM-2-mat.lmat": "res/3d/road/Conventional/Assets/combine/MeshBaker-LayaAir3D-Mesh-Unlit-LM-2-mat-dc1567a890.lmat",
   "res/3d/road/Conventional/RoadA.lh": "res/3d/road/Conventional/RoadA-bb20977065.lh",
-  "res/altas/test.atlas": "res/altas/test-7fa4359ed2.atlas",
-  "res/altas/test.png": "res/altas/test-4cd5f3bf7b.png",
   "res/audio/ButtonSE.mp3": "res/audio/ButtonSE-3f95ff1b26.mp3",
   "res/audio/bomp.mp3": "res/audio/bomp-614beceff2.mp3",
   "res/audio/bossWarringSE.mp3": "res/audio/bossWarringSE-1bef75537d.mp3",