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

quanminlanqiu3d-weixin/demo/res/3d/scene/Conventional/Assets/Project/Effect/Res/Textures/Piaodai/caihong-51f9fdb62f.lmat

+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.TrailMaterial",
+		"renderStates":[
+			{
+				"cull":0,
+				"blend":1,
+				"srcBlend":770,
+				"dstBlend":1,
+				"depthWrite":false,
+				"depthTest":515
+			}
+		],
+		"name":"caihong",
+		"alphaTest":false,
+		"renderQueue":3000,
+		"textures":[
+			{
+				"name":"texture",
+				"path":"caihong.jpg",
+				"constructParams":[
+					64,
+					64,
+					0,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"color",
+				"value":[
+					0.5,
+					0.5,
+					0.5,
+					0.5
+				]
+			}
+		],
+		"defines":[
+			"ADDTIVEFOG"
+		]
+	}
+}
\ No newline at end of file

quanminlanqiu3d-weixin/demo/res/3d/scene/Conventional/Assets/Project/Effect/shaizizhengba/paopao-af6c0ee89d.lmat

+{
+	"version":"LAYAMATERIAL:02",
+	"props":{
+		"type":"Laya.ShurikenParticleMaterial",
+		"renderStates":[
+			{
+				"cull":0,
+				"blend":1,
+				"srcBlend":770,
+				"dstBlend":1,
+				"depthWrite":false,
+				"depthTest":515
+			}
+		],
+		"name":"paopao",
+		"alphaTest":false,
+		"renderQueue":3000,
+		"textures":[
+			{
+				"name":"texture",
+				"path":"paopao.png",
+				"constructParams":[
+					64,
+					64,
+					1,
+					true
+				],
+				"propertyParams":{
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"color",
+				"value":[
+					0.5,
+					0.5,
+					0.5,
+					0.5
+				]
+			}
+		],
+		"defines":[
+			"ADDTIVEFOG"
+		]
+	}
+}
\ No newline at end of file

quanminlanqiu3d-weixin/demo/version.json

 {
   "fileconfig.json": "fileconfig-a1b3577a52.json",
   "index.js": "index-8c51fe0dc7.js",
-  "js/bundle.js": "js/bundle-96c1cac0f5.js",
+  "js/bundle.js": "js/bundle-380fe9d4b6.js",
   "libs/fairygui.js": "libs/fairygui-45bd64af44.js",
   "libs/laya.core.js": "libs/laya-d3f018d388.core.js",
   "libs/laya.d3.js": "libs/laya-94b6e3cf64.d3.js",
@@ -162,6 +162,10 @@
   "res/3d/scene/Conventional/Assets/BasketBallGame/TestScene/skybox/sky-sky.lani": "res/3d/scene/Conventional/Assets/BasketBallGame/TestScene/skybox/sky-sky-ac68939807.lani",
   "res/3d/scene/Conventional/Assets/BasketBallGame/TestScene/skybox/sky.jpg": "res/3d/scene/Conventional/Assets/BasketBallGame/TestScene/skybox/sky-83fedd4407.jpg",
   "res/3d/scene/Conventional/Assets/BasketBallGame/TestScene/skybox/skybox-tiankonghezi.lm": "res/3d/scene/Conventional/Assets/BasketBallGame/TestScene/skybox/skybox-tiankonghezi-71c53dd876.lm",
+  "res/3d/scene/Conventional/Assets/Project/Effect/Res/Textures/Piaodai/caihong.jpg": "res/3d/scene/Conventional/Assets/Project/Effect/Res/Textures/Piaodai/caihong-9b74ad6909.jpg",
+  "res/3d/scene/Conventional/Assets/Project/Effect/Res/Textures/Piaodai/caihong.lmat": "res/3d/scene/Conventional/Assets/Project/Effect/Res/Textures/Piaodai/caihong-51f9fdb62f.lmat",
+  "res/3d/scene/Conventional/Assets/Project/Effect/shaizizhengba/paopao.lmat": "res/3d/scene/Conventional/Assets/Project/Effect/shaizizhengba/paopao-af6c0ee89d.lmat",
+  "res/3d/scene/Conventional/Assets/Project/Effect/shaizizhengba/paopao.png": "res/3d/scene/Conventional/Assets/Project/Effect/shaizizhengba/paopao-edebc48104.png",
   "res/3d/scene/Conventional/Library/unity default resources-Cube.lm": "res/3d/scene/Conventional/Library/unity default resources-Cube-2acf098fc4.lm",
   "res/3d/scene/Conventional/Library/unity default resources-Sphere.lm": "res/3d/scene/Conventional/Library/unity default resources-Sphere-50afe74fd7.lm",
   "res/3d/scene/Conventional/Resources/unity_builtin_extra.lmat": "res/3d/scene/Conventional/Resources/unity_builtin_extra-815e58107c.lmat",
@@ -177,7 +181,7 @@
   "res/audio/throwball.wav": "res/audio/throwball-ce8a456874.wav",
   "res/audio/vs_music02.mp3": "res/audio/vs_music02-0510dcf1d9.mp3",
   "res/audio/win.mp3": "res/audio/win-6924798582.mp3",
-  "res/data/configs.json": "res/data/configs-6aa5b0457a.json",
+  "res/data/configs.json": "res/data/configs-058baa9797.json",
   "res/data/platform.weixin.json": "res/data/platform-61acff0701.weixin.json",
   "res/textures/player/male/male_maozi_001.png": "res/textures/player/male/male_maozi_001-db5c3bb84f.png",
   "res/textures/player/male/male_shenti_001.png": "res/textures/player/male/male_shenti_001-5c8c2d88b7.png",
@@ -193,8 +197,8 @@
   "res/textures/player/male/male_wenshen_001.png": "res/textures/player/male/male_wenshen_001-d36d4c529e.png",
   "res/ui/GameLoadingUI.fui": "res/ui/GameLoadingUI-0eb445c65b.fui",
   "res/ui/GameLoadingUI_atlas0.png": "res/ui/GameLoadingUI_atlas0-1e940858aa.png",
-  "res/ui/GameUI.fui": "res/ui/GameUI-e417e14e8d.fui",
-  "res/ui/GameUI_atlas0.png": "res/ui/GameUI_atlas0-79ce8d134d.png",
+  "res/ui/GameUI.fui": "res/ui/GameUI-d81519ba8e.fui",
+  "res/ui/GameUI_atlas0.png": "res/ui/GameUI_atlas0-6a6d34a16a.png",
   "texture.png": "texture-8a28f5b1b1.png",
   "unpack.json": "unpack-d751713988.json"
 }
\ No newline at end of file

quanminlanqiu3d-weixin/h5/demo0.9.3/fileconfig.json

+{"res/atlas/comp.atlas":["comp/",["blank.png","btn_close.png","button.png","check_circle.png","checkbox.png","clip_num.png","clip_selectBox.png","clip_tree_arrow.png","clip_tree_folder.png","combobox.png","fontClip.png","fontClip_num.png","hscroll$bar.png","hscroll$down.png","hscroll$up.png","hscroll.png","hslider$bar.png","hslider.png","html.png","image.png","img_bg.png","img_bg2.png","img_bg3.png","img_bg4.png","img_bg5.png","img_blank.png","label.png","linkbutton.png","progress$bar.png","progress.png","radio.png","radiogroup.png","tab.png","textarea.png","textinput.png","vscroll$bar.png","vscroll$down.png","vscroll$up.png","vscroll.png","vslider$bar.png","vslider.png"]]}
\ No newline at end of file

quanminlanqiu3d-weixin/h5/demo0.9.3/index.html

+<html>
+
+<head>
+    <title>www.layabox.com</title>
+    <meta charset='utf-8' />
+    <meta name='renderer' content='webkit' />
+    <meta name='viewport' content='width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no'
+    />
+    <meta name='apple-mobile-web-app-capable' content='yes' />
+    <meta name='full-screen' content='true' />
+    <meta name='x5-fullscreen' content='true' />
+    <meta name='360-fullscreen' content='true' />
+    <meta name='laya' screenorientation='landscape' />
+    <meta http-equiv='expires' content='0' />
+    <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1' />
+    <meta http-equiv='expires' content='0' />
+    <meta http-equiv='Cache-Control' content='no-siteapp' />
+</head>
+
+<body>
+    <script type="text/javascript">
+        function loadLib(url) {
+            var script = document.createElement("script");
+            script.async = false;
+            script.src = url;
+            document.body.appendChild(script);
+        }
+    </script>
+    <script type="text/javascript" src="index.js"></script>
+</body>
+
+</html>
\ No newline at end of file

quanminlanqiu3d-weixin/h5/demo0.9.3/index.js

+window.screenOrientation="portrait",loadLib("libs/laya.core.js"),loadLib("libs/laya.webgl.js"),loadLib("libs/laya.html.js"),loadLib("libs/laya.physics3D.js"),loadLib("libs/laya.d3.js"),loadLib("libs/fairygui.js"),loadLib("js/bundle.js");
\ No newline at end of file