Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sejong25
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Tear of Sejong
sejong25
Commits
603217bf
Commit
603217bf
authored
Aug 17, 2019
by
18손재민
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
무적 단어를 사용 시 지속 시간동안 모든 플레이어 창에 그 표시가 생기게 함. 현재는 임시 이미지를 띄움
parent
2e14b614
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
5 deletions
+51
-5
Client.js
js/Client.js
+36
-5
ScenesData.js
js/ScenesData.js
+4
-0
WordObject.js
js/WordObject.js
+2
-0
server.js
server.js
+9
-0
No files found.
js/Client.js
View file @
603217bf
...
@@ -184,6 +184,35 @@ socket.on('attacked', function(msg) // object attackData
...
@@ -184,6 +184,35 @@ socket.on('attacked', function(msg) // object attackData
WordSpace
.
attackedEvents
.
push
(
attackedEvent
);
WordSpace
.
attackedEvents
.
push
(
attackedEvent
);
//console.log(timeout);
//console.log(timeout);
});
});
socket
.
on
(
'
someoneItemStart
'
,
function
(
msg
)
{
let
itemPlayer
=
RoomData
.
findPlayer
(
msg
.
id
);
let
size
=
msg
.
id
==
RoomData
.
myself
.
id
?
1
:
0.7
;
let
xOffset
=
msg
.
id
!=
RoomData
.
myself
.
id
&&
itemPlayer
.
position
.
x
<
game
.
config
.
width
/
2
?
-
1
:
1
;
switch
(
msg
.
itemType
)
{
case
Enums
.
item
.
invincible
:
itemPlayer
.
invincibleMark
=
ScenesData
.
gameScene
.
add
.
sprite
(
itemPlayer
.
position
.
x
+
20
*
size
*
xOffset
,
itemPlayer
.
position
.
y
-
50
*
size
,
'
attackPaper
'
)
.
setDepth
(
5.3
).
setOrigin
(
0.5
,
0.5
).
setScale
(
size
);
break
;
default
:
console
.
log
(
'
Improper item type.
'
);
break
;
}
});
socket
.
on
(
'
someoneItemEnd
'
,
function
(
msg
)
{
let
itemPlayer
=
RoomData
.
findPlayer
(
msg
.
id
);
switch
(
msg
.
itemType
)
{
case
Enums
.
item
.
invincible
:
itemPlayer
.
invincibleMark
.
destroy
();
break
;
default
:
console
.
log
(
'
Improper item type.
'
);
break
;
}
});
socket
.
on
(
'
defeat
'
,
function
(
msg
)
// object player
socket
.
on
(
'
defeat
'
,
function
(
msg
)
// object player
{
{
...
@@ -202,11 +231,8 @@ socket.on('defeat', function(msg) // object player
...
@@ -202,11 +231,8 @@ socket.on('defeat', function(msg) // object player
let
lastAttacker
=
RoomData
.
findPlayer
(
msg
.
lastAttack
.
attackerId
).
nickname
;
let
lastAttacker
=
RoomData
.
findPlayer
(
msg
.
lastAttack
.
attackerId
).
nickname
;
console
.
log
(
RoomData
.
findPlayer
(
msg
.
id
).
nickname
+
'
defeated by
'
+
lastAttacker
+
'
, with
'
+
msg
.
lastAttack
.
word
);
console
.
log
(
RoomData
.
findPlayer
(
msg
.
id
).
nickname
+
'
defeated by
'
+
lastAttacker
+
'
, with
'
+
msg
.
lastAttack
.
word
);
WordSpace
.
killLogForTest
+=
(
'
\n
'
+
lastAttacker
+
'
--
'
+
msg
.
lastAttack
.
word
+
'
->
'
+
RoomData
.
findPlayer
(
msg
.
id
).
nickname
);
WordSpace
.
killLogForTest
+=
(
'
\n
'
+
lastAttacker
+
'
--
'
+
msg
.
lastAttack
.
word
+
'
->
'
+
RoomData
.
findPlayer
(
msg
.
id
).
nickname
);
if
(
msg
.
lastAttack
.
attackerId
==
RoomData
.
myself
.
id
)
let
itemBag
=
ScenesData
.
gameScene
.
add
.
sprite
(
RoomData
.
findPlayer
(
msg
.
lastAttack
.
attackerId
).
position
.
x
,
RoomData
.
findPlayer
(
msg
.
lastAttack
.
attackerId
).
position
.
y
,
{
'
itemBag
'
).
setScale
(
0
).
setDepth
(
5.3
);
var
keys
=
Object
.
keys
(
Enums
.
item
);
WordSpace
.
generateWord
.
Item
(
ScenesData
.
gameScene
,
Enums
.
item
[
keys
[
keys
.
length
*
Math
.
random
()
<<
0
]]);
let
itemBag
=
ScenesData
.
gameScene
.
add
.
sprite
(
RoomData
.
myself
.
position
.
x
,
RoomData
.
myself
.
position
.
y
,
'
itemBag
'
).
setScale
(
0
).
setDepth
(
5.3
);
ScenesData
.
gameScene
.
tweens
.
add
({
ScenesData
.
gameScene
.
tweens
.
add
({
targets
:
itemBag
,
targets
:
itemBag
,
scaleX
:
1
,
scaleX
:
1
,
...
@@ -232,6 +258,11 @@ socket.on('defeat', function(msg) // object player
...
@@ -232,6 +258,11 @@ socket.on('defeat', function(msg) // object player
setTimeout
(
function
()
{
setTimeout
(
function
()
{
itemBag
.
destroy
();
itemBag
.
destroy
();
},
3000
);
},
3000
);
if
(
msg
.
lastAttack
.
attackerId
==
RoomData
.
myself
.
id
)
{
var
keys
=
Object
.
keys
(
Enums
.
item
);
WordSpace
.
generateWord
.
Item
(
ScenesData
.
gameScene
,
Enums
.
item
[
keys
[
keys
.
length
*
Math
.
random
()
<<
0
]]);
RoomData
.
myself
.
killCount
++
;
RoomData
.
myself
.
killCount
++
;
}
}
}
}
...
...
js/ScenesData.js
View file @
603217bf
...
@@ -461,6 +461,10 @@ var gameScene = new Phaser.Class(
...
@@ -461,6 +461,10 @@ var gameScene = new Phaser.Class(
WordSpace
.
nameQueue
.
initiate
();
WordSpace
.
nameQueue
.
initiate
();
//WordSpace.attackGauge.add(11);
//WordSpace.attackGauge.add(11);
WordSpace
.
generateWord
.
Item
(
ScenesData
.
gameScene
,
Enums
.
item
.
invincible
);
WordSpace
.
generateWord
.
Item
(
ScenesData
.
gameScene
,
Enums
.
item
.
invincible
);
WordSpace
.
generateWord
.
Item
(
ScenesData
.
gameScene
,
Enums
.
item
.
invincible
);
},
},
...
...
js/WordObject.js
View file @
603217bf
...
@@ -363,8 +363,10 @@ class ItemWord extends WordObject
...
@@ -363,8 +363,10 @@ class ItemWord extends WordObject
{
{
case
Enums
.
item
.
invincible
:
case
Enums
.
item
.
invincible
:
WordSpace
.
isInvincible
=
true
;
WordSpace
.
isInvincible
=
true
;
socket
.
emit
(
'
itemStart
'
,
{
id
:
RoomData
.
myself
.
id
,
itemType
:
Enums
.
item
.
invincible
});
setTimeout
(()
=>
{
setTimeout
(()
=>
{
WordSpace
.
isInvincible
=
false
;
WordSpace
.
isInvincible
=
false
;
socket
.
emit
(
'
itemEnd
'
,
{
id
:
RoomData
.
myself
.
id
,
itemType
:
Enums
.
item
.
invincible
});
},
5000
);
},
5000
);
break
;
break
;
case
Enums
.
item
.
nameList
:
case
Enums
.
item
.
nameList
:
...
...
server.js
View file @
603217bf
...
@@ -175,6 +175,15 @@ io.on('connection', function(socket)
...
@@ -175,6 +175,15 @@ io.on('connection', function(socket)
if
(
wrongCountIndex
!==
-
1
)
socket
.
playerData
.
playingData
.
lastAttacks
[
wrongCountIndex
].
wrongCount
++
;
if
(
wrongCountIndex
!==
-
1
)
socket
.
playerData
.
playingData
.
lastAttacks
[
wrongCountIndex
].
wrongCount
++
;
});
});
socket
.
on
(
'
itemStart
'
,
function
(
msg
)
//playerID, item
{
socket
.
playerData
.
currentRoom
.
announceToRoom
(
'
someoneItemStart
'
,
msg
);
});
socket
.
on
(
'
itemEnd
'
,
function
(
msg
)
//playerID, item
{
socket
.
playerData
.
currentRoom
.
announceToRoom
(
'
someoneItemEnd
'
,
msg
);
});
socket
.
on
(
'
disconnect
'
,
function
(
reason
)
socket
.
on
(
'
disconnect
'
,
function
(
reason
)
{
{
GameServer
.
disconnectCount
++
;
GameServer
.
disconnectCount
++
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment