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,7 +277,12 @@ export default class MainBase extends eui.UILayer {
             }
 
         }
-
+        if (window['isInvitePage'] == 1) {
+            this.ajaxElement().then(() => {
+                SceneCtrl.instance.change(ModuleTypes.INVITE_SCENE);
+            })
+        }
+        else
             this.createGameScene();
     }
     private svgaList = [];
@@ -283,12 +314,41 @@ 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();
+            })
+        });
+    }
+
+    ajaxElement() {
+        return new Promise((r) => {
+            NetManager.ins.ajaxElement(async () => {
+                r();
+            });
+        });
+    }
+
+    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');
+
+        Buried.init();
+        ///////////
         SceneCtrl.instance.change(ModuleTypes.START_SCENE, this.svgaList);
 
         NetManager.ins.getShareInfo(() => {
@@ -296,18 +356,7 @@ export default class MainBase extends eui.UILayer {
             window['registerWX'](result);
         });
         updateMainTimer();
-            }
-        }
 
-        NetManager.ins.hc_home(() => {
-            count--;
-            check();
-        }, window['collectRuleId']);
-
-        NetManager.ins.ajaxElement(async () => {
-            count--;
-            check();
-        });
 
         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/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/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