オーブンで焼く時間の調整

diff --git a/www/corelib/classes/BakingOvenObjectClass.js b/www/corelib/classes/BakingOvenObjectClass.js
index 68dd8cf..fdc0f17 100644 (file)
--- a/www/corelib/classes/BakingOvenObjectClass.js
+++ b/www/corelib/classes/BakingOvenObjectClass.js
@@ -77,7 +77,7 @@ var BakingOvenObjectClass = function(ownerStage, args){
                                        this.isSelecting = true;
                                        var s = null;
                                        var p = 1;
-                                       var t = ((+new Date()) - this.bakingStartTime) * (100/16000);   //16秒が基準(下の判定の100)
+                                       var t = ((+new Date()) - this.bakingStartTime) / 160;   //16秒が基準(下の判定の100)
                                        var c = this.bakingCount;
                                        if(t < 30){
                                                s = "まだ生だった…。";
@@ -127,6 +127,7 @@ var BakingOvenObjectClass = function(ownerStage, args){
                        if(this.bakingTickCount >= 6){
                                this.bakingTickCount = 0;
                                this.bakingCount++;
+                               console.log(((+new Date()) - this.bakingStartTime) / 160);
                                this.image = this.imgs[(this.bakingCount & 1) + 1];
                        }
                }
@@ -144,9 +145,10 @@ var BakingOvenObjectClass = function(ownerStage, args){
                
                if(this.bakingCount > 80)
                {
-                       var puff = ((+new Date()) - this.bakingStartTime) * (100/16000) - 80;
+                       var puff = ((+new Date()) - this.bakingStartTime) / 160 - 80;
                        if(puff > 40)puff = 40;
-                       var opacity = 0.5 * (puff / 40) + (this.ownerStage.manager.tickCount % 10) / 20;
+                       if(puff < 0) puff = 0;
+                       var opacity = (puff / 40);
                        this.ownerStage.mainContext.save();
                        this.ownerStage.mainContext.globalAlpha = opacity;
                        this.ownerStage.mainContext.drawImage(this.img_puff[this.ownerStage.manager.tickCount % 20 < 10 ? 0 : 1], x - 32 , y - 400, 320, 480);