1

egret/libs/new_wx/components/PrizePanel.ts

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

egret/resource/TextureMerger/invite.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["../assets/invite/invite_invite.png","../assets/invite/invite_help.png","../assets/invite/invite_btn.png","../assets/invite/invite_bg.png","../assets/invite/prize/invitePrize_btn.png","../assets/invite/prize/invitePrize_bg.png","../assets/invite/prize/invitePrize_game_btn.png","../assets/invite/cutTime/invateCut_bg.png","../assets/invite/cutTime/invateCut_btn.png","../assets/invite/invite_wx_tip.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["../assets/invite/invite_invite.png","../assets/invite/invite_help.png","../assets/invite/invite_btn.png","../assets/invite/invite_bg.png","../assets/invite/prize/invitePrize_btn.png","../assets/invite/prize/invitePrize_bg.png","../assets/invite/prize/invitePrize_game_btn.png","../assets/invite/cutTime/invateCut_bg.png","../assets/invite/cutTime/invateCut_btn.png","../assets/invite/invite_wx_tip.png","../assets/invite/rule/invite_rule_bg.png"]}
\ No newline at end of file

egret/scripts/MyExmlPlugin.ts

@@ -8,6 +8,7 @@ import { ExmlPlugin2 } from "./ExmlPlugin2";
 export class MyExmlPlugin extends ExmlPlugin2 implements plugins.Command {
     async onFile(file: plugins.File) {
         const excludes = [
+            'cutTimeFont.png',
             'nums.png',
             'nums2.png'
         ];

egret/src/mapScene/MapScene.ts

@@ -355,8 +355,9 @@ export default class MapScene extends Scene {
 
     updateFriends() {
         NetManager.ins.hc_mapRank(() => {
-            const {data} = DataManager.ins.getData('hc_mapRank');
-            data.forEach((ele) => {
+            const hc_mapRank= DataManager.ins.getData('hc_mapRank').data;
+            if(!hc_mapRank)return;
+            hc_mapRank.forEach((ele) => {
                 this.addAvatar(ele.levelNum, ele.rank[0]);
             });
         });

egret/src/panels/BoxPanel.ts

@@ -15,9 +15,7 @@ export default class BoxPanel extends Panel {
         // 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/09302/${itemid}.png`;
-
-        addAdComp(84,739,this)
+        this.data.img = `http://yun.duiba.com.cn/db_games/1015/${itemid}.png`;
     }
     showlog() {
         NetManager.ins.showLog(getlogItem(17));

egret/src/panels/SignPrizePanel.ts

@@ -18,7 +18,7 @@ export default class SignPrizePanel extends Panel {
             this['numsgroup'].visible=false;
         } else {
             if(customInfo.itemId)
-                this['img'].source = `http://yun.duiba.com.cn/db_games/1014/${customInfo.itemId}.png`;
+                this['img'].source = `http://yun.duiba.com.cn/db_games/1015/${customInfo.itemId}.png`;
         }
 
         this['nums'].text ='x'+ customInfo.prizeCount;

egret/src/shareCtrl3.ts

+import ComponentBase from "../libs/new_wx/components/ComponentBase";
+import layers from "../libs/new_wx/views/layers";
+import getHomeData from "./getHomeData";
+import { iswx } from "./iswx";
+import { callShareApi } from "./shareCtrl";
+
+const img: any = document.getElementById('pic');
+img.style.display = 'none';
+
+class Share3 extends ComponentBase {
+    type;
+
+    setType(type: any) {
+        this.type = type;
+        this['pic1'].visible = false;
+        this['pic2'].visible = false;
+        this['pic' + type].visible = true;
+    }
+
+    start() {
+        this.once(egret.TouchEvent.ADDED_TO_STAGE, () => {
+            this.height = this.stage.stageHeight;
+        }, this);
+
+        this.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            hideShare3();
+        }, this);
+
+        const data = getHomeData();
+        this['tipsTxt0'].text = `超过了${Math.ceil(Math.random() * 100)}%的好友`;
+        this['lvTxt'].text = data.levels.length == 0 ? 1 : data.levels.length;
+        this['lvTxt0'].text = data.levels.length;
+        this['btn1'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            if(iswx()) { //微信端
+
+            } else {//端内
+                this.getFunc('2');//朋友圈
+            }
+
+            hideShare3();
+        }, this);
+
+        this['btn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            if(iswx()) { //微信端
+
+            } else {//端内
+                this.getFunc('1');//好友微信
+            }
+            hideShare3();
+        }, this);
+    }
+
+    //channel 1 好友  2 朋友圈
+    getFunc(channel: string) {
+        // let base64;
+        // if(this.type==1)
+        //     base64= getPrintScreenData(this['pic' + this.type], 0, 0, 579, 866);
+        // else 
+        //     base64= getPrintScreenData(this['pic' + this.type], 0, 0, 600, 965);
+        // NetManager.ins.imgUrl((success) => {
+            // const data = DataManager.ins.getData('imgURL');
+            // img.src = base64;
+            // img.src = data.data;
+            if(this.type==1)
+                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare2.jpg', channel);
+            else
+                callShareApi('https://yun.duiba.com.cn/db_games/xxlshare.jpg', channel);
+        // }, base64);
+    }
+
+    get skinKey() {
+        return 'Share3';
+    }
+}
+
+let inited = false;
+let _share: Share3;
+const initShare = () => {
+    const layer = layers.shareLayer;
+    const share = new Share3();
+    share.loadSkin();
+    share.start();
+    layer.addChild(share);
+    _share = share;
+};
+ const showShare3 = (type) => {
+    if(!inited) {
+        initShare();
+        inited = true;
+    }
+    _share.setType(type);
+    layers.shareLayer.visible = true;
+}
+
+ const hideShare3 = () => {
+    layers.shareLayer.visible = false;
+}

mock/happyclear/mapRank copy.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":[
+        {
+            "levelNum":4,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        },
+        {
+            "levelNum":70,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        },
+        {
+            "levelNum":71,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file

mock/happyclear/mapRank.json

-{
-    "success":true,
+{"success":true,"code":"0000000000","desc":"OK","timestamp":1571055191222,"data":null}
\ No newline at end of file
-    "code":null,
-    "desc":null,
-    "timestamp":1566199822308,
-    "data":[
-        {
-            "levelNum":4,
-            "rank":[
-                {
-                    "nickName":"昵称",
-                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-                    "stars":1,
-                    "maxScore":123,
-                    "rank":"排名"
-                }
-            ]
-        },
-        {
-            "levelNum":70,
-            "rank":[
-                {
-                    "nickName":"昵称",
-                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-                    "stars":1,
-                    "maxScore":123,
-                    "rank":"排名"
-                }
-            ]
-        },
-        {
-            "levelNum":71,
-            "rank":[
-                {
-                    "nickName":"昵称",
-                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
-                    "stars":1,
-                    "maxScore":123,
-                    "rank":"排名"
-                }
-            ]
-        }
-    ]
-}
\ No newline at end of file