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

egret/resource/TextureMerger/map.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png","../assets/map/有星星2.png","../assets/map/有星星3.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png","../assets/map/map刮现金红包.png","../assets/map/map大转盘.png","../assets/map/有星星2.png","../assets/map/有星星3.png","../assets/map/icongray.png"]}
\ No newline at end of file

egret/resource/TextureMerger/preload.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"preload","version":5,"files":["../assets/map/icongray.png"]}
\ No newline at end of file

egret/scripts/MyExmlPlugin.ts

@@ -11,6 +11,7 @@ export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
             'cutTimeFont.png',
             'sharenums.png',
             'nums.png',
+            'nums3.png',
             'nums2.png'
         ];
         if (excludes.indexOf(file.basename) != -1) {

egret/src/mapScene/MapRpeatPart.ts

@@ -34,6 +34,7 @@ export default class MapRpeatPart extends ComponentBase {
             MapScene.starHash[levelOrder] = star;
             icon.addChild(star);
             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

@@ -194,6 +194,7 @@ export default class MapScene extends Scene {
         for (const key in MapScene.iconHash) {
             const levelOrder = parseInt(key);
             const element = MapScene.iconHash[key];
+            if(!element.hasEventListener(egret.TouchEvent.TOUCH_TAP)){
                 element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
                     if (
                         (levelOrder > (homeData.levels.length + 1) && levelOrder > 1)
@@ -206,6 +207,7 @@ export default class MapScene extends Scene {
                     NetManager.ins.clickLog(getlogItem(19))
                 }, this);
             }   
+        }
 
         if (homeData.levels.length < window['total_level']) {
             const targetIcon = MapScene.iconHash[target];

egret/src/mapScene/MapTopPart.ts

@@ -23,6 +23,7 @@ export default class MapTopPart extends ComponentBase {
             icon['mappart']=this;
             icon.show = ()=>{this.addChild(icon)};
             icon['visibleY'] = icon.y;
+            // console.log(icon['visibleY']);
         }
     }
 

egret/src/panels/StartPanel.ts

@@ -120,6 +120,7 @@ showlog(){
             });
             if (success) {
                 // Loading.instace.show();
+                this.hidePanel();
                 try {
                     const key = 'main2';
                     await Promise.all([
@@ -130,7 +131,6 @@ showlog(){
                 }
 
                 // Loading.instace.hide();
-                this.hidePanel();
                 SceneCtrl.instance.change(ModuleTypes.MAIN_SCENE, { chapter: this._level });
                 StartPanel.currlevel=this._level
             }