ソースを参照

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

# Conflicts:
#	minigame/WebContent/js/main.js
sunyadv 5 年 前
コミット
de704927f1

BIN
minigame/WebContent/images/lottery_background_red.png


ファイルの差分が大きいため隠しています
+ 878 - 856
minigame/WebContent/js/main.js


+ 2 - 2
minigame/WebContent/lottery.html

@@ -7,7 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>抽奖</title>
     <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">
     	//从localstorage中取得ID
     	var id = localStorage.userId;
@@ -209,7 +209,7 @@
 </head>
 
 <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">
     <div class="container">
         <img class="item item0" src="images/reward_oil60.png">

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