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

feijidazhan3d-weixin/v1.0.0/res/3d/game/Assets/XL/Model/m/m1/Modle1-Modle1-Modle1Avatar.lav

@@ -12,9 +12,9 @@
 			],
 			"rotation":[
 				0,
-				1,
 				0,
-				0
+				0,
+				-1
 			],
 			"scale":[
 				1,

feijidazhan3d-weixin/v1.0.0/res/3d/game/Assets/XL/Model/m/m2/Modle1-Modle1-Modle1Avatar.lav

@@ -12,9 +12,9 @@
 			],
 			"rotation":[
 				0,
-				1,
 				0,
-				0
+				0,
+				-1
 			],
 			"scale":[
 				1,

feijidazhan3d-weixin/v1.0.0/res/3d/game/game.ls

@@ -2536,13 +2536,13 @@
 						"translate":[
 							0,
 							0,
-							0
+							-7.55
 						],
 						"rotation":[
 							0,
+							1,
 							0,
-							0,
-							-1
+							0
 						],
 						"scale":[
 							1,
@@ -2581,9 +2581,9 @@
 								],
 								"rotation":[
 									0,
-									1,
 									0,
-									0
+									0,
+									-1
 								],
 								"scale":[
 									1,
@@ -2620,7 +2620,7 @@
 										"translate":[
 											0.03155759,
 											4.976256,
-											-0.06774598
+											-0.06774616
 										],
 										"rotation":[
 											-0.006801235,
@@ -2943,7 +2943,7 @@
 										"translate":[
 											-0.04128981,
 											3.82497,
-											-0.01497015
+											-0.0149703
 										],
 										"rotation":[
 											0.5792279,
@@ -3007,13 +3007,13 @@
 						"translate":[
 							0,
 							0,
-							0
+							9.86
 						],
 						"rotation":[
 							0,
+							1,
 							0,
-							0,
-							-1
+							0
 						],
 						"scale":[
 							1,
@@ -3052,9 +3052,9 @@
 								],
 								"rotation":[
 									0,
-									1,
 									0,
-									0
+									0,
+									-1
 								],
 								"scale":[
 									1,
@@ -3090,7 +3090,7 @@
 										"translate":[
 											0.0007208304,
 											5.216763,
-											-0.2930776
+											-0.2930775
 										],
 										"rotation":[
 											0.1131229,
@@ -3401,7 +3401,7 @@
 										"translate":[
 											-0.4338379,
 											3.654972,
-											-0.3212165
+											-0.3212166
 										],
 										"rotation":[
 											0.7071068,
@@ -4079,13 +4079,13 @@
 						"translate":[
 							0,
 							0,
-							0
+							16.8
 						],
 						"rotation":[
 							0,
+							1,
 							0,
-							0,
-							-1
+							0
 						],
 						"scale":[
 							1,
@@ -4162,7 +4162,7 @@
 										"translate":[
 											-0.03134558,
 											4.155817,
-											0.6449068
+											0.644907
 										],
 										"rotation":[
 											0.08292966,
@@ -4632,7 +4632,7 @@
 										"translate":[
 											-1.492197,
 											7.34903,
-											1.695221E-08
+											0
 										],
 										"rotation":[
 											0.6727311,
@@ -4688,7 +4688,7 @@
 										"translate":[
 											-3.007471,
 											3.730408,
-											-0.3018823
+											-0.3018818
 										],
 										"rotation":[
 											-0.8672957,
@@ -4744,7 +4744,7 @@
 										"translate":[
 											3.023834,
 											3.73041,
-											-0.3018842
+											-0.3018837
 										],
 										"rotation":[
 											-0.06680334,
@@ -4800,7 +4800,7 @@
 										"translate":[
 											-1.71525,
 											1.968866,
-											0.6740279
+											0.6740284
 										],
 										"rotation":[
 											-0.9119853,
@@ -4856,7 +4856,7 @@
 										"translate":[
 											1.548969,
 											1.968864,
-											0.6740298
+											0.6740303
 										],
 										"rotation":[
 											-0.05395141,
@@ -4912,7 +4912,7 @@
 										"translate":[
 											-0.07932401,
 											5.135628,
-											-0.09719706
+											-0.09719658
 										],
 										"rotation":[
 											0.5736926,