From 22da6a1f490d6db6cd01c1a361ad85fd185f2b08 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: Wed, 29 Aug 2018 11:28:59 +0900 Subject: [PATCH] Fix: Animal.loadResources static function --- src/game/lib/animal.js | 46 +++++++++++++++++++++++++++-- src/game/result/result.js | 41 +------------------------ src/game/typing/practice/loading.js | 40 +------------------------ src/game/typing/test/loading.js | 40 +------------------------ 4 files changed, 46 insertions(+), 121 deletions(-) diff --git a/src/game/lib/animal.js b/src/game/lib/animal.js index 6fde25f..a41f86b 100644 --- a/src/game/lib/animal.js +++ b/src/game/lib/animal.js @@ -9,10 +9,7 @@ class Animal { } animalLevelIDByRecord(record) { - console.log(record); for(let i = Animal.SPECIES_DATA.length - 1; i > 0; i--) { - console.log(i); - console.log(this.typingCount(Animal.SPECIES_DATA[i])); if(record >= this.typingCount(Animal.SPECIES_DATA[i])) return i; } @@ -103,6 +100,49 @@ class Animal { this.timerEvent = null; } } + + + static loadResources() { + game.load.image('snail_icon', '../../../resources/image/character/animal/snail/run2.png'); + game.load.image('snail_run1', '../../../resources/image/character/animal/snail/run1.png'); + game.load.image('snail_run2', '../../../resources/image/character/animal/snail/run2.png'); + + game.load.image('turtle_icon', '../../../resources/image/character/animal/turtle/run2.png'); + game.load.image('turtle_run1', '../../../resources/image/character/animal/turtle/run1.png'); + game.load.image('turtle_run2', '../../../resources/image/character/animal/turtle/run2.png'); + + game.load.image('cat_icon', '../../../resources/image/character/animal/cat/run2.png'); + game.load.image('cat_run1', '../../../resources/image/character/animal/cat/run1.png'); + game.load.image('cat_run2', '../../../resources/image/character/animal/cat/run2.png'); + + game.load.image('lion_icon', '../../../resources/image/character/animal/lion/run2.png'); + game.load.image('lion_run1', '../../../resources/image/character/animal/lion/run1.png'); + game.load.image('lion_run2', '../../../resources/image/character/animal/lion/run2.png'); + + game.load.image('rabbit_icon', '../../../resources/image/character/animal/rabbit/run2.png'); + game.load.image('rabbit_run1', '../../../resources/image/character/animal/rabbit/run1.png'); + game.load.image('rabbit_run2', '../../../resources/image/character/animal/rabbit/run2.png'); + + game.load.image('ostrich_icon', '../../../resources/image/character/animal/ostrich/run2.png'); + game.load.image('ostrich_run1', '../../../resources/image/character/animal/ostrich/run1.png'); + game.load.image('ostrich_run2', '../../../resources/image/character/animal/ostrich/run2.png'); + + game.load.image('horse_icon', '../../../resources/image/character/animal/horse/run2.png'); + game.load.image('horse_run1', '../../../resources/image/character/animal/horse/run1.png'); + game.load.image('horse_run2', '../../../resources/image/character/animal/horse/run2.png'); + + game.load.image('dog_icon', '../../../resources/image/character/animal/dog/run2.png'); + game.load.image('dog_run1', '../../../resources/image/character/animal/dog/run1.png'); + game.load.image('dog_run2', '../../../resources/image/character/animal/dog/run2.png'); + + game.load.image('cheetah_icon', '../../../resources/image/character/animal/cheetah/run2.png'); + game.load.image('cheetah_run1', '../../../resources/image/character/animal/cheetah/run1.png'); + game.load.image('cheetah_run2', '../../../resources/image/character/animal/cheetah/run2.png'); + + game.load.image('eagle_icon', '../../../resources/image/character/animal/eagle/run2.png'); + game.load.image('eagle_run1', '../../../resources/image/character/animal/eagle/run1.png'); + game.load.image('eagle_run2', '../../../resources/image/character/animal/eagle/run2.png'); + } } diff --git a/src/game/result/result.js b/src/game/result/result.js index dc723fb..25b34ac 100644 --- a/src/game/result/result.js +++ b/src/game/result/result.js @@ -6,46 +6,7 @@ class Result { preload() { game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png'); - this.game.load.image('snail_icon', '../../../resources/image/character/animal/snail/run2.png'); - this.game.load.image('snail_run1', '../../../resources/image/character/animal/snail/run1.png'); - this.game.load.image('snail_run2', '../../../resources/image/character/animal/snail/run2.png'); - - this.game.load.image('turtle_icon', '../../../resources/image/character/animal/turtle/run2.png'); - this.game.load.image('turtle_run1', '../../../resources/image/character/animal/turtle/run1.png'); - this.game.load.image('turtle_run2', '../../../resources/image/character/animal/turtle/run2.png'); - - this.game.load.image('cat_icon', '../../../resources/image/character/animal/cat/run2.png'); - this.game.load.image('cat_run1', '../../../resources/image/character/animal/cat/run1.png'); - this.game.load.image('cat_run2', '../../../resources/image/character/animal/cat/run2.png'); - - this.game.load.image('lion_icon', '../../../resources/image/character/animal/lion/run2.png'); - this.game.load.image('lion_run1', '../../../resources/image/character/animal/lion/run1.png'); - this.game.load.image('lion_run2', '../../../resources/image/character/animal/lion/run2.png'); - - this.game.load.image('rabbit_icon', '../../../resources/image/character/animal/rabbit/run2.png'); - this.game.load.image('rabbit_run1', '../../../resources/image/character/animal/rabbit/run1.png'); - this.game.load.image('rabbit_run2', '../../../resources/image/character/animal/rabbit/run2.png'); - - this.game.load.image('ostrich_icon', '../../../resources/image/character/animal/ostrich/run2.png'); - this.game.load.image('ostrich_run1', '../../../resources/image/character/animal/ostrich/run1.png'); - this.game.load.image('ostrich_run2', '../../../resources/image/character/animal/ostrich/run2.png'); - - this.game.load.image('horse_icon', '../../../resources/image/character/animal/horse/run2.png'); - this.game.load.image('horse_run1', '../../../resources/image/character/animal/horse/run1.png'); - this.game.load.image('horse_run2', '../../../resources/image/character/animal/horse/run2.png'); - - this.game.load.image('dog_icon', '../../../resources/image/character/animal/dog/run2.png'); - this.game.load.image('dog_run1', '../../../resources/image/character/animal/dog/run1.png'); - this.game.load.image('dog_run2', '../../../resources/image/character/animal/dog/run2.png'); - - this.game.load.image('cheetah_icon', '../../../resources/image/character/animal/cheetah/run2.png'); - this.game.load.image('cheetah_run1', '../../../resources/image/character/animal/cheetah/run1.png'); - this.game.load.image('cheetah_run2', '../../../resources/image/character/animal/cheetah/run2.png'); - - this.game.load.image('eagle_icon', '../../../resources/image/character/animal/eagle/run2.png'); - this.game.load.image('eagle_run1', '../../../resources/image/character/animal/eagle/run1.png'); - this.game.load.image('eagle_run2', '../../../resources/image/character/animal/eagle/run2.png'); - + Animal.loadResources(); } create() { diff --git a/src/game/typing/practice/loading.js b/src/game/typing/practice/loading.js index b81f24f..7a23e6e 100644 --- a/src/game/typing/practice/loading.js +++ b/src/game/typing/practice/loading.js @@ -42,45 +42,7 @@ class Loading { 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'); - this.game.load.image('snail_icon', '../../../resources/image/character/animal/snail/run2.png'); - this.game.load.image('snail_run1', '../../../resources/image/character/animal/snail/run1.png'); - this.game.load.image('snail_run2', '../../../resources/image/character/animal/snail/run2.png'); - - this.game.load.image('turtle_icon', '../../../resources/image/character/animal/turtle/run2.png'); - this.game.load.image('turtle_run1', '../../../resources/image/character/animal/turtle/run1.png'); - this.game.load.image('turtle_run2', '../../../resources/image/character/animal/turtle/run2.png'); - - this.game.load.image('cat_icon', '../../../resources/image/character/animal/cat/run2.png'); - this.game.load.image('cat_run1', '../../../resources/image/character/animal/cat/run1.png'); - this.game.load.image('cat_run2', '../../../resources/image/character/animal/cat/run2.png'); - - this.game.load.image('lion_icon', '../../../resources/image/character/animal/lion/run2.png'); - this.game.load.image('lion_run1', '../../../resources/image/character/animal/lion/run1.png'); - this.game.load.image('lion_run2', '../../../resources/image/character/animal/lion/run2.png'); - - this.game.load.image('rabbit_icon', '../../../resources/image/character/animal/rabbit/run2.png'); - this.game.load.image('rabbit_run1', '../../../resources/image/character/animal/rabbit/run1.png'); - this.game.load.image('rabbit_run2', '../../../resources/image/character/animal/rabbit/run2.png'); - - this.game.load.image('ostrich_icon', '../../../resources/image/character/animal/ostrich/run2.png'); - this.game.load.image('ostrich_run1', '../../../resources/image/character/animal/ostrich/run1.png'); - this.game.load.image('ostrich_run2', '../../../resources/image/character/animal/ostrich/run2.png'); - - this.game.load.image('horse_icon', '../../../resources/image/character/animal/horse/run2.png'); - this.game.load.image('horse_run1', '../../../resources/image/character/animal/horse/run1.png'); - this.game.load.image('horse_run2', '../../../resources/image/character/animal/horse/run2.png'); - - this.game.load.image('dog_icon', '../../../resources/image/character/animal/dog/run2.png'); - this.game.load.image('dog_run1', '../../../resources/image/character/animal/dog/run1.png'); - this.game.load.image('dog_run2', '../../../resources/image/character/animal/dog/run2.png'); - - this.game.load.image('cheetah_icon', '../../../resources/image/character/animal/cheetah/run2.png'); - this.game.load.image('cheetah_run1', '../../../resources/image/character/animal/cheetah/run1.png'); - this.game.load.image('cheetah_run2', '../../../resources/image/character/animal/cheetah/run2.png'); - - this.game.load.image('eagle_icon', '../../../resources/image/character/animal/eagle/run2.png'); - this.game.load.image('eagle_run1', '../../../resources/image/character/animal/eagle/run1.png'); - this.game.load.image('eagle_run2', '../../../resources/image/character/animal/eagle/run2.png'); + Animal.loadResources(); // this.game.load.image('hand_left', '../../../resources/image/ui/hand_left.png'); diff --git a/src/game/typing/test/loading.js b/src/game/typing/test/loading.js index 3a332f6..55041e8 100644 --- a/src/game/typing/test/loading.js +++ b/src/game/typing/test/loading.js @@ -35,45 +35,7 @@ class Loading { startLoading() { this.game.load.image('icon_fullscreen', '../../../resources/image/icon/fullscreen_white.png'); - this.game.load.image('snail_icon', '../../../resources/image/character/animal/snail/run2.png'); - this.game.load.image('snail_run1', '../../../resources/image/character/animal/snail/run1.png'); - this.game.load.image('snail_run2', '../../../resources/image/character/animal/snail/run2.png'); - - this.game.load.image('turtle_icon', '../../../resources/image/character/animal/turtle/run2.png'); - this.game.load.image('turtle_run1', '../../../resources/image/character/animal/turtle/run1.png'); - this.game.load.image('turtle_run2', '../../../resources/image/character/animal/turtle/run2.png'); - - this.game.load.image('cat_icon', '../../../resources/image/character/animal/cat/run2.png'); - this.game.load.image('cat_run1', '../../../resources/image/character/animal/cat/run1.png'); - this.game.load.image('cat_run2', '../../../resources/image/character/animal/cat/run2.png'); - - this.game.load.image('lion_icon', '../../../resources/image/character/animal/lion/run2.png'); - this.game.load.image('lion_run1', '../../../resources/image/character/animal/lion/run1.png'); - this.game.load.image('lion_run2', '../../../resources/image/character/animal/lion/run2.png'); - - this.game.load.image('rabbit_icon', '../../../resources/image/character/animal/rabbit/run2.png'); - this.game.load.image('rabbit_run1', '../../../resources/image/character/animal/rabbit/run1.png'); - this.game.load.image('rabbit_run2', '../../../resources/image/character/animal/rabbit/run2.png'); - - this.game.load.image('ostrich_icon', '../../../resources/image/character/animal/ostrich/run2.png'); - this.game.load.image('ostrich_run1', '../../../resources/image/character/animal/ostrich/run1.png'); - this.game.load.image('ostrich_run2', '../../../resources/image/character/animal/ostrich/run2.png'); - - this.game.load.image('horse_icon', '../../../resources/image/character/animal/horse/run2.png'); - this.game.load.image('horse_run1', '../../../resources/image/character/animal/horse/run1.png'); - this.game.load.image('horse_run2', '../../../resources/image/character/animal/horse/run2.png'); - - this.game.load.image('dog_icon', '../../../resources/image/character/animal/dog/run2.png'); - this.game.load.image('dog_run1', '../../../resources/image/character/animal/dog/run1.png'); - this.game.load.image('dog_run2', '../../../resources/image/character/animal/dog/run2.png'); - - this.game.load.image('cheetah_icon', '../../../resources/image/character/animal/cheetah/run2.png'); - this.game.load.image('cheetah_run1', '../../../resources/image/character/animal/cheetah/run1.png'); - this.game.load.image('cheetah_run2', '../../../resources/image/character/animal/cheetah/run2.png'); - - this.game.load.image('eagle_icon', '../../../resources/image/character/animal/eagle/run2.png'); - this.game.load.image('eagle_run1', '../../../resources/image/character/animal/eagle/run1.png'); - this.game.load.image('eagle_run2', '../../../resources/image/character/animal/eagle/run2.png'); + Animal.loadResources(); // this.game.load.image('a', '../../../resources/image/icon/fullscreen_white.png');