iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
363 Commits 1 Branch 0 Tags 6.5 GiB
278868a690
Commit Graph

247 Commits

Author SHA1 Message Date
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
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
NTG
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
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
NTG
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
NTG
8a54f64a2e DataManager 수정 2023-08-24 16:15:32 +09:00
NTG
52efb99600 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 
# Conflicts:
#	BlueWater/Assets/02.Scripts/DataManager.cs
 2023-08-24 16:12:39 +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
NTG_Lenovo
daa0c9f06e #25 카드 시스템 작업 중 유니티 버전 변경 2023-08-23 16:24:31 +09:00
M1_IDMhan
46a19eb8c0 Merge remote-tracking branch 'origin/main' 2023-08-23 11:58:08 +09:00
M1_IDMhan
d00ede5aa3 #21 Canon camera setting 2023-08-23 11:58:03 +09:00
NTG_Lenovo
bd2803b002 싱글톤 수정 버전 2023-08-23 11:09:21 +09:00
M1_IDMhan
6c78a25e45 #25 Add card list 2023-08-23 10:10:33 +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
NTG
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
b8753696e5 hotfix GameManager.cs 2023-08-17 12:47:02 +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
eb99ca0575 Merge remote-tracking branch 'origin/main' 2023-08-17 11:02:26 +09:00
M1_IDMhan
7e3932f30b Close #19 Ship rocking 1st fix completed 2023-08-17 11:02:18 +09:00
NTG_Lenovo
c7350db4f3 CreateUnit 인덱스 오류 수정 2023-08-17 10:52:14 +09:00
NTG_Lenovo
8b7f3a14fd AiController 빌드 오류 수정(전처리기 위치 변경) 2023-08-17 10:48:13 +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
7ba25e1296 #13 bug fix and test shader 2023-08-16 10:38:47 +09:00
NTG_Lenovo
fb7893d0f5 #7 FieldOfView, AiMover 삭제 후 AiController의 인터페이스화 
Ai 프리팹 구성요소 변경
 2023-08-16 08:34:55 +09:00
NTG
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
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
NTG
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
NTG
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
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
NTG
ea03670618 #12 Add conditions for using the camera zoom function 2023-08-08 02:23:37 +09:00
NTG
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
NTG
6051afd27c Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-08-08 01:13:34 +09:00
M1_IDMhan
551b0ac8ed #11 Shader Change 2023-08-05 01:02:49 +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
mappy
613cd78fa4 Merge remote-tracking branch 'origin/main' 2023-08-03 14:50:29 +09:00
mappy
e22ac739d1 메터리얼 색깔 입력, 테스트 씬 수정 2023-08-03 14:50:08 +09:00
NTG_Lenovo
f1c4bdc95b 1. move script folder location 
2. change namespace "BlueWater -> BlueWaterProject"
 2023-08-03 14:49:05 +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