1

26dd8ed7 · wildfirecode · 6a6cdeb4 · 6a6cdeb4 · 26dd8ed7 · 6a6cdeb4
Commit 26dd8ed7 authored Nov 11, 2019 by wildfirecode
13 changed files
--- a/egret/resource/assets/ad/adbg.png
+++ b/egret/resource/assets/ad/adbg.png
--- a/egret/resource/assets/sign/signbg.png
+++ b/egret/resource/assets/sign/signbg.png
--- a/egret/resource/assets/sign/signbtn1.png
+++ b/egret/resource/assets/sign/signbtn1.png
--- a/egret/resource/assets/sign/signbtn2.png
+++ b/egret/resource/assets/sign/signbtn2.png
--- a/egret/resource/assets/sign/signbtn3.png
+++ b/egret/resource/assets/sign/signbtn3.png
--- a/egret/resource/assets/sign/signbtn4.png
+++ b/egret/resource/assets/sign/signbtn4.png
--- a/egret/resource/skins/ADSkin.exml
+++ b/egret/resource/skins/ADSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="AddSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16db3bd8eb8"/>
-	<e:Image source="adbg_png" y="-73" horizontalCenter="0"/>
-	<e:Image id="adBtn" y="218" width="560" height="600" source="{data.img}" x="95"/>
-	<e:Button id="closeBtn" label="" y="164" horizontalCenter="270">
+	<e:Image source="adbg_png" y="14.49" horizontalCenter="-8"/>
+	<e:Image id="adBtn" y="266.49" width="560" height="600" source="{data.img}" x="95"/>
+	<e:Button id="closeBtn" label="" y="220.09" horizontalCenter="284">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
@@ -11,5 +11,5 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Rect id="mask" width="560" height="600" x="95" y="218" ellipseWidth="100" ellipseHeight="100"/>
+	<e:Rect id="mask" width="560" height="600" x="95" y="266.49" ellipseWidth="100" ellipseHeight="100"/>
 </e:Skin>
\ No newline at end of file
--- a/egret/resource/skins/SignItemSkin.exml
+++ b/egret/resource/skins/SignItemSkin.exml
@@ -3,8 +3,8 @@
 	<e:Image id="line1" source="sign_line_png" x="5.36" y="2.01"/>
 	<e:Image source="signitem_png" right="0" y="2"/>
 	<e:Image id="line2" source="sign_line2_png" x="5.36" y="2.01"/>
-	<e:Label id="title" text="第1天" x="77" y="14" textColor="0x955200" size="24"/>
-	<e:Label id="amount" text="1" x="186" y="80.23" textColor="0x955200" size="24"/>
+	<e:Label id="title" text="第1天" x="77" y="15.33" textColor="0x955200" size="24" fontFamily="FZY3JW"/>
+	<e:Label id="amount" text="1" x="186" y="81.56" textColor="0x955200" size="24" fontFamily="FZY3JW"/>
 	<e:Image id="light" source="sign_light_png" x="3.65" y="1.34"/>
 	<e:Image id="object" source="sign_icon1_png" x="96" y="46.73" visible="false"/>
 	<e:Image id="money" source="signicon2_png" x="90" y="67.5" visible="false"/>

--- a/egret/resource/skins/SignSkin.exml
+++ b/egret/resource/skins/SignSkin.exml
 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SignSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image source="signbg_png" y="0" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="630" y="188">
+	<e:Image source="signbg_png" y="22.75" horizontalCenter="-10"/>
+	<e:Button id="closeBtn" label="" x="630" y="163.77">
 		<e:skinName>
 		<e:Skin states="up,down,disabled" xmlns:w="http://ns.egret.com/wing">
 			<e:Image width="100%" height="100%" source="closeCommonBtn_png" source.down="closeCommonBtn_png" source.disabled="closeCommonBtn_png"/>
@@ -9,12 +9,11 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Scroller id="scroll" width="560" height="495" x="91" y="409">
+	<e:Scroller id="scroll" width="560" height="495" x="91" y="372.64">
 		<e:Group>
 			<e:List id="list" width="560" itemRendererSkinName="SignItemSkin">
 				
 			</e:List>
 		</e:Group>
 	</e:Scroller>
-	<e:Label text="签到中断，要从头开始哦" y="360.4" textColor="0xf54504" horizontalCenter="0" size="28"/>
 </e:Skin>
\ No newline at end of file
--- a/mock/config.js
+++ b/mock/config.js
@@ -52,7 +52,7 @@ const config = {
        data: './happyclear/openTreasureBox.json'
    },
    '/customActivity/happyclear/home': {
-        data: './happyclear/homemax.json'
+        data: './happyclear/home.json'
    },
    '/customActivity/happyclear/getLevelInfo': {
        data: './happyclear/getLevelInfo.json'

--- a/mock/happyclear/advert.json
+++ b/mock/happyclear/advert.json
-{"success":true,"code":"0000000000","desc":"OK","timestamp":1572957051094,"data":null}
\ No newline at end of file
+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":{
+        "popupAdvert":{
+            "enable":false,
+            "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"
+                }
+            ]
+        },
+        "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"
+                }
+            ]
+        },
+        "mapAdvert":{
+            "enable":false,
+            "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"
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
--- a/mock/happyclear/home.json
+++ b/mock/happyclear/home.json
@@ -11,506 +11,6 @@
                "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
            }
        ],
        "remainProp": [

--- a/mock/sign/getSignInfo.json
+++ b/mock/sign/getSignInfo.json
 {
    "success": true,
    "signInfoVO": {
-        "continueDay": 6,
-        "todaySigned": 0
+        "continueDay": 1,
+        "todaySigned": 1
    }
 }
\ No newline at end of file