1

egret/libs/new_wx/MainBase.ts

@@ -169,6 +169,7 @@ export default class MainBase extends eui.UILayer {
         RES.getResAsync('mapBg_mp3');
         RES.getResAsync('sharefriend_jpg');
         RES.getResAsync(`nums_png`);
+        RES.getResAsync(`sharenums_fnt`);
         RES.getResAsync(`nums_fnt`);
         RES.getResAsync(`nums2_png`);
         RES.getResAsync(`nums2_fnt`);

egret/resource/TextureMerger/map.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png"]}
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["../assets/map/taskicon.png","../assets/map/recordbtn.png","../assets/map/progress2.png","../assets/map/progress1.png","../assets/map/namebg.png","../assets/map/msgTri.png","../assets/map/map_signicon.png","../assets/map/lionMsgBg.png","../assets/map/invite_txtbg.png","../assets/map/invite_icon.png","../assets/map/iconbg.png","../assets/map/icon.png","../assets/map/guideOver.png","../assets/map/guideMoney.png","../assets/map/guideLove.png","../assets/map/guideLevel.png","../assets/map/guideBox.png","../assets/map/friend_avatar.png","../assets/map/avatar.png","../assets/map/animal1.png","../assets/map/ad_icon.png","../assets/map/元宝bg.png","../assets/map/有星星.png","../assets/map/音乐关闭.png","../assets/map/音乐.png","../assets/map/星星bg.png","../assets/map/星星.png","../assets/map/无星星.png","../assets/map/问题.png","../assets/map/退出.png","../assets/map/狮子.png","../assets/map/声音关闭.png","../assets/map/声音.png","../assets/map/设置bg.png","../assets/map/设置.png","../assets/map/光 副本 4.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/宝箱.png","../assets/map/map明日可领.png","../assets/map/map今日可领.png"]}
\ No newline at end of file

egret/resource/assets/common/sharenums.fnt

+{"file":"sharenums.png","frames":{
+"0":{"x":61,"y":0,"w":58,"h":79,"offX":0,"offY":0,"sourceW":58,"sourceH":79},
+"1":{"x":170,"y":161,"w":31,"h":78,"offX":0,"offY":0,"sourceW":31,"sourceH":78},
+"2":{"x":57,"y":161,"w":53,"h":79,"offX":0,"offY":0,"sourceW":53,"sourceH":79},
+"3":{"x":114,"y":81,"w":54,"h":79,"offX":0,"offY":0,"sourceW":54,"sourceH":79},
+"4":{"x":0,"y":0,"w":59,"h":79,"offX":0,"offY":0,"sourceW":59,"sourceH":79},
+"5":{"x":170,"y":81,"w":54,"h":78,"offX":0,"offY":0,"sourceW":54,"sourceH":78},
+"6":{"x":121,"y":0,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79},
+"7":{"x":57,"y":81,"w":55,"h":78,"offX":0,"offY":0,"sourceW":55,"sourceH":78},
+"8":{"x":178,"y":0,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79},
+"9":{"x":0,"y":81,"w":55,"h":79,"offX":0,"offY":0,"sourceW":55,"sourceH":79}}}
\ No newline at end of file

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"
 		},
 		{
@@ -129,7 +129,7 @@
 			"name": "friendshare"
 		},
 		{
-			"keys": "scratch_bg_png,scratch_help_png,scratch_wx_tip_png,scratchbg2_png,scratch_invite_png,scratch_progress_bg_png,scratch_hongbao_png",
+			"keys": "scratch_bg_png,scratch_hongbao_png,scratch_help_png,scratch_progress_bg_png,scratch_wx_tip_png,scratchbg2_png,scratch_invite_png",
 			"name": "scratch"
 		},
 		{
@@ -2287,16 +2287,46 @@
 			"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"
+		},
+		{
+			"url": "assets/common/sharenums.fnt",
+			"type": "font",
+			"name": "sharenums_fnt"
+		},
+		{
+			"url": "assets/common/sharenums.png",
+			"type": "image",
+			"name": "sharenums_png"
+		},
 		{
 			"url": "assets/scratch/scratch_bg.png",
 			"type": "image",
 			"name": "scratch_bg_png"
 		},
+		{
+			"url": "assets/scratch/scratch_hongbao.png",
+			"type": "image",
+			"name": "scratch_hongbao_png"
+		},
 		{
 			"url": "assets/scratch/scratch_help.png",
 			"type": "image",
 			"name": "scratch_help_png"
 		},
+		{
+			"url": "assets/scratch/scratch_progress_bg.png",
+			"type": "image",
+			"name": "scratch_progress_bg_png"
+		},
 		{
 			"url": "assets/scratch/scratch_wx_tip.png",
 			"type": "image",
@@ -2331,16 +2361,6 @@
 			"url": "assets/scratch/rule/scratch_rule_bg.png",
 			"type": "image",
 			"name": "scratch_rule_bg_png"
-		},
-		{
-			"url": "assets/scratch/scratch_progress_bg.png",
-			"type": "image",
-			"name": "scratch_progress_bg_png"
-		},
-		{
-			"url": "assets/scratch/scratch_hongbao.png",
-			"type": "image",
-			"name": "scratch_hongbao_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/skins/FriendShareSkin.exml

@@ -2,13 +2,14 @@
 <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="lvTxt0" text="120" y="319.99" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="106" textColor="0xB14D00" x="280" width="189" visible="false"/>
+	<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>
+	<e:BitmapLabel id="lvTxt" y="328.38" text="150" font="sharenums_fnt" horizontalCenter="0"/>
 </e:Skin>
\ No newline at end of file

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>
@@ -43,7 +43,7 @@
 		</e:Button>
 		<e:Label id="countdown" text="00:00:00" x="77.39" y="31.19" verticalAlign="middle" textAlign="center" size="22"/>
 	</e:Group>
-	<e:Button id="shopBtn" label="" x="613.08" y="128.01">
+	<e:Button id="shopBtn" label="" x="613.08" y="174.01">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="道具_png" source.down="道具_png" source.disabled="道具_png"/>
@@ -51,7 +51,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="recordBtn" label="" x="614.14" y="257.91">
+	<e:Button id="recordBtn" label="" x="614.14" y="323.76">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="recordbtn_png" source.down="recordbtn_png" source.disabled="recordbtn_png"/>
@@ -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">
@@ -76,7 +68,7 @@
 		<e:Image source="namebg_png" horizontalCenter="-4" bottom="-4"/>
 		<e:Label id="nameTxt" text="La121233bel" y="91.5" size="20" horizontalCenter="1"/>
 	</e:Group>
-	<e:Image id="adBtn" y="390.02" source="ad_icon_png" right="24" width="122" height="122"/>
+	<e:Image id="adBtn" y="474.02" source="ad_icon_png" right="24" width="122" height="122"/>
 	<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
@@ -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,8 @@
 	<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="lvTxt1" text="120" y="286.58" anchorOffsetX="0" anchorOffsetY="0" bold="true" textAlign="center" verticalAlign="middle" size="90" textColor="0xb14d00" horizontalCenter="0" visible="false"/>
+			<e:BitmapLabel id="lvTxt" y="294.38" text="888" font="sharenums_fnt" horizontalCenter="0" scaleX="0.8" scaleY="0.8"/>
 		</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/mainScene/MainScene.ts

@@ -20,7 +20,6 @@ import { RockAni } from '../something/anis/RockAni';
 import { ScoreAni } from '../something/anis/ScoreAni';
 import { ThreeCrossAni } from '../something/anis/ThreeCrossAni';
 import { VerticalAni } from '../something/anis/VerticalAni';
-import { Chapters } from '../something/Chapters';
 import { Element } from '../something/class/Element';
 import { Ice } from '../something/class/Ice';
 import { Lattice } from '../something/class/Lattice';
@@ -59,12 +58,10 @@ import { JellyDisAni } from '../something/anis/JellyDisAni';
 import { EggBrokenAni } from '../something/anis/EggBrokenAni';
 import { FallAniData, FallType } from '../something/interface/FallAniData';
 import { EleMaskAni } from '../something/anis/EleMaskAni';
-// tslint:disable: no-var-keyword
-// tslint:disable: prefer-const
-// tslint:disable: cyclomatic-complexity
-// tslint:disable: prefer-for-of
-// tslint:disable: only-arrow-functions
-// tslint:disable: no-inferrable-types
+import { getChapterData } from '../something/chapters/getChapter';
+import { GenerateLatData } from '../something/interface/GenerateLatData';
+import { FallEleType } from '../something/enum/FallELeType';
+
 const aniClass = {
     "BoomAni": BoomAni,
     "IceAni": IceAni,
@@ -107,16 +104,16 @@ const movieClips: any = {}
 
 export default class MainScene extends Scene {
     get skinKey() { return 'Main2' }
-    exposure
+    //关卡数据
     chapterData: ChapterData;
     //关数
     chapter: number
     //所有的格子数组
     lattices: Lattice[];
-    //生成口
-    generateIndexs: number[];
-    //最后一行的行数
-    endRowNum: number = 0;
+    //生成口，索引就是列数，元素式该列的生成口数据,能不止一个
+    generateIndexs: GenerateLatData[][];
+    //回收口的格子索引
+    recycleIndexs: number[];
     //元素的容器，为了移动事件简单
     elementContainer: egret.DisplayObjectContainer;
     //选中框
@@ -133,7 +130,7 @@ export default class MainScene extends Scene {
     isManual: boolean;
     //选中的元素
     SELECTED: Element;
-    //暂时不用
+    //判断是否提示交换元素用
     enableTouch: boolean;
     //提示交换对象
     warningCop: Element[];
@@ -150,6 +147,7 @@ export default class MainScene extends Scene {
     lollipopCount: number = 0;
     //是否已通关
     hasPassed: boolean = false;
+    //是否结算时间
     isCountingTime: boolean = false;
     //通关的目标元素的计数,下标和元素类型索引一致
     passElements: number[];
@@ -219,69 +217,30 @@ export default class MainScene extends Scene {
     gameGuide: GameGuide;
     start(data) {
         super.start();
-        // var a={x:1}
-        // egret.Tween.get(a)
-        // .to({x:100},1000)
-        // .call(()=>{
-        //     console.log(a.x)
-        // })
-        // .set({x:0})
-        // .call(()=>{
-        //     console.log(a.x)
-        // })
-
         //第几关
         this.chapter = (data && data.chapter) ? data.chapter : 1;
         // this.chapter = 24;
         this.chapterTxt.text = "第" + this.chapter + "关";
         //关卡数据
-        var mapDataIndex = this.chapter;
-        //56到70的话，中间36到50
-        if (this.chapter >= 56 && this.chapter <= 70) {
-            //循环36到50
-            mapDataIndex = this.chapter - 20
-        }
-        this.chapterData = Chapters[mapDataIndex];
+        this.chapterData = getChapterData(this.chapter)
         //初始化索引信息，暂时不做判断列数的奇偶，如需，要修改的地方再考虑，还有道具使用的蒙层是否要改
         Tool.init(/*Tool.getColOddEven(this.chapterData.map.lattices)*/);
         this.initUi();
         this.initSvgas();
         //先禁掉事件
         this.enableMouseEvt(false);
-        // this.initBuired()
+        //三个曝光埋点
         NetManager.ins.showLog(getlogItem(7))
         NetManager.ins.showLog(getlogItem(10))
         NetManager.ins.showLog(getlogItem(13))
 
-        //步数初始化,1期定制，56到70的话
-        if (this.chapter >= 56 && this.chapter <= 70) {
-            this.steps = this.chapterData.stepCount - 4;
-        }
-        else {
+        //步数初始化
         this.steps = this.chapterData.stepCount;
-        }
 
-        //分数置0
-        this.score = 0;
-        //通关目标,如果通关目标是元素时，赋值this.passElements，否则
-        if (this.chapterData.passTarget.type == PassType.ELEMENT_TARGET) {
-            this.hasEliminatedElements = [];
-            this.passElements = [];
-            for (var m = 0; m < this.chapterData.passTarget.elements.length; m++) {
-                var element: ElementTargetData = this.chapterData.passTarget.elements[m];
-                this.passElements[element.type] = element.count;
-                this.hasEliminatedElements[element.type] = 0;
-            }
-            this.elementTargets = new ElementTargets(this.passElements);
-            this.elementTargets.x = 375;
-            this.elementTargets.y = 155;
-            this.addChild(this.elementTargets);
-            this.targetScoreTxt.visible = false;
-        } else {
-            this.passElements = null;
-            this.targetScoreTxt.visible = true;
-            this.targetScoreTxt.text = "目标分数：" + this.chapterData.passTarget.score;
-        }
+        //初始化目标信息
+        this.initTarget();
+        //初始化回收口,如果是棒棒糖关卡，那么在地图底部增加棒棒糖洞，
+        this.initRecycle();
         //初始化格子
         this.initLattices();
         //初始化元素
@@ -299,83 +258,11 @@ export default class MainScene extends Scene {
         }
         //设置栏置顶
         this.addChild(this["settingAll"])
-        //如果是棒棒糖关卡，那么在地图底部增加棒棒糖洞
-        if (this.chapterData.passTarget.type == PassType.ELEMENT_TARGET) {
-            const elements = this.chapterData.passTarget.elements;
-            if (elements[0].type == ElementType.LOLLIPOP)
-                this.drawLollipopHole();
-        }
-
         //AiControl初始化，用于判断格子中是否有果冻，是否有鸡蛋，必须在初始化元素后执行
         AiControl.ins.init(this.lattices);
 
-        //游戏引导
-        const gameGuideChapterNum = [1, 5, 6, 7, 8, 9, 10, 19, 24, 81]
-        if (gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
-            if (!readCache(getCacheKey() + this.chapter)) {
-                this.gameGuide = new GameGuide(this);
-                this.addChild(this.gameGuide);
-                this.gameGuide.show();
-            }
-        }
-        // 234是道具引导
-        else if (this.chapter == 2 || this.chapter == 3 || this.chapter == 4) {
-            if (!readCache(getCacheKey() + this.chapter + "prop")) {
-                this.enableMouseEvt(false);
-                var pgi = new PropGuideInt(this)
-                this.addChild(pgi);
-                pgi.init(this.chapter >> 0)
-                this.lattices[41].element.effectType = EffectType.EXPLOSIVE
-            }
-        }
-
-
-        //开启事件，具体不应该放在这里，到时看
-        // this.enableMouseEvt(true);
-        //测试代码
-        var fail = new eui.Image(RES.getRes("guideKnowBtn_png"));
-        fail.x = 10;
-        fail.y = 10;
-        fail.addEventListener(egret.TouchEvent.TOUCH_TAP, function () {
-            playSound(SoundType.fail);
-            PanelCtrl.instance.show("failed", { level: this.chapter });
-        }, this)
-        // this.addChild(fail);
-        var sucess = new eui.Image(RES.getRes("guideKnowBtn_png"));
-        sucess.x = 474;
-        sucess.y = 10;
-        sucess.addEventListener(egret.TouchEvent.TOUCH_TAP, function () {
-            var json = {};
-            json[1] = 99999;
-            if (this.passElements) {
-                //i就是元素类型的索引
-                for (var i = 0; i < this.passElements.length; i++) {
-                    if (this.passElements[i] != undefined) {
-                        json[submitTran[i]] = 999
-                    }
-                }
-            }
-            this.submit(JSON.stringify(json))
-        }, this)
-        // this.addChild(sucess)
-    }
-    private drawLollipopHole() {
-        const texture: egret.Texture = RES.getRes('main_mapbottom_png');
-        const imgs = new egret.DisplayObjectContainer;
-        for (const key in this.endRowNumHash) {
-            const { index, row } = this.endRowNumHash[key];
-            if (this.endRowNum == row) {
-                const img = new eui.Image(texture);
-                const [x, y] = Tool.getPositionByIndex(index);
-                img.x = x;
-                img.y = y;
-                imgs.addChild(img);
-            }
-        }
-        imgs.x = -texture.textureWidth / 2;
-        imgs.y = Tool.height / 2 - 10;
-        imgs.cacheAsBitmap = true;
-        this.map.addChildAt(imgs, 0);
+        //引导
+        this.initGuide();
     }
     /**
      * 加载所有用到的svga
@@ -468,34 +355,97 @@ export default class MainScene extends Scene {
             this[arrObj[i]].count = nums[i];
             this.addChild(this[arrObj[i]])
         }
-        //道具使用引导
+        //道具使用时蒙层
         this.propGuide = new PropGuide();
         this.propGuide.touchEnabled = true;
         // this.addChild(this.propGuide);
-        //bonusTime引导
+        //bonusTime引导，备用的
         this.bonusTime = new BonusTime();
         this.bonusTime.x = 375;
         this.bonusTime.y = 600;
     }
-    endRowNumHash;
+    initTarget() {
+        //分数置0
+        this.score = 0;
+        //通关目标,如果通关目标是元素时，赋值this.passElements，否则
+        if (this.chapterData.passTarget.type == PassType.ELEMENT_TARGET) {
+            this.hasEliminatedElements = [];
+            this.passElements = [];
+            for (var m = 0; m < this.chapterData.passTarget.elements.length; m++) {
+                var element: ElementTargetData = this.chapterData.passTarget.elements[m];
+                this.passElements[element.type] = element.count;
+                this.hasEliminatedElements[element.type] = 0;
+            }
+            this.elementTargets = new ElementTargets(this.passElements);
+            this.elementTargets.x = 375;
+            this.elementTargets.y = 155;
+            this.addChild(this.elementTargets);
+            this.targetScoreTxt.visible = false;
+        } else {
+            this.passElements = null;
+            this.targetScoreTxt.visible = true;
+            this.targetScoreTxt.text = "目标分数：" + this.chapterData.passTarget.score;
+        }
+    }
+    initRecycle() {
+        //以防万一，初始化下。不排除，目标元素不是棒棒糖的，但是元素里有棒棒糖的情况；
+        this.recycleIndexs = [];
+        //通关目标是消除元素，并且有棒棒糖
+        //不考虑0，初始的时候目标是0？
+        if (this.passElements && this.passElements[ElementType.LOLLIPOP]) {
+            //初始化recycleIndexs，
+            var recycles = this.chapterData.map.recycles;
+            //如果没有就取最下层的
+            if (!recycles || !recycles.length) {
+                var endRowNumHash = {}, endRowNum: number = 0;;
+                for (var i = 0; i < this.chapterData.map.lattices.length; i++) {
+                    var lat = this.chapterData.map.lattices[i];
+                    if (!lat[i]) continue;
+                    var rc = Tool.indexToRc(i);
+                    const [row, col] = rc;
+                    //不用考虑0
+                    if (!endRowNumHash[col]) {
+                        endRowNumHash[col] = { row: row, index: i };
+                    }
+                    if (row > endRowNumHash[col].row) {
+                        endRowNumHash[col] = { row: row, index: i };
+                    }
+                    //取大行数
+                    endRowNum = Math.max(rc[0], endRowNum)
+                }
+                this.recycleIndexs = [];
+                for (const key in endRowNumHash) {
+                    const { index, row } = endRowNumHash[key];
+                    if (endRowNum == row) this.recycleIndexs.push(index)
+                }
+            }
+            //如果有数据，直接用数据，
+            else {
+                this.recycleIndexs = recycles.slice();
+            }
+            //画回收口
+            const texture: egret.Texture = RES.getRes('main_mapbottom_png');
+            const imgs = new egret.DisplayObjectContainer;
+            for (var m = 0; m < this.recycleIndexs.length; m++) {
+                var p = Tool.getPositionByIndex(this.recycleIndexs[m]);
+                const img = new eui.Image(texture);
+                img.x = p[0];
+                img.y = p[1];
+                imgs.addChild(img);
+            }
+            imgs.x = -texture.textureWidth / 2;
+            imgs.y = Tool.height / 2 - 10;
+            imgs.cacheAsBitmap = true;
+            this.map.addChildAt(imgs, 0);
+        }
+    }
+    //初始化地图格子数据
     initLattices() {
-        this.endRowNumHash = {};
         var latticesD = this.chapterData.map.lattices;
-        var generateLats = this.chapterData.map.generateLats;
         //先格子
         this.lattices = [];
         for (var i = 0; i < latticesD.length; i++) {
             if (!latticesD[i]) continue;
-            //记录最下一层的行数
-            var rc = Tool.indexToRc(i);
-            const [row, col] = rc;
-            if (this.endRowNumHash[col] == null) {
-                this.endRowNumHash[col] = { row: row, index: i };
-            }
-            if (row > this.endRowNumHash[col].row) {
-                this.endRowNumHash[col] = { row: row, index: i };
-            }
-            this.endRowNum = rc[0] > this.endRowNum ? rc[0] : this.endRowNum;
             this.lattices[i] = Pool.takeOut(RecoverName.LATTICE);
             if (!this.lattices[i]) {
                 this.lattices[i] = new Lattice(i);
@@ -517,9 +467,8 @@ export default class MainScene extends Scene {
                 ice.y = p[1] - 81 / 2;
             }
         }
-        console.log(this.endRowNumHash);
-        //设置生成口
-        this.generateIndexs = Tool.setGenerateLats(this.lattices, generateLats)
+        //设置生成口，
+        this.generateIndexs = Tool.setGenerateLats(this.lattices, this.chapterData.map.generateLats || [])
         //联通口
         var connectedLats = this.chapterData.map.connectedLats || [];
         for (var i = 0; i < connectedLats.length; i++) {
@@ -528,6 +477,7 @@ export default class MainScene extends Scene {
             this.lattices[connectedLat[1]].up = connectedLat[0];
         }
     }
+    //初始化地图元素
     initElement() {
         //没有就根据地图格子随机元素
         var elements = this.chapterData.map.elements || Tool.setNumber01(this.chapterData.map.lattices.slice());
@@ -618,16 +568,17 @@ export default class MainScene extends Scene {
         }
         // this.lattices[11].element.effectType=EffectType.MAGICLION;
         // this.lattices[20].element.effectType=EffectType.MAGICLION;
-        var bbb = [];
-        for (var a = 0; a < this.lattices.length; a++) {
-            var lat = this.lattices[a];
-            if (lat && lat.element && lat.element.type <= 4) {
-                bbb.push(lat.element.type + 1);
-            } else {
-                bbb.push(0)
-            }
-        }
-        console.log(bbb);
+        //测试导出元素类型
+        // var bbb = [];
+        // for (var a = 0; a < this.lattices.length; a++) {
+        //     var lat = this.lattices[a];
+        //     if (lat && lat.element && lat.element.type <= 4) {
+        //         bbb.push(lat.element.type + 1);
+        //     } else {
+        //         bbb.push(0)
+        //     }
+        // }
+        // console.log(bbb);
     }
     //重置基础元素及特效类型
     initBaseElement() {
@@ -655,6 +606,28 @@ export default class MainScene extends Scene {
             ele.effectType = arr[0] ? arr[0] - 1 : null;
         }
     }
+    //初始化引导，游戏和道具
+    initGuide() {
+        //游戏引导
+        const gameGuideChapterNum = [1, 5, 6, 7, 8, 9, 10, 19, 24, 81]
+        if (gameGuideChapterNum.indexOf(this.chapter >> 0) > -1) {
+            if (!readCache(getCacheKey() + this.chapter)) {
+                this.gameGuide = new GameGuide(this);
+                this.addChild(this.gameGuide);
+                this.gameGuide.show();
+            }
+        }
+        // 234是道具引导
+        else if (this.chapter == 2 || this.chapter == 3 || this.chapter == 4) {
+            if (!readCache(getCacheKey() + this.chapter + "prop")) {
+                this.enableMouseEvt(false);
+                var pgi = new PropGuideInt(this)
+                this.addChild(pgi);
+                pgi.init(this.chapter >> 0)
+                this.lattices[41].element.effectType = EffectType.EXPLOSIVE
+            }
+        }
+    }
 
     /**
      * 更新三个道具
@@ -667,17 +640,6 @@ export default class MainScene extends Scene {
         }
     }
 
-    // 初始化埋点信息
-    initBuired() {
-        const dpm = Buried.connectDpm(110, 1, 1);
-        const dcm = Buried.connectDcm(202, 0, 0);
-        this.exposure = Buried.createExposure(dpm, dcm);
-
-        //发送曝光埋点
-        NetManager.ins.showLog(this.exposure);
-    }
-
-
     //侦听事件
     initEvents() {
         this.addEventListener(egret.Event.ENTER_FRAME, this.onEnterFrame, this);
@@ -997,7 +959,8 @@ export default class MainScene extends Scene {
             var aarr = [s, o]
             for (var i = 0; i < aarr.length; i++) {
                 var ele = aarr[i];
-                if (ele.type == ElementType.LOLLIPOP && ele.row == this.endRowNum) {
+                //元素是棒棒糖，并且在回收口索引内
+                if (ele.type == ElementType.LOLLIPOP && this.recycleIndexs.indexOf(ele.index) > -1) {
                     this.recoverEle(ele.index);
                     this.lollipopCount--;
                     //通关目标还有棒棒糖，并且，图中不足，下次需要生成
@@ -1048,19 +1011,8 @@ export default class MainScene extends Scene {
     fall(callback: Function) {
         //去重一次
         Tool.removeReapty(this.emptys);
-        //注释里的备用
-        /*var anis = this.fallVertical();
-        anis = anis.concat(this.fallSkew());
-        if (!anis.length) {
-            //如果没有能掉落的就直接回调
-            callback();
-        } else {
-            //有就执行掉落动画
-            this.fallAni(anis, () => {
-                this.fall(callback)
-            })
-        }*/
-        //先判断，是否在生成口中有
+
+        //逻辑需要重新梳理
         if (/*!this.fallVerMark ||*/ Tool.judgeOutOne(this.emptys, this.lattices)) {
             // this.fallVerMark = true;
             var anis = this.fallVerticalEx();
@@ -1169,15 +1121,16 @@ export default class MainScene extends Scene {
 
                 }
             }
-            //找m列的生成口
-            if (this.generateIndexs[m] != undefined) {
-                let lat = this.lattices[this.generateIndexs[m]];
-                let index = this.generateIndexs[m];
+            //找m列的生成口，可能有多个
+            if (this.generateIndexs[m]) {
+                for (var aaa = 0; aaa < this.generateIndexs[m].length; aaa++) {
+                    let index = this.generateIndexs[m][aaa].index;
+                    let lat = this.lattices[index];
                     //如果有格子。无元素，是生成口,要补齐下面能掉落的
                     if (lat && !lat.element && lat.isGenerate) {
                         //找出从生成口一直到能掉落的空格,两个
-                    var downIndex = index;
-                    var type: FallType = FallType.STRIGHT;
+                        let downIndex = index;
+                        let type: FallType = FallType.STRIGHT;
                         let connects: { index: number, type: FallType }[] = []
                         let anisOther: FallAniData[] = []
                         while (this.emptys.indexOf(downIndex) > -1) {
@@ -1198,14 +1151,14 @@ export default class MainScene extends Scene {
                                 type = FallType.STRIGHT
                             }
                         }
-                    // var p = Tool.getPositionByIndex(index);
-                    var len = anis.length;//越前面的越上面，y越小
-                    for (var i = len - 1; i >= len - connects.length; i--) {
+                        let len = anis.length;
+                        for (let i = len - 1; i >= len - connects.length; i--) {
                             anis[i].wait = (len - 1 - i) * Tool.latDeltaTime * 2 / 3;
                         }
                     }
                 }
             }
+        }
         return anis;
     }
 
@@ -1292,62 +1245,6 @@ export default class MainScene extends Scene {
         return anis
     }
 
-    /**
-     * 执行掉落动画
-     * @param anis 数组，0是元素，1是目标位置索引，2是掉落层数
-     * @param emptys 
-     * @param callback 
-     */
-    fallAni(anis: any[], callback: Function, isVertical: boolean = false) {
-        var deltaTime = 100;
-        if (isVertical) {
-            playSound(SoundType.fall);
-            deltaTime = 150
-        }
-        let count = 0;
-        let countAll = anis.length;
-        for (let i = 0; i < anis.length; i++) {
-            let obj: Element = anis[i][0];
-            let index = anis[i][1];
-            let rowCount = anis[i][2] || 1;
-            let position = Tool.getPositionByIndex(index);
-            if (!obj) {
-                obj = this.createELement()
-                //位置信息赋值
-                this.elementContainer.addChild(obj);
-                obj.x = position[0];
-                obj.y = position[1] - Tool.height * rowCount;
-            }
-            //现在得位置的赋值
-            var lat = this.lattices[index];
-            lat.element = obj;
-            obj.fallAni()
-            //执行Tween
-            egret.Tween.get(obj)
-                .to({ x: position[0], y: position[1] }, deltaTime * rowCount/*, egret.Ease.cubicOut*/)
-                .call(() => {
-                    obj.x = position[0];
-                    obj.y = position[1];
-                    //查看每个掉落的obj是否有冰淇淋，并且index是底部的索引,如果是，掉落完后，该格置空，加入emptys，并且需要掉落冰淇淋判断
-                    if (obj.type == ElementType.LOLLIPOP && Tool.indexToRc(index)[0] == this.endRowNum) {
-                        this.recoverEle(index);
-                        this.lollipopCount--;
-                        //通关目标还有棒棒糖，并且，图中不足，下次需要生成
-                        if (this.passElements &&
-                            this.passElements[ElementType.LOLLIPOP] &&
-                            this.lollipopCount < this.passElements[ElementType.LOLLIPOP]) {
-                            this.lollipopMark = true
-                        }
-                    }
-                    count++;
-                    if (count == countAll) {
-                        callback()
-                    }
-                })
-        }
-
-    }
-
     fallAniSuper(anis: FallAniData[], callback: Function, isVertical: boolean = false) {
         let deltaTime = Tool.latDeltaTime;
         //是竖直的。播放声音
@@ -1368,10 +1265,10 @@ export default class MainScene extends Scene {
             let endIndex = indexs[indexs.length - 1].index;
             let tween: egret.Tween;
             if (!ele) {
-                ele = this.createELement();
-                this.elementContainer.addChild(ele);
                 //取出第一个索引
                 let firstIndex = indexs.shift()
+                ele = this.createELement(firstIndex.index);
+                this.elementContainer.addChild(ele);
                 oriRow = Tool.indexToRc(firstIndex.index)[0];
                 let fp = Tool.getPositionByIndex(firstIndex.index);
                 ele.x = fp[0];
@@ -1454,7 +1351,7 @@ export default class MainScene extends Scene {
                 let endP = Tool.getPositionByIndex(endIndex);
                 ele.x = endP[0];
                 ele.y = endP[1];
-                if (ele.type == ElementType.LOLLIPOP && Tool.indexToRc(endIndex)[0] == this.endRowNum) {
+                if (ele.type == ElementType.LOLLIPOP && this.recycleIndexs.indexOf(endIndex) > -1) {
                     this.recoverEle(endIndex);
                     this.lollipopCount--;
                     //通关目标还有棒棒糖，并且，图中不足，下次需要生成
@@ -1477,17 +1374,54 @@ export default class MainScene extends Scene {
      * 创建一个掉落元素，
      * 逻辑包括棒棒糖逻辑
      * 定制掉落元素逻辑
+     * @param index 生成口索引。定制掉落口用，不存在则随机
      */
-    createELement() {
-        var type;
+    createELement(index: number): Element {
+        var type: ElementType;
+        var effectType: EffectType = null;
+        //优先棒棒糖
         if (this.lollipopMark) {
             this.lollipopMark = false;
             type = ElementType.LOLLIPOP;
             this.lollipopCount++;
+        }
+        //生成口定制掉落
+        else {
+            //列数
+            var col = Tool.indexToRc(index)[1];
+            //找出索引是index的数据
+            var data: GenerateLatData = this.generateIndexs[col].filter((d) => {
+                return d.index == index
+            })[0];
+            if (data) {
+                //先去掉cus里的
+                let one = data.cus.shift()
+                if (one) {
+                    var oneData = Tool.praseEleNumber(one);
+                    type = oneData[0] === null ? Tool.randomT(this.chapterData.baseElementTypes) : oneData[0];
+                    effectType = oneData[1];
+                }
+                //否则根据type来定
+                else {
+                    if (data.type == FallEleType.RANELE) {
+                        type = Tool.randomT(this.chapterData.baseElementTypes)
+                    }
+                    else if (data.type == FallEleType.RANEFF) {
+                        type = Tool.randomT(this.chapterData.baseElementTypes);
+                        effectType = Tool.randomT([0, 1, 2, 3])
                     } else {
+                        type = data.type - 2
+                    }
+                }
+            }
+            //随机
+            else {
                 type = Tool.randomT(this.chapterData.baseElementTypes)
             }
-        return Tool.getElement(type);
+        }
+        let ele = Tool.getElement(type);
+        ele.effectType = effectType;
+        return ele;
     }
 
     /**

egret/src/mapScene/MapScene.ts

@@ -24,7 +24,7 @@ import { GDispatcher } from "../../libs/tc/util/GDispatcher";
 import Loading from "../../libs/new_wx/components/Loading";
 
 let doHelpFlag = false;
-let adTag = false;
+// let adTag = false;
 export default class MapScene extends Scene {
     static adData;
     scrollGroup: eui.Group;
@@ -70,28 +70,7 @@ export default class MapScene extends Scene {
 
     async start(data?) {
 
-        PanelCtrl.instance.show('scratch', data);
-        // if(MapScene['svga']) {
-        //     const mv = MapScene['svga']
-        //     mv.gotoAndStop(1);
-        //     let data = {
-        //         svga: mv
-        //     }
-        //     PanelCtrl.instance.show('scratch', data);
-        //     return;
-        // }
-        // Loading.instace.show();
-        // loadSvga(getResPath() + 'resource/assets/svgas/invite.svga').then(async (mv: any) => {
-        //     console.log('svga', mv)
-        //     MapScene['svga'] = mv;
-        //     await wait(200);
-        //     Loading.instace.hide();
-        //     mv.gotoAndStop(1);
-        //     let data = {
-        //         svga: mv
-        //     };
-        //     PanelCtrl.instance.show('invite', data);
-        // })
+        // PanelCtrl.instance.show('scratch');
         super.start();
 
         this.sendInvite();
@@ -118,8 +97,8 @@ export default class MapScene extends Scene {
             const nowTimerStr = date.getTime() + '';
             const oldTimerStr = localStorage.getItem('nowTimerStr' + window['CFG'].consumerId);
 
-            // const nowTimerStr2 = date.getTime() + '';
-            // const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId);
+            const nowTimerStr2 = date.getTime() + '';
+            const oldTimerStr2 = localStorage.getItem('nowTimer2Str' + window['CFG'].consumerId);
 
             const hc_advert = DataManager.ins.getData('hc_advert').data;
             let {noticeAdvert} = hc_advert;
@@ -127,21 +106,22 @@ export default class MapScene extends Scene {
                 noticeAdvert = {enable: false}
             }
 
-            if(noticeAdvert && noticeAdvert.enable) {
-                if(!adTag) {
+            if (noticeAdvert && noticeAdvert.enable &&  nowTimerStr2 != oldTimerStr2) {
+                // if (!adTag) {
                     panels.push('ad');
-                    adTag = true;
-                }
-                // localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
+                    // adTag = true;
+                // }
+                localStorage.setItem('nowTimer2Str' + window['CFG'].consumerId, nowTimerStr2);
             }
 
-            const {signInfoVO} = DataManager.ins.getData('getSignInfo');
-            if(signInfoVO.continueDay < 7) {
-                if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
+            const { signInfoVO } = DataManager.ins.getData('getSignInfo');
+            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(() => {
@@ -281,6 +261,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;
@@ -379,6 +369,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/StartPanel.ts

@@ -13,12 +13,12 @@ import { iswx } from "../iswx";
 import PropType from "../PropType";
 import setGlow from "../setGlow";
 import { showShare } from "../shareCtrl";
-import { Chapters } from "../something/Chapters";
 import { ElementType } from "../something/enum/ElementType";
 import { PassType } from "../something/enum/PassType";
 import TargetItemRenderer from "./TargetItemRenderer";
 import { addRankFriendList } from "../mapScene/RankFriendList";
 import { addAdComp } from "./BoxPanel";
+import { getChapterData } from "../something/chapters/getChapter";
 
 export default class StartPanel extends Panel {
     static currlevel;
@@ -39,28 +39,24 @@ export default class StartPanel extends Panel {
         this['levelTxt'].text = `第${data}关`;
         this._level = data;
         let mapDataIndex = data;
-        if (data >= 56 && data <= 70) {
-            //循环36到50
-            mapDataIndex = data - 20
-        }
         this['targetGroup'].visible = false;
         this['scoreGroup'].visible = false;
-        const levelType = Chapters[mapDataIndex].passTarget.type;
+        const levelType = getChapterData(mapDataIndex).passTarget.type;
         if (levelType == PassType.ELEMENT_TARGET) {
             this['targetGroup'].visible = true;
             // this['targetTxt'].text = '在规定步数内\n消除足够数量目标';
 
             this.list.itemRenderer = TargetItemRenderer;
-            const ac = new eui.ArrayCollection(Chapters[mapDataIndex].passTarget.elements);
+            const ac = new eui.ArrayCollection(getChapterData(mapDataIndex).passTarget.elements);
             this.list.dataProvider = ac;
-            const elements = Chapters[mapDataIndex].passTarget.elements;
+            const elements = getChapterData(mapDataIndex).passTarget.elements;
             if (elements.length == 1 && elements[0].type == ElementType.LOLLIPOP)
                 this['tips'].text = '在指定步数内将目标元素移至最底部';
         }
         else if (levelType == PassType.SCORE_TARGET) {
             this['scoreGroup'].visible = true;
-            this['targetScoreTxt'].text = `${Chapters[mapDataIndex].passTarget.score}`;
-            // this['targetTxt'].text = `在规定步数内\n分数达到${Chapters[mapDataIndex].passTarget.score}分`;
+            this['targetScoreTxt'].text = `${getChapterData(mapDataIndex).passTarget.score}`;
+            // this['targetTxt'].text = `在规定步数内\n分数达到${getChapterData(mapDataIndex).passTarget.score}分`;
         }
 
         const prop2Nums = getPropNums(PropType.BOOM);

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);

egret/src/something/Chapters.ts → egret/src/something/ChaptersOri.ts

@@ -8,9 +8,10 @@ import { ElementType } from "./enum/ElementType";
 // const Vigenere = CipherJS.Vigenere;
 
 // Vigenere.encrypt('MY SECRET MESSAGE', 'MY SECRET KEY')
-
-
-export const Chapters: ChapterData[] = [
+/**
+ * 副本，备用120关数据
+ */
+export const ChaptersOri: any[] = [
     //第0关为空吧,
     null,
     //第一关
@@ -28,20 +29,6 @@ export const Chapters: ChapterData[] = [
                 0, 0, 0, 0, 0, 0, 0, 0, 0,
             ],
             generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
-            paths: [
-                {
-                    indexs: ["0_l_u", "8_r_u", "80_r_d", "72_l_d", "63_l_u", "63_r_u", "54_r_u", "54_l_u"],
-                    holes: [
-                        {
-                            indexs: ["50_l_u", "50_l_d", "50_r_d", "50_r_u"],
-                        },
-                        {
-                            indexs: ["48_l_u", "48_l_d", "48_r_d", "48_r_u"],
-                        }
-                    ]
-                }
-            ],
-            // connectedLats: [[27, 45], [28, 46], [29, 47]]
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0.1,

egret/src/something/Tool.ts

@@ -8,6 +8,7 @@ import { Pool } from "./Pool";
 import { RecoverName } from "./enum/RecoverName";
 import { RectMask } from "./class/RectMask";
 import { FallType } from "./interface/FallAniData";
+import { GenerateLatData } from "./interface/GenerateLatData";
 
 export class Tool {
     /**
@@ -19,15 +20,15 @@ export class Tool {
     /**
      * 格子宽度
      */
-    public static width = 81.5;
+    public static width = 80// 81.5;
     /**
      * 格子高度
      */
-    public static height = 81.5;
+    public static height = 80// 81.5;
     //整体偏移X
-    public static offsetX = 8.25;
+    public static offsetX = 15// 8.25;
     //整体偏移Y
-    public static offsetY = 260;
+    public static offsetY = 275 //260;
     /**
      * 圆角半径
      */
@@ -58,7 +59,7 @@ export class Tool {
      * 初始化数据
      */
     public static init(isTwo: boolean = false) {
-        this.offsetX = isTwo ? 49 : 8.25
+        this.offsetX = isTwo ? 55 : 15// 49 : 8.25
         //都是9*9
         //位置信息
         var spaceX = this.width,
@@ -685,25 +686,39 @@ export class Tool {
 
     /**
      * 根据关卡的地图数据generateLats
-     * 设置每列最上面的格子为生成口，
+     * 
      * @param lattices
-     * @param generateLats [0,1,1,1,1,1,1,1,0]
-     */
-    public static setGenerateLats(lattices: Lattice[], generateLats: number[]) {
-        var indexs = []
-        for (var m = 0; m < Tool.colNum; m++) {
-            //找每列第一个元素
-            for (var g = 0; g < Tool.rowNum; g++) {
-                var index = Tool.colNum * g + m;
-                //如果格子存在，并且该列g的数据为1；
-                if (lattices[index] && generateLats[m]) {
+     * @param generateLats 
+     * @return 数组，索引就是列数，每个元素是该列的生成口数据
+     */
+    public static setGenerateLats(lattices: Lattice[], generateLats: GenerateLatData[]): GenerateLatData[][] {
+        var arr: GenerateLatData[][] = [];
+        for (var i = 0; i < generateLats.length; i++) {
+            var generateLat: GenerateLatData = generateLats[i];
+            var index = generateLat.index;
+            if(!lattices[index])continue
             lattices[index].isGenerate = true;
-                    indexs[m] = index;
-                    break
-                }
-            }
+            var rc = this.indexToRc(index);
+            //确实属于哪一列
+            var col = rc[1];
+            if (!arr[col]) arr[col] = [];
+            arr[col].push(generateLat);
         }
-        return indexs
+        return arr
+        // var indexs = [];
+        // for (var m = 0; m < Tool.colNum; m++) {
+        //     //找每列第一个元素
+        //     for (var g = 0; g < Tool.rowNum; g++) {
+        //         var index = Tool.colNum * g + m;
+        //         //如果格子存在，并且该列g的数据为1；
+        //         if (lattices[index] && generateLats[m]) {
+        //             lattices[index].isGenerate = true;
+        //             indexs[m] = index;
+        //             break
+        //         }
+        //     }
+        // }
+        // return indexs
     }
     /**
      * 将9*9都转化成01格子
@@ -821,6 +836,23 @@ export class Tool {
         }
         return false;
     }
+    /**
+     * 十位是基础元素类型，对应数字减1就是基础元素类型
+     * 个位是特效类型（0表示无特效），对应数字减1就是特效类型
+     * @param num 
+     * @return [] 0下标是元素类型，1下标是特效类型
+     */
+    public static praseEleNumber(num) {
+        //解析num;
+        var arr: number[] = this.returnTO(num);
+        //基础类型，没有就是null，有就-1，对ElementType对应
+        var baseType = arr[1] ? arr[1] - 1 : null;
+        //不是基础类型
+        if (baseType > 4) baseType = null;
+        //特效类型
+        var effectType = arr[0] ? arr[0] - 1 : null;
+        return [baseType, effectType];
+    }
 
     /**
      * 从数组移除一个元素
@@ -879,7 +911,7 @@ export class Tool {
     }
 
     /**
-     * 返回个十百等，0是个位
+     * 返回个十百等，0是个位 ,1是十位，依次
      * 78[ 8, 7]
      * 789[ 9, 8, 7]
      * @param num 整数

egret/src/something/chapters/Chapter1.ts

+import { ChapterData } from "../interface/ChapterData";
+import { PassType } from "../enum/PassType";
+import { ElementType } from "../enum/ElementType";
+
+/**
+ * 1到20关数据
+ */
+export const Chapters1: ChapterData[] = [
+    //第0关为空吧,
+    null,
+    //1
+    {
+        baseElementTypes: [0, 1, 2, 3],
+        effectInitProbability: 0,
+        stepCount: 25,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.CHICKEN,
+                    count: 45,
+                },
+            ],
+        },
+        starScores: [4000, 8000, 12000],
+        map: {
+            lattices: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 1, 0, 0, 0, 1, 0, 0,
+                0, 1, 1, 1, 0, 1, 1, 1, 0,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 0, 0, 1, 1, 1, 0, 0, 0,
+                0, 0, 0, 0, 1, 0, 0, 0, 0,
+            ],
+            generateLats: [
+                { index: 11, type: 0, cus: [] },
+                { index: 15, type: 0, cus: [] },
+            ],
+            // connectedLats: [[0, 18], [1, 19], [2, 20]],
+            elements: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 1, 0, 0, 0, 1, 0, 0,
+                0, 1, 1, 1, 0, 1, 1, 1, 0,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 0, 0, 1, 1, 1, 0, 0, 0,
+                0, 0, 0, 0, 1, 0, 0, 0, 0,
+            ],
+            baseElements: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 20, 0, 0, 0, 20, 0, 0,
+                0, 20, 10, 20, 0, 20, 10, 20, 0,
+                20, 10, 20, 10, 20, 10, 20, 10, 20,
+                20, 10, 20, 20, 10, 20, 20, 10, 20,
+                0, 20, 10, 20, 10, 20, 10, 20, 0,
+                0, 0, 20, 10, 20, 10, 20, 0, 0,
+                0, 0, 0, 20, 10, 20, 0, 0, 0,
+                0, 0, 0, 0, 20, 0, 0, 0, 0,
+            ],
+            // recycles: [70, 71, 72, 73]
+        },
+    },
+    //2
+    {
+        baseElementTypes: [0, 1, 2, 3],
+        effectInitProbability: 0,
+        stepCount: 6,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 26,
+                },
+            ],
+        },
+        starScores: [4000, 8000, 12000],
+        map: {
+            lattices: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 1, 1, 0, 0, 0, 1, 1, 0,
+                2, 2, 2, 2, 0, 2, 2, 2, 2,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 2, 2, 0, 0, 0, 1, 1, 0,
+                1, 2, 2, 1, 0, 1, 2, 2, 1,
+                0, 2, 2, 0, 0, 0, 2, 2, 0,
+                2, 2, 2, 2, 0, 2, 2, 2, 2,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+            generateLats: [
+                // { index: 11, type: 0, cus: [] },
+                // { index: 15, type: 0, cus: [] },
+            ],
+            // connectedLats: [[0, 18], [1, 19], [2, 20]],
+            elements: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 1, 1, 0, 0, 0, 1, 1, 0,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 1, 1, 0, 0, 0, 1, 1, 0,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                0, 1, 1, 0, 0, 0, 1, 1, 0,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+            baseElements: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 10, 10, 0, 0, 0, 10, 20, 0,
+                20, 20, 10, 20, 0, 10, 20, 10, 20,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 40, 30, 0, 0, 0, 10, 30, 0,
+                10, 30, 40, 20, 0, 20, 30, 40, 10,
+                0, 40, 30, 0, 0, 0, 40, 30, 0,
+                20, 20, 10, 10, 0, 20, 40, 20, 10,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+            // recycles: [70, 71, 72, 73]
+        },
+    },
+]
\ No newline at end of file

egret/src/something/chapters/Chapter2.ts

+import { ChapterData } from "../interface/ChapterData";
+import { PassType } from "../enum/PassType";
+import { ElementType } from "../enum/ElementType";
+
+/**
+ * 21到40关数据
+ */
+export const Chapters2: ChapterData[] = [
+    //21
+    {
+        map: {
+            lattices: [
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+            // generateLats: ,
+            connectedLats: [],
+            elements: [
+
+            ]
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.1,
+        stepCount: 30,
+        passTarget: {
+            type: PassType.SCORE_TARGET,
+            score: 6000,
+        },
+        starScores: [2000, 4000, 6000]
+    },
+]
\ No newline at end of file

egret/src/something/chapters/getChapter.ts

+import { Chapters1 } from "./Chapter1";
+import { Chapters2 } from "./Chapter2";
+import { ChapterData } from "../interface/ChapterData";
+
+//所有的关卡
+const chapters: ChapterData[] = [].concat(
+    Chapters1,
+    // Chapters2,
+)
+/**
+ * 获取关卡数据，返回关卡数据
+ * 以后每添加20关，添加一个文件，上面concat一个文件
+ * @param index 关数 从1开始
+ */
+export function getChapterData(index: number) {
+    //没有数据就返回第一关数据
+    return chapters[index] || chapters[1];
+}
\ No newline at end of file

egret/src/something/enum/FallELeType.ts

+/**
+ * 掉落元素类型
+ */
+export enum FallEleType {
+    RANELE = 0,//随机元素无特效
+    RANEFF,//随机元素加随机特效
+    RABBIT,//兔子  下面的顺序和ElementType前5保持一致，不要随便修改
+    CHICKEN,//鸡
+    CATTLE,//牛
+    LION,//狮子
+    PIG,//猪
+}
\ No newline at end of file

egret/src/something/interface/GenerateLatData.ts

+import { FallEleType } from "../enum/FallELeType";
+
+
+/**
+ * 格子生成口数据格式
+ */
+export interface GenerateLatData{
+    /**
+     * 生成口的索引
+     */
+    index: number;
+    /**
+     * 掉落元素类型
+     */
+    type:FallEleType
+    /**
+     * 自定义掉落元素
+     * 十位是基础元素类型，对应数字减1就是基础元素类型
+     * 个位是特效类型（0表示无特效），对应数字减1就是特效类型
+     * 10
+     * 11
+     * 12
+     * 13
+     * 14
+     */
+    cus: number[];
+}
\ No newline at end of file

egret/src/something/interface/MapData.ts

-import { PathData } from "./PathData";
+import { GenerateLatData } from "./GenerateLatData";
 
 /**
  * 地图数据接口
@@ -17,11 +17,9 @@ export interface MapData {
     lattices: number[];
     /**
      * 能生成元素的格子索引
-     * 代表每列的第一个格子是否是生成口
-     * 长度9，
-     * 例子[0,0,0,1,1,1,0,0,0];
+     * 
      */
-    generateLats: number[];
+    generateLats?: GenerateLatData[];
     /**
      * 一维格子数组，步长9,
      * 9*9
@@ -34,7 +32,7 @@ export interface MapData {
      * 5果冻
      * 6鸡蛋
      */
-    elements?:number[];
+    elements?: number[];
     /**
      * 9*9的格子
      * 十位是基础元素类型，对应数字减1就是基础元素类型
@@ -45,12 +43,7 @@ export interface MapData {
      * 13
      * 14
      */
-    baseElements?:number[];
-    /**
-     * 路径的索引
-     * 暂时不需要了
-     */
-    paths?:PathData[]
+    baseElements?: number[];
     /**
      * 再考虑
      * 元素为两个索引的数组[8,9]，第一个元素为up，第二个元素为down
@@ -58,4 +51,9 @@ export interface MapData {
      */
     connectedLats?: any[];
 
+    /**
+     * 棒棒糖回收口
+     * 
+     */
+    recycles?: number[];
 }
\ No newline at end of file

egret/src/something/uis/PropGuide.ts

 import PropType from "../../PropType";
+import { Tool } from "../Tool";
 
 /**
  * 道具使用引导，初始化一次，然后用init初始化
@@ -86,11 +87,11 @@ export class PropGuide extends egret.DisplayObjectContainer {
         this.bg.graphics.lineTo(750, 1624);
         this.bg.graphics.lineTo(0, 1624);
         this.bg.graphics.lineTo(0, 0);
-        this.bg.graphics.moveTo(15, 275);
-        this.bg.graphics.lineTo(15, 990);
-        this.bg.graphics.lineTo(750 - 15, 990);
-        this.bg.graphics.lineTo(750 - 15, 275);
-        this.bg.graphics.lineTo(15, 275);
+        this.bg.graphics.moveTo(Tool.offsetX, Tool.offsetY);
+        this.bg.graphics.lineTo(Tool.offsetX, Tool.offsetY + Tool.height * Tool.rowNum);
+        this.bg.graphics.lineTo(750 - Tool.offsetX, Tool.offsetY + Tool.height * Tool.rowNum);
+        this.bg.graphics.lineTo(750 - Tool.offsetX, Tool.offsetY);
+        this.bg.graphics.lineTo(Tool.offsetX, Tool.offsetY);
         this.bg.graphics.endFill();
     }
 }
\ No newline at end of file

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/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