diff --git a/src/game/mouse/dodge/game.js b/src/game/mouse/dodge/game.js
index c8d4568..0f76659 100644
--- a/src/game/mouse/dodge/game.js
+++ b/src/game/mouse/dodge/game.js
@@ -1,8 +1,8 @@
var Game = {
- preload: function() {
- game.stage.disableVisibilityChange = true;
- },
+ // preload: function() {
+ // game.stage.disableVisibilityChange = true;
+ // },
create: function() {
game.physics.enable(this, Phaser.Physics.ARCADE);
@@ -60,14 +60,7 @@ var Game = {
screenTopUI.makeBackButton( (function() { this.back(); }).bind(this) );
screenTopUI.makeFullScreenButton();
- this.stopWatch = new StopWatch(
- 60, // sec
- (function() {
- this.setClickEnable(false);
-
- this.gameOver();
- }).bind(this)
- );
+ this.stopWatch = new StopWatch(game);
// bottom ui
diff --git a/src/game/mouse/dodge/stop_watch.js b/src/game/mouse/dodge/stop_watch.js
index a47fdd9..7bfeb2f 100644
--- a/src/game/mouse/dodge/stop_watch.js
+++ b/src/game/mouse/dodge/stop_watch.js
@@ -1,6 +1,6 @@
function StopWatch() {
- this.ellpasedTime = 0;
- this.startTime = 0;
+ this.ellapsedTime = 0;
+ // this.startTime = 0;
this.isPaused = true;
var fontStyle = StopWatch.DEFAULT_TEXT_FONT;
@@ -24,12 +24,15 @@ function StopWatch() {
StopWatch.prototype.start = function() {
this.isPaused = false;
- this.startTime = game.time.totalElapsedSeconds();
+ // this.startTime = game.time.totalElapsedSeconds();
+
+ this.ellapsedTimer = game.time.create(false);
+ this.timerEvent = this.ellapsedTimer.loop(10, this.updateTimer, this);
+ this.ellapsedTimer.start();
this.printTime();
- if(this.timerEvent === null)
- this.timerEvent = game.time.events.loop(Phaser.Timer.SECOND / 100, this.updateTimer, this);
+ // this.timerEvent = game.time.events.loop(Phaser.Timer.SECOND / 100, this.updateTimer, this);
}
StopWatch.prototype.pause = function() {
@@ -41,31 +44,35 @@ StopWatch.prototype.resume = function() {
}
StopWatch.prototype.stop = function() {
- var recordTime = game.time.totalElapsedSeconds() - this.startTime;
+ // var recordTime = game.time.totalElapsedSeconds() - this.startTime;
+ this.removeTimer();
- if(this.timerEvent)
- this.removeTimer();
-
- return recordTime;
+ // return recordTime;
+ return this.ellapsedTime;
}
StopWatch.prototype.updateTimer = function() {
if(this.isPaused == true)
return;
- this.ellpasedTime = game.time.totalElapsedSeconds() - this.startTime;
+ // this.ellapsedTime = game.time.totalElapsedSeconds() - this.startTime;
+ this.ellapsedTime += 0.01;
this.printTime();
}
StopWatch.prototype.printTime = function() {
this.timerText.text = RecordUtil.getRecordValueWithUnit(
- this.ellpasedTime, sessionStorageManager.getPlayingAppID()
+ this.ellapsedTime, sessionStorageManager.getPlayingAppID()
);
}
StopWatch.prototype.removeTimer = function() {
game.time.events.remove(this.timerEvent);
- this.timerEvent = null;
+ if(this.timerEvent)
+ this.timerEvent = null;
+
+ this.ellapsedTimer.stop();
+ this.ellapsedTimer = null;
}
diff --git a/src/web/client/ads.html b/src/web/client/ads.html
index ad4f9c1..158717f 100644
--- a/src/web/client/ads.html
+++ b/src/web/client/ads.html
@@ -22,7 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 광고
+ 광고 | 초코마에
+
diff --git a/src/web/client/card_matching.html b/src/web/client/card_matching.html
index 568d361..d06c208 100644
--- a/src/web/client/card_matching.html
+++ b/src/web/client/card_matching.html
@@ -22,8 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 카드 짝 맞추기, 초코마에
-
+ 카드 짝 맞추기 | 초코마에
+
diff --git a/src/web/client/dodge.html b/src/web/client/dodge.html
index fdd9af0..795492a 100644
--- a/src/web/client/dodge.html
+++ b/src/web/client/dodge.html
@@ -22,8 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 미사일 피하기, 초코마에
-
+ 미사일 피하기 | 초코마에
+
diff --git a/src/web/client/grilled_meat.html b/src/web/client/grilled_meat.html
index d3271fb..c348494 100644
--- a/src/web/client/grilled_meat.html
+++ b/src/web/client/grilled_meat.html
@@ -22,8 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 고기 굽기, 초코마에
-
+ 고기 굽기 | 초코마에
+
diff --git a/src/web/client/login.html b/src/web/client/login.html
index 4c9b80d..bbf3629 100644
--- a/src/web/client/login.html
+++ b/src/web/client/login.html
@@ -22,7 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 로그인
+ 로그인 | 초코마에
+
diff --git a/src/web/client/menu_app_play_free.html b/src/web/client/menu_app_play_free.html
index 86584c3..0f8b8d8 100644
--- a/src/web/client/menu_app_play_free.html
+++ b/src/web/client/menu_app_play_free.html
@@ -22,7 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 무료 플레이어 메뉴, 초코마에
+ 무료 플레이어 메뉴 | 초코마에
+
diff --git a/src/web/client/menu_app_test_player.html b/src/web/client/menu_app_test_player.html
index ec5382d..d0dae7d 100644
--- a/src/web/client/menu_app_test_player.html
+++ b/src/web/client/menu_app_test_player.html
@@ -22,7 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 테스트 플레이어 메뉴, 초코마에
+ 테스트 플레이어 메뉴 | 초코마에
+
diff --git a/src/web/client/space_invaders.html b/src/web/client/space_invaders.html
index 3592153..3273457 100644
--- a/src/web/client/space_invaders.html
+++ b/src/web/client/space_invaders.html
@@ -22,8 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 외계인 침공, 초코마에
-
+ 외계인 침공 | 초코마에
+
diff --git a/src/web/client/typing_practice.html b/src/web/client/typing_practice.html
index 25fede3..96adb1f 100644
--- a/src/web/client/typing_practice.html
+++ b/src/web/client/typing_practice.html
@@ -22,8 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 타자 연습, 초코마에
-
+ 타자 연습 | 초코마에
+
diff --git a/src/web/client/typing_test.html b/src/web/client/typing_test.html
index ac117c6..e8a900e 100644
--- a/src/web/client/typing_test.html
+++ b/src/web/client/typing_test.html
@@ -22,8 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 타자 시험, 초코마에
-
+ 타자 시험 | 초코마에
+
diff --git a/src/web/client/whac_a_mole.html b/src/web/client/whac_a_mole.html
index 485df1c..ea97727 100644
--- a/src/web/client/whac_a_mole.html
+++ b/src/web/client/whac_a_mole.html
@@ -22,8 +22,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 영어 타자 앱-두더지 타자, 초코마에
-
+ 두더지 타자 | 초코마에
+
diff --git a/src/web/maestro/maestro_test_account_app_menu.html b/src/web/maestro/maestro_test_account_app_menu.html
index e1d5f44..c69869b 100644
--- a/src/web/maestro/maestro_test_account_app_menu.html
+++ b/src/web/maestro/maestro_test_account_app_menu.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 마에스트로 체험
-
+ 마에스트로 체험 | 초코마에
+
diff --git a/src/web/maestro/main_menu.html b/src/web/maestro/main_menu.html
index 1934c2f..f7ae6ea 100644
--- a/src/web/maestro/main_menu.html
+++ b/src/web/maestro/main_menu.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 마에스트로 메뉴, 초코마에
-
+ 마에스트로 메뉴 | 초코마에
+
diff --git a/src/web/maestro/setup.html b/src/web/maestro/setup.html
index d7360fe..bcca9c2 100644
--- a/src/web/maestro/setup.html
+++ b/src/web/maestro/setup.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 마에스트로 정보 변경
-
+ 마에스트로 계정 정보 수정 | 초코마에
+
diff --git a/src/web/maestro/upgrade.html b/src/web/maestro/upgrade.html
index 039dd1f..960abdf 100644
--- a/src/web/maestro/upgrade.html
+++ b/src/web/maestro/upgrade.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 마에스트로 업그레이드
-
+ 마에스트로 계정 업그레이드 | 초코마에
+
diff --git a/src/web/main/faq.html b/src/web/main/faq.html
index 732f08e..3794e04 100644
--- a/src/web/main/faq.html
+++ b/src/web/main/faq.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- FAQ, 초코마에
-
+ FAQ | 초코마에
+
diff --git a/src/web/main/free_player_app_menu.html b/src/web/main/free_player_app_menu.html
index 0a077d4..2c0bc2b 100644
--- a/src/web/main/free_player_app_menu.html
+++ b/src/web/main/free_player_app_menu.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 초코마에 무료 사용자
-
+ 무료 사용자 | 초코마에
+
diff --git a/src/web/main/index.html b/src/web/main/index.html
index 0aea983..d283b6d 100644
--- a/src/web/main/index.html
+++ b/src/web/main/index.html
@@ -24,7 +24,7 @@
초코마에
-
+
diff --git a/src/web/main/login.html b/src/web/main/login.html
index 54f2f01..1b80b8e 100644
--- a/src/web/main/login.html
+++ b/src/web/main/login.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 마에스트로 로그인
-
+ 마에스트로 로그인 | 초코마에
+
diff --git a/src/web/main/register.html b/src/web/main/register.html
index 27586fa..f633042 100644
--- a/src/web/main/register.html
+++ b/src/web/main/register.html
@@ -23,8 +23,8 @@
})(window,document,'script','dataLayer','GTM-N8PB4F3');
- 마에스트로 계정 등록
-
+ 마에스트로 계정 등록 | 초코마에
+