合并时出现错误修正

minigame/WebContent/js/main.js

@@ -71,66 +71,6 @@ function handleComplete(evt, comp) {
     });
 
 
-    var dishIndex = 0;
-    $(".select-dish-box .item").on("click", function() {
-        $(this).addClass("active").siblings().removeClass("active");
-        $(".select-dish-box .confirm").show();
-    })
-    $(".select-dish-box .confirm").on("click", function() {
-        if (!$(".select-dish-box .item").hasClass("active")) {
-            alert("请选择你要做的菜")
-            return false;
-        }
-        dishIndex = $(".select-dish-box .item.active").index();
-        $(".select-dish-box").hide();
-        $(".game-box").show();
-
-        // 判断是哪个菜
-        if(dishIndex == 0){
-            exportRoot.plate.hsr_icon1.alpha = 1;
-            exportRoot.plate.hsr_icon2.alpha = 1;
-            exportRoot.plate.hsr_icon3.alpha = 1;
-            exportRoot.plate.hsr_icon4.alpha = 1;
-    var comp = AdobeAn.getComposition("5529E26743974F469545223C44E61D22");
-    var lib = comp.getLibrary();
-    var loader = new createjs.LoadQueue(false);
-    loader.addEventListener("fileload", function(evt) { handleFileLoad(evt, comp) });
-    loader.addEventListener("complete", function(evt) { handleComplete(evt, comp) });
-    loader.addEventListener("progress", loadProgressHandler);
-    var lib = comp.getLibrary();
-    loader.loadManifest(lib.properties.manifest);
-    createjs.MotionGuidePlugin.install();
-    createjs.Touch.enable(stage);
-}
-
-function handleFileLoad(evt, comp) {
-    var loadingimages = comp.getImages();
-    if (evt && (evt.item.type == "image")) {
-        loadingimages[evt.item.id] = evt.result;
-    }
-}
-
-function loadProgressHandler(event) {
-    var num = Math.floor(event.progress * 100);
-    $("#loadingTxt").text(num);
-    $("#loadingBar").css("width", num + '%');
-}
-
-function handleComplete(evt, comp) {
-    //This function is always called, irrespective of the content. You can use the variable "stage" after it is created in token create_stage.
-    var lib = comp.getLibrary();
-    var ss = comp.getSpriteSheet();
-    var queue = evt.target;
-    var ssMetadata = lib.ssMetadata;
-    for (i = 0; i < ssMetadata.length; i++) {
-        ss[ssMetadata[i].name] = new createjs.SpriteSheet({ "images": [queue.getResult(ssMetadata[i].name)], "frames": ssMetadata[i].frames })
-    }
-    var exportRoot = new lib.assets();
-    $(".loading").fadeOut(function(){
-        $(".select-dish-box").find(".animated").removeClass("js-an");
-    });
-
-
     var dishIndex = 0;
     $(".select-dish-box .item").on("click", function() {
         $(this).addClass("active").siblings().removeClass("active");