forked from mattboan/Galtron
-
Notifications
You must be signed in to change notification settings - Fork 47
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
#406,458 해결 #457
Changes from 28 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
5972f3b
re
moonkihun 506880d
406
moonkihun 97409ab
적 피격
moonkihun fcaf399
피격음 추가
moonkihun 4de712d
f
moonkihun ae9f25e
dmdkdk
moonkihun a950d34
dddd
moonkihun dfb5e96
Update speedMenu.py
Alpacadabra 3f31c73
Update sounds.py
Alpacadabra 6bd2582
Update settingsMenu.py
Alpacadabra b3ff9e1
Update highscore.json
Alpacadabra 49ee237
Update alien.py
Alpacadabra 97aa796
Update gameFunctions.py
Alpacadabra cf61082
효과음 변경
moonkihun e01ae18
ㅍ
moonkihun 0e18106
Merge branch 'master' of github.com:moonkihun/Galtron
moonkihun 898120c
ㅇㄴ
moonkihun 56a81ab
nnnn
moonkihun 153dff4
damaged
moonkihun a854338
Delete requirements.txt
Alpacadabra af98fe5
Update gameFunctions.py
Alpacadabra f85a50e
charge, ultimate, life 글씨 추가
SonMinWoo cd67954
덜덜
moonkihun 1f0b8be
#406
moonkihun 0ddaead
s
moonkihun ff77dac
a
moonkihun dbe312a
sound 변경
moonkihun 6b37a7a
Merge branch 'master' into master
moonkihun 33c30b6
Update gameFunctions.py
moonkihun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
|
||
ultimateStrpos = (x, y - 25) | ||
|
||
screen.blit(ultimateStr, ultimateStrpos) | ||
|
||
|
||
|
@@ -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) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 이 코드는 아래의 바로 아래(703행)의 코드와 중복되어 무효화되는 코드입니다. |
||
|
||
chargeStrpos = (x, y + -25) | ||
|
||
screen.blit(chargeStr, chargeStrpos) | ||
|
||
|
||
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이 코드는 아래의 바로 아래(640행)의 코드와 중복되어 무효화되는 코드입니다.
아래의 코드는 6b37a7a 병합에서 추가되었습니다.