Skip to content
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

#406,458 해결 #457

Merged
merged 29 commits into from
Jun 11, 2018
Merged

#406,458 해결 #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5972f3b
re
moonkihun Apr 14, 2018
506880d
406
moonkihun Apr 14, 2018
97409ab
적 피격
moonkihun Apr 14, 2018
fcaf399
피격음 추가
moonkihun Apr 14, 2018
4de712d
f
moonkihun Apr 15, 2018
ae9f25e
dmdkdk
moonkihun Apr 15, 2018
a950d34
dddd
moonkihun Apr 15, 2018
dfb5e96
Update speedMenu.py
Alpacadabra Apr 15, 2018
3f31c73
Update sounds.py
Alpacadabra Apr 15, 2018
6bd2582
Update settingsMenu.py
Alpacadabra Apr 15, 2018
b3ff9e1
Update highscore.json
Alpacadabra Apr 15, 2018
49ee237
Update alien.py
Alpacadabra Apr 15, 2018
97aa796
Update gameFunctions.py
Alpacadabra Apr 15, 2018
cf61082
효과음 변경
moonkihun Apr 15, 2018
e01ae18
ㅍ
moonkihun Apr 15, 2018
0e18106
Merge branch 'master' of github.com:moonkihun/Galtron
moonkihun Apr 15, 2018
898120c
ㅇㄴ
moonkihun Apr 15, 2018
56a81ab
nnnn
moonkihun Apr 15, 2018
153dff4
damaged
moonkihun Apr 15, 2018
a854338
Delete requirements.txt
Alpacadabra Apr 15, 2018
af98fe5
Update gameFunctions.py
Alpacadabra Apr 15, 2018
f85a50e
charge, ultimate, life 글씨 추가
SonMinWoo Apr 17, 2018
cd67954
덜덜
moonkihun Apr 18, 2018
1f0b8be
#406
moonkihun Apr 20, 2018
0ddaead
s
moonkihun Apr 20, 2018
ff77dac
a
moonkihun Apr 20, 2018
dbe312a
sound 변경
moonkihun Apr 20, 2018
6b37a7a
Merge branch 'master' into master
moonkihun Apr 25, 2018
33c30b6
Update gameFunctions.py
moonkihun Apr 26, 2018
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
6 changes: 5 additions & 1 deletion gameFunctions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,9 @@ def updateUltimateGauge(setting, screen, stats, sb):
pg.draw.rect(screen, (0, 255, 255), (x, y, gauge, 12), 0)
ultimatefont = pg.font.Font('Fonts/Square.ttf', 20)
ultimateStr = ultimatefont.render("Ultimate", True, (255, 255, 255), setting.bgColor)

ultimateStrpos = (x, y - 25)

screen.blit(ultimateStr, ultimateStrpos)


Expand Down Expand Up @@ -693,7 +695,9 @@ def drawChargeGauge(setting, screen, ship, sb):

chargefont = pg.font.Font('Fonts/Square.ttf', 20)
chargeStr = chargefont.render("Charge", True, (255, 255, 255), setting.bgColor)
chargeStrpos = (x, y + -25)

chargeStrpos = (x, y + 10)

screen.blit(chargeStr, chargeStrpos)


Expand Down
Binary file modified sound_effects/charge_shot.wav
View file
Open in desktop
Binary file not shown.
Binary file removed sound_effects/start_game.wav
View file
Open in desktop
Binary file not shown.
Binary file added sound_effects/start_games.wav
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions sounds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
select_menu = pg.mixer.Sound("sound_effects/select_menu.wav")
select_menu.set_volume(0.18)

start_game = pg.mixer.Sound("sound_effects/start_game.wav")
start_game.set_volume(0.3)
start_game = pg.mixer.Sound("sound_effects/start_games.wav")
start_game.set_volume(1.0)

attack = pg.mixer.Sound("sound_effects/attack.wav")
attack.set_volume(0.08)
Expand All @@ -37,7 +37,7 @@
enemy_shoot_sound.set_volume(0.15)

charge_shot = pg.mixer.Sound("sound_effects/charge_shot.wav")
charge_shot.set_volume(0.4)
charge_shot.set_volume(0.25)

stage_clear = pg.mixer.Sound("sound_effects/stage_clear.wav")
stage_clear.set_volume(0.7)
Expand Down