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

5월 8일까지 코드들 #22

Merged
merged 38 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
c04b81d
fix : gitignore 수정
dongcheolpark May 1, 2022
1dcdcf5
init : 프로젝트 생성
dongcheolpark May 1, 2022
ab64f6f
Merge pull request #4 from dongcheolpark/develop
Yeogiwon May 2, 2022
c3ddc4a
feature : 매니저 구조 생성
dongcheolpark May 2, 2022
0095795
feature : 싱글턴 클래스로 분리하고 매니저가 이를 상속받게 만들었습니다.
dongcheolpark May 2, 2022
8f62347
feature : 입력을 담당하는 클래스를 생성하였습니다.
dongcheolpark May 2, 2022
b2e7e08
Merge pull request #6 from dongcheolpark/develop
Yeogiwon May 2, 2022
6f35ad7
feature : 플레이어 추가
dongcheolpark May 4, 2022
a168fb7
feature : 이동 구현
dongcheolpark May 4, 2022
d08bb97
feature : IGameManagerObj에 주석을 추가했습니다
dongcheolpark May 4, 2022
0a2c0cf
bug : InputController가 빠르게 생성되지 않았던 버그를 수정하였습니다.
dongcheolpark May 4, 2022
b1791c4
Merge pull request #9 from dongcheolpark/develop
Yeogiwon May 4, 2022
20f6458
feature : 시야 시스템 추가 했습니다
dongcheolpark May 4, 2022
4097caa
feature : 시야 수정
dongcheolpark May 4, 2022
9089674
feature : 포스트프로세싱 추가
dongcheolpark May 4, 2022
a3c3d54
Merge pull request #11 from dongcheolpark/develop
Yeogiwon May 5, 2022
eb49a4f
feature : 상태머신 추가
dongcheolpark May 5, 2022
fe4d3bf
feature : 카메라 추가
dongcheolpark May 5, 2022
0d5897e
bug : 바닥에 있어도 속도가 주는 버그 해결
dongcheolpark May 5, 2022
ea08bd9
feature : Player 추격 Enemy AI
ch-0012 May 5, 2022
eedd650
Merge pull request #14 from dongcheolpark/SMB
Yeogiwon May 5, 2022
d1f3682
Merge pull request #16 from dongcheolpark/Cameras
Yeogiwon May 5, 2022
8b45fbb
Merge pull request #17 from ch-0012/develop
Yeogiwon May 5, 2022
f7e6559
feature : 상태머신 추가
dongcheolpark May 6, 2022
d7fb52e
Merge remote-tracking branch 'origin/develop' into develop
dongcheolpark May 6, 2022
ab4a3c2
UI 자동 바인딩, Resource Manager, Pool Manager
kjhcocomi May 6, 2022
05345d2
주석 수정, 클래스들 Blind namespace 안으로 이동
kjhcocomi May 6, 2022
37ebc83
주석 수정, 싱글톤 Init 삭제
kjhcocomi May 6, 2022
7e43510
feature : SMB 수정
dongcheolpark May 7, 2022
d7de8ae
feature : SMB 버그 수정
dongcheolpark May 7, 2022
2e6d328
bug : 여러단 점프 수정
dongcheolpark May 7, 2022
0dfc182
feature : enemy 프리팹 생성
dongcheolpark May 7, 2022
9d7fc1b
feature : 그림자 추가
dongcheolpark May 7, 2022
96021b1
Merge pull request #19 from kjhcocomi/develop
Yeogiwon May 7, 2022
e112886
feature : 그림자 변경
dongcheolpark May 7, 2022
46962f6
bug : 카메라 안따라가는 버그 수정
dongcheolpark May 7, 2022
689b61d
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind…
dongcheolpark May 7, 2022
03bd8eb
Merge pull request #20 from dongcheolpark/develop
Yeogiwon May 8, 2022
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
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Mm]emoryCaptures/
[Ll]ibrary/
[Tt]emp/
[Oo]bj/
[Bb]uild/
[Bb]uilds/
[Ll]ogs/
[Mm]emoryCaptures/

# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
Expand Down
13 changes: 13 additions & 0 deletions Project_Blind/.idea/.idea.Project_Blind/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Project_Blind/.idea/.idea.Project_Blind/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Project_Blind/.idea/.idea.Project_Blind/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Project_Blind/.idea/.idea.Project_Blind/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

55 changes: 55 additions & 0 deletions Project_Blind/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
}
}
6 changes: 6 additions & 0 deletions Project_Blind/.vsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Workload.ManagedGame"
]
}
3 changes: 3 additions & 0 deletions Project_Blind/Assets/Art.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Project_Blind/Assets/Art/Animations.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Project_Blind/Assets/Art/Animations/Animator.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Project_Blind/Assets/Art/Animations/Animator/Player.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading