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

Jump to bottom

commit test #41

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

commit test #41

wants to merge 59 commits into from

Conversation

JongHyunJung
Copy link

No description provided.

ljh15952 and others added 30 commits November 11, 2021 04:13
@ljh15952
commit test
b3586cc
@viaunixue
commit test
6701a27
@ljh15952
Add plant x2 speed
2314a9a
@ljh15952
modify
9fc6499
@ljh15952
zombie x2 speed
6083193
@ljh15952
Complete x2 speed
9d75116
@viaunixue
mainmenu_image change
6ef3c0b
@viaunixue
menuRect change
faf5c45
@ljh15952
Test
4f489b6
@ljh15952
test
e15dc8f
h0 - 코드 상 오류 생길까봐 일단 0을 복사 붙여넣기했습니다.
acb2e25 
나머지는 마지막 좀비 출현 1초 후 추가적인 양동이좀비 웨이브를 간단하게 만들어봤습니다.
@ljh15952
Add Coment and set up show information at result panel
29162c0
@ljh15952
Add GameManager function
24f3f2c
@viaunixue
menu_img
033a4c7
@viaunixue
Merge branch 'master' of https://github.com/ljh15952/PythonPlantsVsZo…
6855edd 
…mbies into master
@viaunixue
GameStart_img Change
8f1c875
@viaunixue
Add Gameoff
e8f4cb0
@viaunixue
Add fullScreenMode
f5042e8
결과창 부분 패널화, 부모 클래스 속성 접근관련 논의 조금 필요해보입니다
230a64b
@nominsol
first commit
72efbde
@nominsol
추가한 효과음
db61861 
-게임시작버튼을 눌렀을 때
- 빛 에너지를 먹을 때
- 기본 배경음
- 식물이 공격하는 소리
- 좀비가 죽는 소리
- 잔디깎이가 나가는 소리
@ljh15952
check problem plzㅜㅜ
9e8ef78
@ljh15952
fix bug
991f771
@viaunixue
tool
935b28e
@viaunixue
Merge branch 'master' of https://github.com/ljh15952/PythonPlantsVsZo…
c93471e 
…mbies into master
@ljh15952
중화타이머
4dc1089
@ljh15952
Merge branch 'master' of https://github.com/ljh15952/PythonPlantsVsZo…
2982536 
…mbies
@ljh15952
승리 패배 분리
c906f6b
결과 창 수정
d304927
@nominsol
효과음 추가 및 수정
3c51fe8 
소리설정 이미지파일 추가 (아직 구현X)
ljh15952 and others added 29 commits December 3, 2021 06:44
@ljh15952
배속기능..
2bfabf1
@ljh15952
배속버튼
264392d
@viaunixue
Add MuteButton
bcaa921
@viaunixue
Merge branch 'master' of https://github.com/ljh15952/PythonPlantsVsZo…
7ba7170 
…mbies into master
결과창 수정 1203
fab1a74
@ljh15952
set text pos
1f1ab93
@ljh15952
공격소리
a687550
@ljh15952
공속증가 아이템
cded22f
삽 추가
3ba30a7
삽 든 상태에서 식물배치하지 못하게 수정
99684c4
@ljh15952
햇빛 아이템 만듬
c8d2d7e
@ljh15952
Add Image
998339a
@viaunixue
Complete Main UI
1205b22
@viaunixue
Merge branch 'master' of https://github.com/ljh15952/PythonPlantsVsZo…
2c3be7b 
…mbies into master
@viaunixue
Add Difficulty Config
c28f878
@ljh15952
사운드 버튼 해결
08071a0
@ljh15952
난이도 버튼
21246bc
@ljh15952
난이도별 스테이지 연결
a81877c
@ljh15952
메인화면 예외처리
bbe7d40
@nominsol
소리 추가 구현
c08107e 
-음소거 버튼 클릭시 모든 소리 음소거
-좀비 소리 죽을 때 소리가 2번나는 버그 수정
-좀비 머리가 떨어질 때 나는 소리 변경
@nominsol
소리 추가 구현
979ea1c
쉬움 난이도 추가, 어려움 난이도 수정
6e7d427
Merge branch 'master' of https://github.com/ljh15952/PythonPlantsVsZo…
4e2fd5f 
…mbies
@ljh15952
쉬운 난이도
612b082
@viaunixue
final merge
e1d2933
@viaunixue
Merge branch 'master' of https://github.com/ljh15952/PythonPlantsVsZo…
e3418d0 
…mbies into master
@viaunixue
Add merge
bd897e1
@viaunixue
Mainmenu Bugfix
38e6619
최종발표에 사용한 파일
3cb20ca
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JongHyunJung @ljh15952 @viaunixue @nominsol