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

Fix: typing ES5 bug

Browse Source
This commit is contained in:
Jisang Park
2018-09-14 23:03:35 +09:00
parent f91d9c0049
commit 656b27b24f
3 changed files with 79 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/typing/lib/content_progress.js
+20 -23
View File
@@ -1,33 +1,30 @@
class ContentProgress { function ContentProgress() {
let fontStyle = ContentProgress.DEFAULT_TEXT_FONT;
constructor() { fontStyle.align = "right";
let fontStyle = ContentProgress.DEFAULT_TEXT_FONT; fontStyle.boundsAlignH = "right";
this.typingSpeedText = game.add.text(game.world.width - 300, 0, "", fontStyle)
.setTextBounds(0, 0, 200, ContentProgress.FONT_HEIGHT_PX);
fontStyle.align = "right"; // var grd = this.label.context.createLinearGradient(0, 0, 0, ContentProgress.FONT_HEIGHT_PX);
fontStyle.boundsAlignH = "right"; // grd.addColorStop(0, '#8ED6FF');
this.typingSpeedText = game.add.text(game.world.width - 300, 0, "", fontStyle) // grd.addColorStop(1, '#004CB3');
.setTextBounds(0, 0, 200, ContentProgress.FONT_HEIGHT_PX); // this.label.fill = grd;
// this.scoreText.fill = grd;
// var grd = this.label.context.createLinearGradient(0, 0, 0, ContentProgress.FONT_HEIGHT_PX); // this.setShadow(3, 3, 'rgba(0, 0, 0, 0.5)', 2);
// grd.addColorStop(0, '#8ED6FF'); // this.label.stroke = '#000';
// grd.addColorStop(1, '#004CB3'); // this.label.strokeThickness = 3;
// this.label.fill = grd; };
// this.scoreText.fill = grd;
// this.setShadow(3, 3, 'rgba(0, 0, 0, 0.5)', 2); ContentProgress.prototype.print = function(playingNumber, totalCount) {
// this.label.stroke = '#000'; if(playingNumber > totalCount)
// this.label.strokeThickness = 3; return;
};
print(playingNumber, totalCount) {
if(playingNumber > totalCount)
return;
this.typingSpeedText.text = playingNumber + " / " + totalCount;
}
this.typingSpeedText.text = playingNumber + " / " + totalCount;
} }
ContentProgress.FONT_HEIGHT_PX = 70; ContentProgress.FONT_HEIGHT_PX = 70;
ContentProgress.DEFAULT_TEXT_FONT = { ContentProgress.DEFAULT_TEXT_FONT = {
src/game/typing/lib/typing_content_bg.js
+31 -34
View File
@@ -1,15 +1,38 @@
class TypingContentBG { function TypingContentBG() {
}
constructor() { TypingContentBG.prototype.makePracticeContentBG = function() {
var CONTENT_Y = 140;
var bar = game.add.graphics();
if(isKoreanTypingStage()) {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 120);
} else {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 40);
bar.beginFill(TypingContentBG.COLOR_CONTENT_ALPHABET_BG, 1);
bar.drawRect(0, CONTENT_Y + 40, GAME_SCREEN_SIZE.x, 50);
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y + 90, GAME_SCREEN_SIZE.x, 30);
} }
}
makePracticeContentBG() { TypingContentBG.prototype.makeTestContentBG = function() {
let CONTENT_Y = 140; var CONTENT_Y = 260;
let bar = game.add.graphics(); var bar = game.add.graphics();
if(isKoreanTypingStage()) { if(isKoreanTypingStage()) {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 120);
} else {
if(isTypingSentenceStage()) {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1); bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 120); bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 46);
bar.beginFill(TypingContentBG.COLOR_CONTENT_ALPHABET_BG, 1);
bar.drawRect(0, CONTENT_Y + 46, GAME_SCREEN_SIZE.x, 30);
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y + 76, GAME_SCREEN_SIZE.x, 44);
} else { } else {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1); bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 40); bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 40);
@@ -19,34 +42,8 @@ class TypingContentBG {
bar.drawRect(0, CONTENT_Y + 90, GAME_SCREEN_SIZE.x, 30); bar.drawRect(0, CONTENT_Y + 90, GAME_SCREEN_SIZE.x, 30);
} }
} }
}
makeTestContentBG() {
let CONTENT_Y = 260;
let bar = game.add.graphics();
if(isKoreanTypingStage()) {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 120);
} else {
if(isTypingSentenceStage()) {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 46);
bar.beginFill(TypingContentBG.COLOR_CONTENT_ALPHABET_BG, 1);
bar.drawRect(0, CONTENT_Y + 46, GAME_SCREEN_SIZE.x, 30);
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y + 76, GAME_SCREEN_SIZE.x, 44);
} else {
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y, GAME_SCREEN_SIZE.x, 40);
bar.beginFill(TypingContentBG.COLOR_CONTENT_ALPHABET_BG, 1);
bar.drawRect(0, CONTENT_Y + 40, GAME_SCREEN_SIZE.x, 50);
bar.beginFill(TypingContentBG.COLOR_CONTENT_BG, 1);
bar.drawRect(0, CONTENT_Y + 90, GAME_SCREEN_SIZE.x, 30);
}
}
}
};
TypingContentBG.COLOR_CONTENT_BG = 0x444444; TypingContentBG.COLOR_CONTENT_BG = 0x444444;
TypingContentBG.COLOR_CONTENT_ALPHABET_BG = 0x3d3d3d; TypingContentBG.COLOR_CONTENT_ALPHABET_BG = 0x3d3d3d;
src/game/typing/lib/typing_text_manager.js
+28 -32
View File
@@ -1,40 +1,36 @@
class TypingTextManager { function TypingTextManager() {
this.init();
}
constructor() { TypingTextManager.prototype.init = function() {
this.init(); this.contents = [];
} }
init() { TypingTextManager.prototype.getContents = function() {
this.contents = []; return this.contents;
} }
getContents() { TypingTextManager.prototype.add = function(arr) {
return this.contents; this.contents = this.contents.concat(arr);
} }
add(arr) { TypingTextManager.prototype.slice = function(start, end) {
this.contents = this.contents.concat(arr); this.contents = this.contents.slice(start, end);
} }
slice(start, end) { TypingTextManager.prototype.getShuffledArray = function(arr) {
this.contents = this.contents.slice(start, end); return Phaser.ArrayUtils.shuffle(arr);
} }
getShuffledArray(arr) { TypingTextManager.prototype.makePracticeContents = function(arr, repeatCount) {
return Phaser.ArrayUtils.shuffle(arr); this.init();
} this.add(arr);
for(var i = 0; i < repeatCount; i++) {
makePracticeContents(arr, repeatCount) {
this.init();
this.add(arr);
for(let i = 0; i < repeatCount; i++) {
this.add(this.getShuffledArray(arr));
}
}
makeTestContents(arr) {
this.init();
this.add(this.getShuffledArray(arr)); this.add(this.getShuffledArray(arr));
} }
}; }
TypingTextManager.prototype.makeTestContents = function(arr) {
this.init();
this.add(this.getShuffledArray(arr));
}