Merge branch '1101' into dev

egret/src/mapScene/MapScene.ts

@@ -194,7 +194,7 @@ export default class MapScene extends Scene {
             if (!element.hasEventListener(egret.TouchEvent.TOUCH_TAP)) {
                 element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
                     if (
-                        (levelOrder > (homeData.levels.length + 1) && levelOrder > 1)
+                        (levelOrder > (getHomeData().levels.length + 1) && levelOrder > 1)
                         || (levelOrder > window['last_level'])
                     ) {
                         // showToast('必须通关前面的关卡才能开启本关');
@@ -358,6 +358,11 @@ export default class MapScene extends Scene {
         }
 
         this.scroll.removeEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
+
+        this._avatarsCache.forEach((item)=>{
+            if(item.parent) item.parent.removeChild(item);
+        });
+        this._avatarsCache=null;
     }
 
     getScrollV(lastOrder, stageHeight) {
@@ -434,6 +439,7 @@ export default class MapScene extends Scene {
         this.updateSign();
     }
 
+    private _avatarsCache=[];
     addAvatar(level, ele?) {
         const item = MapScene.iconHash[level];
         const parent = item['mappart'];
@@ -446,6 +452,7 @@ export default class MapScene extends Scene {
         if (!MapScene.starHash[level].visible) {
             avatar.y = item.y - avatar.height;
         }
+        this._avatarsCache.push(avatar);
     }
 
     updateFriends() {

mock/happyclear/home.json

@@ -7,6 +7,16 @@
         "wealth": 999,
         "totalStars": 359,
         "levels": [
+            {
+                "levelNum": 1,
+                "maxScore": 47440,
+                "stars": 3
+            },
+            {
+                "levelNum": 2,
+                "maxScore": 47440,
+                "stars": 3
+            }
         ],
         "remainProp": [
             {

mock/happyclear/mapRank.json

@@ -5,7 +5,7 @@
     "timestamp": 1571322224593,
     "data": [
         {
-            "levelNum": 19,
+            "levelNum": 21,
             "rank": [
                 {
                     "nickName": null,