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

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,FZY4JW_TTF,FZY3JW_1_TTF",
 			"name": "common"
 		},
 		{
@@ -2849,9 +2849,9 @@
 			"name": "eyeDownRight_png"
 		},
 		{
-			"url": "assets/common/HuaKang_YuanTi_W5.TTF",
+			"url": "assets/common/FZY3JW_1.TTF",
 			"type": "bin",
-			"name": "HuaKang_YuanTi_W5_TTF"
+			"name": "FZY3JW_1_TTF"
 		},
 		{
 			"url": "assets/mainScene/hairballDisBg.png",
@@ -2912,6 +2912,11 @@
 			"url": "assets/mainScene/hairballPiece11.png",
 			"type": "image",
 			"name": "hairballPiece11_png"
+		},
+		{
+			"url": "assets/common/FZY4JW.TTF",
+			"type": "bin",
+			"name": "FZY4JW_TTF"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/ScratchSkin.exml

@@ -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" fontFamily="z2"/>
+	<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="895.33" size="28" textColor="0xffffff"  horizontalCenter="0.5" fontFamily="z2" bold="true"/>
 	<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">

egret/resource/skins/StartSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="StartSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16705cb4eec"/>
+	<e:Label id="FZYTW3" text="1" y="1048" textColor="0x244B00" fontFamily="FZYTW3" horizontalCenter="0"/>
+	<e:Label id="FZYTW4" text="1" y="1048" textColor="0x244B00" fontFamily="FZYTW4" horizontalCenter="0"/>
 	<e:Component id="container1" width="20" height="20" x="0" y="0"/>
 	<e:Component id="container2" width="20" height="20" x="0" y="0"/>
 	<e:Group x="140" y="1023.94">

egret/src/panels/ScratchPanel.ts

@@ -93,7 +93,7 @@ export default class ScratchPanel extends Panel {
         // 添加邀请图标
         let noAvatarNum = this.data.helpedCount - this.data.avatarList.length;              // 没有头像的人数
         let dNum = this.data.totalNeedCount - this.data.avatarList.length - noAvatarNum;    // 没邀请的人数
-        for(let i = 0; i < noAvatarNum; i++){
+        for(let i = 0; i < noAvatarNum; i++) {
             this.data.avatarList.push("");
         }
         for(let i = 0; i < dNum; i++) {
@@ -119,7 +119,7 @@ export default class ScratchPanel extends Panel {
         this.setProgress(+this.data.completePercent);
 
         // 倒计时
-        this.cutTimer = new CutTimer(this["cutTimeLabel"], "将在hh:mm:ss后消失", () => {
+        this.cutTimer = new CutTimer(this["cutTimeLabel"], "将在hh:mm:ss后失效", () => {
                 this.hidePanel();
                 GDispatcher.dispatchEvent("updateScratchTips");
             }
@@ -141,7 +141,7 @@ export default class ScratchPanel extends Panel {
         } else if(progress < 0) {
             progress = 0;
         }
-        this['numLabel'].text = `共${this.data.avatarList.length}位好友帮你刮了${progress.toFixed(2)}%`;
+        this['numLabel'].text = `共${2 + this.data.helpedCount}位好友帮你刮了${progress.toFixed(2)}%`;
         this["progressLabel"].text = `仅剩${(100 - progress).toFixed(2)}%`;    // 进度条文字
         let _width = this["progressBg"].width * progress / 100;    // 宽度
         let dProgress = Math.abs(progress - this["progress"].width / this["progressBg"].width);   // 比当前进度的差值的绝对值

mock/happyclear/scratchGetTaskInfo.json

@@ -2,19 +2,17 @@
     "success": true,
     "code": "0000000000",
     "desc": "OK",
-    "timestamp": 1572318933388,
+    "timestamp": 1572405066301,
     "data": {
         "scratchCardTaskId": 1,
         "taskStatus": 1,
-        "prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
-        "currentTime": 1572318933366,
-        "endTime": 1572358710000,
+        "prizeImage": "//yun.dui88.com/images/201910/9u6nk8sjt8.jpg",
+        "currentTime": 1572405066290,
+        "endTime": 1572491337000,
         "completePercent": "91.0",
         "remainPercent": "9.0",
-        "totalNeedCount": 3,
-        "helpedCount": 2,
-        "avatarList": [
-            null
-        ]
+        "totalNeedCount": 1,
+        "helpedCount": 0,
+        "avatarList": []
     }
 }
\ No newline at end of file

mock/happyclear/turnablebaseInfo.json

@@ -4,7 +4,7 @@
     "desc": "OK",
     "timestamp": 1572263074076,
     "data": {
-        "remainTimes": null,
+        "remainTimes": 7,
         "costCoinJoinTimes": 0,
         "nextTimeNeedCoin": 20,
         "luckyDrawInfo": {

mock/happyclear/turnabledojoin.json

@@ -4,12 +4,22 @@
     "desc": "OK",
     "timestamp": 1572327888728,
     "data": {
-        "isScratchCard": true,
+        "isScratchCard": false,
         "option": {
-            "scratchCardTaskId": 7,
-            "prizeImage": "//yun.dui88.com/images/201910/e6pmpk2pne.png",
-            "completePercent": "8",
-            "remainPercent": null
+            "id": "",
+            "day": null,
+            "categoryType": 2,
+            "title": "11",
+            "rate": "11",
+            "minValue": null,
+            "maxValue": null,
+            "coinType": null,
+            "propType": null,
+            "num": 3,
+            "img": "",
+            "appItemId": null,
+            "name": "",
+            "value": ""
         },
         "orderNum": null
     }