Comparar texto

Encontre a diferença entre dois arquivos de texto

Exibição

Layout

Editor liveOcultar espaços em brancoRecolher inalteradasSem quebra de linha

Nível de detalhe

Sintaxe

Processamento

Diffchecker Desktop A maneira mais segura de usar o Diffchecker. Obtenha o aplicativo Diffchecker Desktop: seus diffs nunca saem do seu computador!Obter Desktop

Untitled diff

Criado há 9 anosO diff nunca expira

9 remoções

Linhas
Total
Removido

Caracteres
Total
Removido

Para continuar usando este recurso, atualize para Diffchecker Pro Ver preços

209 linhas

13 adições

Linhas
Total
Adicionado

Caracteres
Total
Adicionado

Para continuar usando este recurso, atualize para Diffchecker Pro Ver preços

213 linhas

var Game = function()

{

this.bgLayers = {};

this.barWidth = 530;

this.init = false;

this.queue = new createjs.LoadQueue(false, "assets/");

this.queue.installPlugin(createjs.Sound);

this.queue.addEventListener("complete", createjs.proxy(this.run, this));

this.queue.addEventListener("progress", function(e) { $("#loader").text("Loading: " + Math.round(e.progress * 100) + "%"); });

createjs.Sound.alternateExtensions = ["mp3"];

createjs.Ticker.addEventListener("tick", createjs.proxy(this.tick, this));

};

Game.prototype =

{

load: function load()

{

this.queue.loadManifest([

{ id: "bg", src: "img/parallax-mountain-bg.png" },

{ id: "mountain", src: "img/parallax-mountain-montain-far.png" },

{ id: "mountains", src: "img/parallax-mountain-mountains.png" },

{ id: "trees", src: "img/parallax-mountain-trees.png" },

{ id: "player-icon", src: "img/player-icon.png" },

{ id: "player", src: "img/player.png" },

{ id: "baddies", src: "img/baddies.png" },

{ id: "goal", src: "img/goal.png" },

{ id: "bgm", src: "bgm.ogg" }

]);

run: function run()

{

$("#loader").remove();

$("#intro").css("display", "block");

createjs.Sound.play("bgm", { loop: -1 });

start: function start()

{

createjs.Sound.play("bgm", { loop: -1 });

$("#intro").remove();

$("#wrapper").css("display", "block");

this.baddies = 0;

this.player = {

distance: 250,

strength: 1,

food: 3,

water: 5

}

this.sleeping = false;

this.stop = false;

this.bgLayers = {

bg: {

x: 0,

y: -62,

speed: 25

mountain: {

x: 0,

y: -40,

speed: 50

mountains: {

x: 0,

y: -40,

speed: 75

trees: {

x: 0,

y: -40,

speed: 100

}

};

$("#food-count").text(this.player.food);

$("#water-count").text(this.player.water);

$("#action-eat").click(this.eat.bind(this));

$("#action-drink").click(this.drink.bind(this));

$("#action-sleep").click(this.sleep.bind(this));

$("#message").empty();

$("#player").css("animation", "play .5s steps(2) infinite");

this.init = true;

tick: function tick(e)

{

if (this.stop || !this.init)

return;

if (this.sleeping)

this.player.strength = this.addStrength(e.delta / 8000);

Diferenças salvas

Texto original

Abrir arquivo

Game.prototype =
{
	load: function load()
	{
        this.queue.loadManifest([
            { id: "bg", src: "img/parallax-mountain-bg.png" },
            { id: "mountain", src: "img/parallax-mountain-montain-far.png" },
            { id: "mountains", src: "img/parallax-mountain-mountains.png" },
            { id: "trees", src: "img/parallax-mountain-trees.png" },
            { id: "player-icon", src: "img/player-icon.png" },
            { id: "player", src: "img/player.png" },
            { id: "baddies", src: "img/baddies.png" },
            { id: "goal", src: "img/goal.png" },
            { id: "bgm", src: "bgm.ogg" }
        ]);
	},
	
	run: function run()
	{
		$("#loader").remove();
        $("#intro").css("display", "block");
    },
    
    start: function start()
    {
        createjs.Sound.play("bgm", { loop: -1 });
		$("#intro").remove();
        $("#wrapper").css("display", "block");
        
        this.baddies = 0;

this.player = {
            distance: 250,
            strength: 1,
            food: 3,
            water: 5
        }

this.sleeping = false;
 this.stop = false;
 
 this.bgLayers = {
 bg: {
 x: 0,
 y: -62,
 speed: 25
 },
 mountain: {
 x: 0,
 y: -40,
 speed: 50
 },
 mountains: {
 x: 0,
 y: -40,
 speed: 75
 },
 trees: {
 x: 0,
 y: -40,
 speed: 100
 }
 };
 
 $("#food-count").text(this.player.food);
 $("#water-count").text(this.player.water);
 
 $("#action-eat").click(this.eat.bind(this));
 $("#action-drink").click(this.drink.bind(this));
 $("#action-sleep").click(this.sleep.bind(this));
 
 this.init = true;
	},
	
	tick: function tick(e)
	{
 if (this.stop || !this.init)
 return;
 
 if (this.sleeping)
 this.player.strength = this.addStrength(e.delta / 8000);
 else
 this.player.strength -= e.delta / 60000;
 
 if (this.player.strength <= 0)
 {
 $("#strength-bar").width(0);
 $("#player").css("animation", "die .5s steps(4) forwards");
 this.showMsg("You died of exhaustion!");
 this.stop = true;
 }
 else
 {
 $("#strength-bar").width(this.barWidth * this.player.strength);

if (!this.sleeping)
 {
 for (var i in this.bgLayers)
 {
 this.bgLayers[i].x -= this.bgLayers[i].speed / e.delta * this.player.strength;
 $("#" + i).css("background-position", this.bgLayers[i].x + "px " + this.bgLayers[i].y + "px");
 }
 
 this.player.distance += 2.5 * (e.delta / 60) * this.player.strength;
 }
 
 this.baddies += 2.5 * (e.delta / 60) * 0.75;
 
 $("#player-icon").css("left", (this.player.distance / 10) + "px");
 $("#baddies").css("left", (this.baddies / 10) + "px");
 
 if (this.baddies >= this.player.distance)
 {
 this.player.strength = 0;
 this.showMsg("You got caught!");
 }
 else if (this.player.distance > 7700)
 {
 this.showMsg("You made it!");
 this.stop = true;
 $("#player").css("animation", "none");
 }
 }
	},
 
 eat: function eat()
 {
 if (this.player.strength <= 0 || this.sleeping)
 return;
 
 if (this.player.food > 0)
 {
 this.player.strength = this.addStrength(0.4);
 this.player.food--;
 $("#food-count").text(this.player.food);
 }
 else
 this.showMsg("No food left!", 2000);
 },
 
 drink: function drink()
 {
 if (this.player.strength <= 0 || this.sleeping)
 return;
 
 if (this.player.water > 0)
 {
 this.player.strength = this.addStrength(0.2);
 this.player.water--;
 $("#water-count").text(this.player.water);
 }
 else
 this.showMsg("No water left!", 2000);
 },
 
 sleep: function sleep()
 {
 if (this.player.strength <= 0 || this.sleeping)
 return;
 
 this.sleeping = true;
 
 $("#world").animate({ opacity: 0 }, 500, function() {
 //this.baddies += 25;
 
 setTimeout(function() {
 $("#world").animate({ opacity: 1 }, 500, function() {
 this.sleeping = false;
 }.bind(this));
 }.bind(this), 2000);
 }.bind(this));
 
 //this.player.strength = this.addStrength(0.75);
 },
 
 addStrength: function addStrength(v)
 {
 var s = this.player.strength + v;
 return (s > 1 ? 1 : s);
 },
 
 showMsg: function showMsg(msg, timeout)
 {
 $("#message").html(msg);
 
 if (timeout)
 {
 window.clearTimeout(window.timeoutID);
 window.timeoutID = setTimeout(function() { $("#message").empty(); }, timeout)
 }
 }
};

Texto alterado

Abrir arquivo

Game.prototype =
{
	load: function load()
	{
        this.queue.loadManifest([
            { id: "bg", src: "img/parallax-mountain-bg.png" },
            { id: "mountain", src: "img/parallax-mountain-montain-far.png" },
            { id: "mountains", src: "img/parallax-mountain-mountains.png" },
            { id: "trees", src: "img/parallax-mountain-trees.png" },
            { id: "player-icon", src: "img/player-icon.png" },
            { id: "player", src: "img/player.png" },
            { id: "baddies", src: "img/baddies.png" },
            { id: "goal", src: "img/goal.png" },
            { id: "bgm", src: "bgm.ogg" }
        ]);
	},
	
	run: function run()
	{
		$("#loader").remove();
        $("#intro").css("display", "block");
        createjs.Sound.play("bgm", { loop: -1 });
    },
    
    start: function start()
    {
		$("#intro").remove();
        $("#wrapper").css("display", "block");
        
        this.baddies = 0;

this.player = {
            distance: 250,
            strength: 1,
            food: 3,
            water: 5
        }

this.sleeping = false;
 this.stop = false;
 
 this.bgLayers = {
 bg: {
 x: 0,
 y: -62,
 speed: 25
 },
 mountain: {
 x: 0,
 y: -40,
 speed: 50
 },
 mountains: {
 x: 0,
 y: -40,
 speed: 75
 },
 trees: {
 x: 0,
 y: -40,
 speed: 100
 }
 };
 
 $("#food-count").text(this.player.food);
 $("#water-count").text(this.player.water);
 
 $("#action-eat").click(this.eat.bind(this));
 $("#action-drink").click(this.drink.bind(this));
 $("#action-sleep").click(this.sleep.bind(this));
 
 $("#message").empty();
 $("#player").css("animation", "play .5s steps(2) infinite");
 this.init = true;
	},
	
	tick: function tick(e)
	{
 if (this.stop || !this.init)
 return;
 
 if (this.sleeping)
 this.player.strength = this.addStrength(e.delta / 8000);
 else
 this.player.strength -= e.delta / 60000;
 
 if (this.player.strength <= 0)
 {
 $("#strength-bar").width(0);
 $("#player").css("animation", "die .5s steps(4) forwards");
 this.showMsg('You died of exhaustion! Restart');
 this.stop = true;
 }
 else
 {
 $("#strength-bar").width(this.barWidth * this.player.strength);

if (!this.sleeping)
 {
 for (var i in this.bgLayers)
 {
 this.bgLayers[i].x -= this.bgLayers[i].speed / e.delta * this.player.strength;
 $("#" + i).css("background-position", this.bgLayers[i].x + "px " + this.bgLayers[i].y + "px");
 }
 
 this.player.distance += 2.5 * (e.delta / 60) * this.player.strength;
 }
 
 this.baddies += 2.5 * (e.delta / 60) * 0.75;
 
 $("#player-icon").css("left", (this.player.distance / 10) + "px");
 $("#baddies").css("left", (this.baddies / 10) + "px");
 
 if (this.baddies >= this.player.distance)
 {
 $("#strength-bar").width(0);
 $("#player").css("animation", "die .5s steps(4) forwards");
 this.showMsg('You got caught! Restart');
 this.stop = true;
 }
 else if (this.player.distance > 7700)
 {
 this.showMsg('You made it! Restart');
 this.stop = true;
 $("#player").css("animation", "none");
 }
 }
	},
 
 eat: function eat()
 {
 if (this.player.strength <= 0 || this.sleeping)
 return;
 
 if (this.player.food > 0)
 {
 this.player.strength = this.addStrength(0.4);
 this.player.food--;
 $("#food-count").text(this.player.food);
 }
 else
 this.showMsg("No food left!", 2000);
 },
 
 drink: function drink()
 {
 if (this.player.strength <= 0 || this.sleeping)
 return;
 
 if (this.player.water > 0)
 {
 this.player.strength = this.addStrength(0.2);
 this.player.water--;
 $("#water-count").text(this.player.water);
 }
 else
 this.showMsg("No water left!", 2000);
 },
 
 sleep: function sleep()
 {
 if (this.player.strength <= 0 || this.sleeping)
 return;
 
 this.sleeping = true;
 
 $("#world").animate({ opacity: 0 }, 500, function() {
 //this.baddies += 25;
 
 setTimeout(function() {
 $("#world").animate({ opacity: 1 }, 500, function() {
 this.sleeping = false;
 }.bind(this));
 }.bind(this), 2000);
 }.bind(this));
 
 //this.player.strength = this.addStrength(0.75);
 },
 
 addStrength: function addStrength(v)
 {
 var s = this.player.strength + v;
 return (s > 1 ? 1 : s);
 },
 
 showMsg: function showMsg(msg, timeout)
 {
 $("#message").html(msg);
 
 if (timeout)
 {
 window.clearTimeout(window.timeoutID);
 window.timeoutID = setTimeout(function() { $("#message").empty(); }, timeout)
 }
 }
};