调整map显示

egret/src/mapScene/MapScene.ts

@@ -316,8 +316,10 @@ export default class MapScene extends Scene {
         }
         this.scrollMapy.push(smaph+mapbot_height);
 
+        // console.log(maptop_height,repeatnum,maprep_height,mapbot_height);
         var scrollheight = maptop_height+repeatnum*maprep_height+mapbot_height;
         // console.log("scroll--------height",scrollheight,this.scrollMapy);
+        this.scroll.height = this.stage.stageHeight;
         this.scrollGroup.height = scrollheight;
         var nowlevel = getHomeData().levels.length;
         // console.log("玩家level",nowlevel);
@@ -345,6 +347,7 @@ export default class MapScene extends Scene {
         if (homeData.levels.length >= window['total_level'])
             lastOrder = window['total_level'];
         this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight);
+        // console.log("滚动设置",this.scroll.viewport.scrollV,this.scrollGroup.height,this.scroll.height,this.stage.stageHeight);
         // console.log("滚动设置",lastOrder,this.scroll.viewport.scrollV);
         this.setScrollVShow();
         // console.log('地图数据-----',this._data);
@@ -822,13 +825,48 @@ export default class MapScene extends Scene {
             }else{
                 var joidx = i3%2;
                 //1对应onemapr,0对应twomapr
+                let onemapy:number;
+                let twomapy:number;
+                let cmap:number;
+                let onemapidx = this.scrollGroup.getChildIndex(this.onemapreppart);
+                let twomapidx = this.scrollGroup.getChildIndex(this.twomapreppart);
+
+                let maxidx = Math.max(onemapidx,twomapidx);
+                let minidx = Math.min(onemapidx,twomapidx);
+
                 if(joidx==1){
                     i3map = this.onemapreppart;
+
+                    cmap = 1;
+                    onemapy = this.onemapreppart.y;
+                    twomapy = this.twomapreppart.y;
+                    
                 }else{
                     i3map = this.twomapreppart;
+                    
+                    cmap = 2;
+                    onemapy = this.onemapreppart.y;
+                    twomapy = this.twomapreppart.y;
                 }
                 if(i3map.y!=i3mapy){
                     i3map.y = i3mapy;
+                    if(cmap==1){
+                        if(i3mapy>twomapy){
+                            this.scrollGroup.setChildIndex(this.onemapreppart,maxidx);
+                            this.scrollGroup.setChildIndex(this.twomapreppart,minidx);
+                        }else{
+                            this.scrollGroup.setChildIndex(this.onemapreppart,minidx);
+                            this.scrollGroup.setChildIndex(this.twomapreppart,maxidx);
+                        }
+                    }else{
+                        if(i3mapy>onemapy){
+                            this.scrollGroup.setChildIndex(this.onemapreppart,minidx);
+                            this.scrollGroup.setChildIndex(this.twomapreppart,maxidx);
+                        }else{
+                            this.scrollGroup.setChildIndex(this.onemapreppart,maxidx);
+                            this.scrollGroup.setChildIndex(this.twomapreppart,minidx);
+                        }
+                    }
                     var i3startlevel = MapTopPart.LEVEL_NUMS+(i3-1)*MapRpeatPart.LEVEL_NUMS;
                     // console.log("局部显示",i3,i3mapy,i3startlevel,lidx,nidx);