3.0

590d2519 · wangzhujun · 877581ed · 590d2519 · 590d2519 · 590d2519
Commit 590d2519 authored Feb 20, 2020 by wangzhujun
833 changed files
--- a/.buildrc.js
+++ b/.buildrc.js
 module.exports = {
+    opn: 0,
    devPort: 8080,
-    opn:0
+    proxy: {
+        '/ngapi/*': 'http://localhost:3000',
+        '/plugin/*': 'http://localhost:3000',
+        '/ngame/*': 'http://localhost:3000',
+        '/activityCommon/*': 'http://localhost:3000',
+        '/ctool/*': 'http://localhost:3000',
+        '/activityVist/*': 'http://localhost:3000',
+        '/collectGoods/*': 'http://localhost:3000',
+        '/activityPlugDrawInfo/*': 'http://localhost:3000',
+        '/collectRule/*': 'http://localhost:3000',
+        '/hdtool/*': 'http://localhost:3000',
+        '/activityPlugin/*': 'http://localhost:3000',
+        '/summer/*': 'http://localhost:3000',
+        '/senstiveword/*': 'http://localhost:3000',
+        '/customActivity/*': 'http://localhost:3000',
+        '/aaw/*': 'http://localhost:3000',
+        '/kjy/*': 'http://localhost:3000',
+        '/aww/*': 'http://localhost:3000',
+        '/activity_winner/*': 'http://localhost:3000',
+        '/signactivity/*': 'http://localhost:3000',
+        '/signpet/*': 'http://localhost:3000',
+        '/projectx/*': 'http://localhost:3000',
+        '/join_4/*': 'http://localhost:3000',
+        '/join_7/*': 'http://localhost:3000',
+        '/join_8/*': 'http://localhost:3000',
+        '/invite_1/*': 'http://localhost:3000'
+    }
 }
\ No newline at end of file
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,4 @@ node_modules
 bin-release
 .DS_Store
 egret/.DS_Store
-**/*/.tmproject
+**/*/.tmproject
\ No newline at end of file
--- a/.history/egret/index copy 2_20200120135807.html
+++ b/.history/egret/index copy 2_20200120135807.html
+<meta charset="utf-8">
+<title>我的咖啡店</title>
+<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="full-screen" content="true" />
+    <meta name="screen-orientation" content="portrait" />
+    <meta name="x5-fullscreen" content="true" />
+    <meta name="360-fullscreen" content="true" />
+<script>var __startTime__ = Date.now()</script>
+
+    <style>
+        html,
+        body {
+            -ms-touch-action: none;
+            background-repeat: no-repeat;
+            background-color: #b96e4f;
+            background-size: 100%;
+            /* background-position: center; */
+            padding: 0;
+            border: 0;
+            margin: 0;
+            height: 100%;
+            width: 100%;
+        }
+    </style>
+
+</head>
+<body>
+  <audio style="display:none;
+            height: 0" id="bgMusic" preload="auto" src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/bg.mp3"
+        loop="loop">
+    </audio>
+   <audio style="display:none;
+                height: 0" id="collectCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/collectCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                    height: 0" id="createCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="createEq" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createEq.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="levelUp" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/levelUp.mp3">
+    </audio>
+
+<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main" data-orientation="auto"
+        data-scale-mode="showAll" data-frame-rate="60" data-content-width="750" data-content-height="1624" data-multi-fingered="2"
+        data-show-fps="false" data-show-log="false" data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
+    </div>
+
+<script>
+  document.addEventListener("visibilitychange", () => {
+
+    if (document.visibilityState == "visible") {
+        if(window["playMusic"]){
+            if(window['isPlayMusic']){
+                window["playMusic"]("bgMusic", true);
+            }
+        }
+    }
+
+    if (document.visibilityState == "hidden") {
+        window["playMusic"]("bgMusic", false);
+    }
+})
+  // oaId 运营配置
+  window['oaId'] = 12321;
+  // appId 运营配置
+  window['appId'] = 123;
+	// projectId 看链接
+  window['projectxId'] = "pe1c5cb75";
+  // 每日领金币    
+  window['takecoins'] = 50000;
+  // 成功邀请奖励金币
+  window['coinsnum']=100000;
+  // 成功邀请奖励钻石
+  window['dianum']=100;
+  // 资源位 图片
+  window["resImg"]='';
+  // 资源位 跳转路径
+  window['resUrl']='';
+  
+  //资源路径
+    var resPath = "https://yun.duiba.com.cn/db_games/activity/weidian1.0/1573812298/";
+
+
+   //record
+    var recordUrl= "/crecord/record";
+
+    function resolve(a) {
+        var b = eval(a);
+        return b;
+    }
+
+      function openRecord(){
+            mqq.ui.openUrl({
+                url:window['recordUrl'],
+                target:1
+            })
+        }
+
+</script>
+<script type="text/javascript" src="https://yun.duiba.com.cn/wawaji/app/meeting/zepto.min.js"></script>
+<script src="https://assets.geilicdn.com/v-components/jsbridge/1.0.1/index.min.js"></script>
+<script>
+            function shareWX(shareCode,uid){
+                var num = Math.floor(Math.random()*3+1);
+                var title = "";
+                var context = "";
+                if(num == 1){
+                    title = "送你200万金币，1分钱包邮换水果";
+                    context = "开微店咖啡店，1分钱包邮水果天天领～";
+                }else if(num == 2){
+                    title = "【邀请函】我开了一家咖啡馆，你不来坐坐？";
+                    context = "送你200万金币，开店兑好礼～";
+                }else if(num == 3){
+                    title = "上微店，200万开店基金待领取！";
+                    context = "来微店咖啡馆，赚营业额兑一分钱包邮水果～";
+                }
+                var param = {"newShare":{"panelList":[{"panelType":1,"desc":"链接分享","content":{"url":"https://h5.weidian.com/m/wdbuyer-hd/coffee-share.html?shareCode="+encodeURIComponent(shareCode)+"&inviteId="+encodeURIComponent(uid),
+                "title":title,"content":context,"imageUrl":"http://yun.duiba.com.cn/db_games/activity/weidian1.0/share.jpg","scene":"1_2_3_4","directScene":"1"}}]}};
+                
+                KDJSBridge2.call(  'WDJSBridge', 'share', param, function( data ) {   } )
+            }
+        function LeaveGame() {
+            var param = {}
+            KDJSBridge2.call('WDJSBridge', 'goBack', function (data) {
+                
+            })
+        }
+</script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/lib2_game.min.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/laochangshajiyi/svga.egret.min1.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1574307217/output.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1573812298/resource/default.thm.js"></script>
+ <script>
+        //音乐自动播放
+        // $(document).ready(function () {
+        //     autoPlayMusic();
+        //     audioAutoPlay();
+        // });
+
+        function audioAutoPlay() {
+            var audio = null;
+            audio = document.getElementById('bgMusic');
+
+            audio.play && audio.play();
+            document.addEventListener("WeixinJSBridgeReady", function () {
+                audio.play();
+            }, false);
+        }
+        // 音乐播放
+        function autoPlayMusic() {
+            // 自动播放音乐效果，解决浏览器或者APP自动播放问题
+            function musicInBrowserHandler() {
+                musicPlay(true);
+                document.body.removeEventListener('touchstart', musicInBrowserHandler);
+            }
+            document.body.addEventListener('touchstart', musicInBrowserHandler);
+            // 自动播放音乐效果，解决微信自动播放问题
+            function musicInWeixinHandler() {
+                musicPlay(true);
+                document.addEventListener("WeixinJSBridgeReady", function () {
+                    musicPlay(true);
+                }, false);
+                document.removeEventListener('DOMContentLoaded', musicInWeixinHandler);
+            }
+            document.addEventListener('DOMContentLoaded', musicInWeixinHandler);
+        }
+
+
+
+        function playMusic(id = "bgMusic", isPlay = true, isLoop = true) {
+            var media = document.getElementById(id);
+            if (isPlay) {
+                media.load();
+                if (media.paused) {
+                    if (isLoop) {
+                        media.play();
+                    } else {
+                        media.play(1)
+                    }
+                } else {
+                    if (isLoop) {
+                        media.pause();
+                        media.play();
+                    } else {
+                        media.pause();
+                        media.play(1);
+                    }
+                }
+            }
+            if (!isPlay && !media.paused) {
+                media.pause();
+            }
+        }
+    </script>
+  <script>
+ egret.ImageLoader.crossOrigin = "anonymous";
+        /**
+             * {
+             * "renderMode":, //Engine rendering mode, "canvas" or "webgl"
+             * "audioType": 0 //Use the audio type, 0: default, 2: web audio, 3: audio
+             * "antialias": //Whether the anti-aliasing is enabled in WebGL mode, true: on, false: off, defaults to false
+             * "calculateCanvasScaleFactor": //a function return canvas scale factor
+             * }
+             **/
+        egret.runEgret({
+            renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor: function (context) {
+                var backingStore = context.backingStorePixelRatio ||
+                    context.webkitBackingStorePixelRatio ||
+                    context.mozBackingStorePixelRatio ||
+                    context.msBackingStorePixelRatio ||
+                    context.oBackingStorePixelRatio ||
+                    context.backingStorePixelRatio || 1;
+                return (window.devicePixelRatio || 1) / backingStore;
+            }
+        });
+    </script>
\ No newline at end of file
--- a/.history/egret/index copy 2_20200120135846.html
+++ b/.history/egret/index copy 2_20200120135846.html
+<meta charset="utf-8">
+<title>我的咖啡店</title>
+<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="full-screen" content="true" />
+    <meta name="screen-orientation" content="portrait" />
+    <meta name="x5-fullscreen" content="true" />
+    <meta name="360-fullscreen" content="true" />
+<script>var __startTime__ = Date.now()</script>
+
+    <style>
+        html,
+        body {
+            -ms-touch-action: none;
+            background-repeat: no-repeat;
+            background-color: #b96e4f;
+            background-size: 100%;
+            /* background-position: center; */
+            padding: 0;
+            border: 0;
+            margin: 0;
+            height: 100%;
+            width: 100%;
+        }
+    </style>
+
+</head>
+<body>
+  <audio style="display:none;
+            height: 0" id="bgMusic" preload="auto" src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/bg.mp3"
+        loop="loop">
+    </audio>
+   <audio style="display:none;
+                height: 0" id="collectCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/collectCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                    height: 0" id="createCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="createEq" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createEq.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="levelUp" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/levelUp.mp3">
+    </audio>
+
+<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main" data-orientation="auto"
+        data-scale-mode="showAll" data-frame-rate="60" data-content-width="750" data-content-height="1624" data-multi-fingered="2"
+        data-show-fps="false" data-show-log="false" data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
+    </div>
+
+<script>
+  document.addEventListener("visibilitychange", () => {
+
+    if (document.visibilityState == "visible") {
+        if(window["playMusic"]){
+            if(window['isPlayMusic']){
+                window["playMusic"]("bgMusic", true);
+            }
+        }
+    }
+
+    if (document.visibilityState == "hidden") {
+        window["playMusic"]("bgMusic", false);
+    }
+})
+ 
+  function getQueryVariable(variable)
+  {
+         var query = window.location.search.substring(1);
+         var vars = query.split("&");
+         for (var i=0;i<vars.length;i++) {
+                 var pair = vars[i].split("=");
+                 if(pair[0] == variable){return pair[1];}
+         }
+         return(false);
+  }
+  
+  // appId 运营配置
+  if(getQueryVariable("appID")){
+      window['appId'] = getQueryVariable("appID");   
+  }else{
+      window['appId'] = "66114";                                   
+  }                                   
+  
+	// projectId 看链接
+  if(window.location.pathname.match(new RegExp("/projectx/(\\S+)/index(\\S+)","g"))){
+       window['projectxId']=window.location.pathname.replace(new RegExp("/projectx/(\\S+)/index(\\S+)","g"),"$1");
+       // oaId 运营配置
+  		 window['oaId'] = window['projectxId'];
+  }else{
+       window['projectxId'] = "p77f14047";
+       // oaId 运营配置
+       window['oaId'] = 12321;
+  }
+                                         
+  // 每日领金币    
+  window['takecoins'] = 150000;
+  // 成功邀请奖励金币
+  window['coinsnum']=100000;
+  // 成功邀请奖励钻石
+  window['dianum']=100;
+  // 资源位 图片
+  window["resImg"]='';
+  // 资源位 跳转路径
+  window['resUrl']='';
+  
+  //资源路径
+    var resPath = "https://yun.duiba.com.cn/db_games/activity/weidian1.0/1578897290/";
+
+
+   //record
+    var recordUrl= "/crecord/record";
+
+    function resolve(a) {
+        var b = eval(a);
+        return b;
+    }
+
+      function openRecord(){
+            mqq.ui.openUrl({
+                url:window['recordUrl'],
+                target:1
+            })
+        }
+
+</script>
+<script type="text/javascript" src="https://yun.duiba.com.cn/wawaji/app/meeting/zepto.min.js"></script>
+<script src="https://assets.geilicdn.com/v-components/jsbridge/1.0.1/index.min.js"></script>
+<script>
+            function shareWX(shareCode,uid){
+                var num = Math.floor(Math.random()*3+1);
+                var title = "";
+                var context = "";
+                if(num == 1){
+                    title = "送你200万金币，1分钱包邮换水果";
+                    context = "开微店咖啡店，1分钱包邮水果天天领～";
+                }else if(num == 2){
+                    title = "【邀请函】我开了一家咖啡馆，你不来坐坐？";
+                    context = "送你200万金币，开店兑好礼～";
+                }else if(num == 3){
+                    title = "上微店，200万开店基金待领取！";
+                    context = "来微店咖啡馆，赚营业额兑一分钱包邮水果～";
+                }
+                var param = {"newShare":{"panelList":[{"panelType":1,"desc":"链接分享","content":{"url":"https://www.91ruyu.com/h/wdbuyer-hd/coffee-share.html?auth=4HndANsAaNQG1AneZN27nvTGLr7k&shareCode="+encodeURIComponent(shareCode)+"&inviteId="+encodeURIComponent(uid),
+                "title":title,"content":context,"imageUrl":"http://yun.duiba.com.cn/db_games/activity/weidian1.0/share.jpg","scene":"1_2_3_4","directScene":"1"}}]}};
+                
+                KDJSBridge2.call(  'WDJSBridge', 'share', param, function( data ) {   } )
+            }
+        function LeaveGame() {
+            var param = {}
+            KDJSBridge2.call('WDJSBridge', 'goBack', function (data) {
+                
+            })
+        }
+</script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/lib2_game.min.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/laochangshajiyi/svga.egret.min1.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1579424039/output.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1578897290/resource/default.thm.js"></script>
+ <script>
+        //音乐自动播放
+        // $(document).ready(function () {
+        //     autoPlayMusic();
+        //     audioAutoPlay();
+        // });
+
+        function audioAutoPlay() {
+            var audio = null;
+            audio = document.getElementById('bgMusic');
+
+            audio.play && audio.play();
+            document.addEventListener("WeixinJSBridgeReady", function () {
+                audio.play();
+            }, false);
+        }
+        // 音乐播放
+        function autoPlayMusic() {
+            // 自动播放音乐效果，解决浏览器或者APP自动播放问题
+            function musicInBrowserHandler() {
+                musicPlay(true);
+                document.body.removeEventListener('touchstart', musicInBrowserHandler);
+            }
+            document.body.addEventListener('touchstart', musicInBrowserHandler);
+            // 自动播放音乐效果，解决微信自动播放问题
+            function musicInWeixinHandler() {
+                musicPlay(true);
+                document.addEventListener("WeixinJSBridgeReady", function () {
+                    musicPlay(true);
+                }, false);
+                document.removeEventListener('DOMContentLoaded', musicInWeixinHandler);
+            }
+            document.addEventListener('DOMContentLoaded', musicInWeixinHandler);
+        }
+
+
+
+        function playMusic(id = "bgMusic", isPlay = true, isLoop = true) {
+            var media = document.getElementById(id);
+            if (isPlay) {
+                media.load();
+                if (media.paused) {
+                    if (isLoop) {
+                        media.play();
+                    } else {
+                        media.play(1)
+                    }
+                } else {
+                    if (isLoop) {
+                        media.pause();
+                        media.play();
+                    } else {
+                        media.pause();
+                        media.play(1);
+                    }
+                }
+            }
+            if (!isPlay && !media.paused) {
+                media.pause();
+            }
+        }
+    </script>
+  <script>
+ egret.ImageLoader.crossOrigin = "anonymous";
+        /**
+             * {
+             * "renderMode":, //Engine rendering mode, "canvas" or "webgl"
+             * "audioType": 0 //Use the audio type, 0: default, 2: web audio, 3: audio
+             * "antialias": //Whether the anti-aliasing is enabled in WebGL mode, true: on, false: off, defaults to false
+             * "calculateCanvasScaleFactor": //a function return canvas scale factor
+             * }
+             **/
+        egret.runEgret({
+            renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor: function (context) {
+                var backingStore = context.backingStorePixelRatio ||
+                    context.webkitBackingStorePixelRatio ||
+                    context.mozBackingStorePixelRatio ||
+                    context.msBackingStorePixelRatio ||
+                    context.oBackingStorePixelRatio ||
+                    context.backingStorePixelRatio || 1;
+                return (window.devicePixelRatio || 1) / backingStore;
+            }
+        });
+    </script>
\ No newline at end of file
--- a/.history/egret/index copy 3_20200120135847.html
+++ b/.history/egret/index copy 3_20200120135847.html
+<meta charset="utf-8">
+<title>我的咖啡店</title>
+<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="full-screen" content="true" />
+    <meta name="screen-orientation" content="portrait" />
+    <meta name="x5-fullscreen" content="true" />
+    <meta name="360-fullscreen" content="true" />
+<script>var __startTime__ = Date.now()</script>
+
+    <style>
+        html,
+        body {
+            -ms-touch-action: none;
+            background-repeat: no-repeat;
+            background-color: #b96e4f;
+            background-size: 100%;
+            /* background-position: center; */
+            padding: 0;
+            border: 0;
+            margin: 0;
+            height: 100%;
+            width: 100%;
+        }
+    </style>
+
+</head>
+<body>
+  <audio style="display:none;
+            height: 0" id="bgMusic" preload="auto" src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/bg.mp3"
+        loop="loop">
+    </audio>
+   <audio style="display:none;
+                height: 0" id="collectCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/collectCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                    height: 0" id="createCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="createEq" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createEq.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="levelUp" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/levelUp.mp3">
+    </audio>
+
+<div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main" data-orientation="auto"
+        data-scale-mode="showAll" data-frame-rate="60" data-content-width="750" data-content-height="1624" data-multi-fingered="2"
+        data-show-fps="false" data-show-log="false" data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
+    </div>
+
+<script>
+  document.addEventListener("visibilitychange", () => {
+
+    if (document.visibilityState == "visible") {
+        if(window["playMusic"]){
+            if(window['isPlayMusic']){
+                window["playMusic"]("bgMusic", true);
+            }
+        }
+    }
+
+    if (document.visibilityState == "hidden") {
+        window["playMusic"]("bgMusic", false);
+    }
+})
+ 
+  function getQueryVariable(variable)
+  {
+         var query = window.location.search.substring(1);
+         var vars = query.split("&");
+         for (var i=0;i<vars.length;i++) {
+                 var pair = vars[i].split("=");
+                 if(pair[0] == variable){return pair[1];}
+         }
+         return(false);
+  }
+  
+  // appId 运营配置
+  if(getQueryVariable("appID")){
+      window['appId'] = getQueryVariable("appID");   
+  }else{
+      window['appId'] = "66114";                                   
+  }                                   
+  
+	// projectId 看链接
+  if(window.location.pathname.match(new RegExp("/projectx/(\\S+)/index(\\S+)","g"))){
+       window['projectxId']=window.location.pathname.replace(new RegExp("/projectx/(\\S+)/index(\\S+)","g"),"$1");
+       // oaId 运营配置
+  		 window['oaId'] = window['projectxId'];
+  }else{
+       window['projectxId'] = "p77f14047";
+       // oaId 运营配置
+       window['oaId'] = 12321;
+  }
+                                         
+  // 每日领金币    
+  window['takecoins'] = 150000;
+  // 成功邀请奖励金币
+  window['coinsnum']=100000;
+  // 成功邀请奖励钻石
+  window['dianum']=100;
+  // 资源位 图片
+  window["resImg"]='';
+  // 资源位 跳转路径
+  window['resUrl']='';
+  
+  //资源路径
+    var resPath = "https://yun.duiba.com.cn/db_games/activity/weidian1.0/1578897290/";
+
+
+   //record
+    var recordUrl= "/crecord/record";
+
+    function resolve(a) {
+        var b = eval(a);
+        return b;
+    }
+
+      function openRecord(){
+            mqq.ui.openUrl({
+                url:window['recordUrl'],
+                target:1
+            })
+        }
+
+</script>
+<script type="text/javascript" src="https://yun.duiba.com.cn/wawaji/app/meeting/zepto.min.js"></script>
+<script src="https://assets.geilicdn.com/v-components/jsbridge/1.0.1/index.min.js"></script>
+<script>
+            function shareWX(shareCode,uid){
+                var num = Math.floor(Math.random()*3+1);
+                var title = "";
+                var context = "";
+                if(num == 1){
+                    title = "送你200万金币，1分钱包邮换水果";
+                    context = "开微店咖啡店，1分钱包邮水果天天领～";
+                }else if(num == 2){
+                    title = "【邀请函】我开了一家咖啡馆，你不来坐坐？";
+                    context = "送你200万金币，开店兑好礼～";
+                }else if(num == 3){
+                    title = "上微店，200万开店基金待领取！";
+                    context = "来微店咖啡馆，赚营业额兑一分钱包邮水果～";
+                }
+                var param = {"newShare":{"panelList":[{"panelType":1,"desc":"链接分享","content":{"url":"https://www.91ruyu.com/h/wdbuyer-hd/coffee-share.html?auth=4HndANsAaNQG1AneZN27nvTGLr7k&shareCode="+encodeURIComponent(shareCode)+"&inviteId="+encodeURIComponent(uid),
+                "title":title,"content":context,"imageUrl":"http://yun.duiba.com.cn/db_games/activity/weidian1.0/share.jpg","scene":"1_2_3_4","directScene":"1"}}]}};
+                
+                KDJSBridge2.call(  'WDJSBridge', 'share', param, function( data ) {   } )
+            }
+        function LeaveGame() {
+            var param = {}
+            KDJSBridge2.call('WDJSBridge', 'goBack', function (data) {
+                
+            })
+        }
+</script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/lib2_game.min.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/laochangshajiyi/svga.egret.min1.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1579424039/output.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1578897290/resource/default.thm.js"></script>
+ <script>
+        //音乐自动播放
+        // $(document).ready(function () {
+        //     autoPlayMusic();
+        //     audioAutoPlay();
+        // });
+
+        function audioAutoPlay() {
+            var audio = null;
+            audio = document.getElementById('bgMusic');
+
+            audio.play && audio.play();
+            document.addEventListener("WeixinJSBridgeReady", function () {
+                audio.play();
+            }, false);
+        }
+        // 音乐播放
+        function autoPlayMusic() {
+            // 自动播放音乐效果，解决浏览器或者APP自动播放问题
+            function musicInBrowserHandler() {
+                musicPlay(true);
+                document.body.removeEventListener('touchstart', musicInBrowserHandler);
+            }
+            document.body.addEventListener('touchstart', musicInBrowserHandler);
+            // 自动播放音乐效果，解决微信自动播放问题
+            function musicInWeixinHandler() {
+                musicPlay(true);
+                document.addEventListener("WeixinJSBridgeReady", function () {
+                    musicPlay(true);
+                }, false);
+                document.removeEventListener('DOMContentLoaded', musicInWeixinHandler);
+            }
+            document.addEventListener('DOMContentLoaded', musicInWeixinHandler);
+        }
+
+
+
+        function playMusic(id = "bgMusic", isPlay = true, isLoop = true) {
+            var media = document.getElementById(id);
+            if (isPlay) {
+                media.load();
+                if (media.paused) {
+                    if (isLoop) {
+                        media.play();
+                    } else {
+                        media.play(1)
+                    }
+                } else {
+                    if (isLoop) {
+                        media.pause();
+                        media.play();
+                    } else {
+                        media.pause();
+                        media.play(1);
+                    }
+                }
+            }
+            if (!isPlay && !media.paused) {
+                media.pause();
+            }
+        }
+    </script>
+  <script>
+ egret.ImageLoader.crossOrigin = "anonymous";
+        /**
+             * {
+             * "renderMode":, //Engine rendering mode, "canvas" or "webgl"
+             * "audioType": 0 //Use the audio type, 0: default, 2: web audio, 3: audio
+             * "antialias": //Whether the anti-aliasing is enabled in WebGL mode, true: on, false: off, defaults to false
+             * "calculateCanvasScaleFactor": //a function return canvas scale factor
+             * }
+             **/
+        egret.runEgret({
+            renderMode: "webgl", audioType: 0, calculateCanvasScaleFactor: function (context) {
+                var backingStore = context.backingStorePixelRatio ||
+                    context.webkitBackingStorePixelRatio ||
+                    context.mozBackingStorePixelRatio ||
+                    context.msBackingStorePixelRatio ||
+                    context.oBackingStorePixelRatio ||
+                    context.backingStorePixelRatio || 1;
+                return (window.devicePixelRatio || 1) / backingStore;
+            }
+        });
+    </script>
\ No newline at end of file
--- a/.history/egret/index copy 3_20200120135935.html
+++ b/.history/egret/index copy 3_20200120135935.html
+<!DOCTYPE HTML>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>我的咖啡店</title>
+    <meta name="viewport"
+        content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no" />
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="full-screen" content="true" />
+    <meta name="screen-orientation" content="portrait" />
+    <meta name="x5-fullscreen" content="true" />
+    <meta name="360-fullscreen" content="true" />
+    <script>
+        var __startTime__ = Date.now()
+    </script>
+
+    <style>
+        html,
+        body {
+            -ms-touch-action: none;
+            background-repeat: no-repeat;
+            background-color: #b96e4f;
+            background-size: 100%;
+            /* background-position: center; */
+            padding: 0;
+            border: 0;
+            margin: 0;
+            height: 100%;
+            width: 100%;
+        }
+    </style>
+
+</head>
+
+<body>
+    <audio style="display:none;
+            height: 0" id="bgMusic" preload="auto" src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/bg.mp3"
+        loop="loop">
+    </audio>
+    <audio style="display:none;
+                height: 0" id="collectCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/collectCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                    height: 0" id="createCoins" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createCoins.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="createEq" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/createEq.mp3">
+    </audio>
+    <audio style="display:none;
+                        height: 0" id="levelUp" preload="auto"
+        src="https://yun.duiba.com.cn/db_games/activity/weidian1.0/levelUp.mp3">
+    </audio>
+
+    <div style="margin: auto;width: 100%;height: 100%;" class="egret-player" data-entry-class="Main"
+        data-orientation="auto" data-scale-mode="showAll" data-frame-rate="60" data-content-width="750"
+        data-content-height="1624" data-multi-fingered="2" data-show-fps="false" data-show-log="false"
+        data-show-fps-style="x:0,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
+    </div>
+
+    <script>
+        document.addEventListener("visibilitychange", () => {
+
+            if (document.visibilityState == "visible") {
+                if (window["playMusic"]) {
+                    if (window['isPlayMusic']) {
+                        window["playMusic"]("bgMusic", true);
+                    }
+                }
+            }
+
+            if (document.visibilityState == "hidden") {
+                window["playMusic"]("bgMusic", false);
+            }
+        })
+        // oaId 运营配置
+        window['oaId'] = "pa19e64bc";
+        // appId 运营配置
+        window['appId'] = 66114;
+        // projectId 看链接
+        window['projectxId'] = "pa19e64bc";
+        // 每日领金币    
+        window['takecoins'] = 150000;
+        // 成功邀请奖励金币
+        window['coinsnum'] = 100000;
+        // 成功邀请奖励钻石
+        window['dianum'] = 100;
+        // 资源位 图片
+        window["resImg"] = '';
+        // 资源位 跳转路径
+        window['resUrl'] = '';
+
+        //资源路径
+        var resPath = "https://yun.duiba.com.cn/db_games/activity/weidian1.0/1575624666/";
+
+
+        //record
+        var recordUrl = "/crecord/record";
+
+        function resolve(a) {
+            var b = eval(a);
+            return b;
+        }
+
+        function openRecord() {
+            mqq.ui.openUrl({
+                url: window['recordUrl'],
+                target: 1
+            })
+        }
+    </script>
+    <script type="text/javascript" src="https://yun.duiba.com.cn/wawaji/app/meeting/zepto.min.js"></script>
+    <script src="https://assets.geilicdn.com/v-components/jsbridge/1.0.1/index.min.js"></script>
+    <script>
+        function shareWX(shareCode, uid) {
+            var num = Math.floor(Math.random() * 3 + 1);
+            var title = "";
+            var context = "";
+            if (num == 1) {
+                title = "送你200万金币，1分钱包邮换水果";
+                context = "开微店咖啡店，1分钱包邮水果天天领～";
+            } else if (num == 2) {
+                title = "【邀请函】我开了一家咖啡馆，你不来坐坐？";
+                context = "送你200万金币，开店兑好礼～";
+            } else if (num == 3) {
+                title = "上微店，200万开店基金待领取！";
+                context = "来微店咖啡馆，赚营业额兑一分钱包邮水果～";
+            }
+            var param = {
+                "newShare": {
+                    "panelList": [{
+                        "panelType": 1,
+                        "desc": "链接分享",
+                        "content": {
+                            "url": "https://www.91ruyu.com/h/wdbuyer-hd/coffee-share.html?shareCode=" +
+                                encodeURIComponent(shareCode) + "&inviteId=" + encodeURIComponent(uid),
+                            "title": title,
+                            "content": context,
+                            "imageUrl": "http://yun.duiba.com.cn/db_games/activity/weidian1.0/share.jpg",
+                            "scene": "1_2_3_4",
+                            "directScene": "1"
+                        }
+                    }]
+                }
+            };
+
+            KDJSBridge2.call('WDJSBridge', 'share', param, function (data) {})
+        }
+
+        function LeaveGame() {
+            var param = {}
+            KDJSBridge2.call('WDJSBridge', 'goBack', function (data) {
+
+            })
+        }
+    </script>
+    <script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/lib2_game.min.js"></script>
+    <script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/laochangshajiyi/svga.egret.min1.js">
+    </script>
+    <script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1575859056/output2.js"></script>
+    <script crossorigin="anonymous"
+        src="//yun.duiba.com.cn/db_games/activity/weidian1.0/1575624666/resource/default.thm.js"></script>
+    <script>
+        //音乐自动播放
+        // $(document).ready(function () {
+        //     autoPlayMusic();
+        //     audioAutoPlay();
+        // });
+
+        function audioAutoPlay() {
+            var audio = null;
+            audio = document.getElementById('bgMusic');
+
+            audio.play && audio.play();
+            document.addEventListener("WeixinJSBridgeReady", function () {
+                audio.play();
+            }, false);
+        }
+        // 音乐播放
+        function autoPlayMusic() {
+            // 自动播放音乐效果，解决浏览器或者APP自动播放问题
+            function musicInBrowserHandler() {
+                musicPlay(true);
+                document.body.removeEventListener('touchstart', musicInBrowserHandler);
+            }
+            document.body.addEventListener('touchstart', musicInBrowserHandler);
+            // 自动播放音乐效果，解决微信自动播放问题
+            function musicInWeixinHandler() {
+                musicPlay(true);
+                document.addEventListener("WeixinJSBridgeReady", function () {
+                    musicPlay(true);
+                }, false);
+                document.removeEventListener('DOMContentLoaded', musicInWeixinHandler);
+            }
+            document.addEventListener('DOMContentLoaded', musicInWeixinHandler);
+        }
+
+
+
+        function playMusic(id = "bgMusic", isPlay = true, isLoop = true) {
+            var media = document.getElementById(id);
+            if (isPlay) {
+                media.load();
+                if (media.paused) {
+                    if (isLoop) {
+                        media.play();
+                    } else {
+                        media.play(1)
+                    }
+                } else {
+                    if (isLoop) {
+                        media.pause();
+                        media.play();
+                    } else {
+                        media.pause();
+                        media.play(1);
+                    }
+                }
+            }
+            if (!isPlay && !media.paused) {
+                media.pause();
+            }
+        }
+    </script>
+    <script>
+        egret.ImageLoader.crossOrigin = "anonymous";
+        /**
+         * {
+         * "renderMode":, //Engine rendering mode, "canvas" or "webgl"
+         * "audioType": 0 //Use the audio type, 0: default, 2: web audio, 3: audio
+         * "antialias": //Whether the anti-aliasing is enabled in WebGL mode, true: on, false: off, defaults to false
+         * "calculateCanvasScaleFactor": //a function return canvas scale factor
+         * }
+         **/
+        egret.runEgret({
+            renderMode: "webgl",
+            audioType: 0,
+            calculateCanvasScaleFactor: function (context) {
+                var backingStore = context.backingStorePixelRatio ||
+                    context.webkitBackingStorePixelRatio ||
+                    context.mozBackingStorePixelRatio ||
+                    context.msBackingStorePixelRatio ||
+                    context.oBackingStorePixelRatio ||
+                    context.backingStorePixelRatio || 1;
+                return (window.devicePixelRatio || 1) / backingStore;
+            }
+        });
+    </script>
+</body>
+
+</html>
\ No newline at end of file
--- a/.history/egret/index copy 3_20200120140431.html
+++ b/.history/egret/index copy 3_20200120140431.html
--- a/.history/egret/src/Gift/ExchangeItemConfig_20200107164109.ts
+++ b/.history/egret/src/Gift/ExchangeItemConfig_20200107164109.ts
+export enum ExchangeItemConfigs {
+    "sss_1" = "https://weidian.com/item.html?itemID=2564848352&wfr=xiaoyouxi",
+    "sss_2" = "https://weidian.com/item.html?itemID=2900881621&wfr=xiaoyouxi",
+    "sss_3" = "https://weidian.com/item.html?itemID=1986494919&wfr=xiaoyouxi",
+    "sss_4" = "https://weidian.com/item.html?itemID=2531384591&wfr=xiaoyouxi",
+    "sss_5" = "https://weidian.com/item.html?itemID=2536177783&wfr=xiaoyouxi",
+    "sss_6" = "https://weidian.com/item.html?itemID=3158915290&wfr=xiaoyouxi",
+    "sss_7" = "https://weidian.com/item.html?itemID=3158362111&wfr=xiaoyouxi",
+    "sss_8" = "https://weidian.com/item.html?itemID=3158379679&wfr=xiaoyouxi",
+    "sss_9" = "https://weidian.com/item.html?itemID=2228953424&wfr=xiaoyouxi",
+    "sss_10" = "https://weidian.com/item.html?itemID=2229003242&wfr=xiaoyouxi",
+    "sss_11" = "https://weidian.com/item.html?itemID=1832466037&wfr=xiaoyouxi",
+    "sss_12" = "https://weidian.com/item.html?itemID=3069445217&wfr=xiaoyouxi",
+    "sss_13" = "https://weidian.com/item.html?itemID=3159030916&wfr=xiaoyouxi",
+    "sss_14" = "https://weidian.com/item.html?itemID=3158542801&wfr=xiaoyouxi",
+    "sss_15" = "https://weidian.com/item.html?itemID=3020644865&wfr=xiaoyouxi",
+    "sss_16" = "https://weidian.com/item.html?itemID=2765373546&wfr=xiaoyouxi",
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/.history/egret/src/Gift/ExchangeItemConfig_20200119165336.ts
+++ b/.history/egret/src/Gift/ExchangeItemConfig_20200119165336.ts
+export enum ExchangeItemConfigs {
+    "sss_1" = "https://weidian.com/item.html?itemID=2564848352&wfr=xiaoyouxi",
+    "sss_2" = "https://weidian.com/item.html?itemID=2900881621&wfr=xiaoyouxi",
+    "sss_3" = "https://weidian.com/item.html?itemID=1986494919&wfr=xiaoyouxi",
+    "sss_4" = "https://weidian.com/item.html?itemID=2531384591&wfr=xiaoyouxi",
+    "sss_5" = "https://weidian.com/item.html?itemID=2536177783&wfr=xiaoyouxi",
+    "sss_6" = "https://weidian.com/item.html?itemID=3158915290&wfr=xiaoyouxi",
+    "sss_7" = "https://weidian.com/item.html?itemID=3158362111&wfr=xiaoyouxi",
+    "sss_8" = "https://weidian.com/item.html?itemID=3158379679&wfr=xiaoyouxi",
+    "sss_9" = "https://weidian.com/item.html?itemID=2228953424&wfr=xiaoyouxi",
+    "sss_10" = "https://weidian.com/item.html?itemID=2229003242&wfr=xiaoyouxi",
+    "sss_11" = "https://weidian.com/item.html?itemID=1832466037&wfr=xiaoyouxi",
+    "sss_12" = "https://weidian.com/item.html?itemID=3069445217&wfr=xiaoyouxi",
+    "sss_13" = "https://weidian.com/item.html?itemID=3159030916&wfr=xiaoyouxi",
+    "sss_14" = "https://weidian.com/item.html?itemID=3158542801&wfr=xiaoyouxi",
+    "sss_15" = "https://weidian.com/item.html?itemID=3020644865&wfr=xiaoyouxi",
+    "sss_16" = "https://weidian.com/item.html?itemID=2765373546&wfr=xiaoyouxi",
+    "sss_17" = "https://weidian.com/item.html?itemID=2226029165&wfr=xiaoyouxi",
+    "sss_18" = "https://weidian.com/item.html?itemID=3294877929&wfr=xiaoyouxi",
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
--- a/.history/egret/src/pop/TaskPanel_20200107164109.ts
+++ b/.history/egret/src/pop/TaskPanel_20200107164109.ts
--- a/.history/egret/src/pop/TaskPanel_20200107190503.ts
+++ b/.history/egret/src/pop/TaskPanel_20200107190503.ts
--- a/.history/egret/src/pop/TaskPanel_20200107191830.ts
+++ b/.history/egret/src/pop/TaskPanel_20200107191830.ts
--- a/.history/egret/src/pop/TaskPanel_20200107191836.ts
+++ b/.history/egret/src/pop/TaskPanel_20200107191836.ts
--- a/.history/egret/src/pop/TaskPanel_20200107192148.ts
+++ b/.history/egret/src/pop/TaskPanel_20200107192148.ts
--- a/.history/egret/src/pop/TaskPanel_20200108093430.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108093430.ts
--- a/.history/egret/src/pop/TaskPanel_20200108093535.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108093535.ts
--- a/.history/egret/src/pop/TaskPanel_20200108094339.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108094339.ts
--- a/.history/egret/src/pop/TaskPanel_20200108100020.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108100020.ts
--- a/.history/egret/src/pop/TaskPanel_20200108100214.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108100214.ts
--- a/.history/egret/src/pop/TaskPanel_20200108101020.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108101020.ts
--- a/.history/egret/src/pop/TaskPanel_20200108101420.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108101420.ts
--- a/.history/egret/src/pop/TaskPanel_20200108101429.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108101429.ts
--- a/.history/egret/src/pop/TaskPanel_20200108101750.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108101750.ts
--- a/.history/egret/src/pop/TaskPanel_20200108114044.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108114044.ts
--- a/.history/egret/src/pop/TaskPanel_20200108114052.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108114052.ts
--- a/.history/egret/src/pop/TaskPanel_20200108114320.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108114320.ts
--- a/.history/egret/src/pop/TaskPanel_20200108133739.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108133739.ts
--- a/.history/egret/src/pop/TaskPanel_20200108154413.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108154413.ts
--- a/.history/egret/src/pop/TaskPanel_20200108155404.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108155404.ts
--- a/.history/egret/src/pop/TaskPanel_20200108155906.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108155906.ts
--- a/.history/egret/src/pop/TaskPanel_20200108160057.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108160057.ts
--- a/.history/egret/src/pop/TaskPanel_20200108160440.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108160440.ts
--- a/.history/egret/src/pop/TaskPanel_20200108160656.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108160656.ts
--- a/.history/egret/src/pop/TaskPanel_20200108160944.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108160944.ts
--- a/.history/egret/src/pop/TaskPanel_20200108161022.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108161022.ts
--- a/.history/egret/src/pop/TaskPanel_20200108161458.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108161458.ts
--- a/.history/egret/src/pop/TaskPanel_20200108172230.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108172230.ts
--- a/.history/egret/src/pop/TaskPanel_20200108172304.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108172304.ts
--- a/.history/egret/src/pop/TaskPanel_20200108194048.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108194048.ts
--- a/.history/egret/src/pop/TaskPanel_20200108194243.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108194243.ts
--- a/.history/egret/src/pop/TaskPanel_20200108194626.ts
+++ b/.history/egret/src/pop/TaskPanel_20200108194626.ts
--- a/.history/egret/src/pop/TaskPanel_20200109143402.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109143402.ts
--- a/.history/egret/src/pop/TaskPanel_20200109143616.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109143616.ts
--- a/.history/egret/src/pop/TaskPanel_20200109144024.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109144024.ts
--- a/.history/egret/src/pop/TaskPanel_20200109150416.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109150416.ts
--- a/.history/egret/src/pop/TaskPanel_20200109150852.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109150852.ts
--- a/.history/egret/src/pop/TaskPanel_20200109151145.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109151145.ts
--- a/.history/egret/src/pop/TaskPanel_20200109151354.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109151354.ts
--- a/.history/egret/src/pop/TaskPanel_20200109185142.ts
+++ b/.history/egret/src/pop/TaskPanel_20200109185142.ts
--- a/.history/egret/src/pop/TaskPanel_20200113190816.ts
+++ b/.history/egret/src/pop/TaskPanel_20200113190816.ts
--- a/.history/egret/src/pop/TaskPanel_20200119151431.ts
+++ b/.history/egret/src/pop/TaskPanel_20200119151431.ts
--- a/.history/mock/config_20200107164109.js
+++ b/.history/mock/config_20200107164109.js
--- a/.history/mock/config_20200108193548.js
+++ b/.history/mock/config_20200108193548.js
--- a/.history/mock/config_20200108195205.js
+++ b/.history/mock/config_20200108195205.js
--- a/.history/mock/weidian/getTaskInfo_20200107164109.json
+++ b/.history/mock/weidian/getTaskInfo_20200107164109.json
+{
+    "code": null,
+    "data": {
+        "browseTask": {
+            "coins": 2000,
+            "completed": 0,
+            "diamonds": 0,
+            "exp": 0,
+            "status": 0,
+            "unclaimed": 0,
+            "url": "https://baidu.com"
+        },
+        "dayInfos": [{
+                "diamonds": 0,
+                "coins": 500000,
+                "sign": true,
+                "exp": 1000
+            },
+            {
+                "diamonds": 0,
+                "coins": 750000,
+                "sign": true,
+                "exp": 1000
+            },
+            {
+                "diamonds": 0,
+                "coins": 1000000,
+                "sign": true,
+                "exp": 1000
+            },
+            {
+                "diamonds": 0,
+                "coins": 1250000,
+                "sign": false,
+                "exp": 1000
+            },
+            {
+                "diamonds": 100,
+                "coins": 0,
+                "sign": false,
+                "exp": 1000
+            }
+        ],
+        "downloadTask": {
+            "coins": 1000000,
+            "completed": 0,
+            "diamonds": 50000,
+            "exp": 0,
+            "status": 0,
+            "unclaimed": 0,
+            "url": "https://h5.weidian.com/m/wdbuyer-hd/coffee-share.html"
+        },
+        "openShopTask": {
+            "coins": 300000,
+            "completed": 0,
+            "diamonds": 30,
+            "exp": 0,
+            "status": 0,
+            "unclaimed": 0,
+            "url": null
+        },
+        "orderTask": {
+            "coins": 500000,
+            "completed": 0,
+            "diamonds": 1000,
+            "exp": 0,
+            "status": 0,
+            "unclaimed": 0,
+            "url": "https://weidian.com/item.html?itemID=2830709760&wfr=cafegamebuytask&spider_token=4ad7"
+        },
+        "shareTask": {
+            "coins": 50000000,
+            "completed": null,
+            "diamonds": 0,
+            "exp": 1000,
+            "status": 1,
+            "unclaimed": null,
+            "url": null
+        },
+        "sign": false,
+        "takeCoinsTask": {
+            "takeSign": false,
+            "nextTakeTime": 1569301200000
+        },
+        "unclaimed": true
+    },
+    "message": null,
+    "success": true
+}
\ No newline at end of file
--- a/.history/mock/weidian/getTaskInfo_20200107192028.json
+++ b/.history/mock/weidian/getTaskInfo_20200107192028.json
--- a/.history/mock/weidian/getTaskInfo_20200107192044.json
+++ b/.history/mock/weidian/getTaskInfo_20200107192044.json
--- a/.history/mock/weidian/getTaskInfo_20200107192242.json
+++ b/.history/mock/weidian/getTaskInfo_20200107192242.json
--- a/.history/mock/weidian/getTaskInfo_20200108093308.json
+++ b/.history/mock/weidian/getTaskInfo_20200108093308.json
--- a/.history/mock/weidian/getTaskInfo_20200108093812.json
+++ b/.history/mock/weidian/getTaskInfo_20200108093812.json
--- a/.history/mock/weidian/getTaskInfo_20200108094417.json
+++ b/.history/mock/weidian/getTaskInfo_20200108094417.json
--- a/.history/mock/weidian/getTaskInfo_20200108100927.json
+++ b/.history/mock/weidian/getTaskInfo_20200108100927.json
--- a/.history/mock/weidian/getTaskInfo_20200108101042.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101042.json
--- a/.history/mock/weidian/getTaskInfo_20200108101118.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101118.json
--- a/.history/mock/weidian/getTaskInfo_20200108101145.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101145.json
--- a/.history/mock/weidian/getTaskInfo_20200108101158.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101158.json
--- a/.history/mock/weidian/getTaskInfo_20200108101506.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101506.json
--- a/.history/mock/weidian/getTaskInfo_20200108101518.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101518.json
--- a/.history/mock/weidian/getTaskInfo_20200108101531.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101531.json
--- a/.history/mock/weidian/getTaskInfo_20200108101541.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101541.json
--- a/.history/mock/weidian/getTaskInfo_20200108101645.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101645.json
--- a/.history/mock/weidian/getTaskInfo_20200108101802.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101802.json
--- a/.history/mock/weidian/getTaskInfo_20200108101856.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101856.json
--- a/.history/mock/weidian/getTaskInfo_20200108101907.json
+++ b/.history/mock/weidian/getTaskInfo_20200108101907.json
--- a/.history/mock/weidian/getTaskInfo_20200108113627.json
+++ b/.history/mock/weidian/getTaskInfo_20200108113627.json
--- a/.history/mock/weidian/getTaskInfo_20200108114118.json
+++ b/.history/mock/weidian/getTaskInfo_20200108114118.json
--- a/.history/mock/weidian/getTaskInfo_20200108114340.json
+++ b/.history/mock/weidian/getTaskInfo_20200108114340.json
--- a/.history/mock/weidian/getTaskInfo_20200108114350.json
+++ b/.history/mock/weidian/getTaskInfo_20200108114350.json
--- a/.history/mock/weidian/getTaskInfo_20200108114401.json
+++ b/.history/mock/weidian/getTaskInfo_20200108114401.json
--- a/.history/mock/weidian/getTaskInfo_20200108114411.json
+++ b/.history/mock/weidian/getTaskInfo_20200108114411.json
--- a/.history/mock/weidian/getTaskInfo_20200108114425.json
+++ b/.history/mock/weidian/getTaskInfo_20200108114425.json
--- a/.history/mock/weidian/getTaskInfo_20200108114432.json
+++ b/.history/mock/weidian/getTaskInfo_20200108114432.json
--- a/.history/mock/weidian/getTaskInfo_20200108133739.json
+++ b/.history/mock/weidian/getTaskInfo_20200108133739.json
--- a/.history/mock/weidian/getTaskInfo_20200108154531.json
+++ b/.history/mock/weidian/getTaskInfo_20200108154531.json
--- a/.history/mock/weidian/getTaskInfo_20200108161048.json
+++ b/.history/mock/weidian/getTaskInfo_20200108161048.json
--- a/.history/mock/weidian/getTaskInfo_20200108161058.json
+++ b/.history/mock/weidian/getTaskInfo_20200108161058.json
--- a/.history/mock/weidian/getTaskInfo_20200108161222.json
+++ b/.history/mock/weidian/getTaskInfo_20200108161222.json
--- a/.history/mock/weidian/getTaskInfo_20200108193033.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193033.json
--- a/.history/mock/weidian/getTaskInfo_20200108193044.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193044.json
--- a/.history/mock/weidian/getTaskInfo_20200108193117.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193117.json
--- a/.history/mock/weidian/getTaskInfo_20200108193133.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193133.json
--- a/.history/mock/weidian/getTaskInfo_20200108193146.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193146.json
--- a/.history/mock/weidian/getTaskInfo_20200108193201.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193201.json
--- a/.history/mock/weidian/getTaskInfo_20200108193213.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193213.json
--- a/.history/mock/weidian/getTaskInfo_20200108193223.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193223.json
--- a/.history/mock/weidian/getTaskInfo_20200108193248.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193248.json
--- a/.history/mock/weidian/getTaskInfo_20200108193304.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193304.json
--- a/.history/mock/weidian/getTaskInfo_20200108193344.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193344.json
--- a/.history/mock/weidian/getTaskInfo_20200108193700.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193700.json
--- a/.history/mock/weidian/getTaskInfo_20200108193713.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193713.json
--- a/.history/mock/weidian/getTaskInfo_20200108193725.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193725.json
--- a/.history/mock/weidian/getTaskInfo_20200108193736.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193736.json
--- a/.history/mock/weidian/getTaskInfo_20200108193749.json
+++ b/.history/mock/weidian/getTaskInfo_20200108193749.json
--- a/.history/mock/weidian/getTaskInfo_20200108194112.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194112.json
--- a/.history/mock/weidian/getTaskInfo_20200108194122.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194122.json
--- a/.history/mock/weidian/getTaskInfo_20200108194141.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194141.json
--- a/.history/mock/weidian/getTaskInfo_20200108194151.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194151.json
--- a/.history/mock/weidian/getTaskInfo_20200108194700.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194700.json
--- a/.history/mock/weidian/getTaskInfo_20200108194720.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194720.json
--- a/.history/mock/weidian/getTaskInfo_20200108194736.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194736.json
--- a/.history/mock/weidian/getTaskInfo_20200108194756.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194756.json
--- a/.history/mock/weidian/getTaskInfo_20200108194844.json
+++ b/.history/mock/weidian/getTaskInfo_20200108194844.json
--- a/.history/mock/weidian/getTaskInfo_20200108201442.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201442.json
--- a/.history/mock/weidian/getTaskInfo_20200108201512.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201512.json
--- a/.history/mock/weidian/getTaskInfo_20200108201521.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201521.json
--- a/.history/mock/weidian/getTaskInfo_20200108201535.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201535.json
--- a/.history/mock/weidian/getTaskInfo_20200108201546.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201546.json
--- a/.history/mock/weidian/getTaskInfo_20200108201610.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201610.json
--- a/.history/mock/weidian/getTaskInfo_20200108201759.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201759.json
--- a/.history/mock/weidian/getTaskInfo_20200108201808.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201808.json
--- a/.history/mock/weidian/getTaskInfo_20200108201816.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201816.json
--- a/.history/mock/weidian/getTaskInfo_20200108201833.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201833.json
--- a/.history/mock/weidian/getTaskInfo_20200108201837.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201837.json
--- a/.history/mock/weidian/getTaskInfo_20200108201858.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201858.json
--- a/.history/mock/weidian/getTaskInfo_20200108201929.json
+++ b/.history/mock/weidian/getTaskInfo_20200108201929.json
--- a/.history/mock/weidian/getTaskInfo_20200108202026.json
+++ b/.history/mock/weidian/getTaskInfo_20200108202026.json
--- a/.history/mock/weidian/getTaskInfo_20200113113322.json
+++ b/.history/mock/weidian/getTaskInfo_20200113113322.json
--- a/.history/mock/weidian/getTaskInfo_20200113113340.json
+++ b/.history/mock/weidian/getTaskInfo_20200113113340.json
--- a/.history/mock/weidian/getTaskInfo_20200113113426.json
+++ b/.history/mock/weidian/getTaskInfo_20200113113426.json
--- a/.history/mock/weidian/getTaskInfo_20200113113457.json
+++ b/.history/mock/weidian/getTaskInfo_20200113113457.json
--- a/.history/mock/weidian/getTaskInfo_20200113113551.json
+++ b/.history/mock/weidian/getTaskInfo_20200113113551.json
--- a/.history/mock/weidian/getTaskInfo_20200113113622.json
+++ b/.history/mock/weidian/getTaskInfo_20200113113622.json
--- a/.history/mock/weidian/getTaskInfo_20200113115003.json
+++ b/.history/mock/weidian/getTaskInfo_20200113115003.json
--- a/.history/mock/weidian/getTaskInfo_20200119145305.json
+++ b/.history/mock/weidian/getTaskInfo_20200119145305.json
--- a/.history/mock/weidian/getTaskInfo_20200119145330.json
+++ b/.history/mock/weidian/getTaskInfo_20200119145330.json
--- a/.history/mock/weidian/takeCoin_20200108195157.json
+++ b/.history/mock/weidian/takeCoin_20200108195157.json
--- a/.history/mock/weidian/takeCoin_20200108195205.json
+++ b/.history/mock/weidian/takeCoin_20200108195205.json
--- a/.history/mock/weidian/takeReward_20200108193539.json
+++ b/.history/mock/weidian/takeReward_20200108193539.json
--- a/.history/mock/weidian/takeReward_20200108193548.json
+++ b/.history/mock/weidian/takeReward_20200108193548.json
--- a/.npmrc
+++ b/.npmrc
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
--- a/README.md
+++ b/README.md
--- a/build.js
+++ b/build.js
--- a/egret/.wing/exml.json
+++ b/egret/.wing/exml.json
--- a/egret/autoMerger.js
+++ b/egret/autoMerger.js
--- a/egret/design/guide_dialog.png
+++ b/egret/design/guide_dialog.png
--- a/egret/design/guide_hand.png
+++ b/egret/design/guide_hand.png
--- a/egret/design/guide_tips.png
+++ b/egret/design/guide_tips.png
--- a/egret/design/kids/boy_eye.png
+++ b/egret/design/kids/boy_eye.png
--- a/egret/design/kids/boyhand.png
+++ b/egret/design/kids/boyhand.png
--- a/egret/design/kids/girl_eye.png
+++ b/egret/design/kids/girl_eye.png
--- a/egret/design/kids/girlhand.png
+++ b/egret/design/kids/girlhand.png
--- a/egret/design/kids/kids.png
+++ b/egret/design/kids/kids.png
--- a/egret/design/kids/kidschair.png
+++ b/egret/design/kids/kidschair.png
--- a/egret/design/monkey/eyeleft.png
+++ b/egret/design/monkey/eyeleft.png
--- a/egret/design/monkey/eyeright.png
+++ b/egret/design/monkey/eyeright.png
--- a/egret/design/monkey/monkey.png
+++ b/egret/design/monkey/monkey.png
--- a/egret/design/参考图.jpg
+++ b/egret/design/参考图.jpg
--- a/egret/design/开启状态/coinOpenState.png
+++ b/egret/design/开启状态/coinOpenState.png
--- a/egret/design/开启状态/gift2OpenState.png
+++ b/egret/design/开启状态/gift2OpenState.png
--- a/egret/design/开启状态/giftOpenState.png
+++ b/egret/design/开启状态/giftOpenState.png
--- a/egret/design/开启状态/goldenboxOpenState.png
+++ b/egret/design/开启状态/goldenboxOpenState.png
--- a/egret/design/开启状态/silverboxOpenState.png
+++ b/egret/design/开启状态/silverboxOpenState.png
--- a/egret/design/开启状态/woodboxOpenState.png
+++ b/egret/design/开启状态/woodboxOpenState.png
--- a/egret/design/木箱/00.png
+++ b/egret/design/木箱/00.png
--- a/egret/design/木箱/01.png
+++ b/egret/design/木箱/01.png
--- a/egret/design/木箱/02.png
+++ b/egret/design/木箱/02.png
--- a/egret/design/木箱/03.png
+++ b/egret/design/木箱/03.png
--- a/egret/design/木箱/04.png
+++ b/egret/design/木箱/04.png
--- a/egret/design/木箱/05.png
+++ b/egret/design/木箱/05.png
--- a/egret/design/木箱/06.png
+++ b/egret/design/木箱/06.png
--- a/egret/design/木箱/07.png
+++ b/egret/design/木箱/07.png
--- a/egret/design/木箱/08.png
+++ b/egret/design/木箱/08.png
--- a/egret/design/木箱/09.png
+++ b/egret/design/木箱/09.png
--- a/egret/design/木箱/10.png
+++ b/egret/design/木箱/10.png
--- a/egret/design/木箱/11.png
+++ b/egret/design/木箱/11.png
--- a/egret/design/渔网/00.png
+++ b/egret/design/渔网/00.png
--- a/egret/design/渔网/01.png
+++ b/egret/design/渔网/01.png
--- a/egret/design/渔网/02.png
+++ b/egret/design/渔网/02.png
--- a/egret/design/渔网/03.png
+++ b/egret/design/渔网/03.png
--- a/egret/design/渔网/04.png
+++ b/egret/design/渔网/04.png
--- a/egret/design/渔网/05.png
+++ b/egret/design/渔网/05.png
--- a/egret/design/渔网/06.png
+++ b/egret/design/渔网/06.png
--- a/egret/design/渔网/07.png
+++ b/egret/design/渔网/07.png
--- a/egret/design/渔网/08.png
+++ b/egret/design/渔网/08.png
--- a/egret/design/渔网/09.png
+++ b/egret/design/渔网/09.png
--- a/egret/design/渔网/10.png
+++ b/egret/design/渔网/10.png
--- a/egret/design/礼物/00.png
+++ b/egret/design/礼物/00.png
--- a/egret/design/礼物/01.png
+++ b/egret/design/礼物/01.png
--- a/egret/design/礼物/02.png
+++ b/egret/design/礼物/02.png
--- a/egret/design/礼物/03.png
+++ b/egret/design/礼物/03.png
--- a/egret/design/礼物/04.png
+++ b/egret/design/礼物/04.png
--- a/egret/design/礼物/05.png
+++ b/egret/design/礼物/05.png
--- a/egret/design/礼物/06.png
+++ b/egret/design/礼物/06.png
--- a/egret/design/礼物/07.png
+++ b/egret/design/礼物/07.png
--- a/egret/design/礼物/08.png
+++ b/egret/design/礼物/08.png
--- a/egret/design/礼物/09.png
+++ b/egret/design/礼物/09.png
--- a/egret/design/礼盒2/00.png
+++ b/egret/design/礼盒2/00.png
--- a/egret/design/礼盒2/01.png
+++ b/egret/design/礼盒2/01.png
--- a/egret/design/礼盒2/02.png
+++ b/egret/design/礼盒2/02.png
--- a/egret/design/礼盒2/03.png
+++ b/egret/design/礼盒2/03.png
--- a/egret/design/礼盒2/04.png
+++ b/egret/design/礼盒2/04.png
--- a/egret/design/礼盒2/05.png
+++ b/egret/design/礼盒2/05.png
--- a/egret/design/礼盒2/06.png
+++ b/egret/design/礼盒2/06.png
--- a/egret/design/礼盒2/07.png
+++ b/egret/design/礼盒2/07.png
--- a/egret/design/礼盒2/08.png
+++ b/egret/design/礼盒2/08.png
--- a/egret/design/礼盒2/09.png
+++ b/egret/design/礼盒2/09.png
--- a/egret/design/礼盒2/10.png
+++ b/egret/design/礼盒2/10.png
--- a/egret/design/礼盒2/11.png
+++ b/egret/design/礼盒2/11.png
--- a/egret/design/贵重/00.png
+++ b/egret/design/贵重/00.png
--- a/egret/design/贵重/01.png
+++ b/egret/design/贵重/01.png
--- a/egret/design/贵重/02.png
+++ b/egret/design/贵重/02.png
--- a/egret/design/贵重/03.png
+++ b/egret/design/贵重/03.png
--- a/egret/design/贵重/04.png
+++ b/egret/design/贵重/04.png
--- a/egret/design/贵重/05.png
+++ b/egret/design/贵重/05.png
--- a/egret/design/贵重/06.png
+++ b/egret/design/贵重/06.png
--- a/egret/design/贵重/07.png
+++ b/egret/design/贵重/07.png
--- a/egret/design/贵重/08.png
+++ b/egret/design/贵重/08.png
--- a/egret/design/贵重/09.png
+++ b/egret/design/贵重/09.png
--- a/egret/design/贵重/10.png
+++ b/egret/design/贵重/10.png
--- a/egret/design/贵重/11.png
+++ b/egret/design/贵重/11.png
--- a/egret/design/银/00.png
+++ b/egret/design/银/00.png
--- a/egret/design/银/01.png
+++ b/egret/design/银/01.png
--- a/egret/design/银/02.png
+++ b/egret/design/银/02.png
--- a/egret/design/银/03.png
+++ b/egret/design/银/03.png
--- a/egret/design/银/04.png
+++ b/egret/design/银/04.png
--- a/egret/design/银/05.png
+++ b/egret/design/银/05.png
--- a/egret/design/银/06.png
+++ b/egret/design/银/06.png
--- a/egret/design/银/07.png
+++ b/egret/design/银/07.png
--- a/egret/design/银/08.png
+++ b/egret/design/银/08.png
--- a/egret/design/银/09.png
+++ b/egret/design/银/09.png
--- a/egret/design/银/10.png
+++ b/egret/design/银/10.png
--- a/egret/design/银/11.png
+++ b/egret/design/银/11.png
--- a/egret/design/银/12.png
+++ b/egret/design/银/12.png
--- a/egret/index copy 2.html
+++ b/egret/index copy 2.html
--- a/egret/index copy 3.html
+++ b/egret/index copy 3.html
--- a/egret/index copy.html
+++ b/egret/index copy.html
--- a/egret/index.html
+++ b/egret/index.html
--- a/egret/libs/config.d.ts
+++ b/egret/libs/config.d.ts
--- a/egret/libs/egret.all.js
+++ b/egret/libs/egret.all.js
--- a/egret/libs/howler.min.js
+++ b/egret/libs/howler.min.js
--- a/egret/libs/modules/game/game.d.ts
+++ b/egret/libs/modules/game/game.d.ts
--- a/egret/libs/modules/game/game.js
+++ b/egret/libs/modules/game/game.js
--- a/egret/libs/modules/game/game.min.js
+++ b/egret/libs/modules/game/game.min.js
--- a/egret/libs/modules/promise/promise.js
+++ b/egret/libs/modules/promise/promise.js
--- a/egret/libs/modules/promise/promise.min.js
+++ b/egret/libs/modules/promise/promise.min.js
--- a/egret/libs/new_tc/getIsIOS.ts
+++ b/egret/libs/new_tc/getIsIOS.ts
--- a/egret/libs/new_tc/getResPath.ts
+++ b/egret/libs/new_tc/getResPath.ts
--- a/egret/libs/new_tc/wait.ts
+++ b/egret/libs/new_tc/wait.ts
--- a/egret/libs/new_tw/ctrls/doStart.ts
+++ b/egret/libs/new_tw/ctrls/doStart.ts
--- a/egret/libs/new_tw/ctrls/showLog.ts
+++ b/egret/libs/new_tw/ctrls/showLog.ts
--- a/egret/libs/new_tw/ctrls/submitAfterDostart.ts
+++ b/egret/libs/new_tw/ctrls/submitAfterDostart.ts
--- a/egret/libs/new_tw/datas/getCountTxt.ts
+++ b/egret/libs/new_tw/datas/getCountTxt.ts
--- a/egret/libs/new_tw/datas/getStartBtnEnable.ts
+++ b/egret/libs/new_tw/datas/getStartBtnEnable.ts
--- a/egret/libs/new_wx/MainBase.ts
+++ b/egret/libs/new_wx/MainBase.ts
--- a/egret/libs/new_wx/components/HTMLRulePanel.ts
+++ b/egret/libs/new_wx/components/HTMLRulePanel.ts
--- a/egret/libs/new_wx/components/OptionsItemRenderder.ts
+++ b/egret/libs/new_wx/components/OptionsItemRenderder.ts
--- a/egret/libs/new_wx/components/OptionsPanel.ts
+++ b/egret/libs/new_wx/components/OptionsPanel.ts
--- a/egret/libs/new_wx/components/PlaySceneBase.ts
+++ b/egret/libs/new_wx/components/PlaySceneBase.ts
--- a/egret/libs/new_wx/components/PrizePanel.ts
+++ b/egret/libs/new_wx/components/PrizePanel.ts
--- a/egret/libs/new_wx/components/RankItem.ts
+++ b/egret/libs/new_wx/components/RankItem.ts
--- a/egret/libs/new_wx/components/RankPanel.ts
+++ b/egret/libs/new_wx/components/RankPanel.ts
--- a/egret/libs/new_wx/components/RulePanel.ts
+++ b/egret/libs/new_wx/components/RulePanel.ts
--- a/egret/libs/new_wx/components/StartSceneBase.ts
+++ b/egret/libs/new_wx/components/StartSceneBase.ts
--- a/egret/libs/new_wx/ctrls/showAlertPanel.ts
+++ b/egret/libs/new_wx/ctrls/showAlertPanel.ts
--- a/egret/libs/new_wx/loadSpriteSheet.ts
+++ b/egret/libs/new_wx/loadSpriteSheet.ts
--- a/egret/libs/new_wx/types/sceneTypes.ts
+++ b/egret/libs/new_wx/types/sceneTypes.ts
--- a/egret/libs/new_wx/utils/getSkinPath.ts
+++ b/egret/libs/new_wx/utils/getSkinPath.ts
--- a/egret/libs/new_wx/views/centerAnchorOffset.ts
+++ b/egret/libs/new_wx/views/centerAnchorOffset.ts
--- a/egret/libs/particle/GravityParticle.ts
+++ b/egret/libs/particle/GravityParticle.ts
--- a/egret/libs/particle/GravityParticleSystem.ts
+++ b/egret/libs/particle/GravityParticleSystem.ts
--- a/egret/libs/particle/Particle.ts
+++ b/egret/libs/particle/Particle.ts
--- a/egret/libs/particle/ParticleSystem.ts
+++ b/egret/libs/particle/ParticleSystem.ts
--- a/egret/libs/physics.d.ts
+++ b/egret/libs/physics.d.ts
--- a/egret/libs/physics.min.js
+++ b/egret/libs/physics.min.js
--- a/egret/libs/svga.egret.min.js
+++ b/egret/libs/svga.egret.min.js
--- a/egret/libs/tc/interface/INetData.ts
+++ b/egret/libs/tc/interface/INetData.ts
--- a/egret/libs/tc/manager/ABNetManager.ts
+++ b/egret/libs/tc/manager/ABNetManager.ts
--- a/egret/libs/tc/util/GFun.ts
+++ b/egret/libs/tc/util/GFun.ts
--- a/egret/libs/tc/utils/isIPhoneX.ts
+++ b/egret/libs/tc/utils/isIPhoneX.ts
--- a/egret/libs/tl/MainBase.ts
+++ b/egret/libs/tl/MainBase.ts
--- a/egret/libs/new_wx/adapter/AssetAdapter.ts
+++ b/egret/libs/new_wx/adapter/AssetAdapter.ts
--- a/egret/libs/new_wx/adapter/ThemeAdapter.ts
+++ b/egret/libs/new_wx/adapter/ThemeAdapter.ts
--- a/egret/libs/tw/data/common/IExposureData.ts
+++ b/egret/libs/tw/data/common/IExposureData.ts
--- a/egret/libs/tw/data/pet/SignInfoData.ts
+++ b/egret/libs/tw/data/pet/SignInfoData.ts
--- a/egret/libs/tw/data/pet/SignInfoVo.ts
+++ b/egret/libs/tw/data/pet/SignInfoVo.ts
--- a/egret/libs/tw/data/pets/PetsInfoData.ts
+++ b/egret/libs/tw/data/pets/PetsInfoData.ts
--- a/egret/libs/tw/enum/NetName.ts
+++ b/egret/libs/tw/enum/NetName.ts
--- a/egret/libs/tw/manager/DataManager.ts
+++ b/egret/libs/tw/manager/DataManager.ts
--- a/egret/libs/tw/manager/NetManager.ts
+++ b/egret/libs/tw/manager/NetManager.ts
--- a/egret/libs/tw/util/Buried.ts
+++ b/egret/libs/tw/util/Buried.ts
--- a/egret/libs/tw/util/TwFun.ts
+++ b/egret/libs/tw/util/TwFun.ts
--- a/egret/libs/tw/util/TwLang.ts
+++ b/egret/libs/tw/util/TwLang.ts
--- a/egret/libs/zepto_security_downloadApp.min.js
+++ b/egret/libs/zepto_security_downloadApp.min.js
--- a/egret/project.json
+++ b/egret/project.json
--- a/egret/publish.js
+++ b/egret/publish.js
--- a/egret/resource/TextureMerger/BeginScene_2.tmproject
+++ b/egret/resource/TextureMerger/BeginScene_2.tmproject
--- a/egret/resource/TextureMerger/Loading_1.tmproject
+++ b/egret/resource/TextureMerger/Loading_1.tmproject
--- a/egret/resource/TextureMerger/MainScene1_3.tmproject
+++ b/egret/resource/TextureMerger/MainScene1_3.tmproject
--- a/egret/resource/TextureMerger/MainScene2_4.tmproject
+++ b/egret/resource/TextureMerger/MainScene2_4.tmproject
--- a/egret/resource/TextureMerger/MainScene3_5.tmproject
+++ b/egret/resource/TextureMerger/MainScene3_5.tmproject
--- a/egret/resource/TextureMerger/MainScene4_15.tmproject
+++ b/egret/resource/TextureMerger/MainScene4_15.tmproject
--- a/egret/resource/TextureMerger/Preload_0.tmproject
+++ b/egret/resource/TextureMerger/Preload_0.tmproject
--- a/egret/resource/TextureMerger/ShopScene_6.tmproject
+++ b/egret/resource/TextureMerger/ShopScene_6.tmproject
--- a/egret/resource/TextureMerger/alert.tmproject
+++ b/egret/resource/TextureMerger/alert.tmproject
--- a/egret/resource/TextureMerger/options.tmproject
+++ b/egret/resource/TextureMerger/options.tmproject
--- a/egret/resource/TextureMerger/play.tmproject
+++ b/egret/resource/TextureMerger/play.tmproject
--- a/egret/resource/TextureMerger/pop1_7.tmproject
+++ b/egret/resource/TextureMerger/pop1_7.tmproject
--- a/egret/resource/TextureMerger/pop2_8.tmproject
+++ b/egret/resource/TextureMerger/pop2_8.tmproject
--- a/egret/resource/TextureMerger/pop3_9.tmproject
+++ b/egret/resource/TextureMerger/pop3_9.tmproject
--- a/egret/resource/TextureMerger/pop4_10.tmproject
+++ b/egret/resource/TextureMerger/pop4_10.tmproject
--- a/egret/resource/TextureMerger/pop5_11.tmproject
+++ b/egret/resource/TextureMerger/pop5_11.tmproject
--- a/egret/resource/TextureMerger/pop6_12.tmproject
+++ b/egret/resource/TextureMerger/pop6_12.tmproject
--- a/egret/resource/TextureMerger/preload.tmproject
+++ b/egret/resource/TextureMerger/preload.tmproject
--- a/egret/resource/TextureMerger/preload_14.tmproject
+++ b/egret/resource/TextureMerger/preload_14.tmproject
--- a/egret/resource/TextureMerger/prize.tmproject
+++ b/egret/resource/TextureMerger/prize.tmproject
--- a/egret/resource/TextureMerger/rank.tmproject
+++ b/egret/resource/TextureMerger/rank.tmproject
--- a/egret/resource/TextureMerger/rule.tmproject
+++ b/egret/resource/TextureMerger/rule.tmproject
--- a/egret/resource/TextureMerger/start.tmproject
+++ b/egret/resource/TextureMerger/start.tmproject
--- a/egret/resource/assets/alert/alertbg.png
+++ b/egret/resource/assets/alert/alertbg.png
--- a/egret/resource/assets/beginScene/bs_bg.jpg
+++ b/egret/resource/assets/beginScene/bs_bg.jpg
--- a/egret/resource/assets/beginScene/bs_words0.png
+++ b/egret/resource/assets/beginScene/bs_words0.png
--- a/egret/resource/assets/beginScene/bs_words1.png
+++ b/egret/resource/assets/beginScene/bs_words1.png
--- a/egret/resource/assets/beginScene/bs_words2.png
+++ b/egret/resource/assets/beginScene/bs_words2.png
--- a/egret/resource/assets/beginScene/dog.png
+++ b/egret/resource/assets/beginScene/dog.png
--- a/egret/resource/assets/beginScene/logo.png
+++ b/egret/resource/assets/beginScene/logo.png
--- a/egret/resource/assets/beginScene/openStoreBtn.png
+++ b/egret/resource/assets/beginScene/openStoreBtn.png
--- a/egret/resource/assets/friendsStore/myCoffeeStore.png
+++ b/egret/resource/assets/friendsStore/myCoffeeStore.png
--- a/egret/resource/assets/mainScene/addCoinBtnBg.png
+++ b/egret/resource/assets/mainScene/addCoinBtnBg.png
--- a/egret/resource/assets/mainScene/addSpeedBg.png
+++ b/egret/resource/assets/mainScene/addSpeedBg.png
--- a/egret/resource/assets/mainScene/addSpeedBtn.png
+++ b/egret/resource/assets/mainScene/addSpeedBtn.png
--- a/egret/resource/assets/mainScene/addSpeedTips.png
+++ b/egret/resource/assets/mainScene/addSpeedTips.png
--- a/egret/resource/assets/mainScene/barCounterLv1.png
+++ b/egret/resource/assets/mainScene/barCounterLv1.png
--- a/egret/resource/assets/mainScene/barCounterLv2.png
+++ b/egret/resource/assets/mainScene/barCounterLv2.png
--- a/egret/resource/assets/mainScene/barCounterLv3.png
+++ b/egret/resource/assets/mainScene/barCounterLv3.png
--- a/egret/resource/assets/mainScene/box.png
+++ b/egret/resource/assets/mainScene/box.png
--- a/egret/resource/assets/mainScene/circleBorder.png
+++ b/egret/resource/assets/mainScene/circleBorder.png
--- a/egret/resource/assets/mainScene/coffeeMakerDesk.png
+++ b/egret/resource/assets/mainScene/coffeeMakerDesk.png
--- a/egret/resource/assets/mainScene/coffeeMakerLv1.png
+++ b/egret/resource/assets/mainScene/coffeeMakerLv1.png
--- a/egret/resource/assets/mainScene/coffeeMakerLv2.png
+++ b/egret/resource/assets/mainScene/coffeeMakerLv2.png
--- a/egret/resource/assets/mainScene/coffeeMakerLv3.png
+++ b/egret/resource/assets/mainScene/coffeeMakerLv3.png
--- a/egret/resource/assets/mainScene/coinAni.json
+++ b/egret/resource/assets/mainScene/coinAni.json
--- a/egret/resource/assets/mainScene/coinAni.png
+++ b/egret/resource/assets/mainScene/coinAni.png
--- a/egret/resource/assets/mainScene/coinLightAni.json
+++ b/egret/resource/assets/mainScene/coinLightAni.json
--- a/egret/resource/assets/mainScene/coinLightAni.png
+++ b/egret/resource/assets/mainScene/coinLightAni.png
--- a/egret/resource/assets/mainScene/coinNumBg.png
+++ b/egret/resource/assets/mainScene/coinNumBg.png
--- a/egret/resource/assets/mainScene/collectBtn.png
+++ b/egret/resource/assets/mainScene/collectBtn.png
--- a/egret/resource/assets/mainScene/createAni.json
+++ b/egret/resource/assets/mainScene/createAni.json
--- a/egret/resource/assets/mainScene/createAni.png
+++ b/egret/resource/assets/mainScene/createAni.png
--- a/egret/resource/assets/mainScene/decorateBtn.png
+++ b/egret/resource/assets/mainScene/decorateBtn.png
--- a/egret/resource/assets/mainScene/diamondNumBg.png
+++ b/egret/resource/assets/mainScene/diamondNumBg.png
--- a/egret/resource/assets/mainScene/exchangeBtn.png
+++ b/egret/resource/assets/mainScene/exchangeBtn.png
--- a/egret/resource/assets/mainScene/finger.png
+++ b/egret/resource/assets/mainScene/finger.png
--- a/egret/resource/assets/mainScene/goBackBtn.png
+++ b/egret/resource/assets/mainScene/goBackBtn.png
--- a/egret/resource/assets/mainScene/inviteBtn.png
+++ b/egret/resource/assets/mainScene/inviteBtn.png
--- a/egret/resource/assets/mainScene/levelBg.png
+++ b/egret/resource/assets/mainScene/levelBg.png
--- a/egret/resource/assets/mainScene/levelUp.json
+++ b/egret/resource/assets/mainScene/levelUp.json
--- a/egret/resource/assets/mainScene/levelUp.png
+++ b/egret/resource/assets/mainScene/levelUp.png
--- a/egret/resource/assets/mainScene/logo.jpg
+++ b/egret/resource/assets/mainScene/logo.jpg
--- a/egret/resource/assets/mainScene/mainBg.jpg
+++ b/egret/resource/assets/mainScene/mainBg.jpg
--- a/egret/resource/assets/mainScene/musciOn.png
+++ b/egret/resource/assets/mainScene/musciOn.png
--- a/egret/resource/assets/mainScene/musicOff.png
+++ b/egret/resource/assets/mainScene/musicOff.png
--- a/egret/resource/assets/mainScene/nicknameBg.png
+++ b/egret/resource/assets/mainScene/nicknameBg.png
--- a/egret/resource/assets/mainScene/ovenDesk.png
+++ b/egret/resource/assets/mainScene/ovenDesk.png
--- a/egret/resource/assets/mainScene/ovenLv1.png
+++ b/egret/resource/assets/mainScene/ovenLv1.png
--- a/egret/resource/assets/mainScene/ovenLv2.png
+++ b/egret/resource/assets/mainScene/ovenLv2.png
--- a/egret/resource/assets/mainScene/ovenLv3.png
+++ b/egret/resource/assets/mainScene/ovenLv3.png
--- a/egret/resource/assets/mainScene/payBtnBg.png
+++ b/egret/resource/assets/mainScene/payBtnBg.png
--- a/egret/resource/assets/mainScene/qiangdanBtn.png
+++ b/egret/resource/assets/mainScene/qiangdanBtn.png
--- a/egret/resource/assets/mainScene/qiangdanTipsBg.png
+++ b/egret/resource/assets/mainScene/qiangdanTipsBg.png
--- a/egret/resource/assets/mainScene/redPacketBtn.png
+++ b/egret/resource/assets/mainScene/redPacketBtn.png
--- a/egret/resource/assets/mainScene/redPoint.png
+++ b/egret/resource/assets/mainScene/redPoint.png
--- a/egret/resource/assets/mainScene/refrigeratorLv1.png
+++ b/egret/resource/assets/mainScene/refrigeratorLv1.png
--- a/egret/resource/assets/mainScene/refrigeratorLv2.png
+++ b/egret/resource/assets/mainScene/refrigeratorLv2.png
--- a/egret/resource/assets/mainScene/refrigeratorLv3.png
+++ b/egret/resource/assets/mainScene/refrigeratorLv3.png
--- a/egret/resource/assets/mainScene/table01.png
+++ b/egret/resource/assets/mainScene/table01.png
--- a/egret/resource/assets/mainScene/table02.png
+++ b/egret/resource/assets/mainScene/table02.png
--- a/egret/resource/assets/mainScene/table03.png
+++ b/egret/resource/assets/mainScene/table03.png
--- a/egret/resource/assets/mainScene/table11.png
+++ b/egret/resource/assets/mainScene/table11.png
--- a/egret/resource/assets/mainScene/table12.png
+++ b/egret/resource/assets/mainScene/table12.png
--- a/egret/resource/assets/mainScene/table13.png
+++ b/egret/resource/assets/mainScene/table13.png
--- a/egret/resource/assets/mainScene/table21.png
+++ b/egret/resource/assets/mainScene/table21.png
--- a/egret/resource/assets/mainScene/table22.png
+++ b/egret/resource/assets/mainScene/table22.png
--- a/egret/resource/assets/mainScene/table23.png
+++ b/egret/resource/assets/mainScene/table23.png
--- a/egret/resource/assets/mainScene/table31.png
+++ b/egret/resource/assets/mainScene/table31.png
--- a/egret/resource/assets/mainScene/table32.png
+++ b/egret/resource/assets/mainScene/table32.png
--- a/egret/resource/assets/mainScene/table33.png
+++ b/egret/resource/assets/mainScene/table33.png
--- a/egret/resource/assets/mainScene/taskBtn.png
+++ b/egret/resource/assets/mainScene/taskBtn.png
--- a/egret/resource/assets/mainScene/userIconBg.png
+++ b/egret/resource/assets/mainScene/userIconBg.png
--- a/egret/resource/assets/mainScene/userImg.png
+++ b/egret/resource/assets/mainScene/userImg.png
--- a/egret/resource/assets/mainScene/vase.png
+++ b/egret/resource/assets/mainScene/vase.png
--- a/egret/resource/assets/mainScene/waitressLv1.png
+++ b/egret/resource/assets/mainScene/waitressLv1.png
--- a/egret/resource/assets/mainScene/waitressLv1.svga
+++ b/egret/resource/assets/mainScene/waitressLv1.svga
--- a/egret/resource/assets/mainScene/waitressLv2.svga
+++ b/egret/resource/assets/mainScene/waitressLv2.svga
--- a/egret/resource/assets/mainScene/waitressLv3.svga
+++ b/egret/resource/assets/mainScene/waitressLv3.svga
--- a/egret/resource/assets/mainScene2/barIcon2.png
+++ b/egret/resource/assets/mainScene2/barIcon2.png
--- a/egret/resource/assets/mainScene2/dajixueBtn.png
+++ b/egret/resource/assets/mainScene2/dajixueBtn.png
--- a/egret/resource/assets/mainScene2/djxEff.svga
+++ b/egret/resource/assets/mainScene2/djxEff.svga
--- a/egret/resource/assets/mainScene2/getPrizeBtn2.png
+++ b/egret/resource/assets/mainScene2/getPrizeBtn2.png
--- a/egret/resource/assets/mainScene2/prizeBar2.png
+++ b/egret/resource/assets/mainScene2/prizeBar2.png
--- a/egret/resource/assets/mainScene2/prizeBarBg2.png
+++ b/egret/resource/assets/mainScene2/prizeBarBg2.png
--- a/egret/resource/assets/mainScene2/prizeBg2.png
+++ b/egret/resource/assets/mainScene2/prizeBg2.png
--- a/egret/resource/assets/mainScene2/prizeTips2.png
+++ b/egret/resource/assets/mainScene2/prizeTips2.png
--- a/egret/resource/assets/music/collectCoins.mp3
+++ b/egret/resource/assets/music/collectCoins.mp3
--- a/egret/resource/assets/music/createCoins.mp3
+++ b/egret/resource/assets/music/createCoins.mp3
--- a/egret/resource/assets/music/createEq.mp3
+++ b/egret/resource/assets/music/createEq.mp3
--- a/egret/resource/assets/music/levelUp.mp3
+++ b/egret/resource/assets/music/levelUp.mp3
--- a/egret/resource/assets/newParticle.json
+++ b/egret/resource/assets/newParticle.json
--- a/egret/resource/assets/newParticle.png
+++ b/egret/resource/assets/newParticle.png
--- a/egret/resource/assets/option/X-1.png
+++ b/egret/resource/assets/option/X-1.png
--- a/egret/resource/assets/option/prizeBg.png
+++ b/egret/resource/assets/option/prizeBg.png
--- a/egret/resource/assets/particle3/ballParticle.json
+++ b/egret/resource/assets/particle3/ballParticle.json
--- a/egret/resource/assets/particle3/ballParticle.png
+++ b/egret/resource/assets/particle3/ballParticle.png
--- a/egret/resource/assets/particle3/firePot.png
+++ b/egret/resource/assets/particle3/firePot.png
--- a/egret/resource/assets/playscene/playscenebg.jpg
+++ b/egret/resource/assets/playscene/playscenebg.jpg
--- a/egret/resource/assets/playscene/testbtn.png
+++ b/egret/resource/assets/playscene/testbtn.png
--- a/egret/resource/assets/playscene/发弹雾气.png
+++ b/egret/resource/assets/playscene/发弹雾气.png
--- a/egret/resource/assets/playscene/大炮的头.png
+++ b/egret/resource/assets/playscene/大炮的头.png
--- a/egret/resource/assets/playscene/火.png
+++ b/egret/resource/assets/playscene/火.png
--- a/egret/resource/assets/playscene/火箭.png
+++ b/egret/resource/assets/playscene/火箭.png
--- a/egret/resource/assets/playscene/轮子1.png
+++ b/egret/resource/assets/playscene/轮子1.png
--- a/egret/resource/assets/playscene/音乐关闭.png
+++ b/egret/resource/assets/playscene/音乐关闭.png
--- a/egret/resource/assets/playscene/音乐开启.png
+++ b/egret/resource/assets/playscene/音乐开启.png
--- a/egret/resource/assets/prize/PrizePanelX.png
+++ b/egret/resource/assets/prize/PrizePanelX.png
--- a/egret/resource/assets/prize/prizePanelUseBtn.png
+++ b/egret/resource/assets/prize/prizePanelUseBtn.png
--- a/egret/resource/assets/prize/prizePanelbg.png
+++ b/egret/resource/assets/prize/prizePanelbg.png
--- a/egret/resource/assets/rank/bottomLine.png
+++ b/egret/resource/assets/rank/bottomLine.png
--- a/egret/resource/assets/rank/closeBtn.png
+++ b/egret/resource/assets/rank/closeBtn.png
--- a/egret/resource/assets/rank/commonPanelBg.png
+++ b/egret/resource/assets/rank/commonPanelBg.png
--- a/egret/resource/assets/rank/dog.png
+++ b/egret/resource/assets/rank/dog.png
--- a/egret/resource/assets/rank/num1.png
+++ b/egret/resource/assets/rank/num1.png
--- a/egret/resource/assets/rank/num2.png
+++ b/egret/resource/assets/rank/num2.png
--- a/egret/resource/assets/rank/num3.png
+++ b/egret/resource/assets/rank/num3.png
--- a/egret/resource/assets/rank/rankTitle.png
+++ b/egret/resource/assets/rank/rankTitle.png
--- a/egret/resource/assets/rank/userItemBg.png
+++ b/egret/resource/assets/rank/userItemBg.png
--- a/egret/resource/assets/rule/X.png
+++ b/egret/resource/assets/rule/X.png
--- a/egret/resource/assets/rule/ruleBg.png
+++ b/egret/resource/assets/rule/ruleBg.png
--- a/egret/resource/assets/shopScene/noCoupon.png
+++ b/egret/resource/assets/shopScene/noCoupon.png
--- a/egret/resource/assets/shopScene/shopItemBg.png
+++ b/egret/resource/assets/shopScene/shopItemBg.png
--- a/egret/resource/assets/shopScene/shopItemMask.png
+++ b/egret/resource/assets/shopScene/shopItemMask.png
--- a/egret/resource/assets/shopScene/ss_bg.jpg
+++ b/egret/resource/assets/shopScene/ss_bg.jpg
--- a/egret/resource/assets/shopScene/ss_coin.png
+++ b/egret/resource/assets/shopScene/ss_coin.png
--- a/egret/resource/assets/shopScene/ss_getBtn.png
+++ b/egret/resource/assets/shopScene/ss_getBtn.png
--- a/egret/resource/assets/shopScene/ss_stealBtnBg.png
+++ b/egret/resource/assets/shopScene/ss_stealBtnBg.png
--- a/egret/resource/assets/shopScene/stealBtn.png
+++ b/egret/resource/assets/shopScene/stealBtn.png
--- a/egret/resource/assets/startScene/e1.png
+++ b/egret/resource/assets/startScene/e1.png
--- a/egret/resource/assets/startScene/e2.png
+++ b/egret/resource/assets/startScene/e2.png
--- a/egret/resource/assets/startScene/e3.png
+++ b/egret/resource/assets/startScene/e3.png
--- a/egret/resource/assets/startScene/e4.png
+++ b/egret/resource/assets/startScene/e4.png
--- a/egret/resource/assets/startScene/optionBtn.png
+++ b/egret/resource/assets/startScene/optionBtn.png
--- a/egret/resource/assets/startScene/rankBtn.png
+++ b/egret/resource/assets/startScene/rankBtn.png
--- a/egret/resource/assets/startScene/recordbtn.png
+++ b/egret/resource/assets/startScene/recordbtn.png
--- a/egret/resource/assets/startScene/ruleBtn.png
+++ b/egret/resource/assets/startScene/ruleBtn.png
--- a/egret/resource/assets/startScene/start_btn.png
+++ b/egret/resource/assets/startScene/start_btn.png
--- a/egret/resource/assets/startScene/start_btn_gray.png
+++ b/egret/resource/assets/startScene/start_btn_gray.png
--- a/egret/resource/assets/startScene/startscenebg.jpg
+++ b/egret/resource/assets/startScene/startscenebg.jpg
--- a/egret/resource/assets/startScene/文案.png
+++ b/egret/resource/assets/startScene/文案.png
--- a/egret/resource/assets/playscene/大炮板子.png
+++ b/egret/resource/assets/playscene/大炮板子.png
--- a/egret/resource/assets/option/line2.png
+++ b/egret/resource/assets/option/line2.png
--- a/egret/resource/assets/wdpop/common/popclose.png
+++ b/egret/resource/assets/wdpop/common/popclose.png
--- a/egret/resource/assets/wdpop/common/popcoin.png
+++ b/egret/resource/assets/wdpop/common/popcoin.png
--- a/egret/resource/assets/wdpop/common/popdia.png
+++ b/egret/resource/assets/wdpop/common/popdia.png
--- a/egret/resource/assets/wdpop/common/popright.png
+++ b/egret/resource/assets/wdpop/common/popright.png
--- a/egret/resource/assets/wdpop/common/reloadBtn.png
+++ b/egret/resource/assets/wdpop/common/reloadBtn.png
--- a/egret/resource/assets/wdpop/common/sorryBG.png
+++ b/egret/resource/assets/wdpop/common/sorryBG.png
--- a/egret/resource/assets/wdpop/convert/convertBG.png
+++ b/egret/resource/assets/wdpop/convert/convertBG.png
--- a/egret/resource/assets/wdpop/convert/convertdia.png
+++ b/egret/resource/assets/wdpop/convert/convertdia.png
--- a/egret/resource/assets/wdpop/convert/convertsure.png
+++ b/egret/resource/assets/wdpop/convert/convertsure.png
--- a/egret/resource/assets/wdpop/convert/convertsure2.png
+++ b/egret/resource/assets/wdpop/convert/convertsure2.png
--- a/egret/resource/assets/wdpop/convert/convertthi.png
+++ b/egret/resource/assets/wdpop/convert/convertthi.png
--- a/egret/resource/assets/wdpop/foodend/feBG.png
+++ b/egret/resource/assets/wdpop/foodend/feBG.png
--- a/egret/resource/assets/wdpop/foodend/feBtn.png
+++ b/egret/resource/assets/wdpop/foodend/feBtn.png
--- a/egret/resource/assets/wdpop/foodgo/add.png
+++ b/egret/resource/assets/wdpop/foodgo/add.png
--- a/egret/resource/assets/wdpop/foodgo/fgBG.png
+++ b/egret/resource/assets/wdpop/foodgo/fgBG.png
--- a/egret/resource/assets/wdpop/foodgo/fgBtn.png
+++ b/egret/resource/assets/wdpop/foodgo/fgBtn.png
--- a/egret/resource/assets/wdpop/foodgo/fgcoast.png
+++ b/egret/resource/assets/wdpop/foodgo/fgcoast.png
--- a/egret/resource/assets/wdpop/foodgo/get.svga
+++ b/egret/resource/assets/wdpop/foodgo/get.svga
--- a/egret/resource/assets/wdpop/foodready/frBG.png
+++ b/egret/resource/assets/wdpop/foodready/frBG.png
--- a/egret/resource/assets/wdpop/foodready/frBtn.png
+++ b/egret/resource/assets/wdpop/foodready/frBtn.png
--- a/egret/resource/assets/wdpop/foodready/frcost.png
+++ b/egret/resource/assets/wdpop/foodready/frcost.png
--- a/egret/resource/assets/wdpop/foodready/frtext.png
+++ b/egret/resource/assets/wdpop/foodready/frtext.png
--- a/egret/resource/assets/wdpop/gift/giftBG.png
+++ b/egret/resource/assets/wdpop/gift/giftBG.png
--- a/egret/resource/assets/wdpop/gift/giftback.png
+++ b/egret/resource/assets/wdpop/gift/giftback.png
--- a/egret/resource/assets/wdpop/gift/giftbase.png
+++ b/egret/resource/assets/wdpop/gift/giftbase.png
--- a/egret/resource/assets/wdpop/gift/gifted.png
+++ b/egret/resource/assets/wdpop/gift/gifted.png
--- a/egret/resource/assets/wdpop/gift/giftlit.png
+++ b/egret/resource/assets/wdpop/gift/giftlit.png
--- a/egret/resource/assets/wdpop/gift/giftmy.png
+++ b/egret/resource/assets/wdpop/gift/giftmy.png
--- a/egret/resource/assets/wdpop/gift/giftshade.png
+++ b/egret/resource/assets/wdpop/gift/giftshade.png
--- a/egret/resource/assets/wdpop/gift/ungift.png
+++ b/egret/resource/assets/wdpop/gift/ungift.png
--- a/egret/resource/assets/wdpop/giftlist/glBG.png
+++ b/egret/resource/assets/wdpop/giftlist/glBG.png
--- a/egret/resource/assets/wdpop/giftlist/glback.png
+++ b/egret/resource/assets/wdpop/giftlist/glback.png
--- a/egret/resource/assets/wdpop/giftlist/glbuy.png
+++ b/egret/resource/assets/wdpop/giftlist/glbuy.png
--- a/egret/resource/assets/wdpop/giftlist/gllittle.png
+++ b/egret/resource/assets/wdpop/giftlist/gllittle.png
--- a/egret/resource/assets/wdpop/giftsuccess/gsuccBG.png
+++ b/egret/resource/assets/wdpop/giftsuccess/gsuccBG.png
--- a/egret/resource/assets/wdpop/giftsuccess/gsuccBtn.png
+++ b/egret/resource/assets/wdpop/giftsuccess/gsuccBtn.png
--- a/egret/resource/assets/wdpop/guidebuy/buyed.png
+++ b/egret/resource/assets/wdpop/guidebuy/buyed.png
--- a/egret/resource/assets/wdpop/guidebuy/gbBG.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbBG.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcash.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcash.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcash1.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcash1.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcash2.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcash2.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcash3.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcash3.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcoff.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcoff.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcoffee1.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcoffee1.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcoffee2.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcoffee2.png
--- a/egret/resource/assets/wdpop/guidebuy/gbcoffee3.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbcoffee3.png
--- a/egret/resource/assets/wdpop/guidebuy/gbdesk.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbdesk.png
--- a/egret/resource/assets/wdpop/guidebuy/gbdesk1.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbdesk1.png
--- a/egret/resource/assets/wdpop/guidebuy/gbdesk2.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbdesk2.png
--- a/egret/resource/assets/wdpop/guidebuy/gbdesk3.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbdesk3.png
--- a/egret/resource/assets/wdpop/guidebuy/gbdeskb2.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbdeskb2.png
--- a/egret/resource/assets/wdpop/guidebuy/gbdeskb3.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbdeskb3.png
--- a/egret/resource/assets/wdpop/guidebuy/gbfrige.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbfrige.png
--- a/egret/resource/assets/wdpop/guidebuy/gbfrige1.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbfrige1.png
--- a/egret/resource/assets/wdpop/guidebuy/gbfrige2.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbfrige2.png
--- a/egret/resource/assets/wdpop/guidebuy/gbfrige3.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbfrige3.png
--- a/egret/resource/assets/wdpop/guidebuy/gblittle.png
+++ b/egret/resource/assets/wdpop/guidebuy/gblittle.png
--- a/egret/resource/assets/wdpop/guidebuy/gboven.png
+++ b/egret/resource/assets/wdpop/guidebuy/gboven.png
--- a/egret/resource/assets/wdpop/guidebuy/gboven1.png
+++ b/egret/resource/assets/wdpop/guidebuy/gboven1.png
--- a/egret/resource/assets/wdpop/guidebuy/gboven2.png
+++ b/egret/resource/assets/wdpop/guidebuy/gboven2.png
--- a/egret/resource/assets/wdpop/guidebuy/gboven3.png
+++ b/egret/resource/assets/wdpop/guidebuy/gboven3.png
--- a/egret/resource/assets/wdpop/guidebuy/gbwait.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbwait.png
--- a/egret/resource/assets/wdpop/guidebuy/gbwait1.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbwait1.png
--- a/egret/resource/assets/wdpop/guidebuy/gbwait2.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbwait2.png
--- a/egret/resource/assets/wdpop/guidebuy/gbwait3.png
+++ b/egret/resource/assets/wdpop/guidebuy/gbwait3.png
--- a/egret/resource/assets/wdpop/guidenew/gnBG.png
+++ b/egret/resource/assets/wdpop/guidenew/gnBG.png
--- a/egret/resource/assets/wdpop/guidenew/gnBtn.png
+++ b/egret/resource/assets/wdpop/guidenew/gnBtn.png
--- a/egret/resource/assets/wdpop/guidenew/gnstart.png
+++ b/egret/resource/assets/wdpop/guidenew/gnstart.png
--- a/egret/resource/assets/wdpop/guidenew/uplab.png
+++ b/egret/resource/assets/wdpop/guidenew/uplab.png
--- a/egret/resource/assets/wdpop/guidesure/9-25-3.zip
+++ b/egret/resource/assets/wdpop/guidesure/9-25-3.zip
--- a/egret/resource/assets/wdpop/guidesure/gsBG.png
+++ b/egret/resource/assets/wdpop/guidesure/gsBG.png
--- a/egret/resource/assets/wdpop/guidesure/gsBtn.png
+++ b/egret/resource/assets/wdpop/guidesure/gsBtn.png
--- a/egret/resource/assets/wdpop/guidesure/gsbuy.png
+++ b/egret/resource/assets/wdpop/guidesure/gsbuy.png
--- a/egret/resource/assets/wdpop/guidesure/gstip.png
+++ b/egret/resource/assets/wdpop/guidesure/gstip.png
--- a/egret/resource/assets/wdpop/guidesure/gstip1.png
+++ b/egret/resource/assets/wdpop/guidesure/gstip1.png
--- a/egret/resource/assets/wdpop/guidesure/gstip2.png
+++ b/egret/resource/assets/wdpop/guidesure/gstip2.png
--- a/egret/resource/assets/wdpop/guidesure/gsunder.png
+++ b/egret/resource/assets/wdpop/guidesure/gsunder.png
--- a/egret/resource/assets/wdpop/leave/leaveBG.png
+++ b/egret/resource/assets/wdpop/leave/leaveBG.png
--- a/egret/resource/assets/wdpop/leave/leavenext.png
+++ b/egret/resource/assets/wdpop/leave/leavenext.png
--- a/egret/resource/assets/wdpop/leave/leavesure.png
+++ b/egret/resource/assets/wdpop/leave/leavesure.png
--- a/egret/resource/assets/wdpop/leave/leavetext.png
+++ b/egret/resource/assets/wdpop/leave/leavetext.png
--- a/egret/resource/assets/wdpop/loading/loadingBG.jpg
+++ b/egret/resource/assets/wdpop/loading/loadingBG.jpg
--- a/egret/resource/assets/wdpop/loading/loadinggirl.png
+++ b/egret/resource/assets/wdpop/loading/loadinggirl.png
--- a/egret/resource/assets/wdpop/loading/loadingline.png
+++ b/egret/resource/assets/wdpop/loading/loadingline.png
--- a/egret/resource/assets/wdpop/loading/loadingload.png
+++ b/egret/resource/assets/wdpop/loading/loadingload.png
--- a/egret/resource/assets/wdpop/loading/loadingpro.png
+++ b/egret/resource/assets/wdpop/loading/loadingpro.png
--- a/egret/resource/assets/wdpop/pay/payBG.png
+++ b/egret/resource/assets/wdpop/pay/payBG.png
--- a/egret/resource/assets/wdpop/pay/payBtn.png
+++ b/egret/resource/assets/wdpop/pay/payBtn.png
--- a/egret/resource/assets/option/line.png
+++ b/egret/resource/assets/option/line.png
--- a/egret/resource/assets/wdpop/pay/paytitle.png
+++ b/egret/resource/assets/wdpop/pay/paytitle.png
--- a/egret/resource/assets/wdpop/pumped/changeBtn.png
+++ b/egret/resource/assets/wdpop/pumped/changeBtn.png
--- a/egret/resource/assets/wdpop/pumped/changetext.png
+++ b/egret/resource/assets/wdpop/pumped/changetext.png
--- a/egret/resource/assets/wdpop/pumped/littlesta.png
+++ b/egret/resource/assets/wdpop/pumped/littlesta.png
--- a/egret/resource/assets/wdpop/pumped/okBtn.png
+++ b/egret/resource/assets/wdpop/pumped/okBtn.png
--- a/egret/resource/assets/wdpop/pumped/oktext.png
+++ b/egret/resource/assets/wdpop/pumped/oktext.png
--- a/egret/resource/assets/wdpop/pumped/plight1.png
+++ b/egret/resource/assets/wdpop/pumped/plight1.png
--- a/egret/resource/assets/wdpop/pumped/plight2.png
+++ b/egret/resource/assets/wdpop/pumped/plight2.png
--- a/egret/resource/assets/wdpop/pumped/pstart1.png
+++ b/egret/resource/assets/wdpop/pumped/pstart1.png
--- a/egret/resource/assets/wdpop/pumped/pstart2.png
+++ b/egret/resource/assets/wdpop/pumped/pstart2.png
--- a/egret/resource/assets/wdpop/pumped/pstart3.png
+++ b/egret/resource/assets/wdpop/pumped/pstart3.png
--- a/egret/resource/assets/wdpop/pumped/pumpedBG.png
+++ b/egret/resource/assets/wdpop/pumped/pumpedBG.png
--- a/egret/resource/assets/wdpop/pumped/pumpedBtn.png
+++ b/egret/resource/assets/wdpop/pumped/pumpedBtn.png
--- a/egret/resource/assets/wdpop/pumped/pumpedlight.png
+++ b/egret/resource/assets/wdpop/pumped/pumpedlight.png
--- a/egret/resource/assets/wdpop/pumped/pumpedpoint.png
+++ b/egret/resource/assets/wdpop/pumped/pumpedpoint.png
--- a/egret/resource/assets/wdpop/pumped/pumpedstart.png
+++ b/egret/resource/assets/wdpop/pumped/pumpedstart.png
--- a/egret/resource/assets/wdpop/pumped/pumpedtext.png
+++ b/egret/resource/assets/wdpop/pumped/pumpedtext.png
--- a/egret/resource/assets/wdpop/revenue/revenueBG.png
+++ b/egret/resource/assets/wdpop/revenue/revenueBG.png
--- a/egret/resource/assets/wdpop/revenue/revenueBtn.png
+++ b/egret/resource/assets/wdpop/revenue/revenueBtn.png
--- a/egret/resource/assets/wdpop/revenue/revenuecoin.png
+++ b/egret/resource/assets/wdpop/revenue/revenuecoin.png
--- a/egret/resource/assets/wdpop/share/shareBG.png
+++ b/egret/resource/assets/wdpop/share/shareBG.png
--- a/egret/resource/assets/wdpop/share/shareBtn.png
+++ b/egret/resource/assets/wdpop/share/shareBtn.png
--- a/egret/resource/assets/wdpop/sign/desktop.ini
+++ b/egret/resource/assets/wdpop/sign/desktop.ini
--- a/egret/resource/assets/wdpop/sign/sign10.png
+++ b/egret/resource/assets/wdpop/sign/sign10.png
--- a/egret/resource/assets/wdpop/sign/sign2.png
+++ b/egret/resource/assets/wdpop/sign/sign2.png
--- a/egret/resource/assets/wdpop/sign/sign30.png
+++ b/egret/resource/assets/wdpop/sign/sign30.png
--- a/egret/resource/assets/wdpop/sign/sign6.png
+++ b/egret/resource/assets/wdpop/sign/sign6.png
--- a/egret/resource/assets/wdpop/sign/signBG.png
+++ b/egret/resource/assets/wdpop/sign/signBG.png
--- a/egret/resource/assets/wdpop/sign/signBtn.png
+++ b/egret/resource/assets/wdpop/sign/signBtn.png
--- a/egret/resource/assets/wdpop/sign/signcoin.png
+++ b/egret/resource/assets/wdpop/sign/signcoin.png
--- a/egret/resource/assets/wdpop/sign/signlit.png
+++ b/egret/resource/assets/wdpop/sign/signlit.png
--- a/egret/resource/assets/wdpop/sign/signok.png
+++ b/egret/resource/assets/wdpop/sign/signok.png
--- a/egret/resource/assets/wdpop/task/btnBG.png
+++ b/egret/resource/assets/wdpop/task/btnBG.png
--- a/egret/resource/assets/wdpop/task/task1.png
+++ b/egret/resource/assets/wdpop/task/task1.png
--- a/egret/resource/assets/wdpop/task/task1Btn1.png
+++ b/egret/resource/assets/wdpop/task/task1Btn1.png
--- a/egret/resource/assets/wdpop/task/task1Btn2.png
+++ b/egret/resource/assets/wdpop/task/task1Btn2.png
--- a/egret/resource/assets/wdpop/task/task2.png
+++ b/egret/resource/assets/wdpop/task/task2.png
--- a/egret/resource/assets/wdpop/task/task2Btn1.png
+++ b/egret/resource/assets/wdpop/task/task2Btn1.png
--- a/egret/resource/assets/wdpop/task/task2Btn2.png
+++ b/egret/resource/assets/wdpop/task/task2Btn2.png
--- a/egret/resource/assets/wdpop/task/task3.png
+++ b/egret/resource/assets/wdpop/task/task3.png
--- a/egret/resource/assets/wdpop/task/task3Btn1.png
+++ b/egret/resource/assets/wdpop/task/task3Btn1.png
--- a/egret/resource/assets/wdpop/task/task3Btn2.png
+++ b/egret/resource/assets/wdpop/task/task3Btn2.png
--- a/egret/resource/assets/wdpop/task/task4.png
+++ b/egret/resource/assets/wdpop/task/task4.png
--- a/egret/resource/assets/wdpop/task/task4Btn1.png
+++ b/egret/resource/assets/wdpop/task/task4Btn1.png
--- a/egret/resource/assets/wdpop/task/task4Btn2.png
+++ b/egret/resource/assets/wdpop/task/task4Btn2.png
--- a/egret/resource/assets/wdpop/task/task5.png
+++ b/egret/resource/assets/wdpop/task/task5.png
--- a/egret/resource/assets/wdpop/task/task6.png
+++ b/egret/resource/assets/wdpop/task/task6.png
--- a/egret/resource/assets/wdpop/task/task6Btn1.png
+++ b/egret/resource/assets/wdpop/task/task6Btn1.png
--- a/egret/resource/assets/wdpop/task/task6Btn2.png
+++ b/egret/resource/assets/wdpop/task/task6Btn2.png
--- a/egret/resource/assets/wdpop/task/task7.png
+++ b/egret/resource/assets/wdpop/task/task7.png
--- a/egret/resource/assets/wdpop/task/task8.png
+++ b/egret/resource/assets/wdpop/task/task8.png
--- a/egret/resource/assets/wdpop/task/task9.png
+++ b/egret/resource/assets/wdpop/task/task9.png
--- a/egret/resource/assets/wdpop/task/task9Btn1.png
+++ b/egret/resource/assets/wdpop/task/task9Btn1.png
--- a/egret/resource/assets/wdpop/task/task9Btn2.png
+++ b/egret/resource/assets/wdpop/task/task9Btn2.png
--- a/egret/resource/assets/wdpop/task/taskBG.png
+++ b/egret/resource/assets/wdpop/task/taskBG.png
--- a/egret/resource/assets/wdpop/task/taskclock.png
+++ b/egret/resource/assets/wdpop/task/taskclock.png
--- a/egret/resource/assets/wdpop/task/taskevery.png
+++ b/egret/resource/assets/wdpop/task/taskevery.png
--- a/egret/resource/assets/wdpop/task/taskeveryBG.png
+++ b/egret/resource/assets/wdpop/task/taskeveryBG.png
--- a/egret/resource/assets/wdpop/task/taskeveryline.png
+++ b/egret/resource/assets/wdpop/task/taskeveryline.png
--- a/egret/resource/assets/wdpop/task/taskfin.png
+++ b/egret/resource/assets/wdpop/task/taskfin.png
--- a/egret/resource/assets/wdpop/task/tasklittleBG.png
+++ b/egret/resource/assets/wdpop/task/tasklittleBG.png
--- a/egret/resource/assets/wdpop/task/tomorrow.png
+++ b/egret/resource/assets/wdpop/task/tomorrow.png
--- a/egret/resource/assets/wdpop/uplevel/upBG.png
+++ b/egret/resource/assets/wdpop/uplevel/upBG.png
--- a/egret/resource/assets/wdpop/uplevel/uplight.png
+++ b/egret/resource/assets/wdpop/uplevel/uplight.png
--- a/egret/resource/assets/wdpop/uplevel/upshow.png
+++ b/egret/resource/assets/wdpop/uplevel/upshow.png
--- a/egret/resource/assets/文案.png
+++ b/egret/resource/assets/文案.png
--- a/egret/resource/default.res.json
+++ b/egret/resource/default.res.json
--- a/egret/resource/default.thm.json
+++ b/egret/resource/default.thm.json
--- a/egret/resource/skins/AlertSkin.exml
+++ b/egret/resource/skins/AlertSkin.exml
--- a/egret/resource/skins/BeginSkin.exml
+++ b/egret/resource/skins/BeginSkin.exml
--- a/egret/resource/skins/LoadingSkin.exml
+++ b/egret/resource/skins/LoadingSkin.exml
--- a/egret/resource/skins/MainSkin.exml
+++ b/egret/resource/skins/MainSkin.exml
--- a/egret/resource/skins/MinorSkin.exml
+++ b/egret/resource/skins/MinorSkin.exml
--- a/egret/resource/skins/MinorSkin2.exml
+++ b/egret/resource/skins/MinorSkin2.exml
--- a/egret/resource/skins/MsgSkin.exml
+++ b/egret/resource/skins/MsgSkin.exml
--- a/egret/resource/skins/OptionItemSkin.exml
+++ b/egret/resource/skins/OptionItemSkin.exml
--- a/egret/resource/skins/OptionsSkin.exml
+++ b/egret/resource/skins/OptionsSkin.exml
--- a/egret/resource/skins/PlaySkin.exml
+++ b/egret/resource/skins/PlaySkin.exml
--- a/egret/resource/skins/PrizeSkin.exml
+++ b/egret/resource/skins/PrizeSkin.exml
--- a/egret/resource/skins/RankItemSkin.exml
+++ b/egret/resource/skins/RankItemSkin.exml
--- a/egret/resource/skins/RankSkin.exml
+++ b/egret/resource/skins/RankSkin.exml
--- a/egret/resource/skins/RuleSkin.exml
+++ b/egret/resource/skins/RuleSkin.exml
--- a/egret/resource/skins/ShopItemSkin.exml
+++ b/egret/resource/skins/ShopItemSkin.exml
--- a/egret/resource/skins/ShopSkin.exml
+++ b/egret/resource/skins/ShopSkin.exml
--- a/egret/resource/skins/StartSkin.exml
+++ b/egret/resource/skins/StartSkin.exml
--- a/egret/resource/skins/ToastSkin.exml
+++ b/egret/resource/skins/ToastSkin.exml
--- a/egret/resource/skins/WaitingSkin.exml
+++ b/egret/resource/skins/WaitingSkin.exml
--- a/egret/resource/skins/components/IconButtonSkin.exml
+++ b/egret/resource/skins/components/IconButtonSkin.exml
--- a/egret/resource/skins/components/MoneyBarSkin.exml
+++ b/egret/resource/skins/components/MoneyBarSkin.exml
--- a/egret/resource/skins/components/MusicButtonSkin.exml
+++ b/egret/resource/skins/components/MusicButtonSkin.exml
--- a/egret/resource/skins/components/ProgressBarSkin.exml
+++ b/egret/resource/skins/components/ProgressBarSkin.exml
--- a/egret/resource/skins/components/SliderSkin.exml
+++ b/egret/resource/skins/components/SliderSkin.exml
--- a/egret/resource/skins/components/StartButtonSkin.exml
+++ b/egret/resource/skins/components/StartButtonSkin.exml
--- a/egret/resource/skins/mainEle/AddSpeedSkin.exml
+++ b/egret/resource/skins/mainEle/AddSpeedSkin.exml
--- a/egret/resource/skins/mainEle/CoinNumSkin.exml
+++ b/egret/resource/skins/mainEle/CoinNumSkin.exml
--- a/egret/resource/skins/mainEle/CollectBtnSkin.exml
+++ b/egret/resource/skins/mainEle/CollectBtnSkin.exml
--- a/egret/resource/skins/mainEle/DiamondNumSkin.exml
+++ b/egret/resource/skins/mainEle/DiamondNumSkin.exml
--- a/egret/resource/skins/mainEle/FriendItemSkin.exml
+++ b/egret/resource/skins/mainEle/FriendItemSkin.exml
--- a/egret/resource/skins/mainEle/NicknameSKin1.exml
+++ b/egret/resource/skins/mainEle/NicknameSKin1.exml
--- a/egret/resource/skins/mainEle/PayBtnSkin.exml
+++ b/egret/resource/skins/mainEle/PayBtnSkin.exml
--- a/egret/resource/skins/pop/ConvertSkin.exml
+++ b/egret/resource/skins/pop/ConvertSkin.exml
--- a/egret/resource/skins/pop/FoodEndSkin.exml
+++ b/egret/resource/skins/pop/FoodEndSkin.exml
--- a/egret/resource/skins/pop/FoodGoSkin.exml
+++ b/egret/resource/skins/pop/FoodGoSkin.exml
--- a/egret/resource/skins/pop/FoodReadySkin.exml
+++ b/egret/resource/skins/pop/FoodReadySkin.exml
--- a/egret/resource/skins/pop/GiftItemSkin.exml
+++ b/egret/resource/skins/pop/GiftItemSkin.exml
--- a/egret/resource/skins/pop/GiftListSkin.exml
+++ b/egret/resource/skins/pop/GiftListSkin.exml
--- a/egret/resource/skins/pop/GiftSkin.exml
+++ b/egret/resource/skins/pop/GiftSkin.exml
--- a/egret/resource/skins/pop/GiftSuccessSkin.exml
+++ b/egret/resource/skins/pop/GiftSuccessSkin.exml
--- a/egret/resource/skins/pop/GlOptionSkin.exml
+++ b/egret/resource/skins/pop/GlOptionSkin.exml
--- a/egret/resource/skins/pop/GuideBuySkin.exml
+++ b/egret/resource/skins/pop/GuideBuySkin.exml
--- a/egret/resource/skins/pop/GuideNewSkin.exml
+++ b/egret/resource/skins/pop/GuideNewSkin.exml
--- a/egret/resource/skins/pop/GuideSureSkin.exml
+++ b/egret/resource/skins/pop/GuideSureSkin.exml
--- a/egret/resource/skins/pop/LeaveSkin.exml
+++ b/egret/resource/skins/pop/LeaveSkin.exml
--- a/egret/resource/skins/pop/PaySkin.exml
+++ b/egret/resource/skins/pop/PaySkin.exml
--- a/egret/resource/skins/pop/PumpedSkin.exml
+++ b/egret/resource/skins/pop/PumpedSkin.exml
--- a/egret/resource/skins/pop/RevenueSkin.exml
+++ b/egret/resource/skins/pop/RevenueSkin.exml
--- a/egret/resource/skins/pop/ShareSkin.exml
+++ b/egret/resource/skins/pop/ShareSkin.exml
--- a/egret/resource/skins/pop/SignSkin.exml
+++ b/egret/resource/skins/pop/SignSkin.exml
--- a/egret/resource/skins/pop/TaskSkin.exml
+++ b/egret/resource/skins/pop/TaskSkin.exml
--- a/egret/resource/skins/pop/UpLevelSkin.exml
+++ b/egret/resource/skins/pop/UpLevelSkin.exml
--- a/egret/scripts/MyExmlPlugin.ts
+++ b/egret/scripts/MyExmlPlugin.ts
--- a/egret/src/GameConst.ts
+++ b/egret/src/GameConst.ts
--- a/egret/src/Gift/ExchangeItemConfig.ts
+++ b/egret/src/Gift/ExchangeItemConfig.ts
--- a/egret/src/Gift/GiftScene.ts
+++ b/egret/src/Gift/GiftScene.ts
--- a/egret/src/Main.ts
+++ b/egret/src/Main.ts
--- a/egret/src/NetConst.ts
+++ b/egret/src/NetConst.ts
--- a/egret/src/NetModel.ts
+++ b/egret/src/NetModel.ts
--- a/egret/src/SceneTransitionAni.ts
+++ b/egret/src/SceneTransitionAni.ts
--- a/egret/libs/new_wx/components/Alert.ts
+++ b/egret/libs/new_wx/components/Alert.ts
--- a/egret/src/alert/Msg.ts
+++ b/egret/src/alert/Msg.ts
--- a/egret/src/beginScene/BeginScene.ts
+++ b/egret/src/beginScene/BeginScene.ts
--- a/egret/libs/new_wx/components/ComponentBase.ts
+++ b/egret/libs/new_wx/components/ComponentBase.ts
--- a/egret/libs/new_wx/components/SheetAnimation.ts
+++ b/egret/libs/new_wx/components/SheetAnimation.ts
--- a/egret/src/ctrls/BuriedCtrl.ts
+++ b/egret/src/ctrls/BuriedCtrl.ts
--- a/egret/src/ctrls/MovieClipCtrl.ts
+++ b/egret/src/ctrls/MovieClipCtrl.ts
--- a/egret/libs/new_wx/ctrls/panelCtrl.ts
+++ b/egret/libs/new_wx/ctrls/panelCtrl.ts
--- a/egret/libs/new_wx/ctrls/sceneCtrl.ts
+++ b/egret/libs/new_wx/ctrls/sceneCtrl.ts
--- a/egret/src/ctrls/soundCtrl.ts
+++ b/egret/src/ctrls/soundCtrl.ts
--- a/egret/src/ctrls/svgaCtrl.ts
+++ b/egret/src/ctrls/svgaCtrl.ts
--- a/egret/src/ctrls/toastCtrl.ts
+++ b/egret/src/ctrls/toastCtrl.ts
--- a/egret/src/decoration/DecorationPanel.ts
+++ b/egret/src/decoration/DecorationPanel.ts
--- a/egret/src/exchangeTip/ExchangeTipPanel.ts
+++ b/egret/src/exchangeTip/ExchangeTipPanel.ts
--- a/egret/src/getCredits/GetCreditsPanel.ts
+++ b/egret/src/getCredits/GetCreditsPanel.ts
--- a/egret/src/loadingScene/LoadingScene.ts
+++ b/egret/src/loadingScene/LoadingScene.ts
--- a/egret/src/loadingScene/ProgressBar.ts
+++ b/egret/src/loadingScene/ProgressBar.ts
--- a/egret/src/login/LoginPanel.ts
+++ b/egret/src/login/LoginPanel.ts
--- a/egret/src/mainScene/AddSpeed.ts
+++ b/egret/src/mainScene/AddSpeed.ts
--- a/egret/src/mainScene/Ani.ts
+++ b/egret/src/mainScene/Ani.ts
--- a/egret/src/mainScene/EquipmentConfig.ts
+++ b/egret/src/mainScene/EquipmentConfig.ts
--- a/egret/src/mainScene/MainScene.ts
+++ b/egret/src/mainScene/MainScene.ts
--- a/egret/src/minorScene/MinorScene.ts
+++ b/egret/src/minorScene/MinorScene.ts
--- a/egret/src/playScene/PlayScene.ts
+++ b/egret/src/playScene/PlayScene.ts
--- a/egret/src/pop/ConvertPanel.ts
+++ b/egret/src/pop/ConvertPanel.ts
--- a/egret/src/pop/FoodEndPanel.ts
+++ b/egret/src/pop/FoodEndPanel.ts
--- a/egret/src/pop/FoodGoPanel.ts
+++ b/egret/src/pop/FoodGoPanel.ts
--- a/egret/src/pop/FoodReadyPanel.ts
+++ b/egret/src/pop/FoodReadyPanel.ts
--- a/egret/src/pop/GiftListPanel.ts
+++ b/egret/src/pop/GiftListPanel.ts
--- a/egret/src/pop/GiftSuccessPanel.ts
+++ b/egret/src/pop/GiftSuccessPanel.ts
--- a/egret/src/pop/GuideBuyPanel.ts
+++ b/egret/src/pop/GuideBuyPanel.ts
--- a/egret/src/pop/GuideNewPanel.ts
+++ b/egret/src/pop/GuideNewPanel.ts
--- a/egret/src/pop/GuideSurePanel.ts
+++ b/egret/src/pop/GuideSurePanel.ts
--- a/egret/src/pop/LeavePanel.ts
+++ b/egret/src/pop/LeavePanel.ts
--- a/egret/src/pop/PayPanel.ts
+++ b/egret/src/pop/PayPanel.ts
--- a/egret/src/pop/PumpedPanel.ts
+++ b/egret/src/pop/PumpedPanel.ts
--- a/egret/src/pop/RevenuePanel.ts
+++ b/egret/src/pop/RevenuePanel.ts
--- a/egret/src/pop/SharePanel.ts
+++ b/egret/src/pop/SharePanel.ts
--- a/egret/src/pop/SignPanel.ts
+++ b/egret/src/pop/SignPanel.ts
--- a/egret/src/pop/TaskPanel.ts
+++ b/egret/src/pop/TaskPanel.ts
--- a/egret/src/pop/UpLevelPanel.ts
+++ b/egret/src/pop/UpLevelPanel.ts
--- a/egret/src/prize/NoPrizePanel.ts
+++ b/egret/src/prize/NoPrizePanel.ts
--- a/egret/src/prize/PrizePanel.ts
+++ b/egret/src/prize/PrizePanel.ts
--- a/egret/src/prize/data/ImgSizeType.ts
+++ b/egret/src/prize/data/ImgSizeType.ts
--- a/egret/src/prize/data/getOptionImgSize.ts
+++ b/egret/src/prize/data/getOptionImgSize.ts
--- a/egret/libs/new_wx/HtmlTextParser.ts
+++ b/egret/libs/new_wx/HtmlTextParser.ts
--- a/egret/src/rulePanel/RulePanel.ts
+++ b/egret/src/rulePanel/RulePanel.ts
--- a/egret/src/shopScene/ShopScene.ts
+++ b/egret/src/shopScene/ShopScene.ts
--- a/egret/src/startScene/StartScene.ts
+++ b/egret/src/startScene/StartScene.ts
--- a/egret/src/statistics.ts
+++ b/egret/src/statistics.ts
--- a/egret/src/types/sceneTypes.ts
+++ b/egret/src/types/sceneTypes.ts
--- a/egret/src/utils.ts
+++ b/egret/src/utils.ts
--- a/egret/libs/new_wx/components/Panel.ts
+++ b/egret/libs/new_wx/components/Panel.ts
--- a/egret/libs/new_wx/components/Scene.ts
+++ b/egret/libs/new_wx/components/Scene.ts
--- a/egret/src/views/Toast.ts
+++ b/egret/src/views/Toast.ts
--- a/egret/libs/new_wx/views/layers.ts
+++ b/egret/libs/new_wx/views/layers.ts
--- a/egret/libs/new_wx/components/Loading.ts
+++ b/egret/libs/new_wx/components/Loading.ts
--- a/egret/src/warning/WarningPanel.ts
+++ b/egret/src/warning/WarningPanel.ts
--- a/mock/config.js
+++ b/mock/config.js
--- a/mock/customization/answer.json
+++ b/mock/customization/answer.json
--- a/mock/customization/collectSoup.json
+++ b/mock/customization/collectSoup.json
--- a/mock/customization/shrimpFishingIndex.json
+++ b/mock/customization/shrimpFishingIndex.json
--- a/mock/customization/takePrize.json
+++ b/mock/customization/takePrize.json
--- a/mock/customization/taskList.json
+++ b/mock/customization/taskList.json
--- a/mock/customization/winners.json
+++ b/mock/customization/winners.json
--- a/mock/json/addValue.json
+++ b/mock/json/addValue.json
--- a/mock/json/adopte.json
+++ b/mock/json/adopte.json
--- a/mock/json/adoptePig.json
+++ b/mock/json/adoptePig.json
--- a/mock/json/batchCollectFood.json
+++ b/mock/json/batchCollectFood.json
--- a/mock/json/chooseCamp.json
+++ b/mock/json/chooseCamp.json
--- a/mock/json/clearValue.json
+++ b/mock/json/clearValue.json
--- a/mock/json/collectExtra.json
+++ b/mock/json/collectExtra.json
--- a/mock/json/doJoinPlugdraw3.json
+++ b/mock/json/doJoinPlugdraw3.json
--- a/mock/json/doSign.json
+++ b/mock/json/doSign.json
--- a/mock/json/feed.json
+++ b/mock/json/feed.json
--- a/mock/json/getAllPet.json
+++ b/mock/json/getAllPet.json
--- a/mock/json/getCollectRule.json
+++ b/mock/json/getCollectRule.json
--- a/mock/json/getCollectRule2.json
+++ b/mock/json/getCollectRule2.json
--- a/mock/json/getGameSubmitResult.json
+++ b/mock/json/getGameSubmitResult.json
--- a/mock/json/getGameSubmitResult3.json
+++ b/mock/json/getGameSubmitResult3.json
--- a/mock/json/getInfo.json
+++ b/mock/json/getInfo.json
--- a/mock/json/getPetInfo.json
+++ b/mock/json/getPetInfo.json
--- a/mock/json/getPetsInfo.json
+++ b/mock/json/getPetsInfo.json
--- a/mock/json/getPetsInfo4.json
+++ b/mock/json/getPetsInfo4.json
--- a/mock/json/getPlugDrawPrizeInfo.json
+++ b/mock/json/getPlugDrawPrizeInfo.json
--- a/mock/json/getPlugOrderStatus.1.json
+++ b/mock/json/getPlugOrderStatus.1.json
--- a/mock/json/getPlugOrderStatus.json
+++ b/mock/json/getPlugOrderStatus.json
--- a/mock/json/getPrizeInfo.json
+++ b/mock/json/getPrizeInfo.json
--- a/mock/json/getQRCode.json
+++ b/mock/json/getQRCode.json
--- a/mock/json/getRule.json
+++ b/mock/json/getRule.json
--- a/mock/json/getSignResult.json
+++ b/mock/json/getSignResult.json
--- a/mock/json/getValentineInfo.json
+++ b/mock/json/getValentineInfo.json
--- a/mock/json/milk.json
+++ b/mock/json/milk.json
--- a/mock/json/milking.json
+++ b/mock/json/milking.json
--- a/mock/json/openCollectGoodsPrize.json
+++ b/mock/json/openCollectGoodsPrize.json
--- a/mock/json/petConfigs.json
+++ b/mock/json/petConfigs.json
--- a/mock/json/queryTaskList.json
+++ b/mock/json/queryTaskList.json
--- a/mock/json/realtimerank.json
+++ b/mock/json/realtimerank.json
--- a/mock/json/rename.json
+++ b/mock/json/rename.json
--- a/mock/json/sendInfo.json
+++ b/mock/json/sendInfo.json
--- a/mock/json/signInfo.json
+++ b/mock/json/signInfo.json
--- a/mock/json/signactivity.json
+++ b/mock/json/signactivity.json
--- a/mock/json/submitScore.json
+++ b/mock/json/submitScore.json
--- a/mock/json/toyUse.json
+++ b/mock/json/toyUse.json
--- a/mock/json/updateDuration.json
+++ b/mock/json/updateDuration.json
--- a/mock/json/valentineDoJoin.json
+++ b/mock/json/valentineDoJoin.json
--- a/mock/json/wordsCheck.json
+++ b/mock/json/wordsCheck.json
--- a/mock/newGame/ajaxElement.json
+++ b/mock/newGame/ajaxElement.json
--- a/mock/newGame/datapash.json
+++ b/mock/newGame/datapash.json
--- a/mock/newGame/doJoin.json
+++ b/mock/newGame/doJoin.json
--- a/mock/newGame/getNgameStartStatus.json
+++ b/mock/newGame/getNgameStartStatus.json
--- a/mock/newGame/getOrderStatus.json
+++ b/mock/newGame/getOrderStatus.json
--- a/mock/newGame/getOrderStatus2.json
+++ b/mock/newGame/getOrderStatus2.json
--- a/mock/newGame/ngameManySubmit.json
+++ b/mock/newGame/ngameManySubmit.json
--- a/mock/newGame/ngameSubmit.json
+++ b/mock/newGame/ngameSubmit.json
--- a/mock/newGame/rankList.json
+++ b/mock/newGame/rankList.json
--- a/mock/newGame/rankList2.json
+++ b/mock/newGame/rankList2.json
--- a/mock/newGame/resurrection.json
+++ b/mock/newGame/resurrection.json
--- a/mock/newGame/resurrectionStatus.json
+++ b/mock/newGame/resurrectionStatus.json
--- a/mock/weidian/Pay.json
+++ b/mock/weidian/Pay.json
--- a/mock/weidian/addSpeed.json
+++ b/mock/weidian/addSpeed.json
--- a/mock/weidian/doShare.json
+++ b/mock/weidian/doShare.json
--- a/mock/weidian/doSign.json
+++ b/mock/weidian/doSign.json
--- a/mock/weidian/exchange.json
+++ b/mock/weidian/exchange.json
--- a/mock/weidian/exchangeList.json
+++ b/mock/weidian/exchangeList.json
--- a/mock/weidian/getEquipments.json
+++ b/mock/weidian/getEquipments.json
--- a/mock/weidian/getFriendDetail.json
+++ b/mock/weidian/getFriendDetail.json
--- a/mock/weidian/getFriendsInfo.json
+++ b/mock/weidian/getFriendsInfo.json
--- a/mock/weidian/getFriendsInfos.json
+++ b/mock/weidian/getFriendsInfos.json
--- a/mock/weidian/getInvite.json
+++ b/mock/weidian/getInvite.json
--- a/mock/weidian/getJumpUrl.json
+++ b/mock/weidian/getJumpUrl.json
--- a/mock/weidian/getPayCount.json
+++ b/mock/weidian/getPayCount.json
--- a/mock/weidian/getPrize.json
+++ b/mock/weidian/getPrize.json
--- a/mock/weidian/getProjectUserInfo.json
+++ b/mock/weidian/getProjectUserInfo.json
--- a/mock/weidian/getShopDetail.json
+++ b/mock/weidian/getShopDetail.json
--- a/mock/weidian/getShopStatus.json
+++ b/mock/weidian/getShopStatus.json
--- a/mock/weidian/getShopsInfo.json
+++ b/mock/weidian/getShopsInfo.json
--- a/mock/weidian/getShopsInfo1.json
+++ b/mock/weidian/getShopsInfo1.json
--- a/mock/weidian/getTaskInfo.json
+++ b/mock/weidian/getTaskInfo.json
--- a/mock/weidian/getVie.json
+++ b/mock/weidian/getVie.json
--- a/mock/weidian/getVieGold.json
+++ b/mock/weidian/getVieGold.json
--- a/mock/weidian/getrecord.json
+++ b/mock/weidian/getrecord.json
--- a/mock/weidian/goShare.json
+++ b/mock/weidian/goShare.json
--- a/mock/weidian/index.json
+++ b/mock/weidian/index.json
--- a/mock/weidian/openStore.json
+++ b/mock/weidian/openStore.json
--- a/mock/weidian/postVie.json
+++ b/mock/weidian/postVie.json
--- a/mock/weidian/receiveGold.json
+++ b/mock/weidian/receiveGold.json
--- a/mock/weidian/stealFriendGold.json
+++ b/mock/weidian/stealFriendGold.json
--- a/mock/weidian/stealShopGold.json
+++ b/mock/weidian/stealShopGold.json
--- a/mock/weidian/takeCoin.json
+++ b/mock/weidian/takeCoin.json
--- a/mock/weidian/takeReward.json
+++ b/mock/weidian/takeReward.json
--- a/mock/weidian/updateGold.json
+++ b/mock/weidian/updateGold.json
--- a/mock/weidian/upgrade.json
+++ b/mock/weidian/upgrade.json
--- a/package.json
+++ b/package.json
--- a/performance.md
+++ b/performance.md
--- a/tslint.json
+++ b/tslint.json
--- a/微店养成.txt
+++ b/微店养成.txt