jisangs/chocomae
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add: animal_list for typing practice and test

Browse Source
This commit is contained in:
Jisang Park
2018-10-07 00:00:42 +09:00
parent cb74f9ec32
commit dbcc8b3848
6 changed files with 81 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/typing/practice/game.js
+10 -35
View File
@@ -24,20 +24,7 @@ var TypingPractice = {
screenTopUI.makeFullScreenButton();
// this.animalOnTitle = new Animal(Animal.TYPE_ON_TITLE, game.world.centerX - 200, 30);
this.animalOnTitle = new Animal(Animal.TYPE_ON_TITLE, game.world.centerX, 100);
this.animalOnTitle.startAnimation(Animal.SPECIES_DATA[0]);
this.animalPrev = new Animal(Animal.TYPE_ICON, game.world.centerX - 200, 100);
this.animalPrev.setIconSprite(Animal.SPECIES_DATA[0]);
this.animalPrev.setAlpha(0);
this.animalNext = new Animal(Animal.TYPE_ICON, game.world.centerX + 200, 100);
this.animalNext.setIconSprite(Animal.SPECIES_DATA[1]);
this.animalNext.setAlpha(0.3);
this.typingScore = new TypingScore();
this.stageTimer = new StageTimer( TypingPractice.STAGE_TIMER_SEC, (function() {
self.isOnStage = false;
@@ -46,6 +33,9 @@ var TypingPractice = {
}));
this.animalList = new AnimalList(100);
// typing content
var typingContentBG = new TypingContentBG();
typingContentBG.makePracticeContentBG();
@@ -151,7 +141,7 @@ var TypingPractice = {
this.leftHand.moveToDefaultPosition();
this.rightHand.moveToDefaultPosition();
this.animalOnTitle.stopAnimation();
this.animalList.stopAnimation();
var gameOverText = new GameOverText();
game.time.events.add(Phaser.Timer.SECOND * 2, this.goResult, this);
@@ -370,21 +360,12 @@ var TypingPractice = {
if(this.isKeyPressed(inputContent, typingContent)) {
this.typingScore.increase();
var animalLevelID = Animal.animalLevelIDByRecord(this.typingScore.score(), Animal.TYPE_PRACTICE);
console.log(animalLevelID);
console.log(this.playingAnimalIndex);
// console.log(animalLevelID);
// console.log(this.playingAnimalIndex);
if(animalLevelID > this.playingAnimalIndex) {
this.playingAnimalIndex = animalLevelID;
this.animalOnTitle.startAnimation(Animal.SPECIES_DATA[this.playingAnimalIndex]);
this.animalOnTitle.tweenAnimation(Animal.ANIMATION_TYPE_CHANGE);
if(this.playingAnimalIndex == 1)
this.animalPrev.setAlpha(0.3);
this.animalPrev.setIconSprite(Animal.SPECIES_DATA[this.playingAnimalIndex - 1]);
if(this.playingAnimalIndex == Animal.SPECIES_DATA.length - 1)
this.animalNext.setAlpha(0);
else
this.animalNext.setIconSprite(Animal.SPECIES_DATA[this.playingAnimalIndex + 1]);
this.animalList.activate(this.playingAnimalIndex);
this.animalList.tweenAnimation(Animal.ANIMATION_TYPE_CHANGE);
}
this.playNextContent();
@@ -395,14 +376,8 @@ var TypingPractice = {
this.typingScore.reset();
this.playingAnimalIndex = 0;
this.animalOnTitle.startAnimation(Animal.SPECIES_DATA[this.playingAnimalIndex]);
this.animalOnTitle.tweenAnimation(Animal.ANIMATION_TYPE_DAMAGE);
this.animalPrev.setIconSprite(Animal.SPECIES_DATA[0]);
this.animalPrev.setAlpha(0);
this.animalNext.setIconSprite(Animal.SPECIES_DATA[1]);
this.animalNext.setAlpha(0.3);
this.animalList.activate(this.playingAnimalIndex);
this.animalList.tweenAnimation(Animal.ANIMATION_TYPE_DAMAGE);
}
},
src/game/typing/test/game.js
+6 -9
View File
@@ -22,11 +22,6 @@ var TypingTest = {
screenTopUI.makeFullScreenButton();
// this.animalOnTitle = new Animal(Animal.TYPE_ON_TITLE, game.world.centerX - 200, 30);
this.animalOnTitle = new Animal(Animal.TYPE_ON_TITLE, game.world.centerX, GAME_SCREEN_SIZE.y - 110);
this.animalOnTitle.startAnimation(Animal.SPECIES_DATA[0]);
this.averageTypingSpeedText = new AverageTypingSpeed();
this.contentProgressText = new ContentProgress();
@@ -104,6 +99,9 @@ var TypingTest = {
}
this.animalList = new AnimalList(GAME_SCREEN_SIZE.y - 110);
// bottom ui
var screenBottomUI = new ScreenBottomUI();
screenBottomUI.printLeftTextWithBestRecord(sessionStorageManager.getBestRecord());
@@ -156,7 +154,7 @@ var TypingTest = {
gameOver: function() {
var gameOverText = new GameOverText();
this.animalOnTitle.stopAnimation();
this.animalList.stopAnimation();
game.time.events.add(Phaser.Timer.SECOND * 2, this.goResult, this);
},
@@ -401,9 +399,8 @@ var TypingTest = {
// console.log('-----------------------------------');
var animalLevelID = Animal.animalLevelIDByRecord(typingRecordTotalInteger, Animal.TYPE_TEST);
this.animalOnTitle.startAnimation(Animal.SPECIES_DATA[animalLevelID]);
this.animalOnTitle.tweenAnimation(Animal.ANIMATION_TYPE_CHANGE);
this.animalList.activate(animalLevelID);
this.animalList.tweenAnimation(Animal.ANIMATION_TYPE_CHANGE);
},
playNextContent: function() {