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

fengkuangguaishouche-weixin/v1.0.0/res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Glow/Materials/zidan2-96a8f15c3c.lmat

+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.UnlitMaterial",
+		"name":"zidan2",
+		"renderStates":[
+			{
+				"cull":2,
+				"blend":0,
+				"srcBlend":1,
+				"dstBlend":0,
+				"depthWrite":true,
+				"depthTest":515
+			}
+		],
+		"enableVertexColor":false,
+		"alphaTest":true,
+		"alphaTestValue":0.5,
+		"renderQueue":2450,
+		"albedoIntensity":1,
+		"textures":[
+			{
+				"name":"albedoTexture",
+				"path":"../../zidan2.png",
+				"constructParams":[
+					64,
+					128,
+					1,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"albedoColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}
\ No newline at end of file

fengkuangguaishouche-weixin/v1.0.0/version.json

 {
   "fileconfig.json": "fileconfig-7f949b983c.json",
   "index.js": "index-e1b0eda546.js",
-  "js/bundle.js": "js/bundle-1b6119179b.js",
+  "js/bundle.js": "js/bundle-fd1fe748e8.js",
   "libs/fairygui.js": "libs/fairygui-45bd64af44.js",
   "libs/laya.core.js": "libs/laya-bd7d93f634.core.js",
   "libs/laya.d3.js": "libs/laya-20105b2449.d3.js",
@@ -17,7 +17,7 @@
   "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Animation/guangzhu-guangzhu.lani": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Animation/guangzhu-guangzhu-6bc6e380d5.lani",
   "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Model/Plane_Z-Plane_Z.lm": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Model/Plane_Z-Plane_Z-73453e31f4.lm",
   "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Glow/Materials/Glow_00171.lmat": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Glow/Materials/Glow_00171-ee2cc0911d.lmat",
-  "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Glow/Materials/zidan2.lmat": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Glow/Materials/zidan2-06241bd84b.lmat",
+  "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Glow/Materials/zidan2.lmat": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Glow/Materials/zidan2-96a8f15c3c.lmat",
   "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Light/Light_000259.png": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Light/Light_000259-adf2401cf7.png",
   "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Light/Materials/Light_000259_Add 1.lmat": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Light/Materials/Light_000259_Add 1-e6fb19f718.lmat",
   "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Light/Materials/Light_000259_Add.lmat": "res/3d/bullet/Conventional/Assets/MonsterCar/Particals/XL/Effect/Textures/Light/Materials/Light_000259_Add-85c97d9bd9.lmat",
@@ -181,8 +181,11 @@
   "res/audio/stageClearSE.mp3": "res/audio/stageClearSE-4f75437df2.mp3",
   "res/audio/waringSE.mp3": "res/audio/waringSE-ab1c38a02b.mp3",
   "res/data/configs.json": "res/data/configs-6596b43053.json",
-  "res/ui/GameUI.fui": "res/ui/GameUI-973647d393.fui",
-  "res/ui/GameUI_atlas0.png": "res/ui/GameUI_atlas0-f21869e171.png",
-  "res/ui/GameUI_atlas_uikc1j.jpg": "res/ui/GameUI_atlas_uikc1j-2b063c9f40.jpg",
+  "res/ui/GameLoadingUI.fui": "res/ui/GameLoadingUI-b80a6ff21e.fui",
+  "res/ui/GameLoadingUI_atlas0.png": "res/ui/GameLoadingUI_atlas0-7788ae4644.png",
+  "res/ui/GameLoadingUI_atlas_klyt6.jpg": "res/ui/GameLoadingUI_atlas_klyt6-60e1090010.jpg",
+  "res/ui/GameUI.fui": "res/ui/GameUI-0b1a9dfbfd.fui",
+  "res/ui/GameUI_atlas0.png": "res/ui/GameUI_atlas0-2c65a569b9.png",
+  "res/ui/GameUI_atlas_uikc1j.jpg": "res/ui/GameUI_atlas_uikc1j-60e1090010.jpg",
   "unpack.json": "unpack-99914b932b.json"
 }
\ No newline at end of file