Compare commits

...

303 Commits

Author SHA1 Message Date
728856e969 Merge pull request 'DEG-181-마무리-작업' (!73) from DEG-181-마무리-작업 into main
Reviewed-on: #73
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-15 08:11:59 +00:00
Sehyeon
ae9c12a109 DEG-181 [Fix] 추가 오류 해결 2025-05-15 16:41:50 +09:00
Sehyeon
72e3455eb9 DEG-181 [Fix] 디버그 로그 삭제 2025-05-15 16:13:31 +09:00
Sehyeon
280a591f3e DEG-181 [Fix] 체력 최대 8까지만 회복 가능 2025-05-15 16:06:31 +09:00
Sehyeon
4d0167f45b DEG-181 [Fix] 자잘한 버그 수정 2025-05-15 15:57:54 +09:00
Sehyeon
e7da3fb9fb DEG-181 [Style] 파일 정리 2025-05-15 14:33:59 +09:00
469523ac95 Merge pull request 'DEG-167-탈진-충돌-충돌' (!72) from DEG-167-탈진-연출-충돌-충돌 into main
Reviewed-on: #72
2025-05-15 04:37:42 +00:00
Parkillhwan
b1dd559bc0 DEG-167-탈진-충돌-충돌 2025-05-15 13:35:49 +09:00
Sehyeon
d3c3bed909 git conflict resolve 2025-05-15 13:03:00 +09:00
Sehyeon
545df9f6d7 DEG-179 [Fix] 스테이지 제한 2025-05-15 11:36:37 +09:00
cc804ae625 Merge pull request 'DEG-180 [feat] 튜토리얼 실행 제어' (!69) from DEG-180-튜토리얼-실행-제어 into main
Reviewed-on: #69
Reviewed-by: 99jamin <rhwk341@naver.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-15 02:29:43 +00:00
Lim0_C
9a74078b34 DEG-180 [feat] 튜토리얼 실행 제어 2025-05-15 11:12:27 +09:00
41e047be40 Merge pull request '[Fix] 돌발 이벤트 발생 패널 버그 수정 재작업' (!68) from DEG-178-돌발이벤트패널-재작 into main
Reviewed-on: #68
2025-05-15 01:31:16 +00:00
HaeinLEE
b976ed7c32 [Fix] 돌발 이벤트 발생 패널 버그 수정 2025-05-15 10:27:58 +09:00
19bf97bfb2 Merge pull request 'DEG-147 로딩연동' (!66) from DEG-147-로딩연동 into main
Reviewed-on: #66
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-15 00:15:21 +00:00
64136ee9ce Merge pull request 'DEG-170 [Feat] 연출 연동' (!65) from DEG-170-연출-연동 into main
Reviewed-on: #65
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-15 00:06:42 +00:00
Lim0_C
5267938a08 DEG-147 로딩연동 2025-05-15 09:04:20 +09:00
b3b4361f64 Merge pull request 'DEG-165-세이브-강화-버그수정' (!64) from DEG-165-세이브-강화-버그수정 into main
Reviewed-on: #64
Reviewed-by: heain0122 <heain0122@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-15 00:02:32 +00:00
Sehyeon
cd36d81984 DEG-170 [Feat] 연출 연동 2025-05-15 01:15:05 +09:00
99jamin
019d013fed DEG-165[Fix] 던전 씬 수정 2025-05-15 00:37:52 +09:00
99jamin
acb756880d DEG-165[Fix] 스크립트 적용 2025-05-15 00:31:56 +09:00
Jay
7becedc9d5 [HOTFIX] 야근 시 다음 날 넘기도록 수정 2025-05-14 18:08:23 +09:00
jay
6403dc74e9 Merge pull request 'DEG-168 [FEAT] 돌발이벤트 후 강제숙면, 생활 능력치 업그레이드' (!61) from DEG-168-돌발이벤트-후-강제숙면-생활-능력치-업그레이드 into main
Reviewed-on: #61
Reviewed-by: 99jamin <rhwk341@naver.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-14 09:06:39 +00:00
Jay
2e434f5641 DEG-168 [FIX] 피드백 수정 2025-05-14 18:03:54 +09:00
Jay
a154bba994 DEG-168 [FIX] 피드백 수정 2025-05-14 18:00:48 +09:00
e9c9e5a8d7 Merge pull request '[fix] 마법사 이동속도 조정' (!62) from DEG-62-마법사몬스터밸런스조정 into main
Reviewed-on: #62
2025-05-14 08:41:56 +00:00
Jay
9b134425a5 DEG-168 [FIX] 피드백 수정 2025-05-14 17:36:33 +09:00
f97c1f9972 [fix] 마법사 이동속도 조정
- 최대 이동 속도 20-> 16으로 조정

DEG-62
2025-05-14 17:32:45 +09:00
Jay
418d22062c DEG-168 [MERGE] 충돌 파일 main걸로 병합 2025-05-14 17:31:16 +09:00
Jay
174a805812 DEG-168 [MERGE] 충돌 파일만 merge 2025-05-14 17:29:11 +09:00
Jay
c3ade04d2d DEG-168 [FEAT] 돌발이벤트 후 강제숙면, 생활 능력치 업그레이드 2025-05-14 17:23:33 +09:00
c52d8f2c80 Merge pull request 'DEG-174-클리어-성공-실패-패널-경고-수정' (!60) from DEG-174-클리어-성공-실패-패널-경고-수정 into main
Reviewed-on: #60
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: heain0122 <heain0122@gmail.com>
2025-05-14 07:59:56 +00:00
03a7ff4d6a Merge pull request 'DEG-173-돌발-패널-말풍선-오류' (!59) from DEG-173-돌발-패널-말풍선-오류 into main
Reviewed-on: #59
Reviewed-by: 99jamin <rhwk341@naver.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-14 07:44:29 +00:00
Lim0_C
1bd50ea21d DEG-174 업그레이드 호출 위치 수정 2025-05-14 16:43:55 +09:00
94a25882ed Merge pull request 'DEG-172-일상UI-색상변경-던전UI-눌림표시' (!58) from DEG-172-일상UI-색상변경-던전UI-눌림표시 into main
Reviewed-on: #58
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: 99jamin <rhwk341@naver.com>
2025-05-14 07:43:39 +00:00
Lim0_C
75a5d715eb DEG-174 클리어 성공 실패 패널 경고 수정 2025-05-14 16:37:03 +09:00
Sehyeon
0fe2c03e9c DEG-173 [Fix] 회식 체력 증가 수치 조정 2025-05-14 16:24:55 +09:00
HaeinLEE
6c7eb7ef36 [Fix] 중복 로직 삭제 2025-05-14 16:21:20 +09:00
HaeinLEE
5d7113ba1f [Remove] 테스트 코드 삭제
씬 전환시 로딩 애니메이션 테스트용 코드 삭제
2025-05-14 16:16:27 +09:00
HaeinLEE
ffb5cec6b4 [Feat] 키보드로 대시, 어택 시 화면 터치처럼 보이는 기능 2025-05-14 16:14:50 +09:00
Sehyeon
5f62e48584 DEG-173 [Fix] 돌발 패널시 말풍선 출력 오류 해결 2025-05-14 16:07:28 +09:00
a7437c8f74 Merge pull request 'DEG-153 [Feat] 시작 연동' (!57) from DEG-153-메인화면-시작-연결-추가 into main
Reviewed-on: #57
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
2025-05-14 06:45:45 +00:00
Lim0_C
7c274b6f85 DEG-153 [Feat] 시작 연동 2025-05-14 15:33:07 +09:00
97db3baa80 Merge pull request 'DEG-166-NPC-대사-추가' (!54) from DEG-166-NPC-대사-추가 into main
Reviewed-on: #54
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: 99jamin <rhwk341@naver.com>
2025-05-14 05:53:42 +00:00
b63088203c Merge pull request '[fix] 마법사 몬스터 밸런스 조정' (!53) from DEG-62-몬스터밸런스 into main
Reviewed-on: #53
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-14 05:47:11 +00:00
Sehyeon
76799a9476 DEG-166 [ADD] 다이렉트 대화 시작 추가 2025-05-14 14:34:15 +09:00
Sehyeon
c0e6264355 DEG-166 [Fix] null 오류 체크 2025-05-14 14:26:41 +09:00
cb6f35d45f [fix] 장판 마법이 너무 높은 곳에 위치하던 버그 수정
- 장판 마법 위치 바닥으로 조정
- 슬로우 디버프 적용 안되던 이슈 수정
2025-05-14 11:59:46 +09:00
Sehyeon
2dd70dff2b DEG-169 [Feat] 같은 스테이지 시도 초과 엔딩 2025-05-14 11:48:58 +09:00
b1650b48be Merge pull request 'DEG-162 [Fix] 충돌과 감지 영역 조정' (!52) from DEG-162-충돌과-감지-영역-분리 into main
Reviewed-on: #52
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-14 02:39:09 +00:00
0b4cc72996 [fix] 도망치는 몬스터의 발버둥이 더 자주 발생토록 수정
DEG-62
2025-05-14 11:26:36 +09:00
Sehyeon
f9f964a189 DEG-162 [Fix] 충돌과 감지 영역 조정 2025-05-14 11:16:18 +09:00
Sehyeon
e68e729228 DEG-166 [Feat] 대화문 추가 2025-05-14 11:08:02 +09:00
b0ca516778 Merge pull request '[Feat] switching 로딩패널에 애니메이션 추가' (!51) from DEG-164-로딩패널-애니메이션-재작업 into main
Reviewed-on: #51
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
2025-05-14 01:43:37 +00:00
bb480fa452 Merge pull request 'DEG-165 세이브,강화 병합' (!50) from DEG-165-세이브-강화-폴리싱 into main
Reviewed-on: #50
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-14 01:42:30 +00:00
24e29ba37e [fix] 마법사 몬스터 최대 이동 속도 5-> 20 변경
- navAgent로 서서히 가속됨

DEG-62
2025-05-14 10:38:20 +09:00
99jamin
56ee17db2f DEG-165 [Fix] 세이브 강제 변환 예외 처리 수정 2025-05-14 01:36:24 +09:00
99jamin
a61e3c4d09 DEG-165 예외처리 및 버그 수정 2025-05-14 01:20:54 +09:00
99jamin
d8a4e6c28b DEG-165-[FIX] 업그레이드 매니저 적용 2025-05-13 22:45:36 +09:00
99jamin
4a1404e212 DEG-165 [Fix] 이전 브랜치 병합 요소 적용 2025-05-13 22:41:47 +09:00
HaeinLEE
7fa848a063 [Feat] switching 로딩패널에 애니메이션 추가 2025-05-13 17:35:54 +09:00
77c798f9ad Merge pull request 'DEG-62 몬스터 폴리싱' (!48) from DEG-62 into main
Reviewed-on: #48
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-13 08:18:33 +00:00
Sehyeon
55533e6571 git conflict resolve 2025-05-13 17:11:13 +09:00
ae7a08a205 Merge pull request 'DEG-161 [Fix] 충돌 영역과 말풍선 위치 조정' (!49) from DEG-161-충돌-영역-및-UI-위치-조정 into main
Reviewed-on: #49
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-13 07:42:35 +00:00
00fee9d6a2 [fix] 피격 범위 개선
- 레이 캐스트에서 구형 캐스트로 변경함

DEG-62
2025-05-13 16:40:04 +09:00
Sehyeon
6f3685fc8a DEG-161 [Fix] 충돌 영역과 말풍선 위치 조정 2025-05-13 16:23:37 +09:00
HaeinLEE
2e1b96baf0 [Fix] 지난 작업 내역 공용 프리팹에 업데이트 2025-05-13 16:12:22 +09:00
0a2c2a6cb8 Merge pull request 'DEG-158 [Fix] 컷씬 애니메이션 기움 현상 고침' (!45) from DEG-158-컷씬-애니메이션-기움-현상-수정 into main
Reviewed-on: #45
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-13 06:19:38 +00:00
Sehyeon
5b6414274d DEG-152 [Feat] 행동 체크와 말풍선 수정 2025-05-13 15:04:37 +09:00
Lim0_C
bf17dfd164 DEG-158 [Fix] 컷씬 애니메이션 기움 현상 고침 2025-05-13 15:03:31 +09:00
396f625ac8 [fix] 마법사 매직미사일 발사 위치 조정
- 하단으로 조정하여 플레이어 머리 위로 날아가지 않도록 조정

DEG-62
2025-05-13 13:44:50 +09:00
0efe56ad42 [fix] 장판 마법 캐스팅 애니메이션 타이밍 조정
DEG-62
2025-05-13 13:36:50 +09:00
jay
d4cdc1ef43 Merge pull request 'DEG-157 [HOTFIX] 누락 데미지 로직 추가' (!44) from DEG-157-공격-시-데미지-누락-추가 into main
Reviewed-on: #44
2025-05-13 04:24:33 +00:00
Jay
a61a79ff71 DEG-157 [HOTFIX] 누락 데미지 로직 추가 2025-05-13 13:23:23 +09:00
jay
940d967b4f Merge pull request 'DEG-151-플레이어-공격-되다가-안되는-이슈-공격속도-강화를-위해-수정-필요' (!43) from DEG-151-플레이어-공격-되다가-안되는-이슈-공격속도-강화를-위해-수정-필요 into main
Reviewed-on: #43
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: 99jamin <rhwk341@naver.com>
2025-05-13 04:13:41 +00:00
Jay
0b2b8045ab DEG-151 [FEAT] 더이상 사용하지 않는 애니메이션 이벤트 삭제 2025-05-13 11:44:21 +09:00
Jay
0f84310d90 DEG-151 [FEAT] 공격 방식 변경 2025-05-13 11:42:41 +09:00
fa1bf29ae8 [fix] 마법사 스펠 애니메이션, SFX 타이밍 조정 2025-05-13 11:15:10 +09:00
f2a1834589 Merge pull request '[fix] 팔라딘 몬스터 수직 베기 범위 오류 수정' (!41) from DEG-150-보스몹-공격범위-버그 into main
Reviewed-on: #41
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-13 01:57:15 +00:00
2e1f3ccf7e [fix] 몬스터 씬 포인터 업데이트
- 실제 변경 사항은 없으나 파일 포인터 갱신됨

DEG-150
2025-05-13 10:56:05 +09:00
fc2f18d9cb [fix] 마법사 몬스터 매직 미사일이 너무 높아 플레이어를 감지하지 못하는 이슈
- 매직미사일 발사 높이 조정
- 매직미사일 플레이어 감지 물리 연산으로 변경

JIRA ISSUE DEG-150
2025-05-13 10:50:47 +09:00
456cc8dafb Merge pull request 'DEG-156 [Fix] 던전씬 버튼 재연동' (!42) from DEG-156-던전씬-버튼-재연동 into main
Reviewed-on: #42
2025-05-13 01:45:02 +00:00
Lim0_C
bf5dc6709f DEG-156 [Fix] 던전씬 버튼 재연동 2025-05-13 10:43:35 +09:00
Sehyeon
d74872d7a1 DEG-152 [Feat] 소품 충돌처리 2025-05-13 10:26:41 +09:00
Lim0_C
6b3996537d Revert "Merge branch 'DEG-146-실내-맵-스카이박스-카메라-조정'"
Canvas.Prefab만 돌려놓기
2025-05-13 10:26:04 +09:00
Lim0_C
d7c62b6cfb Merge branch 'DEG-146-실내-맵-스카이박스-카메라-조정' 2025-05-13 10:18:37 +09:00
6938b246dc [fix] 팔라딘 몬스터 수직 베기 범위 오류 수정
- 보여지는 공격 전조보다 실제 범위가 2배 큰 문제 수정
2025-05-13 09:57:49 +09:00
Lim0_C
b72b99833a DEG-146 [Feat] 실내 맵 폴리싱 작업
- 집 주변 바닥 설치(텍스처 추가)
- 글로벌 볼륨 조정(포스트프로세싱)
- 카메라 위치 조정
- 던전 씬 중지 버튼 연동
2025-05-13 09:45:57 +09:00
Sehyeon
f666ea85ac git conflict resolve 2025-05-13 09:30:56 +09:00
55993df843 Merge pull request 'DEG-144-체력0탈진-연출-추가이전에 로딩패널 구현' (!39) from DEG-144-체력0탈진-연출-추가 into main
Reviewed-on: #39
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
2025-05-12 14:56:55 +00:00
HaeinLEE
b2d0c3b0bb [Remove] 필요없는 변수 삭제 2025-05-12 21:52:19 +09:00
07e974482e Merge pull request 'DEG-145-세탁기 UI 이미지 찌그러지는문제 해결' (!38) from DEG-145-세탁기UI뭉개짐 into main
Reviewed-on: #38
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-12 08:35:08 +00:00
HaeinLEE
e2cf947531 [Style] 테스트용 주석 추가 2025-05-12 17:19:44 +09:00
57f2ee9c69 [fix] 애니메이션 클립 변경사항 누락 수정
- lfs 이슈 해결
2025-05-12 17:14:32 +09:00
HaeinLEE
b482e40e3a [Feat] 씬전환 로딩 패널 구현 2025-05-12 17:12:58 +09:00
aac6fb33bc [fix] 세탁기 UI 이미지 찌그러지는 문제 해결
- 애니메이션 클립에서 사이즈 조절

Work in JIRA ISSUE DEG-145
2025-05-12 16:50:12 +09:00
Sehyeon
82a36ac03d DEG-137 [Fix] 출근 시간에 던전 갈 수 있도록 수정 2025-05-12 16:36:00 +09:00
Sehyeon
5041233ba7 DEG-137 [Feat] 말풍선 최종 2025-05-12 16:34:27 +09:00
jay
bac6ec5f34 Merge pull request 'DEG-148 [FEAT] 공격 대시 버튼 연동 및 카메라 수정' (!36) from DEG-148-공격-대시-버튼-연동-및-카메라-수정 into main
Reviewed-on: #36
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-12 06:40:55 +00:00
Jay
791e4b901c DEG-148 [FEAT] 공격 대시 버튼 연동 및 카메라 수정 2025-05-12 15:31:43 +09:00
Lim0_C
27598b1f82 [HOTFIX] 씬 요소 프리팹화 2025-05-12 15:18:19 +09:00
e4bfba9780 Merge pull request 'DEG-140 [feat] 일시정지 기능 추가' (!34) from DEG-140-게임-일시정지 into main
Reviewed-on: #34
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-12 06:12:04 +00:00
Lim0_C
7823d44746 DEG-140 [Fix] 씬 제외 및 코드 복구 2025-05-12 15:10:49 +09:00
Lim0_C
a946eed728 Revert "DEG-140 [feat] 일시정지 기능 추가"
This reverts commit fe521317c1c5533137a571ce717fa2e504286296.
2025-05-12 15:06:55 +09:00
Lim0_C
5f8080ff9c DEG-140 [Feat] 진짜 일시정지 기능 추가 2025-05-12 15:05:57 +09:00
Lim0_C
8b1b1c1a15 DEG-140 [feat] 일시정지 기능 추가 2025-05-12 15:03:42 +09:00
b09110f8c1 Merge pull request 'DEG-56-몬스터-SFX-추가-작업' (!35) from DEG-56-몬스터-SFX-추가-작업 into main
Reviewed-on: #35
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-12 05:56:02 +00:00
Sehyeon
e01987c1d8 DEG-137 [Feat] 출근 수정 2025-05-12 14:49:57 +09:00
34f63352e2 [feat] 마법사 몬스터 SFX 추가
Work in JIRA ISSUE DEG-56
2025-05-12 14:44:11 +09:00
7ed35864cb [feat] 팔라딘 SFX 추가
- 폭탄 던지는 소리
- 칼 휘두르는 소리 재생 추가
2025-05-12 14:33:50 +09:00
Lim0_C
47d19aa428 DEG-140 [fix] 불필요한 코드 삭제 2025-05-12 14:23:47 +09:00
33e356f678 [fix] 지면 높이에 상관 없이 타겟의 pos를 추적하여 장판 생성
- 장판 y 포지션 동적 할당
- 몬스터 SFX 할당 위치 추가
2025-05-12 14:23:23 +09:00
Lim0_C
fe521317c1 DEG-140 [feat] 일시정지 기능 추가 2025-05-12 14:09:45 +09:00
HaeinLEE
cd6f53e580 [Fix] 돌발이벤트 씬 저장항목 누락 2025-05-12 13:44:00 +09:00
6ed9548735 Merge pull request 'DEG-139-던전-수정' (!33) from DEG-139-던전-수정 into main
Reviewed-on: #33
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-12 04:11:27 +00:00
ab99c57847 Merge pull request 'DEG-56- VFX 추가' (!32) from DEG-56 into main
Reviewed-on: #32
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-12 04:09:40 +00:00
Parkillhwan
35fdb77717 DEG-139-던전-수정-프리팹-정리-CONVEX-최적화 2025-05-12 13:00:09 +09:00
ff455a3885 [feat] 시바 몬스터 아우라 추가, 몬스터 테스트 씬 수정
- 몬스터 테스트 씬에서 사용하지 않는 오브젝트 제거
- 마법사 몬스터에서 사용되지 않는 객체 제거

Work in JIRA ISSUE DEG-56
2025-05-12 11:39:05 +09:00
81336b02ec [feat] 마법사 몬스터 아우라 추가
- 보라색 스파크 아우라 추가
2025-05-12 11:22:25 +09:00
0215ca6c2d [feat] 캐스터 몬스터 이펙트 추가
- 텔레포트 이펙트 추가
- 넉백 이펙트 추가
- 매직 미사일 머테리얼과 이펙트 추가

Work in JIRA ISSUE DEG-56
2025-05-12 11:15:41 +09:00
Parkillhwan
21f6739a54 DEG-139-던전맵-수정 2025-05-12 11:04:31 +09:00
jay
f0e895bf31 Merge pull request 'DEG-142 [FIX] 플레이어 데미지 오류 수정' (!28) from DEG-142-던전맵-플레이어-데미지-오류-수정 into main
Reviewed-on: #28
2025-05-12 00:55:51 +00:00
Jay
bbce1cf8f3 DEG-142 [FIX] 플레이어 데미지 오류 수정 2025-05-12 09:54:34 +09:00
89817f95a1 Merge pull request 'DEG-134-탈진숙면-돌발이벤트-연출' (!27) from DEG-134-탈진숙면-돌발이벤트-연출 into main
Reviewed-on: #27
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-12 00:37:42 +00:00
HaeinLEE
83dd8c6f94 [Fix] 충돌 스크립트 메인에서 가져옴 2025-05-12 09:37:06 +09:00
cec64dd203 Merge pull request 'DEG-136-ui-관련-프리팹-최적화' (!25) from DEG-136-ui-관련-프리팹-최적화 into main
Reviewed-on: #25
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-12 00:30:27 +00:00
HaeinLEE
fcecd38c3f [Remove] 필요 없는 헤더 삭제 2025-05-12 09:24:19 +09:00
Lim0_C
9d163fe992 DEG-136 [Feat] 사운드 설정 저장 및 불러오기 추가 2025-05-12 09:22:01 +09:00
HaeinLEE
4a8e62c8be [Test] 테스트용 주석 삭제 2025-05-12 09:21:32 +09:00
jay
21c2f14ca8 Merge pull request 'DEG-138 [FIX] 대시 일상에서 막기 및 카메라 shake 수정' (!26) from DEG-138-대시-일상에서-막기-카메라-shake-수정 into main
Reviewed-on: #26
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-12 00:14:19 +00:00
HaeinLEE
c17ec2c0a9 [Feat] 돌발 이벤트 사운드 추가 그리고 리팩토링 2025-05-10 02:40:09 +09:00
HaeinLEE
4ae48da950 [Feat] 돌발 이벤트 컷씬 추가 2025-05-10 01:44:58 +09:00
Jay
8e603ad9a4 DEG-138 [FIX] 대시 일상에서 막기 및 카메라 shake 수정 2025-05-09 18:28:25 +09:00
Lim0_C
32a442ea20 DEG-136 [fix[ pause버튼 행동 수정
퍼즈버튼 클릭 시 메뉴 패널을 띄우게 수정
2025-05-09 17:42:34 +09:00
Lim0_C
9615a2d84c DEG-136 [fix] 패널 뒤로 클릭 되는 버그 수정
raycast tartget 속성을 꺼서 뒤에 있는 버튼 등이 눌리는 현상이 있어 이를 방지하기 위해 다시 속성 활성화
2025-05-09 17:39:04 +09:00
Lim0_C
0e206aa885 DEG-136 [fix] 던전 하우징 패널 프리팹 수정
퍼즈버튼 스크립트 추가 todo 작성
2025-05-09 17:15:25 +09:00
Lim0_C
6de9aee53b DEG-136 [Fix] 불필요한 Raycast target 속성 비활성화 2025-05-09 16:41:18 +09:00
51c2545e35 Merge pull request 'DEG-133-맵-통합-작업' (!24) from DEG-133-맵-통합-작업 into main
Reviewed-on: #24
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-09 07:07:57 +00:00
Sehyeon
2d71a980cf DEG-133 [Fix] 기타 버그 수정 2025-05-09 15:40:53 +09:00
Sehyeon
d6514980de DEG-133 [Fix] 이펙트 매니저 추가 2025-05-09 14:57:01 +09:00
Sehyeon
4309c2851e DEG-133 [Feat] 맵 통합 2025-05-09 14:54:01 +09:00
158bc23728 Merge pull request 'DEG-135-최적화-정리' (!23) from DEG-135-최적화-정리 into main
Reviewed-on: #23
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-09 05:18:06 +00:00
Parkillhwan
4b30806133 DEG-135-최적화-정리 2025-05-09 14:02:48 +09:00
jay
7d51909f0c Merge pull request 'DEG-61-플레이어-이펙트-추가' (!20) from DEG-61-플레이어-이펙트-추가 into main
Reviewed-on: #20
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-09 04:04:18 +00:00
2abf00bb73 Merge pull request 'DEG-130-기타-ui-구현' (!19) from DEG-130-기타-ui-구현 into main
Reviewed-on: #19
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-09 04:03:33 +00:00
Sehyeon
e58e0df8e9 git conflict reslove 2025-05-09 11:42:05 +09:00
Jay
1fbf27a398 DEG-61 [STYLE] 안쓰는 변수 삭제 2025-05-08 18:11:54 +09:00
Jay
0de874ec6b DEG-61 [FEAT] 애니메이션 이벤트 타이밍 수정 2025-05-08 18:10:04 +09:00
Jay
0b94f75ec0 DEG-61 [DELETE] 안쓰는 플레이어 에셋 항목 삭제 2025-05-08 17:50:39 +09:00
Sehyeon
f0d7d621e0 DEG-68 [Feat] 오디오 추가 2025-05-08 17:48:30 +09:00
Jay
c9dd131015 DEG-61 [DELETE] 안쓰는 에셋 항목 삭제 2025-05-08 17:42:56 +09:00
Lim0_C
53f3853d74 DEG-130 [fix] OnClickStartButton 코드 수정 2025-05-08 17:29:43 +09:00
Jay
180220a98d DEG-61 [FEAT] 플레이어 이펙트 추가 2025-05-08 17:28:44 +09:00
Lim0_C
2b84d1fd2f DEG-130 [Feat] 메뉴 패널, 패널 매니저 추가 및 리팩토링 2025-05-08 17:10:30 +09:00
Fiore
f80e4e2016 [HOTFIX] 병합 과정에서 누락된 데이터 복원
Work in JIRA ISSUE DEG-100
2025-05-08 16:21:18 +09:00
Jay
b05ee73207 DEG-61 [FEAT] 플레이어 win, dead 추가 2025-05-08 15:53:28 +09:00
6321606597 Merge pull request 'DEG-112-던전맵-제작' (!17) from DEG-112-던전맵-제작 into main
Reviewed-on: #17
Reviewed-by: heain0122 <heain0122@gmail.com>
Reviewed-by: FioreFlower <cjsdlf44@gmail.com>
2025-05-08 06:48:27 +00:00
91383841fa Merge branch 'main' into DEG-112-던전맵-제작 2025-05-08 04:21:55 +00:00
Parkillhwan
4b5a3a25a4 DEG-112-던전맵-제작 2025-05-07 23:59:31 +09:00
d5df426b8f Merge pull request 'DEG-100 원거리 마법사 보스 개발' (!16) from DEG-100-원거리-마법사-보스-몬스터-개발-단계-3 into main
Reviewed-on: #16
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
2025-05-07 08:07:18 +00:00
885e637119 Merge pull request 'DEG-77-튜토리얼-구현' (!14) from DEG-77-튜토리얼-구현 into main
Reviewed-on: #14
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
2025-05-07 08:06:38 +00:00
HaeinLEE
f0e7096ca4 [Remove] 필요없는 파일 삭제 2025-05-07 17:03:43 +09:00
Sehyeon
a0d7279381 Merge branch 'main' into DEG-68-연출-사운드-추가 2025-05-07 16:23:05 +09:00
Sehyeon
cbcf4f8ac6 DEG-68 [Feat] 사운드 추가 2025-05-07 16:22:12 +09:00
Fiore
2b0502775c [refact] 변수 정리 및 가독성 정리
- 안쓰는 유징문 제거
- 넉백과 슬로우 이펙트 프리팹 분리
- 데미지 이펙트 캐싱처리
- 패턴 실행 유틸리티 합침

Work in JIRA ISSUE DEG-100
2025-05-07 15:41:14 +09:00
3151e17899 Merge pull request 'DEG-126-상호작용-로딩ui-애니메이션-작업' (!15) from DEG-126-상호작용-로딩ui-애니메이션-작업 into main
Reviewed-on: #15
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: heain0122 <heain0122@gmail.com>
2025-05-07 06:23:06 +00:00
Fiore
64bccf2a3b 불필요한 공백 제거
Work in JIRA ISSUE DEG-100
2025-05-07 14:59:37 +09:00
Lim0_C
d73dbd3a64 DEG-126 [fix] Housework용어 수정 2025-05-07 14:57:44 +09:00
Lim0_C
32529f84f6 Merge branch 'main' into DEG-126-상호작용-로딩ui-애니메이션-작업 2025-05-07 14:49:01 +09:00
Lim0_C
ce25bcb2ff DEG-126 [Feat] 침대 상호작용 컷신 추가 2025-05-07 14:48:18 +09:00
Fiore
b9a014df88 [refact] 도망 로직 개선, 코루틴 최적화
- 몬스터가 텔레포트로 도망칠 위치를 에디터에서 수정할 수 있도록 개선
- 플레이어와 거리 계산 최적화
- 코루틴에서 사용하는 WaitForSecond 객체 캐싱 유틸 추가

Work in JIRA ISSUE #DEG-100
2025-05-07 14:27:29 +09:00
HaeinLEE
5daf8c4577 Merge branch 'main' into DEG-77-튜토리얼-구현
# Conflicts:
#	Assets/LIN/Scripts/DailyRoutine/InteractionController.cs
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Cartoon_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Foley & Impact_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/GUN_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Magic_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Open & Close_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Sci-Fi_SpaceShip_Signal_Preview.mp3
#	Assets/StoreAssets/Cartoon Game Sound 2.0/JBoB Sound Pack Demo/Whoosh_Cinematic_Preview.mp3
#	Assets/StoreAssets/RPG Tiny Hero Duo/Prefab/MaleCharacterPBR.prefab
#	Assets/UnityTechnologies/Basic Asset Pack Interior/Materials/Grey.mat
2025-05-07 13:59:43 +09:00
HaeinLEE
5d17b2ba60 main pull 2025-05-07 13:47:30 +09:00
jay
cbfd6ea865 Merge pull request 'DEG-25-강화-기초-로직-구현' (!10) from DEG-25-강화-기초-로직-구현 into main
Reviewed-on: #10
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-07 04:38:26 +00:00
jay
26b0de9ab6 Merge pull request 'DEG-125 [FEAT] 플레이어 공격, 피격 애니메이션 및 상태 구현' (!12) from DEG-125-플레이어-유료-에셋-적용 into main
Reviewed-on: #12
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
2025-05-07 04:32:57 +00:00
8799af7966 Merge pull request 'DEG-124-실내-맵-재제작' (!11) from DEG-124-실내-맵-재제작 into main
Reviewed-on: #11
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
2025-05-07 04:31:45 +00:00
Jay
ef74894971 DEG-125 [FEAT] 플레이어 태그 수정 2025-05-07 13:20:30 +09:00
HaeinLEE
66c7ce7972 [Remove] 테스트용 파일 삭제 2025-05-07 09:31:09 +09:00
HaeinLEE
c2250c28bf [Feat] 드래그 애니메이션 추가 2025-05-06 03:09:43 +09:00
HaeinLEE
a40902a5de [Feat] 튜토리얼 애니메이션 생성 2025-05-05 21:40:47 +09:00
Jay
12790941d7 Merge branch 'main' of https://gitea.ysizuku.com/Degulleo/Degulleo3D into DEG-125-플레이어-유료-에셋-적용 2025-05-02 19:17:16 +09:00
Jay
6f8dd0863f DEG-125 [FEAT] 플레이어 공격, 피격 애니메이션 및 상태 구현 2025-05-02 19:16:48 +09:00
HaeinLEE
f991e82fa9 [Style] 폴더 정리 2025-05-02 18:42:05 +09:00
Lim0_C
2fefd93081 Merge branch 'main' into DEG-126-상호작용-로딩ui-애니메이션-작업 2025-05-02 17:43:57 +09:00
Lim0_C
699f2c8e79 DEG-126 [Feat] 상호작용 로딩 애니메이션 추가
출근, 던전,  식사 로딩 애니메이션
2025-05-02 17:31:58 +09:00
Sehyeon
5a9482fdbc DEG-124 [Fix] 버그 수정 2025-05-02 17:23:54 +09:00
cbc6817075 [refact] 디버프 종류 ENUM으로 정리
Work in JIRA ISSUE DEG-100
2025-05-02 15:18:50 +09:00
99jamin
36d0b5a3f0 DEG - 25 [FIX] 폰트 오류 수정 2025-05-02 14:45:28 +09:00
99jamin
533f6c23f0 Merge branch 'main' into DEG-25-강화-기초-로직-구현 2025-05-02 14:35:56 +09:00
99jamin
9419f9f9b9 DEG-25 [Feat] 강화 세이브 연동 테스트 구현 2025-05-02 14:34:10 +09:00
Sehyeon
d4de4f320d Merge branch 'main' into DEG-124-실내-맵-재제작 2025-05-02 14:22:52 +09:00
Sehyeon
c3a7814c94 DEG-124 [Feat] 씬 이동 구현 2025-05-02 14:20:31 +09:00
32b3cb918a [Feat] 넉백 기능 구현
- 플레이어가 PlayerController를 사용한다고 가정하고 넉백 구현

Work in JIRA ISSUE DEG-100
2025-05-02 11:51:24 +09:00
99jamin
6c7536c1ae DEG-25 [Feat] 강화 애니메이션 및 코드 리팩토링 2025-05-02 11:41:32 +09:00
jay
fa1a5174c5 Merge pull request 'DEG-125 [FEAT] 캐릭터 에셋 대체 및 move, battlemode 처리 까지' (!9) from DEG-125-플레이어-유료-에셋-적용 into main
Reviewed-on: #9
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: heain0122 <heain0122@gmail.com>
2025-05-02 02:23:28 +00:00
Sehyeon
e198af6c19 DEG-124 [Feat] npc 상호작용 추가 2025-05-02 10:32:09 +09:00
Sehyeon
dd076b7dc9 DEG-124 [Feat] cat asset 추가 2025-05-02 09:27:08 +09:00
Sehyeon
837d4eacc9 DEG-124 [Feat] prop 변경 2025-05-01 17:54:55 +09:00
Jay
7ca49fe2fc DEG-125 [FEAT] 캐릭터 에셋 대체 및 move, battlemode 처리 까지 2025-05-01 16:29:10 +09:00
9d46d0e61f Merge pull request 'DEG-100-원거리-마법사-보스-몬스터-개발-단계-2' (!8) from DEG-100-원거리-마법사-보스-몬스터-개발-단계-2 into main
Reviewed-on: #8
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: jay <ayjindev@gmail.com>
2025-05-01 06:43:11 +00:00
0b1355f401 [del] 불필요한 파일 제거
Work in JIRA ISSUE DEG-100
2025-05-01 15:11:26 +09:00
13588aa693 [feat] 슬로우 디버프 마법 생성
- 몬스터 에셋 적용
- 슬로우 마법 기능 추가

Work in JIRA ISSUE DEG-100
2025-05-01 15:03:23 +09:00
dfc9b26b95 Merge pull request 'DEG-49-클리어-성공-실패-ui-구현' (!7) from DEG-49-클리어-성공-실패-ui-구현 into main
Reviewed-on: #7
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
2025-05-01 02:38:24 +00:00
Lim0_C
ba4671f76c Merge branch 'main' into DEG-49-클리어-성공-실패-ui-구현 2025-05-01 11:09:35 +09:00
Lim0_C
b49ccd5625 DEG-49 [Refactor] 클리어 성공 실패 패널 리팩토링
의미 없는 코루틴 삭제
2025-05-01 11:08:30 +09:00
10b42cfe15 Merge pull request 'DEG-118-엔딩-로직과 대화창 개선' (!6) from DEG-54-엔딩-로직 into main
Reviewed-on: #6
Reviewed-by: jay <ayjindev@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-05-01 00:02:51 +00:00
HaeinLEE
39a726b172 [Feat] 일상생활 튜토리얼 아주 일부 2025-04-30 23:17:07 +09:00
Fiore
a70eb420a0 [fix] 텔레포트 로직 수정
- 텔레포트 로직 수정
- 텔레포트 시 장판남기는 기능 추가

Work in JIRA ISSUE DEG-100
2025-04-30 18:48:21 +09:00
Lim0_C
2e6c4e4a46 DEG-49 [Feat] 던전 클리어 성공 및 실패 패널 구현 2025-04-30 17:43:49 +09:00
Sehyeon
a61f52fb10 DEG-118 [Feat] GameManager에 대화창 접근 메서드 추가 2025-04-30 14:15:30 +09:00
HaeinLEE
8edeab89c4 [Feat] 일상생활 튜토리얼 구현중 2025-04-30 13:52:58 +09:00
Fiore
c2732adc76 [fix] 의도되지 않은 타이밍에도 텔레포트가 실행되는 문제 수정
- 텔레포트를 사용할 수 있는 빈도 조정
- 텔레포트 처리 로직 정리

Work in JIRA ISSUE DEG-100 DEG-109
#Close
2025-04-30 10:38:32 +09:00
Sehyeon
57419f5c01 DEG-118 [Remove] 안쓰는 에셋 정리 2025-04-30 09:27:39 +09:00
Fiore
71a904e57e [fix] 도주 대체 경로 찾는 중 워프 발생하여 수정 시작
- 텔레포트 쿨타임 생성
- 텔레포트 로직 변경 (플레이어 뒤로 순간이동)
- 코루틴 관리를 위한 메서드 생성
2025-04-29 18:08:45 +09:00
jay
be0193573a Merge pull request 'DEG-55-플레이어-피격-구현' (!5) from DEG-55-플레이어-피격-구현 into main
Reviewed-on: #5
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
2025-04-29 07:54:31 +00:00
03ce0ce347 Merge pull request 'DEG-86-팝업-및-설정-UI-구현' (!4) from DEG-86-팝업-및-설정-UI-구현 into main
Reviewed-on: #4
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
2025-04-29 07:26:34 +00:00
Sehyeon
28c72be3b8 Merge branch 'main' into DEG-54-엔딩-로직 2025-04-29 16:19:45 +09:00
Jay
add7c67317 Merge branch 'main' of https://gitea.ysizuku.com/Degulleo/Degulleo3D into DEG-55-플레이어-피격-구현 2025-04-29 16:18:34 +09:00
Jay
e39b91600e DEG-55 [FEAT] 플레이어 피격 이펙트 구현 2025-04-29 16:17:50 +09:00
Lim0_C
5838ec32ea Merge branch 'main' into DEG-86-팝업-및-설정-UI-구현 2025-04-29 16:14:36 +09:00
Sehyeon
f8e7f539d7 DEG-118 [Feat] 대화 관리 시스템 및 npc와의 대화문 추가 2025-04-29 16:09:35 +09:00
5dcde907a1 Merge pull request 'DEG-100 원거리-마법사-보스-몬스터-개발-단계' (!3) from DEG-100-원거리-마법사-보스-몬스터-개발-단계 into main
Reviewed-on: #3
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: Lim0_C <dladudcks22@gmail.com>
2025-04-29 07:07:06 +00:00
Fiore
2708df17df [feat] 랜덤 패턴 수행을 위한 메서드 추가
Work in JIRA ISSUE DEG-100
2025-04-29 16:06:07 +09:00
Lim0_C
76da13a6b5 Merge branch 'main' into DEG-86-팝업-및-설정-UI-구현 2025-04-29 16:04:19 +09:00
Lim0_C
a77e1ab6e2 DEG-86 [Feat] 팝업 및 설정 UI 스크립트 추가 2025-04-29 15:49:14 +09:00
Fiore
882ef3b8dc 더미 몬스터 프리팹화
Work in JIRA ISSUE DEG-100
2025-04-29 15:25:01 +09:00
Fiore
d0d42cf551 제자리로 판단하는 거리 조정
Work in JIRA ISSUE DEG-100
2025-04-29 15:18:55 +09:00
Fiore
ea45936114 몬스터 테스트 씬 변경사항 저장
Work in JIRA ISSUE DEG-100
2025-04-29 15:02:25 +09:00
Fiore
18211fff05 feat : 몬스터 순간이동 구현
- 몬스터가 구석에 몰려 더이상 움직일 수 없는 경우 중앙으로 워프

Work in JIRA ISSUE DEG-100
2025-04-29 15:00:50 +09:00
Fiore
50e5b8db98 feat : 매직미사일 기본 동작 구현
- 플레이어가 움직이는 방향을 참고하여 예측샷 발사
2025-04-29 14:00:03 +09:00
Fiore
393b538920 feat : bullet base 작성 완료
- 이동속도, 데미지, 라이프타임을 받음
- bulletdata를 받아 초기화 진행
- 발사 위치를 기준으로 목표 방향 세팅
- 테스트를 위해 초기값 임의로 작성

work in DEG-100 JIRA
2025-04-29 11:43:58 +09:00
Fiore
bc88d47e6b [feat] 매직미사일 구현 시작
- 몬스터가 사용할 총알 베이스 생성

work in DEG-100
2025-04-29 11:13:18 +09:00
b5a39714f0 Merge pull request 'DEG-116-액션과-컷씬-연동-재작업' (#2) from DEG-116-액션과-컷씬-연동-재작업 into main
Reviewed-on: #2
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>
2025-04-29 01:45:02 +00:00
HaeinLEE
e1c1f6a329 [Fix] 폰트 재설치 2025-04-29 10:43:41 +09:00
99jamin
5eed0c81c5 DEG-25 강화 기초 로직 2025-04-29 10:17:37 +09:00
Lim0_C
c436a73f5c DEG-86 [Feat] 팝업 및 설정 UI 화면 구성 구현
유니티상 UI화면 구성 완료
2025-04-29 09:56:02 +09:00
Fiore
99082eeb7c [feat] 마법사 몬스터의 도망 로직 정리
- 경로 탐색 주기를 설정해 성능 향상
- 상태 진입과 이탈시 초기화처리
- 버그 수정 : 플레이어와 거리를 체크하고 전투 시작
- 경로 탐색 성능 향상
- 배틀 시퀸스 프레임 작성

work in #DEG-100
2025-04-29 09:26:09 +09:00
HaeinLEE
406dc8f84f [Style] 개인 프리팹 정리 2025-04-28 21:36:38 +09:00
HaeinLEE
c262b9e2f7 [Feat] 컷씬 자동 꺼짐 기능 2025-04-28 21:24:43 +09:00
HaeinLEE
cdded898ec [Feat] 기존 커밋 복구 2025-04-28 17:44:00 +09:00
Sehyeon
23e411b6e1 DEG-54 [Feat] 엔딩 로직 구현 2025-04-28 16:32:12 +09:00
Lim0_C
2ebeccfa69 [HOTFIX] 메인UI 복구 수정
씬 저장이슈
2025-04-28 15:35:07 +09:00
4e7ca0526c Merge pull request 'DEG-85 메인화면UI 복구' (#1) from DEG-85-메인화면-UI-복구 into main
Reviewed-on: #1
Reviewed-by: heain0122 <heain0122@gmail.com>
2025-04-28 06:27:02 +00:00
Lim0_C
976cfc793a DEG-85 메인화면UI 복구 2025-04-28 15:12:29 +09:00
362733785c !Err fix! [JinYeng] 손상된 LFS 파일 제거
- Github LFS 대역폭 초과로 인한 파일 손상 수정
- Git Server 이동 및 마이그레이션 진행
2025-04-28 14:42:22 +09:00
Fiore
363589d35f
Merge pull request #28 from Degulleo/DEG-95-원거리-마법사-보스-몬스터-기획-및-설계
DEG-95 DEG-100 원거리 마법사 보스 몬스터 기획 및 설계
2025-04-28 13:57:24 +09:00
Lim0_C
3cdb1156ac
Merge pull request #29 from Degulleo/DEG-85-메인화면-UI-구현
Deg 85 메인화면 UI 구현
2025-04-28 13:57:15 +09:00
Jay
9113c46139
Merge pull request #26 from Degulleo/DEG-111-공격-버튼-눌렀을-때-공격-모션-끝나고-나서도-Attack-상태가-유지됨
DEG-111 [FIX] Action 초기화, 관련 버그 수정
2025-04-28 09:43:50 +09:00
Jay
17bbcf14fd DEG-111 [DELETE] 안쓰는 player asset 항목 삭제 2025-04-28 09:43:31 +09:00
Lim0_C
c47abc4a53 DEG-85 [fix] 버그 수정
하우징 씬파일 로드 실패로 다른 씬에서 가져와 붙임
2025-04-28 09:16:10 +09:00
544f0003f0 DEG-95 코드 다듬기 2025-04-27 22:26:12 +09:00
Lim0_C
c0451d4566 Revert "DEG-85 [fix] 잘못 건드린 파일 수정"
This reverts commit ab042b2423048715f5ac05fa1d9f553816235654.
2025-04-25 18:38:39 +09:00
Lim0_C
ab042b2423 DEG-85 [fix] 잘못 건드린 파일 수정
파티클 작업하다 잘못 건드린 파일이 있어서 메인의 원본 파일을 덮어씌움
2025-04-25 18:06:22 +09:00
Jay
1d63db580d DEG-111 [FIX] 공격 중에 대시했을 때 weaponController AttackEnd 처리 추가 2025-04-25 18:03:23 +09:00
Lim0_C
5b6106de76 Merge branch 'main' into DEG-85-메인화면-UI-구현 2025-04-25 17:56:21 +09:00
Lim0_C
c08a1d6656 DEG-85 [Feat] 팝업패널 추가 2025-04-25 17:54:31 +09:00
Jay
659cca6770 DEG-111 [Style] 코드 위치 조정 등 2025-04-25 17:39:33 +09:00
Sehyeon
ceb721bebc
Merge pull request #25 from Degulleo/DEG-108-던전-체력-구현
Deg 108 던전 체력 구현
2025-04-25 17:33:39 +09:00
Jay
470d7a2932 DEG-111 [FIX] Actio 초기화, 관련 버그 수정 2025-04-25 17:33:03 +09:00
2bb71999b7 DEG-95 몬스터가 도망치는 상태 스크립트 구현
- 도망치는 애니메이션을 상태 스크립트에서 처리
- 전투 패턴은 몬스터 객체에게 위임
2025-04-25 17:05:20 +09:00
Sehyeon
fe79e0d3ae DEG-108 [Fix] 자동 공격 중지 추가 2025-04-25 16:48:16 +09:00
Lim0_C
de612d59c6 DEG-85 [fix] 파티클 수정 2025-04-25 16:00:20 +09:00
Sehyeon
d3948bc577 DEG-108 [Fix] 공격 제한 2025-04-25 15:59:57 +09:00
Sehyeon
59625fa8ff DEG-108 [Fix] OnNext에서 공격 처리 2025-04-25 15:48:11 +09:00
39379da300 DEG-95 [Fix] 팔라딘 몬스터 폭탄 던지는 애니메이션 누락 수정
- 공격 패턴 순차 실행 -> 랜덤 실행으로 변경
2025-04-25 15:46:54 +09:00
9b1709b92c DEG-95 원거리 마법사 보스 패턴 설계 시작
- 근접 몬스터 전투 패턴 리팩토링
- 전략 패턴과 템플릿 메서드 패턴을 조합
2025-04-25 15:17:27 +09:00
Lim0_C
bb678196c7 DEG-85 메인화면 파티클 추가
메인화면 파티클 효과 추가
2025-04-25 15:00:21 +09:00
Sehyeon
7539b84a1f DEG-108 [Fix] 어느 한 쪽 사망시 더이상 공격 안하도록 처리 2025-04-25 14:52:49 +09:00
Sehyeon
b944d8ced9 Merge branch 'main' into DEG-108-던전-체력-구현 2025-04-25 11:03:51 +09:00
Lim0_C
ffa81ded6f Merge branch 'main' into DEG-85-메인화면-UI-구현 2025-04-25 10:53:01 +09:00
Jay
fc8ec74970
Merge pull request #24 from Degulleo/DEG-110-승리-패배-모션-추가-후-캐릭터-움직임-없음
DEG-110 [FIX] 모션 수정
2025-04-25 10:52:06 +09:00
Lim0_C
ae61935b37 DEG-85 [Feat] 메인화면UI 구현
메인화면UI 구현 및 DOtween 추가
2025-04-25 10:51:39 +09:00
Sehyeon
f60a22aa26 DEG-108 [Feat] 던전 체력 UI 컨트롤러 구현 2025-04-25 10:33:28 +09:00
Jay
aa40c9ac71 DEG-110 [FIX] 모션 수정 2025-04-25 10:26:16 +09:00
Jay
5e61ff03c9
Merge pull request #23 from Degulleo/DEG-60-플레이어-승리-구현
Deg 60 플레이어 승리 구현
2025-04-24 18:02:19 +09:00
Lim0_C
1a2f787f17 DEG-85 [Feat] 초기 메인화면UI 구현
메인화면 배경과 버튼 추가 함
폰트도 추가함
2025-04-24 17:58:14 +09:00
Jay
9fc6f23f81 DEG-60 [FEAT] Editor 추가 등 2025-04-24 17:57:55 +09:00
Jay
2d9c6633b5 DEG-60 [FEAT] 플레이어 승리 패배 상태 구현 2025-04-24 17:57:14 +09:00
Sehyeon
ec9754fd38
Merge pull request #22 from Degulleo/DEG-21-던전-로직-구현
Deg 21 던전 로직 구현
2025-04-24 17:50:44 +09:00
99jamin56
414691a982
Merge pull request #21 from Degulleo/DEG-24-오토-세이브-연동
Deg 24 오토 세이브 연동
2025-04-24 17:12:54 +09:00
99jamin
42b218f0d7 Merge branch 'main' into DEG-24-오토-세이브-연동 2025-04-24 17:11:06 +09:00
Jay
e1335124d6
Merge pull request #20 from Degulleo/DEG-94-플레이어-회피-기능-구현
Deg 94 플레이어 회피 기능 구현
2025-04-24 16:54:35 +09:00
Sehyeon
e38d3f243f DEG-21 [Fix] 플레이어 데미지 수정 2025-04-24 16:27:46 +09:00
Sehyeon
528a936e97 DEG-21 [Feat] 데미지 처리 및 Lighting Bake 추가 2025-04-24 16:12:22 +09:00
99jamin
ecbd265b3b Merge branch 'main' into DEG-24-오토-세이브-연동 2025-04-24 15:40:00 +09:00
99jamin
67410c0860 DEG-24 [Test] 인터페이스 사용 테스트 코드 추가 2025-04-24 15:39:35 +09:00
Jay
40b5619114 DEG-94 [STYLE] 주석 추가 2025-04-24 14:35:56 +09:00
99jamin
a3328c7724 DEG-24 [Refactor] 세이브 데이터 적용 및 불러오기 개선
SaveDataController가 각 필드의 데이터를 모으고, 적용한다.
2025-04-24 14:30:00 +09:00
Jay
4a527c8443 Merge branch 'main' of https://github.com/Degulleo/Degulleo3D into DEG-94-플레이어-회피-기능-구현 2025-04-24 14:27:54 +09:00
Jay
b378d51f73 DEG-94 [FEAT] 회피 행동 추가 2025-04-24 14:27:46 +09:00
Sehyeon
fc59d0c260 Merge branch 'main' into DEG-21-던전-로직-구현 2025-04-24 14:03:46 +09:00
Fiore
71a566262c
Merge pull request #19 from Degulleo/DEG-41-Battle-Pattern2
DEG-41 전투 패턴 구현 리워크
2025-04-24 14:02:16 +09:00
HaeinLEE117
167c1475dd
Merge pull request #18 from Degulleo/DEG-27-돌발이벤트-시스템
Deg 27 돌발이벤트 시스템 그리고 상호작용 리팩토링
2025-04-24 13:54:57 +09:00
Sehyeon
341be0aa7e DEG-21 [Save] 혹시 모를 중간 저장 2025-04-24 13:49:52 +09:00
503c576bf0 DEG-41 메타파일 추가됨 2025-04-24 13:05:31 +09:00
Sehyeon
1d4b6e7866 DEG-21 [Fix] 스크립트 할당 추가 2025-04-24 11:06:02 +09:00
9c03bfd00a DEG-41 DEG-93 공격 패턴 및 애니메이션 조정
- 부채꼴 가로 베기
- 직선 횡 베기
- 근접 원형 공격
- 원거리 폭탄
2025-04-24 10:40:40 +09:00
05bdaafce2 DEG-41 주석 추가 : 이후 처리할 내용 TODO로 작성 2025-04-23 10:28:52 +09:00
6f81f0d68b DEG-41 원거리 공격을 타겟 위치에 던지도록 수정 2025-04-23 09:44:17 +09:00
b6e0458350 DEG-41 근접 범위패턴, 거리가 멀면 원거리 공격 패턴 추가 2025-04-22 18:02:56 +09:00
Sehyeon
be9b90b282 DEG-21 [Feat] 사망 이벤트에 따른 던전 공략 종료 기본 메서드 구현 2025-04-22 17:30:13 +09:00
c0fde7a8d2 DEG-41 사용하지 않는 패턴 정리 2025-04-22 14:24:03 +09:00
3694483a9c DEG-41 전투 패턴 구현 시작 2025-04-21 16:24:23 +09:00
4037 changed files with 1044735 additions and 377252 deletions

13
.idea/.idea.Degulleo/.idea/.gitignore generated vendored Normal file
View File

@ -0,0 +1,13 @@
# 디폴트 무시된 파일
/shelf/
/workspace.xml
# Rider에서 무시된 파일
/.idea.Degulleo.iml
/contentModel.xml
/modules.xml
/projectSettingsUpdater.xml
# 에디터 기반 HTTP 클라이언트 요청
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

6
.idea/.idea.Degulleo/.idea/vcs.xml generated Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

13
.idea/.idea.Degulleo3D-main/.idea/.gitignore generated vendored Normal file
View File

@ -0,0 +1,13 @@
# 디폴트 무시된 파일
/shelf/
/workspace.xml
# Rider에서 무시된 파일
/projectSettingsUpdater.xml
/modules.xml
/contentModel.xml
/.idea.Degulleo3D-main.iml
# 에디터 기반 HTTP 클라이언트 요청
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@ -0,0 +1,13 @@
# 디폴트 무시된 파일
/shelf/
/workspace.xml
# Rider에서 무시된 파일
/contentModel.xml
/modules.xml
/projectSettingsUpdater.xml
/.idea.Degulleo3DReworkLoadingAnim.iml
# 에디터 기반 HTTP 클라이언트 요청
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>

View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="AutoImportSettings">
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="c3b8a67e-61ad-4d5a-9de5-dce8e18c1710" name="변경" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/d6bbda9f0f5a4a7b944aefffbac6e8501fe00/57/cd48a3dd/CharacterController.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/LIN/Scripts/PlayerStateExhaustion.cs" root0="FORCE_HIGHLIGHTING" />
<setting file="file://$PROJECT_DIR$/Assets/LIN/Scripts/UI/SwitchingPanelController.cs" root0="FORCE_HIGHLIGHTING" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"node.js.selected.package.tslint": "(autodetect)"
}
}]]></component>
<component name="RunManager">
<configuration name="유닛 테스트(배치 모드)" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2022.3.60f1\Editor\Unity.exe" />
<option name="PROGRAM_PARAMETERS" value="-runTests -batchmode -projectPath D:\LikeLion\TeamProject\TEAFridge\exhaustion -testResults Logs/results.xml -logFile Logs/Editor.log -testPlatform EditMode -debugCodeOptimization" />
<option name="WORKING_DIRECTORY" value="D:\LikeLion\TeamProject\TEAFridge\exhaustion" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<method v="2" />
</configuration>
<configuration name="Unity 시작" type="RunUnityExe" factoryName="Unity Executable">
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2022.3.60f1\Editor\Unity.exe" />
<option name="PROGRAM_PARAMETERS" value="-projectPath D:\LikeLion\TeamProject\TEAFridge\exhaustion -debugCodeOptimization" />
<option name="WORKING_DIRECTORY" value="D:\LikeLion\TeamProject\TEAFridge\exhaustion" />
<option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" />
<method v="2" />
</configuration>
</component>
<component name="TaskManager">
<servers />
</component>
<component name="UnityProjectConfiguration" hasMinimizedUI="true" />
<component name="UnityUnitTestConfiguration" currentTestLauncher="Both" />
</project>

8
Assets/Animation.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 319ea561ecf14f24a8c397dcf3384433
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 22739671240a4e8489ad2f1f4395a48b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dfce172694e6cae4a978267ab2e8e7f5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c4b4877324e8f984a94db19f57f6e5bc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cb4d2ce283530414f92984caccad61a0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f5f9665f400fc7d4fba150a3f0d8fb11
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9b52bf42130896940b1762721509ab7d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: af0f344c05e45c34ba51690e81ebce3c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Interaction/DoingAniController.controller (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Animation/Interaction/Dungeon.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cc4fdd9736e26314a86319043b8266d8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Interaction/Go2Work.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 02c2a7d350ea60d4d910651746340300
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Interaction/Housework.anim (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Assets/Animation/Interaction/Meal.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cdac76a4ef9c7f74a8ed3b6507030c74
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Interaction/Sleep.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bfb6c709f7fb9d443a02eb102ea56890
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Player/Attack_idle.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d84a1ba0d51fd80429c5896e83064112
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Player/CustomAttack01.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 656169137a9cd5c46aa69f47fabb9598
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Player/CustomAttack02.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3ac73c0cdb0b58c468547fbf44b42b84
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Player/Damage.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 32e77e5f2114f974fa58a23aa6020694
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Player/Dying.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2e2d3b7f53761254aa6d85f86c6f4bcc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Player/Run.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2bea96b6c70e64a458dbc937a5f84ff1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,121 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!319 &31900000
AvatarMask:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UpperBody
m_Mask: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
m_Elements:
- m_Path:
m_Weight: 1
- m_Path: Bip001
m_Weight: 0
- m_Path: Bip001/Bip001 Pelvis
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh
m_Weight: 0
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf/Bip001
L Foot
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 L Thigh/Bip001 L Calf/Bip001
L Foot/Bip001 L Toe0
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh
m_Weight: 0
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf/Bip001
R Foot
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 R Thigh/Bip001 R Calf/Bip001
R Foot/Bip001 R Toe0
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/Bip001
Ponytail1
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/Bip001
Ponytail1/Bip001 Ponytail11
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/Bip001
Ponytail1/Bip001 Ponytail11/Bip001 Ponytail12
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/Bip001
Ponytail1/Bip001 Ponytail11/Bip001 Ponytail12/Bip001 Ponytail13
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 Head/head_dummy
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm/Bip001 L Forearm
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand/Bip001 L Finger0
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand/Bip001 L Finger0/Bip001
L Finger01
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand/Bip001 L Finger1
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand/Bip001 L Finger1/Bip001
L Finger11
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 L
Clavicle/Bip001 L UpperArm/Bip001 L Forearm/Bip001 L Hand/weapon_L
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm/Bip001 R Forearm
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm/Bip001 R Forearm/Bip001 R Hand
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm/Bip001 R Forearm/Bip001 R Hand/Bip001 R Finger0
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm/Bip001 R Forearm/Bip001 R Hand/Bip001 R Finger0/Bip001
R Finger01
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm/Bip001 R Forearm/Bip001 R Hand/Bip001 R Finger1
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm/Bip001 R Forearm/Bip001 R Hand/Bip001 R Finger1/Bip001
R Finger11
m_Weight: 1
- m_Path: Bip001/Bip001 Pelvis/Bip001 Spine/Bip001 Spine1/Bip001 Neck/Bip001 R
Clavicle/Bip001 R UpperArm/Bip001 R Forearm/Bip001 R Hand/weapon_R
m_Weight: 1
- m_Path: char_body
m_Weight: 0
- m_Path: char_head
m_Weight: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7653926bd219c614f9b786ddafa0477c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 31900000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Player/Victory.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 857073f8dbc52534a95bda0227ac4406
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: dba2935d28b61d24cb995b4b892247b9
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Tutorial/Drag Down Animation.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f27b3abad6872c44e97912eebec8d88f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Tutorial/Drag Left Animation.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1508ea9e5623cf14ab2378f0cef9e4f9
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Tutorial/Drag Right Animation.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8702846e8ccd4b34e9e500d748366282
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Tutorial/Drag Up Animation.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8731d87063872e443b687cb8fde04d4d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e9f04be805588144f91257ba68a51876
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Tutorial/FingerImage.controller (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5905112edad17434fb13083581ef0f4f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/Tutorial/Touch Animation.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd99c947dee3d52458ca54e58f038438
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Animation/TutorialIndicateAnimation.anim (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: cd947f5b39b9e6549885e225061e752d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More