l

egret/libs/new_wx/components/PrizePanel.ts

@@ -18,8 +18,9 @@ export default class PrizePanel extends Panel {
 
         // showCustomLog(lottery);
         this._level = parseInt(data.level + '');
-
-        this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
+        const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
+        this.data.img = `http://yun.duiba.com.cn/db_games/0827/${itemid}.png`;
+        // this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
 
         this['shareBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             NetManager.ins.clickLog(getlogItem(15));

egret/resource/TextureMerger/common.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\toast.png","..\\assets\\common\\closeCommonBtn.png","..\\assets\\common\\btn.png","..\\assets\\common\\alertbg.png","..\\assets\\common\\按钮 副本 4.png","..\\assets\\common\\按钮 副本 3.png","..\\assets\\common\\share_btn2.png","..\\assets\\common\\share_btn1.png","..\\assets\\common\\commmon_okbtn1.png","..\\assets\\common\\lightani.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/commmon_okbtn1.png","../assets/common/lightani.png"]}
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -48,19 +48,40 @@ export default class MapScene extends Scene {
         this.scrollGroup.addChild(data.bottom);
         data.bottom.y = data.top.height + (data.list.length * data.list[0].height);
 
+        let target;
+        const homeData = getHomeData();
+        if(homeData.levels.length == 0) {
+            target = 1;
+        }else if(homeData.levels.length ==70) {
+            target = 70+1;
+        }else { 
+            target = homeData.levels.length + 1;
+        }
         for (const key in MapScene.iconHash) {
-            
+            const levelOrder = parseInt(key);
             const element = MapScene.iconHash[key];
             element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
-                const homeData = getHomeData();
-                const levelOrder = parseInt(key);
                 if (levelOrder > (homeData.levels.length + 1) && levelOrder > 1) {
                     // showToast('必须通关前面的关卡才能开启本关');
                 } else
                     PanelCtrl.instance.show('StartPanel', key);
                 NetManager.ins.clickLog(getlogItem(19))
-            }, this);
+            }, this); 
         }
+
+        const targetIcon = MapScene.iconHash[target];
+        const light = RES.getRes('lightani_png');
+        const pic = new egret.Bitmap(light);//76 61
+        // targetIcon.addChild(pic);
+        targetIcon.addChildAt(pic,0);
+        pic.anchorOffsetX=76;
+        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);
+        this['pic'] = pic;
+
         this.updateHomeData();
         this.showLog();
         this.updateBox();
@@ -76,15 +97,19 @@ export default class MapScene extends Scene {
             }
         }, this);
 
-        const homeData = getHomeData();
         let lastOrder = homeData.levels.length + 1;
         if (homeData.levels.length >= 70)
             lastOrder = 70;
         this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight);
         // console.warn(this.getScrollV(lastOrder, this.stage.stageHeight))
-        const light = RES.getRes('lightani_png');
-        const pic = new egret.Bitmap(light);
-        this.addChild(pic);
+       
+    }
+
+    destroy(){
+        super.destroy();
+        if(this['pic'])
+        egret.Tween.removeTweens(this['pic']);
+        
     }
 
     getScrollV(lastOrder, stageHeight) {

egret/src/panels/BoxPanel.ts

@@ -11,7 +11,10 @@ export default class BoxPanel extends Panel {
 
         }, this);
         this.showlog();
-        this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
+        // this.data.img = DataManager.ins.getData('getPlugOrderStatus').lottery.imgurl;
+
+        const itemid = DataManager.ins.getData('getPlugOrderStatus').lottery.itemId;
+        this.data.img = `http://yun.duiba.com.cn/db_games/0827/${itemid}.png`;
     }
     showlog() {
         NetManager.ins.showLog(getlogItem(17));

mock/happyclear/home.json

@@ -87,6 +87,11 @@
                 "maxScore": 99999,
                 "stars": 3
             },
+            {
+                "levelNum": 18,
+                "maxScore": 99999,
+                "stars": 3
+            },
             {
                 "levelNum": 17,
                 "maxScore": 42420,
@@ -109,7 +114,7 @@
         ],
         "remainEnargy": 9979,
         "askForEnergy": false,
-        "canReceiveTreasureBoxNum": 0,
+        "canReceiveTreasureBoxNum": 10,
         "nextRangeStarsNum": 150
     }
 }
\ No newline at end of file

mock/happyclear/openTreasureBox.json

 {
-    "success": false,
+    "success": true,
     "code": "0000000000",
     "desc": "OK",
     "timestamp": 1566558623308,

mock/json/getPlugOrderStatus.json

@@ -7,7 +7,7 @@
         "imgurl": "//yun.duiba.com.cn/developer/img/activityTool/slotMachine/virtual.png",
         "isAppHidden": true,
         "isDownloadUrl": true,
-        "itemId": 49440,
+        "itemId": 59236,
         "link": "//activity.m.duibadev.com.cn/activity/takePrizeNew?recordId=30035037&dbnewopen",
         "linkTo": 0,
         "title": "宝箱1",