diff --git a/Assets/02.Scripts/CustomInspector.cs b/Assets/02.Scripts/Editor/CustomInspector.cs similarity index 100% rename from Assets/02.Scripts/CustomInspector.cs rename to Assets/02.Scripts/Editor/CustomInspector.cs diff --git a/Assets/02.Scripts/CustomInspector.cs.meta b/Assets/02.Scripts/Editor/CustomInspector.cs.meta similarity index 100% rename from Assets/02.Scripts/CustomInspector.cs.meta rename to Assets/02.Scripts/Editor/CustomInspector.cs.meta diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs index 9a0abdb7f..33b3d6326 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs @@ -29,7 +29,7 @@ namespace BlueWater.Uis [field: SerializeField] private TextMeshProUGUI cocktailName; - [field: SerializeField, CLabel("메뉴얼 CockTail Prefab")] + [field: SerializeField] private ManualCocktailButton manualCocktailsPrefabs; [field: SerializeField] diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs index 7c208d4fc..ea50c8c53 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs @@ -45,29 +45,29 @@ namespace BlueWater.Uis //[field: SerializeField, CLabel("IDX"), ReadOnly] //private string _cardData = "AddAllLiquid"; - [field: SerializeField, CLabel("카드 이름")] + [field: SerializeField] private string cardName; //[field: SerializeField, CLabel("카드 이미지")] //private Image CardImage; - [field: SerializeField, CLabel("카드 텍스트")] + [field: SerializeField] private string cardText; private Coroutine _currentRotationCoroutine; [FormerlySerializedAs("RotationDurationCard")] [field: Title("카드 회전")] - [field: SerializeField, CLabel("카드 회전 속도")] + [field: SerializeField] internal float rotationDurationCard = 1.0f; - [field: SerializeField, CLabel("회전 가속 종류")] + [field: SerializeField] public Acceleration accelerationCard; [field: Title("부가효과 : 카드 기울기")] - [field: SerializeField, CLabel("최대 기울기(각도)")] + [field: SerializeField] internal float maxRotationAngle = 15f; - [field: SerializeField, CLabel("기울기 복원 속도")] + [field: SerializeField] internal float returnSpeed = 1.0f; private bool _isPointerInside; // 이미지 안에 마우스가 있는지 여부를 추적 diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs index f0f3f2d5e..975a90280 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonStartShopUi.cs @@ -12,7 +12,7 @@ namespace BlueWater.Uis { public class TycoonStartShopUi : PopupUi { - [SerializeField, CLabel("판매완료 프리팹")] + [SerializeField] private GameObject _soldOutPrefab; [SerializeField] diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset new file mode 100644 index 000000000..77e68a21d --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7e3976da977cb49238499ea3b4c237ae, type: 3} + m_Name: ProfileDataSourceSettings + m_EditorClassIdentifier: + profileGroupTypes: + - m_GroupTypePrefix: Built-In + m_Variables: + - m_Suffix: BuildPath + m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]' + - m_Suffix: LoadPath + m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]' + environments: [] + currentEnvironment: + id: + projectId: + projectGenesisId: + name: + isDefault: 0 diff --git a/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta new file mode 100644 index 000000000..1b3969db7 --- /dev/null +++ b/Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cba484ab334976d47b3bec3c10282d35 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/Windows.meta b/Assets/AddressableAssetsData/Windows.meta new file mode 100644 index 000000000..380621bcc --- /dev/null +++ b/Assets/AddressableAssetsData/Windows.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 98fd3690176e8034ebdf909eff24c1fa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 000000000..62ce7303c --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 000000000..80ee633cb --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 690c62745860f4a45968f90d5fd2322d +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UniversalRenderPipelineGlobalSettings.asset b/Assets/UniversalRenderPipelineGlobalSettings.asset index eba917e42..9fee1643c 100644 --- a/Assets/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/UniversalRenderPipelineGlobalSettings.asset @@ -55,7 +55,18 @@ MonoBehaviour: - rid: 5032277253446697262 - rid: 7789285205019197459 m_RuntimeSettings: - m_List: [] + m_List: + - rid: 5032277253446697243 + - rid: 5032277253446697244 + - rid: 5032277253446697245 + - rid: 5032277253446697247 + - rid: 5032277253446697248 + - rid: 5032277253446697251 + - rid: 5032277253446697253 + - rid: 5032277253446697255 + - rid: 5032277253446697258 + - rid: 5032277253446697259 + - rid: 5032277253446697262 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0524aa162..033c0ed39 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,9 +140,10 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.4.4 + bundleVersion: 0.3.4.5 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} + - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1