From 454f42eb748750a3e610cd9b3b03569d4e218b95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Thu, 21 Jun 2018 10:16:03 +0900 Subject: [PATCH] Fix: move right little finger correctly --- src/game/typing/practice/game.js | 34 +++++++++++++++----------------- src/game/typing/practice/hand.js | 19 ++++++++++++++++++ 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/src/game/typing/practice/game.js b/src/game/typing/practice/game.js index 27b0405..189286e 100644 --- a/src/game/typing/practice/game.js +++ b/src/game/typing/practice/game.js @@ -137,24 +137,6 @@ class TypingPractice { else if(isTypingPracticeStage()) appName = sessionStorageManager.playingAppName.substring(9); - let tempContent = [ - "a", - "C", - "n", - "J", - "t", - "e", - "s", - "X", - "v", - "b", - "D", - "i", - "k", - "N", - ]; - return tempContent; - let testContent = []; switch(appName) { @@ -191,6 +173,22 @@ class TypingPractice { case "english_basic": testContent = englishBasicWordList; + testContent = [ + "a", + "C", + "n", + "J", + "t", + "e", + "s", + "X", + "v", + "b", + "D", + "i", + "k", + "N", + ]; break; case "english_left_upper": testContent = englishLeftUpperWordList; diff --git a/src/game/typing/practice/hand.js b/src/game/typing/practice/hand.js index cb7df4c..7650d59 100644 --- a/src/game/typing/practice/hand.js +++ b/src/game/typing/practice/hand.js @@ -236,6 +236,25 @@ class RightHand extends Hand { this.hand.x -= Keyboard.DEFAULT_KEY_SIZE_PX; break; + case "Minus": + case "BracketLeft": + case "Quote": + this.hand.x += (Keyboard.DEFAULT_KEY_SIZE_PX / 2) * 3; + break; + + case "Equal": + case "BracketRight": + this.hand.x += (Keyboard.DEFAULT_KEY_SIZE_PX / 2) * 5; + break; + + case "Backslash": + this.hand.x += (Keyboard.DEFAULT_KEY_SIZE_PX / 2) * 7; + break; + + case "Enter": + this.hand.x = RightHand.DEFAULT_X_PX + (Keyboard.DEFAULT_KEY_SIZE_PX / 2) * 6; + break; + case "ShiftRight": this.hand.x = RightHand.DEFAULT_X_PX + (Keyboard.DEFAULT_KEY_SIZE_PX / 2) * 6; break;