Skip to content

S
sejong25
Commit 21061e24 authored by 18손재민's avatar 18손재민 Committed by 18송대선
Browse files
Options

cycle을 하나의 클래스로 묶음

parent ec721f06
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 109 deletions
js/ScenesData.js
View file @ 21061e24
......@@ -54,12 +54,13 @@ var gameScene = new Phaser.Class(
Input.inputField.generate(this);
WordSpace.attackGauge.generate(this);
WordSpace.spaceInitiate(this);
// cycle
WordSpace.attackGauge.resetCycle(this);
WordSpace.wordCycle.resetCycle(this, 3000, 0);
WordSpace.nameCycle.resetCycle(this, 3000, 0);
WordSpace.wordCycle.resetCycle(this, 3000, 0, true);
WordSpace.nameCycle.resetCycle(this, 3000, 0, true);
WordSpace.varAdjustCycle.resetCycle(this, 100);
WordSpace.varAdjustCycle.resetCycle(this, 100, 0, true);
WordSpace.playerTyping.initiate(this);
},
......
js/WordObject.js
View file @ 21061e24
......@@ -4,7 +4,6 @@ class WordObject
{
this.generationCode = WordSpace.nextWordCode++;
this.wordText = text;
//this.wordText = Input.removeConVow(text);
this.wordTyping = WordReader.getWordTyping(this.wordText);
this.wordGrade = WordReader.getWordGrade(this.wordTyping);
this.wordWeight = WordReader.getWordWeight(this.wordGrade);
......
js/WordSpace.js
View file @ 21061e24
......@@ -9,7 +9,7 @@ WordSpace.isImageLoaded = false;
WordSpace.nextWordCode = 0;
WordSpace.totalWeight = 0; //현재 단어 무게 총합
WordSpace.totalWordNum = 0;
WordSpace.brainCapacity = 100; //수용 가능한 단어 무게 최대치
WordSpace.brainCapacity = 200; //수용 가능한 단어 무게 최대치
WordSpace.defeatTime = 5000;
WordSpace.gameOverTimer = null; //게임 오버 판정 타이머
WordSpace.isTimerOn = false;
......@@ -86,8 +86,8 @@ WordSpace.AdjustVarByPhase = function(typingRate, phase)
WordSpace.GradeProb[1] = 0.8 - 0.5 * typingRate;
WordSpace.GradeProb[2] = 0.9 - 0.2 * typingRate;
}
WordSpace.wordCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.WordSpawnDelay, WordSpace.wordCycle.currentCycle.getElapsed());
WordSpace.nameCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.NameSpawnDelay, WordSpace.nameCycle.currentCycle.getElapsed());
WordSpace.wordCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.WordSpawnDelay, WordSpace.wordCycle.currentCycle.getElapsed(), true);
WordSpace.nameCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.NameSpawnDelay, WordSpace.nameCycle.currentCycle.getElapsed(), true);
}
WordSpace.GetPhase = function()
......@@ -164,64 +164,6 @@ WordSpace.attackGauge =
}
}
WordSpace.varAdjustCycle =
{
currentCycle: null,
resetCycle : function(scene, _delay)
{
this.delay = _delay;
var option =
{
delay: _delay,
callback: function()
{
//나중에는 메세지 분석해서 Phase랑 PlayerTypingRate 받겠지만 일단 이렇게 해둠
WordSpace.GetPhase();
WordSpace.GetPlayerTypingRate();
WordSpace.AdjustVarByPhase(WordSpace.PlayerTypingRate, WordSpace.CurrentPhase);
},
callbackScope: scene,
loop: true
};
if (this.currentCycle != null)
{
this.currentCycle = this.currentCycle.reset(option);
}
else
{
this.currentCycle = scene.time.addEvent(option);
}
}
}
WordSpace.nameCycle =
{
currentCycle: null,
resetCycle: function(scene, _delay, _startAt)
{
this.delay = _delay;
var option =
{
startAt: _startAt,
delay: _delay,
callback: function()
{
//console.log("호패 on");
},
callbackScope: scene,
loop: true
};
if (this.currentCycle != null)
{
this.currentCycle = this.currentCycle.reset(option);
}
else
{
this.currentCycle = scene.time.addEvent(option);
}
}
}
WordSpace.genWordByProb = function(scene)
{
let wordRnd = Math.random();
......@@ -231,35 +173,6 @@ WordSpace.genWordByProb = function(scene)
WordSpace.generateWord(scene, SelectWord.selectWord(wordIdx));
}
WordSpace.wordCycle =
{
delay: 0,
currentCycle: null,
resetCycle: function(scene, _delay, _startAt)
{
this.delay = _delay;
var option =
{
startAt: _startAt,
delay: _delay,
callback: function()
{
WordSpace.genWordByProb(scene);
},
callbackScope: scene,
loop: true
};
if (this.currentCycle != null)
{
this.currentCycle = this.currentCycle.reset(option);
}
else
{
this.currentCycle = scene.time.addEvent(option);
}
},
}
WordSpace.loadImage = function(scene)
{
if (!this.isImageLoaded)
......@@ -311,25 +224,18 @@ WordSpace.setGameOverTimer = function()
//만약 현재 단어 무게 총합이 뇌 용량보다 크다면 타이머를 시작함
if(this.brainCapacity < this.totalWeight && !this.isTimerOn)
{
var timer =
{
delay: this.defeatTime,
callback: function()
{
gameOver();
},
callbackScope: WordSpace.gameSceneForTest,
loop: false
}
WordSpace.gameOverCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.defeatTime, false);
this.isTimerOn = true;
this.gameOverTimer = WordSpace.gameSceneForTest.time.addEvent(timer);
}
}
WordSpace.resetGameOverTimer = function()
{
if(this.brainCapacity >= this.totalWeight && this.isTimerOn)
{
this.gameOverTimer.remove();
this.isTimerOn = false;
}
}
WordSpace.findWord = function(wordText)
......@@ -354,7 +260,7 @@ WordSpace.findWord = function(wordText)
default: console.log('[ERR] wrong grade of word'); break;
}
weightest.destroy();
//WordSpace.nameCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.NameSpawnDelay, WordSpace.nameCycle.currentCycle.getElapsed() + WordSpace.NameSpawnReduce);
WordSpace.nameCycle.resetCycle(WordSpace.gameSceneForTest, WordSpace.NameSpawnDelay, WordSpace.nameCycle.currentCycle.getElapsed() + WordSpace.NameSpawnReduce);
while(WordSpace.totalWordNum < 5)
{
......@@ -398,7 +304,6 @@ WordSpace.playerTyping =
WordSpace.attack = function(wordText, grade)
{
console.log("d");
wordText = Input.removeConVow(wordText);
if (wordText != '')
{
......@@ -416,4 +321,45 @@ WordSpace.attack = function(wordText, grade)
Input.maxInput = 5;
Input.attackMode = false;
WordSpace.attackGauge.pauseCycle(false);
}
\ No newline at end of file
}
class cycle //앞으로 cycle은 이 클래스를 사용해서 구현할 것
{
constructor(_callback)
{
this.delay = 0;
this.currentCycle = null;
this.callbackFunction = _callback;
}
resetCycle(scene, _delay, _startAt, _loop)
{
this.delay = _delay;
var option =
{
startAt: _startAt,
delay: _delay,
callback: this.callbackFunction,
callbackScope: scene,
loop: _loop
};
if (this.currentCycle != null) this.currentCycle = this.currentCycle.reset(option);
else this.currentCycle = scene.time.addEvent(option);
}
}
WordSpace.wordCycle = new cycle(function()
{
WordSpace.genWordByProb(this);
});
WordSpace.gameOverCycle = new cycle(gameOver);
WordSpace.nameCycle = new cycle(function()
{
console.log("호패 on");
});
WordSpace.varAdjustCycle = new cycle(function()
{
//나중에는 메세지 분석해서 Phase랑 PlayerTypingRate 받겠지만 일단 이렇게 해둠
WordSpace.GetPhase();
WordSpace.GetPlayerTypingRate();
WordSpace.AdjustVarByPhase(WordSpace.PlayerTypingRate, WordSpace.CurrentPhase);
});
\ No newline at end of file
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