|
|
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 |
|
|
|
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
|
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 |
|
|
|
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 |
|
|
|
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 |
|
NTG_Lenovo
|
5a56a9039b
|
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
|
2023-09-13 12:23:47 +09:00 |
|
NTG_Lenovo
|
2b846a54e0
|
Ai 상속 틀 변경
|
2023-09-13 12:23:27 +09:00 |
|
|
|
e534106cde
|
Ai 전체 구조 변경 중2
|
2023-09-12 23:46:57 +09:00 |
|
NTG_Lenovo
|
fd050c4f68
|
Ai 전체 구조 변경 중
|
2023-09-12 16:41:11 +09:00 |
|
M1_IDMhan
|
6cc19dfcef
|
Closed #30 Enemy targeting and fire to canon
|
2023-09-12 14:37:15 +09:00 |
|
NTG_Lenovo
|
639ee838bc
|
Behavior Tree 테스트 중
|
2023-09-11 16:16:02 +09:00 |
|
M1_IDMhan
|
1a2f374fb5
|
#30 Targeting and fire whit targetUI
|
2023-09-11 14:15:18 +09:00 |
|
NTG_Lenovo
|
72c961dbc4
|
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
|
2023-09-11 12:41:14 +09:00 |
|
NTG_Lenovo
|
c1e4175e26
|
유닛 배치 오류 수정
|
2023-09-11 12:41:02 +09:00 |
|
M1_IDMhan
|
c72b97cc61
|
Add Asset "Behavior Designer"
|
2023-09-11 12:34:42 +09:00 |
|
M1_IDMhan
|
460b8107cf
|
#30 Radar target ui timing and set active
|
2023-09-11 10:55:36 +09:00 |
|
NTG_Lenovo
|
243fcbd0ef
|
#23 디펜스 AI 보완 작업 중
+ 공격 애니메이션 수정
+ NavMesh 장애물, 회피 수정
|
2023-09-05 16:17:24 +09:00 |
|
NTG_Lenovo
|
de69533b8d
|
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
|
2023-09-05 10:28:22 +09:00 |
|
NTG_Lenovo
|
024db4dbd6
|
#23 디펜스 AI 추가 작업 중
|
2023-09-04 16:31:04 +09:00 |
|
M1_IDMhan
|
f7b033ee32
|
Closed #21 Canon fire with E Key
|
2023-09-04 13:21:57 +09:00 |
|
M1_IDMhan
|
cc1ac655c4
|
#21 Projectile asset and fire canon
|
2023-09-04 12:20:01 +09:00 |
|
NTG_Lenovo
|
2f56d399c0
|
Ai 이동속도 증가, Main_TG 씬 추가
|
2023-09-04 10:39:51 +09:00 |
|
NTG_Lenovo
|
1b2c12ec4e
|
메인 씬, Boat 변경
|
2023-08-31 16:44:36 +09:00 |
|
NTG_Lenovo
|
71e56b558b
|
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
# Conflicts:
# BlueWater/Assets/02.Scripts/AssaultMode/Boat.cs
|
2023-08-31 16:39:15 +09:00 |
|
NTG_Lenovo
|
dc00036723
|
#29 유닛 이동 방식 수정 중
1. IDamageable 인터페이스 수정
2. Ai 프리팹 크기 변경, 깃발 LookAt 추가
3. Boat 공격 선택 매개변수 제거
|
2023-08-31 16:38:08 +09:00 |
|
M1_IDMhan
|
9384999047
|
#11 Mouse cursor change
|
2023-08-31 15:46:13 +09:00 |
|
M1_IDMhan
|
09c56b52f9
|
#11 Background material change, Mouse cursor change
|
2023-08-31 01:55:43 +09:00 |
|
M1_IDMhan
|
62618284b0
|
#25 Clone card from card list
|
2023-08-31 00:36:22 +09:00 |
|
NTG_Lenovo
|
89367e7d56
|
#28 동적 캐릭터 생성 방식 테스트용
|
2023-08-30 16:20:31 +09:00 |
|
NTG_Lenovo
|
ad7da74ed4
|
메인 씬 병합
|
2023-08-30 14:57:45 +09:00 |
|
NTG_Lenovo
|
98a205d804
|
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
# Conflicts:
# BlueWater/Assets/02.Scripts/DataManager.cs
|
2023-08-30 14:19:51 +09:00 |
|
NTG_Lenovo
|
a8e34e4f3b
|
#28 유닛 생성 및 배치 방식 변경 테스트용(씬 병합)
|
2023-08-30 14:18:09 +09:00 |
|
M1_IDMhan
|
b3e439b5c4
|
#21 Canon ready
|
2023-08-30 14:17:26 +09:00 |
|
NTG_Lenovo
|
4ed3453f3b
|
#28 유닛 생성 방식 변경 중2
|
2023-08-30 11:10:16 +09:00 |
|
M1_IDMhan
|
575c6ef2d0
|
Closed #26 Camera change bug fix
|
2023-08-29 13:23:27 +09:00 |
|
NTG_Lenovo
|
ea170ca058
|
#28 유닛 생성 방식 변경 중
|
2023-08-29 12:41:24 +09:00 |
|
|
|
6438ca89a0
|
closed #27 AiView, AiStat, Unit, Card SO 추가
1.enum 변수들 NONE = 0 -> NONE = -1 변경
2.meleeWeapon -> closeWeapon 이름 변경
3.BaseCharacter(기본캐릭터) 조립형 프리팹 수정
|
2023-08-29 04:52:23 +09:00 |
|
