Skip to content

S
sejong25
Commit d63056b5 authored by 18손재민's avatar 18손재민
Browse files
Options

버튼 오브젝트 결국 따로 만듬. 메인 메뉴에서 보여주는 호패들을 rexUI를 쓰지 않기로 결정함 현재 호패들 닫는 것 wip

parent aad6fb14
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 180 deletions
GameServer.js
View file @ d63056b5
......@@ -76,7 +76,7 @@ class GameRoom
{
this.roomId = GameServer.getRoomNumber();
this.roomIndex = -1;
this.startCount = 3;
this.startCount = 2;
this.maxPlayer = 100;
this.nextRank = 100;
......
js/FirebaseClient.js
View file @ d63056b5
......@@ -230,6 +230,7 @@ FirebaseClient.prototype.updateUserData = function(key, valueChanged, replace =
break;
}
PlayerData.userData = beforeData;
console.log(beforeData);
return this.database.ref('/user-data/' + this.auth.currentUser.uid).update(beforeData);
}
......
js/Input.js
View file @ d63056b5
......@@ -322,7 +322,6 @@ Input.inputField =
generate: function(scene, enterCallback, text, isHopaeScene = false)
{
this.text = text;
//this.text = scene.add.text(background.x, background.y, "", {font: fontSize + 'pt 궁서'}).setOrigin(0.5, 0.5).setColor('#000000').setDepth(10);
scene.input.keyboard.on('keyup', function() {Input.pressCount--; Input.justPressed = '';
if(isHopaeScene)
......
js/ResourceLoader.js
View file @ d63056b5
......@@ -11,7 +11,7 @@ ResourceLoader.loadBackGround = function(scene)
ResourceLoader.loadImage = function(scene)
{
scene.load.image('inputfield', 'assets/placeholder/inputfield.png');
scene.load.image('inputfield', 'assets/image/etc/wordspace.png');
for (let i = 0; i < 4; i++)
{
for (let j = 2; j < 7; j++)
......
js/ScenesData.js
View file @ d63056b5
......@@ -36,110 +36,69 @@ var menuScene = new Phaser.Class(
{
BackGround.drawBackground(this);
Audio.loopSound(this, 'login');
PlayerData.nickname = (PlayerData.userData.recentHopae == '') ? PlayerData.userData.hopae[0].name : PlayerData.userData.recentHopae;
this.userName = this.add.text(100, 100, '내 이름 : ' + PlayerData.userData.userName).setOrigin(0, 0.5).setColor('#000000').setDepth(10).setPadding(5,5,5,5).setFontSize(40);
this.money = this.add.text(100, 200, '소지 엽전 : ' + PlayerData.userData.money).setOrigin(0, 0.5).setColor('#000000').setDepth(10).setPadding(5,5,5,5).setFontSize(40);
//this.currentHopae = this.add.text(100, 300, '현재 호패 : ' + PlayerData.userData.recentHopae).setOrigin(0, 0.5).setColor('#000000').setDepth(10).setPadding(5,5,5,5).setFontSize(40);
this.myHopae = [];
//PlayerData.userData.forEach(function(element){this.myHopae.push(element)});
for(let i = 0; i < PlayerData.userData.hopae.length; i++) this.myHopae.push(PlayerData.userData.hopae[i]);
this.currentHopae = this.button.add(UIObject.createLabel(ScenesData.menuScene, 300, 300, 10,
'nameBgr' + PlayerData.userData.recentHopae.length, 1, PlayerData.userData.recentHopae, 25, '#ffffff', 0.45, 0.5).getElement('background'),
this.setOtherHopae = function()
{
enabled: true, mode: 0
}).on('click', function(button, gameObject, pointer){
button.setEnable(false);
this.otherHopae = [];
for(let i = 0; i < PlayerData.userData.hopae.length; i++)
if(PlayerData.userData.hopae[i].name != PlayerData.nickname)
this.otherHopae.push(
{
name: PlayerData.userData.hopae[i].name,
type: PlayerData.userData.hopae[i].type,
});
}
this.setOtherHopae();
this.hopaeMenu = this.rexUI.add.menu({
x: 300,
y: 300,
items: ScenesData.menuScene.myHopae,
createButtonCallback: function (item, i) {
return ScenesData.menuScene.rexUI.add.label({
background: UIObject.createLabel(ScenesData.menuScene, 0, 0, 10, 'nameBgr' + item.name.length, 1, item.name, 25, '#ffffff', 0.45, 0.5),
text: ScenesData.menuScene.add.text(0, 0, item.name, {
fontSize: '25px'
}).setVisible(false),
space: {
left: 10,
right: 10,
top: 10,
bottom: 10,
icon: 10
}
})
},
easeIn: {
this.createHopaeMenu = function()
{
this.otherHopaeObject = [];
for(let i = 0; i < this.otherHopae.length; i++)
{
let temp = UIObject.createButton(this, UIObject.createLabel(this, 300, 300, 10,
'nameBgr' + ScenesData.menuScene.otherHopae[i].name.length, 1, ScenesData.menuScene.otherHopae[i].name, 25, '#ffffff', 0.45, 0.5), 0, 0, 0,
function()
{
PlayerData.nickname = ScenesData.menuScene.otherHopae[i].name;
ScenesData.menuScene.setOtherHopae();
ScenesData.menuScene.currentHopae.destroy();
ScenesData.menuScene.createCurrentHopae();
ScenesData.menuScene.currentHopae.setEnable(true);
ScenesData.menuScene.otherHopaeObject.forEach(function(element){element.destroy()});
});
ScenesData.menuScene.tweens.add({
targets: temp,
y: 50 * (i + 1),
duration: 500,
orientation: 'y'
},
easeOut: {
duration: 100,
orientation: 'y'
},
});
this.hopaeMenu
.on('button.over', function (button) {
})
.on('button.out', function (button) {
})
.on('button.click', function (button) {
PlayerData.nickname = button.text;
ScenesData.menuScene.currentHopae.setEnable(true);
this.collapse();
ease: 'Bounce',
loop: 0
});
this.otherHopaeObject.push(temp);
}
}
}, this);
this.createCurrentHopae = function()
{
this.currentHopae = UIObject.createButton(this, UIObject.createLabel(this, 300, 300, 10,
'nameBgr' + PlayerData.nickname.length, 1, PlayerData.nickname, 25, '#ffffff', 0.45, 0.5), 0, 0, 0,
function()
{
ScenesData.menuScene.currentHopae.setEnable(false);
ScenesData.menuScene.createHopaeMenu();
})
}
this.createCurrentHopae();
this.myCharacter = this.add.sprite(game.config.width / 2, game.config.height / 2 - 200, 'pyeongminStand').setOrigin(0.5, 0.5).setDepth(5).setScale(0.8);
PlayerData.nickname = (PlayerData.userData.recentHopae == '') ? PlayerData.userData.hopae[0].name : PlayerData.userData.recentHopae;
this.roomEnterDialog = this.rexUI.add.dialog({
x: game.config.width / 2,
y: game.config.height / 2,
background: this.add.sprite(game.config.width / 2, game.config.height / 2, 'panel').setOrigin(0.5, 0.5),
title: this.rexUI.add.label({
background: this.rexUI.add.roundRectangle(0, 0, 100, 40, 20, 0x1b0000),
text: this.add.text(0, 0, '대기실에 참가하시겠습니까?', {
font: '50pt 궁서'
}).setOrigin(0.5, 0.5),
space: {
left: 15,
right: 15,
top: 10,
bottom: 10
}
}),
content: this.add.text(0, 0, '대기실에 참가하시겠습니까?', {
font: '50pt 궁서'
......@@ -186,28 +145,26 @@ var menuScene = new Phaser.Class(
//console.log('button out');
});
this.gameStartBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, 900, 5, 'pyeongminWrite', 0.5), 1, 0, 2,
function()
{
ScenesData.menuScene.gameStartBtn.setEnable(false);
ScenesData.menuScene.roomEnterDialog.setVisible(true).popUp(200);
})
this.shopBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 100, 900, 5, 'pyeongminThrow', 0.5), 1, 0, 2,
function()
{
console.log('상점 입장');
})
this.hopaeBtn = UIObject.createButton(this, UIObject.createLabel(this, 100, 900, 5, 'pyeongminThrow', 0.5), 1, 0, 2,
function()
{
ScenesData.changeScene('hopaeScene');
})
this.gameStartBtn = this.button.add(new Button(this, game.config.width / 2, 900, 'pyeongminWrite', 1, 0, 2).setScale(0.5).setDepth(5),
{
enabled: true, mode: 0
}).on('click', function(button, gameObject, pointer){
button.setEnable(false);
ScenesData.menuScene.roomEnterDialog.setVisible(true).popUp(200);
}, this);
this.shopBtn = this.button.add(new Button(this, game.config.width - 100, 900, 'pyeongminThrow', 1, 0, 2).setScale(0.5).setDepth(5),
{
enabled: true, mode: 0
}).on('click', function(button, gameObject, pointer){
console.log('상점 입장');
}, this);
this.hopaeBtn = this.button.add(new Button(this, 100, 900, 'pyeongminThrow', 1, 0, 2).setScale(0.5).setDepth(5),
{
enabled: true, mode: 0
}).on('click', function(button, gameObject, pointer){
ScenesData.changeScene('hopaeScene');
}, this);
}
});
......@@ -293,31 +250,14 @@ var hopaeScene = new Phaser.Class(
else
{
this.checkDialog.setVisible(false);
this.button.add(
this.rexUI.add.dialog({
x: game.config.width / 2,
y: game.config.height / 2,
background: this.add.sprite(game.config.width / 2, game.config.height / 2, 'panel').setOrigin(0.5, 0.5),
content: this.add.text(0, 0, '엽전이 부족합니다.', {
font: '50pt 궁서',
color: '#000000'
}),
space: {
left: 20,
right: 20,
top: 20,
bottom: 20,
}
}).layout().setDepth(10).popUp(200),
{
enabled: true, mode: 0
}).on('click', function(button, gameObject, pointer){
gameObject.destroy();
this.checkBtn.setEnable(true);
}, this);
this.errorMsg = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, game.config.height / 2, 10, 'panel', 1,
'엽전이 부족합니다', 50, '#000000').layout().popUp(200), 0, 0, 0,
function()
{
ScenesData.hopaeScene.errorMsg.destroy();
ScenesData.hopaeScene.checkBtn.setEnable(true);
})
}
}
else
......@@ -332,29 +272,24 @@ var hopaeScene = new Phaser.Class(
.on('button.out', function (button, groupName, index) {
//console.log('button out');
});
this.warningText = UIObject.createLabel(this, game.config.width / 2, game.config.height / 2 + 100, 10, 'button', 1,
this.warningText = UIObject.createLabel(this, game.config.width / 2, game.config.height / 2 - 100, 2, 'panel', 1,
'이름 타수가 많아 플레이에 패널티가 있을 수 있습니다', 40, '#000000').setVisible(false).layout();
/*this.warningText = this.add.text(this, game.config.width / 2, game.config.height / 2 + 100, '이름 타수가 많아 플레이에 패널티가 있을 수 있습니다')
.setOrigin(0, 0.5).setColor('#000000').setDepth(10).setFontSize(40);
this.warningText.visible = false;*/
this.checkBtn = this.button.add(new Button(this, game.config.width / 2, 900, 'pyeongminWrite', 1, 0, 2).setScale(0.5).setDepth(5),
{
enabled: true, mode: 0
}).on('click', function(button, gameObject, pointer){
if(Input.checkProperInput(Input.inputField.text.text))
this.checkBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, 900, 5, 'pyeongminWrite', 0.5), 1, 0, 2,
function()
{
this.checkBtn.setEnable(false);
ScenesData.hopaeScene.checkDialog.setVisible(true).popUp(200);
}
}, this).setEnable(false);
if(Input.checkProperInput(Input.inputField.text.text))
{
ScenesData.hopaeScene.checkBtn.setEnable(false);
ScenesData.hopaeScene.checkDialog.setVisible(true).popUp(200);
}
})
this.backBtn = this.button.add(new Button(this, 100, 900, 'pyeongminWrite', 1, 0, 2).setScale(0.5).setDepth(5),
{
enabled: true, mode: 0
}).on('click', function(button, gameObject, pointer){
ScenesData.changeScene('menuScene');
}, this);
this.backBtn = UIObject.createButton(this, UIObject.createLabel(this, 100, 900, 5, 'pyeongminWrite', 0.5), 1, 0, 2,
function()
{
ScenesData.changeScene('menuScene');
});
}
});
......
js/UIObject.js
View file @ d63056b5
......@@ -10,8 +10,8 @@ UIObject.createLabel = function (scene, x, y, depth, image, size, text = '', tex
background: scene.add.sprite(x, y, image).setScale(size).setOrigin(0.5, 0.5).setDepth(depth),
text: scene.add.text(x, y, text, {
fontSize: textSize + 'pt'
}).setDepth(depth).setOrigin(textOriginX, textOriginY).setColor(textColor).setFontFamily('궁서'),
font: textSize + 'pt 궁서'
}).setDepth(depth).setOrigin(textOriginX, textOriginY).setColor(textColor),
space: {
left: 10,
......@@ -22,26 +22,48 @@ UIObject.createLabel = function (scene, x, y, depth, image, size, text = '', tex
});
}
class Button extends Phaser.GameObjects.Sprite{
constructor(scene, x, y, texture, overFrame, outFrame, downFrame)
UIObject.createButton = function(scene, buttonGameObject, overFrame, outFrame, downFrame, clickCallback) {
var temp = scene.rexUI.add.buttons({
x: 0,
y: 0,
width: undefined,
height: undefined,
orientation: 0,
buttons: [
buttonGameObject,
],
click: {
mode: 'pointerdown',
clickInterval: 100
}
});
buttonGameObject = buttonGameObject.getElement('background');
temp.enabled = true;
buttonGameObject.setFrame(outFrame).setInteractive()
.on('pointerover', () => {
if(temp.enabled)
{
buttonGameObject.setFrame(overFrame);
}
})
.on('pointerdown', () => {
if(temp.enabled)
{
buttonGameObject.setFrame(downFrame);
clickCallback();
}
})
.on('pointerup', () => {
buttonGameObject.setFrame(outFrame);
})
.on('pointerout', () => {
buttonGameObject.setFrame(outFrame);
})
temp.setEnable = function(isEnable)
{
super(scene, x, y, texture);
scene.add.existing(this);
this.setFrame(outFrame).setInteractive()
.on('pointerover', () => {
this.setFrame(overFrame)
})
.on('pointerdown', () => {
this.setFrame(downFrame)
})
.on('pointerup', () => {
this.setFrame(overFrame)
})
.on('pointerout', () => {
this.setFrame(outFrame)
})
temp.enabled = isEnable;
return temp;
}
return temp;
}
\ No newline at end of file
server.js
View file @ d63056b5
......@@ -13,7 +13,7 @@ app.get('/', function(req, res) {
});
// http 기본 포트(80)에 서버 열기
server.listen(8080, function() {
server.listen(80, function() {
console.log('[SERVER] Listening on port ' + server.address().port);
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment