Browse Source

Merge branch 'master' of http://47.100.37.243:10080/wutt/game

# Conflicts:
#	minigame/WebContent/js/main.js
sunyadv 5 years ago
parent
commit
bb0d3f9939

+ 15 - 0
minigame/WebContent/css/music.css

@@ -0,0 +1,15 @@
+/* music */
+@-webkit-keyframes reverseRotataZ{
+    0%{-webkit-transform: rotateZ(0deg);}
+    100%{-webkit-transform: rotateZ(-360deg);}
+}
+@-webkit-keyframes rotataZ{
+    0%{-webkit-transform: rotateZ(0deg);}
+    100%{-webkit-transform: rotateZ(360deg);}
+}
+#musicControl { position:fixed;right:10px;top:20px;margin-top:0;display:inline-block;z-index:99999999}
+#musicControl a { display:inline-block;width:25px;height:25px;overflow:hidden;background:url('../img/play.png') no-repeat;background-size:100%;}
+#musicControl a audio{width:100%;height:56px;}
+#musicControl a.stop { background-position:left bottom;}
+#musicControl a.on { background-position:0px 1px;-webkit-animation: reverseRotataZ 1.2s linear infinite;}
+#music_play_filter{width:100%;height:100%;overflow:hidden;position:fixed;top:0;left:0;z-index:99999998;}

BIN
minigame/WebContent/img/play.png


+ 122 - 110
minigame/WebContent/index.html

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html>
-  <head>
+<head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=0,minimum-scale=1.0,maximum-scale=1.0,minimal-ui">
@@ -16,138 +16,150 @@
     <script src="./js/flexiable.js"></script>
     <link rel="stylesheet" type="text/css" href="./css/animate.min.css?v=1">
     <link rel="stylesheet" type="text/css" href="./css/main.css?v=1">
+    <link rel="stylesheet" type="text/css" href="./css/music.css?v=1">
     <script src="https://cdn.bootcss.com/SoundJS/1.0.2/soundjs.min.js"></script>
-  </head>
+</head>
 <body onload="getInfo()">
-    <!-- loading -->
-    <div class="loading">
-        <div class="curtain-box">
-            <div class="txt rubberBand time6 iteration">
-                <img src="./img/loading/loading_txt.png">
-            </div>
-            <div class="loading-bar">
-                <p class="load-txt">远方快递正在为您准备美食...<span id="loadingTxt">80</span>%</p>
-                <div class="bar">
+<!-- loading -->
+<div class="loading">
+    <div class="curtain-box">
+        <div class="txt rubberBand time6 iteration">
+            <img src="./img/loading/loading_txt.png">
+        </div>
+        <div class="loading-bar">
+            <p class="load-txt">远方快递正在为您准备美食...<span id="loadingTxt">80</span>%</p>
+            <div class="bar">
                     <span id="loadingBar">
                         <i class="icon-load"></i>
                     </span>
-                </div>
             </div>
         </div>
     </div>
-    <!-- 主内容 -->
-    <div class="warp">
-        <!-- 选择菜 -->
-        <div class="select-dish-box">
-            <img src="./img/menu_tt.png" class="tt fadeIn time4 animated js-an">
-            <div class="list">
-                <div class="item bounceIn time3 animated js-an delay3">
-                    <img src="./img/menu1.png">
-                </div>
-                <div class="item bounceIn time3 animated js-an delay4">
-                    <img src="./img/menu2.png">
-                </div>
-                <div class="item bounceIn time3 animated js-an delay5">
-                    <img src="./img/menu3.png">
-                </div>
-                <div class="item bounceIn time3 animated js-an delay6">
-                    <img src="./img/menu4.png">
-                </div>
+</div>
+<!-- 主内容 -->
+<div class="warp">
+    <!-- 选择菜 -->
+    <div class="select-dish-box">
+        <img src="./img/menu_tt.png" class="tt fadeIn time4 animated js-an">
+        <div class="list">
+            <div class="item bounceIn time3 animated js-an delay3">
+                <img src="./img/menu1.png">
             </div>
-            <div class="confirm anim-btn"></div>
-        </div>
-        <!-- 游戏 -->
-        <div class="game-box">
-            <canvas id="canvas" width="640" height="1040"></canvas>
-        </div>
-    </div>
-    <!-- 海报 -->
-    <div class="poster-mode">
-        <img src="./img/logo.png" class="logo">
-        <img src="./img/poster/hsr.png" class="poster-img" id="poster">
-        <div class="leads-box">
-            <img src="./img/poster/headOil.png" class="pro">
-            <div class="form-group">
-                <input id="nameInput" type="text" placeholder="我想把这道菜送给TA">
-				<div id="nameText" class='msg' style='display:none;'></div>
+            <div class="item bounceIn time3 animated js-an delay4">
+                <img src="./img/menu2.png">
             </div>
-            <div class="form-group">
-                <input id="textInput" type="text" placeholder="我想对TA说">
-				<div id="text" class='msg' style='display:none;'></div>
+            <div class="item bounceIn time3 animated js-an delay5">
+                <img src="./img/menu3.png">
             </div>
-            <div class="user-info">
-                <div class="headimg-box">
-                    <img src="./img/headimg.png">
-                </div>
-                <p>微信昵称</p>
+            <div class="item bounceIn time3 animated js-an delay6">
+                <img src="./img/menu4.png">
             </div>
-            <!-- <div class="submit" onclick='saveText()'> -->
-                <!-- <img src="./img/share_btn.png"> -->
-            <!-- </div> -->
         </div>
-        <div class="qrcode-box">
-            <!-- <img src="./img/poster/qrcode.jpg"> -->
-			<img src="./img/poster/ewm.png">
-            <p>扫码为他做菜</p>
+        <div class="confirm anim-btn"></div>
+    </div>
+    <!-- 游戏 -->
+    <div class="game-box">
+        <canvas id="canvas" width="640" height="1040"></canvas>
+    </div>
+</div>
+<!-- 海报 -->
+<div class="poster-mode">
+    <img src="./img/logo.png" class="logo">
+    <img src="./img/poster/hsr.png" class="poster-img" id="poster">
+    <div class="leads-box">
+        <img src="./img/poster/headOil.png" class="pro">
+        <div class="form-group">
+            <input id="nameInput" type="text" placeholder="我想把这道菜送给TA">
+            <div id="nameText" class='msg' style='display:none;'></div>
         </div>
-        <div class="replay-btn">
-            <img src="./img/replay_btn.png">
+        <div class="form-group">
+            <input id="textInput" type="text" placeholder="我想对TA说">
+            <div id="text" class='msg' style='display:none;'></div>
         </div>
-        <!-- <div class="secret-btn"> -->
-            <!-- <img src="./img/secret_btn.png"> -->
-        <!-- </div> -->
-		<div class="secret-btn" onclick='saveText()'>
-            <img src="./img/share_btn.png">
+        <div class="user-info">
+            <div class="headimg-box">
+                <img src="./img/headimg.png">
+            </div>
+            <p>微信昵称</p>
         </div>
+        <!-- <div class="submit" onclick='saveText()'> -->
+        <!-- <img src="./img/share_btn.png"> -->
+        <!-- </div> -->
+    </div>
+    <div class="qrcode-box">
+        <!-- <img src="./img/poster/qrcode.jpg"> -->
+        <img src="./img/poster/ewm.png">
+        <p>扫码为他做菜</p>
+    </div>
+    <div class="replay-btn">
+        <img src="./img/replay_btn.png">
     </div>
-	
-	<img id="cover" style="width: 100%;height: 103%;position: absolute;top: 0;left: 0;z-index: 99999;display: none" src="./img/cover.png" onclick="hiddenCover()">
-	
-    <div class="secret-box">
-        <img src="./img/poster/secret1.png" id="secret">
+    <!-- <div class="secret-btn"> -->
+    <!-- <img src="./img/secret_btn.png"> -->
+    <!-- </div> -->
+    <div class="secret-btn" onclick='saveText()'>
+        <img src="./img/share_btn.png">
     </div>
+</div>
 
-    <!-- 摇一摇提示 -->
-    <div class="shake-mode">
-        <div class="shake-dialog">
-            <!-- <img src="./img/shake_fire.png"> -->
-            <div class="fire anim-fire" id="fire"></div>
-            <img src="./img/shake_icon.png" class="icon">
-            <img src="./img/shake_txt.png" class="txt">
-        </div>
+<img id="cover" style="width: 100%;height: 103%;position: absolute;top: 0;left: 0;z-index: 99999;display: none" src="./img/cover.png" onclick="hiddenCover()">
+
+<div class="secret-box">
+    <img src="./img/poster/secret1.png" id="secret">
+</div>
+
+<!-- 摇一摇提示 -->
+<div class="shake-mode">
+    <div class="shake-dialog">
+        <!-- <img src="./img/shake_fire.png"> -->
+        <div class="fire anim-fire" id="fire"></div>
+        <img src="./img/shake_icon.png" class="icon">
+        <img src="./img/shake_txt.png" class="txt">
     </div>
-    <script src="./js/jquery.min.js"></script>
-    <script src="./js/create.js"></script>
-    <script src="./js/tweenmax.js"></script>
-    <script src="./js/wechat.js"></script>
-    <script src="./assets.js"></script>
-    <script src="./js/main.js"></script>
-    <script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
-    <script>
-        // 判断微信分享
-        document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-            // 发送给好友
-            WeixinJSBridge.on('menu:share:appmessage', function(argv){
-                // alert('发送给好友')
-                setTimeout(function(){
-                    window.location.href = "http://wx.ttkuaiban.com/minigame/lottery.html";
-                }, 6000);
+</div>
+
+<span id="musicControl">
+        <a id="mc_play" class="on" onclick="play_music();">
+            <audio id="music" loop="loop" autoplay="autoplay">
+                <source src="sound/background_music.mp3" type="audio/mpeg">
+            </audio>
+        </a>
+    </span>
+
+<script src="http://res.wx.qq.com/connect/zh_CN/htmledition/js/wxLogin.js"></script>
+<script src="./js/jquery.min.js"></script>
+<script src="./js/create.js"></script>
+<script src="./js/tweenmax.js"></script>
+<script src="./js/wechat.js"></script>
+<script src="./assets.js"></script>
+<script src="./js/music.js"></script>
+<script src="./js/main.js"></script>
+
+<!--<script>-->
+<!--// 判断微信分享-->
+<!--document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {-->
+<!--// 发送给好友-->
+<!--WeixinJSBridge.on('menu:share:appmessage', function(argv){-->
+<!--// alert('发送给好友')-->
+<!--setTimeout(function(){-->
+<!--window.location.href = "http://wx.ttkuaiban.com/minigame/lottery.html";-->
+<!--}, 6000);-->
 
-            });
-            // 分享到朋友圈
-            WeixinJSBridge.on('menu:share:timeline', function(argv){
-                // alert('分享到朋友圈')
-                setTimeout(function(){
-                    window.location.href = "http://wx.ttkuaiban.com/minigame/lottery.html";
-                }, 6000);
+<!--});-->
+<!--// 分享到朋友圈-->
+<!--WeixinJSBridge.on('menu:share:timeline', function(argv){-->
+<!--// alert('分享到朋友圈')-->
+<!--setTimeout(function(){-->
+<!--window.location.href = "http://wx.ttkuaiban.com/minigame/lottery.html";-->
+<!--}, 6000);-->
 
-            });
-        }, false);
+<!--});-->
+<!--}, false);-->
 
-        // 判断微博分享
-        document.addEventListener('WeiboJSBridgeReady', function onBridgeReady() {
+<!--// 判断微博分享-->
+<!--document.addEventListener('WeiboJSBridgeReady', function onBridgeReady() {-->
 
-        }, false);
-    </script>
+<!--}, false);-->
+<!--</script>-->
 </body>
 </html>

+ 2 - 1
minigame/WebContent/js/main.js

@@ -32,7 +32,8 @@ for (i=0; i < params.length ; i++){
 
 
 function init() {
-    createjs.Sound.play("bgm", {loop: -1});
+    //createjs.Sound.play("bgm", {loop: -1});
+    just_play();
     var comp = AdobeAn.getComposition("5529E26743974F469545223C44E61D22");
     var lib = comp.getLibrary();
     var loader = new createjs.LoadQueue(false);

+ 69 - 0
minigame/WebContent/js/music.js

@@ -0,0 +1,69 @@
+function play_music(){
+    if ($('#mc_play').hasClass('on')){
+        $('#mc_play audio').get(0).pause();
+        $('#mc_play').attr('class','stop');
+    }else{
+        $('#mc_play audio').get(0).play();
+        $('#mc_play').attr('class','on');
+    }
+    var myVid = document.getElementById("music");
+    myVid.volume=0.1;
+    $('#music_play_filter').hide();
+    event.stopPropagation(); //阻止冒泡
+}
+
+function just_play(id){
+    $('#mc_play audio').get(0).play();
+    $('#mc_play').attr('class','on');
+    var myVid = document.getElementById("music");
+    myVid.volume=0.1;
+    if (typeof(id)!='undefined'){
+        $('#music_play_filter').hide();
+    }
+    event.stopPropagation(); //阻止冒泡
+}
+
+function is_weixn(){
+    return false;
+    var ua = navigator.userAgent.toLowerCase();
+    if(ua.match(/MicroMessenger/i)=="micromessenger") {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+var play_filter=document.getElementById('music_play_filter');
+
+play_filter.addEventListener('click', function(){
+    just_play(1);
+});
+
+play_filter.addEventListener('touchstart', function(){
+    just_play(1);
+});
+
+play_filter.addEventListener('touchend', function(){
+    just_play(1);
+});
+
+play_filter.addEventListener('touchmove', function(){
+    just_play(1);
+});
+
+play_filter.addEventListener('mousedown', function(){
+    just_play(1);
+});
+
+play_filter.addEventListener('mouseup', function(){
+    just_play(1);
+});
+
+play_filter.addEventListener('mousemove',function(){
+    just_play(1);
+});
+
+window.οnlοad=function(){
+
+    //$('#mc_play').click();
+}