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

assets/scripts/Game.js

@@ -239,8 +239,8 @@ cc.Class({
                         // this.levelHome.init(Global.user.uid, Global.cityId);
                         break;
                     case 3:
-                        // 艺人列表通知
-                        GameEvent.fire(GameNotificationKey.RefreshArtistManagerList)
+                        // Tab整合了, 不用单独刷新艺人了
+                        GameEvent.fire(GameNotificationKey.RefreshFriendList);
                         break;
                     case 4:
                         // 用户家园建筑列表通知，刷新首页数据

assets/scripts/userInformation/UserInteraction.js

@@ -343,7 +343,7 @@ cc.Class({
     //消耗钻石加速CD时间
     speedCDAction() {
         UserInformationApi.postSpeedInteraction(this.uid, (responseData) => {
-            this.interactionInfo.cnt += 1;
+            this.interactionInfo.cnt = responseData.cnt;
             this.interactionInfo.cdEnd = 0;
             GameModule.userInfo.diamond -= 20;
             this.showInteraction();