diff --git a/resources/image/character/child/child.afdesign b/resources/image/character/child/child.afdesign new file mode 100644 index 0000000..efec058 Binary files /dev/null and b/resources/image/character/child/child.afdesign differ diff --git a/resources/image/character/child/child.png b/resources/image/character/child/child.png new file mode 100644 index 0000000..18a00a4 Binary files /dev/null and b/resources/image/character/child/child.png differ diff --git a/src/game/mouse/grilled_meat/game.js b/src/game/mouse/grilled_meat/game.js index 65aaeff..c40a78f 100644 --- a/src/game/mouse/grilled_meat/game.js +++ b/src/game/mouse/grilled_meat/game.js @@ -68,8 +68,9 @@ var Game = { this.god = new God(this); this.waiter = new Waiter(); - this.meatPlate = game.add.image(220, Game.MEAT_PLATE_POSITION_Y, 'plate'); + this.meatPlate = game.add.image(Game.MEAT_PLATE_POSITION_X, Game.MEAT_PLATE_POSITION_Y, 'plate'); this.meatPlate.anchor.set(0.5); + this.meatPlate.scale.set(0.8); this.meatPlate.smoothed = false; this.heatPlate = new HeatPlate(); @@ -196,8 +197,11 @@ var Game = { this.badMeatCount = 0; console.log("badMeatCount : " + this.badMeatCount); this.activatedMeatCount = this.getStageMeatCount(); - this.serveMeats(); - this.waiter.animateServing(); + this.serveBonusMeat(); + this.serveNormalMeats(); + + if(this.playingStageNo > 1) + this.waiter.animateServing(); }, setClickEnable: function(value) { @@ -209,13 +213,22 @@ var Game = { return this.activatedMeatCount; }, - serveMeats: function() { - if(this.playingStageNo > 1 && this.badMeatCount == 0 && this.bonusMeat.isActivate() == false) { - var randX = this.meatPlate.x - game.rnd.integerInRange(-100, 100); - var randY = this.meatPlate.y - game.rnd.integerInRange(-30, 30); - this.bonusMeat.setActive(true, randX, randY, ""); - } + serveBonusMeat: function() { + if(this.playingStageNo == 1) + return; + if(this.badMeatCount > 0) + return; + + if(this.bonusMeat.isActivate()) + return; + + var randX = this.meatPlate.x - game.rnd.integerInRange(-100, 100); + var randY = this.meatPlate.y - game.rnd.integerInRange(-30, 30); + this.bonusMeat.setActive(true, randX, randY, ""); + }, + + serveNormalMeats: function() { for(var i = 0; i < Game.MAX_MEAT_COUNT; i++) { var meat = this.meatGroup.children[i]; meat.setActive(false, -100, -100, ""); @@ -434,5 +447,7 @@ Game.HEAT_PLATE_HEIGHT = 220; Game.GOD_OUT_OF_FACE_WIDTH = 30; Game.GOD_OUT_OF_FACE_HEIGHT = 30; -Game.MEAT_PLATE_POSITION_Y = 360; +Game.MEAT_PLATE_POSITION_X = 180; +Game.MEAT_PLATE_POSITION_Y = 390; + Game.HEAT_PLATE_POSITION_Y = GAME_SCREEN_SIZE.y / 2 + 200; \ No newline at end of file diff --git a/src/game/mouse/grilled_meat/heat_plate.js b/src/game/mouse/grilled_meat/heat_plate.js index 66dee68..bea0759 100644 --- a/src/game/mouse/grilled_meat/heat_plate.js +++ b/src/game/mouse/grilled_meat/heat_plate.js @@ -46,7 +46,7 @@ HeatPlate.prototype.onChangeDialLevel = function(dialLevel) { } -HeatPlate.POSITION_X = GAME_SCREEN_SIZE.x / 2; +HeatPlate.POSITION_X = GAME_SCREEN_SIZE.x / 2 + 70; HeatPlate.POSITION_Y = GAME_SCREEN_SIZE.y / 2 + 200; HeatPlate.BURN_LEVEL_WEAK = 0; diff --git a/src/game/mouse/grilled_meat/loading.js b/src/game/mouse/grilled_meat/loading.js index a7a309c..5fc4ede 100644 --- a/src/game/mouse/grilled_meat/loading.js +++ b/src/game/mouse/grilled_meat/loading.js @@ -69,7 +69,7 @@ var Loading = { game.load.image('god_smile', '../../../resources/image/character/god/god_smile.png'); game.load.image('god_happy', '../../../resources/image/character/god/god_happy.png'); - game.load.image('waiter', '../../../resources/image/character/god/god_smile.png'); + game.load.image('waiter', '../../../resources/image/character/child/child.png'); // game.load.image('a', '../../../resources/image/icon/fullscreen_white.png'); // game.load.image('b', '../../../resources/image/icon/fullscreen_white.png');