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

assets/scripts/Tab.js

@@ -128,7 +128,8 @@ cc.Class({
                 return n.isApplied != 1
             });
 
-            Global.friendList = this.friends = _friendList;
+            Global.friendList = _friendList;
+            this.friends = _friendList.slice(0, 20);
             this.noArtistTipNode.active = false;
             this.friendLayout();
 

assets/scripts/levelHome/LevelFriendHome.js

@@ -29,12 +29,14 @@ cc.Class({
         let target = Global.friendList.find(n => {
             return n.uid == uid
         })
-
-        this.nick = target.nick
-
-        this.stars = target.stars
-
-        this.head = target.head
+        
+        if(target) {
+            this.nick = target.nick
+    
+            this.stars = target.stars
+    
+            this.head = target.head
+        }
 
         this.buildingInfos = [];
 

assets/scripts/net/HomeApi.js

@@ -51,7 +51,7 @@ class HomeApi {
 
         let data = {
             timeline: 0,
-            count: 15
+            count: 50
         };
 
         Api.httpGet(this.setRequestBody(url, data, success, fail));