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

ㅇㅇ #46

Merged
merged 129 commits into from
May 24, 2024
Merged
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
76ec4ee
Delete Rhythm_game_Editor/Assets directory
yoens Apr 20, 2024
c8307e1
수정 테스트
yoens Apr 26, 2024
f463f29
Merge branch 'master' of https://github.com/yoens/capstone-2024-42
yoens Apr 26, 2024
c818e3b
editor 완료
yoens Apr 26, 2024
2c39360
8주차 개인별 보고서
yoens Apr 26, 2024
7c6d765
메인,캐릭터선택씬 구현
alsgur3480 Apr 26, 2024
5e4bcac
score, combo(수정필요) 추가/ 터치 드래그 추가
yoens Apr 29, 2024
37a41c4
Merge branch 'master' of https://github.com/yoens/capstone-2024-42
yoens Apr 29, 2024
8aae3ab
Merge pull request #18 from yoens/master
yoens Apr 29, 2024
82a9fd4
콤보기능 수정, 이펙트 구현
yoens May 1, 2024
51e0024
Merge pull request #19 from yoens/master
yoens May 1, 2024
5a5c316
씬 연결 필요
yoens May 1, 2024
63347b0
Merge pull request #20 from yoens/master
yoens May 1, 2024
724d648
Delete Assets directory
yoens May 1, 2024
79cc052
Delete Assets directory
yoens May 1, 2024
24b13de
상점 구현
alsgur3480 May 2, 2024
262a2f6
테스트
yoens May 3, 2024
9e2d7f2
Merge pull request #23 from yoens/master
alsgur3480 May 3, 2024
e229603
디자인 추가, 성공시 필요값 전달
yoens May 5, 2024
d25c7e7
Merge pull request #25 from yoens/master
yoens May 5, 2024
3e8c224
백엔드 - 유저 정보 초기화, 불러오기, 변경
ming0223 May 7, 2024
a7cb75a
상점 추가, 임시한글폰트적용
alsgur3480 May 8, 2024
493c70b
에디터 수정 완료
yoens May 10, 2024
457d9e3
인게임 디자인수정
yoens May 10, 2024
7b0483d
Merge pull request #26 from yoens/master
yoens May 10, 2024
824be86
Add files via upload
yoens May 10, 2024
cb66c6d
노트 에디터 드래그 수정기능 추가
yoens May 11, 2024
8714bb4
Merge pull request #27 from yoens/master
yoens May 11, 2024
73c7916
Main Scene 개선, 웹 사이트 이동 기능 추가
alsgur3480 May 12, 2024
3efb4ad
ui 일부 수정
alsgur3480 May 14, 2024
ea9e6ab
랭킹 씬 추가, 캐릭터 비율 조정, ui 수정
alsgur3480 May 15, 2024
6ae8403
.
yoens May 17, 2024
2b567a4
충돌 수정
yoens May 17, 2024
c51c4f5
Merge pull request #28 from yoens/master
yoens May 17, 2024
6818fd3
폰트 통일
yoens May 17, 2024
4f16d44
Merge pull request #29 from yoens/master
yoens May 17, 2024
c2acb9a
백엔드 Insert(초기화) 및 Load
ming0223 May 18, 2024
d8de2a9
ui 수정, 인게임 연동
alsgur3480 May 19, 2024
44bd3be
인게임 수정
yoens May 19, 2024
491c9d1
Revert "ui 수정, 인게임 연동"
alsgur3480 May 19, 2024
407a6ce
충돌 확인
yoens May 19, 2024
cc51ca2
충돌파일 무시
yoens May 19, 2024
6ad80df
ui 수정, 인게임 연동
alsgur3480 May 19, 2024
5b8b71d
Merge remote-tracking branch 'father/master'
yoens May 19, 2024
306636e
Merge pull request #30 from yoens/master
yoens May 19, 2024
bb91982
곡선택창 수정
alsgur3480 May 19, 2024
fbac020
충돌 확인
yoens May 19, 2024
b239e93
충돌 확인
yoens May 19, 2024
49a596f
노래선택 후 인게임 연결 완료
yoens May 19, 2024
852f70c
Merge pull request #31 from yoens/master
yoens May 19, 2024
57ad2e6
유저데이터 Insert 오류 해결
ming0223 May 20, 2024
4485902
readme제거
yoens May 20, 2024
820f87e
Merge pull request #32 from yoens/master
yoens May 20, 2024
27c8e52
폰트 병합
alsgur3480 May 20, 2024
b864681
충돌확인
alsgur3480 May 20, 2024
317d580
Merge pull request #33 from alsgur3480/master
alsgur3480 May 20, 2024
9403d3e
.
yoens May 20, 2024
b4560a9
Merge pull request #34 from yoens/master
yoens May 20, 2024
083d086
Update README.md
Sumi037 May 20, 2024
9f7f6fe
Update index.md
Sumi037 May 20, 2024
12aba5d
Update README.md
Sumi037 May 20, 2024
ea775b1
Update index.md
Sumi037 May 20, 2024
d5f3d35
Update README.md
Sumi037 May 20, 2024
17d96b2
케릭터 선택별 변화
yoens May 21, 2024
22af613
Merge remote-tracking branch 'father/master'
yoens May 21, 2024
dfda18f
Merge pull request #35 from yoens/master
yoens May 21, 2024
ad11997
Insert, Load 오류 수정 & Update 구현 완료
ming0223 May 21, 2024
10ed4c9
레벨 시스템 붙이기
ming0223 May 21, 2024
3b46359
스코어 서버 연결 확인
yoens May 21, 2024
0b4b07a
스코어 서버 연결 확인
yoens May 21, 2024
05c71fe
Merge pull request #36 from yoens/master
yoens May 21, 2024
aa8f015
ui 수정
alsgur3480 May 21, 2024
c9847e7
Merge pull request #37 from alsgur3480/master
alsgur3480 May 21, 2024
8fcd4a6
서버 연결 완료
yoens May 21, 2024
1c6aa8e
병합
yoens May 21, 2024
0672a91
Merge pull request #38 from yoens/master
yoens May 21, 2024
c2521e2
.
yoens May 21, 2024
b3a2cc0
Merge remote-tracking branch 'father/master'
yoens May 21, 2024
5b500ae
ui까지 연결
yoens May 21, 2024
31c3659
Merge pull request #39 from yoens/master
yoens May 21, 2024
ec66980
곡, 캐릭터 데이터 적용
alsgur3480 May 22, 2024
db28b56
Merge pull request #40 from alsgur3480/master
alsgur3480 May 22, 2024
da5c2e9
캐릭터/곡이미지 변화 완료,캐릭터 데이터 확인 필요
yoens May 22, 2024
bf895c5
Merge pull request #41 from yoens/master
yoens May 22, 2024
581ab24
옵션ui 수정, 유저 경험치 테이블 적용
alsgur3480 May 22, 2024
caa499e
Merge pull request #42 from alsgur3480/master
alsgur3480 May 22, 2024
1655402
코드 최적화 및 씬 구성 변경
ming0223 May 22, 2024
0f76221
ui 수정, 캐릭터 경험치 바 활성화
alsgur3480 May 22, 2024
29be9de
Merge pull request #43 from alsgur3480/master
alsgur3480 May 22, 2024
73511c0
Rank Load 추가
ming0223 May 23, 2024
b90080f
Rank 수정
ming0223 May 23, 2024
735ee80
ui및 기능 수정
alsgur3480 May 23, 2024
6b788d7
Revert "ui및 기능 수정"
alsgur3480 May 23, 2024
358897b
ui 에러 수정
alsgur3480 May 23, 2024
000cd92
Merge pull request #44 from alsgur3480/master
alsgur3480 May 23, 2024
b3019ad
Update README.md
Sumi037 May 23, 2024
421409d
Update README.md
Sumi037 May 23, 2024
4364f5f
Update README.md
Sumi037 May 23, 2024
1a34ef6
Update README.md
Sumi037 May 23, 2024
27c0bd5
Update README.md
Sumi037 May 23, 2024
b454e35
Update README.md
Sumi037 May 23, 2024
fec472e
Update README.md
Sumi037 May 23, 2024
cc75d9b
Update README.md
Sumi037 May 23, 2024
d9b19d9
Update README.md
Sumi037 May 23, 2024
7f235ec
Update index.md
Sumi037 May 23, 2024
7d1810e
Update README.md
Sumi037 May 23, 2024
0bd3ecd
Update README.md
Sumi037 May 23, 2024
9c67a27
Update index.md
Sumi037 May 23, 2024
e572298
Create text
yoens May 23, 2024
d93c8e9
Update README.md
Sumi037 May 23, 2024
2e59484
Update index.md
Sumi037 May 23, 2024
d0e52e8
Update README.md
Sumi037 May 23, 2024
bdd8ecf
Update index.md
Sumi037 May 23, 2024
8e1f1fa
Update README.md
Sumi037 May 23, 2024
c3d3dfe
Update index.md
Sumi037 May 23, 2024
bc81d8a
Update index.md
Sumi037 May 23, 2024
1b03c92
Update index.md
Sumi037 May 23, 2024
92b4b4d
Update README.md
Sumi037 May 23, 2024
2af1a82
Update index.md
Sumi037 May 23, 2024
4d50670
Update README.md
Sumi037 May 23, 2024
6a6a0b3
Update index.md
Sumi037 May 24, 2024
c5c9e9a
Update index.md
Sumi037 May 24, 2024
71e530f
Update README.md
Sumi037 May 24, 2024
fe19e8c
Update index.md
Sumi037 May 24, 2024
1b96f07
Update README.md
Sumi037 May 24, 2024
00bf241
Update index.md
Sumi037 May 24, 2024
06ca388
Update README.md
Sumi037 May 24, 2024
379ba4d
Update README.md
Sumi037 May 24, 2024
ca0dab2
Update index.md
Sumi037 May 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
*.csproj
*.sln
.vscode/
Library/
Logs/
UserSettings/
Packages/
ProjectSettings/
*.blob
*.so
*.json
*.x86_64
*.Data/
.utmp/
8 changes: 0 additions & 8 deletions Assets/Prefab.meta

This file was deleted.

103 changes: 0 additions & 103 deletions Assets/Prefab/Note.prefab

This file was deleted.

7 changes: 0 additions & 7 deletions Assets/Prefab/Note.prefab.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Scenes.meta

This file was deleted.

Loading