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

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

@@ -111,7 +111,7 @@
 				"layer":0,
 				"translate":[
 					-1.88,
-					0,
+					2,
 					0
 				],
 				"rotation":[
@@ -136,7 +136,7 @@
 					],
 					"size":[
 						7,
-						3,
+						8,
 						13
 					]
 				}
@@ -2554,7 +2554,7 @@
 							],
 							"size":[
 								4,
-								4,
+								20,
 								4
 							]
 						},
@@ -2667,7 +2667,7 @@
 							],
 							"size":[
 								4,
-								4,
+								20,
 								4
 							]
 						},
@@ -2780,7 +2780,7 @@
 							],
 							"size":[
 								4,
-								4,
+								20,
 								4
 							]
 						},
@@ -3005,7 +3005,7 @@
 							],
 							"size":[
 								4,
-								4,
+								20,
 								4
 							]
 						},

feijidazhan3d-weixin/v1.0.0/res/atlas/.rec

-D .
-D ui
-P 54DE6C38 A.png
-P CBFD93A1 B.png
-P 0EBAC38E biaoqian1.png
-P 90DE190A biaoqian2.png
-R C1971D43 biaoqiandikuang.png
-P 7C1E3A31 biaoqianfengexian.png
-P DAA302A3 BOSS.png
-P DCF8FBEC button1.png
-P D88DCE56 button2.png
-P 5FA8D06C button3.png
-P E5D2BB96 button4.png
-P 2E23D7DD button5.png
-P 07168B61 daichaoyuedikuan.png
-P 33AF040B daojishidik.png
-P 17D575FD dazhao.png
-P A0A949A7 dazhao_dikuan.png
-P 4C3276CC dazhao_jindutiao.png
-P 78628655 di1.png
-P 33E30C25 di2.png
-P 9102A4C2 di3.png
-P 31FB5391 dikuang3.png
-P 0FB5DFEB fanhuibutton.png
-P 8623E2C1 gmzuanshizs.png
-P E9B11E32 goumaihuangjin_ziti.png
-P 5C299422 goumaihuangjin_zs.png
-P 72CB9895 goumaitili.png
-P 3454FDA6 goumaizuanshi_ziti.png
-P 00A29312 guan.png
-P FC3BF44D guanbi.png
-R DA97EB38 guanqia_bj.jpg
-P 4DD97207 guanqiaxian.png
-P ADB57D11 guaqia1_icon.png
-P AD9D5CBD guaqia2_icon.png
-P AAB41D99 guaqia3_icon.png
-P 0B7E7569 heisetoumingkuang.png
-R CDB409D8 hongsebiaotou.png
-R 7BD74A59 huangsebiaotou.png
-P 0A3D83ED jia.png
-P D2B49038 jinbi_icon.png
-R C2BBB313 jindutiao.png
-P 2FD135A6 jindutiao2.png
-R 25AE021B jindutiaodik.png
-P F42B7A03 jindutiaodikuan2.png
-P 1CA0B51A jiyi.png
-P CDE46BF0 kai.png
-P A7F456FA paihanbang_button.png
-P 06FE5E6E paihangbang_btziti.png
-P B9707980 peiyan.png
-P DBA7FC9C pifu_biaoqian1.png
-P 0E361695 pifu_biaoqian2.png
-P 88B0790C pifu_biaoqianfengexian.png
-P F47831B9 pifu_button.png
-P B1B4EC18 pifu_feiji.png
-P 21D9DF23 pifu_jiyi.png
-R C5D5933A pifu_kuang1.png
-P 259B710D pifu_tai.png
-R 792FA6B9 ptkuang.png
-P 248B46FA qianqia_touxiangkuang.png
-P 5F26DE0E S.png
-P 1BD83584 shanghai.png
-P 17BE6669 shesu.png
-P 2B6D86A6 shezhi_button.png
-P 158DA25B shezhi_ziti.png
-P 1A5875C0 shipin1.png
-P D116F29F shipin2.png
-R B4374A1D shouye_bj.jpg
-P 1AB621AE SS.png
-P 37B067A8 sss.png
-P 25DCE4F6 tili_icon.png
-P EE784E39 tilizs.png
-P D3ABA053 tishiicon.png
-P 62FF0FB8 tzjl_zhuangshi.png
-P E296136E tzjl_ziti.png
-R DF667925 UIdikuang.png
-P 7DF66112 xiangshangbutton.png
-P CA78BD5C xianyouanniu.png
-R FAD532AF youxizhong_bj.jpg
-R F7EDA53D yxz_hdikuang.png
-P EF258F2D yxz_hongsejiantou.png
-P 74CA0764 yxz_hongsek.png
-P A24E15C2 yxz_lansejiantou.png
-P 0B8A8A2C yxz_lansek.png
-P 90CD9D89 yxz_zanting.png
-P D357EEF7 zuanshi_icon.png
-D ui/num
-P B6ECE8C4 0.png
-P 0BED91BB 1.png
-P 4A974F94 2.png
-P 59ABB16E 3.png
-P 2C9567F7 4.png
-P 8F2A70C6 5.png
-P 8394906A 6.png
-P 07501C9A 7.png
-P E761DE49 8.png
-P D6A509A6 9.png
-D ui/num1
-P D1680D11 0.png
-P E05E7902 1.png
-P 3782E9F7 2.png
-P ED505696 3.png
-P DAC345E8 4.png
-P CCA07EDD 5.png
-P DB407317 6.png
-P DB9C30CC 7.png
-P 4DBD3D1E 8.png
-P 359F9EA4 9.png
-P 9D25694B B.png
-P EA0F0F7D k.png
-P 86E55FF5 N.png

feijidazhan3d-weixin/v1.0.0/res/table/OrderData.json

 [
-{"id":"1","name":"队形1","monster":["1"]},
-{"id":"2","name":"队形2","monster":["1,2"]},
-{"id":"3","name":"队形3","monster":["1,2,3"]},
-{"id":"4","name":"队形4","monster":["1,2,3,4,5,6,7,8"]},
-{"id":"5","name":"队形5","monster":["1,2,3,4,5,6"]},
-{"id":"6","name":"队形6","monster":["1,2,3,4,5,6,7,8,9,10"]},
-{"id":"7","name":"队形7","monster":["1,2,3,4,5,6,7,8,9,10,11,12"]},
-{"id":"8","name":"队形8","monster":["1,2,3,4,5,6"]},
-{"id":"9","name":"队形9","monster":["1,2,3,4,5"]},
-{"id":"10","name":"队形10","monster":["1,2,3,4,5,6,7,8,9,10"]},
-{"id":"11","name":"队形11","monster":["1,2,3,4,5,6,7,8,9"]},
-{"id":"12","name":"队形12","monster":["1,2,3,4,5,6,7,8,9"]}
+{"id":"1","name":"队形1","monster":["0,0"]},
+{"id":"2","name":"队形2","monster":["-1,0","1,0"]},
+{"id":"3","name":"队形3","monster":["0,0","1,-1","-1,-1"]},
+{"id":"4","name":"队形4","monster":["-1,0","1,0","-1,-1","1,-1","-1,-2","1,-2","-1,-3","1,-3"]},
+{"id":"5","name":"队形5","monster":["-3,0","3,0","-2,-1","2,-1","-1,-2","1,-2"]},
+{"id":"6","name":"队形6","monster":["-2,0","-1,-1","1,-2","2,-3","1,-4","-1,-5","-2,-6","-1,-7","1,-8","2,-9"]},
+{"id":"7","name":"队形7","monster":["-2,0","-1,0","1,0","2,0","-2,-1","-1,-1","1,-1","2,-1","-2,-2","-1,-2","1,-2","2,-2"]},
+{"id":"8","name":"队形8","monster":["0,0","-1,-1","1,-2"]},
+{"id":"9","name":"队形9","monster":["0,0","-1,-1","1,-1","-2,-2","2,2"]},
+{"id":"10","name":"队形10","monster":["0,0","-1,-1","0,-1","1,-1","0,-2"]},
+{"id":"11","name":"队形11","monster":["0,0","-1,-1","1,-1","-2,-2","0,-2","2,-2","-1,-3","1,-3","0,-4"]},
+{"id":"12","name":"队形12","monster":["-2,0","2,0","-1,-1","1,-1","0,-2","-1,-3","1,-3","-2,-4","2,-4"]}
 	
 ]
\ No newline at end of file

feijidazhan3d-weixin/v1.0.0/res/table/Scene.json

-[
-    {"id":"1","name":"关卡1","lenght":300,"order":["10,1,3","20,1,5","55,2,1","80,3,1"]},
-    {"id":"2","name":"关卡2","lenght":800,"order":["10,1,3","20,1,5","25,2,1","30,3,1"]}
-    ]
\ No newline at end of file