From 43899e355f9f6b059a1bfce2d96a9f9e289e2bfe Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Fri, 17 Apr 2026 18:02:36 +0900 Subject: [PATCH] =?UTF-8?q?2026-04-17=20=EC=9E=A5=EB=B3=B4=EA=B8=B0=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EB=B2=84=ED=8A=BC=20=ED=95=A0=EB=8B=B9=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MyProject/GameScene.unity | 4 +- Assets/02_Scripts/Data.meta | 8 + Assets/02_Scripts/Data/Shopping.meta | 8 + .../Data/Shopping/ShoppingOrderEntry.cs | 15 ++ .../Data/Shopping/ShoppingOrderEntry.cs.meta | 2 + .../Data/Shopping/ShoppingOrderList.cs | 14 ++ .../Data/Shopping/ShoppingOrderList.cs.meta | 2 + Assets/02_Scripts/Item/ItemData.cs | 13 +- Assets/02_Scripts/Managers/InputManager.cs | 29 ++++ .../02_Scripts/Managers/InputManager.cs.meta | 2 + .../02_Scripts/Managers/SceneLoadManager.cs | 2 + Assets/02_Scripts/Player.meta | 8 + Assets/02_Scripts/Player/PlayerController.cs | 10 ++ .../Player/PlayerController.cs.meta | 2 + Assets/02_Scripts/UI/ItemInfoPanel.cs | 4 +- Assets/02_Scripts/UI/ShoppingOrderRow.cs | 24 +++ Assets/02_Scripts/UI/ShoppingOrderRow.cs.meta | 2 + Assets/02_Scripts/UI/ShoppingOrderView.cs | 33 ++++ .../02_Scripts/UI/ShoppingOrderView.cs.meta | 2 + Assets/04_Textures/MemoPaper.png | 3 + Assets/04_Textures/MemoPaper.png.meta | 143 ++++++++++++++++++ Assets/07_UI.meta | 8 + Assets/07_UI/Shopping.meta | 8 + Assets/07_UI/Shopping/Prefabs.meta | 8 + .../Shopping/Prefabs/ShoppingOrderRow.prefab | 3 + .../Prefabs/ShoppingOrderRow.prefab.meta | 7 + Assets/08_Data.meta | 8 + Assets/08_Data/Items.meta | 8 + Assets/08_Data/Items/ChocoBar.asset | 3 + Assets/08_Data/Items/ChocoBar.asset.meta | 8 + Assets/08_Data/Items/PotatoChip.asset | 3 + Assets/08_Data/Items/PotatoChip.asset.meta | 8 + Assets/08_Data/Shopping.meta | 8 + .../08_Data/Shopping/ShoppingOrderList.asset | 3 + .../Shopping/ShoppingOrderList.asset.meta | 8 + .../Prefabs/RackAssets/ChipsCane.prefab | 4 +- .../Prefabs/RackAssets/ChocoBar.prefab | 4 +- .../TextMesh Pro/Resources/TMP Settings.asset | 4 +- 38 files changed, 422 insertions(+), 11 deletions(-) create mode 100644 Assets/02_Scripts/Data.meta create mode 100644 Assets/02_Scripts/Data/Shopping.meta create mode 100644 Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs create mode 100644 Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs.meta create mode 100644 Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs create mode 100644 Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs.meta create mode 100644 Assets/02_Scripts/Managers/InputManager.cs create mode 100644 Assets/02_Scripts/Managers/InputManager.cs.meta create mode 100644 Assets/02_Scripts/Player.meta create mode 100644 Assets/02_Scripts/Player/PlayerController.cs create mode 100644 Assets/02_Scripts/Player/PlayerController.cs.meta create mode 100644 Assets/02_Scripts/UI/ShoppingOrderRow.cs create mode 100644 Assets/02_Scripts/UI/ShoppingOrderRow.cs.meta create mode 100644 Assets/02_Scripts/UI/ShoppingOrderView.cs create mode 100644 Assets/02_Scripts/UI/ShoppingOrderView.cs.meta create mode 100644 Assets/04_Textures/MemoPaper.png create mode 100644 Assets/04_Textures/MemoPaper.png.meta create mode 100644 Assets/07_UI.meta create mode 100644 Assets/07_UI/Shopping.meta create mode 100644 Assets/07_UI/Shopping/Prefabs.meta create mode 100644 Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab create mode 100644 Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab.meta create mode 100644 Assets/08_Data.meta create mode 100644 Assets/08_Data/Items.meta create mode 100644 Assets/08_Data/Items/ChocoBar.asset create mode 100644 Assets/08_Data/Items/ChocoBar.asset.meta create mode 100644 Assets/08_Data/Items/PotatoChip.asset create mode 100644 Assets/08_Data/Items/PotatoChip.asset.meta create mode 100644 Assets/08_Data/Shopping.meta create mode 100644 Assets/08_Data/Shopping/ShoppingOrderList.asset create mode 100644 Assets/08_Data/Shopping/ShoppingOrderList.asset.meta diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index de22058a..ba8258f1 100644 --- a/Assets/01_Scenes/MyProject/GameScene.unity +++ b/Assets/01_Scenes/MyProject/GameScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f227fea50a9a17c1c4db3dd92227593658a9bfa1e33b5533067d843343b74ffc -size 13050696 +oid sha256:e8a5185efeff839afdf06e87375cc476ef3f88e0a8ddc2b53e6202da8c2b6448 +size 13140833 diff --git a/Assets/02_Scripts/Data.meta b/Assets/02_Scripts/Data.meta new file mode 100644 index 00000000..5d7826cb --- /dev/null +++ b/Assets/02_Scripts/Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 42138610c79ac4d458c8348120e399c4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Data/Shopping.meta b/Assets/02_Scripts/Data/Shopping.meta new file mode 100644 index 00000000..b40e9880 --- /dev/null +++ b/Assets/02_Scripts/Data/Shopping.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a796fd34ac5e02e4391fefa802c64cb9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs b/Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs new file mode 100644 index 00000000..aff9aa8e --- /dev/null +++ b/Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs @@ -0,0 +1,15 @@ +using System; +using VRShopping.Items; + +namespace VRShopping.Shopping +{ + [Serializable] + public class ShoppingOrderEntry + { + [UnityEngine.SerializeField] private ProductGroup _productGroup; + [UnityEngine.SerializeField, UnityEngine.Min(1)] private int _requiredQuantity = 1; + + public ProductGroup ProductGroup => _productGroup; + public int RequiredQuantity => _requiredQuantity; + } +} diff --git a/Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs.meta b/Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs.meta new file mode 100644 index 00000000..9954f354 --- /dev/null +++ b/Assets/02_Scripts/Data/Shopping/ShoppingOrderEntry.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 3a087096c894c024aa409c35c9b1b87d \ No newline at end of file diff --git a/Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs b/Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs new file mode 100644 index 00000000..ee558e2c --- /dev/null +++ b/Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs @@ -0,0 +1,14 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace VRShopping.Shopping +{ + [CreateAssetMenu(fileName = "ShoppingOrderList", menuName = "VR Shopping/Shopping Order List", order = 1)] + public class ShoppingOrderList : ScriptableObject + { + [SerializeField] private List _entries = new List(); + + public IReadOnlyList Entries => _entries; + public int Count => _entries.Count; + } +} diff --git a/Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs.meta b/Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs.meta new file mode 100644 index 00000000..a7654101 --- /dev/null +++ b/Assets/02_Scripts/Data/Shopping/ShoppingOrderList.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 79a3b1f54c1b0164ab96b9fc0618d0d5 \ No newline at end of file diff --git a/Assets/02_Scripts/Item/ItemData.cs b/Assets/02_Scripts/Item/ItemData.cs index cc4f0403..9dc1238d 100644 --- a/Assets/02_Scripts/Item/ItemData.cs +++ b/Assets/02_Scripts/Item/ItemData.cs @@ -10,22 +10,24 @@ public class ItemData : ScriptableObject [SerializeField] private string _displayName; [SerializeField] private string _brand; [SerializeField] private ItemCategory _category; + [SerializeField] private ProductGroup _productGroup; [Header("Pricing")] [SerializeField, Min(0)] private int _basePrice; [SerializeField, Range(0f, 1f)] private float _discountRate; [Header("Visuals")] - [SerializeField] private Sprite _icon; + //[SerializeField] private Sprite _icon; [SerializeField] private GameObject _prefab; public string ItemId => _itemId; public string DisplayName => _displayName; public string Brand => _brand; public ItemCategory Category => _category; + public ProductGroup ProductGroup => _productGroup; public int BasePrice => _basePrice; public float DiscountRate => _discountRate; - public Sprite Icon => _icon; + //public Sprite Icon => _icon; public GameObject Prefab => _prefab; public int FinalPrice => Mathf.RoundToInt(_basePrice * (1f - _discountRate)); @@ -43,4 +45,11 @@ public enum ItemCategory Household, Etc } + + public enum ProductGroup + { + None, + ChocoBar, + PotatoChip, + } } diff --git a/Assets/02_Scripts/Managers/InputManager.cs b/Assets/02_Scripts/Managers/InputManager.cs new file mode 100644 index 00000000..25c79971 --- /dev/null +++ b/Assets/02_Scripts/Managers/InputManager.cs @@ -0,0 +1,29 @@ +using System; +using UnityEngine; +using UnityEngine.InputSystem; + +public class InputManager : MonoBehaviour +{ + public static InputManager Instance; + + //인풋 매니저는 눌린 키에 대한 이벤트만 실행함. 어떤 로직이 등록되어있는지는 모른다. + public event Action XRLeftControllerPrimaryButton_Event; + + private void Awake() + { + if (Instance == null) + { + Instance = this; //만들어진 자신을 인스턴스로 설정 + } + else + { + Destroy(gameObject); //이미 인스턴스가 있으면 자신을 파괴 + } + } + + public void XRLeftControllerPrimaryButton(InputAction.CallbackContext ctx) + { + if(ctx.started) + XRLeftControllerPrimaryButton_Event?.Invoke(); + } +} diff --git a/Assets/02_Scripts/Managers/InputManager.cs.meta b/Assets/02_Scripts/Managers/InputManager.cs.meta new file mode 100644 index 00000000..204d126d --- /dev/null +++ b/Assets/02_Scripts/Managers/InputManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7932f9ffafd2066489578f2cc9e366d9 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs b/Assets/02_Scripts/Managers/SceneLoadManager.cs index 75e0a804..e7a63848 100644 --- a/Assets/02_Scripts/Managers/SceneLoadManager.cs +++ b/Assets/02_Scripts/Managers/SceneLoadManager.cs @@ -104,6 +104,8 @@ private async Awaitable SceneChange(string sceneName) { try { + SetSceneLoadingProgressValue(0f); + await SetSceneLoadingActive(true,1f); AsyncOperation op = SceneManager.LoadSceneAsync(sceneName); diff --git a/Assets/02_Scripts/Player.meta b/Assets/02_Scripts/Player.meta new file mode 100644 index 00000000..c1c85c6b --- /dev/null +++ b/Assets/02_Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b429503fb9f36be47b514764a3aaeadf +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/02_Scripts/Player/PlayerController.cs b/Assets/02_Scripts/Player/PlayerController.cs new file mode 100644 index 00000000..18dc8c49 --- /dev/null +++ b/Assets/02_Scripts/Player/PlayerController.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +public class PlayerController : MonoBehaviour +{ + + private void Start() + { + //InputManager.Instance.XRLeftControllerPrimaryButton_Event += 장보기 목록 온오프 함수 + } +} diff --git a/Assets/02_Scripts/Player/PlayerController.cs.meta b/Assets/02_Scripts/Player/PlayerController.cs.meta new file mode 100644 index 00000000..0d12343b --- /dev/null +++ b/Assets/02_Scripts/Player/PlayerController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e811ab6255885cc4cba7041d4f936b75 \ No newline at end of file diff --git a/Assets/02_Scripts/UI/ItemInfoPanel.cs b/Assets/02_Scripts/UI/ItemInfoPanel.cs index 1b8cb447..a6f80fb2 100644 --- a/Assets/02_Scripts/UI/ItemInfoPanel.cs +++ b/Assets/02_Scripts/UI/ItemInfoPanel.cs @@ -9,7 +9,7 @@ public class ItemInfoPanel : MonoBehaviour { [Header("Refs")] [SerializeField] private GameObject _root; - [SerializeField] private Image _iconImage; + //[SerializeField] private Image _iconImage; [SerializeField] private TMP_Text _nameText; [SerializeField] private TMP_Text _brandText; [SerializeField] private TMP_Text _priceText; @@ -31,11 +31,13 @@ public void Show(ItemData data) return; } + /* if (_iconImage != null) { _iconImage.sprite = data.Icon; _iconImage.enabled = data.Icon != null; } + */ if (_nameText != null) _nameText.text = data.DisplayName; if (_brandText != null) _brandText.text = data.Brand; diff --git a/Assets/02_Scripts/UI/ShoppingOrderRow.cs b/Assets/02_Scripts/UI/ShoppingOrderRow.cs new file mode 100644 index 00000000..42f39f9b --- /dev/null +++ b/Assets/02_Scripts/UI/ShoppingOrderRow.cs @@ -0,0 +1,24 @@ +using TMPro; +using UnityEngine; +using VRShopping.Shopping; + +namespace VRShopping.UI +{ + public class ShoppingOrderRow : MonoBehaviour + { + [SerializeField] private TMP_Text _nameText; + [SerializeField] private TMP_Text _quantityText; + + public void Bind(ShoppingOrderEntry entry) + { + if (entry == null) + { + gameObject.SetActive(false); + return; + } + + if (_nameText != null) _nameText.text = entry.ProductGroup.ToString(); + if (_quantityText != null) _quantityText.text = $"x{entry.RequiredQuantity}"; + } + } +} diff --git a/Assets/02_Scripts/UI/ShoppingOrderRow.cs.meta b/Assets/02_Scripts/UI/ShoppingOrderRow.cs.meta new file mode 100644 index 00000000..0e7ef66f --- /dev/null +++ b/Assets/02_Scripts/UI/ShoppingOrderRow.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 83f128a612dc1154e829fd29b9537948 \ No newline at end of file diff --git a/Assets/02_Scripts/UI/ShoppingOrderView.cs b/Assets/02_Scripts/UI/ShoppingOrderView.cs new file mode 100644 index 00000000..9146f032 --- /dev/null +++ b/Assets/02_Scripts/UI/ShoppingOrderView.cs @@ -0,0 +1,33 @@ +using UnityEngine; +using VRShopping.Shopping; + +namespace VRShopping.UI +{ + public class ShoppingOrderView : MonoBehaviour + { + [SerializeField] private ShoppingOrderList _orderList; + [SerializeField] private ShoppingOrderRow _rowPrefab; + [SerializeField] private Transform _rowContainer; + + private void Start() + { + Rebuild(); + } + + public void Rebuild() + { + if (_orderList == null || _rowPrefab == null || _rowContainer == null) return; + + for (int i = _rowContainer.childCount - 1; i >= 0; i--) + { + Destroy(_rowContainer.GetChild(i).gameObject); + } + + foreach (var entry in _orderList.Entries) + { + var row = Instantiate(_rowPrefab, _rowContainer); + row.Bind(entry); + } + } + } +} diff --git a/Assets/02_Scripts/UI/ShoppingOrderView.cs.meta b/Assets/02_Scripts/UI/ShoppingOrderView.cs.meta new file mode 100644 index 00000000..5fe9cc60 --- /dev/null +++ b/Assets/02_Scripts/UI/ShoppingOrderView.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 7cc0bf1dd5e1c2a459d8fb6ace6a166a \ No newline at end of file diff --git a/Assets/04_Textures/MemoPaper.png b/Assets/04_Textures/MemoPaper.png new file mode 100644 index 00000000..9cdb46b8 --- /dev/null +++ b/Assets/04_Textures/MemoPaper.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2703a683b5979a8ea42325be2e0683ceffb049ac1ba8e538bf9a9d03df2efe40 +size 13228 diff --git a/Assets/04_Textures/MemoPaper.png.meta b/Assets/04_Textures/MemoPaper.png.meta new file mode 100644 index 00000000..c557f062 --- /dev/null +++ b/Assets/04_Textures/MemoPaper.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 8e368d28e5c2fe84f9d127fa13070588 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_UI.meta b/Assets/07_UI.meta new file mode 100644 index 00000000..9cafe453 --- /dev/null +++ b/Assets/07_UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 184edff3843438e4caff8abc71666d08 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_UI/Shopping.meta b/Assets/07_UI/Shopping.meta new file mode 100644 index 00000000..34b7708a --- /dev/null +++ b/Assets/07_UI/Shopping.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b51c3b42530ddc94682082acb3a19437 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_UI/Shopping/Prefabs.meta b/Assets/07_UI/Shopping/Prefabs.meta new file mode 100644 index 00000000..52761655 --- /dev/null +++ b/Assets/07_UI/Shopping/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38d317c90b99e0f46b79d779c9db19e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab b/Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab new file mode 100644 index 00000000..385b7ad3 --- /dev/null +++ b/Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de336bd6a87deba47b312092595c1e28536fe8375f6661f5bf0791436bee100b +size 10468 diff --git a/Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab.meta b/Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab.meta new file mode 100644 index 00000000..dcff2844 --- /dev/null +++ b/Assets/07_UI/Shopping/Prefabs/ShoppingOrderRow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bbbb9560bc7c1f4439fbe415c92c4299 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data.meta b/Assets/08_Data.meta new file mode 100644 index 00000000..62572b18 --- /dev/null +++ b/Assets/08_Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a3c288e277f563419798ee73be3f8ff +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items.meta b/Assets/08_Data/Items.meta new file mode 100644 index 00000000..42e4ca31 --- /dev/null +++ b/Assets/08_Data/Items.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3dc984d3b9f25cd4989af63102b3d9c9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/ChocoBar.asset b/Assets/08_Data/Items/ChocoBar.asset new file mode 100644 index 00000000..9823e4a3 --- /dev/null +++ b/Assets/08_Data/Items/ChocoBar.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d076e3fc2ec207dcc703652d18b416eb802c8869ec0a600887f168149c2f7806 +size 734 diff --git a/Assets/08_Data/Items/ChocoBar.asset.meta b/Assets/08_Data/Items/ChocoBar.asset.meta new file mode 100644 index 00000000..d29e62e4 --- /dev/null +++ b/Assets/08_Data/Items/ChocoBar.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 174fd6d2cf1a28c4ca33bb3c1e7e64c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Items/PotatoChip.asset b/Assets/08_Data/Items/PotatoChip.asset new file mode 100644 index 00000000..52769203 --- /dev/null +++ b/Assets/08_Data/Items/PotatoChip.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68e066237a4f5e0c14ca1ad1a15537b66e840a856fd91d32a69c8bac210d286f +size 702 diff --git a/Assets/08_Data/Items/PotatoChip.asset.meta b/Assets/08_Data/Items/PotatoChip.asset.meta new file mode 100644 index 00000000..898cc83b --- /dev/null +++ b/Assets/08_Data/Items/PotatoChip.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5484240754a03643b2d57e2ab6cf155 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Shopping.meta b/Assets/08_Data/Shopping.meta new file mode 100644 index 00000000..c7429bad --- /dev/null +++ b/Assets/08_Data/Shopping.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 070f155b1a4803e4d83ef63351b0a8d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/08_Data/Shopping/ShoppingOrderList.asset b/Assets/08_Data/Shopping/ShoppingOrderList.asset new file mode 100644 index 00000000..4acc3762 --- /dev/null +++ b/Assets/08_Data/Shopping/ShoppingOrderList.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aecd29fb58830381327f4d6781cf59db9cb0f9ae3e32d2f61157d5b5080d14d3 +size 564 diff --git a/Assets/08_Data/Shopping/ShoppingOrderList.asset.meta b/Assets/08_Data/Shopping/ShoppingOrderList.asset.meta new file mode 100644 index 00000000..165c008e --- /dev/null +++ b/Assets/08_Data/Shopping/ShoppingOrderList.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 825fc680df5c90f4bbbab0a61674a1e5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab index e43de932..2059a838 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/ChipsCane.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf6a13879a5e4f5384819639a811560c1651d8a039708588fd01bcb5b50e2955 -size 2541 +oid sha256:09bcc862462c63619d01b99167aed05bade36dcef553b635d659b3818e16c792 +size 15646 diff --git a/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab b/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab index 4079cfc8..6ccd7745 100644 --- a/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab +++ b/Assets/Supermarket Store/Prefabs/RackAssets/ChocoBar.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a2e884de3115315918b7194dccda6a79350928d6ff050f9b6994d39ae34d88ba -size 14972 +oid sha256:4b7727b6f0606092b566283fb9223fc99c32d22352382c0da1fa5cfbacad994c +size 15853 diff --git a/Assets/TextMesh Pro/Resources/TMP Settings.asset b/Assets/TextMesh Pro/Resources/TMP Settings.asset index df27ff1d..4d5ca0cb 100644 --- a/Assets/TextMesh Pro/Resources/TMP Settings.asset +++ b/Assets/TextMesh Pro/Resources/TMP Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dafd957b416fdad34f611c30ee60d5f603497099f847b83fd688f883a56a3e72 -size 1904 +oid sha256:477711eb2a34056e288cc08a6c7fbb93b6c82863995c6ff10d0aa8bd7aa18b6b +size 1840