#406,458 해결 #457
Merged
#406,458 해결 #457
Conversation
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
Removed useless blank lines
- Removed useless blank lines - Renamed (enemy_behitted -> enemy_damaged)
Removed useless blank lines
Removed conflict markers
Removed useless blank lines
- Removed duplicated action slow_sound and slowdown_sound enemy_explosion_sound - Line 459 was changed since enemy_behitted is no longer exists
# Conflicts: # data-files/highscore.json # gameFunctions.py # settingsMenu.py # sounds.py
This is useless file.
Fixed indentation error. This error makes every alien dead in one shot.
Taewan-P
added
bug
|
대충 근래에 누군가가 제거한 코드가 다시 등장한것 처럼 보입니다. 중간고사 기간이 끝나고 여유로울때 제대로 리뷰를 하겠습니다... |
|
charge shot을 바꿨고 start game과 stage clear 사운드가 같아서 start game을 바꿨습니다 |
|
낼 시험 보고 리뷰해드릴께요..ㅜ |
StillnessFate
added
the
modification needed
gameFunctions.py
Outdated
| @@ -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) | |||
There was a problem hiding this comment.
이 코드는 아래의 바로 아래(640행)의 코드와 중복되어 무효화되는 코드입니다.
아래의 코드는 6b37a7a 병합에서 추가되었습니다.
gameFunctions.py
Outdated
| @@ -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.
이 코드는 아래의 바로 아래(703행)의 코드와 중복되어 무효화되는 코드입니다.
아래의 코드는 6b37a7a 병합에서 추가되었습니다.
|
지적하셨던 부분의 코드들 삭제했습니다 |
StillnessFate
removed
the
modification needed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
전에 올린 pull request에 올렸지만 점수 반영이 안되 새로 pull request합니다. 전에 올린 거에 다 적용되어있습니다.