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.

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
Show file tree
Hide file tree
Changes from 28 commits
Commits
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
8 changes: 8 additions & 0 deletions gameFunctions.py
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,11 @@ 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 + 12)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 코드는 아래의 바로 아래(640행)의 코드와 중복되어 무효화되는 코드입니다.
아래의 코드는 6b37a7a 병합에서 추가되었습니다.


ultimateStrpos = (x, y - 25)

screen.blit(ultimateStr, ultimateStrpos)


Expand Down Expand Up @@ -693,7 +697,11 @@ 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 + 10)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이 코드는 아래의 바로 아래(703행)의 코드와 중복되어 무효화되는 코드입니다.
아래의 코드는 6b37a7a 병합에서 추가되었습니다.


chargeStrpos = (x, y + -25)

screen.blit(chargeStr, chargeStrpos)


Expand Down
Binary file modified sound_effects/charge_shot.wav
Binary file not shown.
Binary file removed sound_effects/start_game.wav
Binary file not shown.
Binary file added sound_effects/start_games.wav
Binary file not shown.
6 changes: 3 additions & 3 deletions sounds.py
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