1

egret/index.html

@@ -25,6 +25,10 @@
             margin: 0;
             height: 100%;
         }
+        @font-face{
+            font-family: "z2";
+            src: url("resource/assets/common/HuaKang_YuanTi_W5.TTF");
+        }
     </style>
 </head>
 

egret/resource/default.res.json

@@ -81,7 +81,7 @@
 			"name": "signprize"
 		},
 		{
-			"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png",
+			"keys": "toast_png,share_btn2_png,share_btn1_png,prizePanelbg_png,nums2_png,nums2_fnt,nums_png,nums_fnt,lightani_png,common_yuanbao_png,common_prizelight_png,common_adbg_png,commmon_okbtn1_png,closeCommonBtn_png,btn_png,alertbg_png,朋友圈中间分享蒙层1_jpg,按钮 副本 4_png,按钮 副本 3_png,exchangebtn_png,turnnoprize再来一次2_png,HuaKang_YuanTi_W5_TTF",
 			"name": "common"
 		},
 		{
@@ -2847,6 +2847,11 @@
 			"url": "assets/mainScene/eyeDownRight.png",
 			"type": "image",
 			"name": "eyeDownRight_png"
+		},
+		{
+			"url": "assets/common/HuaKang_YuanTi_W5.TTF",
+			"type": "bin",
+			"name": "HuaKang_YuanTi_W5_TTF"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/ScratchSkin.exml

@@ -5,7 +5,7 @@
 	<e:Image id="light2" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png"/>
 	<e:Image id="light1" x="376" y="317" anchorOffsetX="356" anchorOffsetY="296" source="scratchbg2_png"/>
 	<e:Group id="con" y="58.03"/>
-	<e:Label id="numLabel" text="共2位好友帮你刮了90.3%" y="381.33" textColor="0xF54500" size="28" horizontalCenter="0" fontFamily="Lucida Family" verticalAlign="middle" textAlign="center"/>
+	<e:Label id="numLabel" text="共2位好友帮你刮了90.3%" y="381.33" textColor="0xF54500" size="28" horizontalCenter="0" verticalAlign="middle" textAlign="center" fontFamily="z2"/>
 	<e:Image y="414" horizontalCenter="0" source="scratch_card_bg_png"/>
 	<e:Image id="prizeImg" y="435" source=""  width="510" height="228" horizontalCenter="0"/>
 	<e:Image id="scratch_progress" y="414" horizontalCenter="0" x="10" source="scratch_card_90_png"/>
@@ -26,7 +26,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="895.33" size="28" textColor="0xffffff"  horizontalCenter="0.5"/>
+	<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="895.33" size="28" textColor="0xffffff"  horizontalCenter="0.5" fontFamily="z2"/>
 	<e:Label text="帮刮\n记录" y="805" size="28" textColor="0xFFFFFF" horizontalCenter="-248"/>
 	<e:Scroller width="487" height="90" y="783" anchorOffsetX="0" anchorOffsetY="0" horizontalCenter="32.5">
 		<e:Group anchorOffsetX="0" y="2">
@@ -49,7 +49,7 @@
 		<e:Group id="progressGroup" x="8" verticalCenter="0">
 			<e:Image id="progressBg" source="scratch_progress_bg_png" anchorOffsetX="0" anchorOffsetY="0" x="0" y="0" width="437" height="22"/>
 			<e:Rect id="progress" fillColor="0xeb1917" left="0" verticalCenter="0" width="0" top="0" bottom="0"/>
-			<e:Label id="progressLabel" text="仅剩90.7%" size="18" verticalCenter="2" horizontalCenter="0.5" bold="true" verticalAlign="middle" textAlign="center"/>
+			<e:Label id="progressLabel" text="仅剩90.7%" size="18" verticalCenter="2" horizontalCenter="0.5" bold="true" verticalAlign="middle" textAlign="center" fontFamily="z2"/>
 		</e:Group>
 		<e:Image id="hongbao" source="scratch_hongbao_png" scaleX="1" scaleY="1" verticalCenter="0" horizontalCenter="219"/>
 	</e:Group>

egret/src/mapScene/MapScene.ts

@@ -48,7 +48,8 @@ export default class MapScene extends Scene {
         if(doHelpFlag) {
             return;
         }
-        let callBack = (success, res) => {
+        if(code.indexOf("12345678") == -1){  // 邀请有礼
+            NetManager.ins.doHelp((success, res) => {
                 doHelpFlag = true;
                 switch(true) {
                     case (res.code == "400017"): showToast("您不是新用户呢～"); break;
@@ -59,12 +60,21 @@ export default class MapScene extends Scene {
                 if(!success) { return; }
                 showToast("助力成功");
                 NetManager.ins.showLog(getlogItem(36));
-        };
-        if(code.indexOf("12345678") == -1){  // 邀请有礼
-            NetManager.ins.doHelp(callBack, code, dojoin.data);
+            }, code, dojoin.data);
         } else {    // 刮刮卡
             let _code = code.slice(8);
-            NetManager.ins.scratchDoHelp(callBack, _code);
+            NetManager.ins.scratchDoHelp((success, res) => {
+                doHelpFlag = true;
+                switch(true) {
+                    case (res.code == "0000024"): showToast("今日刮卡次数已达到上线限哦～"); break;
+                    case (res.code == "0000022"): showToast("不可以给自己刮哦～"); break;
+                    case (res.code == "0000023"):showToast("已经给好友刮过了哦～"); break;
+                    default: break;
+                }
+                if(!success) { return; }
+                showToast("帮刮成功！");
+                NetManager.ins.showLog(getlogItem(36));
+            }, _code);
         }
     }
 

egret/src/mapScene/icon/TurntableIcon.ts

@@ -26,8 +26,10 @@ export default class TurntableIcon extends IconBase {
         NetManager.ins.clickLog(getlogItem(43));
         NetManager.ins.hc_turnableBaseInfo((success, res)=>{
             if(!success){
+                this.visible = false;
                 return;
             }
+            this.visible = true;
             let data = res.data;
             if (data.remainTimes > 0 || (getHomeData().wealth > data.nextTimeNeedCoin)) {
                 this.tipsVisible = true;

mock/happyclear/scratchGetTaskInfo.json

@@ -5,7 +5,7 @@
     "timestamp": 1572318933388,
     "data": {
         "scratchCardTaskId": 1,
-        "taskStatus": 2,
+        "taskStatus": 1,
         "prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
         "currentTime": 1572318933366,
         "endTime": 1572358710000,