Commit c3119301 authored by 18신대성's avatar 18신대성

ScenesData에 각 scene의 this를 넣어둠, 이전에 test로 쓰던건 다 교체함

parent 2fdf73fd
......@@ -42,7 +42,7 @@ socket.on('setPlayerTypingRate', function(msg) // number playerTypingRate
});
socket.on('attacked', function(msg) // object attackData
{
WordSpace.generateWord.Attack(WordSpace.gameSceneForTest, msg.text, msg.grade, msg.attacker, msg.isStrong);
WordSpace.generateWord.Attack(ScenesData.gameScene, msg.text, msg.grade, msg.attacker, msg.isStrong);
});
socket.on('defeat', function(msg) // object player
{
......
var ScenesData = ScenesData || {};
var menuScene = new Phaser.Class(
{
Extends: Phaser.Scene,
......@@ -11,6 +13,7 @@ var menuScene = new Phaser.Class(
preload: function()
{
ScenesData.menuScene = this;
Input.inputField.loadImage(this);
BackGround.loadImage(this);
Audio.loadSound(this);
......@@ -37,6 +40,7 @@ var gameScene = new Phaser.Class(
preload: function()
{
ScenesData.gameScene = this;
BackGround.loadImage(this);
WordSpace.loadImage(this);
Input.inputField.loadImage(this);
......@@ -65,7 +69,7 @@ var gameScene = new Phaser.Class(
WordSpace.setPlayerTyping.initiate(this);
WordSpace.nameWordTextForTest = WordSpace.gameSceneForTest.add.text(50,400,'현재 가진 호패들 : 없음').setDepth(10).setColor('#000000');
WordSpace.nameWordTextForTest = ScenesData.gameScene.add.text(50,400,'현재 가진 호패들 : 없음').setDepth(10).setColor('#000000');
WordSpace.nameQueue.initiate();
RoomData.players.forEach(function(element)
{
......
var WordSpace = WordSpace || {};
// for test
WordSpace.gameSceneForTest = null;
WordSpace.weightTextObjForTest = null;
WordSpace.nameWordTextForTest = null;
......@@ -69,7 +68,7 @@ WordSpace.gameOverCycle = new Cycle(gameOver);
//호패 생성 사이클
WordSpace.nameCycle = new Cycle(function()
{
WordSpace.generateWord.Name(WordSpace.gameSceneForTest, false);
WordSpace.generateWord.Name(ScenesData.gameScene, false);
});
//이건 뭐지
WordSpace.varAdjustCycle = new Cycle(function()
......@@ -143,8 +142,8 @@ WordSpace.AdjustVarByPhase = function(typingRate, phase)
WordSpace.GradeProb[1] = 0.8 - 0.45 * typingRate;
WordSpace.GradeProb[2] = 0.9 - 0.15 * typingRate;
}
WordSpace.wordCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.delay.WordSpawn, WordSpace.wordCycle.currentCycle.getElapsed(), true);
WordSpace.nameCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.delay.NameSpawn, WordSpace.nameCycle.currentCycle.getElapsed(), true);
WordSpace.wordCycle.resetCycle(ScenesData.gameScene, WordSpace.delay.WordSpawn, WordSpace.wordCycle.currentCycle.getElapsed(), true);
WordSpace.nameCycle.resetCycle(ScenesData.gameScene, WordSpace.delay.NameSpawn, WordSpace.nameCycle.currentCycle.getElapsed(), true);
}
WordSpace.attackGauge =
......@@ -235,7 +234,6 @@ WordSpace.loadImage = function(scene)
scene.load.image('nameBgr' + i, 'assets/placeholder/name' + i + '.png');
}
WordSpace.gameSceneForTest = scene; // for test
WordSpace.weightTextObjForTest = scene.add.text(100, 75, '뇌의 무게: (현재) 0 / 100 (전체)').setDepth(10).setColor('#000000');
}
......@@ -292,7 +290,7 @@ WordSpace.setGameOverTimer = function()
if(this.brainCapacity < this.totalWeight && !this.isTimerOn)
{
this.isTimerOn = true;
WordSpace.gameOverCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.delay.GameOver, 0, false);
WordSpace.gameOverCycle.resetCycle(ScenesData.gameScene, WordSpace.delay.GameOver, 0, false);
}
}
......@@ -319,12 +317,12 @@ WordSpace.findWord = function(wordText)
if (weightest.wordWeight < element.wordWeight) weightest = element;
});
weightest.destroy();
WordSpace.nameCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.delay.NameSpawn, WordSpace.nameCycle.currentCycle.getElapsed() + WordSpace.NameSpawnReduce, true);
WordSpace.nameCycle.resetCycle(ScenesData.gameScene, WordSpace.delay.NameSpawn, WordSpace.nameCycle.currentCycle.getElapsed() + WordSpace.NameSpawnReduce, true);
while(WordSpace.totalWordNum < 5)
{
WordSpace.genWordByProb(WordSpace.gameSceneForTest);
WordSpace.wordCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.delay.WordSpawn, 0);
WordSpace.genWordByProb(ScenesData.gameScene);
WordSpace.wordCycle.resetCycle(ScenesData.gameScene, WordSpace.delay.WordSpawn, 0);
}
WordSpace.setPlayerTyping.add(wordText);
}
......@@ -405,9 +403,9 @@ WordSpace.attack = function(wordText, grade)
socket.emit('attack', attackData);
});
//테스트용, 자기 자신에게 공격함
//WordSpace.generateWord.Attack(WordSpace.gameSceneForTest, wordText, grade, PlayerData, false);
WordSpace.generateWord.Name(WordSpace.gameSceneForTest, false);
WordSpace.generateWord.Name(WordSpace.gameSceneForTest, false);
//WordSpace.generateWord.Attack(ScenesData.gameScene, wordText, grade, PlayerData, false);
WordSpace.generateWord.Name(ScenesData.gameScene, false);
WordSpace.generateWord.Name(ScenesData.gameScene, false);
WordSpace.nameGroup = [];
WordSpace.attackGauge.resetValue();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment