0.0.1 #59
Merged
0.0.1 #59
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
feature: 대쉬 구현
…into develop � Conflicts: � Project_Blind/UserSettings/EditorUserSettings.asset � Project_Blind/UserSettings/Layouts/default-2021.dwlt
캐릭터 움직임 수정
… into develop # Conflicts: # Project_Blind/Assets/Scenes/SampleScene.unity
… into develop # Conflicts: # Project_Blind/Assets/Scripts/Core/PoolManager.cs
김종현 Scene을 새로 만들어서 거기에 작업했습니다.
오브젝트 가까이 가면 UI 띄우기
feature : 파동 퍼지기 풀링 구현
… into develop # Conflicts: # Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset # Project_Blind/UserSettings/EditorUserSettings.asset # Project_Blind/UserSettings/Layouts/default-2021.dwlt
feature : Enemy 프리팹
… into develop # Conflicts: # Project_Blind/Assets/Scenes/김문웅.unity # Project_Blind/Assets/Scripts/Core/MonoBehaviour/EnemyCharacter.cs # Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset
# Conflicts: # Project_Blind/UserSettings/EditorUserSettings.asset # Project_Blind/UserSettings/Layouts/default-2021.dwlt
HP랑 UI 연동
feature : Enemy 프리팹
…into develop � Conflicts: � Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset � Project_Blind/UserSettings/Layouts/default-2021.dwlt
Hurt, Dead 애니메이션 작업
…into develop � Conflicts: � Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset � Project_Blind/UserSettings/EditorUserSettings.asset
kimmoonwoong
approved these changes
Jul 26, 2022
ch-0012
approved these changes
Jul 26, 2022
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.
빌드 테스트 겸 0.0.1 버전입니다.