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

# Conflicts:
#	minigame/WebContent/lottery.html

minigame/WebContent/js/main.js

@@ -8,10 +8,7 @@ var canvas = document.getElementById("canvas");
 var stage = new createjs.Stage(canvas);
 
 createjs.Sound.alternateExtensions = ["mp3"];
-createjs.Sound.registerSound("sound/start/hsr.mp3", "hsr");
-createjs.Sound.registerSound("sound/start/ymc.mp3", "ymc");
-createjs.Sound.registerSound("sound/start/swy.mp3", "swy");
-createjs.Sound.registerSound("sound/start/qcdf.mp3", "qcdf");
+createjs.Sound.registerSound("sound/six.mp3", "six");
 
 window.user_info = {
     uid: 0,
@@ -179,16 +176,7 @@ function handleComplete(evt, comp) {
     }
     function oilIconAnim() {
         oilAnim();
-				
-		if(dishIndex == 0){
-			createjs.Sound.play("hsr");//播放
-        }else if(dishIndex == 1){
-			createjs.Sound.play("qcdf");//播放
-        }else if(dishIndex == 2){
-			createjs.Sound.play("swy");//播放
-        }else{
-            createjs.Sound.play("ymc");//播放
-        }
+		createjs.Sound.play("six");//播放
         var anim = new TimelineMax({ repeat:10,delay:1});
         anim.to(exportRoot.pro.oil_icon2, 0.3, {y:"+=100",alpha:0})
         return anim;
@@ -465,7 +453,7 @@ function handleComplete(evt, comp) {
 
             oilIconAnim();
             proAnim(function() {
-				
+
                 exportRoot.btn2.alpha = 1;
                 btnAnim(exportRoot.btn2);
                 if(dishIndex == 0){
@@ -484,7 +472,7 @@ function handleComplete(evt, comp) {
             materialEnterAnim(exportRoot.blackboard.material1,0.2);
             materialEnterAnim(exportRoot.blackboard.material2,0.4);
             materialEnterAnim(exportRoot.blackboard.material3,0.6);
-            
+
         })
 
         exportRoot.blackboard.material1.addEventListener("mousedown", function() {
@@ -492,6 +480,7 @@ function handleComplete(evt, comp) {
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
 			exportRoot.ball1.alpha = 1;
+
             ballAnim(exportRoot.ball1);
             chooseType = 3;
             $(".poster-mode").addClass("poster-bg3");
@@ -506,8 +495,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() {
@@ -521,9 +508,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() {
@@ -720,6 +704,7 @@ function getInfo() {
 // 获取登陆信息
 function getMsg(){
     if(URLParams['uid'] || localStorage.userId){
+
 		if(localStorage.userId) {
 			window.user_info.uid = localStorage.userId;
 			window.user_info.logo = localStorage.userPic;
@@ -758,7 +743,7 @@ function getMsg(){
 				}
 			}
 		}
-        
+
     }else {
         if(URLParams['code']){
             var code = URLParams['code'];
@@ -799,12 +784,12 @@ function getMsg(){
 function saveText() {
     var value = $('#textInput').val(),
         receiver = $('#nameInput').val();
-	
+
 	if(value == '' || receiver == '') {
 		alert('请填写寄语');
 		return false;
 	}
-	
+
     var xhr=null;
     try{
         xhr=new XMLHttpRequest();
@@ -828,12 +813,7 @@ function saveText() {
                     $('.user-info p').html(msg.data.nickName);
                     $('#nameInput').val(msg.data.receiver);
                     $('#textInput').val(msg.data.message);
-					if(document.location.href.indexOf('?') > -1){
-						href = document.location.href + "&uid=" + msg.data.id;
-					} else {
-						href = document.location.href + "?uid=" + msg.data.id;
-					}
-                    
+                    href = document.location.href + "&uid=" + msg.data.id;
                 }
 
                 if(href != document.location.href){