Переглянути джерело

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	minigame/WebContent/index.html
sunyadv 5 роки тому
батько
коміт
ec695484c1
100 змінених файлів з 571 додано та 2860 видалено
  1. 222 224
      minigame/WebContent/assets.js
  2. 3 4
      minigame/WebContent/static/css/lottery2.css
  3. 11 2
      minigame/WebContent/css/main.css
  4. BIN
      minigame/WebContent/images/assets_atlas_P_3.png
  5. BIN
      minigame/WebContent/images/assets_atlas_P_4.png
  6. BIN
      minigame/WebContent/images/share_picture.png
  7. BIN
      minigame/WebContent/img/poster/hsr1.jpg
  8. 0 0
      minigame/WebContent/img/wait_shake.png
  9. 164 164
      minigame/WebContent/index.html
  10. 95 77
      minigame/WebContent/js/main.js
  11. 5 2
      minigame/WebContent/js/wechat.js
  12. 71 22
      minigame/WebContent/lottery.html
  13. 0 1354
      minigame/WebContent/static/assets.js
  14. 0 6
      minigame/WebContent/static/css/animate.min.css
  15. 0 1005
      minigame/WebContent/static/css/main.css
  16. BIN
      minigame/WebContent/static/images/assets_atlas_P_.png
  17. BIN
      minigame/WebContent/static/images/assets_atlas_P_2.png
  18. BIN
      minigame/WebContent/static/images/assets_atlas_P_3.png
  19. BIN
      minigame/WebContent/static/images/assets_atlas_P_4.png
  20. BIN
      minigame/WebContent/static/images/game_bg.jpg
  21. BIN
      minigame/WebContent/static/img/ball1.png
  22. BIN
      minigame/WebContent/static/img/bg.jpg
  23. BIN
      minigame/WebContent/static/img/blackboard.png
  24. BIN
      minigame/WebContent/static/img/bowl.png
  25. BIN
      minigame/WebContent/static/img/btn1.png
  26. BIN
      minigame/WebContent/static/img/btn2.png
  27. BIN
      minigame/WebContent/static/img/btn3.png
  28. BIN
      minigame/WebContent/static/img/fire.png
  29. BIN
      minigame/WebContent/static/img/game_bg.jpg
  30. BIN
      minigame/WebContent/static/img/headimg.png
  31. BIN
      minigame/WebContent/static/img/hsr/hsr_icon1.png
  32. BIN
      minigame/WebContent/static/img/hsr/hsr_icon1_1.png
  33. BIN
      minigame/WebContent/static/img/hsr/hsr_icon2.png
  34. BIN
      minigame/WebContent/static/img/hsr/hsr_icon2_1.png
  35. BIN
      minigame/WebContent/static/img/hsr/hsr_icon3.png
  36. BIN
      minigame/WebContent/static/img/hsr/hsr_icon3_1.png
  37. BIN
      minigame/WebContent/static/img/hsr/hsr_icon4.png
  38. BIN
      minigame/WebContent/static/img/hsr/hsr_icon4_1.png
  39. BIN
      minigame/WebContent/static/img/hsr/material1.png
  40. BIN
      minigame/WebContent/static/img/hsr/material2.png
  41. BIN
      minigame/WebContent/static/img/hsr/material3.png
  42. BIN
      minigame/WebContent/static/img/hsr/menu_hsr.png
  43. BIN
      minigame/WebContent/static/img/hsr/menu_hsr2.png
  44. BIN
      minigame/WebContent/static/img/hsr_icon1.png
  45. BIN
      minigame/WebContent/static/img/hsr_icon1_1.png
  46. BIN
      minigame/WebContent/static/img/hsr_icon2.png
  47. BIN
      minigame/WebContent/static/img/hsr_icon2_1.png
  48. BIN
      minigame/WebContent/static/img/hsr_icon3.png
  49. BIN
      minigame/WebContent/static/img/hsr_icon3_1.png
  50. BIN
      minigame/WebContent/static/img/hsr_icon4.png
  51. BIN
      minigame/WebContent/static/img/hsr_icon4_1.png
  52. BIN
      minigame/WebContent/static/img/leads_bg.png
  53. BIN
      minigame/WebContent/static/img/leads_pro.png
  54. BIN
      minigame/WebContent/static/img/line.png
  55. BIN
      minigame/WebContent/static/img/loading/bg.jpg
  56. BIN
      minigame/WebContent/static/img/loading/bg2.png
  57. BIN
      minigame/WebContent/static/img/loading/loading_icon.png
  58. BIN
      minigame/WebContent/static/img/loading/loading_icon2.png
  59. BIN
      minigame/WebContent/static/img/loading/loading_txt.png
  60. BIN
      minigame/WebContent/static/img/logo.png
  61. BIN
      minigame/WebContent/static/img/menu1.png
  62. BIN
      minigame/WebContent/static/img/menu2.png
  63. BIN
      minigame/WebContent/static/img/menu3.png
  64. BIN
      minigame/WebContent/static/img/menu4.png
  65. BIN
      minigame/WebContent/static/img/menu_bg.png
  66. BIN
      minigame/WebContent/static/img/menu_hsr.png
  67. BIN
      minigame/WebContent/static/img/menu_tt.png
  68. BIN
      minigame/WebContent/static/img/oil.png
  69. BIN
      minigame/WebContent/static/img/oil_icon1.png
  70. BIN
      minigame/WebContent/static/img/oil_icon2.png
  71. BIN
      minigame/WebContent/static/img/plate.png
  72. BIN
      minigame/WebContent/static/img/poster/bg1.jpg
  73. BIN
      minigame/WebContent/static/img/poster/bg2.jpg
  74. BIN
      minigame/WebContent/static/img/poster/bg3.jpg
  75. BIN
      minigame/WebContent/static/img/poster/headOil.png
  76. BIN
      minigame/WebContent/static/img/poster/hsr.png
  77. BIN
      minigame/WebContent/static/img/poster/hsr1.jpg
  78. BIN
      minigame/WebContent/static/img/poster/qcdf.png
  79. BIN
      minigame/WebContent/static/img/poster/qrcode.jpg
  80. BIN
      minigame/WebContent/static/img/poster/secret1.png
  81. BIN
      minigame/WebContent/static/img/poster/swy.png
  82. BIN
      minigame/WebContent/static/img/poster/ymc.png
  83. BIN
      minigame/WebContent/static/img/pot.png
  84. BIN
      minigame/WebContent/static/img/pro.png
  85. BIN
      minigame/WebContent/static/img/qcdf/menu_qcdf.png
  86. BIN
      minigame/WebContent/static/img/qcdf/menu_qcdf2.png
  87. BIN
      minigame/WebContent/static/img/qcdf/qcdf_icon1.png
  88. BIN
      minigame/WebContent/static/img/qcdf/qcdf_icon1_1.png
  89. BIN
      minigame/WebContent/static/img/qcdf/qcdf_icon2.png
  90. BIN
      minigame/WebContent/static/img/qcdf/qcdf_icon2_1.png
  91. BIN
      minigame/WebContent/static/img/replay_btn.png
  92. BIN
      minigame/WebContent/static/img/secret_btn.png
  93. BIN
      minigame/WebContent/static/img/select_menu_btn.png
  94. BIN
      minigame/WebContent/static/img/shake_fire.png
  95. BIN
      minigame/WebContent/static/img/shake_icon.png
  96. BIN
      minigame/WebContent/static/img/shake_txt.png
  97. BIN
      minigame/WebContent/static/img/share_btn.png
  98. BIN
      minigame/WebContent/static/img/smoke.png
  99. BIN
      minigame/WebContent/static/img/swy/swy_icon1.png
  100. 0 0
      minigame/WebContent/static/img/swy/swy_icon1_1.png

Різницю між файлами не показано, бо вона завелика
+ 222 - 224
minigame/WebContent/assets.js


+ 3 - 4
minigame/WebContent/static/css/lottery2.css

@@ -17,7 +17,6 @@
     width: 84%;
     height: auto;
     left: 7%;
-    top: 250px;
 }
 .container {
     display: flex;
@@ -110,9 +109,9 @@ input{
     z-index: 12;
 }
 .advertisement li{
-	font-size: 12px !important;
-	line-height: 18px !important;
-	height: 18px! important;
+	font-size: 10px !important;
+	line-height: 20px !important;
+	height: 20px !important;
 }
 
 /*滚动*/

+ 11 - 2
minigame/WebContent/css/main.css

@@ -654,7 +654,7 @@ img {
       width: 7.5rem;
       margin-left: -3.75rem; }
       .loading .curtain-box .loading-bar .load-txt {
-        font-size: 0.53125rem;
+        font-size: 0.43125rem;
         color: #1e0502;
         text-align: center;
         text-shadow: 2px 2px 0 #b9b988;
@@ -763,7 +763,7 @@ img {
     padding-right: 1.875rem; }
     .poster-mode .leads-box .form-group {
       border-bottom: 1px solid #c19e83; }
-      .poster-mode .leads-box .form-group input , .poster-mode .leads-box .form-group .msg {
+      .poster-mode .leads-box .form-group input , .poster-mode .leads-box .form-group .msg{
         width: 100%;
         height: 0.78125rem;
 		line-height: 0.78125rem;
@@ -828,6 +828,15 @@ img {
     right: 1.48438rem;
     width: 2.8125rem; }
 
+.shake-mode2 {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100vh;
+  z-index: 100;
+  display: none; }
+
 .shake-mode {
   position: fixed;
   top: 0;

BIN
minigame/WebContent/images/assets_atlas_P_3.png


BIN
minigame/WebContent/images/assets_atlas_P_4.png


BIN
minigame/WebContent/images/share_picture.png


BIN
minigame/WebContent/img/poster/hsr1.jpg


minigame/WebContent/static/img/wait_shake.png → minigame/WebContent/img/wait_shake.png


+ 164 - 164
minigame/WebContent/index.html

@@ -1,165 +1,165 @@
-<!DOCTYPE html>
-<html>
-<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">
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge,Chrome=1">
-    <meta name="screen-orientation" content="portrait" /> <!-- uc强制竖屏 -->
-    <meta name="x5-orientation" content="portrait" />  <!-- QQ强制竖屏 -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-    <meta name="format-detection" content="telphone=no" />
-    <meta name="format-detection" content="email=no" />
-    <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">
-    <script src="https://cdn.bootcss.com/SoundJS/1.0.2/soundjs.min.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">
-                    <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="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="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>
-        <!-- <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>
-    <!-- <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>
-
-<!-- 摇一摇提示 -->
-<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>
-</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);-->
-
-<!--});-->
-<!--}, false);-->
-
-<!--// 判断微博分享-->
-<!--document.addEventListener('WeiboJSBridgeReady', function onBridgeReady() {-->
-
-<!--}, false);-->
-<!--</script>-->
-</body>
+<!DOCTYPE html>
+<html>
+<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">
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=Edge,Chrome=1">
+    <meta name="screen-orientation" content="portrait" /> <!-- uc强制竖屏 -->
+    <meta name="x5-orientation" content="portrait" />  <!-- QQ强制竖屏 -->
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="format-detection" content="telphone=no" />
+    <meta name="format-detection" content="email=no" />
+    <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">
+    <script src="https://cdn.bootcss.com/SoundJS/1.0.2/soundjs.min.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">
+                    <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="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="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>
+        <!-- <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>
+    <!-- <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>
+
+<!-- 摇一摇提示 -->
+<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>
+</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);-->
+
+<!--});-->
+<!--}, false);-->
+
+<!--// 判断微博分享-->
+<!--document.addEventListener('WeiboJSBridgeReady', function onBridgeReady() {-->
+
+<!--}, false);-->
+<!--</script>-->
+</body>
 </html>

+ 95 - 77
minigame/WebContent/js/main.js

@@ -29,8 +29,6 @@ for (i=0; i < params.length ; i++){
     var aParam = params[i].split('=');
     URLParams[aParam[0]] = aParam[1];
 }
-
-
 function init() {
     //createjs.Sound.play("bgm", {loop: -1});
     just_play();
@@ -123,10 +121,10 @@ function handleComplete(evt, comp) {
         window.location.href = "http://wx.ttkuaiban.com/minigame/";
         //location.reload()
     })
-    // $(".secret-btn").on("click",function(){
+    //$(".secret-btn").on("click",function(){
     //saveText();
-    //$(".secret-box").fadeIn();
-    // })
+    //    $(".secret-box").fadeIn();
+    //})
     $(".secret-box").on("click",function(){
         $(".secret-box").fadeOut();
     })
@@ -135,20 +133,20 @@ function handleComplete(evt, comp) {
     function ballAnim(dom) {
         var anim = new TimelineMax({ repeat: -1 });
         anim.to(dom, 0.15, { rotation: "-=15", ease: Power0.easeIn })
-            .to(dom, 0.3, { rotation: "+=30", ease: Power0.easeIn })
-            .to(dom, 0.3, { rotation: "-=30", ease: Power0.easeIn })
-            .to(dom, 0.3, { rotation: "+=30", ease: Power0.easeIn })
-            .to(dom, 0.15, { rotation: "-=15", ease: Power0.easeIn });
+        .to(dom, 0.3, { rotation: "+=30", ease: Power0.easeIn })
+        .to(dom, 0.3, { rotation: "-=30", ease: Power0.easeIn })
+        .to(dom, 0.3, { rotation: "+=30", ease: Power0.easeIn })
+        .to(dom, 0.15, { rotation: "-=15", ease: Power0.easeIn });
         return anim;
     }
 
     function materialAnim(dom, x, y, callback) {
         var anim = new TimelineMax({ onComplete: callback });
         anim.to(dom, 0.5, { x: "+=" + x, y: "+=" + y, ease: Power0.easeIn })
-            .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
-            .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn })
-            .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
-            .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn });
+        .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
+        .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn })
+        .to(dom, 0.3, { rotation: "-=25", ease: Power0.easeIn })
+        .to(dom, 0.3, { rotation: "+=25", ease: Power0.easeIn });
         return anim;
     }
 
@@ -160,24 +158,24 @@ function handleComplete(evt, comp) {
         }
         var anim = new TimelineMax({ delay:0.8});
         anim.to(dom, 0.4, { alpha: 1, ease: Power0.easeIn })
-            .to(dom, 1, { scale: 1, ease: Power0.easeIn })
+        .to(dom, 1, { scale: 1, ease: Power0.easeIn })
         return anim;
     }
     function bowlAnim(callback) {
         var anim = new TimelineMax({ onComplete: callback, delay: 0.3 });
         anim.to(exportRoot.plate, 0.5, { y: "-=370", ease: Power0.easeIn })
-            .to(exportRoot.bowl, 0.5, { alpha: 1, ease: Power0.easeIn });
+        .to(exportRoot.bowl, 0.5, { alpha: 1, ease: Power0.easeIn });
         return anim;
     }
 
     function proAnim(callback) {
         var anim = new TimelineMax({ onComplete: callback, delay: 0.5 });
         anim.to(exportRoot.pro.proImg, 0.5, { rotation: "-=25", ease: Power0.easeIn })
-            .to(exportRoot.pro.oil_icon1, 0.3, {alpha:1})
-            .to(exportRoot.pro.oil_icon2, 0.2, {alpha:1})
-            .to(exportRoot.pro.proImg, 1, {})
-            .to(exportRoot.pro, 0.3, { alpha: 0, ease: Power0.easeIn })
-            .to(exportRoot.pro, 1, {})
+        .to(exportRoot.pro.oil_icon1, 0.3, {alpha:1})
+        .to(exportRoot.pro.oil_icon2, 0.2, {alpha:1})
+        .to(exportRoot.pro.proImg, 1, {})
+        .to(exportRoot.pro, 0.3, { alpha: 0, ease: Power0.easeIn })
+        .to(exportRoot.pro, 1, {})
         return anim;
     }
     function oilIconAnim() {
@@ -200,7 +198,7 @@ function handleComplete(evt, comp) {
     function btnAnim(dom){
         var anim = new TimelineMax({ repeat:-1 });
         anim.to(dom, 0.3, { scale: "+=0.1", ease: Power0.easeIn })
-            .to(dom, 0.3, { scale: "-=0.1", ease: Power0.easeIn })
+        .to(dom, 0.3, { scale: "-=0.1", ease: Power0.easeIn })
         return anim;
     }
     function fadeInAnim(dom){
@@ -208,6 +206,19 @@ function handleComplete(evt, comp) {
         anim.to(dom, 0.4, { alpha: 1, ease: Power0.easeIn })
         return anim;
     }
+    function menuIconInAnim(dom){
+        var anim = new TimelineMax({ });
+        if(!dom.icon5){
+            dom.icon5 = exportRoot.btn2;
+        }
+        anim.to(dom.icon1, 0.3, { alpha: 1, ease: Power0.easeIn })
+            .to(dom.icon2, 0.3, { alpha: 1, ease: Power0.easeIn })
+            .to(dom.icon3, 0.3, { alpha: 1, ease: Power0.easeIn })
+            .to(dom.icon4, 0.3, { alpha: 1, ease: Power0.easeIn })
+            .to(dom.icon5, 0.3, { alpha: 1, ease: Power0.easeIn })
+            .to(exportRoot.btn2, 0.4, { alpha: 1, ease: Power0.easeIn })
+        return anim;
+    }
 
     function materialEnterAnim(dom,delay){
         dom.scale = 0.1;
@@ -261,12 +272,12 @@ function handleComplete(evt, comp) {
     ]
     // 红烧肉的位置
     var hsr_iconArr = [{
-        x: exportRoot.plate.x + exportRoot.plate.hsr_icon1.x,
-        y: exportRoot.plate.y + exportRoot.plate.hsr_icon1.y,
-        width: 202,
-        height: 129,
-        isClear: false
-    },
+            x: exportRoot.plate.x + exportRoot.plate.hsr_icon1.x,
+            y: exportRoot.plate.y + exportRoot.plate.hsr_icon1.y,
+            width: 202,
+            height: 129,
+            isClear: false
+        },
         {
             x: exportRoot.plate.x + exportRoot.plate.hsr_icon2.x,
             y: exportRoot.plate.y + exportRoot.plate.hsr_icon2.y,
@@ -291,12 +302,12 @@ function handleComplete(evt, comp) {
     ];
     // 青菜豆腐的位置
     var qcdf_iconArr = [{
-        x: exportRoot.plate.x + exportRoot.plate.qcdf_icon1.x,
-        y: exportRoot.plate.y + exportRoot.plate.qcdf_icon1.y,
-        width: 169,
-        height: 320,
-        isClear: false
-    },
+            x: exportRoot.plate.x + exportRoot.plate.qcdf_icon1.x,
+            y: exportRoot.plate.y + exportRoot.plate.qcdf_icon1.y,
+            width: 169,
+            height: 320,
+            isClear: false
+        },
         {
             x: exportRoot.plate.x + exportRoot.plate.qcdf_icon2.x,
             y: exportRoot.plate.y + exportRoot.plate.qcdf_icon2.y,
@@ -468,15 +479,13 @@ function handleComplete(evt, comp) {
 
             oilIconAnim();
             proAnim(function() {
-
-                exportRoot.btn2.alpha = 1;
                 btnAnim(exportRoot.btn2);
                 if(dishIndex == 0){
-                    fadeInAnim(exportRoot.pot.hsr);
+                    menuIconInAnim(exportRoot.pot.hsr);
                 }else if(dishIndex == 1){
-                    fadeInAnim(exportRoot.pot.qcdf);
+                    menuIconInAnim(exportRoot.pot.qcdf);
                 }else if(dishIndex == 3){
-                    fadeInAnim(exportRoot.pot.ymc);
+                    menuIconInAnim(exportRoot.pot.ymc);
                 }
             });
         })
@@ -487,16 +496,15 @@ function handleComplete(evt, comp) {
             materialEnterAnim(exportRoot.blackboard.material1,0.2);
             materialEnterAnim(exportRoot.blackboard.material2,0.4);
             materialEnterAnim(exportRoot.blackboard.material3,0.6);
+            exportRoot.ball1.alpha = 1;
 
+            ballAnim(exportRoot.ball1);
         })
 
         exportRoot.blackboard.material1.addEventListener("mousedown", function() {
             exportRoot.blackboard.material1.removeAllEventListeners();
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
-            exportRoot.ball1.alpha = 1;
-            ballAnim(exportRoot.ball1);
-            chooseType = 3;
             $(".poster-mode").addClass("poster-bg3");
             materialAnim(exportRoot.blackboard.material1, 300, 180, function() {
                 exportRoot.blackboard.material1.x -=300;
@@ -509,9 +517,6 @@ function handleComplete(evt, comp) {
             exportRoot.blackboard.material1.removeAllEventListeners();
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
-            exportRoot.ball2.alpha = 1;
-            ballAnim(exportRoot.ball2);
-            chooseType = 2;
             $(".poster-mode").addClass("poster-bg2");
             materialAnim(exportRoot.blackboard.material2, 120, 180, function() {
                 exportRoot.blackboard.material2.x -=120;
@@ -524,10 +529,6 @@ function handleComplete(evt, comp) {
             exportRoot.blackboard.material1.removeAllEventListeners();
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
-            console.log(exportRoot.ball3)
-            exportRoot.ball3.alpha = 1;
-            ballAnim(exportRoot.ball3);
-            chooseType = 1;
             $(".poster-mode").addClass("poster-bg1");
             materialAnim(exportRoot.blackboard.material3, -30, 180, function() {
                 exportRoot.blackboard.material3.x +=30;
@@ -578,13 +579,14 @@ function handleComplete(evt, comp) {
 
 
     function shakeInit() {
+        var shake_cnt = 0;
+        $(".shake-mode2").show();
         if (window.DeviceMotionEvent) {
             window.addEventListener('devicemotion', deviceMotionHandler, false);
         } else {
             alert('您的手机不支持摇一摇功能!');
         }
 
-
         //获取加速度信息
         //通过监听上一步获取到的x, y, z 值在一定时间范围内的变化率,进行设备是否有进行晃动的判断。
         //而为了防止正常移动的误判,需要给该变化率设置一个合适的临界值。
@@ -605,36 +607,41 @@ function handleComplete(evt, comp) {
                 z = acceleration.z;
                 var speed = Math.abs(x + y + z - last_x - last_y - last_z) / diffTime * 10000;
                 if (speed > SHAKE_THRESHOLD) {
-                    $(".shake-mode").show();
-                    setTimeout(function(){
-                        window.removeEventListener('devicemotion', deviceMotionHandler, false);
-                        exportRoot.pot.hsr.play();
-                        exportRoot.btn3.alpha = 1;
-                        btnAnim(exportRoot.btn3);
-                        exportRoot.btn3.addEventListener("mousedown",function(){
+                    $(".shake-mode2").hide();
+                    shake_cnt++;
+                    if(shake_cnt>2){
+                        setTimeout(function(){
+                            window.removeEventListener('devicemotion', deviceMotionHandler, false);
+                            exportRoot.pot.hsr.play();
+                            // exportRoot.btn3.alpha = 1;
+                            // btnAnim(exportRoot.btn3);
+                            // exportRoot.btn3.addEventListener("mousedown",function(){
+                            //     exportRoot.btn3.removeAllEventListeners();
+                            //     $(".poster-mode").fadeIn();
+                            // })
+
+
+                            if(document.location.href.indexOf('type') == -1){
+                                var href = document.location.href + (document.location.href.indexOf('?') > -1?'&':'?') + "type=" + chooseType + "&food=" + dishIndex;
+                                history.pushState("", "Title", href);
+                        	}
+
+                            if(dishIndex == 0){
+                                exportRoot.pot.hsr.gotoAndStop(1);
+                            }else if(dishIndex == 1){
+                                exportRoot.pot.qcdf.gotoAndStop(1);
+                            }else if(dishIndex == 2){
+                                exportRoot.bowl.oil.alpha = 0;
+                                exportRoot.plate['swy_icon1'].gotoAndStop(2);
+                            }else{
+                                exportRoot.pot.ymc.gotoAndStop(1);
+                            }
+                            $(".shake-mode").fadeOut();
                             exportRoot.btn3.removeAllEventListeners();
                             $(".poster-mode").fadeIn();
-                        })
-
-
-                        if(document.location.href.indexOf('type') == -1){
-                            var href = document.location.href + (document.location.href.indexOf('?') > -1?'&':'?') + "type=" + chooseType + "&food=" + dishIndex;
-                            history.pushState("", "Title", href);
-                        }
-
-                        if(dishIndex == 0){
-                            exportRoot.pot.hsr.gotoAndStop(1);
-                        }else if(dishIndex == 1){
-                            exportRoot.pot.qcdf.gotoAndStop(1);
-                        }else if(dishIndex == 2){
-                            exportRoot.bowl.oil.alpha = 0;
-                            exportRoot.plate['swy_icon1'].gotoAndStop(2);
-                        }else{
-                            exportRoot.pot.ymc.gotoAndStop(1);
-                        }
-                        $(".shake-mode").fadeOut();
-                    },3000)
+                        },3000)
 
+                    }
                     //dosomething
                     $("#fire").addClass("anim-time");
                 }else{
@@ -643,6 +650,11 @@ function handleComplete(evt, comp) {
                 last_x = x;
                 last_y = y;
                 last_z = z;
+
+                // 开始火的动画
+                $("#fire").removeClass("js-an");
+                $(".shake-dialog .icon").hide();
+                $(".shake-dialog .txt").hide();
             }
         }
 
@@ -665,7 +677,9 @@ function handleComplete(evt, comp) {
 
 function getInfo() {
     var ua = navigator.userAgent.toLowerCase();
+    var isMobile = false;
     if (!!navigator.userAgent.match(/AppleWebKit.*Mobile.*/)) {
+    	isMobile = true;
         if (ua.match(/MicroMessenger/i) == "micromessenger") {
             type = 0;
             url = "https://open.weixin.qq.com/connect/oauth2/authorize?"
@@ -694,6 +708,7 @@ function getInfo() {
                 +"scope=snsapi_userinfo&"//snsapi_userinfo
                 +"state=1#wechat_redirect";
         }
+        
     }
 
     if(URLParams['uid']) {
@@ -729,7 +744,10 @@ function getInfo() {
         $('.secret-btn').show();
 
         init();
-        getMsg();
+        if (isMobile) {
+        	getMsg();
+        }
+        
     }
 
 }

+ 5 - 2
minigame/WebContent/js/wechat.js

@@ -8,8 +8,7 @@
             link:window.location.href.split('#')[0]
         }
     };
-
-
+   
 	/*
     $.ajax({
       url:"",
@@ -69,3 +68,7 @@
 
 
 })();
+$(function(){
+
+});
+

+ 71 - 22
minigame/WebContent/lottery.html

@@ -7,6 +7,8 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>抽奖</title>
     <script src="js/jquery.min.js"></script>
+    <script src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
+    <script src="js/wechat.js"></script>
     <link rel="stylesheet" href="css/lottery2.css" type="text/css" />
     <script type="text/javascript">
     	//从localstorage中取得ID
@@ -19,6 +21,53 @@
         var src = null;
         var recordId = null;
         $(function () {
+        	
+            $.post("./user/getWxConfigParam?url=http://wx.ttkuaiban.com/minigame/lottery.html", {}, function(resp) {
+        		if (resp.code == 'error') {
+        			console.log(resp.code);
+        		}else{
+        			wx.config({
+        			    debug: false,
+        			    appId: 'wx749c84daac654e1e',
+        			    timestamp: resp.data.timestamp,
+        			    nonceStr: resp.data.noncestr,
+        			    signature: resp.data.sign,
+        			    jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareWeibo', 'onMenuShareQZone', 'showOptionMenu', 'hideAllNonBaseMenuItem', 'showAllNonBaseMenuItem']
+        			});
+        			wx.ready(function(){
+        				const share = {
+        			        title: "一秒变大厨,为远方的朋友做道菜吧!",
+        			        desc: "",
+        			        imgUrl: "http://wx.ttkuaiban.com/minigame/images/share_picture.png",
+        			        link: "http://wx.ttkuaiban.com/minigame/lottery.html",
+        			        success: function() {
+//         			        	$(".mask").hide();
+//         			            $(".success").hide();
+//         			            $(".result_success_title").hide();
+//         			            $(".result_success_logo").hide();
+//         			            $(".result_success_name").hide();
+//         			            $(".result_success_phone").hide();
+//         			            $(".result_success_button").hide();
+        			        	$.post("./prize/luckDrawAddShare", {uid: id}, function(resp) {
+        		    				if (resp.code == 'error') {
+        		    					console.log(resp.code);
+        		    				}else{}
+        		    			});
+        			        },
+        			        cancel: function() {}
+        			    };
+        			    wx.onMenuShareAppMessage(share);
+        			    wx.onMenuShareTimeline(share);
+        			    wx.onMenuShareQQ(share);
+        			    wx.onMenuShareQZone(share);
+        			    wx.onMenuShareWeibo(share);
+        			});
+        			wx.error(function(res){
+        				console.log(res);
+        			});
+        		};	
+        	});
+            
             //进入和窗口缩放时重新设置内容位置
             setPosition();
             $(window).resize(function () {
@@ -183,28 +232,28 @@
         }
         
      	//判断微信分享
-        document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
-    		//发送给好友
-    		WeixinJSBridge.on('menu:share:appmessage', function(argv){
-    			$.post("./prize/luckDrawAddShare", {uid: id}, function(resp) {
-    				if (resp.code == 'error') {
-    					console.log(resp.code);
-    				}else{
-    					alert("分享成功");
-    				}
-    			});
-    		});
-    		//分享到朋友圈
-    		WeixinJSBridge.on('menu:share:timeline', function(argv){
-    			$.post("./prize/luckDrawAddShare", {uid: id}, function(resp) {
-    				if (resp.code == 'error') {
-    					console.log(resp.code);
-    				}else{
-    					alert("分享成功");
-    				}
-    			});
-    		}); 
-    	}, false);
+//         document.addEventListener('WeixinJSBridgeReady', function onBridgeReady() {
+//     		//发送给好友
+//     		WeixinJSBridge.on('menu:share:appmessage', function(argv){
+//     			$.post("./prize/luckDrawAddShare", {uid: id}, function(resp) {
+//     				if (resp.code == 'error') {
+//     					console.log(resp.code);
+//     				}else{
+//     					alert("分享成功");
+//     				}
+//     			});
+//     		});
+//     		//分享到朋友圈
+//     		WeixinJSBridge.on('menu:share:timeline', function(argv){
+//     			$.post("./prize/luckDrawAddShare", {uid: id}, function(resp) {
+//     				if (resp.code == 'error') {
+//     					console.log(resp.code);
+//     				}else{
+//     					alert("分享成功");
+//     				}
+//     			});
+//     		}); 
+//     	}, false);
     </script>
 </head>
 

Різницю між файлами не показано, бо вона завелика
+ 0 - 1354
minigame/WebContent/static/assets.js


Різницю між файлами не показано, бо вона завелика
+ 0 - 6
minigame/WebContent/static/css/animate.min.css


Різницю між файлами не показано, бо вона завелика
+ 0 - 1005
minigame/WebContent/static/css/main.css


BIN
minigame/WebContent/static/images/assets_atlas_P_.png


BIN
minigame/WebContent/static/images/assets_atlas_P_2.png


BIN
minigame/WebContent/static/images/assets_atlas_P_3.png


BIN
minigame/WebContent/static/images/assets_atlas_P_4.png


BIN
minigame/WebContent/static/images/game_bg.jpg


BIN
minigame/WebContent/static/img/ball1.png


BIN
minigame/WebContent/static/img/bg.jpg


BIN
minigame/WebContent/static/img/blackboard.png


BIN
minigame/WebContent/static/img/bowl.png


BIN
minigame/WebContent/static/img/btn1.png


BIN
minigame/WebContent/static/img/btn2.png


BIN
minigame/WebContent/static/img/btn3.png


BIN
minigame/WebContent/static/img/fire.png


BIN
minigame/WebContent/static/img/game_bg.jpg


BIN
minigame/WebContent/static/img/headimg.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon1.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon1_1.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon2.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon2_1.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon3.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon3_1.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon4.png


BIN
minigame/WebContent/static/img/hsr/hsr_icon4_1.png


BIN
minigame/WebContent/static/img/hsr/material1.png


BIN
minigame/WebContent/static/img/hsr/material2.png


BIN
minigame/WebContent/static/img/hsr/material3.png


BIN
minigame/WebContent/static/img/hsr/menu_hsr.png


BIN
minigame/WebContent/static/img/hsr/menu_hsr2.png


BIN
minigame/WebContent/static/img/hsr_icon1.png


BIN
minigame/WebContent/static/img/hsr_icon1_1.png


BIN
minigame/WebContent/static/img/hsr_icon2.png


BIN
minigame/WebContent/static/img/hsr_icon2_1.png


BIN
minigame/WebContent/static/img/hsr_icon3.png


BIN
minigame/WebContent/static/img/hsr_icon3_1.png


BIN
minigame/WebContent/static/img/hsr_icon4.png


BIN
minigame/WebContent/static/img/hsr_icon4_1.png


BIN
minigame/WebContent/static/img/leads_bg.png


BIN
minigame/WebContent/static/img/leads_pro.png


BIN
minigame/WebContent/static/img/line.png


BIN
minigame/WebContent/static/img/loading/bg.jpg


BIN
minigame/WebContent/static/img/loading/bg2.png


BIN
minigame/WebContent/static/img/loading/loading_icon.png


BIN
minigame/WebContent/static/img/loading/loading_icon2.png


BIN
minigame/WebContent/static/img/loading/loading_txt.png


BIN
minigame/WebContent/static/img/logo.png


BIN
minigame/WebContent/static/img/menu1.png


BIN
minigame/WebContent/static/img/menu2.png


BIN
minigame/WebContent/static/img/menu3.png


BIN
minigame/WebContent/static/img/menu4.png


BIN
minigame/WebContent/static/img/menu_bg.png


BIN
minigame/WebContent/static/img/menu_hsr.png


BIN
minigame/WebContent/static/img/menu_tt.png


BIN
minigame/WebContent/static/img/oil.png


BIN
minigame/WebContent/static/img/oil_icon1.png


BIN
minigame/WebContent/static/img/oil_icon2.png


BIN
minigame/WebContent/static/img/plate.png


BIN
minigame/WebContent/static/img/poster/bg1.jpg


BIN
minigame/WebContent/static/img/poster/bg2.jpg


BIN
minigame/WebContent/static/img/poster/bg3.jpg


BIN
minigame/WebContent/static/img/poster/headOil.png


BIN
minigame/WebContent/static/img/poster/hsr.png


BIN
minigame/WebContent/static/img/poster/hsr1.jpg


BIN
minigame/WebContent/static/img/poster/qcdf.png


BIN
minigame/WebContent/static/img/poster/qrcode.jpg


BIN
minigame/WebContent/static/img/poster/secret1.png


BIN
minigame/WebContent/static/img/poster/swy.png


BIN
minigame/WebContent/static/img/poster/ymc.png


BIN
minigame/WebContent/static/img/pot.png


BIN
minigame/WebContent/static/img/pro.png


BIN
minigame/WebContent/static/img/qcdf/menu_qcdf.png


BIN
minigame/WebContent/static/img/qcdf/menu_qcdf2.png


BIN
minigame/WebContent/static/img/qcdf/qcdf_icon1.png


BIN
minigame/WebContent/static/img/qcdf/qcdf_icon1_1.png


BIN
minigame/WebContent/static/img/qcdf/qcdf_icon2.png


BIN
minigame/WebContent/static/img/qcdf/qcdf_icon2_1.png


BIN
minigame/WebContent/static/img/replay_btn.png


BIN
minigame/WebContent/static/img/secret_btn.png


BIN
minigame/WebContent/static/img/select_menu_btn.png


BIN
minigame/WebContent/static/img/shake_fire.png


BIN
minigame/WebContent/static/img/shake_icon.png


BIN
minigame/WebContent/static/img/shake_txt.png


BIN
minigame/WebContent/static/img/share_btn.png


BIN
minigame/WebContent/static/img/smoke.png


BIN
minigame/WebContent/static/img/swy/swy_icon1.png


+ 0 - 0
minigame/WebContent/static/img/swy/swy_icon1_1.png


Деякі файли не було показано, через те що забагато файлів було змінено