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

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

@@ -121,9 +121,9 @@
 					-1
 				],
 				"scale":[
-					0.8,
-					0.8,
-					0.8
+					0.6,
+					0.6,
+					0.6
 				]
 			},
 			"components":{
@@ -135,9 +135,9 @@
 						-12
 					],
 					"size":[
-						8,
-						10,
-						13
+						11,
+						20,
+						13.72
 					]
 				}
 			},
@@ -2559,9 +2559,9 @@
 								0.5
 							],
 							"size":[
-								3,
-								15,
-								3
+								5,
+								20,
+								5
 							]
 						}
 					},
@@ -3030,9 +3030,9 @@
 								0
 							],
 							"size":[
-								3,
-								15,
-								3
+								5,
+								20,
+								5
 							]
 						}
 					},
@@ -3488,9 +3488,9 @@
 								0
 							],
 							"size":[
-								3,
-								15,
-								3
+								5,
+								20,
+								5
 							]
 						}
 					},
@@ -4102,9 +4102,9 @@
 								0
 							],
 							"size":[
-								3,
-								15,
-								3
+								5,
+								20,
+								5
 							]
 						}
 					},

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

@@ -57,9 +57,9 @@
 					1
 				],
 				"clearColor":[
-					0.1921569,
-					0.3019608,
-					0.4745098,
+					0.2126647,
+					0.7003074,
+					0.764151,
 					0
 				]
 			},
@@ -101,6 +101,34 @@
 			"components":{},
 			"child":[]
 		},
+		{
+			"type":"Sprite3D",
+			"props":{
+				"isStatic":false,
+				"name":"Spot Light"
+			},
+			"customProps":{
+				"layer":0,
+				"translate":[
+					0,
+					11.74,
+					0
+				],
+				"rotation":[
+					-0.7071068,
+					0,
+					0,
+					-0.7071068
+				],
+				"scale":[
+					1,
+					1,
+					1
+				]
+			},
+			"components":{},
+			"child":[]
+		},
 		{
 			"type":"Sprite3D",
 			"props":{

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

 [
-{"id":"1","Chapter":"1","ChapterName":"白羊座","Name":"1","Unlock":"2","PassLength":"550","Position":"50,100,150,200,250,300,350,400,450,500,550,600","Formation":"2,3,2,3,2,3,2,3,2,3,3,1","MosterId":"1,2:3,4,5:6,7:8,9,10:11,12:13,14,15:16,17:18,19,20:21,22:23,24,25:26,27,28:29","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:1000,1:0"},
-{"id":"2","Chapter":"1","ChapterName":"白羊座","Name":"2","Unlock":"3","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,600","Formation":"2,3,2,3,2,3,2,3,2,3,3,1","MosterId":"51,52:53,54,55:56,57:58,59,60:61,62:63,64,65:66,67:68,69,70:71,72:73,74,75:76,77,78:79","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:2000,1:0"},
-{"id":"3","Chapter":"1","ChapterName":"白羊座","Name":"3","Unlock":"4","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,650","Formation":"2,3,2,3,2,3,2,3,2,3,3,1","MosterId":"101,102:103,104,105:106,107:108,109,110:111,112:113,114,115:116,117:118,119,120:121,122:123,124,125:126:127","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:3000,1:0"},
-{"id":"4","Chapter":"1","ChapterName":"白羊座","Name":"4","Unlock":"5","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,650","Formation":"2,3,2,3,2,3,2,3,2,3,3,1","MosterId":"151,152,153:154,155,156,157,158:159,160,161:162,163,164,165,166:167,168,169:170,171,172,173,174:175,176,177:178,179","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:4000,1:0"},
+{"id":"1","Chapter":"1","ChapterName":"白羊座","Name":"1","Unlock":"2","PassLength":"550","Position":"50,100,150,200,250,300,350,400,450,500,550,600","Formation":"2,3,2,3,2,3,2,3,2,3,1","MosterId":"1,2:3,4,5:6,7:8,9,10:11,12:13,14,15:16,17:18,19,20:21,22:23,24,25:26","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:1000,1:0"},
+{"id":"2","Chapter":"1","ChapterName":"白羊座","Name":"2","Unlock":"3","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,600","Formation":"2,3,2,3,2,3,2,3,2,3,1","MosterId":"51,52:53,54,55:56,57:58,59,60:61,62:63,64,65:66,67:68,69,70:71,72:73,74,75:76","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:2000,1:0"},
+{"id":"3","Chapter":"1","ChapterName":"白羊座","Name":"3","Unlock":"4","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,600","Formation":"2,3,2,3,2,3,2,3,2,3,1","MosterId":"101,102:103,104,105:106,107:108,109,110:111,112:113,114,115:116,117:118,119,120:121,122:123,124,125:126","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:3000,1:0"},
+{"id":"4","Chapter":"1","ChapterName":"白羊座","Name":"4","Unlock":"5","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,650","Formation":"2,3,2,3,2,3,2,3,2,3,3,1","MosterId":"151,152,153:154,155,156,157,158:159,160,161:162,163,164,165,166:167,168,169:170,171,172,173,174:175,176,177:178,179,180,181,182:183,184,185:186,187,188,189,190:191,192,193:194,195,196,197,198:199","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:4000,1:0"},
 {"id":"5","Chapter":"1","ChapterName":"白羊座","Name":"5","Unlock":"6","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,600,700","Formation":"3,6,9,3,6,9,3,6,9,3,6,1","MosterId":"201,202,203:204,205,206,207,208,209,210:211,212,213,214,215:216,217,218:219,220,221,222,223,224:225,226,227,228,229:230,231,232:233,234,235,236,237,238:239,240,241,242,243:244,245,246:247,248,249,250,251,252:253","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:5000,1:0"},
 {"id":"6","Chapter":"1","ChapterName":"白羊座","Name":"6","Unlock":"7","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,600,700","Formation":"3,8,9,3,8,9,3,8,9,3,8,9,1","MosterId":"301,302,303:304,305,306,307,308,309,310:311,312,313,314,315:316,317,318:319,320,321,322,323,324:325,326,327,328,329:330,331,332:333,334,335,336,337,338:339,340,341,342,343:344,345,346:347,348,349,350,351,352:353","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:6000,1:0"},
 {"id":"7","Chapter":"1","ChapterName":"白羊座","Name":"7","Unlock":"8","PassLength":"700","Position":"50,100,150,200,250,300,350,400,450,500,550,600,700","Formation":"3,6,9,3,6,9,3,6,9,3,6,1","MosterId":"401,402,403:404,405,406,407,408,409,410:411,412,413,414,415:416,417,418:419,420,421,422,423,424:425,426,427,428,429:430,431,432:433,434,435,436,437,438:439,440,441,442,443:444,445,446:447,448,449,450,451,452:453","PropPosition":"0","FirstReward":"0:0,1:10","NormalReward":"0:7000,1:0"},