1

egret/resource/default.res.json

@@ -21,7 +21,7 @@
 			"name": "buy3"
 		},
 		{
-			"keys": "taskicon_png,recordbtn_png,progress2_png,progress1_png,namebg_png,msgTri_png,map3_jpg,map2_jpg,map1_jpg,map_signicon_png,lionMsgBg_png,invite_txtbg_png,invite_icon_png,iconbg_png,icon_png,guideOver_png,guideMoney_png,guideLove_png,guideLevel_png,guideBox_png,friend_avatar_png,avatar_png,animal1_png,ad_icon_png,元宝bg_png,有星星_png,音乐关闭_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音关闭_png,声音_png,设置bg_png,设置_png,光 副本 4_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱3_png,宝箱2_png,宝箱1_png,宝箱_png",
+			"keys": "taskicon_png,recordbtn_png,progress2_png,progress1_png,namebg_png,msgTri_png,map3_jpg,map2_jpg,map1_jpg,map_signicon_png,lionMsgBg_png,invite_txtbg_png,invite_icon_png,iconbg_png,icon_png,guideOver_png,guideMoney_png,guideLove_png,guideLevel_png,guideBox_png,friend_avatar_png,avatar_png,animal1_png,ad_icon_png,元宝bg_png,有星星_png,音乐关闭_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音关闭_png,声音_png,设置bg_png,设置_png,光 副本 4_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱3_png,宝箱2_png,宝箱1_png,宝箱_png,map明日可领_png,map今日可领_png",
 			"name": "map"
 		},
 		{
@@ -2274,6 +2274,16 @@
 			"url": "assets/ad/adbg.png",
 			"type": "image",
 			"name": "adbg_png"
+		},
+		{
+			"url": "assets/map/map明日可领.png",
+			"type": "image",
+			"name": "map明日可领_png"
+		},
+		{
+			"url": "assets/map/map今日可领.png",
+			"type": "image",
+			"name": "map今日可领_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/FriendShareSkin.exml

@@ -2,12 +2,12 @@
 <e:Skin class="FriendShareSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<e:Rect width="750" height="1624" fillAlpha="0.7"/>
 	<e:Image source="sharefriendwx_jpg"/>
-	<e:Label id="lvTxt" text="70" y="377.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="106" textColor="0xB14D00" x="280" width="189"/>
-	<e:Group x="306" y="55">
+	<e:Label id="lvTxt" text="120" y="319.99" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="106" textColor="0xB14D00" x="280" width="189"/>
+	<e:Group x="306" y="-8.7">
 		<e:Image id="avatar" y="0" width="140" height="140" x="0" source=""/>
 		<e:Rect id="avatarMask" width="140" height="140" y="0" ellipseWidth="140" ellipseHeight="140" x="0"/>
 	</e:Group>
-	<e:Group y="174" horizontalCenter="-1">
+	<e:Group y="123.99" horizontalCenter="-1">
 		<e:Image source="sharefriend_png" y="0" x="0"/>
 		<e:Label id="nameTxt" text="打发顺丰" width="149" verticalAlign="middle" textAlign="center" size="18" height="45" x="16"/>
 	</e:Group>

egret/resource/skins/MapSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="MapSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Rect id="rectbg" width="750" height="1206" x="0" y="-3"/>
+	<e:Rect id="rectbg" width="750" height="1206" x="2" y="-3"/>
 	<e:Scroller id="scroll" width="750" height="1624" x="0" y="0" scrollPolicyH="off" scrollPolicyV="on" locked="true">
 		<e:Group id="scrollGroup">
 		</e:Group>
@@ -59,14 +59,6 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="signBtn" label="" x="22.69" y="164.57" scaleX="0.9" scaleY="0.9">
-		<e:skinName>
-			<e:Skin states="up,down,disabled">
-			<e:Image width="100%" height="100%" source="map_signicon_png" source.down="map_signicon_png" source.disabled="recordbtn_png"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-			</e:Skin>
-		</e:skinName>
-	</e:Button>
 	<e:Group id="friendBtn" x="-0.12" y="22.31" width="171" height="120">
 		<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
 		<e:Group x="38.5" y="10">
@@ -85,8 +77,22 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group id="inviteGroup" x="25.63" y="297.76">
-		<e:Button id="inviteBtn" label="" x="0" y="1.54" scaleX="0.9" scaleY="0.9">
+	<e:Group id="signGroup" x="26.69" y="172.57">
+		<e:Button id="signBtn" label="" x="0" y="0">
+			<e:skinName>
+			<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="map_signicon_png" source.down="map_signicon_png" source.disabled="recordbtn_png"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+			</e:skinName>
+		</e:Button>
+		<e:Group y="92" x="9">
+			<e:Image id="sign_s1" source="map今日可领_png" x="0" y="0" visible="false"/>
+			<e:Image id="sign_s2" source="map明日可领_png" x="0" y="0" visible="false"/>
+		</e:Group>
+	</e:Group>
+	<e:Group id="inviteGroup" x="16.69" y="323.76">
+		<e:Button id="inviteBtn" label="" x="10" y="1.54">
 			<e:skinName>
 			<e:Skin states="up,down,disabled">
 				<e:Image width="100%" height="100%" source="invite_icon_png" source.down="invite_icon_png" source.disabled="invite_icon_png"/>
@@ -95,8 +101,8 @@
 			</e:skinName>
 		</e:Button>
 		<e:Group x="75.36" y="-1.33">
-			<e:Image id="inviteTipsBg" source="invite_txtbg_png" x="0" y="0" touchEnabled="false"/>
-			<e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="16"/>
+			<e:Image id="inviteTipsBg" source="invite_txtbg_png" x="78" y="0" touchEnabled="false" scaleX="-1"/>
+			<e:Label id="inviteTips" text="立即到账" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center" textColor="0xffffff" size="18" fontFamily="Helvetica"/>
 		</e:Group>
 	</e:Group>
 	<e:Group x="30" scaleX="1.4" scaleY="1.4" bottom="23">

egret/resource/skins/Share3Skin.exml

@@ -5,7 +5,7 @@
 	<e:Group id="pic" x="86" y="46">
 		<e:Group y="0" x="0">
 			<e:Image x="0" y="0" source="sharefriend_jpg"/>
-			<e:Label id="lvTxt" text="14" y="270.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="106" textColor="0xb14d00" horizontalCenter="0"/>
+			<e:Label id="lvTxt" text="120" y="286.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="90" textColor="0xb14d00" horizontalCenter="0"/>
 		</e:Group>
 		<e:Group x="236.86" y="44.78">
 			<e:Image id="avatar" y="0" width="108" height="108" x="0" source=""/>

egret/scripts/MyExmlPlugin.ts

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

egret/src/mapScene/MapScene.ts

@@ -108,12 +108,13 @@ export default class MapScene extends Scene {
             }
 
             const { signInfoVO } = DataManager.ins.getData('getSignInfo');
-            if (signInfoVO.continueDay < 7) {
+            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) { //引导
                 const guide = new GuideCon(() => {
@@ -253,6 +254,16 @@ export default class MapScene extends Scene {
 
     }
 
+    updateSign(){
+        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 {
+            this['sign_s2'].visible=true;
+        }
+    }
+
     updateAdData() {
         const hc_advert = DataManager.ins.getData('hc_advert').data;
         let { mapAdvert } = hc_advert;
@@ -351,6 +362,7 @@ export default class MapScene extends Scene {
 
     updateScene() {
         this.updateHomeData();
+        this.updateSign();
     }
 
     addAvatar(level, ele?) {

egret/src/panels/SignPanel.ts

@@ -40,6 +40,11 @@ export default class SignPanel extends Panel {
             item['btn1'].enabled=false;
             NetManager.ins.doSign((s)=>{
                 item['btn1'].enabled=true;
+                wait(300).then(()=>{
+                    NetManager.ins.getSignInfo(() => {
+                        SceneCtrl.instance.updateScene();
+                    }, window['signActivityId']);
+                });
                 this.hidePanel();
                 if(s) {
                     const {customInfo,success} =DataManager.ins.getData('dosign');

egret/src/panels/gotoNextLevel.ts

@@ -11,7 +11,7 @@ export const gotoNextLevel = (currentLevel?) => {
     }
     const onMapScene = SceneCtrl.instance.currentScene instanceof MapScene;
 
-    if (currentLevel + 1 <= window['total_level']) {
+    if (currentLevel + 1 <= window['last_level']) {
         if (onMapScene)
             PanelCtrl.instance.show('StartPanel', currentLevel + 1)
         else

egret/src/shareCtrl.ts

@@ -64,7 +64,7 @@ class Share2 extends ComponentBase {
             // img.src = base64;
             // img.src = data.data;
             if(this.type==1)
-                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare2.jpg', channel);
+                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare3.jpg', channel);
             else
                 callShareApi('https://yun.duiba.com.cn/db_games/xxlshare.jpg', channel);
         // }, base64);

mock/happyclear/advert.json

 {
-    "success":true,
-    "code":null,
-    "desc":null,
-    "timestamp":1566199822308,
-    "data":{
-        "popupAdvert":{
-            "enable":0,
-            "advertList":[
+    "code": "0000000000",
+    "data": {
+        "mapAdvert": {
+            "enable": true,
+            "advertList": [
                 {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                },
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
+                    "img": "//yun.duiba.com.cn/images/201910/2iu41if4n7.png",
+                    "url": "https://cuxiao.m.suning.com/scms/s11dybys.html?adTypeCode=1137&adId=https%3A%2F%2Flib.suning.com%2Fweex%2Fs11dybys.js%3FpageCode%3Ds11dybys"
                 }
             ]
         },
-        "noticeAdvert":{
-            "enable":0,
-            "advertList":[
+        "noticeAdvert": {
+            "enable": true,
+            "advertList": [
                 {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                },
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
+                    "img": "//yun.duiba.com.cn/images/201910/mgspbjuspb.png",
+                    "url": "http://shop.m.suning.com/sale/30001669_10269054.html"
                 }
             ]
         },
-        "mapAdvert":{
-            "enable":0,
-            "advertList":[
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
+        "popupAdvert": null
     },
-                {
-                    "img":"http://yun.dui88.com/images/201909/lsh4tdkp5n.jpg",
-                    "url":"Http://www.baidu.com"
-                }
-            ]
-        }
-    }
+    "success": true,
+    "desc": "OK",
+    "timestamp": 1571821360634
 }
\ No newline at end of file

mock/happyclear/getInviteInfo.json

@@ -19,7 +19,7 @@
                 "avatar": null
             }
         ],
-        "completeFlag": 1,
+        "completeFlag": 0,
         "openPrizeMsg": "图片",
         "prizeType": "nickname",
         "prizeName": "nickname",

mock/happyclear/home.json

-{"success":true,"code":"0000000000","desc":"OK","timestamp":1571322220649,"data":{"wealth":0,"totalStars":52,"levels":[{"levelNum":1,"maxScore":49600,"stars":3},{"levelNum":2,"maxScore":28100,"stars":3},{"levelNum":3,"maxScore":23090,"stars":3},{"levelNum":4,"maxScore":23600,"stars":3},{"levelNum":5,"maxScore":18490,"stars":3},{"levelNum":6,"maxScore":35300,"stars":3},{"levelNum":7,"maxScore":31590,"stars":3},{"levelNum":8,"maxScore":42100,"stars":3},{"levelNum":9,"maxScore":55980,"stars":3},{"levelNum":10,"maxScore":25210,"stars":3},{"levelNum":11,"maxScore":20460,"stars":3},{"levelNum":12,"maxScore":36950,"stars":3},{"levelNum":13,"maxScore":34230,"stars":3},{"levelNum":14,"maxScore":43950,"stars":3},{"levelNum":15,"maxScore":14600,"stars":1},{"levelNum":16,"maxScore":36400,"stars":3},{"levelNum":17,"maxScore":25440,"stars":3},{"levelNum":18,"maxScore":37360,"stars":3}],"remainProp":[{"type":3,"num":1}],"remainEnargy":5,"askForEnergy":false,"canReceiveTreasureBoxNum":3,"nextRangeStarsNum":10,"isGetAllTreasureBox":false,"refectionCountdown":0}}
+{"success":true,"code":"0000000000","desc":"OK","timestamp":1571819565824,"data":{"wealth":140,"totalStars":359,"levels":[{"levelNum":1,"maxScore":39870,"stars":3},{"levelNum":2,"maxScore":36770,"stars":3},{"levelNum":3,"maxScore":28800,"stars":3},{"levelNum":4,"maxScore":36340,"stars":3},{"levelNum":5,"maxScore":64750,"stars":3},{"levelNum":6,"maxScore":59590,"stars":3},{"levelNum":7,"maxScore":37810,"stars":3},{"levelNum":8,"maxScore":24050,"stars":3},{"levelNum":9,"maxScore":43210,"stars":3},{"levelNum":10,"maxScore":25630,"stars":3},{"levelNum":11,"maxScore":25420,"stars":3},{"levelNum":12,"maxScore":32580,"stars":3},{"levelNum":13,"maxScore":56700,"stars":3},{"levelNum":14,"maxScore":34450,"stars":3},{"levelNum":15,"maxScore":42080,"stars":3},{"levelNum":16,"maxScore":18990,"stars":3},{"levelNum":17,"maxScore":51180,"stars":3},{"levelNum":18,"maxScore":38390,"stars":3},{"levelNum":19,"maxScore":20160,"stars":3},{"levelNum":20,"maxScore":55860,"stars":3},{"levelNum":21,"maxScore":21630,"stars":3},{"levelNum":22,"maxScore":115670,"stars":3},{"levelNum":23,"maxScore":26840,"stars":3},{"levelNum":24,"maxScore":39310,"stars":3},{"levelNum":25,"maxScore":28010,"stars":3},{"levelNum":26,"maxScore":36710,"stars":3},{"levelNum":27,"maxScore":37610,"stars":3},{"levelNum":28,"maxScore":67430,"stars":3},{"levelNum":29,"maxScore":118210,"stars":3},{"levelNum":30,"maxScore":52800,"stars":3},{"levelNum":31,"maxScore":32060,"stars":3},{"levelNum":32,"maxScore":15000,"stars":3},{"levelNum":33,"maxScore":36350,"stars":3},{"levelNum":34,"maxScore":35930,"stars":3},{"levelNum":35,"maxScore":69590,"stars":3},{"levelNum":36,"maxScore":65520,"stars":3},{"levelNum":37,"maxScore":72220,"stars":3},{"levelNum":38,"maxScore":46450,"stars":3},{"levelNum":39,"maxScore":46340,"stars":3},{"levelNum":40,"maxScore":50220,"stars":3},{"levelNum":41,"maxScore":35080,"stars":3},{"levelNum":42,"maxScore":20690,"stars":3},{"levelNum":43,"maxScore":22950,"stars":3},{"levelNum":44,"maxScore":32270,"stars":3},{"levelNum":45,"maxScore":77730,"stars":3},{"levelNum":46,"maxScore":37680,"stars":3},{"levelNum":47,"maxScore":53230,"stars":3},{"levelNum":48,"maxScore":58830,"stars":3},{"levelNum":49,"maxScore":95480,"stars":3},{"levelNum":50,"maxScore":74370,"stars":3},{"levelNum":51,"maxScore":59300,"stars":3},{"levelNum":52,"maxScore":54770,"stars":3},{"levelNum":53,"maxScore":25710,"stars":3},{"levelNum":54,"maxScore":39220,"stars":3},{"levelNum":55,"maxScore":52860,"stars":3},{"levelNum":56,"maxScore":74730,"stars":3},{"levelNum":57,"maxScore":44770,"stars":3},{"levelNum":58,"maxScore":44610,"stars":3},{"levelNum":59,"maxScore":72310,"stars":3},{"levelNum":60,"maxScore":47880,"stars":3},{"levelNum":61,"maxScore":89810,"stars":3},{"levelNum":62,"maxScore":24420,"stars":3},{"levelNum":63,"maxScore":36960,"stars":3},{"levelNum":64,"maxScore":31840,"stars":3},{"levelNum":65,"maxScore":74220,"stars":3},{"levelNum":66,"maxScore":176910,"stars":3},{"levelNum":67,"maxScore":61010,"stars":3},{"levelNum":68,"maxScore":47900,"stars":3},{"levelNum":69,"maxScore":39940,"stars":3},{"levelNum":70,"maxScore":55620,"stars":3},{"levelNum":71,"maxScore":23480,"stars":3},{"levelNum":72,"maxScore":44670,"stars":3},{"levelNum":73,"maxScore":57750,"stars":3},{"levelNum":74,"maxScore":53350,"stars":3},{"levelNum":75,"maxScore":27430,"stars":3},{"levelNum":76,"maxScore":34370,"stars":3},{"levelNum":77,"maxScore":41730,"stars":3},{"levelNum":78,"maxScore":33080,"stars":3},{"levelNum":79,"maxScore":16860,"stars":3},{"levelNum":80,"maxScore":35460,"stars":3},{"levelNum":81,"maxScore":47380,"stars":3},{"levelNum":82,"maxScore":39230,"stars":3},{"levelNum":83,"maxScore":33710,"stars":3},{"levelNum":84,"maxScore":49520,"stars":3},{"levelNum":85,"maxScore":55970,"stars":3},{"levelNum":86,"maxScore":94160,"stars":3},{"levelNum":87,"maxScore":49370,"stars":3},{"levelNum":88,"maxScore":41570,"stars":3},{"levelNum":89,"maxScore":34480,"stars":3},{"levelNum":90,"maxScore":77170,"stars":3},{"levelNum":91,"maxScore":36230,"stars":3},{"levelNum":92,"maxScore":36890,"stars":3},{"levelNum":93,"maxScore":33800,"stars":3},{"levelNum":94,"maxScore":34200,"stars":3},{"levelNum":95,"maxScore":39460,"stars":3},{"levelNum":96,"maxScore":30800,"stars":2},{"levelNum":97,"maxScore":62330,"stars":3},{"levelNum":98,"maxScore":43080,"stars":3},{"levelNum":99,"maxScore":43850,"stars":3},{"levelNum":100,"maxScore":58060,"stars":3},{"levelNum":101,"maxScore":33440,"stars":3},{"levelNum":102,"maxScore":37070,"stars":3},{"levelNum":103,"maxScore":80120,"stars":3},{"levelNum":104,"maxScore":37370,"stars":3},{"levelNum":105,"maxScore":63770,"stars":3},{"levelNum":106,"maxScore":118590,"stars":3},{"levelNum":107,"maxScore":43040,"stars":3},{"levelNum":108,"maxScore":116110,"stars":3},{"levelNum":109,"maxScore":94310,"stars":3},{"levelNum":110,"maxScore":61970,"stars":3},{"levelNum":111,"maxScore":44820,"stars":3},{"levelNum":112,"maxScore":70240,"stars":3},{"levelNum":113,"maxScore":37160,"stars":3},{"levelNum":114,"maxScore":87000,"stars":3},{"levelNum":115,"maxScore":37340,"stars":3},{"levelNum":116,"maxScore":107460,"stars":3},{"levelNum":117,"maxScore":48130,"stars":3},{"levelNum":118,"maxScore":67190,"stars":3},{"levelNum":119,"maxScore":52010,"stars":3},{"levelNum":120,"maxScore":47440,"stars":3}],"remainProp":[{"type":2,"num":0},{"type":3,"num":1},{"type":4,"num":1}],"remainEnargy":1,"askForEnergy":true,"canReceiveTreasureBoxNum":0,"nextRangeStarsNum":0,"isGetAllTreasureBox":true,"refectionCountdown":1685}}
\ No newline at end of file

mock/happyclear/userInfo.json

@@ -2,8 +2,18 @@
     "success": true,
     "code": "0000000000",
     "desc": "OK",
-    "timestamp": 1571037021641,
-    "data":{
-        "avatar":"https://image.suning.cn/uimg/cmf/cust_headpic/85b8b6681b46cc18dd49190521412cd2_00_120x120.jpg?v=17235850"
+    "timestamp": 1571820707565,
+    "data": {
+        "id": 142607029,
+        "consumerId": 3133923941,
+        "appId": 62499,
+        "partnerUserId": "ded19360f011e9b01fa13e962b18ded19361bf011e9bd1fa",
+        "nickname": "低调哼小曲",
+        "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+        "email": null,
+        "sex": null,
+        "json": "{}",
+        "gmtCreate": 1565835036000,
+        "gmtModified": 1565835036000
     }
 }
\ No newline at end of file

mock/sign/getSignInfo.json

@@ -2,6 +2,6 @@
     "success": true,
     "signInfoVO": {
         "continueDay": 6,
-        "todaySigned": 0
+        "todaySigned": 1
     }
 }
\ No newline at end of file