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

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

 [
 {"id":"1","PlaneName":"神鹰-8号","Quality":"B","UnlockTerm":"初始拥有","BuyCondition":"0","MoveSpeed":"25","effect":"1","res_id":"1","bullet":"1"},
-{"id":"2","PlaneName":"机动悍将","Quality":"A","UnlockTerm":"机动皮肤系列","BuyCondition":"[1,25]","MoveSpeed":"30","effect":"2","res_id":"2","bullet":"2"},
-{"id":"3","PlaneName":"冒险之翼","Quality":"A","UnlockTerm":"象征自由和平","BuyCondition":"[2,500]","MoveSpeed":"30","effect":"3","res_id":"3","bullet":"3"},
-{"id":"4","PlaneName":"机甲战神","Quality":"A","UnlockTerm":"超强机甲系列","BuyCondition":"[2,800]","MoveSpeed":"30","effect":"2","res_id":"4","bullet":"4"},
-{"id":"5","PlaneName":"逆袭天使","Quality":"S","UnlockTerm":"拥有可以匹敌神的力量","BuyCondition":"[2,1000]","MoveSpeed":"35","effect":"1","res_id":"5","bullet":"5"},
-{"id":"6","PlaneName":"烈焰凤凰","Quality":"S","UnlockTerm":"拥有烈焰的力量","BuyCondition":"[2,1500]","MoveSpeed":"35","effect":"3","res_id":"6","bullet":"1"},
+{"id":"2","PlaneName":"机动悍将","Quality":"A","UnlockTerm":"机动皮肤系列","BuyCondition":"1,25","MoveSpeed":"30","effect":"2","res_id":"2","bullet":"2"},
+{"id":"3","PlaneName":"冒险之翼","Quality":"A","UnlockTerm":"象征自由和平","BuyCondition":"2,500","MoveSpeed":"30","effect":"3","res_id":"3","bullet":"3"},
+{"id":"4","PlaneName":"机甲战神","Quality":"A","UnlockTerm":"超强机甲系列","BuyCondition":"2,800","MoveSpeed":"30","effect":"2","res_id":"4","bullet":"4"},
+{"id":"5","PlaneName":"逆袭天使","Quality":"S","UnlockTerm":"拥有可以匹敌神的力量","BuyCondition":"2,1000","MoveSpeed":"35","effect":"1","res_id":"5","bullet":"5"},
+{"id":"6","PlaneName":"烈焰凤凰","Quality":"S","UnlockTerm":"拥有烈焰的力量","BuyCondition":"2,1500","MoveSpeed":"35","effect":"3","res_id":"6","bullet":"1"},
 {"id":"7","PlaneName":"神鹰机翼","Quality":"B","UnlockTerm":"神鹰-8号，专属机翼","BuyCondition":"0","MoveSpeed":"25","effect":"1","res_id":"7","bullet":"2"},
-{"id":"8","PlaneName":"高能炫光弹","Quality":"A","UnlockTerm":"机动悍将，专属机翼","BuyCondition":"[1,25]","MoveSpeed":"30","effect":"2","res_id":"2","bullet":"3"},
-{"id":"9","PlaneName":"雷神之锤","Quality":"A","UnlockTerm":"冒险之翼，专属机翼","BuyCondition":"[2,500]","MoveSpeed":"30","effect":"3","res_id":"3","bullet":"4"},
-{"id":"10","PlaneName":"闪电新星","Quality":"A","UnlockTerm":"机甲战神，专属机翼","BuyCondition":"[2,800]","MoveSpeed":"30","effect":"2","res_id":"6","bullet":"5"},
-{"id":"11","PlaneName":"闪耀火箭弹","Quality":"S","UnlockTerm":"逆袭天使，专属机翼","BuyCondition":"[2,1000]","MoveSpeed":"35","effect":"1","res_id":"1","bullet":"1"},
-{"id":"12","PlaneName":"烈焰机关炮","Quality":"S","UnlockTerm":"烈焰凤凰，专属机翼","BuyCondition":"[2,1500]","MoveSpeed":"35","effect":"3","res_id":"5","bullet":"2"}
+{"id":"8","PlaneName":"高能炫光弹","Quality":"A","UnlockTerm":"机动悍将，专属机翼","BuyCondition":"1,25","MoveSpeed":"30","effect":"2","res_id":"2","bullet":"3"},
+{"id":"9","PlaneName":"雷神之锤","Quality":"A","UnlockTerm":"冒险之翼，专属机翼","BuyCondition":"2,500","MoveSpeed":"30","effect":"3","res_id":"3","bullet":"4"},
+{"id":"10","PlaneName":"闪电新星","Quality":"A","UnlockTerm":"机甲战神，专属机翼","BuyCondition":"2,800","MoveSpeed":"30","effect":"2","res_id":"6","bullet":"5"},
+{"id":"11","PlaneName":"闪耀火箭弹","Quality":"S","UnlockTerm":"逆袭天使，专属机翼","BuyCondition":"2,1000","MoveSpeed":"35","effect":"1","res_id":"1","bullet":"1"},
+{"id":"12","PlaneName":"烈焰机关炮","Quality":"S","UnlockTerm":"烈焰凤凰，专属机翼","BuyCondition":"2,1500","MoveSpeed":"35","effect":"3","res_id":"5","bullet":"2"}
 
 ]
\ No newline at end of file