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

jinjibazuqiu-weixin/v1.0.8/ball/new/box/b001.atlas

+
+b001.png
+size: 334,334
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+1
+  rotate: false
+  xy: 2, 2
+  size: 238, 330
+  orig: 238, 330
+  offset: 0, 0
+  index: -1
+2
+  rotate: false
+  xy: 242, 285
+  size: 32, 47
+  orig: 32, 47
+  offset: 0, 0
+  index: -1

jinjibazuqiu-weixin/v1.0.8/res/3d/Assets/Art/Effect/Texture/Materials/Light_00231_01.lmat

+{
+	"version":"LAYAMATERIAL:01",
+	"props":{
+		"name":"Light_00231_01",
+		"cull":0,
+		"blend":1,
+		"srcBlend":770,
+		"dstBlend":1,
+		"alphaTest":false,
+		"depthWrite":false,
+		"depthTest":513,
+		"renderQueue":2,
+		"textures":[
+			{
+				"name":"diffuseTexture",
+				"path":"../Light_00231_01.png",
+				"params":{
+					"mipmap":true,
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1,
+					"format":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tilingOffset",
+				"value":[
+					1,
+					1,
+					0,
+					0
+				]
+			},
+			{
+				"name":"tintColor",
+				"value":[
+					1,
+					1,
+					1,
+					1
+				]
+			}
+		],
+		"defines":[]
+	}
+}
\ No newline at end of file

jinjibazuqiu-weixin/v1.0.8/res/3d/Assets/Art/Effect/Texture/Materials/Obeject_Ice_00030.lmat

+{
+	"version":"LAYAMATERIAL:01",
+	"props":{
+		"name":"Obeject_Ice_00030",
+		"cull":0,
+		"blend":1,
+		"srcBlend":770,
+		"dstBlend":1,
+		"alphaTest":false,
+		"depthWrite":false,
+		"renderQueue":2,
+		"textures":[
+			{
+				"name":"diffuseTexture",
+				"path":"../Obeject_Ice_00030.png",
+				"params":{
+					"mipmap":true,
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1,
+					"format":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tintColor",
+				"value":[
+					0.5,
+					0.5,
+					0.5,
+					0.5
+				]
+			}
+		],
+		"defines":[
+			"ADDTIVEFOG"
+		]
+	}
+}
\ No newline at end of file

jinjibazuqiu-weixin/v1.0.8/res/3d/Assets/Art/Effect/Texture/Materials/Sequence_F-Smoke_4x4_000104_Add.lmat

+{
+	"version":"LAYAMATERIAL:01",
+	"props":{
+		"name":"Sequence_F-Smoke_4x4_000104_Add",
+		"cull":0,
+		"blend":1,
+		"srcBlend":770,
+		"dstBlend":1,
+		"alphaTest":false,
+		"depthWrite":false,
+		"renderQueue":2,
+		"textures":[
+			{
+				"name":"diffuseTexture",
+				"path":"../Sequence_Explode_4x4_00038.png",
+				"params":{
+					"mipmap":true,
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1,
+					"format":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tintColor",
+				"value":[
+					1,
+					1,
+					1,
+					0.5
+				]
+			}
+		],
+		"defines":[
+			"ADDTIVEFOG"
+		]
+	}
+}
\ No newline at end of file

jinjibazuqiu-weixin/v1.0.8/res/3d/Assets/Art/Effect/Texture/Materials/Sequence_Glow_4x4_00026_Add.lmat

+{
+	"version":"LAYAMATERIAL:01",
+	"props":{
+		"name":"Sequence_Glow_4x4_00026_Add",
+		"cull":0,
+		"blend":1,
+		"srcBlend":770,
+		"dstBlend":1,
+		"alphaTest":false,
+		"depthWrite":false,
+		"renderQueue":2,
+		"textures":[
+			{
+				"name":"diffuseTexture",
+				"path":"../Sequence_Glow_4x4_00026.png",
+				"params":{
+					"mipmap":true,
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1,
+					"format":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tintColor",
+				"value":[
+					1,
+					1,
+					1,
+					0.5
+				]
+			}
+		],
+		"defines":[
+			"ADDTIVEFOG"
+		]
+	}
+}
\ No newline at end of file

jinjibazuqiu-weixin/v1.0.8/res/3d/Assets/Art/Effect/Texture/Materials/Sequence_Light_4x1_00035_02.lmat

+{
+	"version":"LAYAMATERIAL:01",
+	"props":{
+		"name":"Sequence_Light_4x1_00035_02",
+		"cull":0,
+		"blend":1,
+		"srcBlend":770,
+		"dstBlend":1,
+		"alphaTest":false,
+		"depthWrite":false,
+		"renderQueue":2,
+		"textures":[
+			{
+				"name":"diffuseTexture",
+				"path":"../Sequence_Light_4x1_00035_02.png",
+				"params":{
+					"mipmap":true,
+					"filterMode":1,
+					"wrapModeU":0,
+					"wrapModeV":0,
+					"anisoLevel":1,
+					"format":1
+				}
+			}
+		],
+		"vectors":[
+			{
+				"name":"tintColor",
+				"value":[
+					1,
+					1,
+					1,
+					0.5
+				]
+			}
+		],
+		"defines":[
+			"ADDTIVEFOG"
+		]
+	}
+}
\ No newline at end of file

jinjibazuqiu-weixin/v1.0.8/res/3d/Assets/Art/Effect/Texture/Materials/Sequence_Object_Ball_4x4_00017.lmat

+{
+	"version":"LAYAMATERIAL:01",
+	"props":{
+		"name":"Sequence_Object_Ball_4x4_00017",
+		"cull":0,
+		"blend":1,
+		"srcBlend":770,
+		"dstBlend":1,
+		"alphaTest":false,
+		"depthWrite":false,
+		"renderQueue":2,
+		"textures":[
+			{
+				"name":"diffuseTexture",
+				"path":""
+			}
+		],
+		"vectors":[
+			{
+				"name":"tintColor",
+				"value":[
+					1,
+					1,
+					1,
+					0.5
+				]
+			}
+		],
+		"defines":[
+			"ADDTIVEFOG"
+		]
+	}
+}
\ No newline at end of file

jinjibazuqiu-weixin/v1.0.8/res/3d/Assets/Materials/01 - Default 1.lmat

@@ -39,9 +39,9 @@
 			{
 				"name":"albedo",
 				"value":[
-					0.9632353,
-					0.2762219,
-					0.2762219,
+					1,
+					0.967647,
+					0.7867647,
 					1
 				]
 			},