Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d8b5cec
[Delete] 보스애니메이터 부분 수정으로 사용 안하므로 삭제 진행.
Geniards Nov 3, 2024
91edc8d
[Refactor] 보스의 애니메이션 적용에 대한 수정으로 변경
Geniards Nov 3, 2024
d71587e
ignore 내용 추가
karrk Nov 3, 2024
78ee9dd
[Feat] CSV 기능 연동, 임시 테스트용 노트 동작
karrk Nov 3, 2024
fc2463e
Merge branch 'Develop' of https://github.com/Geniards/Unity_Team_Proj…
karrk Nov 3, 2024
e0d34d7
[Add] 한번 로드된 데이터의 경우 다시 로드되지 않게 조건 처리
Geniards Nov 3, 2024
6d357ad
Update .gitignore
Geniards Nov 3, 2024
5ddb10c
[Delete] Test파일 및 프리펩 삭제진행.
Geniards Nov 3, 2024
a2034c6
[Create] 타입별 노트 프리펩 생성.
Geniards Nov 3, 2024
3d111ef
[Create] 몬스터 노트 애님 Script Objects 파일 스테이지 별 생성
Geniards Nov 3, 2024
268b0e2
[Create] 보스 애니메이션 제작
karrk Nov 3, 2024
1652874
[Create] 장애물 노트 애님 ScriptsObjectData파일 생성
Geniards Nov 3, 2024
9e2ee06
[Create] 점수노트 애님 ScriptsObject Data 생성.
Geniards Nov 3, 2024
7e5763a
프리펩 정리 및 개인 씬 정리 작업 실시.
Geniards Nov 3, 2024
f964fed
[Create] NoteMediator 프리펩 생성.
Geniards Nov 3, 2024
92bbac8
[Feat] 스테이지 음원 추가, 적용
karrk Nov 3, 2024
1169cb1
[Create] 노트의 애니메이터 교체 프리펩
Geniards Nov 3, 2024
5021756
파일 위치 변경.
Geniards Nov 3, 2024
17e91e1
[Create] 장애물 데이터 애님 ScriptsObject Data생성
Geniards Nov 3, 2024
9eb2070
[Delete] 파일 위치 변경으로 삭제
Geniards Nov 3, 2024
64d846e
[Refactor] 하단 점수노트 데이터 값변경
Geniards Nov 3, 2024
85452d7
주석정리
Geniards Nov 3, 2024
35636dd
[Refactor] 노트 프리펩 변수값 조정
Geniards Nov 3, 2024
46218d1
개인 씬 정리
Geniards Nov 3, 2024
97281f9
[Fix] 스테이지 씬 재시작시 노트 재등록
karrk Nov 3, 2024
b706b1d
Merge remote-tracking branch 'origin/JangDJ' into KangMS
karrk Nov 3, 2024
b0f4815
Merge pull request #54 from Geniards/KangMS
karrk Nov 3, 2024
a3b1bdf
[Fix] 컴파일 에러코드 수정
karrk Nov 3, 2024
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
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,21 @@ crashlytics-build.properties
/[Aa]ssets/[Ss]treamingAssets/aa/*
/Assets/Imports
/Assets/Imports.meta
Assets/Resources/BGMs/Stage/BOSS_2.wav
Assets/Resources/BGMs/Stage/BOSS_2.wav.meta
Assets/Resources/BGMs/Stage/BOSS_3.wav
Assets/Resources/BGMs/Stage/BOSS_3.wav.meta
Assets/Resources/BGMs/Stage/BOSS_4.wav
Assets/Resources/BGMs/Stage/BOSS_4.wav.meta
Assets/Resources/BGMs/Stage/BOSS_5.wav
Assets/Resources/BGMs/Stage/BOSS_5.wav.meta
Assets/Resources/BGMs/Stage/NORMAL_1.wav
Assets/Resources/BGMs/Stage/NORMAL_1.wav.meta
Assets/Resources/BGMs/Stage/NORMAL_2.wav
Assets/Resources/BGMs/Stage/NORMAL_2.wav.meta
Assets/Resources/BGMs/Stage/NORMAL_3.wav
Assets/Resources/BGMs/Stage/NORMAL_3.wav.meta
Assets/Resources/BGMs/Stage/NORMAL_4.wav
Assets/Resources/BGMs/Stage/NORMAL_4.wav.meta
Assets/Resources/BGMs/Stage/NORMAL_5.wav
Assets/Resources/BGMs/Stage/NORMAL_5.wav.meta
35 changes: 22 additions & 13 deletions Assets/03.PrivateFolder/JangDJ/JDJ_Boss/BOSS_1.controller
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f4a17148603f9984ba3c3379777f007b, type: 2}
m_Motion: {fileID: 7400000, guid: f7ec7003176a1ff449346af34bb1197f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down Expand Up @@ -78,9 +78,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0.125
m_TransitionOffset: 0
m_ExitTime: 0.7692308
m_ExitTime: 0.95
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
Expand Down Expand Up @@ -126,9 +126,9 @@ AnimatorStateTransition:
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.75
m_ExitTime: 1
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
Expand All @@ -142,7 +142,13 @@ AnimatorController:
m_PrefabAsset: {fileID: 0}
m_Name: BOSS_1
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorParameters:
- m_Name: Attack
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -177,7 +183,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 281db99f0943f31429e6dfe627d72bb7, type: 2}
m_Motion: {fileID: 7400000, guid: 8e3f0b0ea7596ec48a0c49716bdd0f2b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand All @@ -203,7 +209,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: ffeda490d30855941bf81cbdd11fd589, type: 2}
m_Motion: {fileID: 7400000, guid: 952dc9f9d09f0f84991ef3794d2eabd3, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand All @@ -216,17 +222,20 @@ AnimatorStateTransition:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: Attack
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -8113286240479566718}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.5
m_HasExitTime: 1
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand All @@ -252,7 +261,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 5ed71a0a09a57d74c8bef97c18c15ad9, type: 2}
m_Motion: {fileID: 7400000, guid: 5660c0cf6ab3e2240a285cdc27c225fe, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand All @@ -279,7 +288,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: c4f66411589aa2a41bda518e063c43e4, type: 2}
m_Motion: {fileID: 7400000, guid: 8c4cf99dc58e66c4b9d9fbe8116a00a6, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
Expand Down
Loading