diff --git a/app.js b/app.js index 4a2f37b..23faeb0 100644 --- a/app.js +++ b/app.js @@ -20,6 +20,7 @@ var app = express(); global.appRoot = path.resolve(__dirname); // 선택한 캐릭터 전역변수 // boyeon, daeun, jaejin, dongju +global.gMemberNameko = ''; global.gMemberName = ''; global.gInterval = 0; global.gTens = 0; @@ -28,6 +29,18 @@ global.gStartTimer = function () { } global.gStep = 1; +global.gmember = function() { + if ( gMemberName == "boyeon"){ + gMemberNameko = '보연'; + }else if( gMemberName == "dongju"){ + gMemberNameko = '동주'; + }else if( gMemberName == "daeun"){ + gMemberNameko = '다은'; + }else if( gMemberName == "jaejin"){ + gMemberNameko = '재진'; + } +} + app.locals.pretty = true ; //페이지 소스보기 이쁘게 diff --git a/routes/cardgame.js b/routes/cardgame.js index 1442f97..8d91133 100644 --- a/routes/cardgame.js +++ b/routes/cardgame.js @@ -4,6 +4,6 @@ exports.startGame = function(req, res) { //res.sendFile(path.join(appRoot + '/views/cardgame.html')); gStep = 3; - res.render('cardgame', {membername:global.gMemberName, gStep:gStep}); + res.render('cardgame', {membername:global.gMemberName, gStep:gStep, gMemberNameko: gMemberNameko}); console.log('gStep : ' + gStep); }; diff --git a/routes/keyword.js b/routes/keyword.js index 731ad44..37ae85c 100644 --- a/routes/keyword.js +++ b/routes/keyword.js @@ -2,11 +2,16 @@ var path = require("path"); exports.matchingGame = function(req, res) { gMemberName = req.query.char; + gStep = 2; clearInterval(gInterval); gInterval = setInterval(gStartTimer, 10); + global.gmember(); //한글 캐릭터이름 가져오기. + global.gMemberName = gMemberName +'-mini.jpg'; - res.render('keywordMatch', {membername:gMemberName, gStep:gStep}); + res.render('keywordMatch', {membername:gMemberName, gStep:gStep, gMemberNameko: gMemberNameko}); + + console.log('gStep : ' + gStep); //res.sendFile(path.join(appRoot + '/views/keywordMatch.html')); diff --git a/routes/timeline.js b/routes/timeline.js index 4d1e854..5c969b5 100644 --- a/routes/timeline.js +++ b/routes/timeline.js @@ -6,7 +6,7 @@ exports.showTimeline = function(req, res) { gStep = 4; - res.render('timeline', {membername:global.gMemberName, gStep:gStep}); + res.render('timeline', {membername:global.gMemberName, gStep:gStep, gMemberNameko: gMemberNameko}); console.log('gStep : ' + gStep); }; diff --git a/views/footer.pug b/views/footer.pug index d10d09c..d4664c6 100644 --- a/views/footer.pug +++ b/views/footer.pug @@ -3,5 +3,5 @@ img.footerimage(src='images/'+membername) p= gStep +"단계입니다." - + p= gMemberNameko link(rel='stylesheet', type='text/css', href='css/footer.css')