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

egret/index1.html

+<!--<script src="https://yun.duiba.com.cn/db_games/debug/vconsole.min.js"></script>
+<script>
+  // init vConsole 11111
+  var vConsole = new VConsole();
+  console.log('Hello world');
+</script>          -->
+<meta name="full-screen" content="true" />
+<meta name="screen-orientation" content="portrait" />
+<meta name="x5-fullscreen" content="true" />
+<meta name="360-fullscreen" content="true" />
+<meta content="true" name="autoclick">
+<meta content="f73ee1cf" name="siteid">
+<meta content="Ag87JsAaAa" name="pageid">
+<script>
+    window['hbRainTime'] = 30;  // 红包雨倒计时
+    window['plugs'] = [];
+    var __startTime__ = Date.now();
+    window['imgver'] = '11112';
+    window['duiba'] = '/duiba';
+</script>
+
+<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:11111,y:0,size:12,textColor:0xffffff,bgAlpha:0.9">
+</div>
+<style>
+    html,
+    body {
+        -ms-touch-action: none;
+        background-color:#ccc;
+        background-size: 100%;
+        background-position:top;
+        background-image: url("https://yun.duiba.com.cn/db_games/activity/game/1573192567/resource/assets/startScene/startscenebg.jpg");
+        padding: 0;
+        border: 0;
+        margin: 0;
+        height: 100%;
+    }
+    @font-face {
+        font-family: "FZY3JW";
+        src: url("https://yun.duiba.com.cn/db_games/FZY3JW_1.TTF");
+    }
+
+    @font-face {
+        font-family: "FZY4JW";
+        src: url("https://yun.duiba.com.cn/db_games/FZY4JW.TTF");
+    }
+</style>
+<img id="pic" style="width:100%;position: absolute;z-index: 999;display: none;" />
+<script>
+    window['h5URL']   = "https://gameact.suning.com/duiba/customShare/share?id=3531";
+    window['h5URL2'] = "https://gameact.suning.com/duiba/customShare/share?id=3611";
+    window['signconfigs'] = [
+        {nums: '0.08元', type: 'quan8'},
+        {nums: '*1', type: 'hammer'},
+        {nums: '0.12元', type: 'quan12'},
+        {nums: '*1', type: 'boom'},
+        {nums: '0.16元', type: 'quan16'},
+        {nums: '*1', type: 'steps'},
+        {nums: '0.28元', type: 'quan28'}
+    ];
+
+    window['signActivityId']=564;
+    window['total_level'] = 14 + 13 * 19;
+    window['last_level'] = 250;//必须大于等于total_level
+
+    window['price1']=30;
+    window['price2']=50;
+    window['price3']=20;
+    window['price4']=30;
+    window['price5']=1000;
+
+    window['renderMode'] = 'webgl';
+    window['__link__']='http://res.m.suning.com/project/coupon/dist/red.html#/index';
+    window['rankId'] =58;
+    window['endtime']=1566057600000;
+    //游戏id
+    window["gameId"]="${id}";
+
+    //资源路径
+    var resPath = "https://yun.duiba.com.cn/db_games/activity/game/1576988929/";
+
+    //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 crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/libs/egret.all.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/libs/zepto_security_downloadApp.min.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/svga.egret.min2.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/libs/aes.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/libs/pad-zeropadding.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/game/1576988929/output.js"></script>
+<script crossorigin="anonymous" src="//yun.duiba.com.cn/db_games/activity/game/1576988929/resource/default.thm.js"></script>
+
+<script type="text/javascript" src="https://res.suning.cn/public/v5/??js/zepto/1.1.4/app.js,mod/alertBox/2.0.0/alertBox.js"></script>
+
+<!--生产
+<script type="text/javascript" src="https://iar-web.suning.com/iar-web/snstatic/SnCaptcha.js"></script>
+<script type="text/javascript" src="https://dfp.suning.com/dfprs-collect/dist/fp.js?appCode=oL5SyeefiMStfRSe"></script>-->
+
+
+<!-- 测试-->
+<script type="text/javascript" src="https://iar-webxg.cnsuning.com/iar-web/snstatic/SnCaptcha.js"></script>
+<script type="text/javascript" src="https://dfpxgpre.cnsuning.com/dfprs-collect/dist/fp.js?appCode=oL5SyeefiMStfRSe"></script>
+
+<script type="text/javascript" src="https://res.suning.cn/public/v5/js/vue/app.js"></script>
+<script src="//res.suning.cn/project/mvs/RES/common/script/android/sneapp.js"></script>
+
+<script>
+    var sharePic =  document.getElementById('pic');
+    sharePic.onclick = function(){
+        sharePic.style.display='none'
+    };
+
+    snVue.base.getEnvName=function(){return 'PRD'}
+    //snVue.base.getEnvName=function(){return 'XGPRE'}
+
+
+    snVue.token(()=>{ });
+
+    window.getRST=function(){
+        window.detect = bd.rst(); //获取人机参数
+        window._device_session_id = _dfp.getToken(); //获取设备指纹
+        console.log('detect====>', detect,  '\n_device_session_id====>',   _device_session_id)
+    }
+    //window['detect'] = 111;
+    //window['_device_session_id'] = 111;
+
+    var shareImgUrl='https://yun.duiba.com.cn/db_games/fishlogo.png';
+    var channel=1;
+    var title="狮狮连萌超好玩~我已经玩到第一了！";
+    CFG.wxShareTitle = title;
+    var content="我在萌狮消消乐等你来挑战哦";
+    var targetUrl='https://gameact.suning.com/sngame-web/api/duiba/private/v1/getLoginUrl.do?appCode=duiba&activityCode=3651404';
+    var iconUrl='https://yun.duiba.com.cn/db_games/fishlogo.png';
+    CFG.wxShareLink =targetUrl;
+    CFG.wxShareImg ='http://yun.duiba.com.cn/db_games/xiaoxiaole2.jpg';
+    var shareWays='1,2,3,4';
+    console.log("share");
+    CFG.wxShareDesc = content;
+
+    function share() {
+        console.log("AppReady");
+        if (isIphone()) {
+            console.log("IOS");
+            console.log(window.SNNativeClient);
+            window.callNativeShareResult = function () { };
+            window.SNNativeClient.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+        } else {
+            console.log("安卓");
+            console.log(shareApi);
+            console.log(shareApi.callMediaShare);
+            shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+        }
+
+    }
+    function isIphone() {
+        var ua = navigator.userAgent.toLocaleLowerCase();
+        if (ua.match(/iphone|ipad/)) {
+            return true;
+        } else if (ua.match(/android/)) {
+            return false;
+        }
+    }
+</script>
+
+<script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
+<script>
+    function invokeWX() {
+        console.log('invokeWX 执行了');
+        wx.onMenuShareTimeline({
+            title: CFG.wxShareTitle,//标题
+            link: CFG.wxShareLink,//链接
+            imgUrl: CFG.wxShareImg  ,//图片
+            success: function () { },
+            cancel: function () { }
+        });
+        wx.onMenuShareAppMessage({
+            title: CFG.wxShareTitle,//标题
+            desc: CFG.wxShareDesc,//描述
+            link: CFG.wxShareLink,//链接
+            imgUrl: CFG.wxShareImg  ,//图片
+            success: function (res) { },
+            cancel: function (res) { },
+            fail: function (res) { }
+        });
+    }
+    var registerWX = function(data ){
+
+        wx.config( {
+
+            debug: false,
+            appId: data.wxappid,
+            timestamp: data.wxtimestamp,
+            nonceStr: data.wxnonceStr,
+            signature:data.wxsignature,
+            jsApiList: ['checkJsApi', 'onMenuShareTimeline', 'onMenuShareAppMessage']
+        } );
+
+        wx.ready(function () {
+            invokeWX();
+        });
+
+    }
+
+
+    //registerWX();
+
+
+    /*
+     * 邀请有礼分享
+     */
+    function inviteShare(shareCode) {
+        let title = "狮狮连萌超好玩~我已经玩到第一了！";
+        let content = "我在萌狮消消乐等你来挑战哦";
+        let targetUrl = "https://gameact.suning.com/duiba/customShare/share?id=3531" + "&shareCode=" + shareCode; // 待修改
+        let iconUrl = "http://yun.duiba.com.cn/db_games/xiaoxiaole2.jpg";
+        let shareWays = "1,2";
+        console.log("AppReady");
+        if (isIphone()) {
+            console.log("IOS");
+            console.log(window.SNNativeClient);
+            window.callNativeShareResult = function () { };
+            window.SNNativeClient.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+        } else {
+            console.log("安卓");
+            console.log(shareApi);
+            console.log(shareApi.callMediaShare);
+            shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+        }
+    }
+    /*
+     * 刮刮卡分享
+     */
+    function scratchShare(shareCode) {
+        let title = "萌狮消消消";
+        let content = "超好玩的萌狮消消乐，快来和我一起玩吧~";
+        let targetUrl = "https://gameact.suning.com/duiba/customShare/share?id=3611" + "&shareCode=" + shareCode; // 待修改
+        let iconUrl = "http://yun.duiba.com.cn/db_games/xiaoxiaole2.jpg";
+        let shareWays = "1,2";
+        console.log("AppReady");
+        if (isIphone()) {
+            console.log("IOS");
+            console.log(window.SNNativeClient);
+            window.callNativeShareResult = function () { };
+            window.SNNativeClient.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+        } else {
+            console.log("安卓");
+            console.log(shareApi);
+            console.log(shareApi.callMediaShare);
+            shareApi.callNativeShare(title, content, targetUrl, iconUrl, shareWays);
+        }
+    }
+</script>
+<!--  -->
+

egret/src/mapScene/MapScene.ts

@@ -222,6 +222,15 @@ export default class MapScene extends Scene {
             }
             localStorage.setItem('taskCenter' + window['CFG'].consumerId, 'false');
 
+            let res = DataManager.ins.getData('hc_redBombBaseInfo');
+            if(res.data > 0){
+                let showBomb = localStorage.getItem('showBomb' + window['CFG'].consumerId);
+                if(showBomb != 'false'){
+                    localStorage.setItem('showBomb' + window['CFG'].consumerId, 'false');
+                    panels.push('BombTips2Panel');
+                }
+            }
+
             if(!readCache() && getHomeData().levels.length <= 0) { //引导
                 const guide = new GuideCon(() => {
                     PanelCtrl.instance.showPanels(panels, [], this.onAllPanelHide);

egret/src/panels/RedBombRule.ts

@@ -31,7 +31,7 @@ export default class RedBombRule extends Panel {
 
     private addRule() {
         const text = 
-        `<br>1、活动期间，所有游戏关卡均有机会触发圣诞铃铛任务，但每个关卡最多只可触发1次。
+        `<br>1、活动期间，所有游戏关卡均有机会触发圣诞铃铛任务。
 2、进入游戏关卡且发现圣诞铃铛后，需先连续消除3次圣诞铃铛附近的元素才可开启任务。
 3、任务开启后，在当前关卡规定的步数内，消除达到任务的目标数量即可获得圣诞奖励；未达到任务的目标数量，则无法获得圣诞奖励。
 4、若在当前关卡规定的步数内，消除未达到圣诞铃铛任务的目标数量但已达到本局关卡的目标数量，用户仍可领取本局关卡的游戏奖励。