SweetJJuya
a90dc55ab5
0.3.4.14
2024-11-19 23:19:54 +09:00
SweetJJuya
0b3cb03a9d
0.3.4.13
2024-11-19 22:48:41 +09:00
SweetJJuya
d38a40cde4
Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
...
# Conflicts:
# Assets/04.Materials/Ink.mat
2024-11-19 22:34:20 +09:00
SweetJJuya
826bc20b0c
0.3.4.11
2024-11-19 22:33:54 +09:00
NTG_Lenovo
86a0e22151
0.3.4.12
2024-11-19 22:32:43 +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
63472acde1
0.3.4.10 업데이트
2024-11-19 16:57:05 +09:00
NTG_Lenovo
e3bd934991
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-11-19 15:58:29 +09:00
SweetJJuya
ecd28edebe
0.3.4.9
2024-11-19 15:57:50 +09:00
NTG_Lenovo
0c68cfe87a
0.3.4.8 업데이트
2024-11-19 15:03:43 +09:00
Nam Tae Gun
4c46b87a95
0.3.4.7
2024-11-19 10:12:01 +09:00
Nam Tae Gun
9ef51bd5e4
0.3.4.6 업데이트
2024-11-18 19:07:19 +09:00
Nam Tae Gun
00be1f84dd
0.3.4.5 빌드 테스트 버전
2024-11-18 13:08:32 +09:00
Nam Tae Gun
3a0c28d3e3
0.3.4.4
2024-11-18 12:51:28 +09:00
Nam Tae Gun
fc0b648b04
0.3.4.3 업데이트
2024-11-18 00:36:08 +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
Nam Tae Gun
6298020485
Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-11-16 03:14:30 +09:00
Nam Tae Gun
959c3f31b4
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-11-16 03:14:06 +09:00
5b886f8b9d
홀 예시 씬 T45
2024-11-16 02:29:19 +09:00
SweetJJuya
30276c6ff4
0.3.4.0(2)
2024-11-15 22:12:39 +09:00
Nam Tae Gun
859333272b
0.3.4.0(2)
2024-11-15 16:41:17 +09:00
Nam Tae Gun
57b21c004f
0.3.4.0
2024-11-15 16:28:13 +09:00
NTG_Lenovo
c905337c94
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-11-12 21:07:37 +09:00
NTG_Lenovo
2d78b0d2a0
0.3.3.23 업데이트
2024-11-12 21:07:23 +09:00
SweetJJuya
e35844537f
0.3.3.22
2024-11-12 20:25:00 +09:00
SweetJJuya
7d45253810
0.3.3.21
2024-11-12 18:33:07 +09:00
NTG_Lenovo
3b6420352c
0.3.3.20
2024-11-12 18:15:42 +09:00
NTG_Lenovo
2117b3004f
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-11-12 17:07:28 +09:00
NTG_Lenovo
92abe1a1b6
0.3.3.19
2024-11-12 17:07:17 +09:00
NTG_Lenovo
0af5d8e69f
0.3.3.18 업데이트
2024-11-12 15:58:33 +09:00
NTG_Lenovo
cf861878fc
0.3.3.17(2) 업데이트
2024-11-12 15:24:44 +09:00
koko
c86ad5f07a
레벨 난이도 감소 (Excel, Json, SO)
2024-11-12 02:40:51 +09:00
NTG_Lenovo
10605c71be
0.3.3.17 업데이트
2024-11-11 21:23:27 +09:00
SweetJJuya
4e64449e02
0.3.3.16
2024-11-11 20:11:10 +09:00
NTG_Lenovo
e11c1db205
0.3.3.16(2)
2024-11-11 18:54:28 +09:00
NTG_Lenovo
d093750e27
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-11-11 18:51:22 +09:00
NTG_Lenovo
ffb6fbc26a
0.3.3.16
2024-11-11 18:51:12 +09:00
SweetJJuya
439595f03c
0.3.3.15
2024-11-11 18:50:41 +09:00
NTG_Lenovo
517e0324e8
0.3.3.14 업데이트
2024-11-11 16:29:53 +09:00
NTG_Lenovo
3e78113bd5
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
...
# Conflicts:
# Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs
2024-11-11 16:25:25 +09:00
SweetJJuya
c2b3b589e4
0.3.3.13
2024-11-11 16:23:21 +09:00
NTG_Lenovo
d01a2ba262
0.3.3.12 업데이트
2024-11-11 16:06:33 +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
61c4fd1094
0.3.3.6 업데이트
2024-11-07 15:13:57 +09:00
ad7b10ce44
홀 구조 수정시안
2024-11-06 18:45:29 +09:00
NTG_Lenovo
07cdaa296a
0.3.3.5(2)
2024-11-05 21:31:03 +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
NTG_Lenovo
396d0d67d8
0.3.3.5 업데이트
2024-11-05 21:27:46 +09:00
SweetJJuya
1dd6f3c4a0
0.3.3.4
2024-11-05 21:27:14 +09:00
NTG_Lenovo
10bf2d0638
0.3.3.3 업데이트
2024-11-05 17:26:26 +09:00
NTG_Lenovo
c5887fcbec
0.3.3.2 업데이트
2024-11-04 21:22:07 +09:00
Nam Tae Gun
aae5bef8f0
0.3.3.1 업데이트
2024-10-31 22:25:31 +09:00
NTG_Lenovo
5a3c2a1ac4
0.3.3.0(2) 업데이트
2024-10-31 21:20:00 +09:00
NTG_Lenovo
b593824caa
Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-10-31 21:18:48 +09:00
NTG_Lenovo
7148065e2f
0.3.3.0 업데이트
2024-10-31 21:18:34 +09:00
NTG_Lenovo
77df4bd899
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-10-31 21:17:55 +09:00
SweetJJuya
e549e19ab7
0.3.2.20
2024-10-31 21:17:10 +09:00
cb605083da
Merge remote-tracking branch 'origin/develop' into develop
2024-10-31 21:04:16 +09:00
204453c5a7
칵테일 DB, 카드 DB 수정
2024-10-31 21:03:55 +09:00
402118db93
홀 4차02
2024-10-31 19:58:14 +09:00
7a7c4dd846
Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into develop
2024-10-31 14:50:31 +09:00
1ec3377e7a
홀 4차01
2024-10-31 14:50:06 +09:00
NTG_Lenovo
b6182e8d0a
0.3.2.19 업데이트
2024-10-31 14:41:13 +09:00
NTG_Lenovo
72281e727c
Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-10-31 14:29:08 +09:00
SweetJJuya
853c595078
0.3.2.18
2024-10-31 14:28:45 +09:00
SweetJJuya
d4d2580abd
0.3.2.18
2024-10-31 14:28:29 +09:00
NTG_Lenovo
2696026118
0.3.2.17(2)
2024-10-29 21:17:17 +09:00
NTG_Lenovo
726063fcf6
0.3.2.17 버전 업데이트
2024-10-29 21:17:00 +09:00
SweetJJuya
3cb6c7b52b
0.3.2.16
2024-10-29 20:45:46 +09:00
SweetJJuya
d50f24b8e0
0.3.2.16
2024-10-29 20:38:36 +09:00
SweetJJuya
8945c191f3
0.3.2.15
2024-10-29 19:43:07 +09:00
SweetJJuya
f2fed8df8f
0.3.2.15
2024-10-29 15:52:17 +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
NTG_Lenovo
1dcd03e018
0.3.2.14 업데이트
2024-10-29 15:45:18 +09:00
723c2598ac
책상 쓰레기 확률 증가
2024-10-29 14:24:56 +09:00
6374e23a46
Merge remote-tracking branch 'origin/develop' into develop
2024-10-28 21:20:08 +09:00
3161695f08
난이도 변경 (excel, json, so 수정)
2024-10-28 21:19:38 +09:00
NTG_Lenovo
fa924e2e06
0.3.2.13 업데이트
2024-10-28 21:11:31 +09:00
NTG_Lenovo
11c4e11a14
0.3.2.12 업데이트
2024-10-28 21:02:31 +09:00
NTG_Lenovo
4b2eb0c117
0.3.2.11 업데이트
2024-10-28 20:42:22 +09:00
8e69d88137
카드 데이타 테이블 리버트, 칵테일 데이터 다시 재업로드
2024-10-28 20:33:57 +09:00
56ba83c239
칵테일 오차율 변경 (Excel, json, SO)
2024-10-28 20:29:09 +09:00
8a6fa4168d
Merge remote-tracking branch 'origin/develop' into develop
2024-10-28 20:08:54 +09:00
5cd6a03e7e
난이도 수정, 리스폰 속도 감소.
...
(excel, json, so 수정)
2024-10-28 20:08:42 +09:00
1de6e70778
홀 3차07
2024-10-28 20:06:08 +09:00
NTG_Lenovo
3db4870837
0.3.2.10 업데이트2 (병합)
2024-10-28 18:27:48 +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
c58074df41
0.3.2.9
2024-10-28 18:09:18 +09:00
NTG_Lenovo
1cf7b9a48f
0.3.2.8 누락된 업데이트 추가
2024-10-28 14:09:06 +09:00
NTG_Lenovo
3b66a33d2f
0.3.2.8 업데이트
2024-10-28 13:52:11 +09:00
SweetJJuya
da35977888
Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
...
# Conflicts:
# Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs
2024-10-28 13:24:39 +09:00
SweetJJuya
5fb234e991
0.3.2.7
2024-10-28 13:24:04 +09:00
NTG_Lenovo
18909909fe
0.3.2.6 업데이트
2024-10-28 13:09:10 +09:00
Nam Tae Gun
87f6ddf1ea
0.3.2.5 버전 업데이트
2024-10-27 18:44:22 +09:00
NTG_Lenovo
b54b4a8b43
0.3.2.4 업데이트
2024-10-24 17:05:32 +09:00
9ca698b56f
토 확률, 책상 더러워 확률 증가 (SO 수정)
2024-10-24 16:57:34 +09:00
8013366e64
손님 대기 시간 수정, EXP 수정, 등장 속도 수정
...
(엑셀, json, SO 모두 수정)
2024-10-24 16:57:08 +09:00
SweetJJuya
c3bdefa642
Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into lmg
...
# Conflicts:
# Assets/02.Scripts/Item/Cocktail/CocktailData.cs
2024-10-24 14:05:51 +09:00
SweetJJuya
a85c91211e
0.3.2.3
2024-10-24 14:04:40 +09:00
NTG_Lenovo
17a5a96b53
CocktailIngredient 데이터 직렬화
2024-10-24 14:03:18 +09:00
Nam Tae Gun
99a8e9b653
0.3.2.2 업데이트
2024-10-23 14:26:56 +09:00
NTG_Lenovo
9b82a39ff1
0.3.2.1 누락 요소 추가3
2024-10-22 21:51:22 +09:00
NTG_Lenovo
17d2abc545
0.3.2.1 누락 요소 추가2
2024-10-22 21:47:02 +09:00
NTG_Lenovo
05e75346b6
0.3.2.1 누락요소 추가
2024-10-22 21:44:27 +09:00
NTG_Lenovo
86036c4408
Merge branch 'develop' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
2024-10-22 21:42:00 +09:00
NTG_Lenovo
10a7c01066
0.3.2.1 버전 업데이트
2024-10-22 21:41:31 +09:00
92fd6b7f19
레벨 데이터 엑셀, json 수정 변경
2024-10-22 17:27:46 +09:00
b4958c28a6
레벨 데이터 테이블 수치 수정
2024-10-21 19:16:33 +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
517285cbc3
0.3.2.0 테스트용 버전 업데이트
2024-10-21 16:58:20 +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
c1f07f81bd
테스트용 푸쉬
2024-10-17 14:19:42 +09:00
Nam Tae Gun
31ea50c10a
Init commit
2024-10-16 03:01:16 +09:00
Nam Tae Gun
07c0e21a57
Initial commit
2024-10-14 20:13:08 +09:00
Nam Tae Gun
ece403f3f1
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
...
# Conflicts:
# Assets/01.Scenes/99.Tycoon43.unity
2024-10-10 23:27:35 +09:00
56c17a8486
홀 3차06
2024-10-10 19:32:02 +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
b34dfa2ddb
0.3.1.2 업데이트
2024-10-10 18:32:18 +09:00
NTG_Lenovo
dd3a023793
0.3.1.1 업데이트
2024-10-10 17:42:20 +09:00
NTG_Lenovo
37612b8dbe
0.3.1.0 업데이트
2024-10-10 14:44:37 +09:00
NTG_Lenovo
18f78706d0
Merge branch 'lmg' of http://175.209.66.186/capersunity/newbluewater into ntg
2024-10-10 14:42:17 +09:00
SweetJJuya
ce32862586
0.3.0.11
2024-10-10 14:41:47 +09:00
NTG_Lenovo
5283f75745
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
2024-10-10 12:59:03 +09:00
Nam Tae Gun
699adb2415
Bill Ui 수정
2024-10-10 11:37:44 +09:00
NTG_Lenovo
5787b83b30
빌지 Ui 작업 중
2024-10-08 22:44:20 +09:00
SweetJJuya
0f8f398c99
0.3.0.10
2024-10-08 15:45:46 +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
9155cb3002
홀조명세팅
2024-10-07 17:45:00 +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
SweetJJuya
b08abbc6b3
0.3.0.4
2024-10-03 16:55:56 +09:00
700c773d57
홀 3차04
2024-10-03 02:29:49 +09:00
NTG_Lenovo
b601a284ff
ai 플로우 수정 중
2024-09-30 21:05:19 +09:00
4ae778acb0
홀 3차03
2024-09-30 20:31:06 +09:00
NTG_Lenovo
c9eb09e0fb
스파인 캐릭터 수정 및 타이쿤 스테이지 로직 수정 중
2024-09-30 18:41:55 +09:00
Nam Tae Gun
2856d83f25
칵테일 제조 Ui 변경
2024-09-30 11:11:09 +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
9af080fda2
Ver 0.3.0.2 업데이트
2024-09-24 19:35:49 +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
b325dc5304
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into ntg
...
# Conflicts:
# Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs
2024-09-23 00:55:52 +09:00
SweetJJuya
b08c8ef39f
카드효과 추가
2024-09-23 00:49:43 +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
9ae0556534
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
2024-09-12 16:56:52 +09:00
NTG_Lenovo
98b22b3677
통합 EventManager 생성
2024-09-12 16:53:16 +09:00
SweetJJuya
9169603d09
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
...
# Conflicts:
# Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs
2024-09-12 16:40:03 +09:00
SweetJJuya
8bb0f299c3
카드 효과 추가
2024-09-12 16:38:16 +09:00
NTG_Lenovo
b5638a435a
데이터 구조 방식 변경
2024-09-12 16:36:24 +09:00
SweetJJuya
a105013227
json 수정
2024-09-12 13:30:48 +09:00
SweetJJuya
c5b90896a4
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
2024-09-12 13:25:57 +09:00
SweetJJuya
463ad93200
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
...
# Conflicts:
# Assets/02.Scripts/Editor/JsonHelperEditor.cs
2024-09-12 13:25:17 +09:00
SweetJJuya
6b5d4da610
2024_09_10
2024-09-12 13:17:34 +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
bf9c6f1491
플레이어 체력 연동 중
2024-09-10 19:52:32 +09:00
NTG_Lenovo
a5b460bfe0
술 제조 작업 중2
2024-09-10 19:25:05 +09:00
NTG_Lenovo
9be98366fa
술 제조 작업 중
2024-09-10 16:26:29 +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
NTG_Lenovo
a5767065c6
렌더 텍스처 수정 중
2024-09-09 21:27:15 +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
b81f9d567e
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
2024-09-09 18:51:35 +09:00
SweetJJuya
0a3addea9a
카드 추가
2024-09-09 18:50:37 +09:00
NTG_Lenovo
288e6a7897
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
2024-09-09 13:16:10 +09:00
678e97eac2
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into develop
2024-09-05 19:08:06 +09:00
d0358629a3
홀 수정04
2024-09-05 19:07:49 +09:00
NTG_Lenovo
319a005027
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
...
# Conflicts:
# Assets/01.Scenes/01.Tycoon.unity
2024-09-05 18:47:34 +09:00
SweetJJuya
0a635bce74
Merge branch 'develop' of http://gitlab.capers.co.kr/capersunity/newbluewater into lmg
2024-09-05 18:41:14 +09:00
SweetJJuya
7ce2094032
VCA 추가
2024-09-05 18:39:51 +09:00
SweetJJuya
2a56a257df
항해씬 임시 동결
2024-09-05 18:33:06 +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
4bac95ec9b
Bar Ui 작업 중2
2024-09-03 21:04:25 +09:00
9129c7bf70
홀 수정02
2024-09-03 03:20:51 +09:00
NTG_Lenovo
340408a8d4
Bar Ui 작업 중
2024-09-02 22:45:46 +09:00
SweetJJuya
5ba54aceb9
Merge remote-tracking branch 'origin/develop' into develop
2024-09-02 14:07:10 +09:00
SweetJJuya
60e4e3f5d4
최신화
2024-09-02 14:06:21 +09:00
NTG_Lenovo
a43bf4c613
DB 최신화
2024-09-02 14:03:17 +09:00
068ec3e140
홀 수정01
2024-08-31 21:20:03 +09:00
NTG_Lenovo
1d9fb1c5a9
씬 저장
2024-08-29 18:54:48 +09:00
NTG_Lenovo
718274154f
양조장 분리, Drink 시스템 보완
2024-08-29 18:51:32 +09:00
NTG_Lenovo
94742936ff
Drink, Cocktail 시스템 및 Ui 작업 중
2024-08-27 21:23:41 +09:00
NTG_Lenovo
6591e1a66f
Idx 자료형 변경 int -> string
2024-08-22 19:39:15 +09:00
NTG_Lenovo
8bf142b2e5
액체 쉐이더 테스트 중4
2024-08-19 19:56:07 +09:00
NTG_Lenovo
2330d6407b
Curved World 에셋 추가
2024-08-19 18:08:56 +09:00
NTG_Lenovo
599951614b
액체 쉐이더 테스트 중3
2024-08-19 17:14:35 +09:00
Nam Tae Gun
b7c333f477
액체 쉐이더 테스트 중2
2024-08-19 12:15:31 +09:00
NTG_Lenovo
f8b42ee64c
액체 쉐이더 테스트 중
2024-08-14 19:52:35 +09:00
NTG_Lenovo
a5c698521b
타이쿤씬 액체 따르기 테스트 추가
2024-08-13 19:13:09 +09:00
NTG_Lenovo
241f66c777
물 에셋 추가
2024-08-06 16:37:03 +09:00
Nam Tae Gun
ded71235e9
6000.0.13f1 버전 업그레이드
2024-08-06 10:24:08 +09:00
bd2e96429d
Todo 수정 내용 삭제
2024-07-22 09:44:38 +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
90a7fb1e49
타이쿤 맵 재수정 및 퇴장 대사 추가 및 수정
2024-07-21 03:55:30 +09:00
a7f7dbd09a
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
2024-07-21 00:38:27 +09:00
3867dfacfb
타이탄 맵 재수정 및 프리팹 변경
2024-07-21 00:38:11 +09:00
koko
c0b5bfc422
Merge remote-tracking branch 'origin/develop' into develop
2024-07-21 00:36:17 +09:00
koko
e1923ffa1b
레스토랑 시간 변경, NPC 대사 변경
2024-07-21 00:35:53 +09:00
5d78b87eeb
테이블위치수정
2024-07-20 21:39:32 +09:00
35ba2fd160
99타이쿤씬꾸미기08
...
쓰레기통, 식기세척, 장작더미 추가
2024-07-20 21:19:22 +09:00
1458693a1b
타이쿤 업데이트 정리
...
+ 상호작용 오브젝트 외곽선 기능 추가
+ 손님 계산 기능 추가
+ 손님 계산 시 Ui 출력 및 파티클, 효과 추가
+ 대화 시스템 로직 수정
+ 테이블 수정
+ 캐릭터 스파인 교체
2024-07-20 20:32:54 +09:00
49d885447c
Merge branch 'develop' of http://175.209.66.186/capersunity/newbluewater into ntg
2024-07-17 22:13:55 +09:00
a1fcc10364
Crew 스파인 추가
2024-07-17 22:13:07 +09:00
42479c4c93
테이블3 프리팹 수정
2024-07-17 19:29:10 +09:00
34f48c7e0e
99타이쿤씬꾸미기07
2024-07-17 19:21:47 +09:00
0bbaf86ce7
타이쿤 배경음 추가
2024-07-17 19:11:30 +09:00
fd688231c2
타이쿤 맵 수정 및 손님 기능 추가
...
+ 요리 주문 기능 추가
+ Props 프리팹 일부 수정
+ 오늘의 메뉴 기능 연동
2024-07-17 01:05:53 +09:00
7a4a8b4a9f
프리팹 폴더 변경 및 base variant 수정
2024-07-16 18:52:15 +09:00
49a1c45e8e
누락 요소 추가
2024-07-16 17:44:12 +09:00
2da4157509
타이쿤 맵 전체 수정 및 프리팹 수정
2024-07-16 17:43:47 +09:00
60a85bba73
손님 스파인 추가
...
+ 스파인 캐릭터 랜덤 스킨 적용 기능 추가
2024-07-16 01:45:33 +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
77743b5114
99타이쿤씬꾸미기03
2024-07-11 04:41:54 +09:00
0536c8af35
게임 타이머 수정
2024-07-10 09:53:48 +09:00
279704f5ba
타이쿤 Ui작업 중 및 Board와 연결
2024-07-10 09:22:34 +09:00
db905f82b9
99타이쿤씬꾸미기02
2024-07-10 02:13:25 +09:00
d0dd97dbb4
99타이쿤씬꾸미기01
2024-07-09 21:46:25 +09:00
04fbc8c7d4
#7 상호작용 가구 추가 중
...
+ FireWood, Pot, PowerSwitch 가구 추가
+ GameTimeData 추가
2024-07-09 05:06:22 +09:00