Strona główna Odkrywaj Pomoc
Zarejestruj się Zaloguj się
wutt
/
game
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

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

Conflicts:
	minigame/WebContent/index.html
quyueting 5 lat temu
rodzic
32ea585846 719e595a04
commit
4ea93a3342
2 zmienionych plików z 118 dodań i 123 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 112 120
      minigame/WebContent/index.html
  2. 6 3
      minigame/WebContent/js/main.js

+ 112 - 120
minigame/WebContent/index.html
Wyświetl plik 

@@ -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">
 
@@ -15,152 +15,144 @@
 
     <title>贝蒂斯厨房</title>
 
     <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">
 
+    <link rel="stylesheet" type="text/css" href="./css/main.css?v=2">
 
     <script src="https://cdn.bootcss.com/SoundJS/1.0.2/soundjs.min.js"></script>
 
     <script src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
 
 </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>
 
-<!-- 主内容 -->
 
-<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 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="item bounceIn time3 animated js-an delay4">
 
-                <img src="./img/menu2.png">
 
+            <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="item bounceIn time3 animated js-an delay5">
 
-                <img src="./img/menu3.png">
 
+            <div class="form-group">
 
+                <input id="textInput" type="text" placeholder="我想对TA说">
 
+				<div id="text" class='msg' style='display:none;'></div>
 
             </div>
 
-            <div class="item bounceIn time3 animated js-an delay6">
 
-                <img src="./img/menu4.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="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="qrcode-box">
 
+            <!-- <img src="./img/poster/qrcode.jpg"> -->
 
+            <img src="./img/poster/ewm.png">
 
+            <p>扫码为他做菜</p>
 
         </div>
 
-        <div class="form-group">
 
-            <input id="textInput" type="text" placeholder="我想对TA说">
 
-            <div id="text" class='msg' style='display:none;'></div>
 
-        </div>
 
-        <div class="user-info">
 
-            <div class="headimg-box">
 
-                <img src="./img/headimg.png">
 
-            </div>
 
-            <p>微信昵称</p>
 
+        <div class="replay-btn">
 
+            <img src="./img/replay_btn.png">
 
         </div>
 
-        <!-- <div class="submit" onclick='saveText()'> -->
 
-        <!-- <img src="./img/share_btn.png"> -->
 
+        <!-- <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="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>
 
-    <!-- <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>
 
-
 
-<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>
 
+	<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="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 class="secret-box">
 
+        <img src="./img/poster/secret1.png" id="secret">
 
     </div>
 
-</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?v=1"></script>
 
-<script src="./js/music.js"></script>
 
-<script src="./js/main.js?v=1"></script>
 
+    <!-- 摇一摇提示 -->
 
+    <div class="shake-mode2">
 
+        <img src="./img/wait_shake.png">
 
+    </div>
 
 
-<!--<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 class="shake-mode">
 
+        <div class="shake-dialog">
 
+            <!-- <img src="./img/shake_fire.png"> -->
 
+            <div class="fire anim-fire js-an" id="fire"></div>
 
+            <!-- <img src="./img/shake_icon.png" class="icon"> -->
 
+            <!-- <img src="./img/shake_txt.png" class="txt"> -->
 
+        </div>
 
+    </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?v=1"></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);
 
 
-<!--});-->
 
-<!--// 分享到朋友圈-->
 
-<!--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>

+ 6 - 3
minigame/WebContent/js/main.js
Wyświetl plik 

@@ -497,6 +497,8 @@ function handleComplete(evt, comp) {
 
                     menuIconInAnim(exportRoot.pot.qcdf);
 
                 }else if(dishIndex == 3){
 
                     menuIconInAnim(exportRoot.pot.ymc);
 
+                }else{
 
+                    exportRoot.btn2.alpha = 1;
 
                 }
 
             });
 
         })
 
@@ -646,6 +648,7 @@ function handleComplete(evt, comp) {
 
                 var speed = Math.abs(x + y + z - last_x - last_y - last_z) / diffTime * 10000;
 
                 if (speed > SHAKE_THRESHOLD) {
 
                     $(".shake-mode2").hide();
 
+                    $(".shake-mode").show();
 
                     shake_cnt++;
 
                     if(shake_cnt>2){
 
                         setTimeout(function(){
 
@@ -675,7 +678,7 @@ function handleComplete(evt, comp) {
 
                                 exportRoot.pot.ymc.gotoAndStop(1);
 
                             }
 
                             $(".shake-mode").fadeOut();
 
-                            exportRoot.btn3.removeAllEventListeners();
 
+                            // exportRoot.btn3.removeAllEventListeners();
 
                             $(".poster-mode").fadeIn();
 
                         },3000)
 
 
@@ -691,8 +694,8 @@ function handleComplete(evt, comp) {
 
 
                 // 开始火的动画
 
                 $("#fire").removeClass("js-an");
 
-                $(".shake-dialog .icon").hide();
 
-                $(".shake-dialog .txt").hide();
 
+                // $(".shake-dialog .icon").hide();
 
+                // $(".shake-dialog .txt").hide();
 
             }
 
         }