Browse Source

Fix loading, remove unused asset

pull/2/head
Robert Chen 11 years ago
parent
commit
b539104f59
  1. 4
      js/screens.js
  2. 1
      js/soundmanager.js

4
js/screens.js

@ -15,7 +15,6 @@ function LoadingScreen( stage, gameState ){ @@ -15,7 +15,6 @@ function LoadingScreen( stage, gameState ){
this.done.alpha= 0;
stage.addChild( this.picture );
stage.addChild( this.cooking );
stage.addChild( this.done );
stage.addChild( this.turkeyState[0] );
var textContent = new createjs.Text( "0 %", "25px Arial", "black" );
@ -46,7 +45,7 @@ function LoadingScreen( stage, gameState ){ @@ -46,7 +45,7 @@ function LoadingScreen( stage, gameState ){
that.done.addEventListener( "mouseout", function(){ document.body.style.cursor='default'; } );
that.done.addEventListener( "click", function(){ gameState.pubsub.publish("SwitchScreen", "MainScreen"); });
/*
/*
that.turkeyState[4].addEventListener( "mouseover", function(){ document.body.style.cursor='pointer'; } );
that.turkeyState[4].addEventListener( "mouseout", function(){ document.body.style.cursor='default'; } );
that.turkeyState[4].addEventListener( "click", function(){ gameState.pubsub.publish("SwitchScreen", "MainScreen"); });
@ -54,6 +53,7 @@ function LoadingScreen( stage, gameState ){ @@ -54,6 +53,7 @@ function LoadingScreen( stage, gameState ){
}
});
stage.addChild( this.done );
stage.addChild( this.pictureFront );
return {

1
js/soundmanager.js

@ -14,7 +14,6 @@ function SoundManager( gameState ){ @@ -14,7 +14,6 @@ function SoundManager( gameState ){
// Register all sounds loaded in gameState
createjs.Sound.registerSound("res/sound/turkey_in_the_straw.mp3", "TitleMusic");
createjs.Sound.registerSound("res/sound/Store/Waterford.mp3", "MarketMusic");
createjs.Sound.registerSound("res/sound/GUI/lowclick.mp3", "LowClick");
createjs.Sound.registerSound("res/sound/GUI/click.mp3", "Click");
createjs.Sound.registerSound("res/sound/GUI/buzz.mp3", "Error");
createjs.Sound.registerSound("res/sound/Store/buy.mp3", "Buy");

Loading…
Cancel
Save