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

Fix: position of keyboard and hand

Browse Source
This commit is contained in:
Jisang Park
2019-05-15 20:37:48 +09:00
parent 3b1054bde4
commit 6e88d4b471
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/typing/lib/hand.js
+5 -1
View File
@@ -27,9 +27,13 @@ function Hand(keyMapper) {
this.little_finger.alpha = 0.5; this.little_finger.alpha = 0.5;
this.hand.addChild(this.little_finger); this.hand.addChild(this.little_finger);
var maskOffsetY = 0;
if(isTypingTestApp())
maskOffsetY = 40;
var mask = game.add.graphics(); var mask = game.add.graphics();
mask.beginFill(0xffffff); mask.beginFill(0xffffff);
mask.drawRect(100, 300, 1028, 360); mask.drawRect(100, 300 + maskOffsetY, 1028, 360);
this.hand.mask = mask; this.hand.mask = mask;
} }
src/game/typing/lib/keyboard.js
+8 -5
View File
@@ -279,6 +279,9 @@ Keyboard.prototype.getKeyPosY = function(text) {
Keyboard.prototype.initKeyData = function(keyMapper) { Keyboard.prototype.initKeyData = function(keyMapper) {
var row1offsetY = 0;
if(isTypingTestApp())
row1offsetY = 80;
// row 1 // row 1
this.addFunctionKeyData( this.addFunctionKeyData(
"Backquote", "Backquote",
@@ -286,7 +289,7 @@ Keyboard.prototype.initKeyData = function(keyMapper) {
Keyboard.ROW_1, Keyboard.ROW_1,
KeyButton.LITTLE_FINGER, KeyButton.LITTLE_FINGER,
Keyboard.KEYBOARD_OFFSET_POS_X, Keyboard.KEYBOARD_OFFSET_POS_X,
Keyboard.ROW_1_POS_Y, Keyboard.ROW_1_POS_Y + row1offsetY,
Keyboard.DEFAULT_KEY_SIZE_PX, Keyboard.DEFAULT_KEY_SIZE_PX,
Keyboard.DEFAULT_KEY_SIZE_PX, Keyboard.DEFAULT_KEY_SIZE_PX,
KeyButton.NORMAL_FUNCTION_KEY KeyButton.NORMAL_FUNCTION_KEY
@@ -319,7 +322,7 @@ Keyboard.prototype.initKeyData = function(keyMapper) {
Keyboard.ROW_2, Keyboard.ROW_2,
KeyButton.NONE_FINGER, KeyButton.NONE_FINGER,
Keyboard.KEYBOARD_OFFSET_POS_X, Keyboard.KEYBOARD_OFFSET_POS_X,
Keyboard.ROW_2_POS_Y, Keyboard.ROW_2_POS_Y + row1offsetY,
Keyboard.TAB_KEY_WIDTH_PX, Keyboard.TAB_KEY_WIDTH_PX,
Keyboard.DEFAULT_KEY_SIZE_PX, Keyboard.DEFAULT_KEY_SIZE_PX,
KeyButton.LEFT_FUNCTION_KEY KeyButton.LEFT_FUNCTION_KEY
@@ -345,7 +348,7 @@ Keyboard.prototype.initKeyData = function(keyMapper) {
Keyboard.ROW_3, Keyboard.ROW_3,
KeyButton.NONE_FINGER, KeyButton.NONE_FINGER,
Keyboard.KEYBOARD_OFFSET_POS_X, Keyboard.KEYBOARD_OFFSET_POS_X,
Keyboard.ROW_3_POS_Y, Keyboard.ROW_3_POS_Y + row1offsetY,
Keyboard.CAPS_LOCK_KEY_WIDTH_PX, Keyboard.CAPS_LOCK_KEY_WIDTH_PX,
Keyboard.DEFAULT_KEY_SIZE_PX, Keyboard.DEFAULT_KEY_SIZE_PX,
KeyButton.LEFT_FUNCTION_KEY KeyButton.LEFT_FUNCTION_KEY
@@ -377,7 +380,7 @@ Keyboard.prototype.initKeyData = function(keyMapper) {
Keyboard.ROW_4, Keyboard.ROW_4,
KeyButton.LITTLE_FINGER, KeyButton.LITTLE_FINGER,
Keyboard.KEYBOARD_OFFSET_POS_X, Keyboard.KEYBOARD_OFFSET_POS_X,
Keyboard.ROW_4_POS_Y, Keyboard.ROW_4_POS_Y + row1offsetY,
Keyboard.SHIFT_KEY_WIDTH_PX, Keyboard.SHIFT_KEY_WIDTH_PX,
Keyboard.DEFAULT_KEY_SIZE_PX, Keyboard.DEFAULT_KEY_SIZE_PX,
KeyButton.LEFT_FUNCTION_KEY KeyButton.LEFT_FUNCTION_KEY
@@ -408,7 +411,7 @@ Keyboard.prototype.initKeyData = function(keyMapper) {
Keyboard.ROW_5, Keyboard.ROW_5,
KeyButton.NONE_FINGER, KeyButton.NONE_FINGER,
Keyboard.KEYBOARD_OFFSET_POS_X, Keyboard.KEYBOARD_OFFSET_POS_X,
Keyboard.ROW_5_POS_Y, Keyboard.ROW_5_POS_Y + row1offsetY,
Keyboard.CTRL_KEY_WIDTH_PX, Keyboard.CTRL_KEY_WIDTH_PX,
Keyboard.DEFAULT_KEY_SIZE_PX, Keyboard.DEFAULT_KEY_SIZE_PX,
KeyButton.LEFT_FUNCTION_KEY KeyButton.LEFT_FUNCTION_KEY
src/game/typing/test/game.js
+1 -1
View File
@@ -101,7 +101,7 @@ var TypingTest = {
// input text // input text
this.inputTextContent = new InputTypeText(game.world.centerX, TYPING_CONTENT_Y + 100); this.inputTextContent = new InputTypeText(game.world.centerX, TYPING_CONTENT_Y + 120);
this.inputTextContent.anchor.set(0.5); this.inputTextContent.anchor.set(0.5);
this.inputTextContent.canvasInput.value(''); this.inputTextContent.canvasInput.value('');
this.inputTextContent.canvasInput.focus(); this.inputTextContent.canvasInput.focus();