Commit Graph

183 Commits

Author SHA1 Message Date
NTG_Lenovo
2c0fcd5e48 0.3.5.6 2024-12-03 15:08:15 +09:00
NTG_Lenovo
5c2ab045d7 0.3.5.5 2024-12-02 20:43:08 +09:00
SweetJJuya
4d6a7eb32e Temp_Save 2024-12-02 20:28:46 +09:00
Nam Tae Gun
9d4c461d07 0.3.5.0 2024-11-30 20:53:38 +09:00
Nam Tae Gun
b5dc9b0f91 0.3.4.24 2024-11-29 17:34:20 +09:00
Nam Tae Gun
9a70355b61 0.3.4.22 2024-11-29 08:07:50 +09:00
NTG_Lenovo
62a17ed600 결과창 작업중 2024-11-26 20:46:32 +09:00
NTG_Lenovo
c0f227e54b Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-26 17:22:46 +09:00
SweetJJuya
39ff17b22c 0.3.4.18 2024-11-26 17:18:41 +09:00
NTG_Lenovo
3e986edc1a 0.3.4.17 2024-11-25 21:36:48 +09:00
Nam Tae Gun
e969065f7b 0.3.4.16(2) 2024-11-25 10:40:15 +09:00
NTG_Lenovo
afb747cc79 0.3.4.16 2024-11-21 20:05:59 +09:00
SweetJJuya
0b3cb03a9d 0.3.4.13 2024-11-19 22:48:41 +09:00
SweetJJuya
273df8d6ed 0.3.4.11 2024-11-19 21:53:00 +09:00
SweetJJuya
bda714eb94 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/04.Materials/Ink.mat
2024-11-19 16:58:37 +09:00
SweetJJuya
9c064a2f01 0.3.4.9 2024-11-19 16:58:11 +09:00
NTG_Lenovo
0c68cfe87a 0.3.4.8 업데이트 2024-11-19 15:03:43 +09:00
Nam Tae Gun
4d9362fc20 0.3.4.2 업데이트 2024-11-17 23:21:16 +09:00
Nam Tae Gun
d9110b34df 0.3.4.1 업데이트 2024-11-17 13:29:57 +09:00
5b886f8b9d 홀 예시 씬 T45 2024-11-16 02:29:19 +09:00
Nam Tae Gun
57b21c004f 0.3.4.0 2024-11-15 16:28:13 +09:00
SweetJJuya
e35844537f 0.3.3.22 2024-11-12 20:25:00 +09:00
NTG_Lenovo
0af5d8e69f 0.3.3.18 업데이트 2024-11-12 15:58:33 +09:00
NTG_Lenovo
10605c71be 0.3.3.17 업데이트 2024-11-11 21:23:27 +09:00
NTG_Lenovo
ffb6fbc26a 0.3.3.16 2024-11-11 18:51:12 +09:00
NTG_Lenovo
5143cb3bff 0.3.3.11 업데이트 2024-11-11 15:09:32 +09:00
Nam Tae Gun
a116f24499 0.3.3.10 업데이트 2024-11-11 11:02:24 +09:00
NTG_Lenovo
88d38d95a2 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-07 21:21:08 +09:00
NTG_Lenovo
cffcaa531b 0.3.3.9 업데이트 2024-11-07 21:20:24 +09:00
SweetJJuya
c2616e30d7 0.3.3.8 2024-11-07 21:02:00 +09:00
NTG_Lenovo
ecc036a98d 0.3.3.7 업데이트 2024-11-07 18:13:54 +09:00
NTG_Lenovo
778f3645cc Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-11-05 21:27:53 +09:00
SweetJJuya
1dd6f3c4a0 0.3.3.4 2024-11-05 21:27:14 +09:00
NTG_Lenovo
c5887fcbec 0.3.3.2 업데이트 2024-11-04 21:22:07 +09:00
NTG_Lenovo
7148065e2f 0.3.3.0 업데이트 2024-10-31 21:18:34 +09:00
SweetJJuya
e549e19ab7 0.3.2.20 2024-10-31 21:17:10 +09:00
SweetJJuya
d50f24b8e0 0.3.2.16 2024-10-29 20:38:36 +09:00
SweetJJuya
19a78c1200 Merge branch 'ntg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/Manual.cs
#	Assets/02.Scripts/Ui/Tycoon/ManualBook.cs
2024-10-29 15:49:54 +09:00
SweetJJuya
4dd40c4c1d 0.3.2.15 2024-10-29 15:46:50 +09:00
1de6e70778 홀 3차07 2024-10-28 20:06:08 +09:00
NTG_Lenovo
30423a4755 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-28 18:10:54 +09:00
NTG_Lenovo
0f6fb12605 0.3.2.10 업데이트 2024-10-28 18:10:34 +09:00
SweetJJuya
619ce13f38 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg 2024-10-21 17:00:37 +09:00
SweetJJuya
c60d6e6286 0.3.1.6 2024-10-21 17:00:11 +09:00
NTG_Lenovo
d4486a2f06 Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-21 16:53:54 +09:00
NTG_Lenovo
fa5d184120 Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg 2024-10-21 15:03:43 +09:00
SweetJJuya
3c7e2ba313 0.3.1.5 업데이트 2024-10-21 14:47:20 +09:00
080a67502b 홀 3차06 2024-10-21 04:29:39 +09:00
Nam Tae Gun
555b2507a8 0.3.1.4 업데이트 2024-10-21 02:21:39 +09:00
7b8322cc34 Gitea connect 2024-10-18 18:22:54 +09:00
Nam Tae Gun
07c0e21a57 Initial commit 2024-10-14 20:13:08 +09:00
SweetJJuya
c33e3c095f Merge branch 'ntg' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg 2024-10-10 18:34:25 +09:00
NTG_Lenovo
5e6aced848 Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-10-10 18:34:23 +09:00
SweetJJuya
108c038858 0.3.1.3 2024-10-10 18:33:50 +09:00
NTG_Lenovo
dd3a023793 0.3.1.1 업데이트 2024-10-10 17:42:20 +09:00
NTG_Lenovo
5787b83b30 빌지 Ui 작업 중 2024-10-08 22:44:20 +09:00
NTG_Lenovo
b000128df3 Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-10-08 15:14:16 +09:00
NTG_Lenovo
330567c868 0.3.0.9 업데이트 2024-10-08 15:13:52 +09:00
SweetJJuya
82a22c8ea5 0.3.0.8 2024-10-08 15:12:27 +09:00
NTG_Lenovo
411f1079b0 0.3.0.7 업데이트 2024-10-07 15:43:01 +09:00
Nam Tae Gun
4764097f6a 0.3.0.6 업데이트 2024-10-07 08:41:09 +09:00
Nam Tae Gun
aa425699c1 Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg 2024-10-06 19:27:50 +09:00
Nam Tae Gun
ccab946896 Merge branch 'lmg' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/11.BehaviorTree/Customer.asset
2024-10-06 19:27:26 +09:00
SweetJJuya
5a5a784f98 0.3.0.5 2024-10-03 19:59:07 +09:00
fdc09ac22d 홀 3차05 2024-10-03 17:34:12 +09:00
700c773d57 홀 3차04 2024-10-03 02:29:49 +09:00
NTG_Lenovo
c9eb09e0fb 스파인 캐릭터 수정 및 타이쿤 스테이지 로직 수정 중 2024-09-30 18:41:55 +09:00
NTG_Lenovo
9d7723d0ee Liquid Ui 수정 중 2024-09-26 20:50:39 +09:00
8c959e2016 홀 3차02 2024-09-26 01:25:53 +09:00
NTG_Lenovo
9bee0a9b74 Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-09-24 19:31:54 +09:00
SweetJJuya
a4ec830929 0.3.0.1 2024-09-24 19:09:17 +09:00
f50a8bee87 홀 3차01 2024-09-23 20:35:38 +09:00
NTG_Lenovo
f9ac16f30f Ver 3.0.0.0 업데이트 2024-09-23 19:18:47 +09:00
Nam Tae Gun
a4637e74ba 타이쿤 기능 붙이는 중 2024-09-23 11:00:21 +09:00
Nam Tae Gun
a69152b060 Merge branch 'lmg' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs
2024-09-22 23:52:16 +09:00
NTG_Lenovo
7bc9f8e922 타이쿤 맵 수정 중 2024-09-12 19:03:21 +09:00
SweetJJuya
8bb0f299c3 카드 효과 추가 2024-09-12 16:38:16 +09:00
NTG_Lenovo
8cd0005329 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-09-12 13:09:16 +09:00
419390a998 홀 2차02 2024-09-11 17:36:18 +09:00
NTG_Lenovo
a5b460bfe0 술 제조 작업 중2 2024-09-10 19:25:05 +09:00
NTG_Lenovo
4ddf944b31 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
# Conflicts:
#	Assets/02.Scripts/Editor/JsonHelperEditor.cs
#	Assets/02.Scripts/Ui/Tycoon/DrinkIngredientUi.cs
2024-09-10 16:25:23 +09:00
62ff30cdb0 Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into develop 2024-09-09 20:02:00 +09:00
f33992c9ee 홀 2차01 2024-09-09 20:01:47 +09:00
SweetJJuya
0a3addea9a 카드 추가 2024-09-09 18:50:37 +09:00
NTG_Lenovo
8246b3bc7d Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg 2024-09-05 14:49:40 +09:00
2dc619b8df 홀 수정03 2024-09-05 01:12:34 +09:00
NTG_Lenovo
340408a8d4 Bar Ui 작업 중 2024-09-02 22:45:46 +09:00
NTG_Lenovo
6591e1a66f Idx 자료형 변경 int -> string 2024-08-22 19:39:15 +09:00
NTG_Lenovo
a5c698521b 타이쿤씬 액체 따르기 테스트 추가 2024-08-13 19:13:09 +09:00
NTG_Lenovo
241f66c777 물 에셋 추가 2024-08-06 16:37:03 +09:00
d7010a279b 타이쿤 추가 업데이트 내용
+ 화면 밖에서 손님이 요구하는 중일 때, Indicator를 통해서 Ui 표시
+ Open, Closed Ui 추가 및 기능 연결
+ 테이블 찾는 로직 변경 (전부 랜덤) - 기존에는 항상 같은 순서로 자리를 채움
+ 통계용 데이터 CustomerVisitInfo 추가 (추후에 통계Ui 생길 때 연결)
+ 대화 조건 변경
+ 일부 가구들 상호작용 조건 변경

+ Outline shader Render Face(Front -> Both 변경 - Front면 x축 뒤집는 경우 안나옴)
+ GraphicMaterialOverride를 사용하는 경우, 에디터에서 전체화면 등 특정 상황에서 material이 사라지는 버그 수정
+ InteractionFuniture Open, Closed 공통 기능으로 병합
2024-07-22 09:42:29 +09:00
35ba2fd160 99타이쿤씬꾸미기08
쓰레기통, 식기세척, 장작더미 추가
2024-07-20 21:19:22 +09:00
1458693a1b 타이쿤 업데이트 정리
+ 상호작용 오브젝트 외곽선 기능 추가
+ 손님 계산 기능 추가
+ 손님 계산 시 Ui 출력 및 파티클, 효과 추가
+ 대화 시스템 로직 수정
+ 테이블 수정
+ 캐릭터 스파인 교체
2024-07-20 20:32:54 +09:00
34f48c7e0e 99타이쿤씬꾸미기07 2024-07-17 19:21:47 +09:00
49a1c45e8e 누락 요소 추가 2024-07-16 17:44:12 +09:00
2da4157509 타이쿤 맵 전체 수정 및 프리팹 수정 2024-07-16 17:43:47 +09:00
f1fcd10077 타이쿤 Ui 테스트용 기본 기능 추가
+ excel 수정
+ 테스트용 이미지 연결
2024-07-16 01:20:39 +09:00
d405036868 99타이쿤씬꾸미기06 2024-07-14 03:45:04 +09:00
381cfd89c9 99타이쿤씬꾸미기05 2024-07-13 19:01:57 +09:00
8eb7c5f841 99타이쿤씬꾸미기04 2024-07-11 17:37:00 +09:00