Commit Graph

579 Commits

Author SHA1 Message Date
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
NTG_Lenovo
269ab8a676 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-09-20 12:31:09 +09:00
NTG_Lenovo
c56898125c #24 화살타워 추가 2023-09-20 12:30:58 +09:00
M1_IDMhan
3669c9c897 #31 Assault mode enemy update 2023-09-20 12:27:33 +09:00
NTG
5f20d3d57a #24 화살타워(ArrowTower) 만드는 중 2023-09-20 02:22:19 +09:00
M1_IDMhan
07f2330908 #31 Camera priority change 2023-09-20 02:00:53 +09:00
M1_IDMhan
01c9cdb955 Merge remote-tracking branch 'origin/main' 2023-09-20 01:59:08 +09:00
M1_IDMhan
ead1f1c1ab #31 Assault mode change with camera 2023-09-20 01:58:52 +09:00
koko
07928c7dfb 에너미 AI 배치 2023-09-20 01:03:00 +09:00
NTG_Lenovo
2d1d5702e6 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-09-18 16:44:04 +09:00
NTG_Lenovo
ff1faec034 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-09-18 16:43:10 +09:00
M1_IDMhan
59233a4f13 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	BlueWater/Assets/RayFire/Tutorial/Material/Default-Material.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/concrete.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/concrete_dark.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/concrete_exterior.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/concrete_interior.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/glass.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/ground.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/ice.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/metal.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/orange.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/slabs.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/wood.mat
#	BlueWater/Assets/RayFire/Tutorial/Material/wood_dark.mat
2023-09-18 16:43:00 +09:00
NTG_Lenovo
057c491c42 Ai archer DefensePos Gizmos 위치 오류 수정 2023-09-18 16:42:41 +09:00
M1_IDMhan
0f647c75bd #31 UI and camera ready 2023-09-18 16:42:35 +09:00
ffd34a1c21 성진 씬 추가 2023-09-18 16:33:24 +09:00
bb5f802047 AI 첫번째 테스트 (테스트 아처 추가, 화살 속도 증가) 2023-09-18 16:32:38 +09:00
NTG_Lenovo
4437e44106 스크립트 실행 순서 변경(GameManager) 2023-09-18 15:46:56 +09:00
NTG_Lenovo
cc6eb456c1 Enum 위치 변경, Draw 위치 오류 수정 2023-09-18 15:28:37 +09:00
M1_IDMhan
d5a77eeb7c Main scene merge 2023-09-18 14:42:34 +09:00
M1_IDMhan
511c56216d Merge remote-tracking branch 'origin/main' 2023-09-18 14:06:22 +09:00
M1_IDMhan
30ad001eea #31 Assault mode camera view 2023-09-18 14:06:11 +09:00
NTG_Lenovo
08233a9f1e #23 디펜스 Ai 보완 2023-09-18 14:02:11 +09:00
NTG
b342cb3adf Ai 테스트 2023-09-18 09:21:55 +09:00
NTG_Lenovo
fc65abc7b4 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-09-13 16:06:10 +09:00
NTG_Lenovo
12ff50f646 Ai 상속 구조 변경 중2 2023-09-13 16:05:21 +09:00
M1_IDMhan
bfddfefed2 #31 Change assault mode camera test 2023-09-13 15:54:24 +09:00
M1_IDMhan
c5f35a4a00 [Asset] Material for URP 2023-09-13 14:10:30 +09:00
M1_IDMhan
d027b297ff [Asset] Add Cozy Weather 2023-09-13 14:07:40 +09:00
M1_IDMhan
0eb7c3cf3c [Hotfix] FindObjectOfType -> FindAnyObjectByType 2023-09-13 13:56:22 +09:00