Commit Graph

357 Commits

Author SHA1 Message Date
IDMhan
6143f3450a [Package] Jetbrains 2023-10-18 12:03:09 +09:00
IDMhan
5b75e1f836 #37 Npc Idle Action, Order Action Dialogue System 2023-10-18 11:36:56 +09:00
NTG_Lenovo
142933c5a5 #34 Crewmate 연동 작업 2023-10-17 16:31:10 +09:00
NTG_Lenovo
e33e979c54 #35 InIslandPlayer 행동 추가
+ IAiView 변경
+ INormalAttack 인터페이스 추가
+ FieldMinion, InIslandPlayer의 BehaviorTree 인터페이스로 통합
+ 행동 트리 Target 검색, 추적 로직 변경
2023-10-16 16:27:29 +09:00
NTG_Lenovo
f721a13675 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
# Conflicts:
#	BlueWater/ProjectSettings/DynamicsManager.asset
2023-10-16 11:24:04 +09:00
NTG_Lenovo
2bb986becb #34 #35 상세 내용 아래에 기재
+ SPUM 프리팹 회전 값 변경
  (0, 90, 0) -> (0, 0, 0)
+ 프리팹 원본 보존(씬에 Viking 따로 사용)
+ ProjectSetting Physics 수정
  Player <-> Props 충돌 추가
+ IAnimationBridge 인터페이스 추가
+ Crewmate(동료) class 추가
+ Enemy MagicOrk 추가
  Magic particleSystem 기능 추가 중
2023-10-12 15:32:02 +09:00
IDMhan
ff1f96f30c Merge remote-tracking branch 'origin/main' 2023-10-12 10:09:48 +09:00
IDMhan
f7d0f2a2a7 Closed #33 Inship Basic Environment and #36 Start Ai 2023-10-12 10:09:31 +09:00
NTG
59c4b14d1a #34 #35 InIslandPlayer, Ai 2D 베이스 변경 작업
+ SPUM 프리팹 NavMeshAgent 위치 변경, 콜라이더, Agent 크기 변경
+ SPUM에서 제공되는 NormalAnimator의 공격 모션에 Event 추가
+ Ork 프리팹 UnitRoot에 Animator Bridge 추가
+ IAiView 타겟을 검색하는 Ai 인터페이스 추가
+ IHelpCall 주변 아군에게 타겟을 공유하는 인터페이스 추가
+ 기존 02.Scripts.Ai.BehaviorTree에는 그대로 냅두고,
  02.Scripts.Ai.NewBehaviorTree 폴더를 추가하여 사용
+ Enemy의 BehaviorTree인 Minion 추가
+ InIslandPlayer의 기본 이동 구현
2023-10-12 05:26:45 +09:00
NTG
e715ee9a35 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-10-10 20:28:57 +09:00
IDMhan
77bbd26602 #33 Insideplayer and Insidefloor 2023-10-10 10:15:18 +09:00
NTG
073f99384d Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
# Conflicts:
#	BlueWater/Assets/01.Scenes/03.Stage_Test.unity.meta
#	BlueWater/Assets/02.Scripts/GameManager.cs
2023-10-06 16:17:41 +09:00
IDMhan
e12d414881 #33 restore 2023-10-06 14:41:16 +09:00
NTG_Lenovo
17172a0633 #35 InIslandPlayer 추가
- Player 이동 구현

- 03.Stage_Test 테스트 씬 추가
- SPUM prefab 스케일 1 -> 2 변경
2023-10-05 16:56:53 +09:00
NTG_Lenovo
383f8d5637 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
# Conflicts:
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta
2023-10-05 13:12:16 +09:00
NTG_Lenovo
11d68b850b InIslandPlayer 배치 기능 추가 2023-10-05 13:11:46 +09:00
NTG_Lenovo
8440e2022d SPUM 캐릭터 프리팹 애니메이터 장착 2023-10-05 11:48:48 +09:00
NTG_Lenovo
9a0697ee83 SPUM 캐릭터 프리팹 기본 값 변경(NPC 제외) 2023-10-05 10:29:07 +09:00
M1_IDMhan
d2ccd05be3 #33 MainScene change 2023-10-01 02:43:16 +09:00
M1_IDMhan
f33afdfd45 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	BlueWater/Assets/Resources/SPUM/SPUM_Units/Unit000.prefab
2023-10-01 01:17:41 +09:00
M1_IDMhan
081f8cd13d [Package] Update 2023-10-01 01:17:20 +09:00
f7dd43d4f4 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/0_Hair.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/1_FaceHair.meta
#	BlueWater/Assets/Resources/SPUM/SPUM_Sprites/Packages/MS_Orc/2_Cloth.meta
2023-09-27 14:45:33 +09:00
5b62ff74f6 spum 캐릭터들 업데이트 2023-09-27 14:41:24 +09:00
NTG_Lenovo
715cfac330 #34 Character 폴더 내부 정리 2023-09-27 14:30:06 +09:00
M1_IDMhan
65c9bd0de7 #34 name change 2023-09-27 11:55:13 +09:00
M1_IDMhan
36e7ac6067 2 2023-09-27 11:21:18 +09:00
M1_IDMhan
71587d440e [Asset] re SPUM Orc 2023-09-27 11:21:00 +09:00
M1_IDMhan
6a973c1bcb [Asset] SPUM Orc 2023-09-27 11:19:25 +09:00
NTG_Lenovo
ae806d01da #34 Character2D 내의 폴더 및 스크립트 이름 수정 2023-09-27 11:13:08 +09:00
NTG_Lenovo
2c67b7e052 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-09-27 10:29:55 +09:00
NTG_Lenovo
4db27e0443 #34 AI 2D베이스 기초 구성 추가 2023-09-27 10:29:45 +09:00
M1_IDMhan
6e42cb693a [Asset] PixelHeroes, SPUM 2023-09-26 15:24:34 +09:00
M1_IDMhan
5ac40b88ef Merge remote-tracking branch 'origin/main' 2023-09-26 15:13:21 +09:00
M1_IDMhan
929f807459 [Asset] Add Behavior Designer 2023-09-26 15:12:44 +09:00
ffc398cd89 활살 타워 업데이트 SJ2씬 업로드 2023-09-26 13:55:28 +09:00
45b46f9a95 Merge remote-tracking branch 'origin/main' 2023-09-26 13:33:30 +09:00
32e402f80b 타워 배치 씬 업로드 2023-09-26 13:32:59 +09:00
M1_IDMhan
79e3f89a1f #19 Camera bug fixed 2023-09-24 13:51:27 +09:00
M1_IDMhan
14f63a60e8 [URP] Graphic setting change 2023-09-24 13:47:12 +09:00
M1_IDMhan
268dfe7373 [Asset] Screen Space Cavity Curvature 2023-09-24 13:38:25 +09:00
M1_IDMhan
18f1e6a838 [Asset] Remove Quibli 2023-09-24 13:37:39 +09:00
M1_IDMhan
e5ef5dca35 #31 Z key now can make card 2023-09-20 18:06:45 +09:00
NTG_Lenovo
d4662ab3e6 Ai, House SelectionBase(부모 선택) 추가 2023-09-20 15:51:14 +09:00
NTG_Lenovo
c19186e666 CombatAi 움직이는 애니메이션 속도 조절
타워 타겟 지정
2023-09-20 15:43:24 +09:00
NTG_Lenovo
4e7987ee0d CombatAi Animator speed 값 변경 2023-09-20 14:01:46 +09:00
NTG_Lenovo
517dbfde0d closed #8 유닛 제어 오류 수정
- Unit input system 수정
2023-09-20 13:54:25 +09:00
462271d683 Merge remote-tracking branch 'origin/main' 2023-09-20 13:17:44 +09:00
eed017fb7b 아군 유닛 데이터 수정, 타워 프리팹 수치 수정 2023-09-20 13:16:40 +09:00
M1_IDMhan
f899e9ca2d Merge remote-tracking branch 'origin/main' 2023-09-20 13:15:18 +09:00
M1_IDMhan
4fa116fb23 #31 Assault camera update, Player Input change 2023-09-20 13:15:04 +09:00