iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
199 Commits 1 Branch 0 Tags 6.5 GiB
59c4b14d1a
Commit Graph

48 Commits

Author SHA1 Message Date
NTG
59c4b14d1a #34 #35 InIslandPlayer, Ai 2D 베이스 변경 작업 
+ SPUM 프리팹 NavMeshAgent 위치 변경, 콜라이더, Agent 크기 변경
+ SPUM에서 제공되는 NormalAnimator의 공격 모션에 Event 추가
+ Ork 프리팹 UnitRoot에 Animator Bridge 추가
+ IAiView 타겟을 검색하는 Ai 인터페이스 추가
+ IHelpCall 주변 아군에게 타겟을 공유하는 인터페이스 추가
+ 기존 02.Scripts.Ai.BehaviorTree에는 그대로 냅두고,
  02.Scripts.Ai.NewBehaviorTree 폴더를 추가하여 사용
+ Enemy의 BehaviorTree인 Minion 추가
+ InIslandPlayer의 기본 이동 구현
 2023-10-12 05:26:45 +09:00
NTG
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
NTG
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
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
e5ef5dca35 #31 Z key now can make card 2023-09-20 18:06:45 +09:00
NTG
5f20d3d57a #24 화살타워(ArrowTower) 만드는 중 2023-09-20 02:22:19 +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
30ad001eea #31 Assault mode camera view 2023-09-18 14:06:11 +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
NTG_Lenovo
243fcbd0ef #23 디펜스 AI 보완 작업 중 
+ 공격 애니메이션 수정
+ NavMesh 장애물, 회피 수정
 2023-09-05 16:17: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
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
ea4320988c #21 Ready for canon shot and destroy object 2023-08-22 14:31:24 +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
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
7ba25e1296 #13 bug fix and test shader 2023-08-16 10:38:47 +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
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
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
6051afd27c Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-08-08 01:13:34 +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
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
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
3973258f79 #6 Default Gerstner Wave 2023-08-03 10:03:08 +09:00
M1_IDMhan
ddcb3e31b0 #6 InputAction, #5 Add Quibli Asset 2023-08-02 18:12:26 +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