Skip to content

한글 이름 추가. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaejin1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

한글 이름 추가. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 ; //페이지 소스보기 이쁘게

Expand Down
2 changes: 1 addition & 1 deletion routes/cardgame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
7 changes: 6 additions & 1 deletion routes/keyword.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
Expand Down
2 changes: 1 addition & 1 deletion routes/timeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
2 changes: 1 addition & 1 deletion views/footer.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

img.footerimage(src='images/'+membername)
p= gStep +"단계입니다."

p= gMemberNameko
link(rel='stylesheet', type='text/css', href='css/footer.css')