diff --git a/resources/image/character/child/child.afdesign b/resources/image/character/child/child.afdesign index efec058..756a32a 100644 Binary files a/resources/image/character/child/child.afdesign and b/resources/image/character/child/child.afdesign differ diff --git a/src/game/mouse/grilled_meat/bonus_meat.js b/src/game/mouse/grilled_meat/bonus_meat.js index 19f9f45..a949f34 100644 --- a/src/game/mouse/grilled_meat/bonus_meat.js +++ b/src/game/mouse/grilled_meat/bonus_meat.js @@ -14,15 +14,12 @@ function BonusMeat(mainGame) { BonusMeat.prototype.setBonusMeatTypeVariables = function() { this.className = BonusMeat.CLASS_NAME; - this.cookingSpeedArray = []; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_WEAK] = BonusMeat.COOKING_SPEED_BURN_LEVEL_WEAK; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_NORMAL] = BonusMeat.COOKING_SPEED_BURN_LEVEL_NORMAL; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_STRONG] = BonusMeat.COOKING_SPEED_BURN_LEVEL_STRONG; + this.cookingTimeForGradeArray[MeatBase.DONENESS_WELLDONE] = BonusMeat.COOKING_TIME_WELLDONE_MS; + this.cookingTimeForGradeArray[MeatBase.DONENESS_BURN_BLACK] = BonusMeat.COOKING_TIME_BURN_BLACK_MS; - this.scoreArray = []; - this.scoreArray[MeatBase.DONENESS_RARE] = BonusMeat.SCORE_NAME_RARE; - this.scoreArray[MeatBase.DONENESS_WELLDONE] = BonusMeat.SCORE_NAME_WELLDONE; - this.scoreArray[MeatBase.DONENESS_BURN_BLACK] = BonusMeat.SCORE_NAME_BURN_BLACK; + this.scoreArray[MeatBase.DONENESS_RARE] = BonusMeat.SCORE_NAME_RARE; + this.scoreArray[MeatBase.DONENESS_WELLDONE] = BonusMeat.SCORE_NAME_WELLDONE; + this.scoreArray[MeatBase.DONENESS_BURN_BLACK] = BonusMeat.SCORE_NAME_BURN_BLACK; } BonusMeat.prototype.setBonusMeatSprite = function() { @@ -38,13 +35,12 @@ BonusMeat.prototype.setBonusMeatSprite = function() { BonusMeat.CLASS_NAME = "BonusMeat"; -BonusMeat.COOKING_SPEED_BURN_LEVEL_WEAK = 0.1; -BonusMeat.COOKING_SPEED_BURN_LEVEL_NORMAL = 0.2; -BonusMeat.COOKING_SPEED_BURN_LEVEL_STRONG = 0.3; +BonusMeat.COOKING_TIME_WELLDONE_MS = 500; +BonusMeat.COOKING_TIME_BURN_BLACK_MS = 700; -BonusMeat.SCORE_NAME_RARE = 1; -BonusMeat.SCORE_NAME_WELLDONE = 5; -BonusMeat.SCORE_NAME_BURN_BLACK = 1; +BonusMeat.SCORE_NAME_RARE = 2; // cooking time * 2 +BonusMeat.SCORE_NAME_WELLDONE = 4; // cooking time * 4 +BonusMeat.SCORE_NAME_BURN_BLACK = 10; // 10 BonusMeat.SPRITE_NAME_RARE = "bonus_meat"; BonusMeat.SPRITE_NAME_WELLDONE = "bonus_meat_welldone"; diff --git a/src/game/mouse/grilled_meat/game.js b/src/game/mouse/grilled_meat/game.js index 5988320..380b7eb 100644 --- a/src/game/mouse/grilled_meat/game.js +++ b/src/game/mouse/grilled_meat/game.js @@ -144,6 +144,7 @@ var Game = { onChangeDialLevel: function(dialLevel) { this.burnLevel = dialLevel; + // console.log(this.burnLevel); this.heatPlate.onChangeDialLevel(dialLevel); }, @@ -152,6 +153,11 @@ var Game = { this.isEnableClick = value; }, + getBurnLevel: function() { + // console.log(this.burnLevel); + return this.burnLevel; + }, + back: function() { sessionStorageManager.resetPlayingAppData(); location.href = '../../web/client/main_menu.html'; diff --git a/src/game/mouse/grilled_meat/meat_base.js b/src/game/mouse/grilled_meat/meat_base.js index e29d422..39703eb 100644 --- a/src/game/mouse/grilled_meat/meat_base.js +++ b/src/game/mouse/grilled_meat/meat_base.js @@ -39,14 +39,14 @@ MeatBase.prototype.initMeatTypeVariables = function() { this.baseScale = 0.5; this.cookingSide = MeatBase.MEAT_NONE; - this.cookingTime = []; - this.cookingGrade = []; - this.cookingTime[MeatBase.MEAT_BACK] = 0; - this.cookingTime[MeatBase.MEAT_FRONT] = 0; + this.cookingTimeBySide = []; + this.cookingTimeBySide[MeatBase.MEAT_BACK] = 0; + this.cookingTimeBySide[MeatBase.MEAT_FRONT] = 0; - this.cookingGrade[MeatBase.MEAT_BACK] = MeatBase.DONENESS_RARE; - this.cookingGrade[MeatBase.MEAT_FRONT] = MeatBase.DONENESS_RARE; + this.cookingGradeBySide = []; + this.cookingGradeBySide[MeatBase.MEAT_BACK] = MeatBase.DONENESS_RARE; + this.cookingGradeBySide[MeatBase.MEAT_FRONT] = MeatBase.DONENESS_RARE; this.isActivated = true; this.isStartCook = false; @@ -58,13 +58,15 @@ MeatBase.prototype.initMeatTypeVariables = function() { this.initCookingSpeedArray(); this.initScoreArray(); + this.initCookingTimeForGradeArray(); } MeatBase.prototype.initCookingSpeedArray = function() { this.cookingSpeedArray = []; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_WEAK] = 1; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_NORMAL] = 2; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_STRONG] = 3; + this.cookingSpeedArray[HeatPlate.BURN_LEVEL_WEAK] = MeatBase.COOKING_SPEED_BURN_LEVEL_WEAK; + this.cookingSpeedArray[HeatPlate.BURN_LEVEL_NORMAL] = MeatBase.COOKING_SPEED_BURN_LEVEL_NORMAL; + this.cookingSpeedArray[HeatPlate.BURN_LEVEL_STRONG] = MeatBase.COOKING_SPEED_BURN_LEVEL_STRONG; + } MeatBase.prototype.initScoreArray = function() { @@ -74,6 +76,12 @@ MeatBase.prototype.initScoreArray = function() { this.scoreArray[MeatBase.DONENESS_BURN_BLACK] = 0; } +MeatBase.prototype.initCookingTimeForGradeArray = function() { + this.cookingTimeForGradeArray = []; + this.cookingTimeForGradeArray[MeatBase.DONENESS_WELLDONE] = NormalMeat.COOKING_TIME_WELLDONE_MS; + this.cookingTimeForGradeArray[MeatBase.DONENESS_BURN_BLACK] = NormalMeat.COOKING_TIME_BURN_BLACK_MS; +} + MeatBase.prototype.initMouseEventHandler = function() { this.downPositionX; this.downPositionY; @@ -161,17 +169,17 @@ MeatBase.prototype.getClassName = function() { } MeatBase.prototype.getTotalCookingTime = function() { - return this.cookingTime[MeatBase.MEAT_BACK] + this.cookingTime[MeatBase.MEAT_FRONT]; + return this.cookingTimeBySide[MeatBase.MEAT_BACK] + this.cookingTimeBySide[MeatBase.MEAT_FRONT]; } MeatBase.prototype.getScore = function() { var meatDoneness = this.getMeatGrade(); var scoreDoneness = this.scoreArray[meatDoneness]; - var totalCookingTime = this.getTotalCookingTime(); if(meatDoneness == MeatBase.DONENESS_BURN_BLACK) return scoreDoneness; + var totalCookingTime = this.getTotalCookingTime(); return scoreDoneness * totalCookingTime; } @@ -250,16 +258,22 @@ MeatBase.prototype.stopCook = function() { } MeatBase.prototype.getMeatGrade = function() { - if(this.cookingGrade[MeatBase.MEAT_FRONT] == MeatBase.DONENESS_WELLDONE && this.cookingGrade[MeatBase.MEAT_BACK] == MeatBase.DONENESS_WELLDONE) + if( + this.cookingGradeBySide[MeatBase.MEAT_FRONT] == MeatBase.DONENESS_WELLDONE + && this.cookingGradeBySide[MeatBase.MEAT_BACK] == MeatBase.DONENESS_WELLDONE + ) { return MeatBase.DONENESS_WELLDONE; - else if(this.cookingGrade[MeatBase.MEAT_FRONT] == MeatBase.DONENESS_BURN_BLACK || this.cookingGrade[MeatBase.MEAT_BACK] == MeatBase.DONENESS_BURN_BLACK) + } else if( + this.cookingGradeBySide[MeatBase.MEAT_FRONT] == MeatBase.DONENESS_BURN_BLACK + || this.cookingGradeBySide[MeatBase.MEAT_BACK] == MeatBase.DONENESS_BURN_BLACK + ) { return MeatBase.DONENESS_BURN_BLACK; - else + } else return MeatBase.DONENESS_RARE; } MeatBase.prototype.getMeatGradeBySide = function(cookingSide) { - return this.cookingGrade[cookingSide]; + return this.cookingGradeBySide[cookingSide]; } MeatBase.prototype.setActive = function(isActivated, x, y) { @@ -274,10 +288,10 @@ MeatBase.prototype.setActive = function(isActivated, x, y) { } this.cookingSide = MeatBase.MEAT_NONE; - this.cookingTime[MeatBase.MEAT_BACK] = 0; - this.cookingTime[MeatBase.MEAT_FRONT] = 0; - this.cookingGrade[MeatBase.MEAT_BACK] = MeatBase.DONENESS_RARE; - this.cookingGrade[MeatBase.MEAT_FRONT] = MeatBase.DONENESS_RARE; + this.cookingTimeBySide[MeatBase.MEAT_BACK] = 0; + this.cookingTimeBySide[MeatBase.MEAT_FRONT] = 0; + this.cookingGradeBySide[MeatBase.MEAT_BACK] = MeatBase.DONENESS_RARE; + this.cookingGradeBySide[MeatBase.MEAT_FRONT] = MeatBase.DONENESS_RARE; this.x = x; this.y = y; @@ -287,32 +301,27 @@ MeatBase.prototype.setActive = function(isActivated, x, y) { } MeatBase.prototype.cooking = function() { - this.cookingTime[this.cookingSide] += 1; - // console.log("back : " + this.cookingTime[MeatBase.MEAT_BACK] + ", front : " + this.cookingTime[MeatBase.MEAT_FRONT]); + var burnLevel = this.mainGame.getBurnLevel(); + var cookingSpeed = this.cookingSpeedArray[burnLevel]; + this.cookingTimeBySide[this.cookingSide] += 1 * cookingSpeed; - if(this.cookingTime[MeatBase.MEAT_BACK] > MeatBase.COOK_TIME_BURN) { - if(this.getMeatGradeBySide(MeatBase.MEAT_BACK) != MeatBase.DONENESS_BURN_BLACK) { - this.cookingGrade[MeatBase.MEAT_BACK] = MeatBase.DONENESS_BURN_BLACK; + var cookingTimeBurnBlack = this.cookingTimeForGradeArray[MeatBase.DONENESS_BURN_BLACK]; + var cookingTimeWelldone = this.cookingTimeForGradeArray[MeatBase.DONENESS_WELLDONE]; + + if(this.cookingTimeBySide[this.cookingSide] > cookingTimeBurnBlack) { + if(this.getMeatGradeBySide(this.cookingSide) != MeatBase.DONENESS_BURN_BLACK) { + this.cookingGradeBySide[this.cookingSide] = MeatBase.DONENESS_BURN_BLACK; this.changeAnimateSmokeColor(MeatBase.DONENESS_BURN_BLACK); } - } else if(this.cookingTime[MeatBase.MEAT_BACK] > MeatBase.COOK_TIME_WELLDONE) { - if(this.getMeatGradeBySide(MeatBase.MEAT_BACK) != MeatBase.DONENESS_WELLDONE) { - this.cookingGrade[MeatBase.MEAT_BACK] = MeatBase.DONENESS_WELLDONE; + } else if(this.cookingTimeBySide[this.cookingSide] > cookingTimeWelldone) { + if(this.getMeatGradeBySide(this.cookingSide) != MeatBase.DONENESS_WELLDONE) { + this.cookingGradeBySide[this.cookingSide] = MeatBase.DONENESS_WELLDONE; this.changeAnimateSmokeColor(MeatBase.DONENESS_WELLDONE); } } +} - if(this.cookingTime[MeatBase.MEAT_FRONT] > MeatBase.COOK_TIME_BURN) { - if(this.getMeatGradeBySide(MeatBase.MEAT_FRONT) != MeatBase.DONENESS_BURN_BLACK) { - this.cookingGrade[MeatBase.MEAT_FRONT] = MeatBase.DONENESS_BURN_BLACK; - this.changeAnimateSmokeColor(MeatBase.DONENESS_BURN_BLACK); - } - } else if(this.cookingTime[MeatBase.MEAT_FRONT] > MeatBase.COOK_TIME_WELLDONE) { - if(this.getMeatGradeBySide(MeatBase.MEAT_FRONT) != MeatBase.DONENESS_WELLDONE) { - this.cookingGrade[MeatBase.MEAT_FRONT] = MeatBase.DONENESS_WELLDONE; - this.changeAnimateSmokeColor(MeatBase.DONENESS_WELLDONE); - } - } +MeatBase.prototype.setMeatGrade = function(side, grade) { } MeatBase.prototype.stopAnimateSmoke = function() { @@ -322,7 +331,7 @@ MeatBase.prototype.stopAnimateSmoke = function() { } MeatBase.prototype.startAnimateSmoke = function() { - var cookingSideGrade = this.cookingGrade[this.cookingSide]; + var cookingSideGrade = this.cookingGradeBySide[this.cookingSide]; this.changeAnimateSmokeColor(cookingSideGrade); } @@ -362,5 +371,9 @@ MeatBase.DONENESS_WELLDONE = 1; MeatBase.DONENESS_BURN_BLACK = 2; MeatBase.DONENESS_NONE = 3; -MeatBase.COOK_TIME_WELLDONE = 200; -MeatBase.COOK_TIME_BURN = 400; \ No newline at end of file +MeatBase.COOKING_TIME_WELLDONE_MS = 200; +MeatBase.COOKING_TIME_BURN_BLACK_MS = 400; + +MeatBase.COOKING_SPEED_BURN_LEVEL_WEAK = 1; +MeatBase.COOKING_SPEED_BURN_LEVEL_NORMAL = 1.5; +MeatBase.COOKING_SPEED_BURN_LEVEL_STRONG = 2; \ No newline at end of file diff --git a/src/game/mouse/grilled_meat/normal_meat.js b/src/game/mouse/grilled_meat/normal_meat.js index 0be9abd..58eabe3 100644 --- a/src/game/mouse/grilled_meat/normal_meat.js +++ b/src/game/mouse/grilled_meat/normal_meat.js @@ -15,12 +15,9 @@ function NormalMeat(mainGame) { NormalMeat.prototype.setNormalMeatTypeVariables = function() { this.className = NormalMeat.CLASS_NAME; - // this.cookingSpeedArray = []; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_WEAK] = NormalMeat.COOKING_SPEED_BURN_LEVEL_WEAK; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_NORMAL] = NormalMeat.COOKING_SPEED_BURN_LEVEL_NORMAL; - this.cookingSpeedArray[HeatPlate.BURN_LEVEL_STRONG] = NormalMeat.COOKING_SPEED_BURN_LEVEL_STRONG; + this.cookingTimeForGradeArray[MeatBase.DONENESS_WELLDONE] = NormalMeat.COOKING_TIME_WELLDONE_MS; + this.cookingTimeForGradeArray[MeatBase.DONENESS_BURN_BLACK] = NormalMeat.COOKING_TIME_BURN_BLACK_MS; - // this.scoreArray = []; this.scoreArray[MeatBase.DONENESS_RARE] = NormalMeat.SCORE_NAME_RARE; this.scoreArray[MeatBase.DONENESS_WELLDONE] = NormalMeat.SCORE_WELLDONE; this.scoreArray[MeatBase.DONENESS_BURN_BLACK] = NormalMeat.SCORE_BURN_BLACK; @@ -57,13 +54,12 @@ NormalMeat.prototype.setNormalMeatSprite = function() { NormalMeat.CLASS_NAME = "NormalMeat"; -NormalMeat.COOKING_SPEED_BURN_LEVEL_WEAK = 0.1; -NormalMeat.COOKING_SPEED_BURN_LEVEL_NORMAL = 0.2; -NormalMeat.COOKING_SPEED_BURN_LEVEL_STRONG = 0.3; +NormalMeat.COOKING_TIME_WELLDONE_MS = 200; +NormalMeat.COOKING_TIME_BURN_BLACK_MS = 400; -NormalMeat.SCORE_RARE = 1; -NormalMeat.SCORE_WELLDONE = 2; -NormalMeat.SCORE_BURN_BLACK = 1; +NormalMeat.SCORE_RARE = 1; // cooking time * 1 +NormalMeat.SCORE_WELLDONE = 2; // cooking time * 2 +NormalMeat.SCORE_BURN_BLACK = 10; // 10 NormalMeat.SPRITE_NAME_RARE = "meat"; NormalMeat.SPRITE_NAME_WELLDONE = "meat_welldone"; diff --git a/src/game/mouse/grilled_meat/stove_dial.js b/src/game/mouse/grilled_meat/stove_dial.js index 946c12d..908b1c5 100644 --- a/src/game/mouse/grilled_meat/stove_dial.js +++ b/src/game/mouse/grilled_meat/stove_dial.js @@ -16,7 +16,7 @@ function StoveDial(x, y) { this.addDotSprite(); - this.state = HeatPlate.BURN_LEVEL_WEAK; + this.burnLevel = HeatPlate.BURN_LEVEL_WEAK; this.setDialLevel(); } @@ -30,22 +30,22 @@ StoveDial.prototype.addDotSprite = function() { } StoveDial.prototype.onDown = function() { - switch(this.state) { + switch(this.burnLevel) { case HeatPlate.BURN_LEVEL_WEAK: - this.state = HeatPlate.BURN_LEVEL_NORMAL; + this.burnLevel = HeatPlate.BURN_LEVEL_NORMAL; break; case HeatPlate.BURN_LEVEL_NORMAL: - this.state = HeatPlate.BURN_LEVEL_STRONG; + this.burnLevel = HeatPlate.BURN_LEVEL_STRONG; break; case HeatPlate.BURN_LEVEL_STRONG: - this.state = HeatPlate.BURN_LEVEL_WEAK; + this.burnLevel = HeatPlate.BURN_LEVEL_WEAK; break; } this.setDialLevel(); - this.onChangeDialLevel(this.state); + this.onChangeDialLevel(this.burnLevel); } StoveDial.prototype.setOnChangeDialLevelHandler = function(eventHandler) { @@ -54,7 +54,7 @@ StoveDial.prototype.setOnChangeDialLevelHandler = function(eventHandler) { StoveDial.prototype.setDialLevel = function() { - switch(this.state) { + switch(this.burnLevel) { case HeatPlate.BURN_LEVEL_WEAK: this.angle = 30; this.dot.tint = StoveDial.BURN_COLOR_WEAK;