Merge branch '1101' into dev

egret/src/mapScene/MapBottomPart.ts

@@ -10,7 +10,7 @@ import { getRepeatCount } from "../startScene/StartScene";
 export default class MapBottomPart extends ComponentBase {
     static LEVEL_NUMS = 11;
     getTxt(i): eui.BitmapLabel { return this[`txt${i}`]; }
-    start() {
+    start({repeatHeight,topHeight}) {
         super.start();
         const repeatCount =getRepeatCount();
         for (let i = 0; i < MapBottomPart.LEVEL_NUMS; i++) {
@@ -31,6 +31,7 @@ export default class MapBottomPart extends ComponentBase {
             const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
             this.removeChild(icon);
             icon.show = ()=>{this.addChild(icon)};
+            icon.hide = ()=>{this.removeChild(icon)};
             icon['nums']  = icon.getChildAt(0);
             icon['bmptxt']=icon.getChildAt(1);
             icon['mappart']=this;
@@ -39,6 +40,7 @@ export default class MapBottomPart extends ComponentBase {
             star.loadSkin(); star.start();
             MapScene.starHash[levelOrder] = star;
             icon.addChild(star);
+            icon['visibleY'] = icon.y + topHeight + repeatHeight * repeatCount;
         }
     }
 

egret/src/mapScene/MapRpeatPart.ts

@@ -12,7 +12,6 @@ export default class MapRpeatPart extends ComponentBase {
         super();
         this._index = i;
         this._topHeight=topHeight;
-        // createData()
     }
 
     start() {
@@ -21,9 +20,11 @@ export default class MapRpeatPart extends ComponentBase {
             const levelOrder = MapTopPart.LEVEL_NUMS + this._index * MapRpeatPart.LEVEL_NUMS + i + 1;
             this.getTxt(i).text = levelOrder + '';
             
+            
             const icon = MapScene.iconHash[levelOrder] = this.getIcon(i);
             this.removeChild(icon);
             icon.show = ()=>{this.addChild(icon)};
+            icon.hide = ()=>{this.removeChild(icon)};
             icon['nums']  = icon.getChildAt(0);
             icon['bmptxt']=icon.getChildAt(1);
             icon['mappart']=this;
@@ -32,7 +33,8 @@ export default class MapRpeatPart extends ComponentBase {
             star.loadSkin(); star.start();
             MapScene.starHash[levelOrder] = star;
             icon.addChild(star);
-            icon['visibleY'] = this._topHeight + this
+            icon['visibleY'] = this._topHeight + this.height * this._index + icon.y;
+            console.log(icon['visibleY'] );
         }
 
         this['animal1'].visible = this._index % 2;

egret/src/mapScene/MapScene.ts

@@ -43,22 +43,22 @@ export default class MapScene extends Scene {
 
     sendInvite() {
         const code = Utils.getRequestByKey('shareCode');
-        if(!code) return;
-        if(doHelpFlag) {
+        if (!code) return;
+        if (doHelpFlag) {
             return;
         }
-        if(code.indexOf("12345678") == -1){  // 邀请有礼
+        if (code.indexOf("12345678") == -1) {  // 邀请有礼
             const dojoin = DataManager.ins.getData('hc_doJoin');
-            if(!dojoin) return;
+            if (!dojoin) return;
             NetManager.ins.doHelp((success, res) => {
                 doHelpFlag = true;
-                switch(true) {
+                switch (true) {
                     case (res.code == "400017"): showToast("您不是新用户呢～"); break;
                     case (res.code == "0000022"): showToast("不可以给自己助力哦～"); break;
-                    case (res.code == "0200202"):showToast("已经给好友助力过了哦～"); break;
+                    case (res.code == "0200202"): showToast("已经给好友助力过了哦～"); break;
                     default: break;
                 }
-                if(!success) { return; }
+                if (!success) { return; }
                 showToast("助力成功");
                 NetManager.ins.showLog(getlogItem(36));
             }, code, dojoin.data);
@@ -66,13 +66,13 @@ export default class MapScene extends Scene {
             const _code = code.slice(8);
             NetManager.ins.scratchDoHelp((success, res) => {
                 doHelpFlag = true;
-                switch(true) {
+                switch (true) {
                     case (res.code == "0000024"): showToast("今日刮卡次数已达到上线限哦～"); break;
                     case (res.code == "0000022"): showToast("不可以给自己刮哦～"); break;
-                    case (res.code == "0000023"):showToast("已经给好友刮过了哦～"); break;
+                    case (res.code == "0000023"): showToast("已经给好友刮过了哦～"); break;
                     default: break;
                 }
-                if(!success) { return; }
+                if (!success) { return; }
                 showToast("帮刮成功！");
                 NetManager.ins.showLog(getlogItem(52));
                 NetManager.ins.showLog(getlogItem(36));
@@ -98,7 +98,7 @@ export default class MapScene extends Scene {
         GDispatcher.dispatchEvent("getInviteInfo"); // 查询邀请信息，控制邀请有礼角标
         this['avatar'].mask = this['avatarMask'];
 
-        if(getBgOn() && MapScene['firstPlayBgTag'] == true) {
+        if (getBgOn() && MapScene['firstPlayBgTag'] == true) {
             playBg();
         }
 
@@ -115,12 +115,12 @@ export default class MapScene extends Scene {
             const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId);
 
             const hc_advert = DataManager.ins.getData('hc_advert').data;
-            let {noticeAdvert} = hc_advert;
-            if(noticeAdvert == null) {
-                noticeAdvert = {enable: false}
+            let { noticeAdvert } = hc_advert;
+            if (noticeAdvert == null) {
+                noticeAdvert = { enable: false }
             }
 
-            if(noticeAdvert && noticeAdvert.enable && nowTimerStr2 != oldTimerStr2) {
+            if (noticeAdvert && noticeAdvert.enable && nowTimerStr2 != oldTimerStr2) {
                 // if (!adTag) {
                 panels.push('ad');
                 // adTag = true;
@@ -129,20 +129,20 @@ export default class MapScene extends Scene {
             }
 
             const backData = DataManager.ins.getData('hc_getBackReward');
-            if(backData.success && backData.data) {
+            if (backData.success && backData.data) {
                 panels.push('back');
             }
 
-            const {signInfoVO} = DataManager.ins.getData('getSignInfo');
-            if(signInfoVO.continueDay < 7) { //表示明天还可以签到
-                if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
+            const { signInfoVO } = DataManager.ins.getData('getSignInfo');
+            if (signInfoVO.continueDay < 7) { //表示明天还可以签到
+                if (signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
                     panels.push('sign');
                     localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr);
                 }
             }
             this.updateSign();
 
-            if(!readCache() && getHomeData().levels.length <= 0) { //引导
+            if (!readCache() && getHomeData().levels.length <= 0) { //引导
                 const guide = new GuideCon(() => {
 
                     PanelCtrl.instance.showPanels(panels);
@@ -166,7 +166,7 @@ export default class MapScene extends Scene {
         this['rect'].scaleX = 0.5
         //进度条文本发光
         setGlow(this['totalStarTxt'], 0x0083e8, 1);
-        
+
         this.topPart = data.top;
         this.repeatsPart = data.list;
         this.bottomPart = data.bottom;
@@ -184,18 +184,18 @@ export default class MapScene extends Scene {
 
         let target;
         const homeData = getHomeData();
-        if(homeData.levels.length == 0) {
+        if (homeData.levels.length == 0) {
             target = 1;
-        } else if(homeData.levels.length == window['total_level']) {
+        } else if (homeData.levels.length == window['total_level']) {
             target = window['total_level'] + 1;
         } else {
             target = homeData.levels.length + 1;
         }
-        for(const key in MapScene.iconHash) {
+        for (const key in MapScene.iconHash) {
             const levelOrder = parseInt(key);
             const element = MapScene.iconHash[key];
             element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
-                if(
+                if (
                     (levelOrder > (homeData.levels.length + 1) && levelOrder > 1)
                     || (levelOrder > window['last_level'])
                 ) {
@@ -207,7 +207,7 @@ export default class MapScene extends Scene {
             }, this);
         }
 
-        if(homeData.levels.length < window['total_level']) {
+        if (homeData.levels.length < window['total_level']) {
             const targetIcon = MapScene.iconHash[target];
             const light = RES.getRes('lightani_png');
 
@@ -220,7 +220,7 @@ export default class MapScene extends Scene {
             pic.anchorOffsetY = 61;
             // pic.x = 50 - 2;
             // pic.y = 37 + 10;
-            egret.Tween.get(pic, {loop: true}).to({scaleX: 2, scaleY: 2, alpha: 0}, 1000).wait(1000);
+            egret.Tween.get(pic, { loop: true }).to({ scaleX: 2, scaleY: 2, alpha: 0 }, 1000).wait(1000);
             this['pic'] = pic;
         }
 
@@ -230,8 +230,8 @@ export default class MapScene extends Scene {
         this.showLog();
         this.updateBox();
 
-        if(data.level) {
-            if(homeData.remainEnargy == 0)
+        if (data.level) {
+            if (homeData.remainEnargy == 0)
 
                 PanelCtrl.instance.show('bloodPanel')
             else
@@ -239,8 +239,8 @@ export default class MapScene extends Scene {
         }
 
         this.stage.once(egret.TouchEvent.TOUCH_TAP, () => {
-            if(!MapScene['firstPlayBgTag']) {
-                if(getBgOn()) {
+            if (!MapScene['firstPlayBgTag']) {
+                if (getBgOn()) {
                     playBg();
                 }
                 MapScene['firstPlayBgTag'] = true;
@@ -248,7 +248,7 @@ export default class MapScene extends Scene {
         }, this);
 
         let lastOrder = homeData.levels.length + 1;
-        if(homeData.levels.length >= window['total_level'])
+        if (homeData.levels.length >= window['total_level'])
             lastOrder = window['total_level'];
         this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight);
         // console.warn(this.getScrollV(lastOrder, this.stage.stageHeight))
@@ -258,10 +258,30 @@ export default class MapScene extends Scene {
             Promise.all([
                 RES.getResAsync(`${key}_json`),
                 RES.getResAsync(`${key}_png`)]);
-        } catch(error) {
+        } catch (error) {
 
         }
 
+        this.scroll.addEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
+    }
+
+    onEnterFrame() {
+        const offset =0;
+        const y0 = this.scroll.viewport.scrollV+offset;
+        const y1 = this.stage.stageHeight + this.scroll.viewport.scrollV - offset;
+        // console.log(y0, y1);
+        let count = 0;
+        for (const key in MapScene.iconHash) {
+            const icon = MapScene.iconHash[key];
+            if(icon['visibleY'] >= y0  && icon['visibleY'] <= y1) {
+                icon.show();
+            }else if(icon.parent) {
+                icon.hide();
+            }
+
+            if(icon.parent)
+            count++;
+        }
     }
 
     // 添加图标
@@ -277,20 +297,20 @@ export default class MapScene extends Scene {
         this['nameTxt'].text = '';
         // NetManager.ins.hc_userInfo(() => {
         this['avatar'].visible = true;
-        const {data} = DataManager.ins.getData('hc_userInfo');
-        if(data)
+        const { data } = DataManager.ins.getData('hc_userInfo');
+        if (data)
             this['avatar'].source = data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png";
         else
             this['avatar'].source = "http://yun.duiba.com.cn/db_games/default_avatar.png";
-        if(data && data.nickname)
+        if (data && data.nickname)
             this['nameTxt'].text = getNick(data.nickname);
         // });
 
     }
 
     updateSign() {
-        const {signInfoVO} = DataManager.ins.getData('getSignInfo');
-        if(signInfoVO.continueDay < 7) { //表示明天还可以签到
+        const { signInfoVO } = DataManager.ins.getData('getSignInfo');
+        if (signInfoVO.continueDay < 7) { //表示明天还可以签到
             this['sign_s1'].visible = signInfoVO.todaySigned == 0;
             this['sign_s2'].visible = !this['sign_s1'].visible;
         } else {
@@ -300,17 +320,17 @@ export default class MapScene extends Scene {
 
     updateAdData() {
         const hc_advert = DataManager.ins.getData('hc_advert').data;
-        let {mapAdvert} = hc_advert;
-        if(mapAdvert == null)
-            mapAdvert = {enable: false, advertList: []}
+        let { mapAdvert } = hc_advert;
+        if (mapAdvert == null)
+            mapAdvert = { enable: false, advertList: [] }
         this['adBtn'].visible = mapAdvert.enable;
-        if(this['adBtn'].visible) {
+        if (this['adBtn'].visible) {
             NetManager.ins.showLog(getlogItem(32));
         }
-        if(mapAdvert.enable) {
+        if (mapAdvert.enable) {
             let result;
             result = mapAdvert.advertList;
-            if(Array.isArray(mapAdvert.advertList)) {
+            if (Array.isArray(mapAdvert.advertList)) {
                 const index = Math.floor(mapAdvert.advertList.length * Math.random());
                 result = mapAdvert.advertList[index];
             }
@@ -324,22 +344,24 @@ export default class MapScene extends Scene {
 
     destroy() {
         super.destroy();
-        if(this['pic'])
+        if (this['pic'])
             egret.Tween.removeTweens(this['pic']);
 
-        if(this.inviteTimer) {
+        if (this.inviteTimer) {
             this.inviteTimer.stop();
             this.inviteTimer.removeEventListener(egret.TimerEvent.TIMER, this.inviteCutTimer, this);
         }
+
+        this.scroll.removeEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
     }
 
     getScrollV(lastOrder, stageHeight) {
         // lastOrder = 69;
-        if(lastOrder <= 7) {//顶部的1-7关
+        if (lastOrder <= 7) {//顶部的1-7关
             return this.getScrollV1(lastOrder, stageHeight);
         }
 
-        if(lastOrder >= window['total_level'] - 10) {//底部的60-70关  70-10
+        if (lastOrder >= window['total_level'] - 10) {//底部的60-70关  70-10
             return this.getScrollV2(lastOrder, stageHeight);
         }
         //中部的4个循环*13   8~59
@@ -350,7 +372,7 @@ export default class MapScene extends Scene {
         const ylist = [26, 158, 302, 435, 547, 674, 821, 897, 969, 1072, 1137, 1254, 1367];
         const y0 = this._data.top.height;//顶部的高度
         let a0 = (lastOrder - MapTopPart.LEVEL_NUMS) % MapRpeatPart.LEVEL_NUMS;  //减去7后的order  8-7 = 1
-        if(a0 == 0) a0 = MapRpeatPart.LEVEL_NUMS
+        if (a0 == 0) a0 = MapRpeatPart.LEVEL_NUMS
         const a1 = Math.ceil((lastOrder - MapTopPart.LEVEL_NUMS) / MapRpeatPart.LEVEL_NUMS) - 1;//当前地图repeat的顺序
         const y1 = ylist[a0 - 1];
         const y2 = y0 + y1 + a1 * this._data.list[0].height;
@@ -360,7 +382,7 @@ export default class MapScene extends Scene {
     getScrollV1(lastOrder, stageHeight) {
         const ylist = [492, 550.35, 744, 803, 810, 975, 1089.69].map(i => i + 40);
         const targetY = ylist[lastOrder - 1] - stageHeight / 2;
-        if(targetY <= 0) return 0
+        if (targetY <= 0) return 0
         return targetY;
     }
 
@@ -372,7 +394,7 @@ export default class MapScene extends Scene {
             + this._data.bottom.height;
         const ylist = [44, 148.44, 331, 403, 513, 660, 829.69, 949.69, 1052.69, 1148.69, 1209.69].map(i => i + 40);
         const targetY = y0 + ylist[lastOrder - 1] - stageHeight / 2;
-        if(targetY >= (totalHeight - stageHeight)) return totalHeight - stageHeight
+        if (targetY >= (totalHeight - stageHeight)) return totalHeight - stageHeight
         return targetY;
     }
 
@@ -382,7 +404,7 @@ export default class MapScene extends Scene {
     }
 
     enableIcon(level) {
-        MapScene.iconHash[level].filters = [];
+        this.resetGray(level);
         MapScene.starHash[level].visible = true;
     }
 
@@ -394,7 +416,7 @@ export default class MapScene extends Scene {
 
     updateBox() {
         const homeData = getHomeData();
-        if(homeData.canReceiveTreasureBoxNum <= 0)
+        if (homeData.canReceiveTreasureBoxNum <= 0)
             setGray(this['box']);
         this['boxiconWrapper'].visible = homeData.canReceiveTreasureBoxNum > 0;
         this['totalStarTxt'].text = `${homeData.totalStars}/${homeData.nextRangeStarsNum}`;
@@ -416,7 +438,7 @@ export default class MapScene extends Scene {
         parent.addChild(avatar);
         avatar.x = item.x + 10;
         avatar.y = item.y - avatar.height - 30;
-        if(!MapScene.starHash[level].visible) {
+        if (!MapScene.starHash[level].visible) {
             avatar.y = item.y - avatar.height;
         }
     }
@@ -424,11 +446,11 @@ export default class MapScene extends Scene {
     updateFriends() {
         NetManager.ins.hc_mapRank(() => {
             const hc_mapRank = DataManager.ins.getData('hc_mapRank').data;
-            if(!hc_mapRank) return;
-            const {data} = DataManager.ins.getData('hc_userInfo');
+            if (!hc_mapRank) return;
+            const { data } = DataManager.ins.getData('hc_userInfo');
             hc_mapRank.forEach((ele) => {
-                if(ele.levelNum == getHomeData().levels.length + 1) {
-                    if(data == null)
+                if (ele.levelNum == getHomeData().levels.length + 1) {
+                    if (data == null)
                         ele.rank[0].avatar = "http://yun.duiba.com.cn/db_games/default_avatar.png";
                     else
                         ele.rank[0].avatar = data.avatar || "http://yun.duiba.com.cn/db_games/default_avatar.png";
@@ -443,24 +465,24 @@ export default class MapScene extends Scene {
 
         this['goldTxt'].text = `${homeData.wealth}`;
 
-        for(let j = 1; j < window['total_level']; j++) {
+        for (let j = 1; j < window['total_level']; j++) {
             this.disableIcon(j + 1);
         }
-        for(let i = 0; i < homeData.levels.length; i++) {
+        for (let i = 0; i < homeData.levels.length; i++) {
             const level = homeData.levels[i];
             const star = MapScene.starHash[i + 1];
-            if(level) {
+            if (level) {
                 star.setStar(level.stars);
                 this.enableIcon(level.levelNum);
             } else {
                 this.disableIcon(level.levelNum);
             }
         }
-        if(homeData.levels.length == 0) {
+        if (homeData.levels.length == 0) {
             const star = MapScene.starHash[1];
             star.setStar(0);
             this.enableIcon(1);
-        } else if(homeData.levels.length == window['last_level']) {
+        } else if (homeData.levels.length == window['last_level']) {
 
         } else {
             const star = MapScene.starHash[homeData.levels.length + 1];
@@ -474,11 +496,11 @@ export default class MapScene extends Scene {
 
     updateTimerView() {
         //更新倒计时
-        if(this._countDown == null) {
+        if (this._countDown == null) {
             this._countDown = new CountDown(this['countdown']);
         }
         const data = getHomeData();
-        if(data.remainEnargy >= BLOOD_NUMS_MAX) { //满了
+        if (data.remainEnargy >= BLOOD_NUMS_MAX) { //满了
             this._countDown.stop();
 
             this['fullTxt'].visible = true;
@@ -499,28 +521,28 @@ export default class MapScene extends Scene {
     onTap_inviteBtn() {
         NetManager.ins.clickLog(getlogItem(33));
         NetManager.ins.getInviteInfo((success, res) => {
-            if(!success || !res.data) {
+            if (!success || !res.data) {
                 return;
             }
             const flag = res.data.completeFlag;
-            switch(true) {
+            switch (true) {
                 case (flag == 0):   // 	未完成
                     this.loadsvga(res);
                     break;
                 case (flag == 1):   // 完成未开奖 待领奖 请求领奖接口
                     try {
-                        if(window['getRST']) window['getRST']();
-                    } catch(error) {
+                        if (window['getRST']) window['getRST']();
+                    } catch (error) {
                         console.warn(error)
                     }
                     NetManager.ins.acceptInvitationPrize((success, res) => {
-                        if(!success) {
+                        if (!success) {
                             showToast("哎呀，萌狮开小差啦！\n过会再来看吧！");
                             GDispatcher.dispatchEvent("getInviteInfo");
                             return;
                         }
                         // console.log(res.data);
-                        if(res.data.completeFlag == 3) {
+                        if (res.data.completeFlag == 3) {
                             showToast("哎呀，萌狮开小差啦！\n过会再来看吧！");
                             GDispatcher.dispatchEvent("getInviteInfo");
                         } else {
@@ -535,7 +557,7 @@ export default class MapScene extends Scene {
                 case (flag == 4):   // 可以开启下一次发任务
 
                     NetManager.ins.acceptInvitationInfo((success, res) => {
-                        if(!success) {
+                        if (!success) {
                             return;
                         }
                         this.loadsvga(res);
@@ -551,7 +573,7 @@ export default class MapScene extends Scene {
     }
 
     loadsvga(res) {
-        if(MapScene['svga']) {
+        if (MapScene['svga']) {
             const mv = MapScene['svga']
             mv.gotoAndStop(1);
             res.data.svga = mv;
@@ -576,14 +598,14 @@ export default class MapScene extends Scene {
      */
     getInviteInfo() {
         NetManager.ins.getInviteInfo((success, res) => {
-            if(!success || !res.data) {
+            if (!success || !res.data) {
                 return;
             }
             const flag = res.data.completeFlag;
-            if(this.inviteTimer) {
+            if (this.inviteTimer) {
                 this.inviteTimer.stop();
             }
-            switch(true) {
+            switch (true) {
                 case (flag == 0):   // 	未完成 显示倒计时
                     this["inviteGroup"].visible = true;
                     NetManager.ins.showLog(getlogItem(33));
@@ -596,7 +618,7 @@ export default class MapScene extends Scene {
                     this.inviteCutTimer();
                     break;
                 case (flag == 1):   // 完成未开奖 待领奖 显示待领奖
-                NetManager.ins.showLog(getlogItem(33));
+                    NetManager.ins.showLog(getlogItem(33));
                     this["inviteGroup"].visible = true;
                     this["inviteTipsBg"].visible = true;
                     this["inviteTips"].visible = true;
@@ -636,7 +658,7 @@ export default class MapScene extends Scene {
     // 倒计时
     private inviteCutTimer() {
         const timer = this.convertTime(this.cutTime -= 1000);
-        if(timer.hour === "00"
+        if (timer.hour === "00"
             && timer.min === "00"
             && timer.sec === "00") {
             this.inviteTimer.stop();
@@ -723,9 +745,9 @@ export default class MapScene extends Scene {
     async onTap_boxLayer() {
         NetManager.ins.clickLog(getlogItem(1));
         const data = getHomeData();
-        if(data.canReceiveTreasureBoxNum > 0) {
+        if (data.canReceiveTreasureBoxNum > 0) {
             this['boxLayer'].visible = true;
-            if(!this._mc)
+            if (!this._mc)
                 this._mc = await loadSvga(getResPath() + 'resource/assets/svgas/box.svga', this['boxani']);
             this._mc.stop();
             this._mc.gotoAndStop(1);
@@ -737,18 +759,18 @@ export default class MapScene extends Scene {
             await wait(50);
             this._mc.visible = true;
             const a = 100, b = 10;
-            egret.Tween.get(this._mc, {loop: true}).set({rotation: b})
-                .to({rotation: -b}, a).to({rotation: b}, a)
-                .to({rotation: -b}, a).to({rotation: b}, a)
-                .to({rotation: -b}, a).to({rotation: b}, a)
-                .to({rotation: 0}, a / 2)
+            egret.Tween.get(this._mc, { loop: true }).set({ rotation: b })
+                .to({ rotation: -b }, a).to({ rotation: b }, a)
+                .to({ rotation: -b }, a).to({ rotation: b }, a)
+                .to({ rotation: -b }, a).to({ rotation: b }, a)
+                .to({ rotation: 0 }, a / 2)
                 .wait(1000);
 
         }
     }
 
     async playAni() {
-        if(this._mc) {
+        if (this._mc) {
             egret.Tween.removeTweens(this._mc);
             this._mc.gotoAndPlay(1, true);
             await this.onPlaySTOP();
@@ -759,7 +781,7 @@ export default class MapScene extends Scene {
     async onPlaySTOP() {
         return new Promise((r) => {
             const func = () => {
-                if(this._mc.currentFrame >= 100) {
+                if (this._mc.currentFrame >= 100) {
                     this._mc.removeEventListener(egret.Event.ENTER_FRAME, func, this);
                     this._mc.stop();
                     r();
@@ -778,14 +800,14 @@ export default class MapScene extends Scene {
         this['boxani'].touchChildren = false;
         await this.playAni();
         try {
-            if(window['getRST']) window['getRST']();
-        } catch(error) {
+            if (window['getRST']) window['getRST']();
+        } catch (error) {
             console.warn(error)
         }
         NetManager.ins.hc_openTreasureBox((success) => {
             this['boxani'].touchEnabled = true;
             this['boxani'].touchChildren = true;
-            if(success) {
+            if (success) {
                 const hc_openTreasureBox = DataManager.ins.getData('hc_openTreasureBox');
                 const boxdata = hc_openTreasureBox.data;
                 const homeData = DataManager.ins.getData('hc_home').data;
@@ -794,8 +816,8 @@ export default class MapScene extends Scene {
                 homeData.totalStarts = boxdata.totalStarts;
                 homeData.isGetAllTreasureBox = boxdata.isGetAllTreasureBox;
                 this.updateBox();
-                
-                if(hc_openTreasureBox.success && boxdata && boxdata.option) {
+
+                if (hc_openTreasureBox.success && boxdata && boxdata.option) {
                     PanelCtrl.instance.show('box');
                 } else {
 
@@ -803,7 +825,7 @@ export default class MapScene extends Scene {
                 }
 
                 NetManager.ins.hc_home(() => {
-                   this.updateScene();
+                    this.updateScene();
                 }, window['collectRuleId']);
 
             } else {
@@ -829,7 +851,7 @@ export default class MapScene extends Scene {
 
     onTap_bloodBtn() {
         NetManager.ins.clickLog(getlogItem(2));
-        if(getHomeData().remainEnargy > 0)
+        if (getHomeData().remainEnargy > 0)
             PanelCtrl.instance.show('bloodPanel')
         else
             PanelCtrl.instance.show('blood2Panel')
@@ -837,8 +859,14 @@ export default class MapScene extends Scene {
 
     setGray(order: number) {
         const icon = MapScene.iconHash[order];
-        (icon['nums'] as eui.Image).source ='icongray_png';
-        (icon['bmptxt'] as eui.BitmapLabel).font ='nums3_fnt';
+        (icon['nums'] as eui.Image).source = 'icongray_png';
+        (icon['bmptxt'] as eui.BitmapLabel).font = 'nums3_fnt';
+    }
+
+    resetGray(order: number) {
+        const icon = MapScene.iconHash[order];
+        (icon['nums'] as eui.Image).source = 'icon_png';
+        (icon['bmptxt'] as eui.BitmapLabel).font = 'nums_fnt';
     }
 
     get skinKey() {
@@ -846,9 +874,9 @@ export default class MapScene extends Scene {
     }
 }
 export const getNick = (nickname, max = 4) => {
-    if(!nickname) return nickname;
+    if (!nickname) return nickname;
 
-    if(nickname.length > max)
+    if (nickname.length > max)
         return nickname.slice(0, max) + '...';
     return nickname;
 }
\ No newline at end of file

egret/src/mapScene/MapTopPart.ts

 import ComponentBase from "../../libs/new_wx/components/ComponentBase";
 import MapScene from "./MapScene";
 import MapStarComp from "./MapStarComp";
+import { createData } from "../startScene/StartScene";
 
 export default class MapTopPart extends ComponentBase {
     static LEVEL_NUMS = 7;
@@ -18,10 +19,11 @@ export default class MapTopPart extends ComponentBase {
             
             icon['nums']  = icon.getChildAt(0);
             icon['bmptxt']=icon.getChildAt(1);
-            this.removeChild(icon);
+            this.removeChild(icon);icon.hide = ()=>{this.removeChild(icon)};
             icon['mappart']=this;
             icon.show = ()=>{this.addChild(icon)};
             icon['visibleY'] = icon.y;
+            console.log(icon['visibleY']);
         }
     }
 

egret/src/startScene/StartScene.ts

@@ -109,21 +109,32 @@ export const changeMapScene = (p?) => {
     SceneCtrl.instance.change(ModuleTypes.MAP_SCENE, data);
 }
 
+let _startSceneData;
 export const createData = () => {
+    if(_startSceneData)return _startSceneData;
     const startSceneData: any = {};
-    startSceneData.top = new MapTopPart();
-    startSceneData.top.loadSkin(); startSceneData.top.start();
-    startSceneData.bottom = new MapBottomPart();
-    startSceneData.bottom.loadSkin(); startSceneData.bottom.start();
+    _startSceneData = startSceneData;
+
+    const repeatCount =getRepeatCount();
     const list = [];
     startSceneData.list = list;
 
-    const repeatCount =getRepeatCount();
+    startSceneData.top = new MapTopPart();
+    startSceneData.top.loadSkin(); startSceneData.top.start();
+
     for (let i = 0; i < repeatCount; i++) {
         const repeat = new MapRpeatPart(i,startSceneData.top.height);
         repeat.loadSkin(); repeat.start();
         list.push(repeat);
     }
+
+    startSceneData.bottom = new MapBottomPart();
+    startSceneData.bottom.loadSkin(); 
+    startSceneData.bottom.start({
+        repeatHeight:list[0].height,
+        topHeight:startSceneData.top.height
+    });
+    
     return startSceneData
 }