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
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
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
NTG_Lenovo
4437e44106
스크립트 실행 순서 변경(GameManager)
2023-09-18 15:46:56 +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
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
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
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
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
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
M1_IDMhan
c752857107
[Hotfix] Unity upgrade bug
2023-08-24 15:51:53 +09:00
M1_IDMhan
fce3aeae2f
Unity Version Upgrade 2023.1.9
2023-08-23 16:32:24 +09:00
M1_IDMhan
d00ede5aa3
#21 Canon camera setting
2023-08-23 11:58:03 +09:00
NTG_Lenovo
e066f0ea52
#25 카드시스템과 유닛 컨트롤러 연동 작업 중
...
Utils.LoadPrefabFromFolder() 폴더 내에서 프리팹 찾는 기능 추가
2023-08-22 15:48:37 +09:00
NTG_Lenovo
099520203e
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
2023-08-22 15:47:36 +09:00
M1_IDMhan
ea4320988c
#21 Ready for canon shot and destroy object
2023-08-22 14:31:24 +09:00
NTG_Lenovo
60da0d14a1
유닛 생성시 UnitController의 rotation에 영향을 받던 문제 해결
2023-08-22 12:34:18 +09:00
13cfeb3315
closed #9 근거리 Ai 공격, 충돌 테스트
...
#7 근거리 무기(MeleeWeapon) 추가
#8 부대 제어 수정 필요(기획 변경)
- Ai 버벅이던 현상 수정(Rigidbody interpolate 문제)
- UnitController 상세화(인스펙터창)
- 오펜스 관련 Ai 기본 설정
- Props 레이어 추가, House 태그 추가
- Physic 충돌 레이어 변경
- Ai 전체 프리팹 수정
- 테스트용 오펜스 ai 타겟 건물 추가
- Swordman 애니메이션 이벤트 누락 수정
2023-08-22 03:08:11 +09:00
NTG_Lenovo
ecb6f47713
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
2023-08-17 16:58:13 +09:00
NTG_Lenovo
7fa593f6ee
#8 유닛 이동, 공격 테스트 중
...
- Ai프리팹 이동속도 변경, 애니메이션 및 애니메이션 이벤트 추가 및 변경
- Enemy의 화살이 안맞는 오류 수정
- 유닛 생성시 UnitName이 아무 값도 안들어있으면 자동 이름변경
- 인터페이스(IAiMover, IFieldOfView, IDamageable) 구조 변경
- 유닛 선택 구조 변경(여러 유닛 겹쳐서 선택하던 오류 수정)
2023-08-17 16:57:46 +09:00
M1_IDMhan
3d83d5cc04
Merge remote-tracking branch 'origin/main'
...
# Conflicts:
# BlueWater/Assets/02.Scripts/GameManager.cs
2023-08-17 12:44:26 +09:00
M1_IDMhan
9cadf1d486
Close #20 Card on boat
2023-08-17 12:42:12 +09:00
NTG_Lenovo
6ba9aed9f9
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
2023-08-17 11:57:24 +09:00
NTG_Lenovo
11678cae8c
closed #22 AI 방패막기 애니메이션 추가
...
Layer - Unit 추가
UnitManager 싱글톤 변경(GameManager 수정)
2023-08-17 11:56:45 +09:00
M1_IDMhan
7e3932f30b
Close #19 Ship rocking 1st fix completed
2023-08-17 11:02:18 +09:00
M1_IDMhan
66711e9851
Merge remote-tracking branch 'origin/main'
2023-08-17 10:04:23 +09:00
M1_IDMhan
6efe51bd0b
#20 Boat on card ready
2023-08-17 10:04:08 +09:00
NTG_Lenovo
da77fa7740
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
...
# Conflicts:
# BlueWater/ProjectSettings/DynamicsManager.asset
# BlueWater/ProjectSettings/TagManager.asset
2023-08-16 14:44:36 +09:00
NTG_Lenovo
dbbb923e23
GlobalValue 추가
2023-08-16 14:40:33 +09:00
M1_IDMhan
ee942d0f2d
#13 LightingData.asset
2023-08-16 10:39:03 +09:00
M1_IDMhan
7ba25e1296
#13 bug fix and test shader
2023-08-16 10:38:47 +09:00
42f15c5a6e
#8 UnitController 이용한 Ai 그룹화 테스트
...
- 그룹 상호작용에 따른 하이라이트 효과 적용
1. 마우스 커서 올림 - 하얀색 외곽선
2. 그룹 선택 - 파란색 외곽선
- Arrow, Archer 코루틴 문제 구조 변경
- FieldOfView 인터페이스화
- new input system Unit Action 추가
- GameManager 슬로우모드(부대 선택시) 추가
- Ai 전체 프리팹 stat 수치 변경
- 원거리 이동 중에 공격시 멈추면서 공격하도록 변경
- Layer, ProjectSetting Physics 추가 및변경
2023-08-16 05:36:04 +09:00
M1_IDMhan
200ce10122
Closed #15 Character player movement
2023-08-15 17:29:24 +09:00
M1_IDMhan
6f44edcd7b
#13 Test Map
2023-08-14 01:13:03 +09:00
M1_IDMhan
56cd48ed12
#13 Now card effect on when card on ground, add asset All 1n One
2023-08-12 04:57:41 +09:00
M1_IDMhan
5b457ae5be
#13 Now summons boat prefab when user drop the card
2023-08-12 02:50:36 +09:00
M1_IDMhan
9e27d0f29f
Closed #17 InShipCam
2023-08-12 01:21:26 +09:00
5c03db81cf
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
...
# Conflicts:
# BlueWater/ProjectSettings/DynamicsManager.asset
# BlueWater/ProjectSettings/NavMeshAreas.asset
2023-08-11 03:04:15 +09:00
88f970c2d9
closed #10 , #14
...
1. 화살이 충돌하는 과정에서 버벅이는 버그 수정
2. 원거리 Ai(궁수) 공격 충돌 테스트 완료
3. 화살을 발사하는 구조 변경
기존 : 애니메이션 실행 후 일정 시간이 지나면 화살을 발사(렉걸리는 경우 싱크가 안맞음)
변경 후 : 애니메이션 클립을 복제해 애니메이션에 event를 추가하여 일정한 순간에 화살을 발사하게 변경(싱크 맞춤)
2023-08-11 03:03:23 +09:00
M1_IDMhan
02faf68af6
#13 Input name change and add infobox of variable
2023-08-11 02:47:30 +09:00
M1_IDMhan
a15e8cf91e
#15 Ready to movement in ship
2023-08-10 22:33:10 +09:00
M1_IDMhan
784b0c364d
#13 Boat now make mouse spot and line renderer
2023-08-10 15:39:59 +09:00
M1_IDMhan
5f95f67232
#13 Update boat and component references
2023-08-10 10:32:21 +09:00
M1_IDMhan
f47cabc061
#13 Remove redundant water materials, optimize Toon Water Material 2 and NavMesh settings, add new prefabs to main scene
2023-08-10 10:31:12 +09:00
M1_IDMhan
b65931de1a
#13 AssaultMode Boat Prefabs, Card Ani Change
2023-08-09 16:47:55 +09:00
NTG_Lenovo
86065e52a9
#10 Testing long range ai (arrow attack system)
...
Additional commit content
1. Modified ObjectPool Function(OnReleaseArrow and naming).
2. Modified hitBox tag in aiPrefab.
3. Modified Physics layer.
4. Modified TargetInfo variable from TargetTransform variable in FieldOfView script.
5. Added GetCurrentHp() in IAiStat script.
2023-08-09 16:44:09 +09:00
NTG_Lenovo
01a9906e95
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
...
# Conflicts:
# BlueWater/ProjectSettings/TagManager.asset
2023-08-09 10:44:57 +09:00
M1_IDMhan
749d3dc633
#13 Assault Mode Test
2023-08-09 01:58:35 +09:00
NTG_Lenovo
d72c13e43c
Testing a long-range attack ai
2023-08-08 16:53:35 +09:00
M1_IDMhan
68b2e11b1a
#13 Assasult Mode Test
2023-08-08 16:08:41 +09:00
NTG_Lenovo
f6d858dfec
1. Change the 02.Main_TG2 scene for testing
...
2. Add DebugType used for Utils.GetComponentAndAssert()
2023-08-08 14:33:49 +09:00
517ebcf21f
closed #12 Add island camera setting (ref.Bad North)
...
Camera function
- Zoom-in, Zoom-out, rotation
Additional commit content
- Add scene 02.Main_TG2
2023-08-08 01:43:26 +09:00
6051afd27c
Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
2023-08-08 01:13:34 +09:00
koko
05cf8201d8
아일랜드 테스트 씬 업로드
2023-08-06 02:40:08 +09:00
M1_IDMhan
551b0ac8ed
#11 Shader Change
2023-08-05 01:02:49 +09:00
2cf45d3dea
로우 폴리 베드노스 맵 테스트 씬 추가
2023-08-03 17:00:22 +09:00
NTG_Lenovo
8bd4a3f3ca
#7 Add FieldOfView script in aiPrefab
...
Additional commit content
- Add arrow prefab, script, objectPool system
- fixed 02.Main_TG Scene
- testing fieldOfView
2023-08-03 17:00:14 +09:00
613cd78fa4
Merge remote-tracking branch 'origin/main'
2023-08-03 14:50:29 +09:00
e22ac739d1
메터리얼 색깔 입력, 테스트 씬 수정
2023-08-03 14:50:08 +09:00
M1_IDMhan
9c462a3910
#5 bad north testmap
2023-08-03 13:15:00 +09:00
M1_IDMhan
0e44c44b85
#6 ship move
2023-08-03 11:54:21 +09:00
M1_IDMhan
3973258f79
#6 Default Gerstner Wave
2023-08-03 10:03:08 +09:00
M1_IDMhan
922ed8e56e
#6 Add Toon Water And GerstnerWave / InputAction Change
2023-08-03 02:10:40 +09:00
M1_IDMhan
ddcb3e31b0
#6 InputAction, #5 Add Quibli Asset
2023-08-02 18:12:26 +09:00
M1_IDMhan
13bb03c6ad
#6 Water Color And Fog Setting
2023-08-02 14:37:30 +09:00
M1_IDMhan
5c2d84e613
#6 Water And Ship
2023-08-02 14:36:11 +09:00
222ad73761
테스트 씬 업로드
2023-08-01 16:56:55 +09:00
53d042bfb8
Merge remote-tracking branch 'origin/main'
2023-08-01 16:34:52 +09:00
b606fbca41
테스트 씬 첫 번째 업로드
2023-08-01 16:25:29 +09:00
M1_IDMhan
c57b1bdd6e
#2 URP Setting Change
2023-08-01 14:50:37 +09:00
M1_IDMhan
e7a8d13457
#2 Add Crest Water
2023-08-01 14:46:51 +09:00
M1_IDMhan
37c2da9b9c
BlueWater First Push
2023-08-01 13:03:57 +09:00
