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

Fix: typing test app bug, code revised

Browse Source
This commit is contained in:
Jisang Park
2018-10-04 23:24:56 +09:00
parent b822762429
commit 88fb1552ba
9 changed files with 152 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/typing/lib/hand.js
+11
View File
@@ -109,6 +109,16 @@ Hand.prototype.unhighlightOffFinger = function() {
}
Hand.loadResources = function() {
game.load.image('hand_palm', '../../../resources/image/ui/hand_palm.png');
game.load.image('hand_thumb', '../../../resources/image/ui/hand_thumb.png');
game.load.image('hand_index_finger', '../../../resources/image/ui/hand_index_finger.png');
game.load.image('hand_middle_finger', '../../../resources/image/ui/hand_middle_finger.png');
game.load.image('hand_little_finger', '../../../resources/image/ui/hand_little_finger.png');
game.load.image('hand_ring_finger', '../../../resources/image/ui/hand_ring_finger.png');
}
Hand.DEFAULT_Y_PX = 540; // 680;
@@ -260,4 +270,5 @@ RightHand.prototype.moveColumn = function(rowNo, key) {
}
RightHand.DEFAULT_X_PX = 810;
src/game/typing/practice/loading.js
+29 -35
View File
@@ -1,14 +1,14 @@
var Loading = {
preload: function() {
// this.game.load.image('loadingbar', './image/phaser.png');
// game.load.image('loadingbar', './image/phaser.png');
},
create: function() {
// var userID = sessionStorage.getItem("UserID");
// console.log("userID : " + userID);
// this.game.stage.backgroundColor = '#4d4d4d';
// game.stage.backgroundColor = '#4d4d4d';
// // Progress report
// this.textProgress = game.add.text(game.world.centerX, 100, '로딩중 . . .', textStyleBasic);
@@ -20,50 +20,44 @@ var Loading = {
// this.preloadBar.anchor.setTo(0.5);
// this.preloadBar.alpha = 0;
this.game.load.onFileComplete.add(this.fileComplete, this);
this.game.load.onLoadComplete.add(this.loadComplete, this);
game.load.onFileComplete.add(this.fileComplete, this);
game.load.onLoadComplete.add(this.loadComplete, this);
this.startLoading();
},
startLoading: function() {
this.game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png');
this.game.load.image('hand_palm', '../../../resources/image/ui/hand_palm.png');
this.game.load.image('hand_thumb', '../../../resources/image/ui/hand_thumb.png');
this.game.load.image('hand_index_finger', '../../../resources/image/ui/hand_index_finger.png');
this.game.load.image('hand_middle_finger', '../../../resources/image/ui/hand_middle_finger.png');
this.game.load.image('hand_little_finger', '../../../resources/image/ui/hand_little_finger.png');
this.game.load.image('hand_ring_finger', '../../../resources/image/ui/hand_ring_finger.png');
game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png');
Hand.loadResources();
Animal.loadResources();
// this.game.load.image('hand_left', '../../../resources/image/ui/hand_left.png');
// this.game.load.image('hand_right', '../../../resources/image/ui/hand_right.png');
// this.game.load.image('a', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('b', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('c', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('d', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('a', './image/phaser.png');
// this.game.load.image('b', './image/phaser.png');
// this.game.load.image('c', './image/phaser.png');
// this.game.load.image('d', './image/phaser.png');
// this.game.load.image('e', './image/phaser.png');
// this.game.load.image('g', './image/phaser.png');
// this.game.load.image('e', './image/phaser.png');
// this.game.load.image('f', './image/phaser.png');
// this.game.load.image('g', './image/phaser.png');
// this.game.load.image('h', './image/phaser.png');
// game.load.image('hand_left', '../../../resources/image/ui/hand_left.png');
// game.load.image('hand_right', '../../../resources/image/ui/hand_right.png');
// game.load.image('a', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('b', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('c', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('d', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('a', './image/phaser.png');
// game.load.image('b', './image/phaser.png');
// game.load.image('c', './image/phaser.png');
// game.load.image('d', './image/phaser.png');
// game.load.image('e', './image/phaser.png');
// game.load.image('g', './image/phaser.png');
// game.load.image('e', './image/phaser.png');
// game.load.image('f', './image/phaser.png');
// game.load.image('g', './image/phaser.png');
// game.load.image('h', './image/phaser.png');
// this.game.load.image('phaser', './image/phaser.png');
// this.game.load.spritesheet('button', './image/button_basic.png', 200, 100);
// this.game.load.image('star', './image/star_particle.png');
// this.game.load.image('medal_gold', './image/medal_gold.png');
// this.game.load.image('medal_silver', './image/medal_silver.png');
// this.game.load.image('medal_bronze', './image/medal_bronze.png');
// game.load.image('phaser', './image/phaser.png');
// game.load.spritesheet('button', './image/button_basic.png', 200, 100);
// game.load.image('star', './image/star_particle.png');
// game.load.image('medal_gold', './image/medal_gold.png');
// game.load.image('medal_silver', './image/medal_silver.png');
// game.load.image('medal_bronze', './image/medal_bronze.png');
this.game.load.start();
game.load.start();
},
fileComplete: function(progress, cacheKey, success, totalLoaded, totalFiles) {
src/game/typing/test/loading.js
+26 -26
View File
@@ -1,14 +1,14 @@
var Loading = {
preload: function() {
// this.game.load.image('loadingbar', './image/phaser.png');
// game.load.image('loadingbar', './image/phaser.png');
},
create: function() {
// var userID = sessionStorage.getItem("UserID");
// console.log("userID : " + userID);
// this.game.stage.backgroundColor = '#4d4d4d';
// game.stage.backgroundColor = '#4d4d4d';
// // Progress report
// this.textProgress = game.add.text(game.world.centerX, 100, '로딩중 . . .', textStyleBasic);
@@ -20,41 +20,41 @@ var Loading = {
// this.preloadBar.anchor.setTo(0.5);
// this.preloadBar.alpha = 0;
this.game.load.onFileComplete.add(this.fileComplete, this);
this.game.load.onLoadComplete.add(this.loadComplete, this);
game.load.onFileComplete.add(this.fileComplete, this);
game.load.onLoadComplete.add(this.loadComplete, this);
this.startLoading();
},
startLoading: function() {
this.game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png');
game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png');
Animal.loadResources();
// this.game.load.image('a', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('b', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('c', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('d', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('a', './image/phaser.png');
// this.game.load.image('b', './image/phaser.png');
// this.game.load.image('c', './image/phaser.png');
// this.game.load.image('d', './image/phaser.png');
// this.game.load.image('e', './image/phaser.png');
// this.game.load.image('g', './image/phaser.png');
// this.game.load.image('e', './image/phaser.png');
// this.game.load.image('f', './image/phaser.png');
// this.game.load.image('g', './image/phaser.png');
// this.game.load.image('h', './image/phaser.png');
// game.load.image('a', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('b', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('c', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('d', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('a', './image/phaser.png');
// game.load.image('b', './image/phaser.png');
// game.load.image('c', './image/phaser.png');
// game.load.image('d', './image/phaser.png');
// game.load.image('e', './image/phaser.png');
// game.load.image('g', './image/phaser.png');
// game.load.image('e', './image/phaser.png');
// game.load.image('f', './image/phaser.png');
// game.load.image('g', './image/phaser.png');
// game.load.image('h', './image/phaser.png');
// this.game.load.image('phaser', './image/phaser.png');
// this.game.load.spritesheet('button', './image/button_basic.png', 200, 100);
// this.game.load.image('star', './image/star_particle.png');
// this.game.load.image('medal_gold', './image/medal_gold.png');
// this.game.load.image('medal_silver', './image/medal_silver.png');
// this.game.load.image('medal_bronze', './image/medal_bronze.png');
// game.load.image('phaser', './image/phaser.png');
// game.load.spritesheet('button', './image/button_basic.png', 200, 100);
// game.load.image('star', './image/star_particle.png');
// game.load.image('medal_gold', './image/medal_gold.png');
// game.load.image('medal_silver', './image/medal_silver.png');
// game.load.image('medal_bronze', './image/medal_bronze.png');
this.game.load.start();
game.load.start();
},
fileComplete: function(progress, cacheKey, success, totalLoaded, totalFiles) {
src/game/typing/whac_a_mole/game.js
+23 -29
View File
@@ -161,24 +161,17 @@ var TypingPractice = {
},
initTypingData: function() {
var typingTextMan = new TypingTextManager();
var typingPracticeContents = this.loadLetters();
// console.log(typingPracticeContents);
// typingTextMan.makePracticeContents(typingPracticeContents, 30);
// this.typingRandomContents = typingTextMan.getContents();
this.typingRandomContents = typingPracticeContents;
// console.log(this.typingRandomContents);
this.typingContentLength = this.typingRandomContents.length;
this.typingRandomLetters = this.loadLetters();
// console.log(this.typingRandomLetters);
this.typingRandomLettersLength = this.typingRandomLetters.length;
this.typingIndex = 0;
},
shuffleLettetFollowingFKey: function(wordList) {
var typingTextMan = new TypingTextManager();
var shuffleLetters = TypingTextManager.shuffledArray(wordList);
var letters = [];
var shuffleLetters = typingTextMan.getShuffledArray(wordList);
for(var i = 0; i < shuffleLetters.length; i++) {
if(isKoreanTypingApp())
letters.push("ㄹ");
@@ -192,10 +185,9 @@ var TypingPractice = {
},
shuffleLettetFollowingJKey: function(wordList) {
var typingTextMan = new TypingTextManager();
var shuffleLetters = TypingTextManager.shuffledArray(wordList);
var letters = [];
var shuffleLetters = typingTextMan.getShuffledArray(wordList);
for(var i = 0; i < shuffleLetters.length; i++) {
letters.push(shuffleLetters[i]);
@@ -223,10 +215,9 @@ var TypingPractice = {
},
shuffleLettetFollowingFJKey: function(wordList) {
// var typingTextMan = new TypingTextManager();
var shuffleLetters = TypingTextManager.shuffledArray(wordList);
var letters = [];
var shuffleLetters = TypingTextManager.shuffledArray(wordList);
for(var i = 0; i < shuffleLetters.length; i++) {
if(this.isLeftHandLetter(shuffleLetters[i])) {
letters.push(shuffleLetters[i]);
@@ -266,7 +257,7 @@ var TypingPractice = {
allLetters = allLetters.concat(englishLeftUpperWordList);
allLetters = allLetters.concat(englishRightUpperWordList);
allLetters = allLetters.concat(englishLeftLowerWordList);
allLetters = allLetters.concat(["m"); // englishRightLowerWordList);
allLetters = allLetters.concat(["m"]); // englishRightLowerWordList);
allLetters = allLetters.concat(englishSecondFingerWordList);
}
@@ -278,14 +269,16 @@ var TypingPractice = {
var letters = [];
if(isKoreanTypingApp()) {
letters = letters.concat(["ㄹ", "ㅓ"]);
letters = letters.concat(["ㄹ", "ㅓ", "ㄹ", "ㅓ", "ㄹ", "ㅓ"]);
letters = letters.concat(this.shuffleLettetFollowingJKey(koreanBasicLeftWordList));
letters = letters.concat(this.shuffleLettetFollowingFKey(koreanBasicRightWordList));
letters = letters.concat(["ㄹ", "ㅓ", "ㄹ", "ㅓ", "ㄹ", "ㅓ"]);
letters = letters.concat(this.shuffleLettetFollowingJKey(koreanLeftUpperWordList));
letters = letters.concat(this.shuffleLettetFollowingFKey(koreanRightUpperWordList));
letters = letters.concat(this.shuffleLettetFollowingJKey(koreanLeftLowerWordList));
letters = letters.concat(["ㄹ", "ㅓ", "ㄹ", "ㅓ", "ㄹ", "ㅓ"]);
// letters = letters.concat(this.shuffleLettetFollowingFKey(koreanRightLowerWordList));
letters = letters.concat(this.shuffleLettetFollowingFJKey(koreanSecondFingerWordList.concat("ㅡ")));
@@ -298,14 +291,16 @@ var TypingPractice = {
}
}
else { // isEnglishTypingApp
letters = letters.concat(["f", "j"]);
letters = letters.concat(["f", "j", "f", "j", "f", "j"]);
letters = letters.concat(this.shuffleLettetFollowingJKey(englishBasicLeftWordList));
letters = letters.concat(this.shuffleLettetFollowingFKey(englishBasicRightWordList));
letters = letters.concat(["f", "j", "f", "j", "f", "j"]);
letters = letters.concat(this.shuffleLettetFollowingJKey(englishLeftUpperWordList));
letters = letters.concat(this.shuffleLettetFollowingFKey(englishRightUpperWordList));
letters = letters.concat(this.shuffleLettetFollowingJKey(englishLeftLowerWordList));
letters = letters.concat(["f", "j", "f", "j", "f", "j"]);
// letters = letters.concat(this.shuffleLettetFollowingFKey(englishRightLowerWordList));
letters = letters.concat(this.shuffleLettetFollowingFJKey(englishSecondFingerWordList.concat("m")));
@@ -317,8 +312,7 @@ var TypingPractice = {
letters = letters.concat(this.suffleAllLetters());
}
}
console.log(letters);
// console.log(letters);
return letters;
},
@@ -329,28 +323,28 @@ var TypingPractice = {
if(doneIndex < 0) {
this.textTypingContentsDone[i].text = "";
} else {
this.textTypingContentsDone[i].text = this.typingRandomContents[doneIndex];
this.textTypingContentsDone[i].text = this.typingRandomLetters[doneIndex];
}
}
if(this.typingIndex == this.typingContentLength) {
if(this.typingIndex == this.typingRandomLettersLength) {
this.textTypingContent.text = "";
return;
}
this.textTypingContent.text = this.typingRandomContents[this.typingIndex];
this.textTypingContent.text = this.typingRandomLetters[this.typingIndex];
for(var i = 0; i < TypingPractice.TYPING_CONTENT_PREVIEW_COUNT; i++) {
var previewIndex = this.typingIndex + i + 1;
if(previewIndex < this.typingRandomContents.length)
this.textTypingContentPreview[i].text = this.typingRandomContents[previewIndex];
if(previewIndex < this.typingRandomLetters.length)
this.textTypingContentPreview[i].text = this.typingRandomLetters[previewIndex];
else
this.textTypingContentPreview[i].text = "";
}
},
hideHighlightKey: function() {
var prevText = this.typingRandomContents[this.typingIndex];
var prevText = this.typingRandomLetters[this.typingIndex];
if(prevText === undefined)
return;
@@ -358,7 +352,7 @@ var TypingPractice = {
},
showHighlightKey: function() {
var typingText = this.typingRandomContents[this.typingIndex];
var typingText = this.typingRandomLetters[this.typingIndex];
if(typingText === undefined)
return;
@@ -387,7 +381,7 @@ var TypingPractice = {
checkTypingContents: function(evnet) {
var inputContent = event.key;
var typingContent = this.typingRandomContents[this.typingIndex];
var typingContent = this.typingRandomLetters[this.typingIndex];
if(this.isKeyPressed(inputContent, typingContent)) {
// this.typingScore.increase();
@@ -395,7 +389,7 @@ var TypingPractice = {
this.playNextContent();
if(this.typingIndex === this.typingContentLength) {
if(this.typingIndex === this.typingRandomLettersLength) {
// this.goResult();
}
} else {
src/game/typing/whac_a_mole/loading.js
+30 -36
View File
@@ -1,14 +1,14 @@
var Loading = {
preload: function() {
// this.game.load.image('loadingbar', './image/phaser.png');
// game.load.image('loadingbar', './image/phaser.png');
},
create: function() {
// var userID = sessionStorage.getItem("UserID");
// console.log("userID : " + userID);
// this.game.stage.backgroundColor = '#4d4d4d';
// game.stage.backgroundColor = '#4d4d4d';
// // Progress report
// this.textProgress = game.add.text(game.world.centerX, 100, '로딩중 . . .', textStyleBasic);
@@ -20,50 +20,44 @@ var Loading = {
// this.preloadBar.anchor.setTo(0.5);
// this.preloadBar.alpha = 0;
this.game.load.onFileComplete.add(this.fileComplete, this);
this.game.load.onLoadComplete.add(this.loadComplete, this);
game.load.onFileComplete.add(this.fileComplete, this);
game.load.onLoadComplete.add(this.loadComplete, this);
this.startLoading();
},
startLoading: function() {
this.game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png');
game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png');
this.game.load.image('hand_palm', '../../../resources/image/ui/hand_palm.png');
this.game.load.image('hand_thumb', '../../../resources/image/ui/hand_thumb.png');
this.game.load.image('hand_index_finger', '../../../resources/image/ui/hand_index_finger.png');
this.game.load.image('hand_middle_finger', '../../../resources/image/ui/hand_middle_finger.png');
this.game.load.image('hand_little_finger', '../../../resources/image/ui/hand_little_finger.png');
this.game.load.image('hand_ring_finger', '../../../resources/image/ui/hand_ring_finger.png');
Animal.loadResources();
// Hand.loadResources();
// Animal.loadResources();
// this.game.load.image('hand_left', '../../../resources/image/ui/hand_left.png');
// this.game.load.image('hand_right', '../../../resources/image/ui/hand_right.png');
// this.game.load.image('a', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('b', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('c', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('d', '../../../resources/image/icon/fullscreen_white.png');
// this.game.load.image('a', './image/phaser.png');
// this.game.load.image('b', './image/phaser.png');
// this.game.load.image('c', './image/phaser.png');
// this.game.load.image('d', './image/phaser.png');
// this.game.load.image('e', './image/phaser.png');
// this.game.load.image('g', './image/phaser.png');
// this.game.load.image('e', './image/phaser.png');
// this.game.load.image('f', './image/phaser.png');
// this.game.load.image('g', './image/phaser.png');
// this.game.load.image('h', './image/phaser.png');
// game.load.image('hand_left', '../../../resources/image/ui/hand_left.png');
// game.load.image('hand_right', '../../../resources/image/ui/hand_right.png');
// game.load.image('a', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('b', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('c', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('d', '../../../resources/image/icon/fullscreen_white.png');
// game.load.image('a', './image/phaser.png');
// game.load.image('b', './image/phaser.png');
// game.load.image('c', './image/phaser.png');
// game.load.image('d', './image/phaser.png');
// game.load.image('e', './image/phaser.png');
// game.load.image('g', './image/phaser.png');
// game.load.image('e', './image/phaser.png');
// game.load.image('f', './image/phaser.png');
// game.load.image('g', './image/phaser.png');
// game.load.image('h', './image/phaser.png');
// this.game.load.image('phaser', './image/phaser.png');
// this.game.load.spritesheet('button', './image/button_basic.png', 200, 100);
// this.game.load.image('star', './image/star_particle.png');
// this.game.load.image('medal_gold', './image/medal_gold.png');
// this.game.load.image('medal_silver', './image/medal_silver.png');
// this.game.load.image('medal_bronze', './image/medal_bronze.png');
// game.load.image('phaser', './image/phaser.png');
// game.load.spritesheet('button', './image/button_basic.png', 200, 100);
// game.load.image('star', './image/star_particle.png');
// game.load.image('medal_gold', './image/medal_gold.png');
// game.load.image('medal_silver', './image/medal_silver.png');
// game.load.image('medal_bronze', './image/medal_bronze.png');
this.game.load.start();
game.load.start();
},
fileComplete: function(progress, cacheKey, success, totalLoaded, totalFiles) {