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

.idea/.gitignore

+# Default ignored files
+/workspace.xml
\ No newline at end of file

.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/xiaoxiaole.iml" filepath="$PROJECT_DIR$/.idea/xiaoxiaole.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

.idea/xiaoxiaole.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

egret/.wing/exml.json

@@ -201,5 +201,21 @@
         "value": "http://yun.duiba.com.cn/db_games/0927/33256.png"
       }
     ]
+  },
+  "16db3bd8eb8": {
+    "bindingDataTestObj": [
+      {
+        "key": "data.img",
+        "value": "http://yun.duiba.com.cn/db_games/fishlogo.png"
+      }
+    ]
+  },
+  "16db4bf413f": {
+    "bindingDataTestObj": [
+      {
+        "key": "data.img",
+        "value": "http://yun.duiba.com.cn/db_games/fishlogo.png"
+      }
+    ]
   }
 }
\ No newline at end of file

egret/index.html

@@ -47,6 +47,59 @@
     <script src="libs/aes.js"></script>
     <script src="libs/pad-zeropadding.js"></script>
     <img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
+    <script>
+        window['isInvitePage']=0;
+        var targetUrl='https://gameact.suning.com/sngame-web/api/duiba/private/v1/getLoginUrl.do?appCode=duiba&activityCode=3651404';
+        /*
+         * 邀请有礼分享
+         */
+        function inviteShare(shareCode) {
+            let title = "";
+            let content = "";
+            let targetUrl = "" + "?shareCode=" + shareCode; // 待修改
+            let iconUrl = "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg";
+            let shareWays = "1,2";
+            console.log("AppReady");
+            if (isIphone()) {
+                console.log("IOS");
+                console.log(window.SNNativeClient);
+                window.callNativeShareResult = function () { };
+                window.SNNativeClient.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+            } else {
+                console.log("安卓");
+                console.log(shareApi);
+                console.log(shareApi.callMediaShare);
+                shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+            }
+        }
+        function share() {
+            let title = "";
+            let content = "";
+            let targetUrl = "";
+            let iconUrl = "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg";
+            let shareWays = "";
+            console.log("AppReady");
+            if (isIphone()) {
+                console.log("IOS");
+                console.log(window.SNNativeClient);
+                window.callNativeShareResult = function () { };
+                window.SNNativeClient.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+            } else {
+                console.log("安卓");
+                console.log(shareApi);
+                console.log(shareApi.callMediaShare);
+                shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+            }
+        }
+        function isIphone() {
+            var ua = navigator.userAgent.toLocaleLowerCase();
+            if (ua.match(/iphone|ipad/)) {
+                return true;
+            } else if (ua.match(/android/)) {
+                return false;
+            }
+        }
+    </script>
     <script>
        window['signconfigs'] =   [
             { nums: '0.15元', type: 'quan15' },
@@ -58,8 +111,8 @@
             { nums: '随机奖励', type: 'random' }
     ];
         // localStorage.clear();
-        window['total_level'] = 18 + 13 * 5;
-window['last_level'] = 80;//必须大于等于total_level
+        window['total_level'] = 18 + 13 * 7;
+window['last_level'] = 100;//必须大于等于total_level
 
 
         // localStorage.clear();

egret/libs/new_wx/MainBase.ts

@@ -45,6 +45,13 @@ import TaskPanel from "../../src/panels/TaskPanel";
 import TaskPrizePanel from "../../src/panels/TaskPrizePanel";
 import BackPanel from "../../src/panels/BackPanel";
 import InvitePanel from "../../src/panels/InvitePanel";
+import FriendPanel from "../../src/panels/FriendPanel";
+import InviteRulePanel from "../../src/panels/InviteRulePanel";
+import InvitePrizePanel from "../../src/panels/InvitePrizePanel";
+import BagPanel from "../../src/panels/BagPanel";
+import H5Scene from "../../src/H5Scene";
+import InviteCutTimePanel from "../../src/panels/InviteCutTimePanel";
+import RulePanel2 from "./components/RulePanel2";
 
 export default class MainBase extends eui.UILayer {
     constructor() {
@@ -60,8 +67,10 @@ export default class MainBase extends eui.UILayer {
             [ModuleTypes.ALERT_PANEL, { cls: Alert }],
 
             [ModuleTypes.RULE_PANEL, { cls: RulePanel }],
+            ['inviterule', { cls: RulePanel2 }],
             [ModuleTypes.PRIZE_PANEL, { cls: PrizePanel }],
             [ModuleTypes.NO_PRIZE_PANEL, { cls: NoPrizePanel }],
+            ['bag', { cls: BagPanel }],
             ['bloodPanel', { cls: BloodPanel }],
             ['blood2Panel', { cls: BloodPanel2 }],
             ['GoldPanel', { cls: GoldPanel }],
@@ -82,10 +91,15 @@ export default class MainBase extends eui.UILayer {
             ['taskPrize', { cls: TaskPrizePanel }],
             ['back', { cls: BackPanel }],
             ['invite', { cls: InvitePanel }],
+            ['invitePrize', { cls: InvitePrizePanel }],
+            ['inviteCutTime', { cls: InviteCutTimePanel }],
+            ['inviteRule', { cls: InviteRulePanel }],
+            ['friend', { cls: FriendPanel }],
             ['ad', { cls: ADPanel }],
         ];
 
         const scenes = [
+            [ModuleTypes.INVITE_SCENE, { cls: H5Scene }],
             [ModuleTypes.START_SCENE, { cls: StartScene }],
             [ModuleTypes.MAP_SCENE, { cls: MapScene }],
             [ModuleTypes.PLAY_SCENE, { cls: PlayScene }],
@@ -163,9 +177,8 @@ export default class MainBase extends eui.UILayer {
             }
             for (var i = 0; i < 5; i++) {
                 RES.getResAsync("ele" + i + "_png")
-                for (var j = 0; j < 3; j++) {
-                    RES.getResAsync("ele" + i + j + "_png")
-                }
+                RES.getResAsync("ele" + i + "Line" + "_png")
+                RES.getResAsync("ele" + i + "Exp" + "_png")
             }
             for (var i = 1; i <= 27; i++) {
                 RES.getResAsync("bonusFra" + i + "_png")
@@ -173,10 +186,10 @@ export default class MainBase extends eui.UILayer {
             for (var i = 1; i <= 19; i++) {
                 RES.getResAsync("eleDis" + i + "_png")
             }
-            for (var i = 1; i <= 6; i++) {
+            for (var i = 2; i <= 6; i++) {
                 RES.getResAsync("ice" + i + "_png")
             }
-            for (var i = 1; i <= 6; i++) {
+            for (var i = 2; i <= 6; i++) {
                 RES.getResAsync("rock" + i + "_png")
             }
             for (var i = 0; i <= 9; i++) {
@@ -191,9 +204,9 @@ export default class MainBase extends eui.UILayer {
             for (var i = 0; i <= 9; i++) {
                 RES.getResAsync("propNum" + i + "_png")
             }
-            for (var i = 1; i <= 5; i++) {
-                RES.getResAsync("guideTxt" + i + "_png")
-            }
+            // for (var i = 1; i <= 5; i++) {
+            //     RES.getResAsync("guideTxt" + i + "_png")
+            // }
             for (var i = 1; i <= 11; i++) {
                 RES.getResAsync("stepAni" + i + "_png")
             }
@@ -203,7 +216,18 @@ export default class MainBase extends eui.UILayer {
                     RES.getResAsync("exLighting" + i + "_png")
                 }
             }
+            for (var i = 0; i <= 2; i++) {
+                RES.getResAsync("eggStatus" + i + "_png")
+            }
+            for (var i = 1; i <= 5; i++) {
+                RES.getResAsync("eggPiece" + i + "_png")
+            }
             var arr = [
+                "yellowCircleDown",
+                "yellowCircleUp",
+                "greenCircleDown",
+                "greenCircleUp",
+                "jellyArrow",
                 "lockVine",
                 "guidePropHand",
                 "guidePropCow",
@@ -225,12 +249,14 @@ export default class MainBase extends eui.UILayer {
                 "hammerBtn",
                 "stepBtn",
                 "propNumBg",
-                "guideBg",
-                "guideKnowBtn",
+                // "guideBg",
+                // "guideKnowBtn",
                 "bonusShoot",
                 "ele5",
                 "ele6",
                 "ele7",
+                "ele8",
+                "ele9",
                 "leftArrow",
                 "chooseRect",
                 "lightedStar",
@@ -251,8 +277,13 @@ export default class MainBase extends eui.UILayer {
             }
 
         }
-
-        this.createGameScene();
+        if (window['isInvitePage'] == 1) {
+            this.ajaxElement().then(() => {
+                SceneCtrl.instance.change(ModuleTypes.INVITE_SCENE);
+            })
+        }
+        else
+            this.createGameScene();
     }
     private svgaList = [];
     private async loadResource() {
@@ -283,31 +314,49 @@ export default class MainBase extends eui.UILayer {
         })
     }
 
-    protected createGameScene() {
-        let count = 2;
-        const check = () => {
-            if (count <= 0) {
-                Buried.init();
+    getAd() {
+        return new Promise((r) => {
+            NetManager.ins.hc_advert(() => {
+                r();
+            })
+        });
+    }
 
-                SceneCtrl.instance.change(ModuleTypes.START_SCENE, this.svgaList);
+    ajaxElement() {
+        return new Promise((r) => {
+            NetManager.ins.ajaxElement(async () => {
+                r();
+            });
+        });
+    }
 
-                NetManager.ins.getShareInfo(() => {
-                    const result = DataManager.ins.getData('getShareInfo');
-                    window['registerWX'](result);
-                });
-                updateMainTimer();
-            }
-        }
+    hcHome() {
+        return new Promise((r) => {
+            NetManager.ins.hc_home(() => {
+                r()
+            }, window['collectRuleId']);
+        });
+    }
+
+    protected async createGameScene() {
+        await Promise.all([
+            this.getAd(),
+            this.ajaxElement(),
+            this.hcHome(),
+        ]);
+
+        MapScene.adData = DataManager.ins.getData('hc_advert');
 
-        NetManager.ins.hc_home(() => {
-            count--;
-            check();
-        }, window['collectRuleId']);
+        Buried.init();
+        ///////////
+        SceneCtrl.instance.change(ModuleTypes.START_SCENE, this.svgaList);
 
-        NetManager.ins.ajaxElement(async () => {
-            count--;
-            check();
+        NetManager.ins.getShareInfo(() => {
+            const result = DataManager.ins.getData('getShareInfo');
+            window['registerWX'](result);
         });
+        updateMainTimer();
+
 
         initstatistics();
         document.addEventListener("visibilitychange", () => {

egret/libs/new_wx/components/ComponentBase.ts

@@ -32,5 +32,4 @@ export default class ComponentBase extends eui.Component {
     destroy() {
         this.removeEvents();
     }
-
 }
\ No newline at end of file

egret/libs/new_wx/components/RulePanel2.ts

+import { DataManager } from "../../tw/manager/DataManager";
+import { HtmlTextParser } from "../HtmlTextParser";
+import Panel from "./Panel";
+
+export default class RulePanel2 extends Panel {
+    public labContent: eui.Label;
+    public scroller: eui.Scroller;
+    start() {
+        super.start();
+
+        this.addRule();
+    }
+
+    group: eui.Group;
+    private addRule() {
+        const text ='<br>'+ DataManager.ins.ajaxElementData.rule;
+        this.labContent.textFlow = (new HtmlTextParser).parser(text);
+    }
+
+    get skinKey() { return 'InviteRule' }
+}
\ No newline at end of file

egret/libs/new_wx/types/sceneTypes.ts

 export enum ModuleTypes {
+    INVITE_SCENE,
     START_SCENE,
     MAP_SCENE,
     PLAY_SCENE,

egret/libs/tw/enum/NetName.ts

@@ -71,5 +71,12 @@ export enum NetName {
     SIGN_DO_SIGN,
 
     //查询奖品记录
-    GET_RECORD
+    GET_RECORD,
+
+    // 邀请有礼
+    GET_SHARECODE,
+    DO_HELP,
+    GET_INVATE_INFO,
+    ACCEPT_INVITATION
+
 }
\ No newline at end of file

egret/libs/tw/manager/NetManager.ts

@@ -10,22 +10,24 @@ import { IExposureData } from '../data/common/IExposureData';
 import { GDispatcher } from '../../tc/util/GDispatcher';
 import onNotSuccess from '../../new_wx/onNotSuccess';
 import { showToast } from '../../new_wx/ctrls/toastCtrl';
+
 // import { IExposureData } from '..';
 
 export class NetManager extends ABNetManager {
     private static instance: NetManager;
 
     public static get ins(): NetManager {
-        if (!this.instance) {
+        if(!this.instance) {
             this.instance = new NetManager();
         }
         return this.instance;
     }
 
     private isInit: boolean;
+
     constructor() {
         super();
-        if (this.isInit) {
+        if(this.isInit) {
             throw Error(TwLang.lang_001);
         }
         this.isInit = true;
@@ -96,7 +98,7 @@ export class NetManager extends ABNetManager {
      */
     public addTimesForActivity(callback: Function, type: number, count: number, validType: number): void {
         let activityId: number;
-        if (type == 1) {
+        if(type == 1) {
             activityId = DataManager.ins.gameCfgData.gameInfo.oaId;
         } else {
             activityId = DataManager.ins.customCfgData.oaId;
@@ -106,7 +108,7 @@ export class NetManager extends ABNetManager {
             addCount: count,
             activityId: activityId
         };
-        if (validType) {
+        if(validType) {
             param.validType = validType;
         }
 
@@ -147,15 +149,15 @@ export class NetManager extends ABNetManager {
     public openCollectGoodsPrize(callback: Function, collectRuleId: number, type?: number): void {
         let actId: number;
         let param: any;
-        if (type == 1) {
+        if(type == 1) {
             actId = DataManager.ins.gameCfgData.gameInfo.oaId;
-        } else if (type == 2) {
+        } else if(type == 2) {
             actId = DataManager.ins.customCfgData.oaId;
         }
-        if (type) {
-            param = { collectRuleId: collectRuleId, actId: actId }
+        if(type) {
+            param = {collectRuleId: collectRuleId, actId: actId}
         } else {
-            param = { collectRuleId: collectRuleId };
+            param = {collectRuleId: collectRuleId};
         }
         const net: INetData = {
             name: NetName.OPEN_COLLECT,
@@ -207,7 +209,7 @@ export class NetManager extends ABNetManager {
 
     /**
      *  购买鱼钩鱼线道具
-     * @param callback 
+     * @param callback
      * @param operatingActivityId 活动oaid
      * @param type 道具类型 0：鱼线 1：鱼钩
      */
@@ -228,7 +230,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 获取鱼钩鱼线数量
-     * @param callback 
+     * @param callback
      */
     public summerGetToyInfo(operatingActivityId, callback: Function): void {
         const net: INetData = {
@@ -236,14 +238,13 @@ export class NetManager extends ABNetManager {
             uri: '/summer/getToyInfo',
             type: 'get',
             dataType: 'json',
-            param: { operatingActivityId: operatingActivityId },
+            param: {operatingActivityId: operatingActivityId},
             callback: callback
         };
         this.send(net);
     }
 
 
-
     /**
      * 开始游戏
      * @param {string} isAgain 是否是再来一次
@@ -253,7 +254,7 @@ export class NetManager extends ABNetManager {
     public doStart(callback: Function, isAgain: boolean, credits?: number, customizedType?: number): void {
 
         let addUrl = '';
-        if (isAgain) {
+        if(isAgain) {
             addUrl += '?dpm=' + DataManager.ins.gameGetSubmitResultData.againExposure.dpm;
         }
 
@@ -262,11 +263,11 @@ export class NetManager extends ABNetManager {
             oaId: DataManager.ins.gameCfgData.gameInfo.oaId
         };
 
-        if (credits) {
+        if(credits) {
             param.credits = credits;
         }
 
-        if (customizedType) {
+        if(customizedType) {
             param.customizedType = customizedType;
         }
 
@@ -293,7 +294,7 @@ export class NetManager extends ABNetManager {
         const param: any = {
             ticketId: ticketId
         };
-        if (customizedType) {
+        if(customizedType) {
             param.customizedType = customizedType
         }
 
@@ -327,6 +328,7 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
+
     /**
      * 复活
      */
@@ -345,6 +347,7 @@ export class NetManager extends ABNetManager {
         };
         this.getToken(net);
     }
+
     /**
      * 获得复活卡数量
      */
@@ -363,6 +366,7 @@ export class NetManager extends ABNetManager {
 
         this.getToken(net);
     }
+
     /**
      * 猜扑克
      * @param {number} pluginId 插件ID
@@ -389,7 +393,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 游戏阶段性数据提交
-     * @param ticketId 
+     * @param ticketId
      * @param dynamicData 阶段性交互数据
      */
     public datapash(callback: Function, ticketId: number, dynamicData: string): void {
@@ -417,7 +421,7 @@ export class NetManager extends ABNetManager {
             sgin: sign,
             dynamicData: JSON.stringify(dynamicData)
         };
-        if (rankId) {
+        if(rankId) {
             param.rankId = rankId;
         }
         const net: INetData = {
@@ -437,18 +441,23 @@ export class NetManager extends ABNetManager {
         kk = kk.substring(0, 16);
         //补0；
         var len = kk.length;
-        while (len < 16) {
+        while(len < 16) {
             kk = kk + "0";
             len++;
         }
         var CryptoJS = window["CryptoJS"];
         var key = CryptoJS.enc.Utf8.parse(kk);
         var iv = CryptoJS.enc.Utf8.parse(kk);
-        return CryptoJS.AES.encrypt(data, key, { iv: iv, mode: CryptoJS.mode.CBC, padding: CryptoJS.pad.ZeroPadding }).toString();
+        return CryptoJS.AES.encrypt(data, key, {
+            iv: iv,
+            mode: CryptoJS.mode.CBC,
+            padding: CryptoJS.pad.ZeroPadding
+        }).toString();
     }
+
     /**
-     * 
-     * @param callback 
+     *
+     * @param callback
      * @param orderId 订单id，来自doJoin,,DataManager.ins.getData("hc_doJoin").data
      * @param score 关卡
      * @param gameData json带分数和通关元素
@@ -489,6 +498,7 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
+
     hc_openTreasureBox(callback: Function): void {
         const net: INetData = {
             name: 'hc_openTreasureBox',
@@ -507,11 +517,11 @@ export class NetManager extends ABNetManager {
     }
 
     /**
-     * 
-     * @param callback 
+     *
+     * @param callback
      * @param orderId DataManager.ins.getData("doJoin").data,或hc_doJoin
-     * @param pollingCheck 
-     * @param pollingCount 
+     * @param pollingCheck
+     * @param pollingCount
      */
     getOrderStatus(callback: Function, orderId: number, pollingCheck?: Function, pollingCount = 10): void {
         const param: any = {
@@ -543,13 +553,13 @@ export class NetManager extends ABNetManager {
      * @param {number} customizedType
      */
     public gameSubmit(callback: Function,
-        ticketId: number,
-        score: number,
-        gameData: any,
-        submitToken: string,
-        dynamicData: string,
-        checkScore?: boolean,
-        customizedType?: number): void {
+                      ticketId: number,
+                      score: number,
+                      gameData: any,
+                      submitToken: string,
+                      dynamicData: string,
+                      checkScore?: boolean,
+                      customizedType?: number): void {
         const sign = this.createSgin(ticketId, score, gameData, submitToken);
         const param: any = {
             ticketId: ticketId,
@@ -558,10 +568,10 @@ export class NetManager extends ABNetManager {
             sgin: sign,
             dynamicData: dynamicData
         };
-        if (checkScore) {
+        if(checkScore) {
             param.checkScore = checkScore;
         }
-        if (customizedType) {
+        if(customizedType) {
             param.customizedType = customizedType;
         }
 
@@ -590,7 +600,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 游戏结束获取奖品数据
-     * @param {number} orderId 订单ID 
+     * @param {number} orderId 订单ID
      * @param {Function} pollingCheck 轮询条件 返回true继续轮询
      * @param {number} 最大轮询次数
      */
@@ -731,7 +741,7 @@ export class NetManager extends ABNetManager {
     public getPlugOrderStatus(callback: Function, orderId: number, pollingCheck: Function, pollingCount = 10, prizeLevel?: number): void {
         const net: INetData = {
             name: 'getPlugOrderStatus',
-            uri:window['duiba'] +  '/plugin/getOrderStatus',
+            uri: window['duiba'] + '/plugin/getOrderStatus',
             type: 'get',
             dataType: 'json',
             param: {
@@ -740,7 +750,7 @@ export class NetManager extends ABNetManager {
             callback: callback,
             pollingCheck: pollingCheck,
             pollingCount: pollingCount,
-            hideMsg:true
+            hideMsg: true
         };
         this.send(net);
     }
@@ -818,10 +828,11 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
-    public getShareInfo(callback: Function, ): void {
+
+    public getShareInfo(callback: Function,): void {
         const net: INetData = {
             name: 'getShareInfo',
-            uri:window['duiba'] +  '/wechatShare/getShareInfo/v2',
+            uri: window['duiba'] + '/wechatShare/getShareInfo/v2',
             type: 'get',
             hideMsg: true,
             dataType: 'json',
@@ -833,6 +844,7 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
+
     public imgUrl(callback: Function, img64: string): void {
         const net: INetData = {
             name: 'imgURL',
@@ -862,6 +874,7 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
+
     public hc_getLevelInfo(callback: Function, getLevelInfo: number): void {
         const net: INetData = {
             name: 'hc_getLevelInfo',
@@ -877,12 +890,13 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
+
     public hc_exchange(callback: Function, propType?: number): void {
         const d: any = {
             activityId: DataManager.ins.customCfgData.actId
 
         };
-        if (propType) {
+        if(propType) {
             d.propType = propType;
         }
         const net: INetData = {
@@ -895,6 +909,7 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
+
     public hc_askForEnergy(callback: Function): void {
         const net: INetData = {
             name: 'hc_askForEnergy',
@@ -908,10 +923,11 @@ export class NetManager extends ABNetManager {
         };
         this.send(net);
     }
+
     public hc_useProp(callback: Function, propType: number): void {
         const net: INetData = {
             name: 'hc_useProp',
-            uri:window['duiba'] +  '/customActivity/happyclear/useProp',
+            uri: window['duiba'] + '/customActivity/happyclear/useProp',
             type: 'post',
             dataType: 'json',
             param: {
@@ -925,9 +941,9 @@ export class NetManager extends ABNetManager {
 
     public getMusicCategory(callback: Function, categoryID?: number, categoryCode?, liteVersion?): void {
         const data: any = {};
-        if (categoryID) data.categoryID = categoryID;
-        if (categoryCode) data.categoryCode = categoryCode;
-        if (liteVersion) data.liteVersion = liteVersion;
+        if(categoryID) data.categoryID = categoryID;
+        if(categoryCode) data.categoryCode = categoryCode;
+        if(liteVersion) data.liteVersion = liteVersion;
         const net: INetData = {
             name: 'getMusicCategory',
             uri: '/aaw/music/category',
@@ -962,8 +978,8 @@ export class NetManager extends ABNetManager {
 
     public getMusicItem(callback: Function, songListId, itemId): void {
         const data: any = {};
-        if (itemId) data.itemId = itemId;
-        if (songListId) data.songListId = songListId;
+        if(itemId) data.itemId = itemId;
+        if(songListId) data.songListId = songListId;
         const net: INetData = {
             name: 'getMusicItem',
             uri: '/aaw/music/item',
@@ -1018,10 +1034,10 @@ export class NetManager extends ABNetManager {
             activityType: 'hdtool',
             consumerId: window['CFG'].consumerId
         };
-        if (credits) {
+        if(credits) {
             param.credits = credits;
         }
-        if (collectRuleId) {
+        if(collectRuleId) {
             param.collectRuleId = collectRuleId;
         }
         const net: INetData = {
@@ -1217,8 +1233,8 @@ export class NetManager extends ABNetManager {
 
     /**
      * 获取宠物信息
-     * @param callback 
-     * @param activityId 
+     * @param callback
+     * @param activityId
      */
     public getPetInfo(callback: Function, activityId: number): void {
         const net: INetData = {
@@ -1242,7 +1258,7 @@ export class NetManager extends ABNetManager {
     public getSignInfo(callback: Function, signActivityId: number): void {
         const net: INetData = {
             name: 'getSignInfo',
-            uri: window['duiba']+'/signactivity/getSignInfo',
+            uri: window['duiba'] + '/signactivity/getSignInfo',
             type: 'post',
             dataType: 'json',
             param: {
@@ -1253,16 +1269,84 @@ export class NetManager extends ABNetManager {
         this.send(net);
     }
 
-    /**
-     * 签到接口
-     * @param {Function} callback
-     * @param {number} signActivityId 签到活动ID
-     * @param {number} activityId 插件活动ID，用于加抽奖次数，不传则使用签到身上配置的插件活动ID，否则不加抽奖次数
-     */
+    public hc_totalNumRank(callback: Function): void {
+        const net: INetData = {
+            name:'hc_totalNumRank',
+            uri: window['duiba']+'/customActivity/happyclear/totalNumRank',
+            type: 'get',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId
+            },
+            hideMsg:true,
+            callback: callback
+        };
+        this.send(net);
+    }
+    public hc_mapRank(callback: Function): void {
+        const net: INetData = {
+            name:'hc_mapRank',
+            uri: window['duiba']+'/customActivity/happyclear/mapRank',
+            type: 'get',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId
+            },
+            hideMsg:true,
+            callback: callback
+        };
+        this.send(net);
+    }
+    public hc_levelNumRank(callback: Function,levelNum): void {
+        const net: INetData = {
+            name:'hc_levelNumRank',
+            uri: window['duiba']+'/customActivity/happyclear/levelNumRank',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId,
+                levelNum: levelNum
+            },
+            hideMsg:true,
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    public hc_userInfo(callback: Function): void {
+        const net: INetData = {
+            name:'hc_userInfo',
+            uri: window['duiba']+'/customActivity/happyclear/userInfo',
+            type: 'get',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId
+            },
+            hideMsg:true,
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    public hc_advert(callback: Function): void {
+        const net: INetData = {
+            name:'hc_advert',
+            uri: window['duiba']+'/customActivity/happyclear/advert',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId
+            },
+            hideMsg:true,
+            callback: callback
+        };
+        this.send(net);
+    }
+
     public doSign(callback: Function, signActivityId: number): void {
         const net: INetData = {
-            name:'dosign',
-            uri: window['duiba']+'/signactivity/doSign',
+            name: 'dosign',
+            uri: window['duiba'] + '/signactivity/doSign',
             type: 'post',
             dataType: 'json',
             param: {
@@ -1270,7 +1354,7 @@ export class NetManager extends ABNetManager {
                 detect: window['detect'],
                 deviceSessionId: window['_device_session_id']
             },
-            hideMsg:true,
+            hideMsg: true,
             callback: callback
         };
         this.send(net);
@@ -1278,7 +1362,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 道具展示接口
-     * @param callback 
+     * @param callback
      * @param {number} actId 宠物活动ID
      */
     public getToys(callback: Function, actId: number): void {
@@ -1297,7 +1381,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 道具兑换接口
-     * @param callback 
+     * @param callback
      * @param {number} toyId 道具id
      * @param {number} credits 兑换所需积分
      */
@@ -1318,7 +1402,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 道具使用接口
-     * @param callback 
+     * @param callback
      * @param {string} identifier 道具唯一标识
      * @param {number} petId 宠物id
      */
@@ -1339,7 +1423,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 收取礼物接口
-     * @param callback 
+     * @param callback
      * @param {number} giftId 礼物id
      * @param {string} giftName 礼物名称
      * @param {string} giftDesc 礼物描述
@@ -1348,13 +1432,13 @@ export class NetManager extends ABNetManager {
      * @param {number} petId 宠物id
      */
     public collect(callback: Function,
-        giftId: number,
-        giftNum: number,
-        giftName: string,
-        giftDesc: string,
-        giftType: number,
-        giftLink: string,
-        petId: number): void {
+                   giftId: number,
+                   giftNum: number,
+                   giftName: string,
+                   giftDesc: string,
+                   giftType: number,
+                   giftLink: string,
+                   petId: number): void {
         const net: INetData = {
             name: NetName.PET_COLLECT,
             uri: '/signpet/addition/collect',
@@ -1376,7 +1460,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 群内喂食排行榜
-     * @param callback 
+     * @param callback
      * @param {number} petId 宠物id
      * @param {number} topNum 排行榜显示top个数
      */
@@ -1399,7 +1483,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 查询待领取粮食
-     * @param callback 
+     * @param callback
      */
     public getFoodPiles(callback: Function): void {
         const net: INetData = {
@@ -1415,7 +1499,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 待领取粮食收取
-     * @param callback 
+     * @param callback
      * @param {number} id 待领取粮食主键ID
      * @param {number} activityId 活动id
      */
@@ -1437,8 +1521,8 @@ export class NetManager extends ABNetManager {
     //--------------------------------------------------------------------外来宠物养成--------------------------------------------------------------------------
     /**
      * 活动主信息接口
-     * @param callback 
-     * @param activityId 
+     * @param callback
+     * @param activityId
      */
     public getHomeInfo(callback: Function, activityId: number): void {
         const net: INetData = {
@@ -1456,9 +1540,9 @@ export class NetManager extends ABNetManager {
 
     /**
      * 商店道具接口
-     * @param callback 
-     * @param actId 
-     * @param actType 	2-日历 4-养成 5-契约 6-外来宠物
+     * @param callback
+     * @param actId
+     * @param actType    2-日历 4-养成 5-契约 6-外来宠物
      * @param toyType   1-状态 2-装饰 3-功能 4-食物 5-玩具
      */
     public getActToys(callback: Function, actId: number, actType: number, toyType: number): void {
@@ -1479,7 +1563,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 外来宠物养成-道具兑换接口
-     * @param callback 
+     * @param callback
      * @param {number} toyId 道具id
      */
     public toyExchanges(callback: Function, toyId: number): void {
@@ -1498,7 +1582,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 道具使用接口
-     * @param callback 
+     * @param callback
      * @param {number} actId 活动id
      * @param {any[]} toyList 使用的道具列表 [{identifier:'道具标识', position:'投放位置'}, {identifier:'道具标识', position:'投放位置'}]
      */
@@ -1519,7 +1603,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 已购买的道具接口
-     * @param callback 
+     * @param callback
      * @param petId     宠物id 没有传0
      * @param toyType   1-状态 2-装饰 3-功能 4-食物 5-玩具
      */
@@ -1540,7 +1624,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 粮食收取
-     * @param callback 
+     * @param callback
      * @param actId     活动id
      * @param ids       收取粮食堆的主键id列表[1,2,3,4]
      */
@@ -1561,8 +1645,8 @@ export class NetManager extends ABNetManager {
 
     /**
      * 来访统计
-     * @param callback 
-     * @param actId 
+     * @param callback
+     * @param actId
      */
     public visitStatistics(callback: Function, actId: number): void {
         const net: INetData = {
@@ -1580,7 +1664,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 动态信息列表
-     * @param callback 
+     * @param callback
      * @param actId         活动id
      * @param showNum       显示条数
      */
@@ -1601,7 +1685,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 到访记录详情
-     * @param callback 
+     * @param callback
      * @param actId ：活动id
      * @param identifier ：宠物唯一标识
      */
@@ -1622,7 +1706,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 礼物收取
-     * @param callback 
+     * @param callback
      * @param recordId 礼物记录ID
      */
     public collectGiftRecord(recordId: number, callback: Function): void {
@@ -1642,10 +1726,10 @@ export class NetManager extends ABNetManager {
 
     /**
      * 获取token
-     * @param net 
+     * @param net
      */
     public getToken(net: INetData): void {
-        if (window['getDuibaToken']) {
+        if(window['getDuibaToken']) {
             window['getDuibaToken']((tokenObj: any) => {
                 net.param.token = tokenObj.token;
                 this.send(net);
@@ -1659,7 +1743,7 @@ export class NetManager extends ABNetManager {
 
     /**
      * 查询我的奖品记录
-     * @param callback 
+     * @param callback
      * @param {number} page 当前页数
      */
     public getRecord(callback: Function, page: number): void {
@@ -1676,12 +1760,12 @@ export class NetManager extends ABNetManager {
 
         let gTime: string = '?_=' + GTime.getTimestamp();
         let realUrl: string = net.uri;
-        if (realUrl.indexOf('?') != -1) {
+        if(realUrl.indexOf('?') != -1) {
             gTime = '&_=' + GTime.getTimestamp();
         }
 
         //url加参数等特殊需求（例如再玩一次需要在dostart接口的url上加埋点）
-        if (net.addUrl) {
+        if(net.addUrl) {
             realUrl += net.addUrl;
         }
 
@@ -1749,7 +1833,7 @@ export class NetManager extends ABNetManager {
     public clickLog(exposure: IExposureData): void {
         const net: INetData = {
             name: 'clickLog',
-            uri: window['duiba']  + '/log/click',
+            uri: window['duiba'] + '/log/click',
             type: 'get',
             dataType: 'jsonp',
             param: exposure,
@@ -1777,19 +1861,19 @@ export class NetManager extends ABNetManager {
     }
 
 
-    public remainDuration(remain,first,from=1): void {
+    public remainDuration(remain, first, from = 1): void {
         const net: INetData = {
             name: 'remainDuration',
-            uri: window['duiba'] +'/customActivity/api/remainDuration',
+            uri: window['duiba'] + '/customActivity/api/remainDuration',
             type: 'get',
             dataType: 'json',
             param: {
                 id: DataManager.ins.customCfgData.hdToolId,
                 activityId: DataManager.ins.customCfgData.actId,
-                activityType:'hdtool',
-                remain:remain,
-                first:first,
-                from:from
+                activityType: 'hdtool',
+                remain: remain,
+                first: first,
+                from: from
             },
             callback: null,
             hideMsg: true
@@ -1798,38 +1882,38 @@ export class NetManager extends ABNetManager {
     }
 
     /**
-      * 消息响应
-      * @param net 
-      * @param result 结果
-      */
+     * 消息响应
+     * @param net
+     * @param result 结果
+     */
     protected onResponse(net: INetData, result: any): void {
         if(net.name == 'hc_home') {
             // if(result.data.refectionCountdown==null)
             //     result.data.refectionCountdown==0;
-            if(result.data.refectionCountdown==0)
-                result.data.refectionCountdown=5;
-            result.data.refectionCountdown += Math.floor(new Date().getTime()/1000);
+            if(result.data.refectionCountdown == 0)
+                result.data.refectionCountdown = 5;
+            result.data.refectionCountdown += Math.floor(new Date().getTime() / 1000);
         }
         //数据处理
         const data: Data = DataManager.ins.updateData(net.name, result, net.param);
         //接口成功
-        if (net.pollingCount && net.pollingCheck(data)) {
+        if(net.pollingCount && net.pollingCheck(data)) {
             net.pollingCount -= 1;
             //轮询接口特殊处理
             setTimeout(() => {
                 this.send(net);
             }, 500);
-        } else if (net.callback) {
-            if (net.pollingCheck && net.pollingCount == 0 && net.pollingCheck(data)) {
+        } else if(net.callback) {
+            if(net.pollingCheck && net.pollingCount == 0 && net.pollingCheck(data)) {
                 result.message = '系统异常，请稍后再试。';
                 data['success'] = false;
             }
             net.callback(data.success, data || result);
         }
-        if (!data.success && !net.hideMsg) {
+        if(!data.success && !net.hideMsg) {
             GDispatcher.dispatchEvent(ABNetManager.ERROR, net, result.message || result.desc || result.msg);
         }
-        if (!data.success && !net.hideMsg) {
+        if(!data.success && !net.hideMsg) {
             onNotSuccess(data, net.name)
         }
     }
@@ -1838,18 +1922,111 @@ export class NetManager extends ABNetManager {
 
     /**
      * 通讯底层错误
-     * @param net 
-     * @param message 
+     * @param net
+     * @param message
      */
     protected onError(net: INetData): void {
-        if (net.callback) {
+        if(net.callback) {
             net.callback(false);
         }
 
-        if (!net.hideMsg) {
+        if(!net.hideMsg) {
             GDispatcher.dispatchEvent(ABNetManager.ERROR, net);
             showToast('网络开小差了，再试一次吧');
         }
     }
+
     // tslint:disable-next-line:max-file-line-count
+
+    ///////////////////////////////  消消乐邀请有礼  /////////////////////////////////////
+    /**
+     * 邀请有礼-获取邀请码
+     * @param callback
+     */
+    public getShareCode(callback: Function): void {
+        const net: INetData = {
+            name: NetName.GET_SHARECODE,
+            uri: '/customActivity/happyclear/getShareCode',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId,
+            },
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    /**
+     * 邀请有礼-助力
+     * @param callback
+     * @param shareCode 分享码
+     * @param orderId 参与关卡流水记录id
+     */
+    public doHelp(callback: Function, shareCode: any, orderId: number): void {
+        const net: INetData = {
+            name: NetName.DO_HELP,
+            uri: '/customActivity/happyclear/doHelp',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId,
+                shareCode: shareCode,
+                orderId: orderId
+            },
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    /**
+     * 获取邀请详情
+     * @param callback
+     */
+    public getInviteInfo(callback: Function): void {
+        const net: INetData = {
+            name: NetName.GET_INVATE_INFO,
+            uri: '/customActivity/happyclear/invitationInfo',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId,
+            },
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    /**
+     * 接受任务
+     * @param callback
+     */
+    public acceptInvitationInfo(callback: Function): void {
+        const net: INetData = {
+            name: NetName.ACCEPT_INVITATION,
+            uri: '/customActivity/happyclear/acceptInvitationInfo',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId,
+            },
+            callback: callback
+        };
+        this.send(net);
+    }
+
+    public acceptInvitationPrize(callback: Function): void {
+        const net: INetData = {
+            name: NetName.ACCEPT_INVITATION,
+            uri: '/customActivity/happyclear/acceptInvitationPrize',
+            type: 'post',
+            dataType: 'json',
+            param: {
+                activityId: DataManager.ins.customCfgData.actId,
+            },
+            callback: callback
+        };
+        this.send(net);
+    }
+    ///////////////////////////////////////////////////////////////////////////////////
 }
\ No newline at end of file

egret/resource/TextureMerger/blood.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["..\\assets\\blood\\blood体力补济站.png","..\\assets\\blood\\blood按钮.png","..\\assets\\blood\\blood按钮 副本1.png","..\\assets\\blood\\blood按钮 副本.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood","version":5,"files":["../assets/blood/blood体力补济站.png","../assets/blood/blood按钮.png","../assets/blood/blood按钮 副本1.png","../assets/blood/blood按钮 副本.png"]}
\ No newline at end of file

egret/resource/TextureMerger/blood2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood2","version":5,"files":["..\\assets\\blood2\\blood2按钮 副本1.png","..\\assets\\blood2\\blood2按钮 副本.png","..\\assets\\blood2\\blood2.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"blood2","version":5,"files":["../assets/blood2/blood2按钮 副本1.png","../assets/blood2/blood2按钮 副本.png","../assets/blood2/blood2.png"]}
\ No newline at end of file

egret/resource/TextureMerger/box.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["..\\assets\\box\\boxbtn.png","..\\assets\\box\\boxbg.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box","version":5,"files":["../assets/box/boxbtn.png","../assets/box/boxbg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/box2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box2","version":5,"files":["..\\assets\\box2\\box2_bg.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"box2","version":5,"files":["../assets/box2/box2_bg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/buy1.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy1","version":5,"files":["..\\assets\\buy1\\购买锤子.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy1","version":5,"files":["../assets/buy1/购买锤子.png"]}
\ No newline at end of file

egret/resource/TextureMerger/buy2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy2","version":5,"files":["..\\assets\\buy2\\购买炸弹.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy2","version":5,"files":["../assets/buy2/购买炸弹.png"]}
\ No newline at end of file

egret/resource/TextureMerger/buy3.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["..\\assets\\buy3\\购买步数增加.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"buy3","version":5,"files":["../assets/buy3/购买步数增加.png"]}
\ No newline at end of file

egret/resource/TextureMerger/common.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["..\\assets\\common\\toast.png","..\\assets\\common\\closeCommonBtn.png","..\\assets\\common\\btn.png","..\\assets\\common\\alertbg.png","..\\assets\\common\\按钮 副本 4.png","..\\assets\\common\\按钮 副本 3.png","..\\assets\\common\\share_btn2.png","..\\assets\\common\\share_btn1.png","..\\assets\\common\\commmon_okbtn1.png","..\\assets\\common\\lightani.png","..\\assets\\common\\prizePanelbg.png","..\\assets\\common\\common_prizelight.png","..\\assets\\common\\common_yuanbao.png"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/prizePanelbg.png","../assets/common/lightani.png","../assets/common/common_yuanbao.png","../assets/common/common_prizelight.png","../assets/common/common_adbg.png","../assets/common/commmon_okbtn1.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png"]}
+=======
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"common","version":5,"files":["../assets/common/toast.png","../assets/common/closeCommonBtn.png","../assets/common/btn.png","../assets/common/alertbg.png","../assets/common/按钮 副本 4.png","../assets/common/按钮 副本 3.png","../assets/common/share_btn2.png","../assets/common/share_btn1.png","../assets/common/commmon_okbtn1.png","../assets/common/lightani.png","../assets/common/prizePanelbg.png","../assets/common/common_prizelight.png","../assets/common/common_yuanbao.png"]}
+>>>>>>> 0930

egret/resource/TextureMerger/exchange.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["..\\assets\\exchange\\exchangebtn.png","..\\assets\\exchange\\exchange.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"exchange","version":5,"files":["../assets/exchange/exchangebtn.png","../assets/exchange/exchange.png"]}
\ No newline at end of file

egret/resource/TextureMerger/fail.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["..\\assets\\faild\\闯关失败.png","..\\assets\\faild\\按钮 副本 9.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"fail","version":5,"files":["../assets/faild/闯关失败.png","../assets/faild/按钮 副本 9.png"]}
\ No newline at end of file

egret/resource/TextureMerger/friend.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"friend","version":5,"files":["../assets/friend/friendbg.png","../assets/friend/friend按钮-炫耀.png","../assets/friend/friend_itembg.png","../assets/friend/friend_icon3.png","../assets/friend/friend_icon2.png","../assets/friend/friend_icon1.png"]}
\ No newline at end of file

egret/resource/TextureMerger/h5.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"h5","version":5,"files":["../assets/h5/h5btn.png","../assets/h5/h5_gobtn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/invite.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"invite","version":5,"files":["../assets/invite/invite_invite.png","../assets/invite/invite_help.png","../assets/invite/invite_btn.png","../assets/invite/invite_bg.png","../assets/invite/prize/invitePrize_btn.png","../assets/invite/prize/invitePrize_bg.png","../assets/invite/prize/invitePrize_game_btn.png","../assets/invite/cutTime/invateCut_bg.png","../assets/invite/cutTime/invateCut_btn.png","../assets/invite/invite_wx_tip.png"]}
\ No newline at end of file

egret/resource/TextureMerger/inviterule.tmproject

+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"inviterule","version":5,"files":["../assets/inviterule/inviterulebg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/main2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main2","version":5,"files":["..\\assets\\mainScene\\yezi1.png","..\\assets\\mainScene\\unlightedStar.png","..\\assets\\mainScene\\targetBoard.png","..\\assets\\mainScene\\stepsBoard.png","..\\assets\\mainScene\\stepNumber9.png","..\\assets\\mainScene\\stepNumber8.png","..\\assets\\mainScene\\stepNumber7.png","..\\assets\\mainScene\\stepNumber6.png","..\\assets\\mainScene\\stepNumber5.png","..\\assets\\mainScene\\stepNumber4.png","..\\assets\\mainScene\\stepNumber3.png","..\\assets\\mainScene\\stepNumber2.png","..\\assets\\mainScene\\stepNumber1.png","..\\assets\\mainScene\\stepNumber0.png","..\\assets\\mainScene\\stepBtn.png","..\\assets\\mainScene\\starProgress.png","..\\assets\\mainScene\\setting.png","..\\assets\\mainScene\\scoreNumber9.png","..\\assets\\mainScene\\scoreNumber8.png","..\\assets\\mainScene\\scoreNumber7.png","..\\assets\\mainScene\\scoreNumber6.png","..\\assets\\mainScene\\scoreNumber5.png","..\\assets\\mainScene\\scoreNumber4.png","..\\assets\\mainScene\\scoreNumber3.png","..\\assets\\mainScene\\scoreNumber2.png","..\\assets\\mainScene\\scoreNumber1.png","..\\assets\\mainScene\\scoreNumber0.png","..\\assets\\mainScene\\rock6.png","..\\assets\\mainScene\\rock5.png","..\\assets\\mainScene\\rock4.png","..\\assets\\mainScene\\rock3.png","..\\assets\\mainScene\\rock2.png","..\\assets\\mainScene\\rock1.png","..\\assets\\mainScene\\rightMark.png","..\\assets\\mainScene\\rightArrow.png","..\\assets\\mainScene\\rectLat.png","..\\assets\\mainScene\\progressDown.png","..\\assets\\mainScene\\magicLionBg.png","..\\assets\\mainScene\\magicLion.png","..\\assets\\mainScene\\lockUp.png","..\\assets\\mainScene\\lockDown.png","..\\assets\\mainScene\\lineLight.png","..\\assets\\mainScene\\lightedStar.png","..\\assets\\mainScene\\leftArrow.png","..\\assets\\mainScene\\ice6.png","..\\assets\\mainScene\\ice5.png","..\\assets\\mainScene\\ice4.png","..\\assets\\mainScene\\ice3.png","..\\assets\\mainScene\\ice2.png","..\\assets\\mainScene\\ice1.png","..\\assets\\mainScene\\hammerBtn.png","..\\assets\\mainScene\\eleDis9.png","..\\assets\\mainScene\\eleDis8.png","..\\assets\\mainScene\\eleDis7.png","..\\assets\\mainScene\\eleDis6.png","..\\assets\\mainScene\\eleDis5.png","..\\assets\\mainScene\\eleDis4.png","..\\assets\\mainScene\\eleDis3.png","..\\assets\\mainScene\\eleDis2.png","..\\assets\\mainScene\\eleDis12.png","..\\assets\\mainScene\\eleDis11.png","..\\assets\\mainScene\\eleDis10.png","..\\assets\\mainScene\\eleDis1.png","..\\assets\\mainScene\\ele5.png","..\\assets\\mainScene\\ele42.png","..\\assets\\mainScene\\ele41.png","..\\assets\\mainScene\\ele40.png","..\\assets\\mainScene\\ele4.png","..\\assets\\mainScene\\ele32.png","..\\assets\\mainScene\\ele31.png","..\\assets\\mainScene\\ele30.png","..\\assets\\mainScene\\ele3.png","..\\assets\\mainScene\\ele22.png","..\\assets\\mainScene\\ele21.png","..\\assets\\mainScene\\ele20.png","..\\assets\\mainScene\\ele2.png","..\\assets\\mainScene\\ele12.png","..\\assets\\mainScene\\ele11.png","..\\assets\\mainScene\\ele10.png","..\\assets\\mainScene\\ele1.png","..\\assets\\mainScene\\ele02.png","..\\assets\\mainScene\\ele01.png","..\\assets\\mainScene\\ele00.png","..\\assets\\mainScene\\ele0.png","..\\assets\\mainScene\\dangqianfenshu.png","..\\assets\\mainScene\\chooseRect.png","..\\assets\\mainScene\\boomBtn.png","..\\assets\\mainScene\\boom9.png","..\\assets\\mainScene\\boom8.png","..\\assets\\mainScene\\boom7.png","..\\assets\\mainScene\\boom6.png","..\\assets\\mainScene\\boom5.png","..\\assets\\mainScene\\boom4.png","..\\assets\\mainScene\\boom3.png","..\\assets\\mainScene\\boom2.png","..\\assets\\mainScene\\boom18.png","..\\assets\\mainScene\\boom17.png","..\\assets\\mainScene\\boom16.png","..\\assets\\mainScene\\boom15.png","..\\assets\\mainScene\\boom14.png","..\\assets\\mainScene\\boom13.png","..\\assets\\mainScene\\boom12.png","..\\assets\\mainScene\\boom11.png","..\\assets\\mainScene\\boom10.png","..\\assets\\mainScene\\boom1.png","..\\assets\\mainScene\\mainSoundBtnOn.png","..\\assets\\mainScene\\mainSettingBg.png","..\\assets\\mainScene\\mainQuestionBtn.png","..\\assets\\mainScene\\mainMusicBtnOn.png","..\\assets\\mainScene\\mainQuitBtn.png","..\\assets\\mainScene\\mainSoundBtnOff.png","..\\assets\\mainScene\\mainMusicBtnOff.png","..\\assets\\mainScene\\targetNumber9.png","..\\assets\\mainScene\\targetNumber8.png","..\\assets\\mainScene\\targetNumber7.png","..\\assets\\mainScene\\targetNumber6.png","..\\assets\\mainScene\\targetNumber5.png","..\\assets\\mainScene\\targetNumber4.png","..\\assets\\mainScene\\targetNumber3.png","..\\assets\\mainScene\\targetNumber2.png","..\\assets\\mainScene\\targetNumber1.png","..\\assets\\mainScene\\targetNumber0.png","..\\assets\\mainScene\\ele7.png","..\\assets\\mainScene\\ele6.png","..\\assets\\mainScene\\bonusFra9.png","..\\assets\\mainScene\\bonusFra8.png","..\\assets\\mainScene\\bonusFra7.png","..\\assets\\mainScene\\bonusFra6.png","..\\assets\\mainScene\\bonusFra5.png","..\\assets\\mainScene\\bonusFra4.png","..\\assets\\mainScene\\bonusFra3.png","..\\assets\\mainScene\\bonusFra27.png","..\\assets\\mainScene\\bonusFra26.png","..\\assets\\mainScene\\bonusFra25.png","..\\assets\\mainScene\\bonusFra24.png","..\\assets\\mainScene\\bonusFra23.png","..\\assets\\mainScene\\bonusFra22.png","..\\assets\\mainScene\\bonusFra21.png","..\\assets\\mainScene\\bonusFra20.png","..\\assets\\mainScene\\bonusFra2.png","..\\assets\\mainScene\\bonusFra19.png","..\\assets\\mainScene\\bonusFra18.png","..\\assets\\mainScene\\bonusFra17.png","..\\assets\\mainScene\\bonusFra16.png","..\\assets\\mainScene\\bonusFra15.png","..\\assets\\mainScene\\bonusFra14.png","..\\assets\\mainScene\\bonusFra13.png","..\\assets\\mainScene\\bonusFra12.png","..\\assets\\mainScene\\bonusFra11.png","..\\assets\\mainScene\\bonusFra10.png","..\\assets\\mainScene\\bonusFra1.png","..\\assets\\mainScene\\bonusShoot.png","..\\assets\\mainScene\\guideTxt5.png","..\\assets\\mainScene\\guideTxt4.png","..\\assets\\mainScene\\guideTxt3.png","..\\assets\\mainScene\\guideTxt2.png","..\\assets\\mainScene\\guideTxt1.png","..\\assets\\mainScene\\guideKnowBtn.png","..\\assets\\mainScene\\guideBg.png","..\\assets\\mainScene\\propNum9.png","..\\assets\\mainScene\\propNum8.png","..\\assets\\mainScene\\propNum7.png","..\\assets\\mainScene\\propNum6.png","..\\assets\\mainScene\\propNum5.png","..\\assets\\mainScene\\propNum4.png","..\\assets\\mainScene\\propNum3.png","..\\assets\\mainScene\\propNum2.png","..\\assets\\mainScene\\propNum1.png","..\\assets\\mainScene\\propNum0.png","..\\assets\\mainScene\\propNumBg.png","..\\assets\\mainScene\\bonusTime.png","..\\assets\\mainScene\\eleDis19.png","..\\assets\\mainScene\\eleDis18.png","..\\assets\\mainScene\\eleDis17.png","..\\assets\\mainScene\\eleDis16.png","..\\assets\\mainScene\\eleDis15.png","..\\assets\\mainScene\\eleDis14.png","..\\assets\\mainScene\\eleDis13.png","..\\assets\\mainScene\\main_mapbottom.png","..\\assets\\mainScene\\guidePropShoe.png","..\\assets\\mainScene\\guidePropMsgPanel.png","..\\assets\\mainScene\\guidePropHand.png","..\\assets\\mainScene\\guidePropHammer.png","..\\assets\\mainScene\\guidePropCow.png","..\\assets\\mainScene\\guidePropBoom.png","..\\assets\\mainScene\\stepAni9.png","..\\assets\\mainScene\\stepAni8.png","..\\assets\\mainScene\\stepAni7.png","..\\assets\\mainScene\\stepAni6.png","..\\assets\\mainScene\\stepAni5.png","..\\assets\\mainScene\\stepAni4.png","..\\assets\\mainScene\\stepAni3.png","..\\assets\\mainScene\\stepAni2.png","..\\assets\\mainScene\\stepAni11.png","..\\assets\\mainScene\\stepAni10.png","..\\assets\\mainScene\\stepAni1.png","..\\assets\\mainScene\\lockVine.png","..\\assets\\mainScene\\exLighting1.png","..\\assets\\mainScene\\exLighting11.png","..\\assets\\mainScene\\exLighting14.png","..\\assets\\mainScene\\exLighting16.png","..\\assets\\mainScene\\exLighting18.png","..\\assets\\mainScene\\exLighting19.png","..\\assets\\mainScene\\exLighting21.png","..\\assets\\mainScene\\exLighting23.png","..\\assets\\mainScene\\exLighting25.png","..\\assets\\mainScene\\exLighting27.png","..\\assets\\mainScene\\exLighting29.png","..\\assets\\mainScene\\exLighting3.png","..\\assets\\mainScene\\exLighting32.png","..\\assets\\mainScene\\exLighting34.png","..\\assets\\mainScene\\exLighting5.png","..\\assets\\mainScene\\exLighting7.png","..\\assets\\mainScene\\exLighting9.png"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main2","version":5,"files":["../assets/mainScene/bonusFra1.png","../assets/mainScene/bonusFra10.png","../assets/mainScene/bonusFra11.png","../assets/mainScene/bonusFra12.png","../assets/mainScene/bonusFra13.png","../assets/mainScene/bonusFra14.png","../assets/mainScene/bonusFra15.png","../assets/mainScene/bonusFra16.png","../assets/mainScene/bonusFra17.png","../assets/mainScene/bonusFra18.png","../assets/mainScene/bonusFra19.png","../assets/mainScene/bonusFra2.png","../assets/mainScene/bonusFra20.png","../assets/mainScene/bonusFra21.png","../assets/mainScene/bonusFra22.png","../assets/mainScene/bonusFra23.png","../assets/mainScene/bonusFra24.png","../assets/mainScene/bonusFra25.png","../assets/mainScene/bonusFra26.png","../assets/mainScene/bonusFra27.png","../assets/mainScene/bonusFra3.png","../assets/mainScene/bonusFra4.png","../assets/mainScene/bonusFra5.png","../assets/mainScene/bonusFra6.png","../assets/mainScene/bonusFra7.png","../assets/mainScene/bonusFra8.png","../assets/mainScene/bonusFra9.png","../assets/mainScene/bonusShoot.png","../assets/mainScene/bonusTime.png","../assets/mainScene/boom1.png","../assets/mainScene/boom10.png","../assets/mainScene/boom11.png","../assets/mainScene/boom12.png","../assets/mainScene/boom13.png","../assets/mainScene/boom14.png","../assets/mainScene/boom15.png","../assets/mainScene/boom16.png","../assets/mainScene/boom17.png","../assets/mainScene/boom18.png","../assets/mainScene/boom2.png","../assets/mainScene/boom3.png","../assets/mainScene/boom4.png","../assets/mainScene/boom5.png","../assets/mainScene/boom6.png","../assets/mainScene/boom7.png","../assets/mainScene/boom8.png","../assets/mainScene/boom9.png","../assets/mainScene/boomBtn.png","../assets/mainScene/chooseRect.png","../assets/mainScene/dangqianfenshu.png","../assets/mainScene/eggPiece1.png","../assets/mainScene/eggPiece2.png","../assets/mainScene/eggPiece3.png","../assets/mainScene/eggPiece4.png","../assets/mainScene/eggPiece5.png","../assets/mainScene/eggStatus0.png","../assets/mainScene/eggStatus1.png","../assets/mainScene/eggStatus2.png","../assets/mainScene/ele0.png","../assets/mainScene/ele0Exp.png","../assets/mainScene/ele0Line.png","../assets/mainScene/ele1.png","../assets/mainScene/ele1Exp.png","../assets/mainScene/ele1Line.png","../assets/mainScene/ele2.png","../assets/mainScene/ele2Exp.png","../assets/mainScene/ele2Line.png","../assets/mainScene/ele3.png","../assets/mainScene/ele3Exp.png","../assets/mainScene/ele3Line.png","../assets/mainScene/ele4.png","../assets/mainScene/ele4Exp.png","../assets/mainScene/ele4Line.png","../assets/mainScene/ele5.png","../assets/mainScene/ele6.png","../assets/mainScene/ele7.png","../assets/mainScene/ele8.png","../assets/mainScene/ele9.png","../assets/mainScene/eleDis1.png","../assets/mainScene/eleDis10.png","../assets/mainScene/eleDis11.png","../assets/mainScene/eleDis12.png","../assets/mainScene/eleDis13.png","../assets/mainScene/eleDis14.png","../assets/mainScene/eleDis15.png","../assets/mainScene/eleDis16.png","../assets/mainScene/eleDis17.png","../assets/mainScene/eleDis18.png","../assets/mainScene/eleDis19.png","../assets/mainScene/eleDis2.png","../assets/mainScene/eleDis3.png","../assets/mainScene/eleDis4.png","../assets/mainScene/eleDis5.png","../assets/mainScene/eleDis6.png","../assets/mainScene/eleDis7.png","../assets/mainScene/eleDis8.png","../assets/mainScene/eleDis9.png","../assets/mainScene/exLighting1.png","../assets/mainScene/exLighting11.png","../assets/mainScene/exLighting14.png","../assets/mainScene/exLighting16.png","../assets/mainScene/exLighting18.png","../assets/mainScene/exLighting19.png","../assets/mainScene/exLighting21.png","../assets/mainScene/exLighting23.png","../assets/mainScene/exLighting25.png","../assets/mainScene/exLighting27.png","../assets/mainScene/exLighting29.png","../assets/mainScene/exLighting3.png","../assets/mainScene/exLighting32.png","../assets/mainScene/exLighting34.png","../assets/mainScene/exLighting5.png","../assets/mainScene/exLighting7.png","../assets/mainScene/exLighting9.png","../assets/mainScene/greenCircleDown.png","../assets/mainScene/greenCircleUp.png","../assets/mainScene/guidePropBoom.png","../assets/mainScene/guidePropCow.png","../assets/mainScene/guidePropHammer.png","../assets/mainScene/guidePropHand.png","../assets/mainScene/guidePropMsgPanel.png","../assets/mainScene/guidePropShoe.png","../assets/mainScene/hammerBtn.png","../assets/mainScene/ice2.png","../assets/mainScene/ice3.png","../assets/mainScene/ice4.png","../assets/mainScene/ice5.png","../assets/mainScene/ice6.png","../assets/mainScene/jellyArrow.png","../assets/mainScene/leftArrow.png","../assets/mainScene/lightedStar.png","../assets/mainScene/lineLight.png","../assets/mainScene/lockDown.png","../assets/mainScene/lockUp.png","../assets/mainScene/lockVine.png","../assets/mainScene/magicLion.png","../assets/mainScene/magicLionBg.png","../assets/mainScene/mainMusicBtnOff.png","../assets/mainScene/mainMusicBtnOn.png","../assets/mainScene/mainQuestionBtn.png","../assets/mainScene/mainQuitBtn.png","../assets/mainScene/mainSettingBg.png","../assets/mainScene/mainSoundBtnOff.png","../assets/mainScene/mainSoundBtnOn.png","../assets/mainScene/main_mapbottom.png","../assets/mainScene/progressDown.png","../assets/mainScene/propNum0.png","../assets/mainScene/propNum1.png","../assets/mainScene/propNum2.png","../assets/mainScene/propNum3.png","../assets/mainScene/propNum4.png","../assets/mainScene/propNum5.png","../assets/mainScene/propNum6.png","../assets/mainScene/propNum7.png","../assets/mainScene/propNum8.png","../assets/mainScene/propNum9.png","../assets/mainScene/propNumBg.png","../assets/mainScene/rectLat.png","../assets/mainScene/rightArrow.png","../assets/mainScene/rightMark.png","../assets/mainScene/rock2.png","../assets/mainScene/rock3.png","../assets/mainScene/rock4.png","../assets/mainScene/rock5.png","../assets/mainScene/rock6.png","../assets/mainScene/scoreNumber0.png","../assets/mainScene/scoreNumber1.png","../assets/mainScene/scoreNumber2.png","../assets/mainScene/scoreNumber3.png","../assets/mainScene/scoreNumber4.png","../assets/mainScene/scoreNumber5.png","../assets/mainScene/scoreNumber6.png","../assets/mainScene/scoreNumber7.png","../assets/mainScene/scoreNumber8.png","../assets/mainScene/scoreNumber9.png","../assets/mainScene/setting.png","../assets/mainScene/starProgress.png","../assets/mainScene/stepAni1.png","../assets/mainScene/stepAni10.png","../assets/mainScene/stepAni11.png","../assets/mainScene/stepAni2.png","../assets/mainScene/stepAni3.png","../assets/mainScene/stepAni4.png","../assets/mainScene/stepAni5.png","../assets/mainScene/stepAni6.png","../assets/mainScene/stepAni7.png","../assets/mainScene/stepAni8.png","../assets/mainScene/stepAni9.png","../assets/mainScene/stepBtn.png","../assets/mainScene/stepNumber0.png","../assets/mainScene/stepNumber1.png","../assets/mainScene/stepNumber2.png","../assets/mainScene/stepNumber3.png","../assets/mainScene/stepNumber4.png","../assets/mainScene/stepNumber5.png","../assets/mainScene/stepNumber6.png","../assets/mainScene/stepNumber7.png","../assets/mainScene/stepNumber8.png","../assets/mainScene/stepNumber9.png","../assets/mainScene/stepsBoard.png","../assets/mainScene/targetBoard.png","../assets/mainScene/targetNumber0.png","../assets/mainScene/targetNumber1.png","../assets/mainScene/targetNumber2.png","../assets/mainScene/targetNumber3.png","../assets/mainScene/targetNumber4.png","../assets/mainScene/targetNumber5.png","../assets/mainScene/targetNumber6.png","../assets/mainScene/targetNumber7.png","../assets/mainScene/targetNumber8.png","../assets/mainScene/targetNumber9.png","../assets/mainScene/unlightedStar.png","../assets/mainScene/yellowCircleDown.png","../assets/mainScene/yellowCircleUp.png","../assets/mainScene/yezi1.png"]}
+=======
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"main2","version":5,"files":["../assets/mainScene/yezi1.png","../assets/mainScene/unlightedStar.png","../assets/mainScene/targetBoard.png","../assets/mainScene/stepsBoard.png","../assets/mainScene/stepNumber9.png","../assets/mainScene/stepNumber8.png","../assets/mainScene/stepNumber7.png","../assets/mainScene/stepNumber6.png","../assets/mainScene/stepNumber5.png","../assets/mainScene/stepNumber4.png","../assets/mainScene/stepNumber3.png","../assets/mainScene/stepNumber2.png","../assets/mainScene/stepNumber1.png","../assets/mainScene/stepNumber0.png","../assets/mainScene/stepBtn.png","../assets/mainScene/starProgress.png","../assets/mainScene/setting.png","../assets/mainScene/scoreNumber9.png","../assets/mainScene/scoreNumber8.png","../assets/mainScene/scoreNumber7.png","../assets/mainScene/scoreNumber6.png","../assets/mainScene/scoreNumber5.png","../assets/mainScene/scoreNumber4.png","../assets/mainScene/scoreNumber3.png","../assets/mainScene/scoreNumber2.png","../assets/mainScene/scoreNumber1.png","../assets/mainScene/scoreNumber0.png","../assets/mainScene/rock6.png","../assets/mainScene/rock5.png","../assets/mainScene/rock4.png","../assets/mainScene/rock3.png","../assets/mainScene/rock2.png","../assets/mainScene/rightMark.png","../assets/mainScene/rightArrow.png","../assets/mainScene/rectLat.png","../assets/mainScene/progressDown.png","../assets/mainScene/magicLionBg.png","../assets/mainScene/magicLion.png","../assets/mainScene/lockUp.png","../assets/mainScene/lockDown.png","../assets/mainScene/lineLight.png","../assets/mainScene/lightedStar.png","../assets/mainScene/leftArrow.png","../assets/mainScene/ice6.png","../assets/mainScene/ice5.png","../assets/mainScene/ice4.png","../assets/mainScene/ice3.png","../assets/mainScene/ice2.png","../assets/mainScene/hammerBtn.png","../assets/mainScene/eleDis9.png","../assets/mainScene/eleDis8.png","../assets/mainScene/eleDis7.png","../assets/mainScene/eleDis6.png","../assets/mainScene/eleDis5.png","../assets/mainScene/eleDis4.png","../assets/mainScene/eleDis3.png","../assets/mainScene/eleDis2.png","../assets/mainScene/eleDis12.png","../assets/mainScene/eleDis11.png","../assets/mainScene/eleDis10.png","../assets/mainScene/eleDis1.png","../assets/mainScene/ele5.png","../assets/mainScene/ele4.png","../assets/mainScene/ele3.png","../assets/mainScene/ele2.png","../assets/mainScene/ele1.png","../assets/mainScene/ele0.png","../assets/mainScene/dangqianfenshu.png","../assets/mainScene/chooseRect.png","../assets/mainScene/boomBtn.png","../assets/mainScene/boom9.png","../assets/mainScene/boom8.png","../assets/mainScene/boom7.png","../assets/mainScene/boom6.png","../assets/mainScene/boom5.png","../assets/mainScene/boom4.png","../assets/mainScene/boom3.png","../assets/mainScene/boom2.png","../assets/mainScene/boom18.png","../assets/mainScene/boom17.png","../assets/mainScene/boom16.png","../assets/mainScene/boom15.png","../assets/mainScene/boom14.png","../assets/mainScene/boom13.png","../assets/mainScene/boom12.png","../assets/mainScene/boom11.png","../assets/mainScene/boom10.png","../assets/mainScene/boom1.png","../assets/mainScene/mainSoundBtnOn.png","../assets/mainScene/mainSettingBg.png","../assets/mainScene/mainQuestionBtn.png","../assets/mainScene/mainMusicBtnOn.png","../assets/mainScene/mainQuitBtn.png","../assets/mainScene/mainSoundBtnOff.png","../assets/mainScene/mainMusicBtnOff.png","../assets/mainScene/targetNumber9.png","../assets/mainScene/targetNumber8.png","../assets/mainScene/targetNumber7.png","../assets/mainScene/targetNumber6.png","../assets/mainScene/targetNumber5.png","../assets/mainScene/targetNumber4.png","../assets/mainScene/targetNumber3.png","../assets/mainScene/targetNumber2.png","../assets/mainScene/targetNumber1.png","../assets/mainScene/targetNumber0.png","../assets/mainScene/ele7.png","../assets/mainScene/ele6.png","../assets/mainScene/bonusFra9.png","../assets/mainScene/bonusFra8.png","../assets/mainScene/bonusFra7.png","../assets/mainScene/bonusFra6.png","../assets/mainScene/bonusFra5.png","../assets/mainScene/bonusFra4.png","../assets/mainScene/bonusFra3.png","../assets/mainScene/bonusFra27.png","../assets/mainScene/bonusFra26.png","../assets/mainScene/bonusFra25.png","../assets/mainScene/bonusFra24.png","../assets/mainScene/bonusFra23.png","../assets/mainScene/bonusFra22.png","../assets/mainScene/bonusFra21.png","../assets/mainScene/bonusFra20.png","../assets/mainScene/bonusFra2.png","../assets/mainScene/bonusFra19.png","../assets/mainScene/bonusFra18.png","../assets/mainScene/bonusFra17.png","../assets/mainScene/bonusFra16.png","../assets/mainScene/bonusFra15.png","../assets/mainScene/bonusFra14.png","../assets/mainScene/bonusFra13.png","../assets/mainScene/bonusFra12.png","../assets/mainScene/bonusFra11.png","../assets/mainScene/bonusFra10.png","../assets/mainScene/bonusFra1.png","../assets/mainScene/bonusShoot.png","../assets/mainScene/propNum9.png","../assets/mainScene/propNum8.png","../assets/mainScene/propNum7.png","../assets/mainScene/propNum6.png","../assets/mainScene/propNum5.png","../assets/mainScene/propNum4.png","../assets/mainScene/propNum3.png","../assets/mainScene/propNum2.png","../assets/mainScene/propNum1.png","../assets/mainScene/propNum0.png","../assets/mainScene/propNumBg.png","../assets/mainScene/bonusTime.png","../assets/mainScene/eleDis19.png","../assets/mainScene/eleDis18.png","../assets/mainScene/eleDis17.png","../assets/mainScene/eleDis16.png","../assets/mainScene/eleDis15.png","../assets/mainScene/eleDis14.png","../assets/mainScene/eleDis13.png","../assets/mainScene/main_mapbottom.png","../assets/mainScene/guidePropShoe.png","../assets/mainScene/guidePropMsgPanel.png","../assets/mainScene/guidePropHand.png","../assets/mainScene/guidePropHammer.png","../assets/mainScene/guidePropCow.png","../assets/mainScene/guidePropBoom.png","../assets/mainScene/stepAni9.png","../assets/mainScene/stepAni8.png","../assets/mainScene/stepAni7.png","../assets/mainScene/stepAni6.png","../assets/mainScene/stepAni5.png","../assets/mainScene/stepAni4.png","../assets/mainScene/stepAni3.png","../assets/mainScene/stepAni2.png","../assets/mainScene/stepAni11.png","../assets/mainScene/stepAni10.png","../assets/mainScene/stepAni1.png","../assets/mainScene/lockVine.png","../assets/mainScene/exLighting1.png","../assets/mainScene/exLighting11.png","../assets/mainScene/exLighting14.png","../assets/mainScene/exLighting16.png","../assets/mainScene/exLighting18.png","../assets/mainScene/exLighting19.png","../assets/mainScene/exLighting21.png","../assets/mainScene/exLighting23.png","../assets/mainScene/exLighting25.png","../assets/mainScene/exLighting27.png","../assets/mainScene/exLighting29.png","../assets/mainScene/exLighting3.png","../assets/mainScene/exLighting32.png","../assets/mainScene/exLighting34.png","../assets/mainScene/exLighting5.png","../assets/mainScene/exLighting7.png","../assets/mainScene/exLighting9.png","../assets/mainScene/ele8.png","../assets/mainScene/ele0Line.png","../assets/mainScene/ele0Exp.png","../assets/mainScene/ele1Line.png","../assets/mainScene/ele1Exp.png","../assets/mainScene/ele2Line.png","../assets/mainScene/ele2Exp.png","../assets/mainScene/ele3Line.png","../assets/mainScene/ele3Exp.png","../assets/mainScene/ele4Line.png","../assets/mainScene/ele4Exp.png","../assets/mainScene/jellyArrow.png","../assets/mainScene/greenCircleUp.png","../assets/mainScene/greenCircleDown.png","../assets/mainScene/ele9.png","../assets/mainScene/eggStatus1.png","../assets/mainScene/eggStatus0.png","../assets/mainScene/eggStatus2.png","../assets/mainScene/yellowCircleUp.png","../assets/mainScene/yellowCircleDown.png","../assets/mainScene/eggPiece5.png","../assets/mainScene/eggPiece4.png","../assets/mainScene/eggPiece3.png","../assets/mainScene/eggPiece2.png","../assets/mainScene/eggPiece1.png"]}
+>>>>>>> 0930

egret/resource/TextureMerger/map.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"map","version":5,"files":["..\\assets\\map\\progress2.png","..\\assets\\map\\progress1.png","..\\assets\\map\\icon.png","..\\assets\\map\\animal1.png","..\\assets\\map\\元宝bg.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\\设置bg.png","..\\assets\\map\\设置.png","..\\assets\\map\\关闭 拷贝.png","..\\assets\\map\\道具.png","..\\assets\\map\\宝箱btn.png","..\\assets\\map\\宝箱bg.png","..\\assets\\map\\宝箱.png","..\\assets\\map\\宝箱3.png","..\\assets\\map\\宝箱2.png","..\\assets\\map\\宝箱1.png","..\\assets\\map\\iconbg.png","..\\assets\\map\\光 副本 4.png","..\\assets\\map\\音乐关闭.png","..\\assets\\map\\声音关闭.png","..\\assets\\map\\recordbtn.png","..\\assets\\map\\msgTri.png","..\\assets\\map\\guideOver.png","..\\assets\\map\\guideLove.png","..\\assets\\map\\guideBox.png","..\\assets\\map\\guideLevel.png","..\\assets\\map\\guideMoney.png","..\\assets\\map\\lionMsgBg.png","..\\assets\\map\\map_signicon.png"]}
\ No newline at end of file
+<<<<<<< HEAD
+{"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/progress2.png","../assets/map/progress1.png","../assets/map/icon.png","../assets/map/animal1.png","../assets/map/元宝bg.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/设置bg.png","../assets/map/设置.png","../assets/map/关闭 拷贝.png","../assets/map/道具.png","../assets/map/宝箱btn.png","../assets/map/宝箱bg.png","../assets/map/宝箱.png","../assets/map/宝箱3.png","../assets/map/宝箱2.png","../assets/map/宝箱1.png","../assets/map/iconbg.png","../assets/map/光 副本 4.png","../assets/map/音乐关闭.png","../assets/map/声音关闭.png","../assets/map/recordbtn.png","../assets/map/msgTri.png","../assets/map/guideOver.png","../assets/map/guideLove.png","../assets/map/guideBox.png","../assets/map/guideLevel.png","../assets/map/guideMoney.png","../assets/map/lionMsgBg.png","../assets/map/map_signicon.png"]}
+>>>>>>> 0930

egret/resource/TextureMerger/noprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["..\\assets\\nprize\\擦肩而过弹窗 .png","..\\assets\\nprize\\得分- 无发券.png","..\\assets\\nprize\\再来一次.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"noprize","version":5,"files":["../assets/nprize/擦肩而过弹窗 .png","../assets/nprize/得分- 无发券.png","../assets/nprize/再来一次.png"]}
\ No newline at end of file

egret/resource/TextureMerger/prize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["..\\assets\\prize\\PrizePanelX.png","..\\assets\\prize\\prizePanelUseBtn.png","..\\assets\\prize\\点亮.png","..\\assets\\prize\\点亮 副本 2.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize","version":5,"files":["../assets/prize/PrizePanelX.png","../assets/prize/prizePanelUseBtn.png","../assets/prize/点亮.png","../assets/prize/点亮 副本 2.png"]}
\ No newline at end of file

egret/resource/TextureMerger/prize2.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize2","version":5,"files":["..\\assets\\prize2\\prize2_icon.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"prize2","version":5,"files":["../assets/prize2/prize2_icon.png"]}
\ No newline at end of file

egret/resource/TextureMerger/quit.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["..\\assets\\quit\\quit_bg.png","..\\assets\\quit\\关闭按钮.png","..\\assets\\quit\\按钮 副本 8.png","..\\assets\\quit\\按钮 副本 7.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"quit","version":5,"files":["../assets/quit/quit_bg.png","../assets/quit/关闭按钮.png","../assets/quit/按钮 副本 8.png","../assets/quit/按钮 副本 7.png"]}
\ No newline at end of file

egret/resource/TextureMerger/rule.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule","version":5,"files":["..\\assets\\rule\\ruleBg.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"rule","version":5,"files":["../assets/rule/ruleBg.png"]}
\ No newline at end of file

egret/resource/TextureMerger/shop.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["..\\assets\\shop\\shopbtn1.png","..\\assets\\shop\\道具商城.png","..\\assets\\shop\\按钮 副本.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"shop","version":5,"files":["../assets/shop/shopbtn1.png","../assets/shop/道具商城.png","../assets/shop/按钮 副本.png"]}
\ No newline at end of file

egret/resource/TextureMerger/sign.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["..\\assets\\sign\\signitem.png","..\\assets\\sign\\signicon5.png","..\\assets\\sign\\signicon4.png","..\\assets\\sign\\signicon3.png","..\\assets\\sign\\signicon2.png","..\\assets\\sign\\signbtn4.png","..\\assets\\sign\\signbtn3.png","..\\assets\\sign\\signbtn2.png","..\\assets\\sign\\signbtn1.png","..\\assets\\sign\\signbg.png","..\\assets\\sign\\sign_line2.png","..\\assets\\sign\\sign_line.png","..\\assets\\sign\\sign_light.png","..\\assets\\sign\\sign_icon1.png","..\\assets\\sign\\signicon6.png","..\\assets\\sign\\signicon_blood.png","..\\assets\\sign\\sign_quan88.png","..\\assets\\sign\\sign_quan58.png","..\\assets\\sign\\sign_quan38.png","..\\assets\\sign\\sign_quan15.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"sign","version":5,"files":["../assets/sign/signitem.png","../assets/sign/signicon5.png","../assets/sign/signicon4.png","../assets/sign/signicon3.png","../assets/sign/signicon2.png","../assets/sign/signbtn4.png","../assets/sign/signbtn3.png","../assets/sign/signbtn2.png","../assets/sign/signbtn1.png","../assets/sign/signbg.png","../assets/sign/sign_line2.png","../assets/sign/sign_line.png","../assets/sign/sign_light.png","../assets/sign/sign_icon1.png","../assets/sign/signicon6.png","../assets/sign/signicon_blood.png","../assets/sign/sign_quan88.png","../assets/sign/sign_quan58.png","../assets/sign/sign_quan38.png","../assets/sign/sign_quan15.png"]}
\ No newline at end of file

egret/resource/TextureMerger/signprize.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"signprize","version":5,"files":["..\\assets\\signprize\\singprizebg.png","..\\assets\\signprize\\singprize体力.png","..\\assets\\signprize\\signprize元宝.png","..\\assets\\signprize\\signprize_numsbg.png","..\\assets\\signprize\\signprize_btn.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"signprize","version":5,"files":["../assets/signprize/singprizebg.png","../assets/signprize/singprize体力.png","../assets/signprize/signprize元宝.png","../assets/signprize/signprize_numsbg.png","../assets/signprize/signprize_btn.png"]}
\ No newline at end of file

egret/resource/TextureMerger/start.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["..\\assets\\startScene\\mask3.png","..\\assets\\startScene\\mask2.png","..\\assets\\startScene\\mask.png","..\\assets\\startScene\\loadingbg.png","..\\assets\\startScene\\头顶树丛.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"start","version":5,"files":["../assets/startScene/mask3.png","../assets/startScene/mask2.png","../assets/startScene/mask.png","../assets/startScene/loadingbg.png","../assets/startScene/头顶树丛.png"]}
\ No newline at end of file

egret/resource/TextureMerger/startpanel.tmproject

-{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["..\\assets\\startpanel2\\startpanel通关条件.png","..\\assets\\startpanel2\\startpanel数量.png","..\\assets\\startpanel2\\startpanel数量 副本 3.png","..\\assets\\startpanel2\\startpanel目标33.png","..\\assets\\startpanel2\\startpanel目标3.png","..\\assets\\startpanel2\\startpanel按钮.png","..\\assets\\startpanel2\\startpanel_ice1.png","..\\assets\\startpanel2\\startpanel_ele6.png","..\\assets\\startpanel2\\startpanel_block2.png"]}
\ No newline at end of file
+{"options":{"layoutMath":"2","sizeMode":"2n","useExtension":1,"layoutGap":1,"extend":0},"projectName":"startpanel","version":5,"files":["../assets/startpanel2/startpanel通关条件.png","../assets/startpanel2/startpanel数量.png","../assets/startpanel2/startpanel数量 副本 3.png","../assets/startpanel2/startpanel目标33.png","../assets/startpanel2/startpanel目标3.png","../assets/startpanel2/startpanel按钮.png","../assets/startpanel2/startpanel_icon3.png","../assets/startpanel2/startpanel_icon2.png","../assets/startpanel2/startpanel_icon1.png","../assets/startpanel2/startpanel_icon.png","../assets/startpanel2/startpanel_ele9.png","../assets/startpanel2/startpanel_ele8.png","../assets/startpanel2/startpanel_ele7.png","../assets/startpanel2/startpanel_ele6.png","../assets/startpanel2/startpanel_ele5.png","../assets/startpanel2/startpanel_ele4.png","../assets/startpanel2/startpanel_ele3.png","../assets/startpanel2/startpanel_ele2.png","../assets/startpanel2/startpanel_ele1.png","../assets/startpanel2/startpanel_ele0.png","../assets/startpanel2/startpanel_block2.png","../assets/startpanel2/startpanel_bg2.png","../assets/startpanel2/startpanel_avatar.png"]}

egret/resource/assets/common/cutTimeFont.fnt

+{"file":"cutTimeFont.png","frames":{
+":":{"x":240,"y":0,"w":16,"h":45,"offX":0,"offY":27,"sourceW":16,"sourceH":99},
+"0":{"x":180,"y":99,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"1":{"x":60,"y":0,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"2":{"x":0,"y":0,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"3":{"x":120,"y":99,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"4":{"x":180,"y":0,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"5":{"x":0,"y":198,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"6":{"x":120,"y":0,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"7":{"x":60,"y":99,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"8":{"x":60,"y":198,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99},
+"9":{"x":0,"y":99,"w":60,"h":99,"offX":0,"offY":0,"sourceW":60,"sourceH":99}}}
\ No newline at end of file

egret/resource/default.res.json

@@ -8,10 +8,6 @@
 			"keys": "ruleBg_png",
 			"name": "rule"
 		},
-		{
-			"keys": "toast_png,nums_png,nums_fnt,closeCommonBtn_png,btn_png,alertbg_png,按钮 副本 4_png,按钮 副本 3_png,share_btn2_png,朋友圈中间分享蒙层1_jpg,share_btn1_png,commmon_okbtn1_png,lightani_png,prizePanelbg_png,common_prizelight_png,common_yuanbao_png,nums2_png,nums2_fnt",
-			"name": "common"
-		},
 		{
 			"keys": "购买锤子_png",
 			"name": "buy1"
@@ -25,7 +21,7 @@
 			"name": "buy3"
 		},
 		{
-			"keys": "progress2_png,progress1_png,map3_jpg,map2_jpg,map1_jpg,icon_png,animal1_png,元宝bg_png,有星星_png,音乐_png,星星bg_png,星星_png,无星星_png,问题_png,退出_png,狮子_png,声音_png,设置bg_png,设置_png,关闭 拷贝_png,道具_png,宝箱btn_png,宝箱bg_png,宝箱_png,宝箱3_png,宝箱2_png,宝箱1_png,iconbg_png,光 副本 4_png,音乐关闭_png,声音关闭_png,recordbtn_png,msgTri_png,guideOver_png,guideLove_png,guideBox_png,guideLevel_png,guideMoney_png,lionMsgBg_png,map_signicon_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",
 			"name": "map"
 		},
 		{
@@ -44,10 +40,6 @@
 			"keys": "shopbtn1_png,道具商城_png,按钮 副本_png",
 			"name": "shop"
 		},
-		{
-			"keys": "yezi1_png,unlightedStar_png,targetBoard_png,stepsBoard_png,stepNumber9_png,stepNumber8_png,stepNumber7_png,stepNumber6_png,stepNumber5_png,stepNumber4_png,stepNumber3_png,stepNumber2_png,stepNumber1_png,stepNumber0_png,stepBtn_png,starProgress_png,setting_png,scoreNumber9_png,scoreNumber8_png,scoreNumber7_png,scoreNumber6_png,scoreNumber5_png,scoreNumber4_png,scoreNumber3_png,scoreNumber2_png,scoreNumber1_png,scoreNumber0_png,rock6_png,rock5_png,rock4_png,rock3_png,rock2_png,rock1_png,rightMark_png,rightArrow_png,rectLat_png,progressDown_png,magicLionBg_png,magicLion_png,lockUp_png,lockDown_png,lineLight_png,lightedStar_png,leftArrow_png,ice6_png,ice5_png,ice4_png,ice3_png,ice2_png,ice1_png,hammerBtn_png,eleDis9_png,eleDis8_png,eleDis7_png,eleDis6_png,eleDis5_png,eleDis4_png,eleDis3_png,eleDis2_png,eleDis12_png,eleDis11_png,eleDis10_png,eleDis1_png,ele5_png,ele42_png,ele41_png,ele40_png,ele4_png,ele32_png,ele31_png,ele30_png,ele3_png,ele22_png,ele21_png,ele20_png,ele2_png,ele12_png,ele11_png,ele10_png,ele1_png,ele02_png,ele01_png,ele00_png,ele0_png,dangqianfenshu_png,chooseRect_png,boomBtn_png,boom9_png,boom8_png,boom7_png,boom6_png,boom5_png,boom4_png,boom3_png,boom2_png,boom18_png,boom17_png,boom16_png,boom15_png,boom14_png,boom13_png,boom12_png,boom11_png,boom10_png,boom1_png,mainSoundBtnOn_png,mainSettingBg_png,mainQuestionBtn_png,mainMusicBtnOn_png,mainQuitBtn_png,mainSoundBtnOff_png,mainMusicBtnOff_png,targetNumber9_png,targetNumber8_png,targetNumber7_png,targetNumber6_png,targetNumber5_png,targetNumber4_png,targetNumber3_png,targetNumber2_png,targetNumber1_png,targetNumber0_png,ele7_png,ele6_png,bonusFra9_png,bonusFra8_png,bonusFra7_png,bonusFra6_png,bonusFra5_png,bonusFra4_png,bonusFra3_png,bonusFra27_png,bonusFra26_png,bonusFra25_png,bonusFra24_png,bonusFra23_png,bonusFra22_png,bonusFra21_png,bonusFra20_png,bonusFra2_png,bonusFra19_png,bonusFra18_png,bonusFra17_png,bonusFra16_png,bonusFra15_png,bonusFra14_png,bonusFra13_png,bonusFra12_png,bonusFra11_png,bonusFra10_png,bonusFra1_png,bonusShoot_png,guideTxt5_png,guideTxt4_png,guideTxt3_png,guideTxt2_png,guideTxt1_png,guideKnowBtn_png,guideBg_png,propNum9_png,propNum8_png,propNum7_png,propNum6_png,propNum5_png,propNum4_png,propNum3_png,propNum2_png,propNum1_png,propNum0_png,propNumBg_png,bonusTime_png,eleDis19_png,eleDis18_png,eleDis17_png,eleDis16_png,eleDis15_png,eleDis14_png,eleDis13_png,main_mapbottom_png,guidePropShoe_png,guidePropMsgPanel_png,guidePropHand_png,guidePropHammer_png,guidePropCow_png,guidePropBoom_png,stepAni9_png,stepAni8_png,stepAni7_png,stepAni6_png,stepAni5_png,stepAni4_png,stepAni3_png,stepAni2_png,stepAni11_png,stepAni10_png,stepAni1_png,lockVine_png,exLighting1_png,exLighting11_png,exLighting14_png,exLighting16_png,exLighting18_png,exLighting19_png,exLighting21_png,exLighting23_png,exLighting25_png,exLighting27_png,exLighting29_png,exLighting3_png,exLighting32_png,exLighting34_png,exLighting5_png,exLighting7_png,exLighting9_png,playSceneBg_jpg",
-			"name": "main2"
-		},
 		{
 			"keys": "闯关失败_png,按钮 副本 9_png",
 			"name": "fail"
@@ -69,7 +61,7 @@
 			"name": "prize2"
 		},
 		{
-			"keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_ice1_png,startpanel_ele6_png,startpanel_block2_png",
+			"keys": "startpanel通关条件_png,startpanel数量_png,startpanel数量 副本 3_png,startpanel目标33_png,startpanel目标3_png,startpanel按钮_png,startpanel_icon3_png,startpanel_icon2_png,startpanel_icon1_png,startpanel_icon_png,startpanel_ele9_png,startpanel_ele8_png,startpanel_ele7_png,startpanel_ele6_png,startpanel_ele5_png,startpanel_ele4_png,startpanel_ele3_png,startpanel_ele2_png,startpanel_ele1_png,startpanel_ele0_png,startpanel_block2_png,startpanel_bg2_png,startpanel_avatar_png",
 			"name": "startpanel"
 		},
 		{
@@ -87,6 +79,30 @@
 		{
 			"keys": "singprizebg_png,singprize体力_png,signprize元宝_png,signprize_numsbg_png,signprize_btn_png",
 			"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",
+			"name": "common"
+		},
+		{
+			"keys": "friendbg_png,friend按钮-炫耀_png,friend_itembg_png,friend_icon3_png,friend_icon2_png,friend_icon1_png",
+			"name": "friend"
+		},
+		{
+			"keys": "invite_invite_png,invite_help_png,invite_btn_png,invite_bg_png,invitePrize_btn_png,invitePrize_bg_png,invitePrize_game_btn_png,invateCut_bg_png,invateCut_btn_png,invite_wx_tip_png",
+			"name": "invite"
+		},
+		{
+			"keys": "h5btn_png,h5_gobtn_png",
+			"name": "h5"
+		},
+		{
+			"keys": "bonusFra1_png,bonusFra10_png,bonusFra11_png,bonusFra12_png,bonusFra13_png,bonusFra14_png,bonusFra15_png,bonusFra16_png,bonusFra17_png,bonusFra18_png,bonusFra19_png,bonusFra2_png,bonusFra20_png,bonusFra21_png,bonusFra22_png,bonusFra23_png,bonusFra24_png,bonusFra25_png,bonusFra26_png,bonusFra27_png,bonusFra3_png,bonusFra4_png,bonusFra5_png,bonusFra6_png,bonusFra7_png,bonusFra8_png,bonusFra9_png,bonusShoot_png,bonusTime_png,boom1_png,boom10_png,boom11_png,boom12_png,boom13_png,boom14_png,boom15_png,boom16_png,boom17_png,boom18_png,boom2_png,boom3_png,boom4_png,boom5_png,boom6_png,boom7_png,boom8_png,boom9_png,boomBtn_png,chooseRect_png,dangqianfenshu_png,eggPiece1_png,eggPiece2_png,eggPiece3_png,eggPiece4_png,eggPiece5_png,eggStatus0_png,eggStatus1_png,eggStatus2_png,ele0_png,ele0Exp_png,ele0Line_png,ele1_png,ele1Exp_png,ele1Line_png,ele2_png,ele2Exp_png,ele2Line_png,ele3_png,ele3Exp_png,ele3Line_png,ele4_png,ele4Exp_png,ele4Line_png,ele5_png,ele6_png,ele7_png,ele8_png,ele9_png,eleDis1_png,eleDis10_png,eleDis11_png,eleDis12_png,eleDis13_png,eleDis14_png,eleDis15_png,eleDis16_png,eleDis17_png,eleDis18_png,eleDis19_png,eleDis2_png,eleDis3_png,eleDis4_png,eleDis5_png,eleDis6_png,eleDis7_png,eleDis8_png,eleDis9_png,exLighting1_png,exLighting11_png,exLighting14_png,exLighting16_png,exLighting18_png,exLighting19_png,exLighting21_png,exLighting23_png,exLighting25_png,exLighting27_png,exLighting29_png,exLighting3_png,exLighting32_png,exLighting34_png,exLighting5_png,exLighting7_png,exLighting9_png,greenCircleDown_png,greenCircleUp_png,guidePropBoom_png,guidePropCow_png,guidePropHammer_png,guidePropHand_png,guidePropMsgPanel_png,guidePropShoe_png,hammerBtn_png,ice2_png,ice3_png,ice4_png,ice5_png,ice6_png,jellyArrow_png,leftArrow_png,lightedStar_png,lineLight_png,lockDown_png,lockUp_png,lockVine_png,magicLion_png,magicLionBg_png,mainMusicBtnOff_png,mainMusicBtnOn_png,mainQuestionBtn_png,mainQuitBtn_png,mainSettingBg_png,mainSoundBtnOff_png,mainSoundBtnOn_png,main_mapbottom_png,playSceneBg_jpg,progressDown_png,propNum0_png,propNum1_png,propNum2_png,propNum3_png,propNum4_png,propNum5_png,propNum6_png,propNum7_png,propNum8_png,propNum9_png,propNumBg_png,rectLat_png,rightArrow_png,rightMark_png,rock2_png,rock3_png,rock4_png,rock5_png,rock6_png,scoreNumber0_png,scoreNumber1_png,scoreNumber2_png,scoreNumber3_png,scoreNumber4_png,scoreNumber5_png,scoreNumber6_png,scoreNumber7_png,scoreNumber8_png,scoreNumber9_png,setting_png,starProgress_png,stepAni1_png,stepAni10_png,stepAni11_png,stepAni2_png,stepAni3_png,stepAni4_png,stepAni5_png,stepAni6_png,stepAni7_png,stepAni8_png,stepAni9_png,stepBtn_png,stepNumber0_png,stepNumber1_png,stepNumber2_png,stepNumber3_png,stepNumber4_png,stepNumber5_png,stepNumber6_png,stepNumber7_png,stepNumber8_png,stepNumber9_png,stepsBoard_png,targetBoard_png,targetNumber0_png,targetNumber1_png,targetNumber2_png,targetNumber3_png,targetNumber4_png,targetNumber5_png,targetNumber6_png,targetNumber7_png,targetNumber8_png,targetNumber9_png,unlightedStar_png,yellowCircleDown_png,yellowCircleUp_png,yezi1_png",
+			"name": "main2"
+		},
+		{
+			"keys": "inviterulebg_png",
+			"name": "inviterule"
 		}
 	],
 	"resources": [
@@ -150,11 +166,6 @@
 			"type": "image",
 			"name": "startscenebg_jpg"
 		},
-		{
-			"url": "assets/common/alertbg.png",
-			"type": "image",
-			"name": "alertbg_png"
-		},
 		{
 			"url": "assets/nprize/再来一次.png",
 			"type": "image",
@@ -195,11 +206,6 @@
 			"type": "sound",
 			"name": "click_mp3"
 		},
-		{
-			"url": "assets/common/closeCommonBtn.png",
-			"type": "image",
-			"name": "closeCommonBtn_png"
-		},
 		{
 			"url": "assets/startScene/头顶树丛.png",
 			"type": "image",
@@ -240,16 +246,6 @@
 			"type": "image",
 			"name": "map3_jpg"
 		},
-		{
-			"url": "assets/common/nums.png",
-			"type": "image",
-			"name": "nums_png"
-		},
-		{
-			"url": "assets/common/nums.fnt",
-			"type": "font",
-			"name": "nums_fnt"
-		},
 		{
 			"url": "assets/map/icon.png",
 			"type": "image",
@@ -355,11 +351,6 @@
 			"type": "image",
 			"name": "宝箱bg_png"
 		},
-		{
-			"url": "assets/common/toast.png",
-			"type": "image",
-			"name": "toast_png"
-		},
 		{
 			"url": "assets/shop/按钮 副本.png",
 			"type": "image",
@@ -385,11 +376,6 @@
 			"type": "image",
 			"name": "购买步数增加_png"
 		},
-		{
-			"url": "assets/common/btn.png",
-			"type": "image",
-			"name": "btn_png"
-		},
 		{
 			"url": "assets/prize/点亮.png",
 			"type": "image",
@@ -405,16 +391,6 @@
 			"type": "image",
 			"name": "擦肩而过弹窗 _png"
 		},
-		{
-			"url": "assets/common/按钮 副本 3.png",
-			"type": "image",
-			"name": "按钮 副本 3_png"
-		},
-		{
-			"url": "assets/common/按钮 副本 4.png",
-			"type": "image",
-			"name": "按钮 副本 4_png"
-		},
 		{
 			"url": "assets/faild/按钮 副本 9.png",
 			"type": "image",
@@ -476,689 +452,724 @@
 			"name": "boxbg_png"
 		},
 		{
-			"url": "assets/mainScene/boom1.png",
-			"type": "image",
-			"name": "boom1_png"
+			"url": "assets/sounds/eliminate.mp3",
+			"type": "sound",
+			"name": "eliminate_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom10.png",
-			"type": "image",
-			"name": "boom10_png"
+			"url": "assets/sounds/fail.mp3",
+			"type": "sound",
+			"name": "fail_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom11.png",
-			"type": "image",
-			"name": "boom11_png"
+			"url": "assets/sounds/fall.mp3",
+			"type": "sound",
+			"name": "fall_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom12.png",
-			"type": "image",
-			"name": "boom12_png"
+			"url": "assets/sounds/line.mp3",
+			"type": "sound",
+			"name": "line_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom13.png",
-			"type": "image",
-			"name": "boom13_png"
+			"url": "assets/sounds/sucess.mp3",
+			"type": "sound",
+			"name": "sucess_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom14.png",
-			"type": "image",
-			"name": "boom14_png"
+			"url": "assets/sounds/mapBg.mp3",
+			"type": "sound",
+			"name": "mapBg_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom15.png",
-			"type": "image",
-			"name": "boom15_png"
+			"url": "assets/sounds/toast.mp3",
+			"type": "sound",
+			"name": "toast_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom16.png",
-			"type": "image",
-			"name": "boom16_png"
+			"url": "assets/sounds/playBg.mp3",
+			"type": "sound",
+			"name": "playBg_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom17.png",
-			"type": "image",
-			"name": "boom17_png"
+			"url": "assets/sounds/magic.mp3",
+			"type": "sound",
+			"name": "magic_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom18.png",
-			"type": "image",
-			"name": "boom18_png"
+			"url": "assets/sounds/boom.mp3",
+			"type": "sound",
+			"name": "boom_mp3"
 		},
 		{
-			"url": "assets/mainScene/boom2.png",
+			"url": "assets/share2.jpg",
 			"type": "image",
-			"name": "boom2_png"
+			"name": "share2_jpg"
 		},
 		{
-			"url": "assets/mainScene/boom3.png",
+			"url": "assets/showoff.jpg",
 			"type": "image",
-			"name": "boom3_png"
+			"name": "showoff_jpg"
 		},
 		{
-			"url": "assets/mainScene/boom4.png",
+			"url": "assets/map/iconbg.png",
 			"type": "image",
-			"name": "boom4_png"
+			"name": "iconbg_png"
 		},
 		{
-			"url": "assets/mainScene/boom5.png",
+			"url": "assets/blood/blood按钮 副本.png",
 			"type": "image",
-			"name": "boom5_png"
+			"name": "blood按钮 副本_png"
 		},
 		{
-			"url": "assets/mainScene/boom6.png",
+			"url": "assets/blood/blood按钮.png",
 			"type": "image",
-			"name": "boom6_png"
+			"name": "blood按钮_png"
 		},
 		{
-			"url": "assets/mainScene/boom7.png",
+			"url": "assets/blood/blood按钮 副本1.png",
 			"type": "image",
-			"name": "boom7_png"
+			"name": "blood按钮 副本1_png"
 		},
 		{
-			"url": "assets/mainScene/boom8.png",
+			"url": "assets/blood/blood体力补济站.png",
 			"type": "image",
-			"name": "boom8_png"
+			"name": "blood体力补济站_png"
 		},
 		{
-			"url": "assets/mainScene/boom9.png",
+			"url": "assets/map/音乐关闭.png",
 			"type": "image",
-			"name": "boom9_png"
+			"name": "音乐关闭_png"
 		},
 		{
-			"url": "assets/mainScene/boomBtn.png",
+			"url": "assets/map/声音关闭.png",
 			"type": "image",
-			"name": "boomBtn_png"
+			"name": "声音关闭_png"
 		},
 		{
-			"url": "assets/mainScene/chooseRect.png",
+			"url": "assets/share3.jpg",
 			"type": "image",
-			"name": "chooseRect_png"
+			"name": "share3_jpg"
 		},
 		{
-			"url": "assets/mainScene/dangqianfenshu.png",
+			"url": "assets/box2/box2_bg.png",
 			"type": "image",
-			"name": "dangqianfenshu_png"
+			"name": "box2_bg_png"
 		},
 		{
-			"url": "assets/mainScene/ele0.png",
+			"url": "assets/prize2/prize2_icon.png",
 			"type": "image",
-			"name": "ele0_png"
+			"name": "prize2_icon_png"
 		},
 		{
-			"url": "assets/mainScene/ele00.png",
+			"url": "assets/showoff1.jpg",
 			"type": "image",
-			"name": "ele00_png"
+			"name": "showoff1_jpg"
 		},
 		{
-			"url": "assets/mainScene/ele01.png",
-			"type": "image",
-			"name": "ele01_png"
+			"url": "assets/sounds/bonusShoot.mp3",
+			"type": "sound",
+			"name": "bonusShoot_mp3"
 		},
 		{
-			"url": "assets/mainScene/ele02.png",
+			"url": "assets/map/recordbtn.png",
 			"type": "image",
-			"name": "ele02_png"
+			"name": "recordbtn_png"
 		},
 		{
-			"url": "assets/mainScene/ele1.png",
+			"url": "assets/map/guideMoney.png",
 			"type": "image",
-			"name": "ele1_png"
+			"name": "guideMoney_png"
 		},
 		{
-			"url": "assets/mainScene/ele10.png",
+			"url": "assets/map/guideBox.png",
 			"type": "image",
-			"name": "ele10_png"
+			"name": "guideBox_png"
 		},
 		{
-			"url": "assets/mainScene/ele11.png",
+			"url": "assets/map/msgTri.png",
 			"type": "image",
-			"name": "ele11_png"
+			"name": "msgTri_png"
 		},
 		{
-			"url": "assets/mainScene/ele12.png",
+			"url": "assets/map/lionMsgBg.png",
 			"type": "image",
-			"name": "ele12_png"
+			"name": "lionMsgBg_png"
 		},
 		{
-			"url": "assets/mainScene/ele2.png",
+			"url": "assets/map/guideOver.png",
 			"type": "image",
-			"name": "ele2_png"
+			"name": "guideOver_png"
 		},
 		{
-			"url": "assets/mainScene/ele20.png",
+			"url": "assets/map/guideLove.png",
 			"type": "image",
-			"name": "ele20_png"
+			"name": "guideLove_png"
 		},
 		{
-			"url": "assets/mainScene/ele21.png",
+			"url": "assets/map/guideLevel.png",
 			"type": "image",
-			"name": "ele21_png"
+			"name": "guideLevel_png"
 		},
 		{
-			"url": "assets/mainScene/ele22.png",
+			"url": "assets/blood2/blood2按钮 副本1.png",
 			"type": "image",
-			"name": "ele22_png"
+			"name": "blood2按钮 副本1_png"
 		},
 		{
-			"url": "assets/mainScene/ele3.png",
+			"url": "assets/blood2/blood2按钮 副本.png",
 			"type": "image",
-			"name": "ele3_png"
+			"name": "blood2按钮 副本_png"
 		},
 		{
-			"url": "assets/mainScene/ele30.png",
+			"url": "assets/signprize/signprize_btn.png",
 			"type": "image",
-			"name": "ele30_png"
+			"name": "signprize_btn_png"
 		},
 		{
-			"url": "assets/mainScene/ele31.png",
+			"url": "assets/signprize/singprizebg.png",
 			"type": "image",
-			"name": "ele31_png"
+			"name": "singprizebg_png"
 		},
 		{
-			"url": "assets/mainScene/ele32.png",
+			"url": "assets/sign/signbtn1.png",
 			"type": "image",
-			"name": "ele32_png"
+			"name": "signbtn1_png"
 		},
 		{
-			"url": "assets/mainScene/ele4.png",
+			"url": "assets/sign/signbtn2.png",
 			"type": "image",
-			"name": "ele4_png"
+			"name": "signbtn2_png"
 		},
 		{
-			"url": "assets/mainScene/ele40.png",
+			"url": "assets/sign/signbtn3.png",
 			"type": "image",
-			"name": "ele40_png"
+			"name": "signbtn3_png"
 		},
 		{
-			"url": "assets/mainScene/ele41.png",
+			"url": "assets/sign/signbtn4.png",
 			"type": "image",
-			"name": "ele41_png"
+			"name": "signbtn4_png"
 		},
 		{
-			"url": "assets/mainScene/ele42.png",
+			"url": "assets/sign/sign_line.png",
 			"type": "image",
-			"name": "ele42_png"
+			"name": "sign_line_png"
 		},
 		{
-			"url": "assets/mainScene/ele5.png",
+			"url": "assets/sign/sign_icon1.png",
 			"type": "image",
-			"name": "ele5_png"
+			"name": "sign_icon1_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis1.png",
+			"url": "assets/sign/signicon2.png",
 			"type": "image",
-			"name": "eleDis1_png"
+			"name": "signicon2_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis10.png",
+			"url": "assets/sign/signicon3.png",
 			"type": "image",
-			"name": "eleDis10_png"
+			"name": "signicon3_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis11.png",
+			"url": "assets/sign/signitem.png",
 			"type": "image",
-			"name": "eleDis11_png"
+			"name": "signitem_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis12.png",
+			"url": "assets/exchange/exchangebtn.png",
 			"type": "image",
-			"name": "eleDis12_png"
+			"name": "exchangebtn_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis2.png",
+			"url": "assets/exchange/exchange.png",
 			"type": "image",
-			"name": "eleDis2_png"
+			"name": "exchange_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis3.png",
+			"url": "assets/shop/shopbtn1.png",
 			"type": "image",
-			"name": "eleDis3_png"
+			"name": "shopbtn1_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis4.png",
+			"url": "assets/blood2/blood2.png",
 			"type": "image",
-			"name": "eleDis4_png"
+			"name": "blood2_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis5.png",
+			"url": "assets/sign/signicon4.png",
 			"type": "image",
-			"name": "eleDis5_png"
+			"name": "signicon4_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis6.png",
+			"url": "assets/sign/signicon5.png",
 			"type": "image",
-			"name": "eleDis6_png"
+			"name": "signicon5_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis7.png",
+			"url": "assets/sign/signbg.png",
 			"type": "image",
-			"name": "eleDis7_png"
+			"name": "signbg_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis8.png",
+			"url": "assets/sign/sign_line2.png",
 			"type": "image",
-			"name": "eleDis8_png"
+			"name": "sign_line2_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis9.png",
+			"url": "assets/sign/sign_light.png",
 			"type": "image",
-			"name": "eleDis9_png"
+			"name": "sign_light_png"
 		},
 		{
-			"url": "assets/mainScene/hammerBtn.png",
+			"url": "assets/sign/signicon_blood.png",
 			"type": "image",
-			"name": "hammerBtn_png"
+			"name": "signicon_blood_png"
 		},
 		{
-			"url": "assets/mainScene/ice1.png",
+			"url": "assets/signprize/signprize_numsbg.png",
 			"type": "image",
-			"name": "ice1_png"
+			"name": "signprize_numsbg_png"
 		},
 		{
-			"url": "assets/mainScene/ice2.png",
+			"url": "assets/signprize/singprize体力.png",
 			"type": "image",
-			"name": "ice2_png"
+			"name": "singprize体力_png"
 		},
 		{
-			"url": "assets/mainScene/ice3.png",
+			"url": "assets/signprize/signprize元宝.png",
 			"type": "image",
-			"name": "ice3_png"
+			"name": "signprize元宝_png"
 		},
 		{
-			"url": "assets/mainScene/ice4.png",
+			"url": "assets/sign/signicon6.png",
 			"type": "image",
-			"name": "ice4_png"
+			"name": "signicon6_png"
 		},
 		{
-			"url": "assets/mainScene/ice5.png",
+			"url": "assets/map/map_signicon.png",
 			"type": "image",
-			"name": "ice5_png"
+			"name": "map_signicon_png"
 		},
 		{
-			"url": "assets/mainScene/ice6.png",
+			"url": "assets/sign/sign_quan58.png",
 			"type": "image",
-			"name": "ice6_png"
+			"name": "sign_quan58_png"
 		},
 		{
-			"url": "assets/mainScene/leftArrow.png",
+			"url": "assets/sign/sign_quan88.png",
 			"type": "image",
-			"name": "leftArrow_png"
+			"name": "sign_quan88_png"
 		},
 		{
-			"url": "assets/mainScene/lightedStar.png",
+			"url": "assets/sign/sign_quan38.png",
 			"type": "image",
-			"name": "lightedStar_png"
+			"name": "sign_quan38_png"
 		},
 		{
-			"url": "assets/mainScene/lineLight.png",
+			"url": "assets/sign/sign_quan15.png",
 			"type": "image",
-			"name": "lineLight_png"
+			"name": "sign_quan15_png"
 		},
 		{
-			"url": "assets/mainScene/lockDown.png",
+			"url": "assets/map/namebg.png",
 			"type": "image",
-			"name": "lockDown_png"
+			"name": "namebg_png"
 		},
 		{
-			"url": "assets/mainScene/lockUp.png",
+			"url": "assets/map/avatar.png",
 			"type": "image",
-			"name": "lockUp_png"
+			"name": "avatar_png"
 		},
 		{
-			"url": "assets/mainScene/magicLion.png",
+			"url": "assets/map/invite_txtbg.png",
 			"type": "image",
-			"name": "magicLion_png"
+			"name": "invite_txtbg_png"
 		},
 		{
-			"url": "assets/mainScene/magicLionBg.png",
+			"url": "assets/map/invite_icon.png",
 			"type": "image",
-			"name": "magicLionBg_png"
+			"name": "invite_icon_png"
 		},
 		{
-			"url": "assets/mainScene/progressDown.png",
+			"url": "assets/map/taskicon.png",
 			"type": "image",
-			"name": "progressDown_png"
+			"name": "taskicon_png"
 		},
 		{
-			"url": "assets/mainScene/rectLat.png",
+			"url": "assets/map/friend_avatar.png",
 			"type": "image",
-			"name": "rectLat_png"
+			"name": "friend_avatar_png"
 		},
 		{
-			"url": "assets/mainScene/rightArrow.png",
+			"url": "assets/map/ad_icon.png",
 			"type": "image",
-			"name": "rightArrow_png"
+			"name": "ad_icon_png"
 		},
 		{
-			"url": "assets/mainScene/rightMark.png",
+			"url": "assets/testavatar.png",
 			"type": "image",
-			"name": "rightMark_png"
+			"name": "testavatar_png"
 		},
 		{
-			"url": "assets/mainScene/rock1.png",
+			"url": "assets/invite/invite_help.png",
 			"type": "image",
-			"name": "rock1_png"
+			"name": "invite_help_png"
 		},
 		{
-			"url": "assets/mainScene/rock2.png",
+			"url": "assets/invite/invite_invite.png",
 			"type": "image",
-			"name": "rock2_png"
+			"name": "invite_invite_png"
 		},
 		{
-			"url": "assets/mainScene/rock3.png",
+			"url": "assets/invite/invite_bg.png",
 			"type": "image",
-			"name": "rock3_png"
+			"name": "invite_bg_png"
 		},
 		{
-			"url": "assets/mainScene/rock4.png",
+			"url": "assets/invite/invite_btn.png",
 			"type": "image",
-			"name": "rock4_png"
+			"name": "invite_btn_png"
 		},
 		{
-			"url": "assets/mainScene/rock5.png",
+			"url": "assets/friend/friend_icon1.png",
 			"type": "image",
-			"name": "rock5_png"
+			"name": "friend_icon1_png"
 		},
 		{
-			"url": "assets/mainScene/rock6.png",
+			"url": "assets/friend/friend_icon2.png",
 			"type": "image",
-			"name": "rock6_png"
+			"name": "friend_icon2_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber0.png",
+			"url": "assets/friend/friend_icon3.png",
 			"type": "image",
-			"name": "scoreNumber0_png"
+			"name": "friend_icon3_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber1.png",
+			"url": "assets/friend/friend_itembg.png",
 			"type": "image",
-			"name": "scoreNumber1_png"
+			"name": "friend_itembg_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber2.png",
+			"url": "assets/friend/friendbg.png",
 			"type": "image",
-			"name": "scoreNumber2_png"
+			"name": "friendbg_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber3.png",
+			"url": "assets/friend/friend按钮-炫耀.png",
 			"type": "image",
-			"name": "scoreNumber3_png"
+			"name": "friend按钮-炫耀_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber4.png",
+			"url": "assets/common/alertbg.png",
 			"type": "image",
-			"name": "scoreNumber4_png"
+			"name": "alertbg_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber5.png",
+			"url": "assets/common/btn.png",
 			"type": "image",
-			"name": "scoreNumber5_png"
+			"name": "btn_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber6.png",
+			"url": "assets/common/closeCommonBtn.png",
 			"type": "image",
-			"name": "scoreNumber6_png"
+			"name": "closeCommonBtn_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber7.png",
+			"url": "assets/common/commmon_okbtn1.png",
 			"type": "image",
-			"name": "scoreNumber7_png"
+			"name": "commmon_okbtn1_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber8.png",
+			"url": "assets/common/common_adbg.png",
 			"type": "image",
-			"name": "scoreNumber8_png"
+			"name": "common_adbg_png"
 		},
 		{
-			"url": "assets/mainScene/scoreNumber9.png",
+			"url": "assets/common/common_prizelight.png",
 			"type": "image",
-			"name": "scoreNumber9_png"
+			"name": "common_prizelight_png"
 		},
 		{
-			"url": "assets/mainScene/setting.png",
+			"url": "assets/common/common_yuanbao.png",
 			"type": "image",
-			"name": "setting_png"
+			"name": "common_yuanbao_png"
 		},
 		{
-			"url": "assets/mainScene/starProgress.png",
+			"url": "assets/common/lightani.png",
 			"type": "image",
-			"name": "starProgress_png"
+			"name": "lightani_png"
 		},
 		{
-			"url": "assets/mainScene/stepBtn.png",
-			"type": "image",
-			"name": "stepBtn_png"
+			"url": "assets/common/nums.fnt",
+			"type": "font",
+			"name": "nums_fnt"
 		},
 		{
-			"url": "assets/mainScene/stepNumber0.png",
+			"url": "assets/common/nums.png",
 			"type": "image",
-			"name": "stepNumber0_png"
+			"name": "nums_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber1.png",
-			"type": "image",
-			"name": "stepNumber1_png"
+			"url": "assets/common/nums2.fnt",
+			"type": "font",
+			"name": "nums2_fnt"
 		},
 		{
-			"url": "assets/mainScene/stepNumber2.png",
+			"url": "assets/common/nums2.png",
 			"type": "image",
-			"name": "stepNumber2_png"
+			"name": "nums2_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber3.png",
+			"url": "assets/common/prizePanelbg.png",
 			"type": "image",
-			"name": "stepNumber3_png"
+			"name": "prizePanelbg_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber4.png",
+			"url": "assets/common/share_btn1.png",
 			"type": "image",
-			"name": "stepNumber4_png"
+			"name": "share_btn1_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber5.png",
+			"url": "assets/common/share_btn2.png",
 			"type": "image",
-			"name": "stepNumber5_png"
+			"name": "share_btn2_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber6.png",
+			"url": "assets/common/toast.png",
 			"type": "image",
-			"name": "stepNumber6_png"
+			"name": "toast_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber7.png",
+			"url": "assets/common/按钮 副本 3.png",
 			"type": "image",
-			"name": "stepNumber7_png"
+			"name": "按钮 副本 3_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber8.png",
+			"url": "assets/common/按钮 副本 4.png",
 			"type": "image",
-			"name": "stepNumber8_png"
+			"name": "按钮 副本 4_png"
 		},
 		{
-			"url": "assets/mainScene/stepNumber9.png",
+			"url": "assets/common/朋友圈中间分享蒙层1.jpg",
 			"type": "image",
-			"name": "stepNumber9_png"
+			"name": "朋友圈中间分享蒙层1_jpg"
 		},
 		{
-			"url": "assets/mainScene/stepsBoard.png",
+			"url": "assets/startpanel2/startpanel_avatar.png",
 			"type": "image",
-			"name": "stepsBoard_png"
+			"name": "startpanel_avatar_png"
 		},
 		{
-			"url": "assets/mainScene/targetBoard.png",
+			"url": "assets/startpanel2/startpanel_bg2.png",
 			"type": "image",
-			"name": "targetBoard_png"
+			"name": "startpanel_bg2_png"
 		},
 		{
-			"url": "assets/mainScene/unlightedStar.png",
+			"url": "assets/startpanel2/startpanel_block2.png",
 			"type": "image",
-			"name": "unlightedStar_png"
+			"name": "startpanel_block2_png"
 		},
 		{
-			"url": "assets/mainScene/yezi1.png",
+			"url": "assets/startpanel2/startpanel_ele6.png",
 			"type": "image",
-			"name": "yezi1_png"
+			"name": "startpanel_ele6_png"
 		},
 		{
-			"url": "assets/sounds/eliminate.mp3",
-			"type": "sound",
-			"name": "eliminate_mp3"
+			"url": "assets/startpanel2/startpanel_icon.png",
+			"type": "image",
+			"name": "startpanel_icon_png"
 		},
 		{
-			"url": "assets/sounds/fail.mp3",
-			"type": "sound",
-			"name": "fail_mp3"
+			"url": "assets/startpanel2/startpanel_icon1.png",
+			"type": "image",
+			"name": "startpanel_icon1_png"
 		},
 		{
-			"url": "assets/sounds/fall.mp3",
-			"type": "sound",
-			"name": "fall_mp3"
+			"url": "assets/startpanel2/startpanel_icon2.png",
+			"type": "image",
+			"name": "startpanel_icon2_png"
 		},
 		{
-			"url": "assets/sounds/line.mp3",
-			"type": "sound",
-			"name": "line_mp3"
+			"url": "assets/startpanel2/startpanel_icon3.png",
+			"type": "image",
+			"name": "startpanel_icon3_png"
 		},
 		{
-			"url": "assets/sounds/sucess.mp3",
-			"type": "sound",
-			"name": "sucess_mp3"
+			"url": "assets/startpanel2/startpanel按钮.png",
+			"type": "image",
+			"name": "startpanel按钮_png"
 		},
 		{
-			"url": "assets/sounds/mapBg.mp3",
-			"type": "sound",
-			"name": "mapBg_mp3"
+			"url": "assets/startpanel2/startpanel数量 副本 3.png",
+			"type": "image",
+			"name": "startpanel数量 副本 3_png"
 		},
 		{
-			"url": "assets/sounds/toast.mp3",
-			"type": "sound",
-			"name": "toast_mp3"
+			"url": "assets/startpanel2/startpanel数量.png",
+			"type": "image",
+			"name": "startpanel数量_png"
 		},
 		{
-			"url": "assets/sounds/playBg.mp3",
-			"type": "sound",
-			"name": "playBg_mp3"
+			"url": "assets/startpanel2/startpanel目标3.png",
+			"type": "image",
+			"name": "startpanel目标3_png"
 		},
 		{
-			"url": "assets/sounds/magic.mp3",
-			"type": "sound",
-			"name": "magic_mp3"
+			"url": "assets/startpanel2/startpanel目标33.png",
+			"type": "image",
+			"name": "startpanel目标33_png"
 		},
 		{
-			"url": "assets/sounds/boom.mp3",
-			"type": "sound",
-			"name": "boom_mp3"
+			"url": "assets/startpanel2/startpanel通关条件.png",
+			"type": "image",
+			"name": "startpanel通关条件_png"
 		},
 		{
-			"url": "assets/mainScene/mainSoundBtnOn.png",
+			"url": "assets/invite/rule/invite_rule_bg.png",
 			"type": "image",
-			"name": "mainSoundBtnOn_png"
+			"name": "invite_rule_bg_png"
 		},
 		{
-			"url": "assets/mainScene/mainMusicBtnOn.png",
+			"url": "assets/invite/prize/invitePrize_btn.png",
 			"type": "image",
-			"name": "mainMusicBtnOn_png"
+			"name": "invitePrize_btn_png"
 		},
 		{
-			"url": "assets/mainScene/mainQuestionBtn.png",
+			"url": "assets/invite/prize/invitePrize_bg.png",
 			"type": "image",
-			"name": "mainQuestionBtn_png"
+			"name": "invitePrize_bg_png"
 		},
 		{
-			"url": "assets/mainScene/mainQuitBtn.png",
+			"url": "assets/invite/prize/invitePrize_game_btn.png",
 			"type": "image",
-			"name": "mainQuitBtn_png"
+			"name": "invitePrize_game_btn_png"
 		},
 		{
-			"url": "assets/mainScene/mainSettingBg.png",
+			"url": "assets/invite/cutTime/invateCut_bg.png",
 			"type": "image",
-			"name": "mainSettingBg_png"
+			"name": "invateCut_bg_png"
 		},
 		{
-			"url": "assets/mainScene/mainSoundBtnOff.png",
+			"url": "assets/invite/cutTime/invateCut_btn.png",
 			"type": "image",
-			"name": "mainSoundBtnOff_png"
+			"name": "invateCut_btn_png"
 		},
 		{
-			"url": "assets/mainScene/mainMusicBtnOff.png",
+			"url": "assets/invite/invite_wx_tip.png",
 			"type": "image",
-			"name": "mainMusicBtnOff_png"
+			"name": "invite_wx_tip_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber9.png",
-			"type": "image",
-			"name": "targetNumber9_png"
+			"url": "assets/common/cutTimeFont.fnt",
+			"type": "font",
+			"name": "cutTimeFont_fnt"
 		},
 		{
-			"url": "assets/mainScene/targetNumber0.png",
+			"url": "assets/common/cutTimeFont.png",
 			"type": "image",
-			"name": "targetNumber0_png"
+			"name": "cutTimeFont_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber1.png",
+			"url": "assets/mainScene/bonusFra1.png",
 			"type": "image",
-			"name": "targetNumber1_png"
+			"name": "bonusFra1_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber2.png",
+			"url": "assets/mainScene/bonusFra10.png",
 			"type": "image",
-			"name": "targetNumber2_png"
+			"name": "bonusFra10_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber3.png",
+			"url": "assets/mainScene/bonusFra11.png",
 			"type": "image",
-			"name": "targetNumber3_png"
+			"name": "bonusFra11_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber4.png",
+			"url": "assets/mainScene/bonusFra12.png",
 			"type": "image",
-			"name": "targetNumber4_png"
+			"name": "bonusFra12_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber5.png",
+			"url": "assets/mainScene/bonusFra13.png",
 			"type": "image",
-			"name": "targetNumber5_png"
+			"name": "bonusFra13_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber6.png",
+			"url": "assets/mainScene/bonusFra14.png",
 			"type": "image",
-			"name": "targetNumber6_png"
+			"name": "bonusFra14_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber7.png",
+			"url": "assets/mainScene/bonusFra15.png",
 			"type": "image",
-			"name": "targetNumber7_png"
+			"name": "bonusFra15_png"
 		},
 		{
-			"url": "assets/mainScene/targetNumber8.png",
+			"url": "assets/mainScene/bonusFra16.png",
 			"type": "image",
-			"name": "targetNumber8_png"
+			"name": "bonusFra16_png"
 		},
 		{
-			"url": "assets/mainScene/ele7.png",
+			"url": "assets/mainScene/bonusFra17.png",
 			"type": "image",
-			"name": "ele7_png"
+			"name": "bonusFra17_png"
 		},
 		{
-			"url": "assets/mainScene/ele6.png",
+			"url": "assets/mainScene/bonusFra18.png",
 			"type": "image",
-			"name": "ele6_png"
+			"name": "bonusFra18_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra27.png",
+			"url": "assets/mainScene/bonusFra19.png",
 			"type": "image",
-			"name": "bonusFra27_png"
+			"name": "bonusFra19_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra1.png",
+			"url": "assets/mainScene/bonusFra2.png",
 			"type": "image",
-			"name": "bonusFra1_png"
+			"name": "bonusFra2_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra2.png",
+			"url": "assets/mainScene/bonusFra20.png",
 			"type": "image",
-			"name": "bonusFra2_png"
+			"name": "bonusFra20_png"
+		},
+		{
+			"url": "assets/mainScene/bonusFra21.png",
+			"type": "image",
+			"name": "bonusFra21_png"
+		},
+		{
+			"url": "assets/mainScene/bonusFra22.png",
+			"type": "image",
+			"name": "bonusFra22_png"
+		},
+		{
+			"url": "assets/mainScene/bonusFra23.png",
+			"type": "image",
+			"name": "bonusFra23_png"
+		},
+		{
+			"url": "assets/mainScene/bonusFra24.png",
+			"type": "image",
+			"name": "bonusFra24_png"
+		},
+		{
+			"url": "assets/mainScene/bonusFra25.png",
+			"type": "image",
+			"name": "bonusFra25_png"
+		},
+		{
+			"url": "assets/mainScene/bonusFra26.png",
+			"type": "image",
+			"name": "bonusFra26_png"
+		},
+		{
+			"url": "assets/mainScene/bonusFra27.png",
+			"type": "image",
+			"name": "bonusFra27_png"
 		},
 		{
 			"url": "assets/mainScene/bonusFra3.png",
@@ -1196,269 +1207,279 @@
 			"name": "bonusFra9_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra10.png",
+			"url": "assets/mainScene/bonusShoot.png",
 			"type": "image",
-			"name": "bonusFra10_png"
+			"name": "bonusShoot_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra11.png",
+			"url": "assets/mainScene/bonusTime.png",
 			"type": "image",
-			"name": "bonusFra11_png"
+			"name": "bonusTime_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra12.png",
+			"url": "assets/mainScene/boom1.png",
 			"type": "image",
-			"name": "bonusFra12_png"
+			"name": "boom1_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra13.png",
+			"url": "assets/mainScene/boom10.png",
 			"type": "image",
-			"name": "bonusFra13_png"
+			"name": "boom10_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra14.png",
+			"url": "assets/mainScene/boom11.png",
 			"type": "image",
-			"name": "bonusFra14_png"
+			"name": "boom11_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra15.png",
+			"url": "assets/mainScene/boom12.png",
 			"type": "image",
-			"name": "bonusFra15_png"
+			"name": "boom12_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra16.png",
+			"url": "assets/mainScene/boom13.png",
 			"type": "image",
-			"name": "bonusFra16_png"
+			"name": "boom13_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra17.png",
+			"url": "assets/mainScene/boom14.png",
 			"type": "image",
-			"name": "bonusFra17_png"
+			"name": "boom14_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra18.png",
+			"url": "assets/mainScene/boom15.png",
 			"type": "image",
-			"name": "bonusFra18_png"
+			"name": "boom15_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra19.png",
+			"url": "assets/mainScene/boom16.png",
 			"type": "image",
-			"name": "bonusFra19_png"
+			"name": "boom16_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra20.png",
+			"url": "assets/mainScene/boom17.png",
 			"type": "image",
-			"name": "bonusFra20_png"
+			"name": "boom17_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra21.png",
+			"url": "assets/mainScene/boom18.png",
 			"type": "image",
-			"name": "bonusFra21_png"
+			"name": "boom18_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra22.png",
+			"url": "assets/mainScene/boom2.png",
 			"type": "image",
-			"name": "bonusFra22_png"
+			"name": "boom2_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra23.png",
+			"url": "assets/mainScene/boom3.png",
 			"type": "image",
-			"name": "bonusFra23_png"
+			"name": "boom3_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra24.png",
+			"url": "assets/mainScene/boom4.png",
 			"type": "image",
-			"name": "bonusFra24_png"
+			"name": "boom4_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra25.png",
+			"url": "assets/mainScene/boom5.png",
 			"type": "image",
-			"name": "bonusFra25_png"
+			"name": "boom5_png"
 		},
 		{
-			"url": "assets/mainScene/bonusFra26.png",
+			"url": "assets/mainScene/boom6.png",
 			"type": "image",
-			"name": "bonusFra26_png"
+			"name": "boom6_png"
 		},
 		{
-			"url": "assets/mainScene/bonusShoot.png",
+			"url": "assets/mainScene/boom7.png",
 			"type": "image",
-			"name": "bonusShoot_png"
+			"name": "boom7_png"
 		},
 		{
-			"url": "assets/share2.jpg",
+			"url": "assets/mainScene/boom8.png",
 			"type": "image",
-			"name": "share2_jpg"
+			"name": "boom8_png"
 		},
 		{
-			"url": "assets/showoff.jpg",
+			"url": "assets/mainScene/boom9.png",
 			"type": "image",
-			"name": "showoff_jpg"
+			"name": "boom9_png"
 		},
 		{
-			"url": "assets/mainScene/guideTxt5.png",
+			"url": "assets/mainScene/boomBtn.png",
 			"type": "image",
-			"name": "guideTxt5_png"
+			"name": "boomBtn_png"
 		},
 		{
-			"url": "assets/mainScene/guideBg.png",
+			"url": "assets/mainScene/chooseRect.png",
 			"type": "image",
-			"name": "guideBg_png"
+			"name": "chooseRect_png"
 		},
 		{
-			"url": "assets/mainScene/guideKnowBtn.png",
+			"url": "assets/mainScene/dangqianfenshu.png",
 			"type": "image",
-			"name": "guideKnowBtn_png"
+			"name": "dangqianfenshu_png"
 		},
 		{
-			"url": "assets/mainScene/guideTxt1.png",
+			"url": "assets/mainScene/eggPiece1.png",
 			"type": "image",
-			"name": "guideTxt1_png"
+			"name": "eggPiece1_png"
 		},
 		{
-			"url": "assets/mainScene/guideTxt2.png",
+			"url": "assets/mainScene/eggPiece2.png",
 			"type": "image",
-			"name": "guideTxt2_png"
+			"name": "eggPiece2_png"
 		},
 		{
-			"url": "assets/mainScene/guideTxt3.png",
+			"url": "assets/mainScene/eggPiece3.png",
 			"type": "image",
-			"name": "guideTxt3_png"
+			"name": "eggPiece3_png"
 		},
 		{
-			"url": "assets/mainScene/guideTxt4.png",
+			"url": "assets/mainScene/eggPiece4.png",
 			"type": "image",
-			"name": "guideTxt4_png"
+			"name": "eggPiece4_png"
 		},
 		{
-			"url": "assets/mainScene/propNum9.png",
+			"url": "assets/mainScene/eggPiece5.png",
 			"type": "image",
-			"name": "propNum9_png"
+			"name": "eggPiece5_png"
 		},
 		{
-			"url": "assets/mainScene/propNum0.png",
+			"url": "assets/mainScene/eggStatus0.png",
 			"type": "image",
-			"name": "propNum0_png"
+			"name": "eggStatus0_png"
 		},
 		{
-			"url": "assets/mainScene/propNum1.png",
+			"url": "assets/mainScene/eggStatus1.png",
 			"type": "image",
-			"name": "propNum1_png"
+			"name": "eggStatus1_png"
 		},
 		{
-			"url": "assets/mainScene/propNum2.png",
+			"url": "assets/mainScene/eggStatus2.png",
 			"type": "image",
-			"name": "propNum2_png"
+			"name": "eggStatus2_png"
 		},
 		{
-			"url": "assets/mainScene/propNum3.png",
+			"url": "assets/mainScene/ele0.png",
 			"type": "image",
-			"name": "propNum3_png"
+			"name": "ele0_png"
 		},
 		{
-			"url": "assets/mainScene/propNum4.png",
+			"url": "assets/mainScene/ele0Exp.png",
 			"type": "image",
-			"name": "propNum4_png"
+			"name": "ele0Exp_png"
 		},
 		{
-			"url": "assets/mainScene/propNum5.png",
+			"url": "assets/mainScene/ele0Line.png",
 			"type": "image",
-			"name": "propNum5_png"
+			"name": "ele0Line_png"
 		},
 		{
-			"url": "assets/mainScene/propNum6.png",
+			"url": "assets/mainScene/ele1.png",
 			"type": "image",
-			"name": "propNum6_png"
+			"name": "ele1_png"
 		},
 		{
-			"url": "assets/mainScene/propNum7.png",
+			"url": "assets/mainScene/ele1Exp.png",
 			"type": "image",
-			"name": "propNum7_png"
+			"name": "ele1Exp_png"
 		},
 		{
-			"url": "assets/mainScene/propNum8.png",
+			"url": "assets/mainScene/ele1Line.png",
 			"type": "image",
-			"name": "propNum8_png"
+			"name": "ele1Line_png"
 		},
 		{
-			"url": "assets/mainScene/propNumBg.png",
+			"url": "assets/mainScene/ele2.png",
 			"type": "image",
-			"name": "propNumBg_png"
+			"name": "ele2_png"
 		},
 		{
-			"url": "assets/map/iconbg.png",
+			"url": "assets/mainScene/ele2Exp.png",
 			"type": "image",
-			"name": "iconbg_png"
+			"name": "ele2Exp_png"
 		},
 		{
-			"url": "assets/blood/blood按钮 副本.png",
+			"url": "assets/mainScene/ele2Line.png",
 			"type": "image",
-			"name": "blood按钮 副本_png"
+			"name": "ele2Line_png"
 		},
 		{
-			"url": "assets/blood/blood按钮.png",
+			"url": "assets/mainScene/ele3.png",
 			"type": "image",
-			"name": "blood按钮_png"
+			"name": "ele3_png"
 		},
 		{
-			"url": "assets/blood/blood按钮 副本1.png",
+			"url": "assets/mainScene/ele3Exp.png",
 			"type": "image",
-			"name": "blood按钮 副本1_png"
+			"name": "ele3Exp_png"
 		},
 		{
-			"url": "assets/blood/blood体力补济站.png",
+			"url": "assets/mainScene/ele3Line.png",
 			"type": "image",
-			"name": "blood体力补济站_png"
+			"name": "ele3Line_png"
 		},
 		{
-			"url": "assets/map/音乐关闭.png",
+			"url": "assets/mainScene/ele4.png",
 			"type": "image",
-			"name": "音乐关闭_png"
+			"name": "ele4_png"
 		},
 		{
-			"url": "assets/map/声音关闭.png",
+			"url": "assets/mainScene/ele4Exp.png",
 			"type": "image",
-			"name": "声音关闭_png"
+			"name": "ele4Exp_png"
 		},
 		{
-			"url": "assets/mainScene/bonusTime.png",
+			"url": "assets/mainScene/ele4Line.png",
 			"type": "image",
-			"name": "bonusTime_png"
+			"name": "ele4Line_png"
 		},
 		{
-			"url": "assets/share3.jpg",
+			"url": "assets/mainScene/ele5.png",
 			"type": "image",
-			"name": "share3_jpg"
+			"name": "ele5_png"
 		},
 		{
-			"url": "assets/common/朋友圈中间分享蒙层1.jpg",
+			"url": "assets/mainScene/ele6.png",
 			"type": "image",
-			"name": "朋友圈中间分享蒙层1_jpg"
+			"name": "ele6_png"
 		},
 		{
-			"url": "assets/common/share_btn1.png",
+			"url": "assets/mainScene/ele7.png",
 			"type": "image",
-			"name": "share_btn1_png"
+			"name": "ele7_png"
 		},
 		{
-			"url": "assets/common/share_btn2.png",
+			"url": "assets/mainScene/ele8.png",
 			"type": "image",
-			"name": "share_btn2_png"
+			"name": "ele8_png"
 		},
 		{
-			"url": "assets/box2/box2_bg.png",
+			"url": "assets/mainScene/ele9.png",
 			"type": "image",
-			"name": "box2_bg_png"
+			"name": "ele9_png"
 		},
 		{
-			"url": "assets/common/commmon_okbtn1.png",
+			"url": "assets/mainScene/eleDis1.png",
 			"type": "image",
-			"name": "commmon_okbtn1_png"
+			"name": "eleDis1_png"
 		},
 		{
-			"url": "assets/mainScene/eleDis19.png",
+			"url": "assets/mainScene/eleDis10.png",
 			"type": "image",
-			"name": "eleDis19_png"
+			"name": "eleDis10_png"
+		},
+		{
+			"url": "assets/mainScene/eleDis11.png",
+			"type": "image",
+			"name": "eleDis11_png"
+		},
+		{
+			"url": "assets/mainScene/eleDis12.png",
+			"type": "image",
+			"name": "eleDis12_png"
 		},
 		{
 			"url": "assets/mainScene/eleDis13.png",
@@ -1491,479 +1512,709 @@
 			"name": "eleDis18_png"
 		},
 		{
-			"url": "assets/common/lightani.png",
+			"url": "assets/mainScene/eleDis19.png",
 			"type": "image",
-			"name": "lightani_png"
+			"name": "eleDis19_png"
 		},
 		{
-			"url": "assets/prize2/prize2_icon.png",
+			"url": "assets/mainScene/eleDis2.png",
 			"type": "image",
-			"name": "prize2_icon_png"
+			"name": "eleDis2_png"
 		},
 		{
-			"url": "assets/common/prizePanelbg.png",
+			"url": "assets/mainScene/eleDis3.png",
 			"type": "image",
-			"name": "prizePanelbg_png"
+			"name": "eleDis3_png"
 		},
 		{
-			"url": "assets/showoff1.jpg",
+			"url": "assets/mainScene/eleDis4.png",
 			"type": "image",
-			"name": "showoff1_jpg"
+			"name": "eleDis4_png"
 		},
 		{
-			"url": "assets/sounds/bonusShoot.mp3",
-			"type": "sound",
-			"name": "bonusShoot_mp3"
+			"url": "assets/mainScene/eleDis5.png",
+			"type": "image",
+			"name": "eleDis5_png"
 		},
 		{
-			"url": "assets/map/recordbtn.png",
+			"url": "assets/mainScene/eleDis6.png",
 			"type": "image",
-			"name": "recordbtn_png"
+			"name": "eleDis6_png"
 		},
 		{
-			"url": "assets/map/guideMoney.png",
+			"url": "assets/mainScene/eleDis7.png",
 			"type": "image",
-			"name": "guideMoney_png"
+			"name": "eleDis7_png"
 		},
 		{
-			"url": "assets/map/guideBox.png",
+			"url": "assets/mainScene/eleDis8.png",
 			"type": "image",
-			"name": "guideBox_png"
+			"name": "eleDis8_png"
 		},
 		{
-			"url": "assets/map/msgTri.png",
+			"url": "assets/mainScene/eleDis9.png",
 			"type": "image",
-			"name": "msgTri_png"
+			"name": "eleDis9_png"
 		},
 		{
-			"url": "assets/map/lionMsgBg.png",
+			"url": "assets/mainScene/exLighting1.png",
 			"type": "image",
-			"name": "lionMsgBg_png"
+			"name": "exLighting1_png"
 		},
 		{
-			"url": "assets/map/guideOver.png",
+			"url": "assets/mainScene/exLighting11.png",
 			"type": "image",
-			"name": "guideOver_png"
+			"name": "exLighting11_png"
 		},
 		{
-			"url": "assets/map/guideLove.png",
+			"url": "assets/mainScene/exLighting14.png",
 			"type": "image",
-			"name": "guideLove_png"
+			"name": "exLighting14_png"
 		},
 		{
-			"url": "assets/map/guideLevel.png",
+			"url": "assets/mainScene/exLighting16.png",
 			"type": "image",
-			"name": "guideLevel_png"
+			"name": "exLighting16_png"
 		},
 		{
-			"url": "assets/common/common_prizelight.png",
+			"url": "assets/mainScene/exLighting18.png",
 			"type": "image",
-			"name": "common_prizelight_png"
+			"name": "exLighting18_png"
 		},
 		{
-			"url": "assets/common/common_yuanbao.png",
+			"url": "assets/mainScene/exLighting19.png",
 			"type": "image",
-			"name": "common_yuanbao_png"
+			"name": "exLighting19_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel数量.png",
+			"url": "assets/mainScene/exLighting21.png",
 			"type": "image",
-			"name": "startpanel数量_png"
+			"name": "exLighting21_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel按钮.png",
+			"url": "assets/mainScene/exLighting23.png",
 			"type": "image",
-			"name": "startpanel按钮_png"
+			"name": "exLighting23_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel数量 副本 3.png",
+			"url": "assets/mainScene/exLighting25.png",
 			"type": "image",
-			"name": "startpanel数量 副本 3_png"
+			"name": "exLighting25_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel通关条件.png",
+			"url": "assets/mainScene/exLighting27.png",
 			"type": "image",
-			"name": "startpanel通关条件_png"
+			"name": "exLighting27_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel_block2.png",
+			"url": "assets/mainScene/exLighting29.png",
 			"type": "image",
-			"name": "startpanel_block2_png"
+			"name": "exLighting29_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel目标3.png",
+			"url": "assets/mainScene/exLighting3.png",
 			"type": "image",
-			"name": "startpanel目标3_png"
+			"name": "exLighting3_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel目标33.png",
+			"url": "assets/mainScene/exLighting32.png",
 			"type": "image",
-			"name": "startpanel目标33_png"
+			"name": "exLighting32_png"
 		},
 		{
-			"url": "assets/common/nums2.fnt",
-			"type": "font",
-			"name": "nums2_fnt"
+			"url": "assets/mainScene/exLighting34.png",
+			"type": "image",
+			"name": "exLighting34_png"
+		},
+		{
+			"url": "assets/mainScene/exLighting5.png",
+			"type": "image",
+			"name": "exLighting5_png"
+		},
+		{
+			"url": "assets/mainScene/exLighting7.png",
+			"type": "image",
+			"name": "exLighting7_png"
+		},
+		{
+			"url": "assets/mainScene/exLighting9.png",
+			"type": "image",
+			"name": "exLighting9_png"
+		},
+		{
+			"url": "assets/mainScene/greenCircleDown.png",
+			"type": "image",
+			"name": "greenCircleDown_png"
+		},
+		{
+			"url": "assets/mainScene/greenCircleUp.png",
+			"type": "image",
+			"name": "greenCircleUp_png"
+		},
+		{
+			"url": "assets/mainScene/guidePropBoom.png",
+			"type": "image",
+			"name": "guidePropBoom_png"
+		},
+		{
+			"url": "assets/mainScene/guidePropCow.png",
+			"type": "image",
+			"name": "guidePropCow_png"
+		},
+		{
+			"url": "assets/mainScene/guidePropHammer.png",
+			"type": "image",
+			"name": "guidePropHammer_png"
+		},
+		{
+			"url": "assets/mainScene/guidePropHand.png",
+			"type": "image",
+			"name": "guidePropHand_png"
+		},
+		{
+			"url": "assets/mainScene/guidePropMsgPanel.png",
+			"type": "image",
+			"name": "guidePropMsgPanel_png"
+		},
+		{
+			"url": "assets/mainScene/guidePropShoe.png",
+			"type": "image",
+			"name": "guidePropShoe_png"
+		},
+		{
+			"url": "assets/mainScene/hammerBtn.png",
+			"type": "image",
+			"name": "hammerBtn_png"
+		},
+		{
+			"url": "assets/mainScene/ice2.png",
+			"type": "image",
+			"name": "ice2_png"
+		},
+		{
+			"url": "assets/mainScene/ice3.png",
+			"type": "image",
+			"name": "ice3_png"
+		},
+		{
+			"url": "assets/mainScene/ice4.png",
+			"type": "image",
+			"name": "ice4_png"
+		},
+		{
+			"url": "assets/mainScene/ice5.png",
+			"type": "image",
+			"name": "ice5_png"
+		},
+		{
+			"url": "assets/mainScene/ice6.png",
+			"type": "image",
+			"name": "ice6_png"
+		},
+		{
+			"url": "assets/mainScene/jellyArrow.png",
+			"type": "image",
+			"name": "jellyArrow_png"
+		},
+		{
+			"url": "assets/mainScene/leftArrow.png",
+			"type": "image",
+			"name": "leftArrow_png"
+		},
+		{
+			"url": "assets/mainScene/lightedStar.png",
+			"type": "image",
+			"name": "lightedStar_png"
+		},
+		{
+			"url": "assets/mainScene/lineLight.png",
+			"type": "image",
+			"name": "lineLight_png"
+		},
+		{
+			"url": "assets/mainScene/lockDown.png",
+			"type": "image",
+			"name": "lockDown_png"
+		},
+		{
+			"url": "assets/mainScene/lockUp.png",
+			"type": "image",
+			"name": "lockUp_png"
+		},
+		{
+			"url": "assets/mainScene/lockVine.png",
+			"type": "image",
+			"name": "lockVine_png"
+		},
+		{
+			"url": "assets/mainScene/magicLion.png",
+			"type": "image",
+			"name": "magicLion_png"
+		},
+		{
+			"url": "assets/mainScene/magicLionBg.png",
+			"type": "image",
+			"name": "magicLionBg_png"
+		},
+		{
+			"url": "assets/mainScene/mainMusicBtnOff.png",
+			"type": "image",
+			"name": "mainMusicBtnOff_png"
+		},
+		{
+			"url": "assets/mainScene/mainMusicBtnOn.png",
+			"type": "image",
+			"name": "mainMusicBtnOn_png"
+		},
+		{
+			"url": "assets/mainScene/mainQuestionBtn.png",
+			"type": "image",
+			"name": "mainQuestionBtn_png"
+		},
+		{
+			"url": "assets/mainScene/mainQuitBtn.png",
+			"type": "image",
+			"name": "mainQuitBtn_png"
+		},
+		{
+			"url": "assets/mainScene/mainSettingBg.png",
+			"type": "image",
+			"name": "mainSettingBg_png"
+		},
+		{
+			"url": "assets/mainScene/mainSoundBtnOff.png",
+			"type": "image",
+			"name": "mainSoundBtnOff_png"
+		},
+		{
+			"url": "assets/mainScene/mainSoundBtnOn.png",
+			"type": "image",
+			"name": "mainSoundBtnOn_png"
+		},
+		{
+			"url": "assets/mainScene/main_mapbottom.png",
+			"type": "image",
+			"name": "main_mapbottom_png"
+		},
+		{
+			"url": "assets/mainScene/playSceneBg.jpg",
+			"type": "image",
+			"name": "playSceneBg_jpg"
+		},
+		{
+			"url": "assets/mainScene/progressDown.png",
+			"type": "image",
+			"name": "progressDown_png"
+		},
+		{
+			"url": "assets/mainScene/propNum0.png",
+			"type": "image",
+			"name": "propNum0_png"
+		},
+		{
+			"url": "assets/mainScene/propNum1.png",
+			"type": "image",
+			"name": "propNum1_png"
+		},
+		{
+			"url": "assets/mainScene/propNum2.png",
+			"type": "image",
+			"name": "propNum2_png"
+		},
+		{
+			"url": "assets/mainScene/propNum3.png",
+			"type": "image",
+			"name": "propNum3_png"
+		},
+		{
+			"url": "assets/mainScene/propNum4.png",
+			"type": "image",
+			"name": "propNum4_png"
+		},
+		{
+			"url": "assets/mainScene/propNum5.png",
+			"type": "image",
+			"name": "propNum5_png"
+		},
+		{
+			"url": "assets/mainScene/propNum6.png",
+			"type": "image",
+			"name": "propNum6_png"
+		},
+		{
+			"url": "assets/mainScene/propNum7.png",
+			"type": "image",
+			"name": "propNum7_png"
+		},
+		{
+			"url": "assets/mainScene/propNum8.png",
+			"type": "image",
+			"name": "propNum8_png"
+		},
+		{
+			"url": "assets/mainScene/propNum9.png",
+			"type": "image",
+			"name": "propNum9_png"
 		},
 		{
-			"url": "assets/common/nums2.png",
+			"url": "assets/mainScene/propNumBg.png",
 			"type": "image",
-			"name": "nums2_png"
+			"name": "propNumBg_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel_ele6.png",
+			"url": "assets/mainScene/rectLat.png",
 			"type": "image",
-			"name": "startpanel_ele6_png"
+			"name": "rectLat_png"
 		},
 		{
-			"url": "assets/startpanel2/startpanel_ice1.png",
+			"url": "assets/mainScene/rightArrow.png",
 			"type": "image",
-			"name": "startpanel_ice1_png"
+			"name": "rightArrow_png"
 		},
 		{
-			"url": "assets/mainScene/main_mapbottom.png",
+			"url": "assets/mainScene/rightMark.png",
 			"type": "image",
-			"name": "main_mapbottom_png"
+			"name": "rightMark_png"
 		},
 		{
-			"url": "assets/mainScene/guidePropHand.png",
+			"url": "assets/mainScene/rock2.png",
 			"type": "image",
-			"name": "guidePropHand_png"
+			"name": "rock2_png"
 		},
 		{
-			"url": "assets/mainScene/guidePropCow.png",
+			"url": "assets/mainScene/rock3.png",
 			"type": "image",
-			"name": "guidePropCow_png"
+			"name": "rock3_png"
 		},
 		{
-			"url": "assets/mainScene/guidePropMsgPanel.png",
+			"url": "assets/mainScene/rock4.png",
 			"type": "image",
-			"name": "guidePropMsgPanel_png"
+			"name": "rock4_png"
 		},
 		{
-			"url": "assets/mainScene/guidePropShoe.png",
+			"url": "assets/mainScene/rock5.png",
 			"type": "image",
-			"name": "guidePropShoe_png"
+			"name": "rock5_png"
 		},
 		{
-			"url": "assets/mainScene/guidePropHammer.png",
+			"url": "assets/mainScene/rock6.png",
 			"type": "image",
-			"name": "guidePropHammer_png"
+			"name": "rock6_png"
 		},
 		{
-			"url": "assets/mainScene/guidePropBoom.png",
+			"url": "assets/mainScene/scoreNumber0.png",
 			"type": "image",
-			"name": "guidePropBoom_png"
+			"name": "scoreNumber0_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni11.png",
+			"url": "assets/mainScene/scoreNumber1.png",
 			"type": "image",
-			"name": "stepAni11_png"
+			"name": "scoreNumber1_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni1.png",
+			"url": "assets/mainScene/scoreNumber2.png",
 			"type": "image",
-			"name": "stepAni1_png"
+			"name": "scoreNumber2_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni2.png",
+			"url": "assets/mainScene/scoreNumber3.png",
 			"type": "image",
-			"name": "stepAni2_png"
+			"name": "scoreNumber3_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni3.png",
+			"url": "assets/mainScene/scoreNumber4.png",
 			"type": "image",
-			"name": "stepAni3_png"
+			"name": "scoreNumber4_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni4.png",
+			"url": "assets/mainScene/scoreNumber5.png",
 			"type": "image",
-			"name": "stepAni4_png"
+			"name": "scoreNumber5_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni5.png",
+			"url": "assets/mainScene/scoreNumber6.png",
 			"type": "image",
-			"name": "stepAni5_png"
+			"name": "scoreNumber6_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni6.png",
+			"url": "assets/mainScene/scoreNumber7.png",
 			"type": "image",
-			"name": "stepAni6_png"
+			"name": "scoreNumber7_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni7.png",
+			"url": "assets/mainScene/scoreNumber8.png",
 			"type": "image",
-			"name": "stepAni7_png"
+			"name": "scoreNumber8_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni8.png",
+			"url": "assets/mainScene/scoreNumber9.png",
 			"type": "image",
-			"name": "stepAni8_png"
+			"name": "scoreNumber9_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni9.png",
+			"url": "assets/mainScene/setting.png",
 			"type": "image",
-			"name": "stepAni9_png"
+			"name": "setting_png"
 		},
 		{
-			"url": "assets/mainScene/stepAni10.png",
+			"url": "assets/mainScene/starProgress.png",
 			"type": "image",
-			"name": "stepAni10_png"
+			"name": "starProgress_png"
 		},
 		{
-			"url": "assets/blood2/blood2按钮 副本1.png",
+			"url": "assets/mainScene/stepAni1.png",
 			"type": "image",
-			"name": "blood2按钮 副本1_png"
+			"name": "stepAni1_png"
 		},
 		{
-			"url": "assets/blood2/blood2按钮 副本.png",
+			"url": "assets/mainScene/stepAni10.png",
 			"type": "image",
-			"name": "blood2按钮 副本_png"
+			"name": "stepAni10_png"
 		},
 		{
-			"url": "assets/signprize/signprize_btn.png",
+			"url": "assets/mainScene/stepAni11.png",
 			"type": "image",
-			"name": "signprize_btn_png"
+			"name": "stepAni11_png"
 		},
 		{
-			"url": "assets/signprize/singprizebg.png",
+			"url": "assets/mainScene/stepAni2.png",
 			"type": "image",
-			"name": "singprizebg_png"
+			"name": "stepAni2_png"
 		},
 		{
-			"url": "assets/mainScene/lockVine.png",
+			"url": "assets/mainScene/stepAni3.png",
 			"type": "image",
-			"name": "lockVine_png"
+			"name": "stepAni3_png"
 		},
 		{
-			"url": "assets/sign/signbtn1.png",
+			"url": "assets/mainScene/stepAni4.png",
 			"type": "image",
-			"name": "signbtn1_png"
+			"name": "stepAni4_png"
 		},
 		{
-			"url": "assets/sign/signbtn2.png",
+			"url": "assets/mainScene/stepAni5.png",
 			"type": "image",
-			"name": "signbtn2_png"
+			"name": "stepAni5_png"
 		},
 		{
-			"url": "assets/sign/signbtn3.png",
+			"url": "assets/mainScene/stepAni6.png",
 			"type": "image",
-			"name": "signbtn3_png"
+			"name": "stepAni6_png"
 		},
 		{
-			"url": "assets/sign/signbtn4.png",
+			"url": "assets/mainScene/stepAni7.png",
 			"type": "image",
-			"name": "signbtn4_png"
+			"name": "stepAni7_png"
 		},
 		{
-			"url": "assets/sign/sign_line.png",
+			"url": "assets/mainScene/stepAni8.png",
 			"type": "image",
-			"name": "sign_line_png"
+			"name": "stepAni8_png"
 		},
 		{
-			"url": "assets/sign/sign_icon1.png",
+			"url": "assets/mainScene/stepAni9.png",
 			"type": "image",
-			"name": "sign_icon1_png"
+			"name": "stepAni9_png"
 		},
 		{
-			"url": "assets/sign/signicon2.png",
+			"url": "assets/mainScene/stepBtn.png",
 			"type": "image",
-			"name": "signicon2_png"
+			"name": "stepBtn_png"
 		},
 		{
-			"url": "assets/sign/signicon3.png",
+			"url": "assets/mainScene/stepNumber0.png",
 			"type": "image",
-			"name": "signicon3_png"
+			"name": "stepNumber0_png"
 		},
 		{
-			"url": "assets/sign/signitem.png",
+			"url": "assets/mainScene/stepNumber1.png",
 			"type": "image",
-			"name": "signitem_png"
+			"name": "stepNumber1_png"
 		},
 		{
-			"url": "assets/exchange/exchangebtn.png",
+			"url": "assets/mainScene/stepNumber2.png",
 			"type": "image",
-			"name": "exchangebtn_png"
+			"name": "stepNumber2_png"
 		},
 		{
-			"url": "assets/exchange/exchange.png",
+			"url": "assets/mainScene/stepNumber3.png",
 			"type": "image",
-			"name": "exchange_png"
+			"name": "stepNumber3_png"
 		},
 		{
-			"url": "assets/shop/shopbtn1.png",
+			"url": "assets/mainScene/stepNumber4.png",
 			"type": "image",
-			"name": "shopbtn1_png"
+			"name": "stepNumber4_png"
 		},
 		{
-			"url": "assets/blood2/blood2.png",
+			"url": "assets/mainScene/stepNumber5.png",
 			"type": "image",
-			"name": "blood2_png"
+			"name": "stepNumber5_png"
 		},
 		{
-			"url": "assets/sign/signicon4.png",
+			"url": "assets/mainScene/stepNumber6.png",
 			"type": "image",
-			"name": "signicon4_png"
+			"name": "stepNumber6_png"
 		},
 		{
-			"url": "assets/sign/signicon5.png",
+			"url": "assets/mainScene/stepNumber7.png",
 			"type": "image",
-			"name": "signicon5_png"
+			"name": "stepNumber7_png"
 		},
 		{
-			"url": "assets/sign/signbg.png",
+			"url": "assets/mainScene/stepNumber8.png",
 			"type": "image",
-			"name": "signbg_png"
+			"name": "stepNumber8_png"
 		},
 		{
-			"url": "assets/sign/sign_line2.png",
+			"url": "assets/mainScene/stepNumber9.png",
 			"type": "image",
-			"name": "sign_line2_png"
+			"name": "stepNumber9_png"
 		},
 		{
-			"url": "assets/sign/sign_light.png",
+			"url": "assets/mainScene/stepsBoard.png",
 			"type": "image",
-			"name": "sign_light_png"
+			"name": "stepsBoard_png"
 		},
 		{
-			"url": "assets/sign/signicon_blood.png",
+			"url": "assets/mainScene/targetBoard.png",
 			"type": "image",
-			"name": "signicon_blood_png"
+			"name": "targetBoard_png"
 		},
 		{
-			"url": "assets/signprize/signprize_numsbg.png",
+			"url": "assets/mainScene/targetNumber0.png",
 			"type": "image",
-			"name": "signprize_numsbg_png"
+			"name": "targetNumber0_png"
 		},
 		{
-			"url": "assets/signprize/singprize体力.png",
+			"url": "assets/mainScene/targetNumber1.png",
 			"type": "image",
-			"name": "singprize体力_png"
+			"name": "targetNumber1_png"
 		},
 		{
-			"url": "assets/signprize/signprize元宝.png",
+			"url": "assets/mainScene/targetNumber2.png",
 			"type": "image",
-			"name": "signprize元宝_png"
+			"name": "targetNumber2_png"
 		},
 		{
-			"url": "assets/sign/signicon6.png",
+			"url": "assets/mainScene/targetNumber3.png",
 			"type": "image",
-			"name": "signicon6_png"
+			"name": "targetNumber3_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting16.png",
+			"url": "assets/mainScene/targetNumber4.png",
 			"type": "image",
-			"name": "exLighting16_png"
+			"name": "targetNumber4_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting18.png",
+			"url": "assets/mainScene/targetNumber5.png",
 			"type": "image",
-			"name": "exLighting18_png"
+			"name": "targetNumber5_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting19.png",
+			"url": "assets/mainScene/targetNumber6.png",
 			"type": "image",
-			"name": "exLighting19_png"
+			"name": "targetNumber6_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting21.png",
+			"url": "assets/mainScene/targetNumber7.png",
 			"type": "image",
-			"name": "exLighting21_png"
+			"name": "targetNumber7_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting23.png",
+			"url": "assets/mainScene/targetNumber8.png",
 			"type": "image",
-			"name": "exLighting23_png"
+			"name": "targetNumber8_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting25.png",
+			"url": "assets/mainScene/targetNumber9.png",
 			"type": "image",
-			"name": "exLighting25_png"
+			"name": "targetNumber9_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting27.png",
+			"url": "assets/mainScene/unlightedStar.png",
 			"type": "image",
-			"name": "exLighting27_png"
+			"name": "unlightedStar_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting29.png",
+			"url": "assets/mainScene/yellowCircleDown.png",
 			"type": "image",
-			"name": "exLighting29_png"
+			"name": "yellowCircleDown_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting32.png",
+			"url": "assets/mainScene/yellowCircleUp.png",
 			"type": "image",
-			"name": "exLighting32_png"
+			"name": "yellowCircleUp_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting34.png",
+			"url": "assets/mainScene/yezi1.png",
 			"type": "image",
-			"name": "exLighting34_png"
+			"name": "yezi1_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting1.png",
+			"url": "assets/startpanel2/startpanel_ele7.png",
 			"type": "image",
-			"name": "exLighting1_png"
+			"name": "startpanel_ele7_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting3.png",
+			"url": "assets/startpanel2/startpanel_ele5.png",
 			"type": "image",
-			"name": "exLighting3_png"
+			"name": "startpanel_ele5_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting5.png",
+			"url": "assets/startpanel2/startpanel_ele9.png",
 			"type": "image",
-			"name": "exLighting5_png"
+			"name": "startpanel_ele9_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting7.png",
+			"url": "assets/startpanel2/startpanel_ele8.png",
 			"type": "image",
-			"name": "exLighting7_png"
+			"name": "startpanel_ele8_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting9.png",
+			"url": "assets/startpanel2/startpanel_ele4.png",
 			"type": "image",
-			"name": "exLighting9_png"
+			"name": "startpanel_ele4_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting11.png",
+			"url": "assets/startpanel2/startpanel_ele3.png",
 			"type": "image",
-			"name": "exLighting11_png"
+			"name": "startpanel_ele3_png"
 		},
 		{
-			"url": "assets/mainScene/exLighting14.png",
+			"url": "assets/startpanel2/startpanel_ele2.png",
 			"type": "image",
-			"name": "exLighting14_png"
+			"name": "startpanel_ele2_png"
 		},
 		{
-			"url": "assets/map/map_signicon.png",
+			"url": "assets/startpanel2/startpanel_ele1.png",
 			"type": "image",
-			"name": "map_signicon_png"
+			"name": "startpanel_ele1_png"
 		},
 		{
-			"url": "assets/sign/sign_quan58.png",
+			"url": "assets/startpanel2/startpanel_ele0.png",
 			"type": "image",
-			"name": "sign_quan58_png"
+			"name": "startpanel_ele0_png"
 		},
 		{
-			"url": "assets/sign/sign_quan88.png",
+			"url": "assets/h5/h5btn.png",
 			"type": "image",
-			"name": "sign_quan88_png"
+			"name": "h5btn_png"
 		},
 		{
-			"url": "assets/sign/sign_quan38.png",
+			"url": "assets/h5/h5_gobtn.png",
 			"type": "image",
-			"name": "sign_quan38_png"
+			"name": "h5_gobtn_png"
 		},
 		{
-			"url": "assets/sign/sign_quan15.png",
+			"url": "assets/invitebg.jpg",
 			"type": "image",
-			"name": "sign_quan15_png"
+			"name": "invitebg_jpg"
 		},
 		{
-			"url": "assets/mainScene/playSceneBg.jpg",
+			"url": "assets/inviterule/inviterulebg.png",
 			"type": "image",
-			"name": "playSceneBg_jpg"
+			"name": "inviterulebg_png"
 		}
 	]
 }
\ No newline at end of file

egret/resource/default.thm.json

 {
-    "skins": {},
-    "autoGenerateExmlsList": true,
-    "exmls": [
-        "resource/skins/AlertSkin.exml",
-        "resource/skins/Blood2Skin.exml",
-        "resource/skins/BloodSkin.exml",
-        "resource/skins/Box2Skin.exml",
-        "resource/skins/BoxSkin.exml",
-        "resource/skins/Buy1Skin.exml",
-        "resource/skins/Buy2Skin.exml",
-        "resource/skins/Buy3Skin.exml",
-        "resource/skins/ExchangeSkin.exml",
-        "resource/skins/FailSkin.exml",
-        "resource/skins/IconButtonSkin.exml",
-        "resource/skins/Main2Skin.exml",
-        "resource/skins/MapBottomSkin.exml",
-        "resource/skins/MapRepeatSkin.exml",
-        "resource/skins/MapSkin.exml",
-        "resource/skins/MapTopSkin.exml",
-        "resource/skins/NoPrizeSkin.exml",
-        "resource/skins/OptionItemSkin.exml",
-        "resource/skins/OptionsSkin.exml",
-        "resource/skins/PlaySkin.exml",
-        "resource/skins/Prize2Skin.exml",
-        "resource/skins/PrizeSkin.exml",
-        "resource/skins/QuitSkin.exml",
-        "resource/skins/RankItemSkin.exml",
-        "resource/skins/RankSkin.exml",
-        "resource/skins/ReliveSkin.exml",
-        "resource/skins/RuleSkin.exml",
-        "resource/skins/Share2Skin.exml",
-        "resource/skins/ShareSkin.exml",
-        "resource/skins/ShopSkin.exml",
-        "resource/skins/ShowOffSkin.exml",
-        "resource/skins/SignItemSkin.exml",
-        "resource/skins/SignPrizeSkin.exml",
-        "resource/skins/SignSkin.exml",
-        "resource/skins/StarSkin.exml",
-        "resource/skins/StartPanelSkin.exml",
-        "resource/skins/StartSkin.exml",
-        "resource/skins/TargetItemSkin.exml",
-        "resource/skins/TaskItemSkin.exml",
-        "resource/skins/TaskSkin.exml",
-        "resource/skins/TaskPrizeSkin.exml",
-        "resource/skins/ADSkin.exml",
-        "resource/skins/BackSkin.exml",
-        "resource/skins/InviteSkin.exml",
-        "resource/skins/ToastSkin.exml",
-        "resource/skins/VScrollBarSkin.exml"
-    ],
-    "path": "resource/default.thm.json"
+	"skins": {},
+	"autoGenerateExmlsList": true,
+	"exmls": [
+		"resource/skins/ADSkin.exml",
+		"resource/skins/ADSmallSkin.exml",
+		"resource/skins/AlertSkin.exml",
+		"resource/skins/AvatarSkin.exml",
+		"resource/skins/BackSkin.exml",
+		"resource/skins/BagSkin.exml",
+		"resource/skins/Blood2Skin.exml",
+		"resource/skins/BloodSkin.exml",
+		"resource/skins/Box2Skin.exml",
+		"resource/skins/BoxSkin.exml",
+		"resource/skins/Buy1Skin.exml",
+		"resource/skins/Buy2Skin.exml",
+		"resource/skins/Buy3Skin.exml",
+		"resource/skins/ExchangeSkin.exml",
+		"resource/skins/FailSkin.exml",
+		"resource/skins/FriendItem2Skin.exml",
+		"resource/skins/FriendItemSkin.exml",
+		"resource/skins/FriendSkin.exml",
+		"resource/skins/H5Skin.exml",
+		"resource/skins/IconButtonSkin.exml",
+		"resource/skins/InviteCutTimePanelSkin.exml",
+		"resource/skins/InviteItemSkin.exml",
+		"resource/skins/InvitePrizePanelSkin.exml",
+		"resource/skins/InviteRulePanelSkin.exml",
+		"resource/skins/InviteRuleSkin.exml",
+		"resource/skins/InviteSkin.exml",
+		"resource/skins/Main2Skin.exml",
+		"resource/skins/MapBottomSkin.exml",
+		"resource/skins/MapRepeatSkin.exml",
+		"resource/skins/MapSkin.exml",
+		"resource/skins/MapTopSkin.exml",
+		"resource/skins/NoPrizeSkin.exml",
+		"resource/skins/OptionItemSkin.exml",
+		"resource/skins/OptionsSkin.exml",
+		"resource/skins/PlaySkin.exml",
+		"resource/skins/Prize2Skin.exml",
+		"resource/skins/PrizeSkin.exml",
+		"resource/skins/QuitSkin.exml",
+		"resource/skins/RankItemSkin.exml",
+		"resource/skins/RankSkin.exml",
+		"resource/skins/ReliveSkin.exml",
+		"resource/skins/RuleSkin.exml",
+		"resource/skins/Share2Skin.exml",
+		"resource/skins/ShareSkin.exml",
+		"resource/skins/ShareTipsSkin.exml",
+		"resource/skins/ShopSkin.exml",
+		"resource/skins/ShowOffSkin.exml",
+		"resource/skins/SignItemSkin.exml",
+		"resource/skins/SignPrizeSkin.exml",
+		"resource/skins/SignSkin.exml",
+		"resource/skins/StarSkin.exml",
+		"resource/skins/StartPanelSkin.exml",
+		"resource/skins/StartSkin.exml",
+		"resource/skins/TargetItemSkin.exml",
+		"resource/skins/TaskItemSkin.exml",
+		"resource/skins/TaskPrizeSkin.exml",
+		"resource/skins/TaskSkin.exml",
+		"resource/skins/ToastSkin.exml",
+		"resource/skins/VScrollBarSkin.exml"
+	],
+	"path": "resource/default.thm.json"
 }
\ No newline at end of file

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">
-	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="609" y="197">
+<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 id="closeBtn2" y="142" horizontalCenter="0" width="540" height="600" source="{data.img}"/>
+	<e:Button id="closeBtn" label="" y="811" horizontalCenter="0">
 		<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"/>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="ad_closebtn_png" source.down="ad_closebtn_png" source.disabled="ad_closebtn_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
+			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label text="AD广告" x="260" y="604"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/ADSmallSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="ADSmallSkin" width="582" height="203" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<w:Config id="16db4bf413f"/>
+	<e:Image source="common_adbg_png"/>
+	<e:Image y="57" horizontalCenter="0" width="493" height="111" source="{data.img}" anchorOffsetY="0"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/AvatarSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="AvatarSkin" width="79" height="85" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image source="friend_avatar_png"/>
+	<e:Group x="8.5" y="8.8">
+		<e:Image id="avatar" y="0" source="testavatar_png" width="64" height="64" x="0"/>
+		<e:Rect id="avatarMask" width="64" height="64" y="0" ellipseWidth="64" ellipseHeight="64"/>
+	</e:Group>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/BackSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="BackSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
+	<e:Component y="710.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="609" y="197">
 		<e:skinName>

egret/resource/skins/BagSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="BagSkin" width="400" height="300" xmlns:e="http://ns.egret.com/eui">
+</e:Skin>
\ No newline at end of file

egret/resource/skins/Box2Skin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="Box2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16ccc954c14"/>
+	<e:Component y="739.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image y="33.76" horizontalCenter="0" source="box2_bg_png"/>
 	<e:Button id="closeBtn" label="" x="601.94" y="195.3">
 		<e:skinName>

egret/resource/skins/BoxSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="BoxSkin" width="750" height="1205" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16cc233ca3b"/>
+	<e:Component y="739.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image source="boxbg_png" y="33.76" horizontalCenter="0"/>
 	<e:Image id="img" y="355" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="0.9" scaleY="0.9" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="604.96" y="190.84">

egret/resource/skins/FailSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="FailSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
-	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="609" y="197">
+	<e:Component y="674.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Image source="闯关失败_png" y="-8" horizontalCenter="0"/>
+	<e:Button id="closeBtn" label="" x="609" y="162">
 		<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,7 +10,7 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="againBtn" label="" y="556" horizontalCenter="0">
+	<e:Button id="againBtn" label="" y="521" horizontalCenter="0">
 		<e:skinName>
 			<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="按钮 副本 9_png" source.down="按钮 副本 9_png" source.disabled="按钮 副本 9_png"/>

egret/resource/skins/FriendItem2Skin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="FriendItem2Skin" width="108" height="137" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image source="startpanel_avatar_png" horizontalCenter="0.5" y="5"/>
+	<e:Label id="nameTxt" text="Label" y="89.5" size="16" textColor="0x784325" horizontalCenter="0.5"/>
+	<e:Label text="分数:12345分" y="115.29" id="score" size="16" anchorOffsetX="0" anchorOffsetY="0" textColor="0x784325" horizontalCenter="0.5"/>
+	<e:Group x="22" y="14">
+		<e:Image id="avatar" y="0" width="64" height="64" x="0" source=""/>
+		<e:Rect id="avatarMask" width="64" height="64" y="0" ellipseWidth="64" ellipseHeight="64"/>
+	</e:Group>
+	<e:Group x="8">
+		<e:Image id="rank1" x="-5" y="0" source="startpanel_icon1_png" visible="false"/>
+		<e:Image id="rank2" x="-5" y="0" source="startpanel_icon2_png" visible="false"/>
+		<e:Image id="rank3" x="-3" source="startpanel_icon3_png" visible="false"/>
+		<e:Group x="-4" y="0">
+			<e:Image id="rankbg" source="startpanel_icon_png"/>
+			<e:Label id="rankTxt" text="73" textAlign="center" verticalAlign="middle" size="20" textColor="0xffffff" width="31" height="31"/>
+		</e:Group>
+	</e:Group>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/FriendItemSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="FriendItemSkin" width="546" height="105" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image source="friend_itembg_png"/>
+	<e:Label id="rankTxt" text="73" width="86" textAlign="center" verticalAlign="middle" height="52" size="48" textColor="0x784325" y="25"/>
+	<e:Label text="X55" x="480.94" y="44.29" id="star" size="24" textColor="0x784325"/>
+	<e:Label id="nameTxt" text="Label" x="189" y="20.5" size="24" textColor="0x784325"/>
+	<e:Label text="第15关" x="189" y="54.29" id="progress" size="24" textColor="0x784325"/>
+	<e:Label text="分数:123分" x="297" y="54.29" id="score" size="24" anchorOffsetX="0" anchorOffsetY="0" textColor="0x784325"/>
+	<e:Group x="108.87" y="23.79">
+		<e:Image id="avatar" y="0" width="60" height="60" x="0" source=""/>
+		<e:Rect id="avatarMask" width="60" height="60" y="0" ellipseWidth="60" ellipseHeight="60"/>
+	</e:Group>
+	<e:Group x="10" y="16">
+		<e:Image id="rank1" source="friend_icon1_png" x="0" y="0"/>
+		<e:Image id="rank2" source="friend_icon2_png" x="1" y="0"/>
+		<e:Image id="rank3" source="friend_icon3_png" x="3" y="2"/>
+	</e:Group>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/FriendSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="FriendSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image source="friendbg_png" y="31" horizontalCenter="1"/>
+	<e:Label id="star" text="X0" x="597.94" y="329.79" size="24"/>
+	<e:Button id="closeBtn" label="" x="632.94" y="164.98">
+		<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"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+		</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Scroller id="scroll" width="546" height="555" y="412.35" scrollPolicyV="on" scrollPolicyH="off" x="122">
+		<e:Group>
+			<e:List id="list" width="100%" itemRendererSkinName="FriendItemSkin" visible="false">
+				<e:ArrayCollection>
+					<e:Array>
+						<e:Object a="taskname1"/>
+						<e:Object a="taskname2"/>
+						<e:Object a="taskname3"/>
+						<e:Object a="null"/>
+						<e:Object a="null"/>
+						<e:Object a="null"/>
+						<e:Object a="null"/>
+						<e:Object a="null"/>
+						<e:Object a="null"/>
+						<e:Object a="null"/>
+					</e:Array>
+				</e:ArrayCollection>
+				<e:layout>
+					<e:VerticalLayout gap="6"/>
+				</e:layout>
+			</e:List>
+		</e:Group>
+	</e:Scroller>
+	<e:Button id="btn" label="" y="985.99" horizontalCenter="0">
+		<e:skinName>
+		<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="friend按钮-炫耀_png" source.down="friend按钮-炫耀_png" source.disabled="friend按钮-炫耀_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+		</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Group x="323.87" y="104.79">
+		<e:Image id="avatar" y="0" width="120" height="120" x="0" source=""/>
+		<e:Rect id="avatarMask" width="120" height="120" y="0" ellipseWidth="120" ellipseHeight="120"/>
+	</e:Group>
+	<e:Group x="226.87" y="308.79">
+		<e:Image id="avatar0" y="0" width="60" height="60" x="0" source=""/>
+		<e:Rect id="avatarMask0" width="60" height="60" y="0" ellipseWidth="60" ellipseHeight="60"/>
+	</e:Group>
+	<e:Label id="nameTxt0" text="nickname" y="245" textColor="0x784325" horizontalCenter="6.5"/>
+	<e:Label id="rankTxt" text="0" x="112" y="311" width="86" textAlign="center" verticalAlign="middle" height="52" size="48"/>
+	<e:Label id="nameTxt" text="-" x="306" y="307" size="24"/>
+	<e:Label id="progress" text="第0关" x="306" y="340.79" size="24"/>
+	<e:Label id="score" text="分数:0分" x="414" y="340.79" size="24" anchorOffsetX="0" anchorOffsetY="0"/>
+	<e:Label id="empty" text="您还没有好友" y="636" textColor="0x784325" horizontalCenter="6.5"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/H5Skin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="H5Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image source="invitebg_jpg"/>
+	<e:Image id="gobtn" source="h5_gobtn_png" y="995" horizontalCenter="0"/>
+	<e:Image id="rulebtn" source="h5btn_png" y="954" horizontalCenter="0"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/InviteCutTimePanelSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
+        xmlns:w="http://ns.egret.com/wing">
+	<e:Image y="216.33" source="invateCut_bg_png" horizontalCenter="0"/>
+	<e:BitmapLabel id="cutTimeLabel" y="396.33" font="cutTimeFont_fnt" text="00:00:00" letterSpacing="10" horizontalCenter="0"/>
+	<e:Button id="closeBtn" label="" x="615" y="208.33">
+		<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" />
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" />
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Button id="ok_btn" label="" y="596" anchorOffsetX="150" anchorOffsetY="48" horizontalCenter="0">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="invateCut_btn_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Component y="726.33" skinName="ADSmallSkin" horizontalCenter="0"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/InviteItemSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="InviteItemSkin" width="90" height="90" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="img" source="" top="0" left="0" bottom="0" right="0"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/InvitePrizePanelSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
+        xmlns:w="http://ns.egret.com/wing">
+	<e:Image y="45.33" horizontalCenter="0"  source="invitePrize_bg_png"/>
+	<e:Image id="prizeImg" y="426.77" source=""  horizontalCenter="0"/>
+	<e:Button id="closeBtn" label="" x="632" y="317.33">
+		<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" />
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" />
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Button id="ok_btn" label="" y="760" anchorOffsetX="138.5" anchorOffsetY="56.5" x="236.5">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="invitePrize_btn_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Button id="game_btn" label="" y="760" anchorOffsetX="139" anchorOffsetY="56.5" x="527">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="invitePrize_game_btn_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Component y="845.33" skinName="ADSmallSkin" horizontalCenter="0"/>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/InviteRulePanelSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="RuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Rect left="0" bottom="0" top="0" right="0" fillColor="0x000000" fillAlpha="0.7"/>
+	<e:Image id="ruleBg" horizontalCenter="0.5" verticalCenter="-231" source="invite_rule_bg_png"/>
+	<e:Scroller id="scroller" width="545" height="542" y="372.2" horizontalCenter="0.5" anchorOffsetY="0">
+		<e:Group id="group" width="100%" x="-1.26" y="36" anchorOffsetY="0" height="515">
+			<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
+			<e:layout>
+				<e:VerticalLayout/>
+			</e:layout>
+		</e:Group>
+	</e:Scroller>
+	<e:Button id="closeBtn" label="" x="608" y="322">
+		<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"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+		</e:Skin>
+		</e:skinName>
+	</e:Button>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/InviteRuleSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="InviteRuleSkin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Image id="ruleBg" horizontalCenter="0.5" source="inviterulebg_png" y="152"/>
+	<e:Scroller id="scroller" width="545" x="104.76" height="507" y="377.2">
+		<e:Group id="group" width="100%">
+			<e:Label id="labContent" width="100%" text="" lineSpacing="10" size="30" multiline="true" textColor="0xa54615"/>
+			<e:layout>
+				<e:VerticalLayout/>
+			</e:layout>
+		</e:Group>
+	</e:Scroller>
+	<e:Button id="closeBtn" label="" x="614" y="301">
+		<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"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+		</e:Skin>
+		</e:skinName>
+	</e:Button>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/InviteSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
-<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
-	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
-	<e:Button id="closeBtn" label="" x="609" y="197">
+<e:Skin class="InviteSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui"
+        xmlns:w="http://ns.egret.com/wing">
+	<e:Image y="45.33" horizontalCenter="0" source="invite_bg_png" />
+	<e:Image id="prizeImg" y="439.33" horizontalCenter="0.5" source="" />
+	<e:Button id="closeBtn" label="" x="605" y="227.33">
 		<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"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
+			<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" />
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" />
+			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Label text="Invite" x="260" y="604"/>
+	<e:Button id="helpBtn" label="" x="564" y="376.33">
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="invite_help_png" source.down="invite_help_png"
+				         source.disabled="invite_help_png" />
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0" xmlns:w="http://ns.egret.com/wing" />
+			</e:Skin>
+		</e:skinName>
+	</e:Button>
+	<e:Label id="numLabel" text="仅差3人可获得" y="679.33" textColor="0xf54500" size="28" horizontalCenter="0" />
+	<e:Label id="cutTimeLabel" text="将在23:43:21后失效" y="883.33" size="28" textColor="0xffffff"  horizontalCenter="0"/>
+	<e:Scroller width="554" height="90" y="766.33" anchorOffsetX="0" anchorOffsetY="0" x="98">
+		<e:Group anchorOffsetX="0">
+			<e:List id="list" x="0" y="0" anchorOffsetX="0">
+				<e:layout>
+					<e:HorizontalLayout gap="66" horizontalAlign="center" verticalAlign="middle"/>
+				</e:layout>
+</e:List>
+			<e:layout>
+				<e:HorizontalLayout gap="66" horizontalAlign="center" verticalAlign="middle"/>
+			</e:layout>
+		</e:Group>
+	</e:Scroller>
+	<e:Group id="wxShareTip" width="750" height="1206" y="0" x="0" visible="false">
+		<e:Rect fillAlpha="0.7" left="0" top="0" right="0" bottom="0"/>
+		<e:Image source="invite_wx_tip_png" x="484" y="0"/>
+	</e:Group>
 </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="-2"/>
+	<e:Rect id="rectbg" width="750" height="1206" x="0" 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>
 	</e:Scroller>
-	<e:Group id="treasureboxBtn" y="-3.06" x="467.84">
+	<e:Group id="treasureboxBtn" y="-3.06" x="516.26" scaleX="0.8" scaleY="0.8">
 		<e:Image source="宝箱bg_png" y="22"/>
 		<e:Group x="41.08" y="45.48">
-			<e:Rect id="rect" width="124" height="45" x="0" y="0" visible="false"/>
-			<e:Image id="progressbg" source="progress2_png" y="0" x="0" visible="false"/>
-			<e:Image id="progressfront" source="progress1_png" y="0" x="0" visible="false"/>
-			<e:Image source="星星_png" verticalCenter="-2.5" x="-17.31"/>
-			<e:Label id="totalStarTxt" text="0/0" x="24.04" verticalAlign="middle" textAlign="left" size="26" verticalCenter="1.5" bold="true"/>
+		<e:Rect id="rect" width="124" height="45" x="0" y="0" visible="false"/>
+		<e:Image id="progressbg" source="progress2_png" y="0" x="0" visible="false"/>
+		<e:Image id="progressfront" source="progress1_png" y="0" x="0" visible="false"/>
+		<e:Image source="星星_png" verticalCenter="-2.5" x="-17.31"/>
+		<e:Label id="totalStarTxt" text="0/0" x="24.04" verticalAlign="middle" textAlign="left" size="26" verticalCenter="1.5" bold="true"/>
 		</e:Group>
 		<e:Image id="box" source="宝箱_png" right="32" verticalCenter="13.5" anchorOffsetX="34" anchorOffsetY="34"/>
 		<e:Group id="boxiconWrapper" x="197.33" y="34.86" touchEnabled="false" touchChildren="false">
-			<e:Image x="8.32" y="0" source="iconbg_png"/>
-			<e:Label id="boxNumsTxt" text="0" x="0" verticalAlign="middle" textAlign="center" size="18" width="46" y="6.14"/>
+		<e:Image x="8.32" y="0" source="iconbg_png"/>
+		<e:Label id="boxNumsTxt" text="0" x="0" verticalAlign="middle" textAlign="center" size="18" width="46" y="6.14"/>
 		</e:Group>
 	</e:Group>
-	<e:Group id="top" x="36" y="24">
+	<e:Group id="top" x="167.04" y="18.05" scaleX="0.8" scaleY="0.8">
 		<e:Image source="元宝bg_png" x="0" y="0"/>
 		<e:Label id="bloodTxt" text="5" x="12.71" y="22.84" width="49" verticalAlign="middle" textAlign="center" size="36"/>
 		<e:Label id="fullTxt" text="已满" x="76.71" y="29.84" width="82" verticalAlign="middle" textAlign="center" size="24" visible="false"/>
 		<e:Label id="goldTxt" text="0" x="317.23" y="27.84" width="88" verticalAlign="middle" textAlign="center"/>
 		<e:Button id="bloodBtn" label="" x="168.38" y="16.6">
-			<e:skinName>
-				<e:Skin states="up,down,disabled">
-				<e:Image width="100%" height="100%" source="关闭 拷贝_png" source.down="关闭 拷贝_png" source.disabled="关闭 拷贝_png"/>
-				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-				</e:Skin>
-			</e:skinName>
+		<e:skinName>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="关闭 拷贝_png" source.down="关闭 拷贝_png" source.disabled="关闭 拷贝_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+		</e:skinName>
 		</e:Button>
 		<e:Button id="goldBtn" label="" x="385.2" y="16.6" visible="false">
-			<e:skinName>
+		<e:skinName>
 			<e:Skin states="up,down,disabled">
-				<e:Image width="100%" height="100%" source="关闭 拷贝_png" source.down="关闭 拷贝_png" source.disabled="关闭 拷贝_png"/>
-				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			<e:Image width="100%" height="100%" source="关闭 拷贝_png" source.down="关闭 拷贝_png" source.disabled="关闭 拷贝_png"/>
+			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
 			</e:Skin>
-			</e:skinName>
+		</e:skinName>
 		</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="615.08" y="154.01">
+	<e:Button id="shopBtn" label="" x="615.08" y="128.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="615.08" y="304.41">
+	<e:Button id="recordBtn" label="" x="620.14" y="255.91">
 		<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,7 +59,7 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="signBtn" label="" x="29.48" y="158.57" scaleX="0.9" scaleY="0.9">
+	<e:Button id="signBtn" label="" x="608.69" y="383.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"/>
@@ -67,30 +67,38 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="taskBtn" label="" x="31.7" y="305.41">
-		<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"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
-		</e:skinName>
-	</e:Button>
-	<e:Button id="adBtn" label="" x="44.3" y="459.41">
-		<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"/>
-			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
-		</e:skinName>
-	</e:Button>
-	<e:Button id="inviteBtn" label="" x="608.17" y="460.41">
+	<e:Group id="friendBtn" x="5.96" y="22.31" width="171" height="120">
+		<e:Image source="avatar_png" y="0" horizontalCenter="0"/>
+		<e:Group x="38.5" y="10">
+		<e:Image id="avatar" y="0" source="testavatar_png" width="96" height="96" x="0"/>
+		<e:Rect id="avatarMask" width="96" height="96" x="0" y="0" ellipseWidth="96" ellipseHeight="96"/>
+		</e:Group>
+		<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="519.02" source="ad_icon_png" right="12"/>
+	<e:Button id="taskBtn" label="" x="572.62" y="248.51" visible="false">
 		<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"/>
+			<e:Skin states="up,down,disabled">
+			<e:Image width="100%" height="100%" source="taskicon_png" source.down="taskicon_png" source.disabled="taskicon_png"/>
 			<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
-		</e:Skin>
+			</e:Skin>
 		</e:skinName>
 	</e:Button>
+	<e:Group id="inviteGroup" x="24.4" y="163.76">
+		<e:Button id="inviteBtn" label="" x="0" 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"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+			</e:Skin>
+			</e:skinName>
+		</e:Button>
+		<e:Group x="84.67" y="0">
+			<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:Group>
+	</e:Group>
 	<e:Group x="30" scaleX="1.4" scaleY="1.4" bottom="23">
 		<e:Group id="settingGroup" x="2" y="6.08" visible="false">
 			<e:Image id="settingbg" source="设置bg_png" y="0" x="0" scale9Grid="9,84,54,76" height="231"/>

egret/resource/skins/NoPrizeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="NoPrizeSkin" width="750" height="1000" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<e:Component y="735.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
 	<e:Image y="109.55" source="擦肩而过弹窗 _png" horizontalCenter="0.5"/>
 	<e:Button id="closeBtn" label="" x="617" y="279">

egret/resource/skins/Prize2Skin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="Prize2Skin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="169005181d0"/>
-	<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
-	<e:Image source="prizePanelbg_png" y="134.96" horizontalCenter="0.5"/>
-	<e:Button id="closeBtn" label="" x="616" y="307">
+	<e:Component y="849.52" skinName="ADSmallSkin" horizontalCenter="0"/>
+	<e:Image id="light" source="common_prizelight_png" x="374.19" y="246.13" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
+	<e:Image source="prizePanelbg_png" y="51.58" horizontalCenter="0.5"/>
+	<e:Button id="closeBtn" label="" x="616" y="223.62">
 		<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,14 +12,14 @@
 			</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Image id="picb" source="点亮 副本 2_png" x="142" y="191"/>
-	<e:Image id="pica" source="点亮 副本 2_png" x="608" y="191" scaleX="-1"/>
-	<e:Image id="picc" source="点亮_png" y="142" x="280"/>
-	<e:Image id="pic1" source="点亮 副本 2_png" x="222" y="249" anchorOffsetX="80" anchorOffsetY="58"/>
-	<e:Image id="pic3" source="点亮 副本 2_png" x="536" y="243" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
-	<e:Image id="pic2" source="点亮_png" y="218" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/>
-	<e:Image source="signprize元宝_png" y="453.24" horizontalCenter="-2"/>
-	<e:Button id="shareBtn" label="" y="787" horizontalCenter="-145.5">
+	<e:Image id="picb" source="点亮 副本 2_png" x="142" y="107.62"/>
+	<e:Image id="pica" source="点亮 副本 2_png" x="608" y="107.62" scaleX="-1"/>
+	<e:Image id="picc" source="点亮_png" y="58.62" x="280"/>
+	<e:Image id="pic1" source="点亮 副本 2_png" x="222" y="165.62" anchorOffsetX="80" anchorOffsetY="58"/>
+	<e:Image id="pic3" source="点亮 副本 2_png" x="536" y="159.62" scaleX="-1" anchorOffsetX="72" anchorOffsetY="52"/>
+	<e:Image id="pic2" source="点亮_png" y="134.62" horizontalCenter="0" anchorOffsetX="96" anchorOffsetY="76"/>
+	<e:Image source="signprize元宝_png" y="369.86" horizontalCenter="-2"/>
+	<e:Button id="shareBtn" label="" y="703.62" horizontalCenter="-145.5">
 		<e:skinName>
 		<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="按钮 副本 3_png" source.down="按钮 副本 3_png" source.disabled="按钮 副本 3_png"/>
@@ -26,7 +27,7 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Button id="goBtn" label="" y="787" horizontalCenter="144">
+	<e:Button id="goBtn" label="" y="703.62" horizontalCenter="144">
 		<e:skinName>
 		<e:Skin states="up,down,disabled">
 			<e:Image width="100%" height="100%" source="按钮 副本 4_png" source.down="按钮 副本 4_png" source.disabled="按钮 副本 4_png"/>
@@ -34,7 +35,7 @@
 		</e:Skin>
 		</e:skinName>
 	</e:Button>
-	<e:Group id="numsgroup" x="393.38" y="496.76">
+	<e:Group id="numsgroup" x="393.38" y="413.38">
 		<e:Image id="numsbg0" source="signprize_numsbg_png" x="0" y="0"/>
 		<e:Label id="tips" text="X8" size="22" horizontalCenter="0" verticalCenter="0" verticalAlign="middle" textAlign="center"/>
 	</e:Group>

egret/resource/skins/PrizeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="PrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="169005181d0"/>
+	<e:Component y="938.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image id="light" source="common_prizelight_png" x="374.19" y="329.51" anchorOffsetX="375.76" anchorOffsetY="327.27"/>
 	<e:Image source="prizePanelbg_png" y="136.9" horizontalCenter="0.5"/>
 	<e:Button id="closeBtn" label="" x="618" y="311">

egret/resource/skins/ShareTipsSkin.exml

+<?xml version="1.0" encoding="utf-8"?>
+<e:Skin class="Share2Skin" width="750" height="1624" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
+	<w:Config id="16cd6d4c8ff"/>
+	<e:Rect width="750" height="1624" fillAlpha="0.7"/>
+	<e:Group id="inviteGroup" x="0" bottom="0">
+		<e:Image source="朋友圈中间分享蒙层1_jpg" y="0" x="0"/>
+		<e:Group y="66" x="261">
+			<e:Button id="btn1" label="" x="0" y="0">
+			<e:skinName>
+				<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="share_btn1_png" source.down="share_btn1_png" source.disabled="share_btn1_png"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+				</e:Skin>
+			</e:skinName>
+			</e:Button>
+			<e:Button id="btn2" label="" x="152">
+			<e:skinName>
+				<e:Skin states="up,down,disabled">
+				<e:Image width="100%" height="100%" source="share_btn2_png" source.down="share_btn2_png" source.disabled="share_btn2_png"/>
+				<e:Label id="labelDisplay" horizontalCenter="0" verticalCenter="0"/>
+				</e:Skin>
+			</e:skinName>
+			</e:Button>
+		</e:Group>
+	</e:Group>
+</e:Skin>
\ No newline at end of file

egret/resource/skins/SignPrizeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="SignPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16d5c2563cb"/>
+	<e:Component y="698.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image source="singprizebg_png" y="20" horizontalCenter="0"/>
 	<e:Image id="img" y="297" touchEnabled="true" source="{data.img}" width="512" height="240" scaleX="1" scaleY="1" horizontalCenter="0" visible="false"/>
 	<e:Image id="money" source="signprize元宝_png" y="234.88" horizontalCenter="0"/>

egret/resource/skins/StartPanelSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="StartPanelSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16cd285c715"/>
+	<e:Image source="startpanel_bg2_png" y="925" horizontalCenter="0"/>
 	<e:Image y="52" horizontalCenter="0" source="startpanel通关条件_png"/>
 	<e:Label id="levelTxt" text="第一关" y="204" horizontalCenter="0" size="42"/>
 	<e:Label id="targetTxt" text="在规定的步数内\n消除足够数量目标" y="332" width="444" x="157" textAlign="center" lineSpacing="15" verticalAlign="middle" height="156" anchorOffsetX="0" textColor="0xa32020" visible="false"/>
@@ -60,4 +61,19 @@
 		</e:List>
 		<e:Label id="tips" text="在指定步数内消灭目标元素" y="7" size="23" textColor="0x885037" bold="true" horizontalCenter="0"/>
 	</e:Group>
+	<e:List id="friendlist" itemRendererSkinName="FriendItem2Skin" horizontalCenter="0" y="973" visible="false">
+		<e:ArrayCollection>
+			<e:Array>
+				<e:Object a="null"/>
+				<e:Object a="null"/>
+				<e:Object a="null"/>
+				<e:Object a="null"/>
+				<e:Object a="null"/>
+			</e:Array>
+		</e:ArrayCollection>
+		<e:layout>
+			<e:HorizontalLayout/>
+		</e:layout>
+	</e:List>
+	<e:Label id="empty" text="该关卡没有好友通关" y="1022" horizontalCenter="0" textColor="0xc33700" size="26"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/TargetItemSkin.exml

@@ -2,7 +2,15 @@
 <e:Skin class="TargetItemSkin" width="60" height="81" xmlns:e="http://ns.egret.com/eui" xmlns:w="http://ns.egret.com/wing">
 	<w:Config id="16cfafb2357"/>
 	<e:Image source="startpanel_block2_png" x="0" y="0"/>
-	<e:Image id="icon_LOLLIPOP" source="startpanel_ele6_png" width="60" height="60"/>
-	<e:Image id="icon_ICE" source="startpanel_ice1_png" width="60" height="60"/>
+	<e:Image id="icon0" width="60" height="60" source="startpanel_ele0_png"/>
+	<e:Image id="icon1" width="60" height="60" source="startpanel_ele1_png"/>
+	<e:Image id="icon2" width="60" height="60" source="startpanel_ele2_png"/>
+	<e:Image id="icon3" width="60" height="60" source="startpanel_ele3_png"/>
+	<e:Image id="icon4" width="60" height="60" source="startpanel_ele4_png"/>
+	<e:Image id="icon5" width="60" height="60" source="startpanel_ele5_png"/>
+	<e:Image id="icon6" width="60" height="60" source="startpanel_ele6_png"/>
+	<e:Image id="icon7" width="60" height="60" source="startpanel_ele7_png"/>
+	<e:Image id="icon8" width="60" height="60" source="startpanel_ele8_png"/>
+	<e:Image id="icon9" width="60" height="60" source="startpanel_ele9_png"/>
 	<e:BitmapLabel id="txt" text="X0" font="nums2_fnt" scaleX="0.4" scaleY="0.4" y="46" horizontalCenter="0"/>
 </e:Skin>
\ No newline at end of file

egret/resource/skins/TaskPrizeSkin.exml

 <?xml version="1.0" encoding="utf-8"?>
 <e:Skin class="TaskPrizeSkin" width="750" height="1206" xmlns:e="http://ns.egret.com/eui">
+	<e:Component y="757.52" skinName="ADSmallSkin" horizontalCenter="0"/>
 	<e:Image source="闯关失败_png" y="27" horizontalCenter="0"/>
 	<e:Button id="closeBtn" label="" x="609" y="197">
 		<e:skinName>

egret/src/H5Scene.ts

+import Scene from "../libs/new_wx/components/Scene";
+import Utils from "./Utils";
+import PanelCtrl from "../libs/new_wx/ctrls/panelCtrl";
+
+
+export default class H5Scene extends Scene {
+
+    async start(data?) {
+        super.start();
+        this['rulebtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
+            PanelCtrl.instance.show('inviterule')
+        },this);
+        this['gobtn'].addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
+            const code = Utils.getRequestByKey('shareCode');
+            window.location.href =  `${window['targetUrl']}&shareCode=code`
+        },this);
+    }
+
+    
+    get skinKey() { return 'H5' }
+}

egret/src/Utils.ts

+export default class Utils {
+    constructor() {
+
+    }
+
+    /**
+     * 获取连接上的参数，以对象的形式返回
+     * @constructor
+     */
+    public static getRequest() {
+        const url = location.search;   //获取url中"?"符后的字串
+        let theRequest = {};
+        if(url.indexOf("?") != -1) {
+            let str = url.substr(1);
+            let strs = str.split("&");
+            for(let i = 0; i < strs.length; i++) {
+                theRequest[strs[i].split("=")[0]] = unescape(strs[i].split("=")[1]);
+            }
+        }
+        return theRequest;
+    }
+
+    /**
+     * 通过Key获取连接上的参数
+     * @param key
+     */
+    public static getRequestByKey(key: string) {
+        return this.getRequest()[key];
+    }
+
+    /**
+     * 数字补0
+     * @param num 数字
+     * @param length 位数
+     */
+    public static prefixInteger(num, length) {
+        return (Array(length).join('0') + num).slice(-length);
+    }
+}
\ No newline at end of file

egret/src/mainScene/GameGuide.ts

@@ -415,6 +415,33 @@ const chapterFuns = {
             "被困住的元素无法进行移动，当触发元素\n消除时，元素上的藤蔓即可被消除"
         ]
     },
+    //果冻消除
+    81: {
+        elementTypes: [
+            0, 0, 0, 4, 5, 2, 0, 0, 0,
+            0, 0, 4, 5, 3, 4, 1, 0, 0, 
+            0, 5, 5, 4, 4, 1, 4, 2, 0, 
+            3, 2, 1, 5, 4, 3, 1, 4, 5, 
+            4, 3, 5, 4, 2, 3, 1, 3, 4, 
+            1, 2, 2, 1, 3, 2, 2, 5, 3, 
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 
+            5, 2, 3, 1, 0, 3, 5, 5, 1
+        ],
+        stepCount: 1,
+        showIndexs: [
+            [32, 41, 50, 49],
+        ],
+        hideIndexs: [
+            [32, 41],
+        ],
+        handIndexs: [
+            [49, 50]
+        ],
+        msg: [
+            "当果冻附近的元素产生消除时，即可消除果冻\n不消除果冻时，果冻会逐渐蔓延"
+        ]
+    },
 }
 
 /**

egret/src/mainScene/MainScene.ts

@@ -54,6 +54,9 @@ import { StepAni } from '../something/anis/StepAni';
 import { updateMainTimerAfterGetData } from '../../libs/new_wx/MainBase';
 import wait from '../../libs/new_tc/wait';
 import { GameGuide } from './GameGuide';
+import { AiControl } from '../something/logic/AiControl';
+import { JellyDisAni } from '../something/anis/JellyDisAni';
+import { EggBrokenAni } from '../something/anis/EggBrokenAni';
 // tslint:disable: no-var-keyword
 // tslint:disable: prefer-const
 // tslint:disable: cyclomatic-complexity
@@ -71,6 +74,8 @@ const aniClass = {
     "EleDisAni": EleDisAni,
     "MagicLionAni": MagicLionAni,
     "StepAni": StepAni,
+    "JellyDisAni": JellyDisAni,
+    "EggBrokenAni": EggBrokenAni,
 }
 export const baseScore = 20;
 /**
@@ -153,7 +158,8 @@ export default class MainScene extends Scene {
     scoreAnis: ScoreAni[] = [];
     //每一步生成的总分数
     oneStepScore: number;
-
+    //果冻有消除的标记；
+    jellyBrokenMark: boolean
     //皮肤上的
     public starProgress: eui.Image;
     public scoreTxt: eui.Label;
@@ -213,9 +219,9 @@ export default class MainScene extends Scene {
         super.start();
         //第几关
         this.chapter = (data && data.chapter) ? data.chapter : 1;
-        // this.chapter = 24;
+        // this.chapter = 81;
         this.chapterTxt.text = "第" + this.chapter + "关";
-        //关卡数据,1期定制，70,后面35关地图一致，步数减少
+        //关卡数据
         var mapDataIndex = this.chapter;
         //56到70的话，中间36到50
         if (this.chapter >= 56 && this.chapter <= 70) {
@@ -276,37 +282,11 @@ export default class MainScene extends Scene {
                 this.drawLollipopHole();
         }
 
+        //AiControl初始化，用于判断格子中是否有果冻，是否有鸡蛋，必须在初始化元素后执行
+        AiControl.ins.init(this.lattices);
 
-
-        //引导提示
-        var guideImageNum: number;
-        // 15678是操作引导
-        /*const chapterToGuideNum = {
-            1: 1,
-            5: 2,
-            6: 3,
-            7: 4,
-            8: 5,
-            10: 8,
-            19: 6,
-            24: 7,
-        }
-        guideImageNum = chapterToGuideNum[this.chapter];
-        if (guideImageNum && !readCache(getCacheKey() + guideImageNum)) {
-            Loading2.instace.show()
-            let g = new GuideMsg();
-            g.init(
-                guideImageNum,
-                () => {
-                    Loading2.instace.hide()
-                    this.addChild(g);
-                },
-                () => {
-                    Loading2.instace.hide()
-                })
-        }*/
         //游戏引导
-        const gameGuideChapterNum = [1, 5, 6, 7, 8, 9, 10, 19, 24]
+        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);
@@ -473,123 +453,6 @@ export default class MainScene extends Scene {
         this.bonusTime.x = 375;
         this.bonusTime.y = 600;
     }
-    //初始化格子
-    initLattices1() {
-        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);
-            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);
-            } else {
-                this.lattices[i].reset(i);
-            }
-            //如果是生成口
-            if (generateLats.indexOf(i) >= 0) {
-                this.lattices[i].isGenerate = true;
-            }
-            var p = Tool.getPositionByIndex(i);
-            switch (latticesD[i]) {
-                //基础元素,浅冰块，深冰块，枷锁
-                case 1:
-                case 2:
-                case 3:
-                case 6:
-                    var type = Tool.returnType(i, this.lattices, this.chapterData.baseElementTypes);
-                    let ele: Element = Pool.takeOut(RecoverName.ELEMENT);
-                    if (!ele) {
-                        ele = new Element(type)
-                    } else {
-                        ele.reset(type)
-                    }
-                    ele.x = p[0];
-                    ele.y = p[1];
-                    this.elementContainer.addChild(ele);
-                    this.lattices[i].element = ele;
-                    //加特效
-                    if (Math.random() < this.chapterData.effectInitProbability) {
-                        ele.effectType = Tool.randomT([0, 1, 2, 3])
-                        if (ele.effectType == EffectType.MAGICLION) {
-                            this.elementContainer.addChildAt(ele, 0);
-                        }
-                    }
-                    //冰块
-                    if (latticesD[i] == 2 || latticesD[i] == 3) {
-                        let ice = Pool.takeOut(RecoverName.ICE);
-                        if (!ice) {
-                            ice = new Ice(latticesD[i] - 1);
-                        } else {
-                            ice.reset(latticesD[i] - 1);
-                        }
-                        this.map.addChild(ice);
-                        this.lattices[i].ice = ice;
-                        ice.x = p[0] - 80 / 2;
-                        ice.y = p[1] - 81 / 2;
-                    }
-                    //枷锁
-                    else if (latticesD[i] == 6) {
-                        ele.isLock = true;
-                    }
-                    break;
-                //棒棒糖
-                case 4:
-                    this.lollipopCount++;
-                    let lol: Element = Pool.takeOut(RecoverName.ELEMENT);
-                    if (!lol) {
-                        lol = new Element(ElementType.LOLLIPOP)
-                    } else {
-                        lol.reset(ElementType.LOLLIPOP)
-                    }
-                    lol.x = p[0];
-                    lol.y = p[1];
-                    this.elementContainer.addChild(lol);
-                    this.lattices[i].element = lol;
-                    break;
-                //石头    
-                case 5:
-                    let rock: Element = Pool.takeOut(RecoverName.ELEMENT);
-                    if (!rock) {
-                        rock = new Element(ElementType.ROCK)
-                    } else {
-                        rock.reset(ElementType.ROCK)
-                    }
-                    rock.x = p[0];
-                    rock.y = p[1];
-                    this.elementContainer.addChild(rock);
-                    this.lattices[i].element = rock;
-                    break;
-            }
-        }
-        //联通口
-        var connectedLats = this.chapterData.map.connectedLats || [];
-        for (var i = 0; i < connectedLats.length; i++) {
-            var connectedLat = connectedLats[i];
-            this.lattices[connectedLat[0]].down = connectedLat[1];
-            this.lattices[connectedLat[1]].up = connectedLat[0];
-        }
-        //第35和56，要枷锁元素,定制，2期去掉
-        if (this.chapter == 35 || this.chapter == 56) {
-            var locks = [4, 13, 22, 31, 40, 49, 57, 58, 59, 66, 67, 68, 75, 76, 77, 63, 64, 72, 73, 70, 71, 79, 80];
-            for (var aaa = 0; aaa < locks.length; aaa++) {
-                this.lattices[locks[aaa]].element.isLock = true;
-            }
-        }
-        //初始化完先检测死图
-        this.warningCop = Tool.dieMapCheck(this.lattices);
-        if (!this.warningCop) {
-            //替换顺序
-            this.upsetElement();
-        }
-        else {
-            this.enableMouseEvt(true);
-        }
-
-    }
     endRowNumHash;
     initLattices() {
         this.endRowNumHash = {};
@@ -705,6 +568,22 @@ export default class MainScene extends Scene {
                     this.elementContainer.addChild(rock);
                     this.lattices[i].element = rock;
                     break;
+                //果冻
+                case 5:
+                    let jelly: Element = Tool.getElement(ElementType.JELLY)
+                    jelly.x = p[0];
+                    jelly.y = p[1];
+                    this.elementContainer.addChild(jelly);
+                    this.lattices[i].element = jelly;
+                    break;
+                //鸡蛋
+                case 6:
+                    let egg: Element = Tool.getElement(ElementType.CHICKEN_EGG)
+                    egg.x = p[0];
+                    egg.y = p[1];
+                    this.elementContainer.addChild(egg);
+                    this.lattices[i].element = egg;
+                    break;
                 default:
                     //其他标识按空元素记
                     this.emptys.push(i);
@@ -714,6 +593,16 @@ 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);
 
         //初始化完先检测死图
         this.warningCop = Tool.dieMapCheck(this.lattices);
@@ -914,7 +803,7 @@ export default class MainScene extends Scene {
             this.elementContainer.addEventListener(egret.TouchEvent.TOUCH_BEGIN, fun = function (e) {
                 var ele = e.target.parent
                 if (ele instanceof Element &&
-                    ele.type != ElementType.ROCK &&
+                    // ele.type != ElementType.ROCK &&
                     ele.type != ElementType.LOLLIPOP) {
                     this.elementContainer.removeEventListener(egret.TouchEvent.TOUCH_BEGIN, fun, this);
                     var index = ele.index;
@@ -1024,7 +913,7 @@ export default class MainScene extends Scene {
             this.isShowWarning = false;
             this.noActionCount = 0;
             this.resetWarning();
-            if (e.target.parent.type == ElementType.ROCK || e.target.parent.isLock) return
+            if (!Tool.judgeChosen(e.target.parent)) return
             // console.log(e.target.parent)
             if (self.SELECTED && Tool.checkNeb(e.target.parent, self.SELECTED)) {
                 self.exchangeElementAni(self.SELECTED, e.target.parent, self.callbackEx);
@@ -1043,7 +932,8 @@ export default class MainScene extends Scene {
     }
     mouseMoveE(e) {
         if (this.SELECTED && e.target.parent instanceof Element) {
-            if (e.target.parent.type == ElementType.ROCK || e.target.parent.isLock) return
+            if (!Tool.judgeChosen(e.target.parent)) return
+            // if (e.target.parent.type == ElementType.ROCK || e.target.parent.isLock) return
             if (Tool.checkNeb(e.target.parent, this.SELECTED)) {
                 this.exchangeElementAni(this.SELECTED, e.target.parent, this.callbackEx);
                 this.SELECTED.removeChild(this.choosed);
@@ -1143,9 +1033,9 @@ export default class MainScene extends Scene {
                     })
                 }
             } else {
-                this.fallVerAni(anis, () => {
+                this.fallAni(anis, () => {
                     this.fall(callback)
-                })
+                }, true)
             }
         } else {
             var anis = this.fallVertical();
@@ -1357,83 +1247,18 @@ export default class MainScene extends Scene {
         return anis
     }
 
-    private fallSkew() {
-        //记录一个对象和位置信息[obj,index]的数组，如果obj是null则生成，index位置上方
-        var anis = [];
-        var emptys = this.emptys;
-        //排序从小到大
-        emptys.sort(function (a, b) { return a > b ? 1 : -1 })
-        for (var i = emptys.length - 1; i >= 0; i--) {
-            var indexMy = emptys[i];
-            var lat = this.lattices[indexMy];
-            //判断是否是生成口
-            if (lat.isGenerate) {
-                //是生成口，就不用管落下乐
-                anis.push([null, indexMy])
-                //去掉
-                emptys.splice(i, 1);
-                //优先判断生成的，不用管掉落了，跳下一个
-                continue
-            }
-            let latFall;
-            let indexFall;
-            //找正上方是否有能掉落的。
-            var latUp = this.lattices[indexMy - Tool.colNum];
-            //上方格子为null，或格子上元素为null
-            if (Tool.judgeFall(latUp)) {
-                latFall = latUp;
-                indexFall = indexMy - Tool.colNum;
-            }
-            //找联通的up，一期没有复杂的联通，所以动画不用特殊处理
-            else if (lat.up) {
-                var latUnUp = this.lattices[lat.up];
-                if (Tool.judgeFall(latUnUp)) {
-                    latFall = latUnUp;
-                    indexFall = lat.up;
-                }
-            }
-            //找左上
-            if (!latFall && Tool.indexToRc(indexMy)[1] != 0) {
-                var latLeftUp = this.lattices[indexMy - Tool.colNum - 1];
-                if (Tool.judgeFall(latLeftUp)) {
-                    latFall = latLeftUp;
-                    indexFall = indexMy - Tool.colNum - 1;
-                }
-            }
-            //找右上
-            if (!latFall && Tool.indexToRc(indexMy)[1] != Tool.colNum - 1) {
-                var latRightUp = this.lattices[indexMy - Tool.colNum + 1];
-                if (Tool.judgeFall(latRightUp)) {
-                    latFall = latRightUp;
-                    indexFall = indexMy - Tool.colNum + 1;
-                }
-            }
-            //如果latFall存在
-            if (latFall) {
-                //能掉落，记录元素动画
-                anis.push([latFall.element, indexMy]);
-                //去掉
-                emptys.splice(i, 1);
-                //在剩下emptys的加上一个，正上方的那个
-                // Tool.insert(indexFall, emptys)
-                emptys.push(indexFall)
-                //掉落的格子上的元素致null
-                latFall.element = null;
-                //长度加了，多加+
-                i++;
-            }
-        }
-        return anis
-    }
-
     /**
      * 执行掉落动画
      * @param anis 数组，0是元素，1是目标位置索引，2是掉落层数
      * @param emptys 
      * @param callback 
      */
-    fallAni(anis: any[], callback: Function) {
-        // playSound(SoundType.fall);
+    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++) {
@@ -1468,7 +1293,7 @@ export default class MainScene extends Scene {
             obj.fallAni()
             //执行Tween
             egret.Tween.get(obj)
-                .to({ x: position[0], y: position[1] }, 100/*, egret.Ease.cubicOut*/)
+                .to({ x: position[0], y: position[1] }, deltaTime * rowCount/*, egret.Ease.cubicOut*/)
                 .call(() => {
                     obj.x = position[0];
                     obj.y = position[1];
@@ -1491,46 +1316,7 @@ export default class MainScene extends Scene {
         }
 
     }
-    fallVerAni(anis: any[], callback: Function) {
-        playSound(SoundType.fall);
-        var maxCount = anis["maxCount"] || 1;
-        // console.log(maxCount)
-        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);
-            //现在得位置的赋值
-            var lat = this.lattices[index];
-            lat.element = obj;
-            obj.fallAni()
-            //执行Tween
-            egret.Tween.get(obj)
-                .to({ x: position[0], y: position[1] }, 150 * 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()
-                    }
-                })
-        }
 
-    }
     /**
      * 只关心交换后元素的可消除
      * 或者冰淇淋的掉落
@@ -1670,7 +1456,10 @@ export default class MainScene extends Scene {
 
 
 
-    //执行消除，应该是一个迭代，只要eliminatedElements有东西就一直执行
+    /**
+     * 执行消除，应该是一个迭代，只要eliminatedElements有东西就一直执行
+     * 掉落后的逻辑很复杂
+     */
     eliminate() {
         //如果是是带组合特效的，组合时的特效本身的算分在effectCombination内，暂不计
         if (this.isManual) {
@@ -1707,9 +1496,14 @@ export default class MainScene extends Scene {
             //执行掉落
             setTimeout(() => {
                 this.fall(() => {
+                    //掉落后有消除
                     if (this.threeMatch()) {
                         this.eliminate()
-                    } else {
+                        return
+                    }
+                    //鸡蛋的操作，无鸡蛋，或鸡蛋无小鸡 直接执行回调，
+                    //有小鸡飞出要走threeMatch，有eliminate，没有直接走回调
+                    AiControl.ins.eggMotion(this, () => {
                         //如果早已通关，正在结算
                         if (this.hasPassed) {
                             //如果原先特效还有，
@@ -1728,6 +1522,7 @@ export default class MainScene extends Scene {
                         //判断是否已达目标
                         this.hasPassed = this.judgePass();
                         console.log(this.hasPassed)
+                        //如果已达目标
                         if (this.hasPassed) {
                             //通关就不允许退出按钮
                             this.quitBtn.touchEnabled = false;
@@ -1758,23 +1553,33 @@ export default class MainScene extends Scene {
                         //连消置0
                         this.commonContinuityTimes = 0;
                         this.effectContinuityTimes = 0;
-
-                        //先判断步数是否为0；
+                        //判断步数是否为0；
                         if (this.steps == 0) {
-                            //判断是否有加步数的道具，有则提示是否加（加完判断死图），没有则直接结束
                             //失败弹框
                             playSound(SoundType.fail);
                             PanelCtrl.instance.show("failed", { level: this.chapter });
-                        } else {
+                            return
+                        }
+                        //额外加一步ai果冻的操作，然后再执行检查死图
+                        AiControl.ins.jellyMotion(this, () => {
                             //检查死图
                             this.warningCop = Tool.dieMapCheck(this.lattices);
                             if (!this.warningCop) {
-                                //死图。替换顺序，出toast
-                                showToast("没有可以消除的元素")
-                                // PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: "没有可以消除的元素", isHideMask: true })
-                                setTimeout(() => {
-                                    this.upsetElement()
-                                }, 1000)
+                                //检查一边是否已死
+                                if (Tool.alreadyDie(this.lattices)) {
+                                    showToast("元素已无法消除")
+                                    setTimeout(() => {
+                                        playSound(SoundType.fail);
+                                        PanelCtrl.instance.show("failed", { level: this.chapter });
+                                    }, 1000)
+                                } else {
+                                    //死图。替换顺序，出toast
+                                    showToast("没有可以消除的元素")
+                                    // PanelCtrl.instance.show(ModuleTypes.TOAST_PANEL, { msg: "没有可以消除的元素", isHideMask: true })
+                                    setTimeout(() => {
+                                        this.upsetElement()
+                                    }, 1000)
+                                }
                             } else {
                                 //如果还有游戏引导
                                 if (this.gameGuide) {
@@ -1784,8 +1589,8 @@ export default class MainScene extends Scene {
                                 //允许移动
                                 this.enableMouseEvt(true)
                             }
-                        }
-                    }
+                        })
+                    })
                 });
             }, 200)
         }
@@ -1817,9 +1622,10 @@ export default class MainScene extends Scene {
             for (var i = 0; i < this.lattices.length; i++) {
                 var lat = this.lattices[i];
                 if (Tool.judgeEliminate(lat)) {
-                    this.eliminatedElements.push(i);
+                    //本来没必要判断特效组合时是否有重复的消除元素，但是recoverEle里会有判断石头或果冻的加入，造成重复
+                    if (this.eliminatedElements.indexOf(i) == -1) this.eliminatedElements.push(i);
                     //两个魔力鸟分数MM
-                    if (!lat.element.isLock/*&&lat.element.effectType==null*/) {
+                    if (!lat.element.isLock && lat.element.type <= 4/*&&lat.element.effectType==null*/) {
                         this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes.MM, Tool.getPositionByIndex(i))
                     }
                 }
@@ -1854,7 +1660,8 @@ export default class MainScene extends Scene {
                 var lat = this.lattices[i];
                 if (Tool.judgeMatch(lat) &&
                     lat.element.type == other.type) {
-                    this.eliminatedElements.push(i);
+                    //一个魔力鸟时其实不用加，因为石头或果冻的不会进入判断
+                    if (this.eliminatedElements.indexOf(i) == -1) this.eliminatedElements.push(i);
                     //如果other带特效，符合的元素都加上特效，没动效，直接加吧先，
                     if (other.effectType != null) {
                         if (other.effectType == EffectType.EXPLOSIVE) {
@@ -1889,8 +1696,8 @@ export default class MainScene extends Scene {
             for (var i = 0; i < this.lattices.length; i++) {
                 var lat = this.lattices[i];
                 if (Tool.judgeEliminate(lat) && (lat.row == lat1.row || lat.column == lat1.column)) {
-                    this.eliminatedElements.push(i);
-                    if (!lat.element.isLock) {
+                    if (this.eliminatedElements.indexOf(i) == -1) this.eliminatedElements.push(i);
+                    if (!lat.element.isLock && lat.element.type <= 4) {
                         //线与线
                         this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes.LL, Tool.getPositionByIndex(i))
                     }
@@ -1913,8 +1720,8 @@ export default class MainScene extends Scene {
                 var lat = this.lattices[i];
                 if (Tool.judgeEliminate(lat) &&
                     (Math.abs(lat.row - lat1.row) < 2 || Math.abs(lat.column - lat1.column) < 2)) {
-                    this.eliminatedElements.push(i);
-                    if (!lat.element.isLock) {
+                    if (this.eliminatedElements.indexOf(i) == -1) this.eliminatedElements.push(i);
+                    if (!lat.element.isLock && lat.element.type <= 4) {
                         //线和炸弹
                         this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes.EL, Tool.getPositionByIndex(i))
                     }
@@ -1938,8 +1745,8 @@ export default class MainScene extends Scene {
                 var lat = this.lattices[i];
                 if (Tool.judgeEliminate(lat) &&
                     (Math.abs(lat.row - lat1.row) < 3 && Math.abs(lat.column - lat1.column) < 3)) {
-                    this.eliminatedElements.push(i);
-                    if (!lat.element.isLock) {
+                    if (this.eliminatedElements.indexOf(i) == -1) this.eliminatedElements.push(i);
+                    if (!lat.element.isLock && lat.element.type <= 4) {
                         //两个炸弹
                         this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes.EE, Tool.getPositionByIndex(i))
                     }
@@ -1970,6 +1777,7 @@ export default class MainScene extends Scene {
     }
     /**
      * 普通元素消除,先消除无特效的，有特效的存下，然后触发，找下一步消除的元素
+     * 加入石头，果冻，鸡蛋
      */
     commonEliminate(): number[] {
         playSound(SoundType.eliminate)
@@ -1981,7 +1789,10 @@ export default class MainScene extends Scene {
             //不用判断是否存在元素了吧
             var ele = lat.element;
             var p = Tool.getPositionByIndex(index);
-            if (ele.isLock) {
+            if (!ele) {
+                //以防万一还是判断一次
+            }
+            else if (ele.isLock) {
                 //被禁锢的解开
                 ele.isLock = false;
             }
@@ -1996,13 +1807,38 @@ export default class MainScene extends Scene {
                     //但是算个数，
                     this.goElementTarget(ele);
                     //如果格子有冰
-                    this.iceBroke(this.lattices[index]);
+                    this.iceBroken(this.lattices[index]);
                     //如果格子附近有石头
-                    this.rokeBroke(this.lattices[index]);
+                    this.rokeBroken(this.lattices[index]);
+                    //如果格子附近有果冻
+                    this.jellyBroken(this.lattices[index]);
+                    //如果附近有鸡蛋
+                    this.eggBroken(this.lattices[index])
                 } else {
                     //单纯元素消失特效
-                    this.playAni(RecoverName.ELEDIS_ANI, p)
-                    this.recoverEle(index)
+                    if (ele.type <= 4) {
+                        this.playAni(RecoverName.ELEDIS_ANI, p)
+                        this.recoverEle(index)
+                    }
+                    //石头
+                    else if (ele.type == ElementType.ROCK) {
+                        this.removeRock(index);
+                        //算个数
+                        this.goElementTarget(ele);
+                    }
+                    //果冻
+                    else if (ele.type == ElementType.JELLY) {
+                        this.removeJelly(index);
+                    }
+                    //鸡蛋
+                    else if (ele.type == ElementType.CHICKEN_EGG) {
+                        //额外逻辑,
+                        ele.chickenEgg.statusNum--;
+                        //鸡蛋的摆动
+                        ele.chickenEgg.shakeAni();
+                        //鸡蛋动效,待改
+                        this.playAni(RecoverName.EGGBROKEN_ANI, p)
+                    }
                 }
             }
             //从消除列表移除
@@ -2072,7 +1908,7 @@ export default class MainScene extends Scene {
                             if (this.eliminatedElements.indexOf(i) < 0 && effectIndexs.indexOf(i) < 0) {
                                 this.eliminatedElements.push(i);
                                 //
-                                if (!this.lattices[i].element.isLock) {
+                                if (!this.lattices[i].element.isLock && this.lattices[i].element.type <= 4) {
                                     this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["2"], Tool.getPositionByIndex(i))
                                 }
                             }
@@ -2091,7 +1927,7 @@ export default class MainScene extends Scene {
                             if (this.eliminatedElements.indexOf(ein) < 0 && effectIndexs.indexOf(ein) < 0) {
                                 this.eliminatedElements.push(ein);
                                 //
-                                if (!this.lattices[ein].element.isLock) {
+                                if (!this.lattices[ein].element.isLock && this.lattices[ein].element.type <= 4) {
                                     this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["0"], Tool.getPositionByIndex(ein))
                                 }
                             }
@@ -2110,7 +1946,7 @@ export default class MainScene extends Scene {
                             if (this.eliminatedElements.indexOf(ein) < 0 && effectIndexs.indexOf(ein) < 0) {
                                 this.eliminatedElements.push(ein);
                                 //
-                                if (!this.lattices[ein].element.isLock) {
+                                if (!this.lattices[ein].element.isLock && this.lattices[ein].element.type <= 4) {
                                     this.pushScoreAni(baseScore * this.effectContinuityTimes * effectBaseTimes["1"], Tool.getPositionByIndex(ein))
                                 }
                             }
@@ -2154,11 +1990,14 @@ export default class MainScene extends Scene {
         var effectElements = [], elements = [];
         for (var i = Tool.colNum * Tool.rowNum - 1; i >= 0; i--) {
             var lat = this.lattices[i];
-            if (!Tool.judgeEliminate(lat)) continue
-            if (lat.element.effectType != null) {
-                effectElements.push(i);
-            } else {
-                elements.push(lat.element)
+            if (lat &&
+                lat.element &&
+                lat.element.type <= 4) {
+                if (lat.element.effectType != null) {
+                    effectElements.push(i);
+                } else {
+                    elements.push(lat.element)
+                }
             }
         }
         //如果特效有，消除特效
@@ -2270,8 +2109,7 @@ export default class MainScene extends Scene {
             var lat = this.lattices[i];
             if (lat &&
                 lat.element &&
-                lat.element.type != ElementType.ROCK &&
-                lat.element.type != ElementType.LOLLIPOP &&
+                lat.element.type <= 4 &&
                 !lat.element.isLock) {
                 lats.push(lat)
             }
@@ -2319,7 +2157,7 @@ export default class MainScene extends Scene {
     }
 
     /**
-     * 该方法基本用于消除的时候，有时异步的时候不用
+     * 该方法基本用于消除的时候，有时异步的时候不用，只用于基本元素和特效和棒棒糖
      * 添加进emptys
      * 置空格子的element,
      * 从容器移除
@@ -2339,9 +2177,13 @@ export default class MainScene extends Scene {
         this.lattices[index].element = null;
         if (ele.type != ElementType.LOLLIPOP) {
             //如果格子有冰
-            this.iceBroke(this.lattices[index]);
+            this.iceBroken(this.lattices[index]);
             //如果附近有石头
-            this.rokeBroke(this.lattices[index]);
+            this.rokeBroken(this.lattices[index]);
+            //如果附近有果冻
+            this.jellyBroken(this.lattices[index]);
+            //如果附近有鸡蛋
+            this.eggBroken(this.lattices[index])
         }
         //计算元素消除个数
         this.goElementTarget(ele);
@@ -2460,7 +2302,7 @@ export default class MainScene extends Scene {
      * 格子上的冰块破碎
      * @param lat 
      */
-    iceBroke(lat: Lattice) {
+    iceBroken(lat: Lattice) {
         if (lat && lat.ice) {
             var ice = lat.ice;
             ice.countNum--;
@@ -2506,7 +2348,7 @@ export default class MainScene extends Scene {
      * 附近是否有石头
      * @param lat 格子
      */
-    rokeBroke(lat: Lattice) {
+    rokeBroken(lat: Lattice) {
         var indexMy = lat.index;
         //判断上下左右是否有石头
         var indexs = [
@@ -2525,22 +2367,106 @@ export default class MainScene extends Scene {
             if (lat &&
                 lat.element &&
                 lat.element.type == ElementType.ROCK) {
-                //回收
-                let ele = lat.element;
-                //添加进emptys
-                this.emptys.push(index)
-                //从容器移除
-                this.elementContainer.removeChild(ele);
-                //回收元素
-                Pool.recover(RecoverName.ELEMENT, ele);
-                //置空格子的element,
-                lat.element = null;
-                //播放动效
-                this.playAni(RecoverName.ROCK_ANI, Tool.getPositionByIndex(index))
+                // this.removeRock(index)
+                //添加进消除队列，注意重复
+                if (this.eliminatedElements.indexOf(index) == -1) this.eliminatedElements.push(index)
             }
         }
     }
-
+    /**
+     * 附近是否有果冻
+     * @param lat 格子
+     */
+    jellyBroken(lat: Lattice) {
+        var indexMy = lat.index;
+        //判断上下左右是否有果冻
+        var indexs = [
+            indexMy - Tool.colNum,
+            indexMy + Tool.colNum,
+        ]
+        if (lat.column > 0) {
+            indexs.push(indexMy - 1)
+        }
+        if (lat.column < Tool.colNum - 1) {
+            indexs.push(indexMy + 1)
+        }
+        for (let i = 0; i < indexs.length; i++) {
+            let index = indexs[i];
+            let lat = this.lattices[index];
+            if (lat &&
+                lat.element &&
+                lat.element.type == ElementType.JELLY) {
+                // this.removeJelly(index)
+                //添加进消除队列，注意重复
+                if (this.eliminatedElements.indexOf(index) == -1) this.eliminatedElements.push(index)
+            }
+        }
+    }
+    /**
+     * 附近是否有鸡蛋
+     * @param lat 
+     */
+    eggBroken(lat: Lattice) {
+        var indexMy = lat.index;
+        //判断上下左右是否有果冻
+        var indexs = [
+            indexMy - Tool.colNum,
+            indexMy + Tool.colNum,
+        ]
+        if (lat.column > 0) {
+            indexs.push(indexMy - 1)
+        }
+        if (lat.column < Tool.colNum - 1) {
+            indexs.push(indexMy + 1)
+        }
+        for (let i = 0; i < indexs.length; i++) {
+            let index = indexs[i];
+            let lat = this.lattices[index];
+            if (lat &&
+                lat.element &&
+                lat.element.type == ElementType.CHICKEN_EGG) {
+                //添加进消除队列，注意重复
+                if (this.eliminatedElements.indexOf(index) == -1) this.eliminatedElements.push(index)
+            }
+        }
+    }
+    /**
+     * 石头的移除，包括动效
+     * @param index 
+     */
+    removeRock(index: number) {
+        //回收
+        let ele = this.lattices[index].element;
+        //添加进emptys
+        this.emptys.push(index)
+        //从容器移除
+        this.elementContainer.removeChild(ele);
+        //回收元素
+        Pool.recover(RecoverName.ELEMENT, ele);
+        //置空格子的element,
+        this.lattices[index].element = null;
+        //播放动效
+        this.playAni(RecoverName.ROCK_ANI, Tool.getPositionByIndex(index))
+    }
+    /**
+     * 果冻的移除，包括动效
+     * @param index 
+     */
+    removeJelly(index: number) {
+        this.jellyBrokenMark = true;
+        //回收
+        let ele = this.lattices[index].element;
+        //添加进emptys
+        this.emptys.push(index)
+        //从容器移除
+        this.elementContainer.removeChild(ele);
+        //回收元素
+        Pool.recover(RecoverName.ELEMENT, ele);
+        //置空格子的element,
+        this.lattices[index].element = null;
+        //播放动效，果冻的特效，待写
+        this.playAni(RecoverName.JELLYDIS_ANI, Tool.getPositionByIndex(index))
+    }
     /**
      * 禁用与开启事件
      * 暂时只禁止道具及元素的
@@ -2554,6 +2480,7 @@ export default class MainScene extends Scene {
             arr[i].touchEnabled = b;
             arr[i].touchChildren = b;
         }
+        this.quitBtn.touchEnabled = b;
         this.enableTouch = b;
     }
     sample() {

egret/src/mapScene/AdSmallComp.ts

+import ComponentBase from "../../libs/new_wx/components/ComponentBase";
+import { NetManager } from "../../libs/tw/manager/NetManager";
+
+export default class AdSmallComp extends ComponentBase {
+    
+    start(data?) {
+        this.touchEnabled=this.touchChildren=false;
+        super.start(data);
+        NetManager.ins.hc_advert(()=>{
+            this.data.img = ''
+        })
+    }
+
+    get skinKey(): string { return 'ADSmall' }
+}
\ No newline at end of file

egret/src/mapScene/AvatarComp.ts

+import ComponentBase from "../../libs/new_wx/components/ComponentBase";
+
+export default class AvatarComp extends ComponentBase {
+    
+    start(data?) {
+        this.touchEnabled=this.touchChildren=false;
+        super.start(data);
+        this['avatar'].mask = this['avatarMask'];
+        this['avatar'].source = data.avatar;
+    }
+
+    get skinKey(): string { return 'Avatar' }
+}
\ No newline at end of file

egret/src/mapScene/MapScene.ts

@@ -18,9 +18,13 @@ import setGray from "../setGray";
 import { loadSvga } from "../loadSvga";
 import getResPath from "../../libs/new_tc/getResPath";
 import CountDown from "./CountDown";
+import AvatarComp from "./AvatarComp";
+import Utils from "../Utils";
+import tr = egret.sys.tr;
 
 
 export default class MapScene extends Scene {
+    static adData;
     scrollGroup: eui.Group;
     scroll: eui.Scroller;
     topPart: MapTopPart;
@@ -29,15 +33,32 @@ export default class MapScene extends Scene {
     static iconHash: any = {};
     static starHash: any = {};
     _data;
+    sendInvite(){
+        const dojoin = DataManager.ins.getData('hc_doJoin');
+        if(!dojoin)return;
+        NetManager.ins.doHelp(()=>{},Utils.getRequestByKey("shareCode"),dojoin.data);
+    }
+
+    // 邀请有礼角标倒计时
+    private timer: egret.Timer;
+    private cutTime: number;
+
     async start(data?) {
 
         super.start();
+        
+        this.sendInvite();
+
+        this.updateMyInfo();
+        this.updateAdData();
+        this.getInviteInfo(); // 查询邀请信息，控制邀请有礼角标
+        this['avatar'].mask = this['avatarMask'];
 
-        // setTimeout(() => {
-        //     PanelCtrl.instance.show('invite');
-        // }, 3000);
+        setTimeout(() => {
+            // PanelCtrl.instance.show('StartPanel',1);
+        }, 1000);
 
-        if (getBgOn() && MapScene['firstPlayBgTag'] == true) {
+        if(getBgOn() && MapScene['firstPlayBgTag'] == true) {
             playBg();
         }
 
@@ -49,11 +70,11 @@ export default class MapScene extends Scene {
             const nowTimerStr = date.getTime() + '';
             const oldTimerStr = localStorage.getItem('nowTimerStr' + window['CFG'].consumerId);
 
-            if (!readCache() && getHomeData().levels.length <= 0) { //引导
-                const guide = new GuideCon(()=>{
-                    const { signInfoVO } = DataManager.ins.getData('getSignInfo');
-                    if (signInfoVO.continueDay >= 7) return;
-                    if (signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
+            if(!readCache() && getHomeData().levels.length <= 0) { //引导
+                const guide = new GuideCon(() => {
+                    const {signInfoVO} = DataManager.ins.getData('getSignInfo');
+                    if(signInfoVO.continueDay >= 7) return;
+                    if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
                         PanelCtrl.instance.show('sign');
                         localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr);
                     }
@@ -63,15 +84,14 @@ export default class MapScene extends Scene {
                 guide.play(1)
                 console.log(guide)
             } else { //不用引导
-                const { signInfoVO } = DataManager.ins.getData('getSignInfo');
-                if (signInfoVO.continueDay >= 7) return;
-                if (signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
+                const {signInfoVO} = DataManager.ins.getData('getSignInfo');
+                if(signInfoVO.continueDay >= 7) return;
+                if(signInfoVO.todaySigned == 0 && oldTimerStr != nowTimerStr) {
                     PanelCtrl.instance.show('sign');
                     localStorage.setItem('nowTimerStr' + window['CFG'].consumerId, nowTimerStr);
                 }
             }
 
-            
 
         }, window['signActivityId']);
 
@@ -104,20 +124,20 @@ export default class MapScene extends Scene {
 
         let target;
         const homeData = getHomeData();
-        if (homeData.levels.length == 0) {
+        if(homeData.levels.length == 0) {
             target = 1;
-        } else if (homeData.levels.length == window['total_level']) {
+        } else if(homeData.levels.length == window['total_level']) {
             target = window['total_level'] + 1;
         } else {
             target = homeData.levels.length + 1;
         }
-        for (const key in MapScene.iconHash) {
+        for(const key in MapScene.iconHash) {
             const levelOrder = parseInt(key);
             const element = MapScene.iconHash[key];
             element.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
-                if (
-                    (levelOrder > (homeData.levels.length + 1) && levelOrder > 1 )
-                    ||  (levelOrder > window['last_level'])
+                if(
+                    (levelOrder > (homeData.levels.length + 1) && levelOrder > 1)
+                    || (levelOrder > window['last_level'])
                 ) {
                     // showToast('必须通关前面的关卡才能开启本关');
                     console.log('必须通关前面的关卡才能开启本关');
@@ -127,7 +147,7 @@ export default class MapScene extends Scene {
             }, this);
         }
 
-        if (homeData.levels.length < window['total_level']) {
+        if(homeData.levels.length < window['total_level']) {
             const targetIcon = MapScene.iconHash[target];
             const light = RES.getRes('lightani_png');
             const pic = new egret.Bitmap(light);//76 61
@@ -137,17 +157,18 @@ export default class MapScene extends Scene {
             pic.anchorOffsetY = 61;
             pic.x = 50 - 2;
             pic.y = 37 + 10;
-            egret.Tween.get(pic, { loop: true }).to({ scaleX: 2, scaleY: 2, alpha: 0 }, 1000).wait(1000);
+            egret.Tween.get(pic, {loop: true}).to({scaleX: 2, scaleY: 2, alpha: 0}, 1000).wait(1000);
             this['pic'] = pic;
         }
 
 
         this.updateHomeData();
+        this.updateFriends();
         this.showLog();
         this.updateBox();
 
-        if (data.level) {
-            if (homeData.remainEnargy == 0)
+        if(data.level) {
+            if(homeData.remainEnargy == 0)
 
                 PanelCtrl.instance.show('bloodPanel')
             else
@@ -155,8 +176,8 @@ export default class MapScene extends Scene {
         }
 
         this.stage.once(egret.TouchEvent.TOUCH_TAP, () => {
-            if (!MapScene['firstPlayBgTag']) {
-                if (getBgOn()) {
+            if(!MapScene['firstPlayBgTag']) {
+                if(getBgOn()) {
                     playBg();
                 }
                 MapScene['firstPlayBgTag'] = true;
@@ -164,7 +185,7 @@ export default class MapScene extends Scene {
         }, this);
 
         let lastOrder = homeData.levels.length + 1;
-        if (homeData.levels.length >= window['total_level'])
+        if(homeData.levels.length >= window['total_level'])
             lastOrder = window['total_level'];
         this.scroll.viewport.scrollV = this.getScrollV(lastOrder, this.stage.stageHeight);
         // console.warn(this.getScrollV(lastOrder, this.stage.stageHeight))
@@ -174,26 +195,49 @@ export default class MapScene extends Scene {
             Promise.all([
                 RES.getResAsync(`${key}_json`),
                 RES.getResAsync(`${key}_png`)]);
-        } catch (error) {
+        } catch(error) {
 
         }
 
     }
 
+    updateMyInfo() {
+        this['avatar'].visible = false;
+        this['nameTxt'].text = '';
+        NetManager.ins.hc_userInfo(() => {
+            this['avatar'].visible = true;
+            const {data} = DataManager.ins.getData('hc_userInfo');
+            this['avatar'].source = data.avatar;
+
+            this['nameTxt'].text = getNick(data.nickname);
+        });
+
+    }
+
+    updateAdData() {
+        // if(){
+        //     this['adBtn'].visible=false;
+        // }
+        // this['adBtn'].source = '';
+        this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            // window.location.href = '';
+        }, this);
+    }
+
     destroy() {
         super.destroy();
-        if (this['pic'])
+        if(this['pic'])
             egret.Tween.removeTweens(this['pic']);
 
     }
 
     getScrollV(lastOrder, stageHeight) {
         // lastOrder = 69;
-        if (lastOrder <= 7) {//顶部的1-7关
+        if(lastOrder <= 7) {//顶部的1-7关
             return this.getScrollV1(lastOrder, stageHeight);
         }
 
-        if (lastOrder >= window['total_level'] - 10) {//底部的60-70关  70-10
+        if(lastOrder >= window['total_level'] - 10) {//底部的60-70关  70-10
             return this.getScrollV2(lastOrder, stageHeight);
         }
         //中部的4个循环*13   8~59
@@ -204,7 +248,7 @@ export default class MapScene extends Scene {
         const ylist = [26, 158, 302, 435, 547, 674, 821, 897, 969, 1072, 1137, 1254, 1367];
         const y0 = this._data.top.height;//顶部的高度
         let a0 = (lastOrder - MapTopPart.LEVEL_NUMS) % MapRpeatPart.LEVEL_NUMS;  //减去7后的order  8-7 = 1
-        if (a0 == 0) a0 = MapRpeatPart.LEVEL_NUMS
+        if(a0 == 0) a0 = MapRpeatPart.LEVEL_NUMS
         const a1 = Math.ceil((lastOrder - MapTopPart.LEVEL_NUMS) / MapRpeatPart.LEVEL_NUMS) - 1;//当前地图repeat的顺序
         const y1 = ylist[a0 - 1];
         const y2 = y0 + y1 + a1 * this._data.list[0].height;
@@ -214,7 +258,7 @@ export default class MapScene extends Scene {
     getScrollV1(lastOrder, stageHeight) {
         const ylist = [492, 550.35, 744, 803, 810, 975, 1089.69].map(i => i + 40);
         const targetY = ylist[lastOrder - 1] - stageHeight / 2;
-        if (targetY <= 0) return 0
+        if(targetY <= 0) return 0
         return targetY;
     }
 
@@ -226,7 +270,7 @@ export default class MapScene extends Scene {
             + this._data.bottom.height;
         const ylist = [44, 148.44, 331, 403, 513, 660, 829.69, 949.69, 1052.69, 1148.69, 1209.69].map(i => i + 40);
         const targetY = y0 + ylist[lastOrder - 1] - stageHeight / 2;
-        if (targetY >= (totalHeight - stageHeight)) return totalHeight - stageHeight
+        if(targetY >= (totalHeight - stageHeight)) return totalHeight - stageHeight
         return targetY;
     }
 
@@ -248,7 +292,7 @@ export default class MapScene extends Scene {
 
     updateBox() {
         const homeData = getHomeData();
-        if (homeData.canReceiveTreasureBoxNum <= 0)
+        if(homeData.canReceiveTreasureBoxNum <= 0)
             setGray(this['box']);
         this['boxiconWrapper'].visible = homeData.canReceiveTreasureBoxNum > 0;
         this['totalStarTxt'].text = `${homeData.totalStars}/${homeData.nextRangeStarsNum}`;
@@ -259,29 +303,50 @@ export default class MapScene extends Scene {
     updateScene() {
         this.updateHomeData();
     }
+
+    addAvatar(level, ele?) {
+        const item = MapScene.starHash[level];
+        const parent = item.parent;
+        const avatar = new AvatarComp();
+        avatar.loadSkin();
+        avatar.start(ele);
+        parent.addChild(avatar);
+        avatar.x = item.x;
+        avatar.y = item.y - avatar.height;
+    }
+
+    updateFriends() {
+        NetManager.ins.hc_mapRank(() => {
+            const { data } = DataManager.ins.getData('hc_mapRank');
+            data.forEach((ele) => {
+                this.addAvatar(ele.levelNum,ele.rank[0]);
+            });
+        });
+    }
+
     updateHomeData() {
         const homeData = getHomeData();
 
         this['goldTxt'].text = `${homeData.wealth}`;
 
-        for (let j = 1; j < window['total_level']; j++) {
+        for(let j = 1; j < window['total_level']; j++) {
             this.disableIcon(j + 1);
         }
-        for (let i = 0; i < homeData.levels.length; i++) {
+        for(let i = 0; i < homeData.levels.length; i++) {
             const level = homeData.levels[i];
             const star = MapScene.starHash[i + 1];
-            if (level) {
+            if(level) {
                 star.setStar(level.stars);
                 this.enableIcon(level.levelNum);
             } else {
                 this.disableIcon(level.levelNum);
             }
         }
-        if (homeData.levels.length == 0) {
+        if(homeData.levels.length == 0) {
             const star = MapScene.starHash[1];
             star.setStar(0);
             this.enableIcon(1);
-        } else if (homeData.levels.length == window['last_level']) {
+        } else if(homeData.levels.length == window['last_level']) {
 
         } else {
             const star = MapScene.starHash[homeData.levels.length + 1];
@@ -292,13 +357,14 @@ export default class MapScene extends Scene {
     }
 
     private _countDown: CountDown;
+
     updateTimerView() {
         //更新倒计时
-        if (this._countDown == null) {
+        if(this._countDown == null) {
             this._countDown = new CountDown(this['countdown']);
         }
         const data = getHomeData();
-        if (data.remainEnargy >= BLOOD_NUMS_MAX) { //满了
+        if(data.remainEnargy >= BLOOD_NUMS_MAX) { //满了
             this._countDown.stop();
 
             this['fullTxt'].visible = true;
@@ -311,24 +377,140 @@ export default class MapScene extends Scene {
         }
         this['bloodTxt'].text = `${data.remainEnargy}`;
     }
-    onTap_taskBtn(){
+
+    onTap_taskBtn() {
         PanelCtrl.instance.show('task');
     }
-    onTap_inviteBtn(){
-        PanelCtrl.instance.show('invite');
+
+    onTap_inviteBtn() {
+        NetManager.ins.getInviteInfo((success, res) => {
+            if (!success || !res.data) {
+                return;
+            }
+            let flag = res.data.completeFlag;
+            switch(true) {
+                case (flag == 0):   // 	未完成
+                    PanelCtrl.instance.show('invite', res.data);
+                    break;
+                case (flag == 1):   // 完成未开奖 待领奖 请求领奖接口
+                    NetManager.ins.acceptInvitationPrize((success, res)=>{
+                        if(!success){
+                            return;
+                        }
+                        console.log(res.data);
+                        if(res.data.completeFlag == 3){
+                            showToast("哎呀，萌狮开小差啦！\n过会再来看吧！");
+                        }else{
+                            PanelCtrl.instance.show('invitePrize', res.data);
+                        }
+                    });
+                    break;
+                case (flag == 2):   // 领奖成功 倒计时
+                case (flag == 3):   // 领奖失败 倒计时
+                    PanelCtrl.instance.show('inviteCutTime', res.data);
+                    break;
+                case (flag == 4):   // 可以开启下一次发任务
+                    NetManager.ins.acceptInvitationInfo((success, res)=>{
+                        if(!success){
+                            return;
+                        }
+                        PanelCtrl.instance.show('invite', res.data);
+                    });
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+
+    //////////////////////////////////////// 邀请有礼角标 //////////////////////////////////////////////
+    /**
+     * 查询邀请信息
+     */
+    getInviteInfo(){
+        NetManager.ins.getInviteInfo((success, res) => {
+            if (!success || !res.data) {
+                return;
+            }
+            let flag = res.data.completeFlag;
+            switch(true) {
+                case (flag == 0):   // 	未完成 显示倒计时
+                    this["inviteTipsBg"].visible = true;
+                    this["inviteTips"].visible = true;
+                    this.cutTime = res.data.endTime - res.data.sysTime + 1000;
+                    console.log(this.cutTime);
+                    this.timer = new egret.Timer(1000, 0);
+                    this.timer.addEventListener(egret.TimerEvent.TIMER, this.cutTimer, this);
+                    this.timer.start();
+                    this.cutTimer();
+                    break;
+                case (flag == 1):   // 完成未开奖 待领奖 显示待领奖
+                    this["inviteTipsBg"].visible = true;
+                    this["inviteTips"].visible = true;
+                    this["inviteTips"].text = "待领奖";
+                    break;
+                case (flag == 2):   // 领奖成功 无角标
+                case (flag == 3):   // 领奖失败 无角标
+                    this["inviteTipsBg"].visible = false;
+                    this["inviteTips"].visible = false;
+                    break;
+                case (flag == 4):   // 可以开启下一次发任务 显示立即到账
+                    this["inviteTipsBg"].visible = true;
+                    this["inviteTips"].visible = true;
+                    this["inviteTips"].text = "立即到账";
+                    break;
+                default:
+                    break;
+            }
+        });
+    }
+
+
+    // 倒计时
+    private cutTimer() {
+        let timer = this.convertTime(this.cutTime -= 1000);
+        if(timer.hour === "00"
+            && timer.min === "00"
+            && timer.sec === "00") {
+            this.timer.stop();
+            this.getInviteInfo();
+        }
+        this["inviteTips"].text = `${timer.hour}:${timer.min}:${timer.sec}`;
+    }
+
+    // 通过时间戳获取时间计数（时，分，秒）
+    private convertTime(time: number) {
+        let hour = ~~(time / 3600000);                              // 小时
+        let min = ~~((time - hour * 3600000) / 60000);              // 分
+        let sec = ~~((time - hour * 3600000 - min * 60000) / 1000); // 秒
+
+        return {
+            hour: Utils.prefixInteger(hour, 2),
+            min: Utils.prefixInteger(min, 2),
+            sec: Utils.prefixInteger(sec, 2)
+        }
+    }
+
+    ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+    onTap_friendBtn() {
+        PanelCtrl.instance.show('friend');
     }
-    onTap_adBtn(){
+
+    onTap_adBtn() {
         console.log('onTap_adBtn')
     }
-    onTap_signBtn(){
+
+    onTap_signBtn() {
         NetManager.ins.getSignInfo(() => {
             PanelCtrl.instance.show('sign');
-        },window['signActivityId'])
+        }, window['signActivityId'])
     }
 
     protected initEvents() {
         // this['goldBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_goldBtn, this)
         this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_inviteBtn, this)
+        this['friendBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_friendBtn, this)
         this['adBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_adBtn, this)
         this['taskBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_taskBtn, this)
         this['signBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTap_signBtn, this)
@@ -367,12 +549,13 @@ export default class MapScene extends Scene {
     }
 
     private _mc;
+
     async onTap_boxLayer() {
         NetManager.ins.clickLog(getlogItem(1));
         const data = getHomeData();
-        if (data.canReceiveTreasureBoxNum > 0) {
+        if(data.canReceiveTreasureBoxNum > 0) {
             this['boxLayer'].visible = true;
-            if (!this._mc)
+            if(!this._mc)
                 this._mc = await loadSvga(getResPath() + 'resource/assets/svgas/box.svga', this['boxani']);
             this._mc.stop();
             this._mc.gotoAndStop(1);
@@ -384,18 +567,18 @@ export default class MapScene extends Scene {
             await wait(50);
             this._mc.visible = true;
             const a = 100, b = 10;
-            egret.Tween.get(this._mc, { loop: true }).set({ rotation: b })
-                .to({ rotation: -b }, a).to({ rotation: b }, a)
-                .to({ rotation: -b }, a).to({ rotation: b }, a)
-                .to({ rotation: -b }, a).to({ rotation: b }, a)
-                .to({ rotation: 0 }, a / 2)
+            egret.Tween.get(this._mc, {loop: true}).set({rotation: b})
+                .to({rotation: -b}, a).to({rotation: b}, a)
+                .to({rotation: -b}, a).to({rotation: b}, a)
+                .to({rotation: -b}, a).to({rotation: b}, a)
+                .to({rotation: 0}, a / 2)
                 .wait(1000);
 
         }
     }
 
     async playAni() {
-        if (this._mc) {
+        if(this._mc) {
             egret.Tween.removeTweens(this._mc);
             this._mc.gotoAndPlay(1, true);
             await this.onPlaySTOP();
@@ -406,7 +589,7 @@ export default class MapScene extends Scene {
     async onPlaySTOP() {
         return new Promise((r) => {
             const func = () => {
-                if (this._mc.currentFrame >= 100) {
+                if(this._mc.currentFrame >= 100) {
                     this._mc.removeEventListener(egret.Event.ENTER_FRAME, func, this);
                     this._mc.stop();
                     r();
@@ -425,14 +608,14 @@ export default class MapScene extends Scene {
         this['boxani'].touchChildren = false;
         await this.playAni();
         try {
-            if (window['getRST']) window['getRST']();
-        } catch (error) {
+            if(window['getRST']) window['getRST']();
+        } catch(error) {
             console.warn(error)
         }
         NetManager.ins.hc_openTreasureBox((success) => {
             this['boxani'].touchEnabled = true;
             this['boxani'].touchChildren = true;
-            if (success) {
+            if(success) {
                 const boxdata = DataManager.ins.getData('hc_openTreasureBox').data;
                 const homeData = DataManager.ins.getData('hc_home').data;
                 homeData.canReceiveTreasureBoxNum = boxdata.canReceiveTreasureBoxNum;
@@ -442,21 +625,23 @@ export default class MapScene extends Scene {
                 this.updateBox();
                 const data = DataManager.ins.getData('hc_openTreasureBox').data;
                 NetManager.ins.getPlugOrderStatus((s) => {
-                    if (s) {
-                        const data = DataManager.ins.getData('getPlugOrderStatus');
-                        //区分奖品
-                        if (data.lottery && data.lottery.type != 'thanks') {
-                            PanelCtrl.instance.show('box');
+                        if(s) {
+                            const data = DataManager.ins.getData('getPlugOrderStatus');
+                            //区分奖品
+                            if(data.lottery && data.lottery.type != 'thanks') {
+                                PanelCtrl.instance.show('box');
+                            } else {
+                                showToast('哎呀！奖励与您擦肩而过！快继续闯关！');
+                            }
                         } else {
+
                             showToast('哎呀！奖励与您擦肩而过！快继续闯关！');
                         }
-                    } else {
-
-                        showToast('哎呀！奖励与您擦肩而过！快继续闯关！');
-                    }
-                },
+                    },
                     data.orderNum,
-                    () => { return DataManager.ins.getData('getPlugOrderStatus').result == 0 });
+                    () => {
+                        return DataManager.ins.getData('getPlugOrderStatus').result == 0
+                    });
 
 
             } else {
@@ -470,6 +655,7 @@ export default class MapScene extends Scene {
         PanelCtrl.instance.show(ModuleTypes.RULE_PANEL);
         this.toggleSettings();
     }
+
     onTap_shopBtn() {
         PanelCtrl.instance.show('Shop');
         NetManager.ins.clickLog(getlogItem(5));
@@ -485,7 +671,7 @@ export default class MapScene extends Scene {
 
     onTap_bloodBtn() {
         NetManager.ins.clickLog(getlogItem(2));
-        if (getHomeData().remainEnargy > 0)
+        if(getHomeData().remainEnargy > 0)
             PanelCtrl.instance.show('bloodPanel')
         else
             PanelCtrl.instance.show('blood2Panel')
@@ -503,5 +689,14 @@ export default class MapScene extends Scene {
         d.filters = [colorFlilter];
     }
 
-    get skinKey() { return 'Map' }
+    get skinKey() {
+        return 'Map'
+    }
 }
+export const getNick = (nickname) => {
+    if (!nickname) return nickname;
+    const max = 4;
+    if(nickname.length > max)
+        return nickname.slice(0, max) + '...';
+    return nickname;
+}
\ No newline at end of file

egret/src/panels/ADPanel.ts

@@ -4,6 +4,7 @@ export default class ADPanel extends Panel {
     start(data) {
         super.start();
         this.showlog();
+        
     }
 
     showlog(){
@@ -20,6 +21,6 @@ export default class ADPanel extends Panel {
         
     }
 
-    protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
+    protected get closeBtns(): eui.Button[] { return [this['closeBtn'],this['closeBtn2']] }
     get skinKey() { return 'AD' }
 }
\ No newline at end of file

egret/src/panels/BagPanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+
+export default class BagPanel extends Panel {
+    start(data) {
+        super.start();
+        this.showlog();
+        
+    }
+
+    showlog(){
+        // NetManager.ins.showLog(getlogItem(3));
+        // NetManager.ins.showLog(getlogItem(4));
+    }
+
+    initEvents() {
+        super.initEvents();
+        // this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+    }
+
+    onTapInvite() {
+        
+    }
+
+    protected get closeBtns(): eui.Button[] { return [this['closeBtn'],this['closeBtn2']] }
+    get skinKey() { return 'Bag' }
+}
\ No newline at end of file

egret/src/panels/FriendItem2Renderer.ts

+import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
+import { getNick } from "../mapScene/MapScene";
+
+export default class FriendItem2Renderer extends eui.ItemRenderer {
+    constructor() {
+        super();
+        this.skinName = getSkinPath('FriendItem2');
+    }
+    
+    score: eui.Label;
+    dataChanged() {
+        const {rank,nickName,avatar,maxScore}= this.data;
+
+        this['avatar'].mask = this['avatarMask'];
+
+        this['rankbg'].visible =this['rank1'].visible = this['rank2'].visible = this['rank3'].visible = this['rankTxt'].visible = false;
+        this['rankTxt'].text = rank + '';
+        if (rank == 1) {
+            this['rank1'].visible = true;
+        } else if (rank == 2) {
+            this['rank2'].visible = true;
+        } else if (rank == 3) {
+            this['rank3'].visible = true;
+        } else {
+            this['rankTxt'].visible = true;
+            this['rankbg'].visible = true;
+        }
+
+        this['avatar'].source = avatar
+
+        this['nameTxt'].text = getNick(nickName);
+        
+        this.score.textFlow = (new egret.HtmlTextParser).parser(
+            `<font color=0xff4501><b>${maxScore}</b></font>分`);
+    }
+}
\ No newline at end of file

egret/src/panels/FriendItemRenderer.ts

+import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
+import { getNick } from "../mapScene/MapScene";
+
+export default class FriendItemRenderer extends eui.ItemRenderer {
+    constructor() {
+        super();
+        this.skinName = getSkinPath('FriendItem');
+    }
+    progress: eui.Label;
+    score: eui.Label;
+    dataChanged() {
+        const rank = this.data.rank;
+        this['avatar'].mask = this['avatarMask'];
+
+        this['rank1'].visible = this['rank2'].visible = this['rank3'].visible = this['rankTxt'].visible = false;
+        this['rankTxt'].text = rank + '';
+        if (rank == 1) {
+            this['rank1'].visible = true;
+        } else if (rank == 2) {
+            this['rank2'].visible = true;
+        } else if (rank == 3) {
+            this['rank3'].visible = true;
+        } else {
+            this['rankTxt'].visible = true;
+        }
+
+        this['nameTxt'].text = getNick(this.data.nickName) ;
+        this['avatar'].source = this.data.avatar;
+        this['star'].text = `X${this.data.stars}`;
+        this.progress.textFlow = (new egret.HtmlTextParser).parser(
+            `第<font color=0xff4501><b>${this.data.levelNum}</b></font>关`);
+        this.score.textFlow = (new egret.HtmlTextParser).parser(
+            `<font color=0xff4501><b>${this.data.maxScore}</b></font>分`);
+    }
+}
\ No newline at end of file

egret/src/panels/FriendPanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+import FriendItemRenderer from "./FriendItemRenderer";
+import { NetManager } from "../../libs/tw/manager/NetManager";
+import { DataManager } from "../../libs/tw/manager/DataManager";
+import { getNick } from "../mapScene/MapScene";
+
+export default class FriendPanel extends Panel {
+    public list: eui.List;
+    progress: eui.Label;
+    score: eui.Label;
+    start(data) {
+        super.start();
+        this.showlog();
+        this['btn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this);
+        this['avatar'].mask = this['avatarMask'];
+        this['avatar0'].mask = this['avatarMask0'];
+        this.list.useVirtualLayout = false;
+        this.list.itemRenderer = FriendItemRenderer;
+
+        this.updateMyInfo();
+
+        this.list.visible = false;
+        this['empty'].visible = false;
+        NetManager.ins.hc_totalNumRank(() => {
+            const { data: hc_totalNumRank } = DataManager.ins.getData('hc_totalNumRank');
+            const { list, user } = hc_totalNumRank;
+            if (user) {
+                this.progress.textFlow = (new egret.HtmlTextParser).parser(
+                    `第<font color=0xfff000><b>${user.levelNum}</b></font>关`);
+                this.score.textFlow = (new egret.HtmlTextParser).parser(
+                    `<font color=0xfff000><b>${user.maxScore}</b></font>分`);
+                    this['rankTxt'].text = user.rank
+                    this['star'].text = `X${user.stars}`
+            }
+
+            if (list && list.length > 0) {
+                this.list.visible = true;
+                this['empty'].visible = false;
+                const ac = new eui.ArrayCollection(list);
+                this.list.dataProvider = ac;
+            } else {
+                this.list.visible = false;
+                this['empty'].visible = true;
+            }
+        })
+    }
+
+    private updateMyInfo() {
+        this['avatar'].visible = false;
+        this['avatar0'].visible = false;
+        this['nameTxt'].text = '';
+        this['nameTxt0'].text = '';
+        
+        NetManager.ins.hc_userInfo(() => {
+            this['avatar'].visible = true;
+            this['avatar0'].visible = true;
+            const { data } = DataManager.ins.getData('hc_userInfo');
+            this['avatar'].source = this['avatar0'].source = data.avatar;
+
+            this['nameTxt'].text = getNick(data.nickname);
+            this['nameTxt0'].text = getNick(data.nickname);
+        });
+    }
+
+    showlog() {
+        // NetManager.ins.showLog(getlogItem(3));
+        // NetManager.ins.showLog(getlogItem(4));
+    }
+
+
+    initEvents() {
+        super.initEvents();
+        // this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+    }
+
+    onTapInvite() {
+        console.log('onTapInvite')
+    }
+
+    protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
+    get skinKey() { return 'Friend' }
+}
\ No newline at end of file

egret/src/panels/InviteCutTimePanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+import { changeMapScene } from "../startScene/StartScene";
+import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
+import getHomeData from "../getHomeData";
+import { ModuleTypes } from "../../libs/new_wx/types/sceneTypes";
+import Utils from "../Utils";
+
+/**
+ * 邀请规则面板
+ */
+export default class InviteCutTimePanel extends Panel {
+    public cutTimeLabel: eui.BitmapLabel;
+    public closeBtn: eui.Button;
+    public ok_btn: eui.Button;
+
+    private timer: egret.Timer;
+    private cutTime: number;
+
+    constructor(data) {
+        super();
+        this.data = data;
+    }
+
+    start() {
+        super.start();
+    }
+
+    protected onSkinComplete() {
+        this.initUI();
+    }
+
+    initEvents() {
+        super.initEvents();
+        this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
+    }
+
+    removeEvents() {
+        super.removeEvents();
+        this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
+    }
+
+    onTouchOK() {
+        if((getHomeData().levels.length + 1)>window['last_level']){
+            changeMapScene();
+            super.hidePanel();
+            return;
+        }
+        PanelCtrl.instance.show("StartPanel", getHomeData().levels.length + 1);
+    }
+
+    initUI() {
+        // 到第二天0点的倒计时
+        let endTime = this.data.sysTime + 86400000 - ((this.data.sysTime + 86400000) % 86400000) - 8 * 3600000;
+        this.cutTime = endTime - this.data.sysTime + 1000;
+        this.timer = new egret.Timer(1000, 0);
+        this.timer.addEventListener(egret.TimerEvent.TIMER, this.cutTimer, this);
+        this.timer.start();
+        this.cutTimer();
+    }
+
+    private cutTimer() {
+        let timer = this.convertTime(this.cutTime -= 1000);
+        if(timer.hour === "00"
+            && timer.min === "00"
+            && timer.sec === "00") {
+            this.timer.stop();
+            this.hidePanel();
+        }
+        this.cutTimeLabel.text = `${timer.hour}:${timer.min}:${timer.sec}`;
+    }
+
+    private convertTime(time: number) {
+        let hour = ~~(time / 3600000);                              // 小时
+        let min = ~~((time - hour * 3600000) / 60000);              // 分
+        let sec = ~~((time - hour * 3600000 - min * 60000) / 1000); // 秒
+
+        return {
+            hour: Utils.prefixInteger(hour, 2),
+            min: Utils.prefixInteger(min, 2),
+            sec: Utils.prefixInteger(sec, 2)
+        }
+    }
+
+    protected get closeBtns(): eui.Button[] {
+        return [this['closeBtn']]
+    }
+
+    get skinKey() {
+        return 'InviteCutTimePanel'
+    }
+}

egret/src/panels/InvitePanel.ts

 import Panel from "../../libs/new_wx/components/Panel";
+import { iswx } from "../iswx";
+import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
+import InviteRulePanel from "./InviteRulePanel";
+import { NetManager } from "../../libs/tw/manager/NetManager";
+import Utils from "../Utils";
 
 export default class InvitePanel extends Panel {
+    public prizeImg: eui.Image;
+    public closeBtn: eui.Button;
+    public helpBtn: eui.Button;
+    public numLabel: eui.Label;
+    public cutTimeLabel: eui.Label;
+    public list: eui.List;
+    public wxShareTip: eui.Group;
+
+    private invite_img: egret.Texture;
+    private timer: egret.Timer;
+    private cutTime: number;
+
+    constructor(data) {
+        super();
+        this.data = data;
+    }
+
     start(data) {
         super.start();
         this.showlog();
     }
 
-    showlog(){
+    showlog() {
         // NetManager.ins.showLog(getlogItem(3));
         // NetManager.ins.showLog(getlogItem(4));
     }
@@ -14,12 +36,206 @@ export default class InvitePanel extends Panel {
     initEvents() {
         super.initEvents();
         // this['inviteBtn'].addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+        this.helpBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapRule, this);
+    }
+
+    removeEvents() {
+        super.removeEvents();
+        // this['inviteBtn'].removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapInvite, this)
+        this.helpBtn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapRule, this);
+    }
+
+    onTapRule() {
+        // PanelCtrl.instance.show('invitePrize');
+        const rule = new InviteRulePanel();
+        rule.loadSkin();
+        rule.start();
+        this.addChild(rule);
     }
 
     onTapInvite() {
-        
+
+    }
+
+    protected onSkinComplete() {
+        this.getGameRes().then(r => this.initUI());
+    }
+
+    initUI() {
+        this.setWXShareTip();
+        this.prizeImg.source = this.data.img;
+        if(!this.data.invitationUser){
+            this.data.invitationUser = [];
+        }
+        let dNum = this.data.invitationCount - this.data.invitationUser.length;
+        this.numLabel.text = `仅差${dNum}人可获得`;
+        for(let i = 0; i < dNum; i++) {
+            this.data.invitationUser.push({
+                nickname: "nickname",
+                avatar: this.invite_img,
+                callFun: () => {
+                    NetManager.ins.getShareCode((success, res) => {
+                        if(!success) {
+                            return;
+                        }
+                        let shareCode = res.data;
+                        if(iswx()) { //微信端
+                            this.wxShareTip.visible = true;
+                        } else {//端内
+                            this.wxShareTip.visible = true;
+                            // window["inviteShare"](shareCode);
+                        }
+                    });
+                }
+            });
+        }
+        this.list.useVirtualLayout = false;
+        this.list.itemRenderer = InviteItem;
+        this.list.dataProvider = new eui.ArrayCollection(this.data.invitationUser);
+
+        this.cutTime = this.data.endTime - this.data.sysTime + 1000;
+
+        this.timer = new egret.Timer(1000, 0);
+        this.timer.addEventListener(egret.TimerEvent.TIMER, this.cutTimer, this);
+        this.timer.start();
+        this.cutTimer();
+    }
+
+    private cutTimer() {
+        let timer = this.convertTime(this.cutTime -= 1000);
+        if(timer.hour === "00"
+            && timer.min === "00"
+            && timer.sec === "00") {
+            this.timer.stop();
+            this.hidePanel();
+        }
+        this.cutTimeLabel.text = `将在${timer.hour}:${timer.min}:${timer.sec}后失效`;
+    }
+
+    private convertTime(time: number) {
+        let hour = ~~(time / 3600000);                              // 小时
+        let min = ~~((time - hour * 3600000) / 60000);              // 分
+        let sec = ~~((time - hour * 3600000 - min * 60000) / 1000); // 秒
+
+        return {
+            hour: Utils.prefixInteger(hour, 2),
+            min: Utils.prefixInteger(min, 2),
+            sec: Utils.prefixInteger(sec, 2)
+        }
+    }
+
+    private setWXShareTip() {
+        this.wxShareTip.visible = false;
+        this.wxShareTip.width = this.width / window.innerWidth * window.innerWidth;
+        this.wxShareTip.height = this.width / window.innerWidth * window.innerHeight;
+        this.wxShareTip.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            this.wxShareTip.visible = false;
+        }, this);
+    }
+
+    protected get closeBtns(): eui.Button[] {
+        return [this['closeBtn']]
+    }
+
+    private async getGameRes() {
+        this.invite_img = await RES.getResAsync("invite_invite_png");
+    }
+
+    get skinKey() {
+        return 'Invite'
+    }
+
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////
+/**
+ * 邀请好友的列表项
+ */
+class InviteItem extends eui.ItemRenderer {
+    public img: eui.Image;
+
+    constructor() {
+        super();
+        this.skinName = getSkinPath('InviteItem');
+    }
+
+    dataChanged() {
+        this.img.source = this.data.avatar;
+        this.img.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+            if(this.data.callFun) {
+                this.data.callFun();
+            }
+        }, this);
     }
+}
 
-    protected get closeBtns(): eui.Button[] { return [this['closeBtn']] }
-    get skinKey() { return 'Invite' }
-}
\ No newline at end of file
+// ////////////////////////////////////////////////////////////////////////////////////////////////
+// // 端内分享提示
+// class ShareTips extends ComponentBase {
+//     public inviteGroup: eui.Group;
+//     public btn1: eui.Button;
+//     public btn2: eui.Button;
+//
+//     private img: string;
+//
+//     setUrl(img: string) {
+//         this.img = img;
+//     }
+//
+//     start() {
+//         this.once(egret.TouchEvent.ADDED_TO_STAGE, () => {
+//             this.height = this.stage.stageHeight;
+//         }, this);
+//
+//         this.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+//             hideShare();
+//         }, this);
+//
+//         this.btn1.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+//             this.getFunc();//朋友圈
+//             hideShare();
+//         }, this);
+//
+//         this.btn2.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
+//             this.getFunc();//朋友圈
+//             hideShare();
+//         }, this);
+//     }
+//
+//     getFunc() {
+//         NetManager.ins.getShareCode((success, res) => {
+//             if(!success) {
+//                 return;
+//             }
+//             if(iswx()) { //微信端
+//
+//             } else {//端内
+//                 window["inviteShare"](res.data);
+//             }
+//         });
+//     }
+//
+//     get skinKey() {
+//         return 'ShareTips';
+//     }
+// }
+//
+// let inited = false;
+// let _share: ShareTips;
+// const initShare = () => {
+//     const layer = layers.shareLayer;
+//     const share = new ShareTips();
+//     share.loadSkin();
+//     share.start();
+//     layer.addChild(share);
+//     _share = share;
+// };
+//
+// const showShareTips = (url: string) => {
+//     if(!inited) {
+//         initShare();
+//         inited = true;
+//     }
+//     _share.setUrl(url);
+//     layers.shareLayer.visible = true;
+// };
\ No newline at end of file

egret/src/panels/InvitePrizePanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
+import getHomeData from "../getHomeData";
+import { changeMapScene } from "../startScene/StartScene";
+
+/**
+ * 邀请规则面板
+ */
+export default class InvitePrizePanel extends Panel {
+    public prizeImg: eui.Image;
+    public closeBtn: eui.Button;
+    public ok_btn: eui.Button;
+    public game_btn: eui.Button;
+
+    constructor(data) {
+        super();
+        this.data = data;
+    }
+
+    start() {
+        super.start();
+    }
+
+    protected onSkinComplete() {
+        this.initUI();
+    }
+
+    initEvents() {
+        super.initEvents();
+        this.ok_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapGoPrize, this);
+        this.game_btn.addEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
+    }
+
+    removeEvents() {
+        super.removeEvents();
+        this.ok_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTapGoPrize, this);
+        this.game_btn.removeEventListener(egret.TouchEvent.TOUCH_TAP, this.onTouchOK, this);
+    }
+
+    onTouchOK() {
+        if((getHomeData().levels.length + 1)>window['last_level']){
+            changeMapScene();
+            super.hidePanel();
+            return;
+        }
+        PanelCtrl.instance.show("StartPanel", getHomeData().levels.length + 1);
+    }
+
+    onTapGoPrize() {
+        window.location.href = window['__link__'];
+    }
+
+    initUI() {
+        this.prizeImg.source = this.data.prizeImg;
+    }
+
+    protected get closeBtns(): eui.Button[] {
+        return [this['closeBtn']]
+    }
+
+    get skinKey() {
+        return 'InvitePrizePanel'
+    }
+}

egret/src/panels/InviteRulePanel.ts

+import Panel from "../../libs/new_wx/components/Panel";
+import { DataManager } from "../../libs/tw/manager/DataManager";
+import { HtmlTextParser } from "../../libs/new_wx/HtmlTextParser";
+import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
+
+/**
+ * 邀请规则面板
+ */
+export default class InviteRulePanel extends Panel {
+    public scroller: eui.Scroller;
+    public group: eui.Group;
+    public labContent: eui.Label;
+    public closeBtn: eui.Button;
+    private _mask: egret.Sprite;
+
+    start() {
+        super.start();
+        this.addRule();
+        this.closeBtn.addEventListener(egret.TouchEvent.TOUCH_TAP, ()=>{
+            this.visible = false;
+        }, this);
+    }
+
+    loadSkin() {
+        this.skinName = getSkinPath(this.skinKey);
+        if (this.skin) {
+            this.onSkinComplete();
+        } else {
+            this.addEventListener(egret.Event.COMPLETE, this.onSkinComplete, this);
+        }
+    }
+
+    private addRule() {
+        const text = '<br>' + DataManager.ins.ajaxElementData.rule;
+        this.labContent.textFlow = (new HtmlTextParser).parser(text);
+    }
+
+    get skinKey() {
+        return 'InviteRulePanel'
+    }
+}

egret/src/panels/StartPanel.ts

+import wait from "../../libs/new_tc/wait";
+import hdGameDoDojoin from "../../libs/new_tw/ctrls/hdGameDoDojoin";
 import Panel from "../../libs/new_wx/components/Panel";
 import PanelCtrl from "../../libs/new_wx/ctrls/panelCtrl";
-import setGlow from "../setGlow";
 import SceneCtrl from "../../libs/new_wx/ctrls/sceneCtrl";
+import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
+import { updateMainTimerAfterGetData } from "../../libs/new_wx/MainBase";
 import { ModuleTypes } from "../../libs/new_wx/types/sceneTypes";
-import { Chapters } from "../something/Chapters";
-import { PassType } from "../something/enum/PassType";
+import { NetManager } from "../../libs/tw/manager/NetManager";
 import getHomeData, { getPropNums } from "../getHomeData";
-import PropType from "../PropType";
-import hdGameDoDojoin from "../../libs/new_tw/ctrls/hdGameDoDojoin";
-import TargetItemRenderer from "./TargetItemRenderer";
-import { ElementType } from "../something/enum/ElementType";
-import { iswx } from "../iswx";
 import { getShareUrl } from "../getSharePic";
+import { iswx } from "../iswx";
+import PropType from "../PropType";
+import setGlow from "../setGlow";
 import { showShare } from "../shareCtrl";
-import { NetManager } from "../../libs/tw/manager/NetManager";
-import { getlogItem } from "../Main";
-import { showToast } from "../../libs/new_wx/ctrls/toastCtrl";
-import wait from "../../libs/new_tc/wait";
-import { updateMainTimerAfterGetData } from "../../libs/new_wx/MainBase";
+import { Chapters } from "../something/Chapters";
+import { ElementType } from "../something/enum/ElementType";
+import { PassType } from "../something/enum/PassType";
+import FriendItem2Renderer from "./FriendItem2Renderer";
+import TargetItemRenderer from "./TargetItemRenderer";
+import { DataManager } from "../../libs/tw/manager/DataManager";
 
 export default class StartPanel extends Panel {
     private _level;
     private list: eui.List;
+    public friendlist: eui.List;
     start(data) {
         super.start();
+        this.friendlist.useVirtualLayout = false;
+        this.friendlist.itemRenderer = FriendItem2Renderer;
+        this.friendlist.visible = false;
+        this['empty'].visible = false;
+
+        NetManager.ins.hc_levelNumRank(() => {
+            const { data: friends } = DataManager.ins.getData('hc_levelNumRank');
+            if(friends && friends.length > 0 ) {
+                this.friendlist.visible = true;
+                if (friends.length > 5)
+                    friends.length = 5;
+                const ac = new eui.ArrayCollection(friends);
+                this.friendlist.dataProvider = ac;
+            }
+            else {
+                this['empty'].visible = true;
+            }
+            
+        }, data)
+
         setGlow(this['levelTxt'], 0xfa4b09, 1);
         this['levelTxt'].text = `第${data}关`;
         this._level = data;

egret/src/panels/TargetItemRenderer.ts

 import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
-import { ElementType } from "../something/enum/ElementType";
 export default class TargetItemRenderer extends eui.ItemRenderer {
     constructor() {
         super();
@@ -7,8 +6,14 @@ export default class TargetItemRenderer extends eui.ItemRenderer {
     }
 
     dataChanged(){
-        this['icon_LOLLIPOP'].visible=this.data.type == ElementType.LOLLIPOP;
-        this['icon_ICE'].visible=this.data.type == ElementType.ICE;
+        for (let i = 0; i <10; i++) {
+            this['icon' + i].visible=false;
+            
+        }
+
+        this['icon' + this.data.type].visible=true;
+
+
         this['txt'].text = `X${this.data.count }`;
     }
 }
\ No newline at end of file

egret/src/shareCtrl.ts

@@ -11,27 +11,29 @@ img.style.display = 'none';
 
 class Share2 extends ComponentBase {
     type;
+
     setType(type: any) {
         this.type = type;
         this['pic1'].visible = false;
         this['pic2'].visible = false;
         this['pic' + type].visible = true;
     }
+
     start() {
-        this.once(egret.TouchEvent.ADDED_TO_STAGE,()=>{
+        this.once(egret.TouchEvent.ADDED_TO_STAGE, () => {
             this.height = this.stage.stageHeight;
-        },this);
-        
-        this.addEventListener(egret.TouchEvent.TOUCH_TAP,()=>{
+        }, this);
+
+        this.addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
             hideShare();
-        },this);
-        
+        }, this);
+
         const data = getHomeData();
         this['tipsTxt0'].text = `超过了${Math.ceil(Math.random() * 100)}%的好友`;
-        this['lvTxt'].text = data.levels.length ==0 ?  1 : data.levels.length; 
+        this['lvTxt'].text = data.levels.length == 0 ? 1 : data.levels.length;
         this['lvTxt0'].text = data.levels.length;
         this['btn1'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
-            if (iswx()) { //微信端
+            if(iswx()) { //微信端
 
             } else {//端内
                 this.getFunc('2');//朋友圈
@@ -41,7 +43,7 @@ class Share2 extends ComponentBase {
         }, this);
 
         this['btn2'].addEventListener(egret.TouchEvent.TOUCH_TAP, () => {
-            if (iswx()) { //微信端
+            if(iswx()) { //微信端
 
             } else {//端内
                 this.getFunc('1');//好友微信
@@ -49,6 +51,7 @@ class Share2 extends ComponentBase {
             hideShare();
         }, this);
     }
+
     //channel 1 好友  2 朋友圈
     getFunc(channel: string) {
         // let base64;
@@ -61,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/xxshareshare.jpg', channel);
+                callShareApi('https://yun.duiba.com.cn/db_games/xxshareshare2.jpg', channel);
             else
                 callShareApi('https://yun.duiba.com.cn/db_games/xxlshare.jpg', channel);
         // }, base64);
@@ -71,6 +74,7 @@ class Share2 extends ComponentBase {
         return 'Share2';
     }
 }
+
 let inited = false;
 let _share: Share2;
 const initShare = () => {
@@ -82,7 +86,7 @@ const initShare = () => {
     _share = share;
 };
 export const showShare = (type) => {
-    if (!inited) {
+    if(!inited) {
         initShare();
         inited = true;
     }
@@ -96,27 +100,29 @@ export const hideShare = () => {
 
 const isIphone = () => {
     const ua = navigator.userAgent.toLocaleLowerCase();
-    if (ua.match(/iphone|ipad/)) {
+    if(ua.match(/iphone|ipad/)) {
         return true;
-    } else if (ua.match(/android/)) {
+    } else if(ua.match(/android/)) {
         return false;
     }
 }
 //channel 1 好友  2 朋友圈
 export const callShareApi = (shareImgUrl, channel) => {
     try {
-        if (isIphone()) {
+        if(isIphone()) {
             console.log("IOS");
             console.log(window['SNNativeClient']);
             //分享图片方法
-            window['SNNativeClient'].callMediaShare(shareImgUrl, channel, (message) => { });
+            window['SNNativeClient'].callMediaShare(shareImgUrl, channel, (message) => {
+            });
         } else {
             console.log("安卓");
             console.log(window['shareApi']);
             //分享图片用下列方法
-            window['shareApi'].callMediaShare(shareImgUrl, channel, (message) => { });
+            window['shareApi'].callMediaShare(shareImgUrl, channel, (message) => {
+            });
         }
-    } catch (error) {
+    } catch(error) {
         console.log(error)
     }
 

egret/src/something/Chapters.ts

@@ -11,7 +11,7 @@ import { ElementType } from "./enum/ElementType";
 
 
 export const Chapters: ChapterData[] = [
-    //第0关为空吧，
+    //第0关为空吧,
     null,
     //第一关
     {
@@ -2192,7 +2192,7 @@ export const Chapters: ChapterData[] = [
         ]
     },
     ////////////////////////////
-    //56到70，用中间36到50的数据，步数减4，所以先置空，还是先拷贝上吧，,现在逻辑并不用56到70关的数据
+    //56到70,用中间36到50的数据,步数减4,所以先置空,还是先拷贝上吧,,现在逻辑并不用56到70关的数据
     //第五十六关
     {
         map: {
@@ -2941,7 +2941,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3],
         effectInitProbability: 0.3,
-        stepCount: 14+6+5,
+        stepCount: 25,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -2986,7 +2986,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3],
         effectInitProbability: 0.03,
-        stepCount: 20+6,
+        stepCount: 26,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -3031,7 +3031,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0.02,
-        stepCount: 15+5,
+        stepCount: 30,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -3076,7 +3076,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0,
-        stepCount: 20+4,
+        stepCount: 24,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -3121,7 +3121,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0.03,
-        stepCount: 20+5,
+        stepCount: 25,
         passTarget: {
             type: PassType.SCORE_TARGET,
             score: 15000
@@ -3161,7 +3161,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0.03,
-        stepCount: 20+4,
+        stepCount: 24,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -3206,7 +3206,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0.03,
-        stepCount: 15+5,
+        stepCount: 20,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -3251,7 +3251,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0.03,
-        stepCount: 20+4,
+        stepCount: 24,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -3296,7 +3296,7 @@ export const Chapters: ChapterData[] = [
         },
         baseElementTypes: [0, 1, 2, 3, 4],
         effectInitProbability: 0.02,
-        stepCount: 25+3,
+        stepCount: 28,
         passTarget: {
             type: PassType.ELEMENT_TARGET,
             elements: [
@@ -3312,4 +3312,919 @@ export const Chapters: ChapterData[] = [
             15000
         ]
     },
+    ////////////////////////////////
+    //第八十一关
+    {
+        map: {
+            lattices: [
+                0, 0, 0, 1, 1, 1, 0, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 1, 1, 1, 1, 1, 1, 1, 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,
+                2, 2, 2, 2, 2, 2, 2, 2, 2,
+                2, 2, 2, 1, 1, 1, 2, 2, 2,
+            ],
+            generateLats: [0, 0, 0, 1, 1, 1, 0, 0, 0],
+            elements: [
+                0, 0, 0, 1, 1, 1, 0, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 1, 1, 1, 1, 1, 1, 1, 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,
+                5, 5, 5, 5, 5, 5, 5, 5, 5,
+                2, 2, 2, 2, 2, 2, 2, 2, 2,
+                4, 4, 4, 1, 5, 1, 4, 4, 4,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 38,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 15
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十二关
+    {
+        map: {
+            lattices: [
+                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,
+                1, 3, 3, 3, 3, 3, 3, 3, 1,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                1, 3, 3, 3, 3, 3, 3, 3, 1,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            connectedLats: [[27, 45], [28, 46], [29, 47], [30, 48], [31, 49], [32, 50], [33, 51], [34, 52], [35, 53]],
+            elements: [
+                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,
+                5, 4, 5, 4, 5, 4, 5, 4, 5,
+                4, 5, 4, 5, 4, 5, 4, 5, 4,
+                5, 4, 5, 4, 5, 4, 5, 4, 5,
+                4, 5, 4, 5, 4, 5, 4, 5, 4,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.02,
+        stepCount: 40,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 32
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十三关
+    {
+        map: {
+            lattices: [
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 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,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            elements: [
+                0, 0, 3, 1, 1, 1, 1, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 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,
+                2, 2, 1, 2, 2, 2, 1, 2, 2,
+                5, 2, 5, 2, 5, 2, 5, 2, 5,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.02,
+        stepCount: 20,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.LOLLIPOP,
+                    count: 2
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十四关
+    {
+        map: {
+            lattices: [
+                3, 3, 1, 1, 0, 1, 1, 3, 3,
+                3, 3, 1, 1, 0, 1, 1, 3, 3,
+                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,
+                3, 3, 1, 1, 0, 1, 1, 3, 3,
+                3, 3, 1, 1, 0, 1, 1, 3, 3,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            elements: [
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 2, 2, 2, 2, 2, 1, 1,
+                1, 1, 2, 5, 5, 5, 2, 1, 1,
+                1, 1, 2, 2, 2, 2, 2, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.02,
+        stepCount: 30,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 16
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十五关
+    {
+        map: {
+            lattices: [
+                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, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                0, 1, 1, 1, 1, 1, 1, 1, 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,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            elements: [
+                1, 3, 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, 1, 2, 2, 2, 2, 2, 1, 0,
+                0, 1, 2, 5, 5, 5, 2, 1, 0,
+                0, 1, 2, 2, 2, 2, 2, 1, 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,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.03,
+        stepCount: 50,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.LOLLIPOP,
+                    count: 4
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十六关
+    {
+        map: {
+            lattices: [
+                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,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            elements: [
+                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,
+                4, 2, 4, 2, 4, 2, 4, 2, 4,
+                5, 4, 5, 4, 5, 4, 5, 4, 5,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 30,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 18
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十七关
+    {
+        map: {
+            lattices: [
+                0, 3, 0, 3, 0, 3, 0, 3, 0,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                0, 3, 0, 3, 0, 3, 0, 3, 0,
+            ],
+            generateLats: [0, 1, 0, 1, 0, 1, 0, 1, 0],
+            elements: [
+                0, 1, 0, 1, 0, 1, 0, 1, 0,
+                4, 1, 1, 1, 1, 1, 1, 1, 4,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                5, 1, 1, 1, 1, 1, 1, 1, 5,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                4, 1, 1, 1, 1, 1, 1, 1, 4,
+                0, 1, 1, 1, 1, 1, 1, 1, 0,
+                5, 1, 1, 1, 1, 1, 1, 1, 5,
+                0, 4, 0, 5, 0, 5, 0, 4, 0,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 40,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 65
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十八关
+    {
+        map: {
+            lattices: [
+                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,
+                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, 1, 0, 1, 0, 1, 0, 1,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            elements: [
+                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,
+                4, 4, 4, 4, 4, 4, 4, 4, 4,
+                5, 5, 5, 5, 5, 5, 5, 5, 5,
+                2, 2, 2, 2, 2, 2, 2, 2, 2,
+                2, 0, 2, 0, 2, 0, 2, 0, 2,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 40,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ROCK,
+                    count: 14
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第八十九关
+    {
+        map: {
+            lattices: [
+                1, 1, 1, 0, 0, 0, 1, 1, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 2, 2, 2, 0, 0, 0,
+                2, 2, 2, 3, 3, 3, 2, 2, 2,
+                2, 2, 2, 2, 2, 2, 2, 2, 2,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                2, 2, 2, 2, 2, 2, 2, 2, 2,
+                0, 0, 0, 3, 3, 3, 0, 0, 0,
+                0, 0, 0, 0, 1, 0, 0, 0, 0,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            connectedLats: [[0, 27], [1, 28], [2, 29], [6, 33], [7, 34], [8, 35],],
+            elements: [
+                1, 1, 1, 0, 0, 0, 1, 1, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1, 1, 1, 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, 4, 1, 1, 1, 1,
+                1, 1, 1, 4, 5, 4, 1, 1, 1,
+                1, 1, 1, 1, 5, 1, 1, 1, 1,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 30,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 42
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十关
+    {
+        map: {
+            lattices: [
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            //connectedLats: [[0, 27], [1, 28], [2, 29], [6, 33], [7, 34], [8, 35],],
+            elements: [
+                1, 1, 2, 5, 1, 1, 2, 1, 1,
+                1, 1, 2, 1, 5, 1, 2, 1, 1,
+                1, 1, 2, 1, 1, 5, 2, 1, 1,
+                1, 1, 2, 1, 5, 1, 2, 1, 1,
+                1, 1, 2, 5, 1, 1, 2, 1, 1,
+                1, 1, 2, 1, 5, 1, 2, 1, 1,
+                1, 1, 2, 1, 1, 5, 2, 1, 1,
+                1, 1, 2, 1, 5, 1, 2, 1, 1,
+                1, 1, 2, 5, 1, 1, 2, 1, 1,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 30,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 27
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //////////////////////////////////
+    //第九十一关
+    {
+        map: {
+            lattices: [
+                0, 3, 1, 1, 1, 1, 1, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                1, 0, 3, 3, 3, 3, 3, 0, 1,
+                0, 0, 3, 3, 3, 3, 3, 0, 0,
+                1, 0, 3, 3, 3, 3, 3, 0, 1,
+                2, 0, 3, 3, 3, 3, 3, 0, 2,
+                1, 0, 0, 0, 0, 0, 0, 0, 1,
+                1, 0, 0, 0, 0, 0, 0, 0, 1,
+            ],
+            generateLats: [0, 1, 1, 1, 1, 1, 1, 1, 0],
+            connectedLats: [[27, 45], [35, 53]],
+            elements: [
+                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,
+                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,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 40,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 38
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十二关
+    {
+        map: {
+            lattices: [
+                1, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 1, 0, 1, 1, 1, 0, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 0, 0,
+                0, 0, 1, 1, 1, 1, 1, 1, 0,
+                0, 0, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 1, 0, 0, 1, 1, 1, 1,
+            ],
+            generateLats: [1, 0, 0, 1, 1, 1, 0, 0, 0],
+            //connectedLats: [[27, 45], [35, 53]],
+            elements: [
+                3, 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, 2, 2, 2, 1, 1, 1,
+                1, 1, 1, 2, 5, 2, 1, 1, 1,
+                1, 1, 1, 2, 2, 2, 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,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.05,
+        stepCount: 30,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.LOLLIPOP,
+                    count: 3
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十三关
+    {
+        map: {
+            lattices: [
+                0, 0, 1, 0, 0, 0, 0, 1, 1,
+                0, 0, 3, 0, 0, 0, 1, 3, 3,
+                0, 3, 3, 3, 0, 1, 3, 3, 3,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                3, 3, 3, 3, 3, 3, 3, 3, 3,
+                0, 0, 0, 0, 0, 0, 0, 0, 1,
+            ],
+            generateLats: [0, 0, 1, 0, 0, 0, 0, 1, 1],
+            //connectedLats: [[27, 45], [35, 53]],
+            elements: [
+                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,
+                1, 1, 1, 1, 1, 1, 1, 1, 4,
+                1, 1, 1, 1, 1, 1, 1, 4, 4,
+                1, 1, 1, 1, 1, 1, 4, 4, 4,
+                1, 1, 1, 1, 1, 1, 1, 1, 0,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.03,
+        stepCount: 22,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 54
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十四关
+    {
+        map: {
+            lattices: [
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 0, 0, 3, 0, 0, 1, 1,
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                3, 3, 3, 3, 0, 3, 3, 3, 3,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 3, 3, 3, 1, 1, 1,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            //connectedLats: [[27, 45], [35, 53]],
+            elements: [
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 5, 1, 1, 1, 1,
+                1, 1, 1, 1, 4, 1, 1, 1, 1,
+                1, 1, 1, 1, 4, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                2, 2, 2, 2, 1, 2, 2, 2, 2,
+                0, 0, 0, 0, 1, 0, 0, 0, 0,
+                1, 1, 1, 4, 4, 4, 1, 1, 1,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.03,
+        stepCount: 26,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 14
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十五关
+    {
+        map: {
+            lattices: [
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 3, 3, 3, 3, 3, 3, 3, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 2, 2, 2, 2, 2, 2, 2, 0,
+            ],
+            generateLats: [0, 1, 1, 1, 1, 1, 1, 1, 0],
+            connectedLats: [[55, 73], [56, 74], [57, 75], [58, 76], [59, 77], [60, 78], [61, 79]],
+            elements: [
+                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,
+                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,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3, 4],
+        effectInitProbability: 0.03,
+        stepCount: 25,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 56
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十六关
+    {
+        map: {
+            lattices: [
+                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, 1, 0, 0, 1, 1,
+                1, 0, 0, 2, 0, 2, 0, 0, 1,
+                0, 0, 2, 2, 0, 2, 2, 0, 0,
+                0, 2, 2, 2, 0, 2, 2, 2, 0,
+                2, 2, 2, 2, 0, 2, 2, 2, 2,
+                2, 2, 2, 2, 0, 2, 2, 2, 2,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            // connectedLats: [[55, 73], [56, 74],[57, 75],[58, 76],[59, 77],[60, 78],[61, 79]],
+            elements: [
+                1, 1, 1, 2, 2, 2, 1, 1, 1,
+                1, 1, 1, 2, 2, 2, 1, 1, 1,
+                1, 1, 1, 2, 2, 2, 1, 1, 1,
+                1, 1, 1, 2, 2, 2, 1, 1, 1,
+                1, 0, 0, 0, 0, 0, 0, 0, 1,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 0, 0, 0, 0, 0, 0,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3],
+        effectInitProbability: 0,
+        stepCount: 21,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 28
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十七关
+    {
+        map: {
+            lattices: [
+                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, 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, 1, 1, 1, 1, 1, 0, 0,
+                0, 1, 1, 1, 0, 1, 1, 1, 0,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            // connectedLats: [[55, 73], [56, 74],[57, 75],[58, 76],[59, 77],[60, 78],[61, 79]],
+            elements: [
+                1, 1, 1, 1, 3, 1, 1, 1, 1,
+                1, 1, 1, 2, 2, 2, 1, 1, 1,
+                1, 1, 1, 2, 5, 2, 1, 1, 1,
+                1, 1, 1, 2, 2, 2, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                1, 1, 1, 4, 4, 4, 1, 1, 1,
+                1, 1, 2, 2, 2, 2, 2, 1, 1,
+                1, 2, 5, 5, 0, 5, 5, 2, 1,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3],
+        effectInitProbability: 0.06,
+        stepCount: 21,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.LOLLIPOP,
+                    count: 4
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十八关
+    {
+        map: {
+            lattices: [
+                0, 0, 0, 0, 1, 1, 1, 1, 1,
+                0, 0, 0, 0, 1, 1, 1, 1, 1,
+                0, 0, 0, 0, 1, 1, 1, 1, 1,
+                1, 1, 1, 0, 1, 1, 1, 1, 1,
+                0, 0, 0, 0, 1, 1, 1, 1, 1,
+                2, 2, 2, 2, 2, 0, 0, 0, 0,
+                2, 2, 2, 2, 2, 0, 0, 0, 0,
+                2, 2, 2, 2, 2, 0, 1, 1, 1,
+                2, 2, 2, 2, 2, 0, 1, 1, 1,
+            ],
+            generateLats: [1, 1, 1, 0, 1, 1, 1, 1, 1],
+            connectedLats: [[27, 45], [28, 46], [29, 47], [42, 69], [43, 70], [44, 71]],
+            elements: [
+                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,
+                4, 4, 4, 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, 1, 1, 1, 1, 1, 1,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3],
+        effectInitProbability: 0.04,
+        stepCount: 24,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 20
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第九十九关
+    {
+        map: {
+            lattices: [
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                0, 0, 0, 0, 0, 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, 1, 0, 1, 1, 1, 1,
+                1, 1, 1, 1, 0, 0, 0, 0, 0,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                1, 1, 1, 1, 0, 1, 1, 1, 1,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+            ],
+            generateLats: [1, 1, 1, 1, 0, 1, 1, 1, 1],
+            connectedLats: [[0, 18], [1, 19], [2, 20], [3, 21], [41, 59], [42, 60], [43, 61], [44, 62]],
+            elements: [
+                1, 1, 1, 1, 0, 3, 3, 3, 1,
+                1, 1, 1, 1, 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, 1, 1, 1, 1,
+                2, 2, 2, 2, 1, 1, 1, 1, 1,
+                1, 1, 1, 1, 5, 2, 2, 2, 2,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3],
+        effectInitProbability: 0.04,
+        stepCount: 22,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.LOLLIPOP,
+                    count: 4
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
+    //第一百关
+    {
+        map: {
+            lattices: [
+                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, 3, 3, 3, 3, 3, 0, 0,
+                0, 0, 3, 3, 0, 3, 3, 0, 0,
+                0, 0, 3, 3, 3, 3, 3, 0, 0,
+            ],
+            generateLats: [1, 1, 1, 1, 1, 1, 1, 1, 1],
+            connectedLats: [[38, 56], [39, 57], [40, 58], [41, 59], [42, 60]],
+            elements: [
+                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,
+                1, 1, 1, 1, 1, 1, 1, 1, 1,
+                0, 0, 5, 5, 5, 5, 5, 0, 0,
+                0, 0, 5, 5, 0, 5, 5, 0, 0,
+                0, 0, 5, 5, 5, 5, 5, 0, 0,
+            ],
+        },
+        baseElementTypes: [0, 1, 2, 3],
+        effectInitProbability: 0.06,
+        stepCount: 34,
+        passTarget: {
+            type: PassType.ELEMENT_TARGET,
+            elements: [
+                {
+                    type: ElementType.ICE,
+                    count: 14
+                }
+            ],
+        },
+        starScores: [
+            6000,
+            15000,
+            32000
+        ]
+    },
 ]
\ No newline at end of file

egret/src/something/Tool.ts

@@ -207,8 +207,11 @@ export class Tool {
         if (!lat || !lat.element) {
             return false
         }
-        //上方元素为石头，或元素为锁定
-        else if (lat.element.type == ElementType.ROCK || lat.element.isLock) {
+        //上方元素为石头，或元素为锁定，或者是果冻，或者鸡蛋
+        else if (lat.element.type == ElementType.ROCK ||
+            lat.element.isLock ||
+            lat.element.type == ElementType.JELLY ||
+            lat.element.type == ElementType.CHICKEN_EGG) {
             return false
         }
         //剩下情况
@@ -228,10 +231,12 @@ export class Tool {
         if (!lat || !lat.element) {
             return false
         }
-        //上方元素为石头，或为冰淇淋，或为魔力鸟
+        //上方元素为石头，或为冰淇淋，或为魔力鸟，或为果冻，或为鸡蛋
         else if (lat.element.type == ElementType.ROCK ||
             lat.element.type == ElementType.LOLLIPOP ||
-            lat.element.effectType == EffectType.MAGICLION) {
+            lat.element.effectType == EffectType.MAGICLION ||
+            lat.element.type == ElementType.JELLY ||
+            lat.element.type == ElementType.CHICKEN_EGG) {
             return false
         }
         //剩下情况
@@ -241,7 +246,7 @@ export class Tool {
     }
     /**
      * 判断能执行消除的元素，
-     * 包括所有特效和基本元素
+     * 包括所有特效和基本元素，石头，果冻，鸡蛋
      * @param lat 
      */
     public static judgeEliminate(lat: Lattice) {
@@ -249,8 +254,8 @@ export class Tool {
         if (!lat || !lat.element) {
             return false
         }
-        //上方元素为石头，或为冰淇淋
-        else if (lat.element.type == ElementType.ROCK || lat.element.type == ElementType.LOLLIPOP) {
+        //上方元素为冰淇淋
+        else if (lat.element.type == ElementType.LOLLIPOP) {
             return false
         }
         //剩下情况
@@ -259,6 +264,24 @@ export class Tool {
         }
     }
 
+    /**
+     * 判断元素是否可被手势选中和交换
+     * 主要点击元素判断使用
+     * @param ele 元素
+     * @return 返回true为可选，false不可选
+     */
+    public static judgeChosen(ele: Element) {
+        if (!ele ||
+            ele.type == ElementType.ROCK ||
+            ele.isLock ||
+            ele.type == ElementType.JELLY ||
+            ele.type == ElementType.CHICKEN_EGG
+        ) {
+            return false;
+        }
+        return true
+    }
+
     /**
      * 检测死图，需要提示
      * 需要返回一组提示 两个能互相交换元素,数组
@@ -501,6 +524,86 @@ export class Tool {
         return null
     }
 
+    /**
+     * 判断已死
+     * @param lattices 
+     */
+    public static alreadyDie(lattices: Lattice[]) {
+        //记录基本元素的个数
+        var arr = {};
+        //记录是否有特效，两个任意特效，或一个魔力鸟特效，都未锁定
+        var hasEffect = false;
+        var effectCount = 0;
+        //记录是否有两个格子挨着，且未锁定
+        var hasTwo = false;
+        //记录是否有三个格子挨着，且未锁定，这个逻辑略烦，暂定至少都未锁定，有bug再改
+        var hasThree = false;
+        for (var i = 0; i < lattices.length; i++) {
+            if (lattices[i] &&
+                lattices[i].element &&
+                lattices[i].element.type <= 4 &&
+                !lattices[i].element.isLock) {
+                var type = lattices[i].element.type;
+                if (!arr[type]) arr[type] = 0;
+                arr[type]++;
+
+                var ele = lattices[i].element;
+
+                if (ele.effectType == EffectType.MAGICLION) {
+                    hasEffect = true;
+                }
+                if (ele.effectType != null) {
+                    effectCount++;
+                    if (effectCount >= 2) {
+                        hasEffect = true;
+                    }
+                }
+                var rc = Tool.indexToRc(i);
+                //右1
+                if (rc[1] < Tool.colNum - 1) {
+                    var latRight1 = lattices[i + 1];
+                    if (Tool.judgeFall(latRight1) && latRight1.element.type != ElementType.LOLLIPOP) {
+                        hasTwo = true;
+                    }
+                    //右2
+                    if (rc[1] < Tool.colNum - 2) {
+                        var latRight2 = lattices[i + 2];
+                        if (Tool.judgeFall(latRight1) &&
+                            latRight1.element.type != ElementType.LOLLIPOP &&
+                            Tool.judgeFall(latRight2) &&
+                            latRight2.element.type != ElementType.LOLLIPOP) {
+                            hasThree = true;
+                        }
+                    }
+                }
+                //下1
+                var latDown1 = lattices[i + Tool.colNum];
+                if (Tool.judgeFall(latDown1) && latDown1.element.type != ElementType.LOLLIPOP) {
+                    hasTwo = true;
+                }
+                //提前判断下
+                if (hasTwo && hasEffect) return false;
+
+                //下2
+                var latDown2 = lattices[i + Tool.colNum * 2];
+                if (Tool.judgeFall(latDown1) &&
+                    latDown1.element.type != ElementType.LOLLIPOP &&
+                    Tool.judgeFall(latDown2) &&
+                    latDown2.element.type != ElementType.LOLLIPOP) {
+                    hasThree = true;
+                }
+                if (hasThree) {
+                    for (var a in arr) {
+                        if (arr[a] >= 3) {
+                            return false
+                        }
+                    }
+                }
+            }
+        }
+        return true
+    }
+
     /**
      * 将有相邻相同的组合,不是基础元素的，都会是单独的
      * @param arr 
@@ -699,8 +802,8 @@ export class Tool {
      * 获得元素
      * @param type 
      */
-    public static getElement(type: ElementType) {
-        let obj = Pool.takeOut(RecoverName.ELEMENT);
+    public static getElement(type: ElementType): Element {
+        let obj: Element = Pool.takeOut(RecoverName.ELEMENT);
         if (!obj) {
             obj = new Element(type)
         } else {
@@ -742,4 +845,35 @@ export class Tool {
         }
         return r
     }
+    /**
+     * 随机取数组arr中count个元素
+     * @param arr 
+     * @param count 
+     */
+    public static getRandomArrayElements(arr: any[], count: number) {
+        var shuffled = arr.slice(0), i = arr.length, min = i - count, temp, index;
+        //如果count大于等于数组长度，返回所有数组
+        if (min <= 0) return shuffled;
+        //随机排序，然后取出后面的元素
+        while (i-- > min) {
+            index = Math.floor((i + 1) * Math.random());
+            temp = shuffled[index];
+            shuffled[index] = shuffled[i];
+            shuffled[i] = temp;
+        }
+        return shuffled.slice(min);
+    }
+    public static getRandomArrayElementsEx(arr: any[], count: number):any[] {
+        //如果count大于等于数组长度，返回所有数组
+        if (arr.length <= count) return arr.slice();
+        if (count <= 0) return [];
+        var arrCopy = arr.slice();
+        var outArr = [];
+        while (count--) {
+            var rand = Math.floor(Math.random() * arrCopy.length);
+            var ele = arrCopy.splice(rand, 1)[0];
+            outArr.push(ele);
+        }
+        return outArr
+    }
 }
\ No newline at end of file

egret/src/something/anis/EggBrokenAni.ts

+import { Ani } from "../class/Ani";
+
+const offsetX = 91 / 2;
+const offsetY = 62 / 2;
+
+export class EggBrokenAni extends Ani {
+
+    downCircle: egret.Bitmap;
+    upCircle: egret.Bitmap;
+    eggPiece1: egret.Bitmap;
+    eggPiece2: egret.Bitmap;
+    eggPiece3: egret.Bitmap;
+    eggPiece4: egret.Bitmap;
+    eggPiece5: egret.Bitmap;
+    constructor() {
+        super()
+        this.aniName = "EggBrokenAni";
+
+        var arr = ["yellowCircleDown_png", "yellowCircleUp_png", "eggPiece1_png", "eggPiece2_png", "eggPiece3_png", "eggPiece4_png", "eggPiece5_png"];
+        var objs = ["downCircle", "upCircle", "eggPiece1", "eggPiece2", "eggPiece3", "eggPiece4", "eggPiece5"];
+
+        for (var i = 0; i < arr.length; i++) {
+            var texture: egret.Texture = RES.getRes(arr[i])
+            var obj = new egret.Bitmap(texture);
+            this.addChild(obj);
+            obj.anchorOffsetX = texture.textureWidth / 2;
+            obj.anchorOffsetY = texture.textureHeight / 2;
+            this[objs[i]] = obj;
+        }
+    }
+
+    play() {
+        this.alpha = 1;
+        //黄色圈下
+        egret.Tween.get(this.downCircle)
+            .set({ scaleX: 0.01, scaleY: 0.01 })
+            .to({ scaleX: 0.6, scaleY: 0.6 }, 300, egret.Ease.cubicOut)
+        egret.Tween.get(this.downCircle)
+            .set({ alpha: 1 })
+            .wait(140)
+            .to({ alpha: 0 }, 160);
+        //黄色圈上
+        egret.Tween.get(this.upCircle)
+            .set({ scaleX: 0.01, scaleY: 0.01 })
+            .wait(70)
+            .to({ scaleX: 1, scaleY: 1 }, 160, egret.Ease.cubicOut);
+        egret.Tween.get(this.upCircle)
+            .set({ alpha: 1 })
+            .wait(170)
+            .to({ alpha: 0 }, 100);
+        //下面所有的蛋壳碎片
+        egret.Tween.get(this.eggPiece1)
+            .set({ rotation: 0, x: 37 - offsetX, y: 22 - offsetY })
+            .to({ rotation: 60, x: 37 - offsetX - 30, y: 22 - offsetY - 34 }, 400);
+        egret.Tween.get(this.eggPiece2)
+            .set({ rotation: 0, x: 48 - offsetX, y: 20 - offsetY })
+            .to({ rotation: 60, x: 48 - offsetX + 36, y: 20 - offsetY - 28 }, 400);
+        egret.Tween.get(this.eggPiece3)
+            .set({ rotation: 0, x: 52 - offsetX, y: 32 - offsetY })
+            .to({ rotation: 60, x: 52 - offsetX + 30, y: 32 - offsetY + 10 }, 400);
+        egret.Tween.get(this.eggPiece4)
+            .set({ rotation: 0, x: 45 - offsetX, y: 44 - offsetY })
+            .to({ rotation: 60, x: 45 - offsetX + 32, y: 44 - offsetY + 38 }, 400);
+        egret.Tween.get(this.eggPiece5)
+            .set({ rotation: 0, x: 34 - offsetX, y: 34 - offsetY })
+            .to({ rotation: 60, x: 34 - offsetX - 20, y: 34 - offsetY + 14 }, 400);
+
+        //整体透明度
+        egret.Tween.get(this)
+            .wait(250)
+            .to({ alpha: 0 }, 150)
+            .call(() => {
+                this.recover();
+            })
+
+
+    }
+
+
+}
\ No newline at end of file

egret/src/something/anis/HatchAni.ts

+
+import { RecoverName } from "../enum/RecoverName";
+import { Pool } from "../Pool";
+import { Element } from "../class/Element";
+import { Ice } from "../class/Ice";
+import { ElementType } from "../enum/ElementType";
+import { Tool } from "../Tool";
+import MainScene from "../../mainScene/MainScene";
+
+/**
+ * 孵蛋的动效
+ */
+export function HatchAni(startIndex: number, endIndexs: number[], thisObj: MainScene, callback: Function) {
+    let countAll = endIndexs.length;
+    let count = 0;
+    var startP = Tool.getPositionByIndex(startIndex);
+    for (let i = 0; i < endIndexs.length; i++) {
+        let endIndex = endIndexs[i];
+        let endP = Tool.getPositionByIndex(endIndex);
+        let eleC: Element = Tool.getElement(ElementType.CHICKEN);
+        eleC.x = startP[0];
+        eleC.y = startP[1];
+        eleC.scaleX = eleC.scaleY = 0.7;
+        thisObj.addChild(eleC);
+        paraCurveAni(eleC, startP, endP, () => {
+            //回收
+            thisObj.removeChild(eleC);
+            Pool.recover(RecoverName.ELEMENT, eleC);
+            //对应的索引的类型变成鸡
+            thisObj.lattices[endIndex].element.reset(ElementType.CHICKEN);
+            //动画，和bonusTime的效果一样，暂时没加
+            
+            count++;
+            if (count == countAll) callback();
+        })
+    }
+}
+
+
+const deltaTime = 500;
+const gravity = 0.003
+/**
+ * 抛物线路径
+ * @param startP 
+ * @param endP 
+ * @param callback 
+ */
+function paraCurveAni(ele: Element, startP: number[], endP: number[], callback: Function) {
+    //x方向匀速，线性
+    var deltaX = endP[0] - startP[0]
+    //y方向，自由落体，y向下为正，加速度向下为正，初速度根据情况而定
+    var deltaY = endP[1] - startP[1];
+    var vy0 = deltaY / deltaTime - gravity * deltaTime / 2;
+    var a = { t: 0 };
+    egret.Tween.get(a, {
+        onChange: function () {
+            ele.x = deltaX * a.t / deltaTime + startP[0];
+            ele.y = vy0 * a.t + gravity * a.t * a.t / 2 + startP[1];
+
+        }
+    })
+        .to({ t: deltaTime }, deltaTime)
+        .call(() => {
+            callback();
+        })
+    var rotation;
+    if (deltaX > 0) {
+        rotation = 360;
+    }
+    else if (deltaX < 0) {
+        rotation = -360;
+    } else {
+        rotation = 0
+    }
+
+    //旋转
+    egret.Tween.get(ele)
+        .set({ scaleX: 0.3, scaleY: 0.3, rotation: 0 })
+        .to({ scaleX: 1, scaleY: 1, rotation: rotation }, deltaTime)
+
+
+}
\ No newline at end of file

egret/src/something/anis/IceAni.ts

@@ -10,7 +10,7 @@ export class IceAni extends Ani {
     constructor() {
         super();
         this.aniName = "IceAni";
-        this.showImage = new ImageAni(["ice1_png", "ice2_png", "ice3_png", "ice4_png", "ice5_png", "ice6_png"]);
+        this.showImage = new ImageAni(["ele7_png", "ice2_png", "ice3_png", "ice4_png", "ice5_png", "ice6_png"]);
         this.addChild(this.showImage)
     }
 

egret/src/something/anis/JellyDisAni.ts

+import { Ani } from "../class/Ani";
+
+export class JellyDisAni extends Ani {
+    showImage: egret.Bitmap;
+    downCircle: egret.Bitmap;
+    upCircle: egret.Bitmap;
+    constructor() {
+        super()
+        this.aniName = "JellyDisAni";
+
+        var arr = ["ele8_png", "greenCircleDown_png", "greenCircleUp_png"];
+        var objs = ["showImage", "downCircle", "upCircle"];
+
+        for (var i = 0; i < arr.length; i++) {
+            var texture: egret.Texture = RES.getRes(arr[i])
+            var obj = new egret.Bitmap(texture);
+            this.addChild(obj);
+            obj.anchorOffsetX = texture.textureWidth / 2;
+            obj.anchorOffsetY = texture.textureHeight / 2;
+            this[objs[i]] = obj;
+        }
+    }
+
+    play() {
+
+        egret.Tween.get(this.showImage)
+            .set({ alpha: 1 })
+            .to({ alpha: 0 }, 250*1.5)
+
+        egret.Tween.get(this.downCircle)
+            .set({ scaleX: 0.01, scaleY: 0.01 })
+            .to({ scaleX: 0.6, scaleY: 0.6 }, 300*1.5, egret.Ease.cubicOut)
+            .call(() => {
+                this.recover();
+            })
+
+        egret.Tween.get(this.downCircle)
+            .set({ alpha: 1 })
+            .wait(140*1.5)
+            .to({ alpha: 0 }, 160*1.5);
+
+        egret.Tween.get(this.upCircle)
+            .set({ scaleX: 0.01, scaleY: 0.01 })
+            .wait(70*1.5)
+            .to({ scaleX: 1, scaleY: 1 }, 160*1.5, egret.Ease.cubicOut);
+
+        egret.Tween.get(this.upCircle)
+            .set({ alpha: 1 })
+            .wait(170*1.5)
+            .to({ alpha: 0 }, 100*1.5);
+
+    }
+
+
+}
\ No newline at end of file

egret/src/something/anis/JellySpreadAni.ts

+import { ImageAni } from "../class/ImageAni";
+import { Pool } from "../Pool";
+import { RecoverName } from "../enum/RecoverName";
+import { playSound, SoundType } from "../../soundCtrl";
+import { Tool } from "../Tool";
+
+/**
+ * 需要回调的
+ * 
+ */
+export class JellySpreadAni extends egret.DisplayObjectContainer {
+    //原位置的图片
+    oriImage: egret.Bitmap;
+    //目标位置的图片，到时根据方向定
+    targetImage: egret.Bitmap;
+
+    shoot: egret.Bitmap;
+    constructor() {
+        super()
+        var texture: egret.Texture = RES.getRes("ele8_png")
+        this.targetImage = new egret.Bitmap(texture);
+        this.targetImage.anchorOffsetX = texture.textureWidth / 2;
+        this.targetImage.anchorOffsetY = texture.textureHeight / 2;
+        this.addChild(this.targetImage);
+
+        this.oriImage = new egret.Bitmap(texture);
+        this.oriImage.anchorOffsetX = texture.textureWidth / 2;
+        this.oriImage.anchorOffsetY = texture.textureHeight / 2;
+        this.addChild(this.oriImage);
+
+        this.shoot = new egret.Bitmap(RES.getRes("jellyArrow_png"));
+        this.shoot.anchorOffsetX = 0;
+        this.shoot.anchorOffsetY = 23 / 2;
+        this.addChild(this.shoot);
+    }
+
+    play(startP: number[], endP: number[], callback: Function) {
+        this.x = startP[0];
+        this.y = startP[1];
+
+        this.shoot.visible = true;
+        this.shoot.x = 0
+        this.shoot.y = 0;
+        this.shoot.scaleX = this.shoot.scaleY = 0.01;
+        this.targetImage.visible = false;
+        //判断上下左右，
+        var obj = { scaleX: 0.01, scaleY: 0.01, x: 0, y: 0 };
+        //x相等 上下
+        if (Math.abs(endP[0] - startP[0]) <= 0.001) {
+            //下
+            if (endP[1] - startP[1] > 0) {
+                this.shoot.rotation = 90;
+                this.targetImage.x = 0;
+                this.targetImage.y = Tool.height;
+                obj.y = Tool.height;
+            }
+            //上
+            else {
+                this.shoot.rotation = 270;
+                this.targetImage.x = 0;
+                this.targetImage.y = -Tool.height;
+                obj.y = -Tool.height;
+            }
+        }
+        //y相等 左右
+        else {
+            //左
+            if (endP[0] - startP[0] > 0) {
+                this.shoot.rotation = 0;
+                this.targetImage.x = Tool.width;
+                this.targetImage.y = 0;
+                obj.x = Tool.width;
+            }
+            //右
+            else {
+                this.shoot.rotation = 180;
+                this.targetImage.x = -Tool.width;
+                this.targetImage.y = 0;
+                obj.x = -Tool.width;
+            }
+        }
+
+
+        egret.Tween.get(this.oriImage)
+            .to({ scaleX: 1.07, scaleY: 0.89 }, 150)
+            .to({ scaleX: 0.91, scaleY: 1.07 }, 150)
+            .to({ scaleX: 1.07, scaleY: 0.89 }, 100)
+            .to({ scaleX: 0.93, scaleY: 1.06 }, 100)
+            .to({ scaleX: 1.07, scaleY: 0.93 }, 100)
+            .to({ scaleX: 1, scaleY: 1 }, 100)
+
+        egret.Tween.get(this.shoot)
+            .to({ scaleX: 2, scaleY: 1 }, 230)
+            .to(obj, 50)
+            .call(() => {
+                callback();
+                this.shoot.visible = false;
+                this.targetImage.visible = true;
+                egret.Tween.get(this.targetImage)
+                    .to({ scaleX: 1.07, scaleY: 0.89 }, 150)
+                    .to({ scaleX: 0.91, scaleY: 1.07 }, 150)
+                    .to({ scaleX: 1.07, scaleY: 0.89 }, 100)
+                    .to({ scaleX: 0.93, scaleY: 1.06 }, 100)
+                    .to({ scaleX: 1.07, scaleY: 0.93 }, 100)
+                    .to({ scaleX: 1, scaleY: 1 }, 100)
+                    .call(() => {
+                        if (this.$parent) {
+                            this.$parent.removeChild(this)
+                        };
+                        Pool.recover(RecoverName.JELLYSPREAD_ANI, this)
+                    })
+            })
+    }
+}
\ No newline at end of file

egret/src/something/anis/PieceToEggAni.ts

+import { ImageAni } from "../class/ImageAni";
+import { Pool } from "../Pool";
+import { RecoverName } from "../enum/RecoverName";
+import { playSound, SoundType } from "../../soundCtrl";
+import { Tool } from "../Tool";
+
+const offsetX = 91 / 2;
+const offsetY = 62 / 2;
+/**
+ * 需要回调的
+ * 
+ */
+export class PieceToEggAni extends egret.DisplayObjectContainer {
+
+    showImage: egret.Bitmap;
+    eggPiece1: egret.Bitmap;
+    eggPiece2: egret.Bitmap;
+    eggPiece3: egret.Bitmap;
+    eggPiece4: egret.Bitmap;
+    eggPiece5: egret.Bitmap;
+    constructor() {
+        super()
+        var arr = ["ele9_png", "eggPiece1_png", "eggPiece2_png", "eggPiece3_png", "eggPiece4_png", "eggPiece5_png"];
+        var objs = ["showImage", "eggPiece1", "eggPiece2", "eggPiece3", "eggPiece4", "eggPiece5"];
+
+        for (var i = 0; i < arr.length; i++) {
+            var texture: egret.Texture = RES.getRes(arr[i])
+            var obj = new egret.Bitmap(texture);
+            this.addChild(obj);
+            obj.anchorOffsetX = texture.textureWidth / 2;
+            obj.anchorOffsetY = texture.textureHeight / 2;
+            this[objs[i]] = obj;
+        }
+    }
+
+    play(p: number[], callback: Function) {
+        this.x = p[0];
+        this.y = p[1];
+        this.showImage.alpha = 0;
+        egret.Tween.get(this.showImage)
+            .wait(250)
+            .to({ alpha: 1 }, 150)
+
+        this.alpha = 0;
+        //整体透明度
+        egret.Tween.get(this)
+            .to({ alpha: 1 }, 150)
+        //下面所有的蛋壳碎片
+        egret.Tween.get(this.eggPiece1)
+            .set({ rotation: 60, x: 37 - offsetX - 30, y: 22 - offsetY - 34 })
+            .to({ rotation: 0, x: 37 - offsetX, y: 22 - offsetY }, 400);
+        egret.Tween.get(this.eggPiece2)
+            .set({ rotation: 60, x: 48 - offsetX + 36, y: 20 - offsetY - 28 })
+            .to({ rotation: 0, x: 48 - offsetX, y: 20 - offsetY }, 400);
+        egret.Tween.get(this.eggPiece3)
+            .set({ rotation: 60, x: 52 - offsetX + 30, y: 32 - offsetY + 10 })
+            .to({ rotation: 0, x: 52 - offsetX, y: 32 - offsetY }, 400);
+        egret.Tween.get(this.eggPiece4)
+            .set({ rotation: 60, x: 45 - offsetX + 32, y: 44 - offsetY + 38 })
+            .to({ rotation: 0, x: 45 - offsetX, y: 44 - offsetY }, 400);
+        egret.Tween.get(this.eggPiece5)
+            .set({ rotation: 60, x: 34 - offsetX - 20, y: 34 - offsetY + 14 })
+            .to({ rotation: 0, x: 34 - offsetX, y: 34 - offsetY }, 400)
+            .call(() => {
+                callback();
+                if (this.$parent) {
+                    this.$parent.removeChild(this)
+                };
+                Pool.recover(RecoverName.PIECETOEGG_ANI, this)
+            })
+
+
+
+
+
+    }
+}
\ No newline at end of file

egret/src/something/anis/RockAni.ts

@@ -10,7 +10,7 @@ export class RockAni extends Ani {
     constructor() {
         super();
         this.aniName = "RockAni";
-        this.showImage = new ImageAni(["rock1_png", "rock2_png", "rock3_png", "rock4_png", "rock5_png", "rock6_png"]);
+        this.showImage = new ImageAni(["ele5_png", "rock2_png", "rock3_png", "rock4_png", "rock5_png", "rock6_png"]);
         this.addChild(this.showImage)
     }
 

egret/src/something/class/ChickenEgg.ts

+//四种状态的图片
+const images = {
+    3: "ele9_png",
+    2: "eggStatus2_png",
+    1: "eggStatus1_png",
+    0: "eggStatus0_png"
+}
+/**
+ * 鸡蛋的状态
+ * 
+ */
+export class ChickenEgg extends eui.Component {
+    private showImage: eui.Image;
+    /**
+     * 是否孵小鸡
+     */
+    isActive: boolean;
+    /**
+     * 鸡蛋状态变化 3 2 1 0 再往后，可孵鸡
+     */
+    private _statusNum: number;
+    get statusNum() {
+        return this._statusNum
+    }
+    set statusNum(value: number) {
+        if (value >= 0) {
+            this._statusNum = value;
+            //修改图片
+            if (this.showImage.source != images[this._statusNum]) {
+                this.changeSource(images[this._statusNum]);
+            }
+        } else {
+            this._statusNum = 0;
+            this.isActive = true;
+        }
+    }
+
+    constructor(n: number = 3) {
+        super()
+        this.showImage = new eui.Image();
+        this.addChild(this.showImage)
+        this.changeSource(images[n]);
+
+        this.isActive = false;
+        this._statusNum = n;
+    }
+    changeSource(source: string) {
+        var texture: egret.Texture = RES.getRes(source);
+        this.showImage.texture = texture
+
+        this.showImage.anchorOffsetX = texture.textureWidth / 2;
+        this.showImage.anchorOffsetY = texture.textureHeight / 2 + 20;
+        this.showImage.y = 20
+    }
+    shakeAni() {
+        this.showImage.rotation = 0;
+        egret.Tween.get(this.showImage)
+            .to({ rotation: 10 }, 80)
+            .to({ rotation: -8 }, 160)
+            .to({ rotation: 5 }, 160)
+            .to({ rotation: 0 }, 50)
+    }
+
+
+    reset(n: number = 3) {
+        this.changeSource(images[n]);
+        this.isActive = false;
+        this._statusNum = n;
+
+    }
+
+}
\ No newline at end of file

egret/src/something/class/Element.ts

@@ -7,6 +7,7 @@ import { MagicLionBgAni } from "../periodAni/MagicLionBgAni";
 import { HorizontalBgAni } from "../periodAni/HorizontalBgAni";
 import { VerticalBgAni } from "../periodAni/VerticalBgAni";
 import { ExplosiveBgAni } from "../periodAni/ExplosiveBgAni";
+import { ChickenEgg } from "./ChickenEgg";
 
 
 /**
@@ -17,7 +18,10 @@ export class Element extends eui.Component {
     /**
      * 初始类型
      */
-    type: ElementType;
+    private _type: ElementType;
+    get type() {
+        return this._type
+    }
     /**
      * 显示的图片，直接改source，"ele"+type+effectType
      */
@@ -50,7 +54,7 @@ export class Element extends eui.Component {
                     this.addChildAt(this.magicLionBgAni, 0);
                     break;
                 case EffectType.HORIZONTAL:
-                    this.changeSource("ele" + this.type + value + "_png");
+                    this.changeSource("ele" + this.type + "Line" + "_png");
                     //添加HorizontalBgAni
                     this.horizontalBgAni = Pool.takeOut(RecoverName.HORIZONTALBG_ANI)
                     if (!this.horizontalBgAni) {
@@ -61,7 +65,7 @@ export class Element extends eui.Component {
                     this.addChildAt(this.horizontalBgAni, 1)
                     break;
                 case EffectType.VERTICAL:
-                    this.changeSource("ele" + this.type + value + "_png");
+                    this.changeSource("ele" + this.type + "Line" + "_png");
                     //添加VerticalBgAni
                     this.verticalBgAni = Pool.takeOut(RecoverName.VERTICALBG_ANI)
                     if (!this.verticalBgAni) {
@@ -72,7 +76,7 @@ export class Element extends eui.Component {
                     this.addChildAt(this.verticalBgAni, 1)
                     break;
                 case EffectType.EXPLOSIVE:
-                    this.changeSource("ele" + this.type + value + "_png");
+                    this.changeSource("ele" + this.type + "Exp" + "_png");
                     this.explosiveBgAni = Pool.takeOut(RecoverName.EXPLOSIVEBG_ANI)
                     if (!this.explosiveBgAni) {
                         this.explosiveBgAni = new ExplosiveBgAni();
@@ -135,13 +139,24 @@ export class Element extends eui.Component {
         }
         this._isLock = value
     }
+    chickenEgg: ChickenEgg;
     constructor(type: ElementType) {
         super();
-        this.type = type;
+        this._type = type;
         this.showImage = new eui.Image();
         this.changeSource("ele" + this.type + "_png");
         this.addChild(this.showImage);
         // this.showImage.touchEnabled=false
+        if (type == ElementType.CHICKEN_EGG) {
+            this.chickenEgg = Pool.takeOut(RecoverName.CHICKEN_EGG)
+            if (!this.chickenEgg) {
+                //新建,里面是解锁的所有图片组
+                this.chickenEgg = new ChickenEgg();
+            } else {
+                this.chickenEgg.reset();
+            }
+            this.addChild(this.chickenEgg)
+        }
     }
 
     /**
@@ -157,7 +172,7 @@ export class Element extends eui.Component {
         this.showImage.y = -texture.textureHeight / 2;
 
         //特殊逻辑，因为魔力鸟动效要旋转，所以隐藏原图showImage
-        if (source == "magicLion_png") {
+        if (source == "magicLion_png" || source == "ele9_png") {
             this.showImage.alpha = 0;
         } else {
             this.showImage.alpha = 1;
@@ -167,7 +182,7 @@ export class Element extends eui.Component {
     reset(type: ElementType) {
         this.alpha = this.scaleX = this.scaleY = 1;
         //类型重置，showImage修改
-        this.type = type;
+        this._type = type;
         this.changeSource("ele" + type + "_png");
         //特效重置
         this.effectType = null;
@@ -180,6 +195,22 @@ export class Element extends eui.Component {
             Pool.recover(RecoverName.LOCK_ANI, this.lockAni);
             this.lockAni = null;
         }
+        //如果类型是鸡蛋
+        if (type == ElementType.CHICKEN_EGG) {
+            this.chickenEgg = this.chickenEgg || Pool.takeOut(RecoverName.CHICKEN_EGG)
+            if (!this.chickenEgg) {
+                //新建,里面是解锁的所有图片组
+                this.chickenEgg = new ChickenEgg();
+            } else {
+                this.chickenEgg.reset();
+            }
+            this.addChild(this.chickenEgg)
+        }
+        else if (this.chickenEgg) {
+            this.removeChild(this.chickenEgg);
+            Pool.recover(RecoverName.CHICKEN_EGG, this.chickenEgg);
+            this.chickenEgg = null;
+        }
     }
 
     private removeHas() {

egret/src/something/enum/ElementType.ts

 /**
- * 元素类型
+ * 元素类型  <=4就是基础元素
  */
 export enum ElementType {
     RABBIT = 0,//兔子0
@@ -7,9 +7,14 @@ export enum ElementType {
     CATTLE,//牛2
     LION,//狮子3
     PIG,//猪4
+    
     ROCK,//石头5
     LOLLIPOP,//棒棒糖6
-    ICE,//冰块7
+
+    ICE,//冰块7  有时间重构的话，不适合放这里
+
+    JELLY,//果冻8
+    CHICKEN_EGG,//鸡蛋9
 }
 export const codeMsgs = {
     "E1002090011": "用户关卡记录异常",

egret/src/something/enum/RecoverName.ts

 /**
- * 特效类型
+ * 回收类型
  */
 export enum RecoverName {
     ELEMENT = "Element",
@@ -12,7 +12,13 @@ export enum RecoverName {
 
     SCORE_ANI = "ScoreAni",
 
+    //带回调的动画
     BONUSSHOOT_ANI = "BonusShootAni",
+    JELLYSPREAD_ANI = "JellySpreadAni",
+    PIECETOEGG_ANI = "PieceToEggAni",
+
+
+
     //元素身上
     LOCK_ANI = "LockAni",
     MAGICLIONBG_ANI = "MagicLionBgAni",
@@ -20,6 +26,9 @@ export enum RecoverName {
     VERTICALBG_ANI = "VerticalBgAni",
     EXPLOSIVEBG_ANI = "ExplosiveBgAni",
 
+    //元素身上的鸡蛋
+    CHICKEN_EGG = "ChickenEgg",
+
     //所有继承ani的，能单独播放的
     ROCK_ANI = "RockAni",
     ICE_ANI = "IceAni",
@@ -31,4 +40,6 @@ export enum RecoverName {
     THREECROSS_ANI = "ThreeCrossAni",
     MAGICLION_ANI = "MagicLionAni",
     STEP_ANI = "StepAni",
+    JELLYDIS_ANI = "JellyDisAni",
+    EGGBROKEN_ANI = "EggBrokenAni",
 }
\ No newline at end of file

egret/src/something/interface/MapData.ts

@@ -31,6 +31,8 @@ export interface MapData {
      * 2石头
      * 3棒棒糖
      * 4元素枷锁
+     * 5果冻
+     * 6鸡蛋
      */
     elements?:number[]
     /**

egret/src/something/logic/AiControl.ts

+import MainScene from "../../mainScene/MainScene";
+import { JellySpreadAni } from "../anis/JellySpreadAni";
+import { Pool } from "../Pool";
+import { RecoverName } from "../enum/RecoverName";
+import { Tool } from "../Tool";
+import { ElementType } from "../enum/ElementType";
+import { Lattice } from "../class/Lattice";
+import { ChickenEgg } from "../class/ChickenEgg";
+import { HatchAni } from "../anis/HatchAni";
+import { PieceToEggAni } from "../anis/PieceToEggAni";
+
+//孵鸡的数量
+const chickenNum: number = 4
+
+export class AiControl {
+    private static _ins: AiControl
+    static get ins() {
+        return AiControl._ins || (AiControl._ins = new AiControl())
+    }
+    /**
+     * 判断是否还有果冻，暂时不考虑果冻无中生有，否则逻辑修改
+     */
+    private hasJelly: boolean;
+    /**
+     * 提前记录所有的鸡蛋的索引
+     */
+    private eggs: number[];
+
+    init(lattices: Lattice[]) {
+        this.hasJelly = judgeJellyExist(lattices);
+        this.eggs = getEggs(lattices);
+    }
+
+    jellyMotion(thisObj: MainScene, callback: Function) {
+        if (!this.hasJelly || thisObj.jellyBrokenMark) {
+            //没有果冻，或上一步有果冻被消除，直接回调
+            callback();
+            thisObj.jellyBrokenMark = false;
+            return
+        }
+        //标识记为false
+        thisObj.jellyBrokenMark = false;
+        //果冻蔓延
+        let spread = getJellySpreadAni(thisObj.lattices);
+        if (spread) {
+            //执行动画
+            let jellySpreadAni: JellySpreadAni = Pool.takeOut(RecoverName.JELLYSPREAD_ANI)
+            if (!jellySpreadAni) {
+                jellySpreadAni = new JellySpreadAni()
+            }
+            thisObj.addChild(jellySpreadAni);
+            //隐藏原来的元素
+            thisObj.lattices[spread[0]].element.visible = false;
+            jellySpreadAni.play(Tool.getPositionByIndex(spread[0]), Tool.getPositionByIndex(spread[1]), () => {
+                //显示隐藏元素
+                thisObj.lattices[spread[0]].element.visible = true;
+                //播放完后，将终点元素变成果冻
+                thisObj.lattices[spread[1]].element.reset(ElementType.JELLY);
+                //执行回调
+                callback()
+            })
+        } else {
+            callback()
+            if (spread === 0) {
+                //如果无果冻了
+                this.hasJelly = false;
+            }
+        }
+    }
+    /**
+     * 鸡蛋得孵化逻辑
+     * 与果冻不同，需要执行一次threeMatch，如无再执行callback，否则执行eleminate
+     * @param thisObj 
+     * @param callback 
+     */
+    eggMotion(thisObj: MainScene, callback: Function) {
+        //无蛋，直接回调
+        if (!this.eggs.length) {
+            callback();
+            return
+        }
+        var activeEggIndexs: number[] = []
+        //找出所有有鸡的蛋的索引
+        for (var i = 0; i < this.eggs.length; i++) {
+            var index = this.eggs[i];
+            var egg: ChickenEgg = thisObj.lattices[index].element.chickenEgg
+            if (egg.isActive) activeEggIndexs.push(index);
+        }
+        //无有鸡的蛋，直接回调
+        if (!activeEggIndexs.length) {
+            callback();
+            return
+        }
+
+        //找出所有能飞小鸡的格子索引
+        var chickenIndexs: number[] = [];
+        for (var a = 0; a < thisObj.lattices.length; a++) {
+            var lat = thisObj.lattices[a];
+            if (lat &&
+                lat.element &&
+                lat.element.type <= 4) {
+                chickenIndexs.push(a);
+            }
+        }
+        //如果没有能飞的格子
+        if (!chickenIndexs.length) {
+            callback();
+            return
+        }
+        //打乱索引
+        chickenIndexs.sort(function () {
+            return (0.5 - Math.random());
+        });
+        //拷贝
+        var chickenIndexsCopy = chickenIndexs.slice();
+
+        let countAll = activeEggIndexs.length;
+        let count = 0;
+        //开始给每个有鸡的蛋做匹配
+        for (var b = 0; b < activeEggIndexs.length; b++) {
+            let activeEggIndex = activeEggIndexs[b];
+            //从chickenIndexsCopy取四个，不足就在chickenIndexs随个
+            let four: number[] = chickenIndexsCopy.splice(0, 4);
+            if (four.length < chickenNum) {
+                //补上剩下的，如果还不足，就不管
+                four = four.concat(Tool.getRandomArrayElementsEx(chickenIndexs, chickenNum - four.length))
+            }
+            //播蛋壳动画
+            let activeEgg = thisObj.lattices[activeEggIndex].element.chickenEgg;
+            activeEgg.visible = false;
+            HatchAni(activeEggIndex, four, thisObj, () => {
+                //飞完后恢复蛋的状态
+                //蛋壳变为蛋的动画,回调里执行吧
+                let pieceToEggAni: PieceToEggAni = Pool.takeOut(RecoverName.PIECETOEGG_ANI)
+                if (!pieceToEggAni) {
+                    pieceToEggAni = new PieceToEggAni()
+                }
+                thisObj.addChild(pieceToEggAni);
+                pieceToEggAni.play(Tool.getPositionByIndex(activeEggIndex), () => {
+                    activeEgg.reset();
+                    activeEgg.visible = true;
+                })
+
+                count++;
+                if (count == countAll) {
+                    setTimeout(() => {
+                        if (thisObj.threeMatch()) {
+                            thisObj.eliminate();
+                        } else {
+                            callback()
+                        }
+                    })
+                }
+            })
+        }
+    }
+
+
+
+}
+
+/**
+ * 判断果冻是否存在
+ * @param lattices 
+ * @return false表示不存在，true表示存在
+ */
+function judgeJellyExist(lattices: Lattice[]) {
+    for (var i = 0; i < lattices.length; i++) {
+        var lattice = lattices[i]
+        //没有格子或没有元素或不是果冻 跳过
+        if (!lattice || !lattice.element || lattice.element.type != ElementType.JELLY) continue
+        return true
+    }
+    return false;
+}
+/**
+ * 获取所有鸡蛋的索引
+ * @param lattices 
+ * @return false表示不存在，true表示存在
+ */
+function getEggs(lattices: Lattice[]) {
+    var arr = [];
+    for (var i = 0; i < lattices.length; i++) {
+        var lattice = lattices[i]
+        //没有格子或没有元素或不是果冻 跳过
+        if (lattice &&
+            lattice.element &&
+            lattice.element.type == ElementType.CHICKEN_EGG
+        ) {
+            arr.push(i)
+        }
+
+    }
+    return arr;
+}
+
+
+/**
+ * 获取能蔓延的
+ * @param lattices 
+ */
+function getJellySpreadAni(lattices: Lattice[]) {
+    var indexs: number[] = [];
+    for (var i = 0; i < lattices.length; i++) {
+        var lattice = lattices[i]
+        //没有格子或没有元素或不是果冻 跳过
+        if (!lattice || !lattice.element || lattice.element.type != ElementType.JELLY) continue
+        indexs.push(i);
+    }
+    if (!indexs.length) return 0
+    while (indexs.length) {
+        var rand = Math.floor(Math.random() * indexs.length);
+        var randIndex = indexs.splice(rand, 1)[0];
+        var index = judgeSpread(randIndex, lattices);
+        if (index != null) {
+            //能蔓延，返回自身索引和蔓延的索引
+            return [randIndex, index];
+        }
+    }
+    return null;
+}
+
+/**
+ * 判断可蔓延的方向，并返回蔓延的格子索引
+ * @param index 
+ * @return 没有返回null，注意判断时可能有0
+ */
+function judgeSpread(index: number, lattices: Lattice[]): number {
+    //四个方向尽量随机
+    var arr = [index - Tool.colNum, index + Tool.colNum];
+    var rc = Tool.indexToRc(index);
+    var col = rc[1];
+    //列数大于0才可能有左边格子
+    if (col > 0) arr.push(index - 1);
+    //列数不为最右边
+    if (col < Tool.colNum - 1) arr.push(index + 1);
+    while (arr.length) {
+        var rand = Math.floor(Math.random() * arr.length);
+        var i = arr.splice(rand, 1)[0];
+        if (lattices[i] &&
+            lattices[i].element &&
+            lattices[i].element.type <= 4&&
+            !lattices[i].element.isLock) {
+            return i
+        }
+    }
+    return null
+}
+
+

mock/config.js

 const path = require('path');
 const config = {
+    '/customActivity/happyclear/totalNumRank': {
+        data: './happyclear/totalNumRank.json'
+    },
+    '/customActivity/happyclear/userInfo': {
+        data: './happyclear/userInfo.json'
+    },
+    '/customActivity/happyclear/levelNumRank': {
+        data: './happyclear/levelNumRank.json'
+    },
+    '/customActivity/happyclear/mapRank': {
+        data: './happyclear/mapRank.json'
+    },
+    '/customActivity/happyclear/advert': {
+        data: './happyclear/advert.json'
+    },
     '/signactivity/getSignInfo': {
         data: './sign/getSignInfo.json'
     },
@@ -74,7 +89,7 @@ const config = {
     '/activityPlugDrawInfo/getPrizeInfo': {
         data: './json/getPlugDrawPrizeInfo.json'
     },
-   
+
     // 活动工具新游戏
     '/hdtool/rank/rankList': {
         data: './rankList.json'
@@ -102,8 +117,23 @@ const config = {
     },
     '/hdtool/recon/ngame/resurrectionStatus': {
         data: './resurrectionStatus.json'
+    },
+    //////////////////// 消消乐邀请有礼 ////////////////////
+    '/customActivity/happyclear/getShareCode': {
+        data: './happyclear/getShareCode.json'
+    },
+    '/customActivity/happyclear/doHelp': {
+        data: './happyclear/doHelp.json'
+    },
+    '/customActivity/happyclear/invitationInfo': {
+        data: './happyclear/getInviteInfo.json'
+    },
+    '/customActivity/happyclear/acceptInvitationInfo':{
+        data: './happyclear/acceptInvitationInfo.json'
+    },
+    '/customActivity/happyclear/acceptInvitationPrize':{
+        data: './happyclear/acceptInvitationPrize.json'
     }
-
 }
 
 for (let item in config) {

mock/happyclear/acceptInvitationInfo.json

+{
+    "success": true,
+    "code": null,
+    "desc": null,
+    "timestamp": 1566199822308,
+    "data": {
+        "invitationId": "活动id",
+        "invitationCount": 0,
+        "img": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
+        "sysTime": 1570630215000,
+        "endTime": 1570672800000,
+        "completeFlag": 0,
+        "openPrizMsg": "图片",
+        "prizeType": "nickname",
+        "prizeName": "nickname",
+        "prizeImg": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
+        "facePrice": "avatar"
+    }
+}
\ No newline at end of file

mock/happyclear/acceptInvitationPrize.json

+{
+    "success": true,
+    "code": null,
+    "desc": null,
+    "timestamp": 1566199822308,
+    "data": {
+        "invitationId": "活动id",
+        "img": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
+        "completeFlag": 1,
+        "openPrizMsg": "图片",
+        "prizeType": "nickname",
+        "prizeName": "nickname",
+        "prizeImg": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
+        "facePrice": "avatar"
+    }
+}
\ No newline at end of file

mock/happyclear/advert.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":[
+        {
+            "levelNum":1,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"头像",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file

mock/happyclear/doHelp.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":""
+}
\ No newline at end of file

mock/happyclear/getInviteInfo.json

+{
+    "success": true,
+    "code": null,
+    "desc": null,
+    "timestamp": 1566199822308,
+    "data": {
+        "invitationId": "活动id",
+        "invitationCount": 4,
+        "img": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
+        "sysTime": 1570630215000,
+        "endTime": 1570672800000,
+        "invitationUser": [
+            {
+                "nickname": "nickname",
+                "avatar": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg"
+            }
+        ],
+        "completeFlag": 1,
+        "openPrizeMsg": "图片",
+        "prizeType": "nickname",
+        "prizeName": "nickname",
+        "prizeImg": "http://yun.duiba.com.cn/db_games/xiaoxiaole.jpg",
+        "facePrice": "avatar"
+    }
+}
\ No newline at end of file

mock/happyclear/getShareCode.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":"666"
+}
\ No newline at end of file

mock/happyclear/home.json

@@ -366,25 +366,165 @@
                 "levelNum": 72,
                 "maxScore": 15910,
                 "stars": 1
+            },
+            {
+                "levelNum": 73,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 74,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 75,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 76,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 77,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 78,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 79,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 80,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 81,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 82,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 83,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 84,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 85,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 86,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 87,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 88,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 89,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 90,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 91,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 92,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 93,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 94,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 95,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 96,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 97,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 98,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 99,
+                "maxScore": 15910,
+                "stars": 1
+            },
+            {
+                "levelNum": 100,
+                "maxScore": 15910,
+                "stars": 1
             }
         ],
         "remainProp": [
             {
                 "type": 2,
-                "num": 0
+                "num": 2
             },
             {
                 "type": 3,
-                "num": 0
+                "num": 2
             },
             {
                 "type": 4,
-                "num": 0
+                "num": 2
             }
         ],
-        "remainEnargy": 9979,
+        "remainEnargy": 99,
         "askForEnergy": false,
-        "canReceiveTreasureBoxNum": 0,
+        "canReceiveTreasureBoxNum": 10,
         "nextRangeStarsNum": 150
     }
 }
\ No newline at end of file

mock/happyclear/homemax.json

+{
+    "success": true,
+    "code": "0000000000",
+    "desc": "OK",
+    "timestamp": 1566885811031,
+    "data": {
+        "wealth": 7960,
+        "totalStars": 145,
+        "levels": [
+            {
+                "levelNum": 1,
+                "maxScore": 36320,
+                "stars": 3
+            }
+        ],
+        "remainProp": [
+            {
+                "type": 2,
+                "num": 0
+            },
+            {
+                "type": 3,
+                "num": 0
+            },
+            {
+                "type": 4,
+                "num": 0
+            }
+        ],
+        "remainEnargy": 99,
+        "askForEnergy": false,
+        "canReceiveTreasureBoxNum": 10,
+        "nextRangeStarsNum": 150
+    }
+}
\ No newline at end of file

mock/happyclear/levelNumRank.json

+{
+    "success": true,
+    "code": null,
+    "desc": null,
+    "timestamp": 1566199822308,
+    "data": [
+        {
+            "nickName": "奈何本人没文化，一句卧槽行天下",
+            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+            "stars": 1,
+            "maxScore": 1234567,
+            "rank": "1"
+        },
+        {
+            "nickName": "2奈何本人没文化，一句卧槽行天下",
+            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+            "stars": 1,
+            "maxScore": 1234567,
+            "rank": "2"
+        },
+        {
+            "nickName": "3奈何本人没文化，一句卧槽行天下",
+            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+            "stars": 1,
+            "maxScore": 1234567,
+            "rank": "3"
+        },
+        {
+            "nickName": "4奈何本人没文化，一句卧槽行天下",
+            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+            "stars": 1,
+            "maxScore": 1234567,
+            "rank": "4"
+        },
+        {
+            "nickName": "5奈何本人没文化，一句卧槽行天下",
+            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+            "stars": 1,
+            "maxScore": 123,
+            "rank": "5"
+        },
+        {
+            "nickName": "6奈何本人没文化，一句卧槽行天下",
+            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+            "stars": 1,
+            "maxScore": 555555,
+            "rank": "6"
+        }
+    ]
+}
\ No newline at end of file

mock/happyclear/mapRank.json

+{
+    "success":true,
+    "code":null,
+    "desc":null,
+    "timestamp":1566199822308,
+    "data":[
+        {
+            "levelNum":4,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        },
+        {
+            "levelNum":70,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        },
+        {
+            "levelNum":71,
+            "rank":[
+                {
+                    "nickName":"昵称",
+                    "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                    "stars":1,
+                    "maxScore":123,
+                    "rank":"排名"
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file

mock/happyclear/totalNumRank.json

+{
+    "success": true,
+    "code": null,
+    "desc": null,
+    "timestamp": 1566199822308,
+    "data": {
+        "user": {
+            "levelNum": 555,
+            "nickName": "奈何本人没文化，一句卧槽行天下",
+            "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+            "stars": 666,
+            "maxScore": 1234567,
+            "rank": 123
+        },
+        "list":[
+            {
+                "levelNum": 11,
+                "nickName": "1奈何本人没文化，一句卧槽行天下",
+                "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                "stars": 11,
+                "maxScore": 111111,
+                "rank": 1
+            },
+            {
+                "levelNum": 22,
+                "nickName": "2奈何本人没文化，一句卧槽行天下",
+                "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                "stars": 22,
+                "maxScore": 222222,
+                "rank": 2
+            },
+            {
+                "levelNum": 33,
+                "nickName": "3奈何本人没文化，一句卧槽行天下",
+                "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                "stars": 33,
+                "maxScore": 33333,
+                "rank": 3
+            },
+            {
+                "levelNum": 44,
+                "nickName": "3奈何本人没文化，一句卧槽行天下",
+                "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                "stars": 44,
+                "maxScore": 4444444,
+                "rank": 4
+            },
+            {
+                "levelNum": 55,
+                "nickName": "3奈何本人没文化，一句卧槽行天下",
+                "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                "stars": 55,
+                "maxScore": 1234567,
+                "rank": 5
+            },
+            {
+                "levelNum": 55,
+                "nickName": "3奈何本人没文化，一句卧槽行天下",
+                "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                "stars": 55,
+                "maxScore": 1234567,
+                "rank": 5
+            },
+            {
+                "levelNum": 9999,
+                "nickName": "99奈何本人没文化，一句卧槽行天下",
+                "avatar": "http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+                "stars": 55,
+                "maxScore": 1234567,
+                "rank": 999
+            }
+        ]
+    }
+}
\ No newline at end of file

mock/happyclear/userInfo.json

+{
+    "success":true,
+    "code":"0000000000",
+    "desc":"OK",
+    "timestamp":1570785133074,
+    "data":{
+        "id":27,
+        "consumerId":1539361,
+        "appId":1,
+        "partnerUserId":"1",
+        "nickname":"奈何本人没文化，一句卧槽行天下",
+        "avatar":"http://yun.dui88.com/images/201604/c6s5l4dgea.jpg",
+        "email":null,
+        "sex":null,
+        
+        "gmtCreate":1447904240000,
+        "gmtModified":1564034789000
+    }
+}
\ No newline at end of file