Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev

egret/src/panels/ScratchPanel.ts

@@ -91,7 +91,11 @@ export default class ScratchPanel extends Panel {
         }
 
         // 添加邀请图标
-        let dNum = this.data.totalNeedCount - this.data.avatarList.length;
+        let noAvatarNum = this.data.helpedCount - this.data.avatarList.length;              // 没有头像的人数
+        let dNum = this.data.totalNeedCount - this.data.avatarList.length - noAvatarNum;    // 没邀请的人数
+        for(let i = 0; i < noAvatarNum; i++){
+            this.data.avatarList.push("");
+        }
         for(let i = 0; i < dNum; i++) {
             this.data.avatarList.push("scratch_invite_png");
         }

mock/happyclear/scratchGetTaskInfo.json

@@ -12,7 +12,7 @@
         "completePercent": "91.0",
         "remainPercent": "9.0",
         "totalNeedCount": 3,
-        "helpedCount": 1,
+        "helpedCount": 2,
         "avatarList": [
             null
         ]