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>
DEG-181 [Fix] 추가 오류 해결
2025-05-15 08:11:59 +00:00 · 2025-05-15 16:41:50 +09:00 · 2025-05-15 16:13:31 +09:00 · 2025-05-15 16:06:31 +09:00 · 2025-05-15 15:57:54 +09:00 · 2025-05-15 14:33:59 +09:00
790 changed files with 338 additions and 140184 deletions
--- a/Assets/Animation.meta
+++ b/Assets/Animation.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a0ba1963fb7ce5041be57eb9074619f8
+guid: 319ea561ecf14f24a8c397dcf3384433
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Animation/Animation
+++ b/Assets/Animation/Animation
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a9e0606fbb9eff542926cf31a71db1ec
+guid: 22739671240a4e8489ad2f1f4395a48b
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Animation/Animation
+++ b/Assets/Animation/Animation
--- a/Assets/Animation/Animation
+++ b/Assets/Animation/Animation
--- a/Assets/JAY/Animator/BattlePlayerController.controller
+++ b/Assets/JAY/Animator/BattlePlayerController.controller
--- a/Assets/JAY/Animator/BattlePlayerController.controller.meta
+++ b/Assets/JAY/Animator/BattlePlayerController.controller.meta
--- a/Assets/Animation/Animation
+++ b/Assets/Animation/Animation
--- a/Assets/Animation/Animation
+++ b/Assets/Animation/Animation
--- a/Assets/JAY/Animator/NormalPlayerСontroller.controller
+++ b/Assets/JAY/Animator/NormalPlayerСontroller.controller
--- a/Assets/JAY/Animator/NormalPlayerСontroller.controller.meta
+++ b/Assets/JAY/Animator/NormalPlayerСontroller.controller.meta
--- a/Assets/JYY/Animator/PldDogControl.controller
+++ b/Assets/JYY/Animator/PldDogControl.controller
--- a/Assets/JYY/Animator/PldDogControl.controller.meta
+++ b/Assets/JYY/Animator/PldDogControl.controller.meta
--- a/Controller/TutorialAnimController.controller
+++ b/Controller/TutorialAnimController.controller
--- a/Controller/TutorialAnimController.controller.meta
+++ b/Controller/TutorialAnimController.controller.meta
--- a/Assets/Animation/Enemy.meta
+++ b/Assets/Animation/Enemy.meta
--- a/Assets/Animation/Enemy/Attack01
+++ b/Assets/Animation/Enemy/Attack01
--- a/Assets/Animation/Enemy/Attack01
+++ b/Assets/Animation/Enemy/Attack01
--- a/Assets/Animation/Enemy/Attack01.anim
+++ b/Assets/Animation/Enemy/Attack01.anim
--- a/Assets/Animation/Enemy/Attack01.anim.meta
+++ b/Assets/Animation/Enemy/Attack01.anim.meta
--- a/Assets/Animation/Enemy/Attack02.anim
+++ b/Assets/Animation/Enemy/Attack02.anim
--- a/Assets/Animation/Enemy/Attack02.anim.meta
+++ b/Assets/Animation/Enemy/Attack02.anim.meta
--- a/Assets/Animation/Enemy/Defend.anim
+++ b/Assets/Animation/Enemy/Defend.anim
--- a/Assets/Animation/Enemy/Defend.anim.meta
+++ b/Assets/Animation/Enemy/Defend.anim.meta
--- a/Assets/Animation/Enemy/Die.anim
+++ b/Assets/Animation/Enemy/Die.anim
--- a/Assets/Animation/Enemy/Die.anim.meta
+++ b/Assets/Animation/Enemy/Die.anim.meta
--- a/Assets/Animation/Enemy/DieRecover.anim
+++ b/Assets/Animation/Enemy/DieRecover.anim
--- a/Assets/Animation/Enemy/DieRecover.anim.meta
+++ b/Assets/Animation/Enemy/DieRecover.anim.meta
--- a/Assets/Animation/Enemy/Dizzy.anim
+++ b/Assets/Animation/Enemy/Dizzy.anim
--- a/Assets/Animation/Enemy/Dizzy.anim.meta
+++ b/Assets/Animation/Enemy/Dizzy.anim.meta
--- a/Assets/Animation/Enemy/GetHit.anim
+++ b/Assets/Animation/Enemy/GetHit.anim
--- a/Assets/Animation/Enemy/GetHit.anim.meta
+++ b/Assets/Animation/Enemy/GetHit.anim.meta
--- a/Assets/Animation/Enemy/Idle_Battle.anim
+++ b/Assets/Animation/Enemy/Idle_Battle.anim
--- a/Assets/Animation/Enemy/Idle_Battle.anim.meta
+++ b/Assets/Animation/Enemy/Idle_Battle.anim.meta
--- a/Assets/Animation/Enemy/RunForwardBattle.anim
+++ b/Assets/Animation/Enemy/RunForwardBattle.anim
--- a/Assets/Animation/Enemy/RunForwardBattle.anim.meta
+++ b/Assets/Animation/Enemy/RunForwardBattle.anim.meta
--- a/Assets/Animation/Enemy/ShakeSwordVerti.anim
+++ b/Assets/Animation/Enemy/ShakeSwordVerti.anim
--- a/Assets/Animation/Enemy/ShakeSwordVerti.anim.meta
+++ b/Assets/Animation/Enemy/ShakeSwordVerti.anim.meta
--- a/Assets/Animation/Enemy/WalkForwardBattle.anim
+++ b/Assets/Animation/Enemy/WalkForwardBattle.anim
--- a/Assets/Animation/Enemy/WalkForwardBattle.anim.meta
+++ b/Assets/Animation/Enemy/WalkForwardBattle.anim.meta
--- a/Assets/Animation/Enemy/WindUp.anim
+++ b/Assets/Animation/Enemy/WindUp.anim
--- a/Assets/Animation/Enemy/WindUp.anim.meta
+++ b/Assets/Animation/Enemy/WindUp.anim.meta
--- a/Assets/Animation/Interaction.meta
+++ b/Assets/Animation/Interaction.meta
--- a/Assets/Animation/Interaction/DoingAniController.controller
+++ b/Assets/Animation/Interaction/DoingAniController.controller
--- a/Assets/Animation/Interaction/DoingAniController.controller.meta
+++ b/Assets/Animation/Interaction/DoingAniController.controller.meta
--- a/Assets/Animation/Interaction/Dungeon.anim
+++ b/Assets/Animation/Interaction/Dungeon.anim
--- a/Assets/Animation/Interaction/Dungeon.anim.meta
+++ b/Assets/Animation/Interaction/Dungeon.anim.meta
--- a/Assets/Animation/Interaction/Go2Work.anim
+++ b/Assets/Animation/Interaction/Go2Work.anim
--- a/Assets/Animation/Interaction/Go2Work.anim.meta
+++ b/Assets/Animation/Interaction/Go2Work.anim.meta
--- a/Assets/Animation/Interaction/Housework.anim
+++ b/Assets/Animation/Interaction/Housework.anim
--- a/Assets/Animation/Interaction/Housework.anim.meta
+++ b/Assets/Animation/Interaction/Housework.anim.meta
--- a/Assets/Animation/Interaction/Meal.anim
+++ b/Assets/Animation/Interaction/Meal.anim
--- a/Assets/Animation/Interaction/Meal.anim.meta
+++ b/Assets/Animation/Interaction/Meal.anim.meta
--- a/Assets/Animation/Interaction/Sleep.anim
+++ b/Assets/Animation/Interaction/Sleep.anim
--- a/Assets/Animation/Interaction/Sleep.anim.meta
+++ b/Assets/Animation/Interaction/Sleep.anim.meta
--- a/Assets/Animation/Player.meta
+++ b/Assets/Animation/Player.meta
--- a/Assets/Animation/Player/Attack_idle.anim
+++ b/Assets/Animation/Player/Attack_idle.anim
--- a/Assets/Animation/Player/Attack_idle.anim.meta
+++ b/Assets/Animation/Player/Attack_idle.anim.meta
--- a/Assets/Animation/Player/CustomAttack01.anim
+++ b/Assets/Animation/Player/CustomAttack01.anim
--- a/Assets/Animation/Player/CustomAttack01.anim.meta
+++ b/Assets/Animation/Player/CustomAttack01.anim.meta
--- a/Assets/Animation/Player/CustomAttack02.anim
+++ b/Assets/Animation/Player/CustomAttack02.anim
--- a/Assets/Animation/Player/CustomAttack02.anim.meta
+++ b/Assets/Animation/Player/CustomAttack02.anim.meta
--- a/Assets/Animation/Player/Damage.anim
+++ b/Assets/Animation/Player/Damage.anim
--- a/Assets/Animation/Player/Damage.anim.meta
+++ b/Assets/Animation/Player/Damage.anim.meta
--- a/Assets/Animation/Player/Dying.anim
+++ b/Assets/Animation/Player/Dying.anim
--- a/Assets/Animation/Player/Dying.anim.meta
+++ b/Assets/Animation/Player/Dying.anim.meta
--- a/Assets/Animation/Player/Run.anim
+++ b/Assets/Animation/Player/Run.anim
--- a/Assets/Animation/Player/Run.anim.meta
+++ b/Assets/Animation/Player/Run.anim.meta
--- a/Assets/Animation/Player/UpperBody.mask
+++ b/Assets/Animation/Player/UpperBody.mask
--- a/Assets/Animation/Player/UpperBody.mask.meta
+++ b/Assets/Animation/Player/UpperBody.mask.meta
--- a/Assets/Animation/Player/Victory.anim
+++ b/Assets/Animation/Player/Victory.anim
--- a/Assets/Animation/Player/Victory.anim.meta
+++ b/Assets/Animation/Player/Victory.anim.meta
--- a/Assets/Animation/Tutorial.meta
+++ b/Assets/Animation/Tutorial.meta
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Drag
+++ b/Assets/Animation/Tutorial/Drag
--- a/Assets/Animation/Tutorial/Finger
+++ b/Assets/Animation/Tutorial/Finger
--- a/Assets/Animation/Tutorial/Finger
+++ b/Assets/Animation/Tutorial/Finger
--- a/Assets/Animation/Tutorial/FingerImage.controller
+++ b/Assets/Animation/Tutorial/FingerImage.controller
--- a/Assets/Animation/Tutorial/FingerImage.controller.meta
+++ b/Assets/Animation/Tutorial/FingerImage.controller.meta
--- a/Assets/Animation/Tutorial/Touch
+++ b/Assets/Animation/Tutorial/Touch
--- a/Assets/Animation/Tutorial/Touch
+++ b/Assets/Animation/Tutorial/Touch
--- a/Assets/Animation/TutorialIndicateAnimation.anim
+++ b/Assets/Animation/TutorialIndicateAnimation.anim
--- a/Assets/Animation/TutorialIndicateAnimation.anim.meta
+++ b/Assets/Animation/TutorialIndicateAnimation.anim.meta
--- a/Assets/JYY/FBX.meta
+++ b/Assets/JYY/FBX.meta
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Blink.controller.meta
+++ b/Blink.controller.meta
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Assets/JYY/FBX/Alien
+++ b/Assets/JYY/FBX/Alien
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sehyeon	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
parkilhwan	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
Lim0_C	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
heain0122	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
Lim0_C	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
Sehyeon	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
99jamin	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