iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
72 Commits 1 Branch 0 Tags 6.5 GiB
7e3932f30b
Commit Graph

70 Commits

Author SHA1 Message Date
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
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
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
NTG
6b7b33dbb3 Physic 프로젝트 셋팅 변경 
Weapon->Ground, Water
 2023-08-11 03:13:18 +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
8af4158f44 #10 Add Projectile Asset 2023-08-10 17:23:04 +09:00
M1_IDMhan
784b0c364d #13 Boat now make mouse spot and line renderer 2023-08-10 15:39:59 +09:00
M1_IDMhan
51b44fddb8 #13 Boat Prefabs change 2023-08-10 13:42:03 +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
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
775c58ca76 Git Server Test 2023-08-07 22:18:15 +09:00
koko
05cf8201d8 아일랜드 테스트 씬 업로드 2023-08-06 02:40:08 +09:00
M1_IDMhan
174619aeee Add GUI Pack, Ordin Asset 2023-08-05 01:53:27 +09:00
M1_IDMhan
551b0ac8ed #11 Shader Change 2023-08-05 01:02:49 +09:00
mappy
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
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
NTG_Lenovo
bd465b9f89 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 
# Conflicts:
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiController.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiStat.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/AiWeight.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Archer.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Axeman.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SpearKnight.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Spearman.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/SwordKnight.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Ai/Type/Swordman.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiBase.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IAiStat.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Interface/IDamageable.cs.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility.meta
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs
#	BlueWater/Assets/Cube World Set URP - Proto Series/Assets/Bitgem/Cube_World/_Materials/URP_Multicolor_Material/Multicolor shader related/Editor/Utility/Utils.cs.meta
 2023-08-03 14:33:33 +09:00
NTG_Lenovo
bd9c1a6cef #7 Add NavMeshAgent and layer 
fixed aiPrefab
 2023-08-03 14:32:17 +09:00
M1_IDMhan
9c462a3910 #5 bad north testmap 2023-08-03 13:15:00 +09:00
NTG_Lenovo
08826dfc19 Code cleanup 2023-08-03 12:54:59 +09:00
NTG_Lenovo
c86dc6b7b2 #7 Add rigidbody and collider of aiPrefab 
Additional commit content
- Set aiStat for testing
- Add ai interface script
- Add layer and fix physics setting
 2023-08-03 12:38:50 +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