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

assets/scripts/levelHome/LevelHome.js

@@ -266,7 +266,7 @@ cc.Class({
             });
 
         }
-        // this.randomResidentTip();
+        this.randomResidentTip();
     },
 
     /**
@@ -325,6 +325,9 @@ cc.Class({
                     noArtistBuildings[i].setResidentTip(i == index);
                 }
 
+                clearInterval(this.residentTipHideTimer);
+                clearInterval(this.residentTipShowTimer);
+                
                 this.residentTipHideTimer = setInterval(() => {
                     noArtistBuildings[index].setResidentTip(false);
                 }, 5000);