Merge remote-tracking branch 'origin/main'

타이쿤씬 수정중
2025-01-16 20:07:16 +09:00 · 2025-01-16 20:04:13 +09:00
11 changed files with 202364 additions and 51786 deletions
--- a/Assets/01.Scenes/Old/00.CombatTitle.unity
+++ b/Assets/01.Scenes/Old/00.CombatTitle.unity
--- a/Assets/01.Scenes/Old/00.CombatTitle.unity.meta
+++ b/Assets/01.Scenes/Old/00.CombatTitle.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: fba5b932ccd629c4eb5144ef6902637c
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/01.Scenes/Old/00.CombatTitle2.unity
+++ b/Assets/01.Scenes/Old/00.CombatTitle2.unity
--- a/Assets/01.Scenes/Old/00.CombatTitle2.unity.meta
+++ b/Assets/01.Scenes/Old/00.CombatTitle2.unity.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 580d8444d5f5965408bf05cd3a59709b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/01.Scenes/Old/01.Tycoon.unity
+++ b/Assets/01.Scenes/Old/01.Tycoon.unity
--- a/Assets/01.Scenes/Old/04.TycoonTest.unity
+++ b/Assets/01.Scenes/Old/04.TycoonTest.unity
--- a/Assets/01.Scenes/Old/04.TycoonTest.unity.meta
+++ b/Assets/01.Scenes/Old/04.TycoonTest.unity.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b2b07a151b44ee849a1d12d9dc5bc87a
+guid: 88baecbcb33d9bd49ad918b556136d8d
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/01.Scenes/Old/99.T47.unity
+++ b/Assets/01.Scenes/Old/99.T47.unity
--- a/Assets/01.Scenes/Old/99.T47.unity.meta
+++ b/Assets/01.Scenes/Old/99.T47.unity.meta
--- a/Assets/01.Scenes/Old/99.T48.unity
+++ b/Assets/01.Scenes/Old/99.T48.unity
--- a/Assets/01.Scenes/Old/99.T48.unity.meta
+++ b/Assets/01.Scenes/Old/99.T48.unity.meta
Author	SHA1	Message	Date
hho210	3790861a5d	Merge remote-tracking branch 'origin/main'	2025-01-16 20:07:16 +09:00
hho210	5799f28fdf	타이쿤씬 수정중	2025-01-16 20:04:13 +09:00