iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
283 Commits 1 Branch 0 Tags 6.5 GiB
2e7348ed52
Commit Graph

283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NTG_Lenovo
2e7348ed52 #43 FieldBoss01 Test.ver001 
+ 03.Stage_Test_SJ2 씬 추가 (성진님 테스트용)
+ Layer Skill 추가
+ LavaEruption 스킬 로직 변경, 데미지 공유
+ 플레이어 공격 받을 때, 카메라 쉐이킹 테스트
 2023-11-30 13:16:35 +09:00
NTG_Lenovo
2d1ed3f287 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:49:44 +09:00
IDMhan
2114b9e41a [HOTFIX] Bugfix 2023-11-30 10:49:29 +09:00
NTG_Lenovo
273800abcf Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-30 10:48:06 +09:00
IDMhan
0ea6254cdd Fixed #61 cameraShake 2023-11-30 10:47:37 +09:00
NTG_Lenovo
4ec33e70fe Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 
# Conflicts:
#	BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianAttackParticleMaterial.mat
#	BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianDustMaterial.mat
#	BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTopDownGroundRocks.mat
#	BlueWater/Assets/Feel/FeelDemos/Barbarians/Materials/FeelBarbarianTopDownMountains.mat
#	BlueWater/Assets/Feel/FeelDemos/Blob/Materials/FeelBlobEyes.mat
#	BlueWater/Assets/Feel/FeelDemos/Blob/Materials/FeelBlobPlastic.mat
#	BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarBodyRed.mat
#	BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarBodyYellow.mat
#	BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarWheels.mat
#	BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchCarWindows.mat
#	BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchChalet.mat
#	BlueWater/Assets/Feel/FeelDemos/SquashAndStretch/Materials/FeelSquashAndStretchGround.mat
#	BlueWater/Assets/Feel/FeelDemos/Tactical/Materials/FeelTacticalShirtMaterial.mat
#	BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_BlueSquares.mat
#	BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_DarkGreyCrosses.mat
#	BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_DarkGreyDots.mat
#	BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_GreenCrosses.mat
#	BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_LightGreyDots.mat
#	BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_RedSquares.mat
#	BlueWater/Assets/Feel/MMTools/Tools/MMPrototypeTextures/MMBRP_Materials/MMBPR_YellowCrosses.mat
 2023-11-30 10:46:32 +09:00
IDMhan
286a4d0b3c Closes #61 CameraShake, Class name change TimeManager -> VisualFeedbackManager 2023-11-30 10:45:24 +09:00
NTG_Lenovo
8069748e49 맵 크기 변경 
+ 스킬 구조 변경
+ 공격시 히트스톱 추가
+ Lava 추가 중
 2023-11-29 15:13:25 +09:00
IDMhan
c4b6c61ebb Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	BlueWater/ProjectSettings/DynamicsManager.asset
 2023-11-29 11:40:29 +09:00
IDMhan
6f1cbf4cd9 Closes #60 HitStop 2023-11-29 11:39:46 +09:00
NTG
7e1d42fb76 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-11-28 22:46:23 +09:00
NTG
c61ccb46a5 $43 FieldBoss01 테스트 작업 
+ FieldBoss01 BT 구현
+ FieldBoss01가 사용하는 스킬(LineRush, LavaEruption, BigLavaEruption, VolcanicEruption) 추가
+ 보스 전용 HpSlider 추가
 2023-11-28 22:45:40 +09:00
IDMhan
93505c673b Closes #59 Jail can not use 2 NPC 2023-11-24 14:25:47 +09:00
IDMhan
207156cef9 Closes #53 Prison -> Jail, Now Player Can Order Go To Jail NPC, And Bark 2023-11-24 11:15:02 +09:00
IDMhan
1a972a3018 Closes #50 #51 Use Toilet And Vomit, NPC Get Around Points 2023-11-24 02:52:14 +09:00
IDMhan
851911ce39 #51 Revoke Npc MotionSick System And MaxValue 100 -> 300 (30Sec) 2023-11-22 23:08:47 +09:00
NTG_Lenovo
44a8603258 #43 보스 스킬 작업 중 2023-11-22 16:20:22 +09:00
NTG_Lenovo
d5fd449fb7 #43 보스 몬스터 구현 중 2023-11-21 16:31:14 +09:00
IDMhan
a82255ee81 Closes #55 In Ship Camera Follow Offset revoke when end interaction 2023-11-21 04:48:10 +09:00
NTG_Lenovo
2cbd7dd194 #43 기본 보스 구성 중 
+ 2d형 기본 맵 구성 중
+ 스파인 오브젝트 테스트
 2023-11-21 04:48:10 +09:00
NTG_Lenovo
ab4354cc43 #44 스킬 시스템 구현 및 플레이어 스킬 공격 추가 2023-11-21 04:48:09 +09:00
NTG
bd43540064 #44 스킬 시스템 구현 중2 2023-11-21 04:48:09 +09:00
NTG_Lenovo
b0650b9eb3 #44 스킬 시스템 구현 중 
+ Skill관련 image, material, shader 추가
+ ISkill 인터페이스 삭제
+ ActiveSkill 메커니즘 변경
+ RadiusActiveSkill 구현
 2023-11-21 04:48:09 +09:00
NTG_Lenovo
7b5665a11b + RPG indicator 에셋 추가 (스킬 예시) 2023-11-21 04:48:09 +09:00
NTG_Lenovo
7df78bab8b 보스 스킬 쉐이더 작업 중 2023-11-21 04:48:08 +09:00
IDMhan
5c3dbf8b63 BarkUI layer index change 2023-11-20 14:31:17 +09:00
IDMhan
9acecd2322 Closes #49 Apply Grid Each Room 2023-11-18 03:27:34 +09:00
IDMhan
3ed6f92ae3 Closes #47 Block Grid 2023-11-17 14:12:23 +09:00
IDMhan
9661f313fa #45 Add GridObject RumBarrel, Chickenroom @GoDoRii 2023-11-16 01:42:23 +09:00
IDMhan
cd9f632457 Closes #46 Now ZKey Rotation Only Left/Right @GoDoRii 2023-11-16 01:15:11 +09:00
IDMhan
dc08b450c8 #45 Housing Object and new inship house 2023-11-13 15:48:15 +09:00
IDMhan
23f12cf724 Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	BlueWater/Assets/Editor.meta
#	BlueWater/Assets/Editor/SpineSettings.asset.meta
 2023-11-01 18:25:46 +09:00
IDMhan
436243fa0f #45 Housing system with Grid builder asset 2023-11-01 18:25:09 +09:00
NTG_Lenovo
4a70315d56 Spine 런타임 에셋 추가 
+ iDamageable 관통률 삭제
+ #44 스킬 시스템 구성 및 임시 스킬 FireBoom 작업
 2023-11-01 16:39:12 +09:00
NTG_Lenovo
3fcf2edf68 스킬 시스템 밑작업 중 2023-10-31 16:37:23 +09:00
NTG
a0a3fd6030 Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-10-31 03:51:03 +09:00
NTG
96f1528a96 closed #42 회피 중 공격 수정 
+ 필드 보스 작업 중
 2023-10-31 03:50:02 +09:00
IDMhan
a35f0327d8 #37 Nature AI (Vomit whit motionSick) 2023-10-31 00:45:05 +09:00
NTG
2840306ceb PlayerInput 방식 변경 
+ 기존의 SendMessage 형식 사용
+ 집 데스크탑 씬 동기화
 2023-10-26 19:48:26 +09:00
mappy
eebe94dda0 Merge remote-tracking branch 'origin/main' 2023-10-26 18:49:44 +09:00
mappy
aca0ff6f44 플레이 테스트 안되는거 수정 2023-10-26 18:48:36 +09:00
IDMhan
4b664495b9 Merge remote-tracking branch 'origin/main' 2023-10-26 17:52:13 +09:00
IDMhan
a15c9eb789 #37 OrderToPrisonState, RestorePreviousState and Light setting 2023-10-26 17:52:06 +09:00
NTG_Lenovo
c8d1acec32 #42 플레이어 수동 제어로 변경 
+ Input System 로직 변경 및 Actions 추가
  ㄴ 컴포넌트 내의 Behavior :
     SendMessage -> Invoke Unity Events
  ㄴ OnEnable, OnDisable에서 이벤트 연결 방식
+ 마우스 왼쪽 키, K 기본 공격
+ 마우스 Space 키 구르기(무적)
+ 구르기 중 Trail 파티클로 임시 표현
+ 공격 시 Trail Particles로 임시 범위 표시
 2023-10-26 16:00:08 +09:00
NTG_Lenovo
50841c604f Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG 2023-10-26 15:55:08 +09:00
NTG_Lenovo
642e189c1c #42 플레이어 수동 제어 변경 
+ Crewmate가 target이 있으면 따라오지 않게 변경
+ Player Input Attack 추가
+ 플레이어 공격 잔상 테스트
 2023-10-25 16:32:57 +09:00
mappy
999f45a7ea 태건님 씬 고쳐준거 업로드 2023-10-24 18:02:34 +09:00
NTG_Lenovo
397d0fe410 씬 재로딩시 crewmate 리스폰 추가 작업 중 2023-10-24 16:27:11 +09:00
IDMhan
2a2f66f1e3 Merge remote-tracking branch 'origin/main' 2023-10-24 11:29:58 +09:00
IDMhan
4617e57d59 #37 Interaction and convarsation 2023-10-24 11:29:50 +09:00