パン焼き窯のバグを修正

diff --git a/www/corelib/classes/BakingOvenObjectClass.js b/www/corelib/classes/BakingOvenObjectClass.js
index da6815e..8c87a16 100644 (file)
--- a/www/corelib/classes/BakingOvenObjectClass.js
+++ b/www/corelib/classes/BakingOvenObjectClass.js
@@ -59,8 +59,8 @@ var BakingOvenObjectClass = function(ownerStage, args){
                                                                                        for(var i = 0, m = retv.length; i < m; i++){
                                                                                                removeAnObjectFromArray(thatManager.userManager.ingredientList, retv[i]);
                                                                                        }
-                                                                                       this.cookSound.load();
-                                                                                       this.cookSound.play();
+                                                                                       that.cookSound.load();
+                                                                                       that.cookSound.play();
                                                                                }
                                                                        } else{
                                                                                thatManager.addWidget(new MessageWidgetClass(thatManager, ["一つも材料が選択されていないので、パンを焼くことができません！\n"]));
@@ -70,7 +70,7 @@ var BakingOvenObjectClass = function(ownerStage, args){
                                                        },true, 0, true])
                                                );
                                        }
-                               } else{
+                               } else if(this.bakingCount > 10){
                                        //焼き終わり
                                        this.isSelecting = true;
                                        var s = null;
@@ -114,6 +114,7 @@ var BakingOvenObjectClass = function(ownerStage, args){
                                        that.isBaking = false;
                                        this.bakingCount = 0;
                                        this.image = this.imgs[0];
+                                       that.cookSound.pause();
                                }
                        }
                }

diff --git a/www/corelib/classes/RandomIngredientItemClass.js b/www/corelib/classes/RandomIngredientItemClass.js
index 4987e99..f99bde5 100644 (file)
--- a/www/corelib/classes/RandomIngredientItemClass.js
+++ b/www/corelib/classes/RandomIngredientItemClass.js
@@ -39,7 +39,7 @@ var RandomIngredientItemClass = function(stage, args){
                RandomIngredientItemClass.base.prototype.draw.apply(this, arguments);
        },
        itemCaputured: function(obj){
-               if(obj instanceof MainCharacterClass){
+               if(this.image && obj instanceof MainCharacterClass){
                        var m = this.ownerStage.userControlledCharacter;
                        if(obj == m){
                                if(this.ownerStage.manager.userManager.addIngredientItem(getSelectWidgetItemFromIngredientID(this.ingredients[this.currentItemIndex][0]))){