Merge branch 'datasheet' of http://svn.ouj.com:3000/DWG/allstar into datasheet

assets/scripts/data/city.js

@@ -1 +1 @@
-module.exports=[{"id":1,"name":"中国","picId":60001,"unlockScore":125},{"id":2,"name":"土耳其","picId":60002,"unlockScore":250},{"id":3,"name":"韩国","picId":60003,"unlockScore":375},{"id":4,"name":"日本","picId":60004,"unlockScore":500},{"id":5,"name":"马来西亚","picId":60005,"unlockScore":625}]
+module.exports=[{"id":1,"name":"无名小镇","picId":60001,"unlockScore":125},{"id":2,"name":"长沙","picId":60002,"unlockScore":250},{"id":3,"name":"广州","picId":60003,"unlockScore":375},{"id":4,"name":"上海","picId":60004,"unlockScore":500},{"id":5,"name":"北京","picId":60005,"unlockScore":625}]

assets/scripts/data/item.js

@@ -1 +1 @@
-module.exports=[{"id":1,"name":"演员的自我修养","picId":10001,"type":1},{"id":2,"name":"金瓶梅","picId":10002,"type":1},{"id":3,"name":"城堡岩","picId":10003,"type":1},{"id":4,"name":"防守卡A","picId":10004,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"提高艺人被抢夺时的失败几率","wordInfo":"这是防守卡1","defend":10},{"id":5,"name":"防守卡B","picId":10005,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"提高艺人被抢夺时的失败几率","wordInfo":"这是防守卡1","defend":20},{"id":6,"name":"转职卡","picId":10006,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"转职时使用","wordInfo":"转职时使用"},{"id":7,"name":"进阶卡","picId":10007,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"进阶时使用","wordInfo":"进阶时使用"}]
+module.exports=[{"id":1,"name":"演员的自我修养","picId":10001,"type":1},{"id":2,"name":"金瓶梅","picId":10002,"type":1},{"id":3,"name":"城堡岩","picId":10003,"type":1},{"id":4,"name":"谈心卡","picId":10004,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"增加艺人被抢夺时的防守成功率20%","wordInfo":"谈心卡","defend":20},{"id":5,"name":"加薪卡","picId":10005,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"增加艺人被抢夺时的防守成功率20%","wordInfo":"加薪卡","defend":20},{"id":6,"name":"转职卡","picId":10006,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"艺人转换职业所使用的卡片","wordInfo":"转职卡"},{"id":7,"name":"进阶卡","picId":10007,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"进阶时使用","wordInfo":"进阶卡"},{"id":8,"name":"友情卡","picId":10008,"type":1,"useTimeType":1,"validTime":0,"funcInfo":"增加艺人被抢夺时的防守成功率20%","wordInfo":"友情卡","defend":20},{"type":null}]

assets/scripts/data/job.js

@@ -1 +1 @@
-module.exports=[{"id":1,"name":"主持","charm":1.8,"ability":2.1,"effect":0.3,"msg":"大扎好，我是主持","itemInfo":{"6":15}},{"id":2,"name":"舞者","charm":1.3,"ability":0.5,"effect":1.4,"msg":"大扎好，我是舞者","itemInfo":{"6":15}},{"id":3,"name":"歌手","charm":0.8,"ability":1.5,"effect":1.2,"msg":"大扎好，我是歌手","itemInfo":{"6":15}},{"id":4,"name":"演员","charm":1.1,"ability":1,"effect":2,"msg":"大扎好，我是演员","itemInfo":{"6":15}},{"id":5,"name":"电竞明星","charm":0.9,"ability":1.7,"effect":2.1,"msg":"大扎好，我是电竞明星","itemInfo":{"6":15}}]
+module.exports=[{"id":1,"name":"主持人","charm":1.8,"ability":2.1,"effect":0.3,"msg":"丰姿潇洒处变不惊—主持人","itemInfo":{"6":15}},{"id":2,"name":"舞者","charm":1.3,"ability":0.5,"effect":1.4,"msg":"跟随音乐的律动起舞—舞者","itemInfo":{"6":15}},{"id":3,"name":"歌手","charm":0.8,"ability":1.5,"effect":1.2,"msg":"被天使亲吻过的歌喉—歌手","itemInfo":{"6":15}},{"id":4,"name":"演员","charm":1.1,"ability":1,"effect":2,"msg":"演技精湛天资过人—演员","itemInfo":{"6":15}},{"id":5,"name":"电竞选手","charm":0.9,"ability":1.7,"effect":2.1,"msg":"技术精湛的游戏大神—电竞选手","itemInfo":{"6":15}}]

assets/scripts/data/mission.js

@@ -1 +1 @@
-module.exports=[{"id":1,"picId":20001,"quality":1,"bType":1,"itemInfo":{"1":2},"coin":10,"diamond":10,"cd":10000,"addCharm":10,"addAbility":10,"addEffect":10,"msg":"skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr"},{"id":2,"picId":20002,"quality":2,"bType":1,"itemInfo":{"2":10},"coin":20,"diamond":20,"cd":10000,"addCharm":20,"addAbility":20,"addEffect":20,"msg":"skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr"},{"id":3,"picId":20003,"quality":3,"bType":1,"itemInfo":{"3":5},"coin":30,"diamond":30,"cd":10000,"addCharm":30,"addAbility":30,"addEffect":30,"msg":"skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr"}]
+module.exports=[{"id":1,"picId":20001,"quality":1,"bType":1,"itemInfo":{"1":2},"coin":10,"diamond":10,"cd":10000,"addCharm":10,"addAbility":10,"addEffect":10,"msg":"skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr"},{"id":2,"picId":20002,"quality":2,"bType":1,"itemInfo":{"2":10},"coin":20,"diamond":20,"cd":10000,"addCharm":20,"addAbility":20,"addEffect":20,"msg":"skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr"},{"id":3,"picId":20003,"quality":3,"bType":1,"itemInfo":{"3":5},"coin":31,"diamond":30,"cd":10000,"addCharm":30,"addAbility":30,"addEffect":30,"msg":"skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr,skr"}]