Merge remote-tracking branch 'origin/master'

minigame/WebContent/js/main.js

@@ -93,7 +93,7 @@ function handleComplete(evt, comp) {
             exportRoot.plate.hsr_icon3.alpha = 1;
             exportRoot.plate.hsr_icon4.alpha = 1;
             cutDishArr = hsr_iconArr;
-            $('#poster').attr('src','./img/poster/hsr.png');
+            //$('#poster').attr('src','./img/poster/hsr.png');
         }else if(dishIndex == 1){
             exportRoot.plate.qcdf_icon1.alpha = 1;
             exportRoot.plate.qcdf_icon2.alpha = 1;
@@ -101,19 +101,19 @@ function handleComplete(evt, comp) {
             exportRoot.plate.qcdf_icon4.alpha = 1;
             exportRoot.plate.qcdf_icon5.alpha = 1;
             cutDishArr = qcdf_iconArr;
-            $('#poster').attr('src','./img/poster/qcdf.png');
+            //$('#poster').attr('src','./img/poster/qcdf.png');
         }else if(dishIndex == 2){
             exportRoot.plate.swy_icon1.alpha = 1;
             exportRoot.plate.swy_icon2.alpha = 1;
             cutDishArr = swy_iconArr;
-            $('#poster').attr('src','./img/poster/swy.png');
+            //$('#poster').attr('src','./img/poster/swy.png');
         }else{
             exportRoot.plate.ymc_icon1.alpha = 1;
             exportRoot.plate.ymc_icon2.alpha = 1;
             exportRoot.plate.ymc_icon3.alpha = 1;
             exportRoot.plate.ymc_icon4.alpha = 1;
             cutDishArr = ymc_iconArr;
-            $('#poster').attr('src','./img/poster/ymc.png');
+            //$('#poster').attr('src','./img/poster/ymc.png');
         }
     })
     $(".replay-btn").on("click",function(){
@@ -506,6 +506,15 @@ function handleComplete(evt, comp) {
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
             $(".poster-mode").addClass("poster-bg3");
+            if(dishIndex == 0){
+                $('#poster').attr('src','./img/poster/hsr_lv.png');
+            }else if(dishIndex == 1){
+                $('#poster').attr('src','./img/poster/qcdf_lv.png');
+            }else if(dishIndex == 2){
+                $('#poster').attr('src','./img/poster/swy_lv.png');
+            }else{
+                $('#poster').attr('src','./img/poster/ymc_lv.png');
+            }
             materialAnim(exportRoot.blackboard.material1, 300, 180, function() {
                 exportRoot.blackboard.material1.x -=300;
                 exportRoot.blackboard.material1.y -=180;
@@ -518,6 +527,15 @@ function handleComplete(evt, comp) {
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
             $(".poster-mode").addClass("poster-bg2");
+            if(dishIndex == 0){
+                $('#poster').attr('src','./img/poster/hsr_hei.png');
+            }else if(dishIndex == 1){
+                $('#poster').attr('src','./img/poster/qcdf_hei.png');
+            }else if(dishIndex == 2){
+                $('#poster').attr('src','./img/poster/swy_hei.png');
+            }else{
+                $('#poster').attr('src','./img/poster/ymc_hei.png');
+            }
             materialAnim(exportRoot.blackboard.material2, 120, 180, function() {
                 exportRoot.blackboard.material2.x -=120;
                 exportRoot.blackboard.material2.y -=180;
@@ -530,6 +548,15 @@ function handleComplete(evt, comp) {
             exportRoot.blackboard.material2.removeAllEventListeners();
             exportRoot.blackboard.material3.removeAllEventListeners();
             $(".poster-mode").addClass("poster-bg1");
+            if(dishIndex == 0){
+                $('#poster').attr('src','./img/poster/hsr_fen.png');
+            }else if(dishIndex == 1){
+                $('#poster').attr('src','./img/poster/qcdf_fen.png');
+            }else if(dishIndex == 2){
+                $('#poster').attr('src','./img/poster/swy_fen.png');
+            }else{
+                $('#poster').attr('src','./img/poster/ymc_fen.png');
+            }
             materialAnim(exportRoot.blackboard.material3, -30, 180, function() {
                 exportRoot.blackboard.material3.x +=30;
                 exportRoot.blackboard.material3.y -=180;
@@ -723,15 +750,47 @@ function getInfo() {
         chooseType = URLParams['type'];
         dishType = URLParams['food'];
         $(".poster-mode").addClass("poster-bg" + chooseType);
-        if(dishType == 0){
-            $('#poster').attr('src','./img/poster/hsr.png');
-        }else if(dishType == 1){
-            $('#poster').attr('src','./img/poster/qcdf.png');
-        }else if(dishType == 2){
-            $('#poster').attr('src','./img/poster/swy.png');
-        }else{
-            $('#poster').attr('src','./img/poster/ymc.png');
+        if(chooseType == 3) {
+            if(dishType == 0){
+                $('#poster').attr('src','./img/poster/hsr_lv.png');
+            }else if(dishType == 1){
+                $('#poster').attr('src','./img/poster/qcdf_lv.png');
+            }else if(dishType == 2){
+                $('#poster').attr('src','./img/poster/swy_lv.png');
+            }else{
+                $('#poster').attr('src','./img/poster/ymc_lv.png');
+            }
+        } else if(chooseType == 2) {
+            if(dishType == 0){
+                $('#poster').attr('src','./img/poster/hsr_hei.png');
+            }else if(dishType == 1){
+                $('#poster').attr('src','./img/poster/qcdf_hei.png');
+            }else if(dishType == 2){
+                $('#poster').attr('src','./img/poster/swy_hei.png');
+            }else{
+                $('#poster').attr('src','./img/poster/ymc_hei.png');
+            }
+        } else if(chooseType == 1) {
+            if(dishType == 0){
+                $('#poster').attr('src','./img/poster/hsr_fen.png');
+            }else if(dishType == 1){
+                $('#poster').attr('src','./img/poster/qcdf_fen.png');
+            }else if(dishType == 2){
+                $('#poster').attr('src','./img/poster/swy_fen.png');
+            }else{
+                $('#poster').attr('src','./img/poster/ymc_fen.png');
+            }
         }
+
+        // if(dishType == 0){
+        //     $('#poster').attr('src','./img/poster/hsr.png');
+        // }else if(dishType == 1){
+        //     $('#poster').attr('src','./img/poster/qcdf.png');
+        // }else if(dishType == 2){
+        //     $('#poster').attr('src','./img/poster/swy.png');
+        // }else{
+        //     $('#poster').attr('src','./img/poster/ymc.png');
+        // }
         getMsg();
         $(".poster-mode").fadeIn();
     } else {