Home Explore Help
Register Sign In
wutt
/
game
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
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
439e8ba1b8 9cb6aa30bf
commit
de704927f1
4 changed files with 880 additions and 858 deletions
Unified View Show Diff Stats
  1. BIN
      minigame/WebContent/images/lottery_background_red.png
  2. 878 856
      minigame/WebContent/js/main.js
  3. 2 2
      minigame/WebContent/lottery.html
  4. 0 0
      minigame/WebContent/static/css/lottery2.css

BIN
minigame/WebContent/images/lottery_background_red.png
View File


File diff suppressed because it is too large
+ 878 - 856
minigame/WebContent/js/main.js


+ 2 - 2
minigame/WebContent/lottery.html
View File 

@@ -7,7 +7,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
 
     <title>抽奖</title>
 
     <title>抽奖</title>
 
     <script src="js/jquery.min.js"></script>
 
     <script src="js/jquery.min.js"></script>
 
-    <link rel="stylesheet" href="css/lottery.css" type="text/css" />
 
+    <link rel="stylesheet" href="css/lottery2.css" type="text/css" />
 
     <script type="text/javascript">
 
     <script type="text/javascript">
 
     	//从localstorage中取得ID
 
     	//从localstorage中取得ID
 
     	var id = localStorage.userId;
 
     	var id = localStorage.userId;
 
@@ -209,7 +209,7 @@
 
 </head>
 
 </head>
 
 
 
 <body style="width: 100%">
 
 <body style="width: 100%">
 
-    <img class="background" src="images/lottery_background.png">
 
+    <img class="background" src="images/lottery_background_red.png">
 
     <img class="pool" src="images/lottery_pool.png">
 
     <img class="pool" src="images/lottery_pool.png">
 
     <div class="container">
 
     <div class="container">
 
         <img class="item item0" src="images/reward_oil60.png">
 
         <img class="item item0" src="images/reward_oil60.png">

minigame/WebContent/static/css/lottery.css → minigame/WebContent/static/css/lottery2.css
View File