iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542 Commits 1 Branch 0 Tags 6.5 GiB
9da8b228f1
Commit Graph

542 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
NTG
9da8b228f1 Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG 2024-04-09 04:57:53 +09:00
NTG
0419e10b21 Closed #229 항해, 전투 공용 아이템 드랍 기능 추가 2024-04-09 04:57:31 +09:00
IDMhan
ca89b2d13b Closes #228 Customer AI Improve 2024-04-07 14:56:58 +09:00
IDMhan
733cf4fd65 Closes #224 #227 Excel To Json, Time*Weather 2024-04-03 14:09:36 +09:00
NTG_Lenovo
091ff073ea #230 날씨 변경 중 2024-04-02 14:09:52 +09:00
NTG_Lenovo
15bf5ce8c6 WeatherUi 수정 2024-04-02 11:43:43 +09:00
IDMhan
054d3fea61 #227 Tycoon Cozy 2024-04-02 11:38:35 +09:00
IDMhan
f7560740a7 Merge remote-tracking branch 'origin/develop' into develop 2024-04-02 11:25:15 +09:00
IDMhan
ca2f1f2b54 #225 #224 DB Data, Nuget 2024-04-02 11:25:07 +09:00
IDMhan
1f2168c7a7 #225 Customer DB, #224 Nuget Import 2024-04-02 11:24:39 +09:00
NTG_Lenovo
d35afb28b9 WeatherUi 수정 2024-04-02 11:10:51 +09:00
NTG
6fa993ca16 #230 CozyManager 추가 2024-04-02 02:46:53 +09:00
NTG_Lenovo
dba82d7d05 [Combat] 2D맵 베이스용 Player 테스트 중 2024-03-28 15:42:56 +09:00
NTG
12e5fb6ea9 누락 요소 추가 2024-03-26 03:49:06 +09:00
NTG
2582474c4f #222 프로토타입용 날씨 적용 2024-03-26 03:48:45 +09:00
NTG
a7d6359b6f Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG 2024-03-25 13:26:20 +09:00
NTG
e9076319aa #222 프로포타입용 날씨 개발 중 2024-03-25 13:24:33 +09:00
IDMhan
d908da59d8 [ASSETS] COZY 3: Stylized Weather 2024-03-25 12:19:30 +09:00
NTG
679a5ef2c1 Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG 
# Conflicts:
#	BlueWater/Assets/03.Images/Tycoon/Floors/Materials/restaurant_wall_front.mat.meta
 2024-03-22 13:19:05 +09:00
IDMhan
2a8a34b53e Closes #223 2D Object Now Look At Main Camera 2024-03-21 02:03:12 +09:00
NTG_Lenovo
9a0fd5c27e #222 프로토타입 날씨 작업 중 2024-03-18 15:39:53 +09:00
IDMhan
b9e7848fd7 Merge2 2024-03-18 11:51:18 +09:00
IDMhan
707333453e [ASSETS] Cozy Weather 2024-03-18 11:40:36 +09:00
NTG
6f8968999f 날씨 테스트 2024-03-18 04:21:42 +09:00
hho2
dfa8cc4c02 99타이쿤2 
램스타일 업데이트중
 2024-03-18 01:49:45 +09:00
hho2
a454ab076b 씬99 렘스타일 
램스타일로 수정
 2024-03-12 20:36:04 +09:00
IDMhan
b6244ce29f [NAVERWORKS] Npc Worry Talk 2024-03-10 23:32:50 +09:00
IDMhan
0b46505abf [NAVERWORKS] npc animator 2024-03-10 21:49:35 +09:00
IDMhan
f8ab0d5ca9 [NAVERWORKS] npc come in when open 2024-03-10 19:35:18 +09:00
IDMhan
9c47feb790 [NAVERWORKS] Npc when open 2024-03-10 19:11:50 +09:00
IDMhan
aefbbb64dc Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset
 2024-03-10 17:51:53 +09:00
IDMhan
68c818c4af [NAVERWORKS] 1,2,3,4 
1. Beer size down
2. Character size down
3. Food now 20count
4. Door On/Off Anime
 2024-03-10 17:51:09 +09:00
NTG
c134612583 Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG 2024-03-07 13:34:35 +09:00
NTG
f35a8a441f 02.Tycoon_video 영상용 씬 추가 
+ SPUM 캐릭터 프리팹 값 초기화
+ NavMesh 재설정
+ KitchenController sotPosition 변경
+ 손님용 TestMove 스크립트 추가
 2024-03-07 13:34:10 +09:00
hho2
68c2574122 씬 99스파인 추가 
캐릭터 추가
 2024-03-07 01:40:00 +09:00
NTG
cfd67e6d83 Bubble 재수정 2024-03-05 21:24:25 +09:00
NTG
0ae3c10412 Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG 2024-03-05 21:16:39 +09:00
NTG
bb7b4276a4 Bubble 수정 2024-03-05 21:15:49 +09:00
hho2
229531d695 씬 99타이쿤 작업 
청소 애니메이션 추가
 2024-03-05 21:08:07 +09:00
NTG
628697db67 Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG 2024-03-05 21:05:16 +09:00
NTG
7a743ef740 Bubble 스프라이트 애니메이션 추가 2024-03-05 21:00:50 +09:00
hho2
5f65e496c6 씬 99타이쿤 추가작업(애니메이션) 
씬 99타이쿤 추가작업
 2024-03-05 20:58:13 +09:00
NTG
444c8c6e61 Ocean씬 Terrain 수정 
+ OceanWater material 수정
+ Pirate Cannon projectile 주황색으로 변경
+ Player Cannon 속도 방식으로 변경
+ 임시 바다 몬스터 추가
 2024-03-05 15:23:30 +09:00
NTG
779f56cd53 Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG 2024-03-05 12:47:38 +09:00
NTG
86f9d2607e Closes #213 #214 해적선 Ai 추가 및 항해 씬 취합 
+ 해적선 Ai 추가
  ㄴ 패트롤, 추격, 공격 등의 패턴 적용
+ Cannon 클래스 분리
  ㄴ 캐논 자체의 기능만 남기고, Player는 CannonController와 연결해서 사용
+ Player, Pirate 용 cannon projectile 분리
+ New input system 네이밍 변경
  ㄴ ToggleCannon -> ToggleLaunchMode
  ㄴ FireCannon -> LaunchCannon
+ 해적선 Ai에 Rayfire(파괴) 기능 테스트용 추가
 2024-03-05 12:47:17 +09:00
IDMhan
0a6a42ef2c #193 light on off 2024-03-03 23:04:28 +09:00
IDMhan
c0c6e98fef Merge remote-tracking branch 'origin/develop' into develop 2024-03-03 19:55:55 +09:00
IDMhan
37175c31ae #193 switch and scene 2024-03-03 19:55:46 +09:00
hho2
c00f77c37c 씬 타이쿤 스파인 테스트완 
씬 타이쿤 스파인 테스트완
 2024-03-02 19:12:43 +09:00
NTG
35440098e4 Closes #220 부유물 드랍 기능 추가 
+ 부유물 Barrel, BigBarrel 프리팹 추가
  ㄴ 각각 코인 x50, x100 부여
+ BaseBoids Variant 3종 추가
  (망치머리상어, 금붕어, 가오리)
+ 02.Ocean 씬에 부유물, Boids 배치
+ 02.Ocean water material 옵션 변경
 2024-03-02 16:10:25 +09:00