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
c1079d7e
Commit
c1079d7e
authored
5 years ago
by
18손재민
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'sound'
parents
9faf947b
14d6b942
master
attackmark
gameScene
hopaeScene
image
logInScene
menuscene
physics
release
server
shopScene
sound
word
wordgen
wordspace
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
BGMsound.js
js/BGMsound.js
+4
-3
ScenesData.js
js/ScenesData.js
+5
-2
No files found.
js/BGMsound.js
View file @
c1079d7e
...
@@ -23,13 +23,13 @@ Audio.loadSound = function(scene)
...
@@ -23,13 +23,13 @@ Audio.loadSound = function(scene)
scene
.
load
.
audio
(
'
Phase3
'
,
'
assets/sound/Phase3.ogg
'
);
scene
.
load
.
audio
(
'
Phase3
'
,
'
assets/sound/Phase3.ogg
'
);
// 승패 BGM
// 승패 BGM
scene
.
load
.
audio
(
'
victory
'
,
'
assets/sound/victory.ogg
'
);
scene
.
load
.
audio
(
'
defeat
'
,
'
assets/sound/victory.ogg
'
);
scene
.
load
.
audio
(
'
defeat
'
,
'
assets/sound/defeat.ogg
'
);
scene
.
load
.
audio
(
'
victory
'
,
'
assets/sound/defeat.ogg
'
);
}
}
Audio
.
playSound
=
function
(
scene
,
title
)
// 한 번만 재생할 때 사용
Audio
.
playSound
=
function
(
scene
,
title
)
// 한 번만 재생할 때 사용
{
{
bgm
=
scene
.
sound
.
add
(
title
);
bgm
=
scene
.
sound
.
add
(
title
);
// 추후 수정 예정
bgm
.
play
();
bgm
.
play
();
}
}
...
@@ -56,3 +56,4 @@ Audio.killSound = function(scene, title)
...
@@ -56,3 +56,4 @@ Audio.killSound = function(scene, title)
bgm
.
stop
();
bgm
.
stop
();
}
}
// 전반적으로 함수 수정 필요..
\ No newline at end of file
This diff is collapsed.
Click to expand it.
js/ScenesData.js
View file @
c1079d7e
...
@@ -661,8 +661,11 @@ var gameScene = new Phaser.Class(
...
@@ -661,8 +661,11 @@ var gameScene = new Phaser.Class(
ScenesData
.
changeScene
=
function
(
sceneKey
)
ScenesData
.
changeScene
=
function
(
sceneKey
)
{
{
Audio
.
killSound
(
ScenesData
.
menuScene
,
'
login
'
);
Audio
.
killSound
(
ScenesData
.
menuScene
,
'
login
'
);
Audio
.
killSound
(
ScenesData
.
gameScene
,
'
victory
'
);
Audio
.
killSound
(
ScenesData
.
currentScene
,
'
victory
'
);
Audio
.
killSound
(
ScenesData
.
gameScene
,
'
defeat
'
);
Audio
.
killSound
(
ScenesData
.
currentScene
,
'
defeat
'
);
// Audio.killSound(ScenesData.gameScene, 'victory');
// Audio.killSound(ScenesData.gameScene, 'defeat');
ScenesData
.
currentScene
.
scene
.
start
(
sceneKey
);
ScenesData
.
currentScene
.
scene
.
start
(
sceneKey
);
Input
.
input
=
[];
Input
.
input
=
[];
Input
.
converted
=
''
;
Input
.
converted
=
''
;
...
...
This diff is collapsed.
Click to expand it.
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