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

# Conflicts:
#	minigame/WebContent/index.html
#	minigame/WebContent/js/main.js

minigame/WebContent/index.html

@@ -19,7 +19,7 @@
     <link rel="stylesheet" type="text/css" href="./css/music.css?v=2">
     <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="https://www.w3cways.com/demo/vconsole/vconsole.min.js?v=2.2.0"></script>
+    <!--<script src="https://www.w3cways.com/demo/vconsole/vconsole.min.js?v=2.2.0"></script>-->
     <script>
         window.ifDebug = false;
         if (location.href.startsWith('http://')) {