7a2b5e9d02
Closes #255 거대 슬라임 보스 추가
...
+ UiManager의 CombatUi, OceanUi 모두 분리
각각의 씬에서 CombatUiManager, OceanUiManager로 변경
+ Ocean, OceanUi input action map 추가 및 변경
input action map, uiManager 변경에 따른 Player input 로직 변경
+ CombatPlayer가 죽으면 GameOverUi 추가
+ 재시작 기능 추가
+ 인벤토리 Ui 수정
+ 슬라임 보스 로직 및 애니메이션 수정
2024-05-12 06:29:16 +09:00
ed4312ba6f
99 컴뱃씬 디테일업
2024-05-08 15:39:54 +09:00
NTG_Lenovo
b3b4f4abc0
02.Combat_2D 씬 GroundFog 추가
2024-05-08 14:11:49 +09:00
NTG_Lenovo
9699c0534a
#255 거대 슬라임 작업2
2024-05-08 11:59:17 +09:00
bcefdb679c
#255 거대 슬라임 작업 중
2024-05-08 09:28:04 +09:00
7d11851f52
TitanSlime 추가 작업 중, IAnimationStateController 로직 수정
2024-05-08 04:05:50 +09:00
daa018eb35
Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
...
# Conflicts:
# BlueWater/ProjectSettings/Packages/com.unity.muse.common/Settings.json
2024-05-08 04:00:43 +09:00
IDMhan
15f05688d7
Merge remote-tracking branch 'origin/develop' into develop
2024-05-08 02:33:40 +09:00
IDMhan
685e30b35a
PausePopup UI
2024-05-08 02:32:50 +09:00
f1d0c6d371
Closes #244 , #254 CombatPlayer 개선, 하트 시스템 추가
...
+ CombatPlayer 기능별 분리
+ Combat, CombatUi 전용 input action map 추가
+ 스킬 시스템 로직 수정
+ 전투플레이어 스킬(검의 왈츠) 로직 변경
2024-05-08 00:37:33 +09:00
b6d58eae15
99씬 슬라임보스 프레임확장+idle추가
2024-05-06 18:41:10 +09:00
3a5675b2db
Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
2024-05-05 19:20:58 +09:00
0aa00f5ae4
씬99 컴뱃 슬라임보스 디테일업
2024-05-05 19:20:16 +09:00
8136be5113
Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
2024-05-05 14:06:36 +09:00
IDMhan
a1ac5704f1
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# BlueWater/ProjectSettings/Packages/com.unity.muse.common/Settings.json
2024-05-02 16:37:54 +09:00
IDMhan
fad3dd2f4a
#252 Title.cs, #253 Construction image ready
2024-05-02 16:37:21 +09:00
IDMhan
0cf0fdbd71
Closes #252 Title Scene
2024-05-02 16:36:39 +09:00
9f1fa6433e
99 컴뱃씬 슬라임 더미+전투맵 추가
2024-05-02 16:18:56 +09:00
NTG_Lenovo
e4ccf72d84
Combat2D 씬 작업 중
...
CombatPlayer 수정 작업 중
Input System 수정
2024-05-02 16:10:19 +09:00
NTG_Lenovo
be6a089e43
드랍 아이템 개선2
2024-04-30 11:48:52 +09:00
NTG_Lenovo
6c632e344d
Closed #249 드랍 아이템 개선 (동적이게)
2024-04-30 11:34:03 +09:00
3785c576fa
Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
2024-04-30 09:12:13 +09:00
3747f706f7
closed #232 , #233 인벤토리 시스템 적용
2024-04-30 09:11:59 +09:00
97e2e126fe
씬99 타이쿤3 업데이트
2024-04-30 03:18:00 +09:00
795d3cfb40
99 타이쿤3 씬 업데이트
2024-04-27 00:29:25 +09:00
IDMhan
34e6432261
Merge remote-tracking branch 'origin/develop' into develop
2024-04-23 02:53:07 +09:00
IDMhan
e5954dbe08
#225 Customer DB Update
2024-04-23 02:52:54 +09:00
0c9457a192
Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
2024-04-22 15:55:24 +09:00
64ced8e879
타이쿤 주방 수정
...
타이쿤 주방 수정
2024-04-21 22:48:46 +09:00
NTG_Lenovo
ebf1143545
Unity muse package
2024-04-18 14:41:07 +09:00
8ef6f5fa43
아이템 테이블 변경 및 추가
2024-04-17 23:56:29 +09:00
IDMhan
156722ad59
02.Tycoon Scene
2024-04-16 01:04:19 +09:00
IDMhan
b102cfb48d
Merge remote-tracking branch 'origin/develop' into develop
2024-04-16 01:04:03 +09:00
IDMhan
50e0487662
#225 Customer DB
2024-04-16 01:03:56 +09:00
9da8b228f1
Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
2024-04-09 04:57:53 +09:00
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
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
12e5fb6ea9
누락 요소 추가
2024-03-26 03:49:06 +09:00
2582474c4f
#222 프로토타입용 날씨 적용
2024-03-26 03:48:45 +09:00
a7d6359b6f
Merge branch 'develop' of 121.165.94.242:capers/bluewater into NTG
2024-03-25 13:26:20 +09:00
