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

assets/scripts/talent/TalentMission.js

@@ -174,17 +174,17 @@ cc.Class({
         let ticket = model.ticket;
 
         if (coin > 0) {
-            let type = { 'type': 'coin', 'count': `金币 x ${coin}` };
+            let type = { 'type': 'coin', 'count': `金币 x ${DWTool.coinParse(coin)}` };
             this.showArray.push(type);
         }
 
         if (diamond > 0) {
-            let type = { 'type': 'diamond', 'count': `钻石 x ${diamond}` };
+            let type = { 'type': 'diamond', 'count': `钻石 x ${DWTool.coinParse(diamond)}` };
             this.showArray.push(type);
         }
 
         if (ticket > 0) {
-            let type = { 'type': 'ticket', 'count': `艺人券 x ${ticket}` };
+            let type = { 'type': 'ticket', 'count': `艺人券 x ${DWTool.coinParse(ticket)}` };
             this.showArray.push(type);
         }