From b5d4950d0ec1e4be7d8d97aae116b44a749a236e Mon Sep 17 00:00:00 2001 From: "DESKTOP-VVOCIJO\\PC" Date: Thu, 23 Apr 2026 12:14:35 +0900 Subject: [PATCH] =?UTF-8?q?2026-04-23=20=EC=9E=90=EC=9E=98=ED=95=9C=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/MyProject/GameScene.unity | 4 +- .../01_Scenes/MyProject/GameStartScene.unity | 4 +- Assets/02_Scripts/ITransPossible.cs | 6 + Assets/02_Scripts/ITransPossible.cs.meta | 2 + .../02_Scripts/Managers/SceneLoadManager.cs | 20 ++- Assets/02_Scripts/Player/PlayerController.cs | 7 +- Assets/04_Textures/Panels.meta | 8 + Assets/04_Textures/Panels/Panel_Minus.png | 3 + .../04_Textures/Panels/Panel_Minus.png.meta | 143 ++++++++++++++++++ Assets/04_Textures/Panels/Panel_Plus.png | 3 + Assets/04_Textures/Panels/Panel_Plus.png.meta | 143 ++++++++++++++++++ .../Shopping/Prefabs/CheckoutItemRow.prefab | 4 +- .../Prefabs/ShelfCheckouts.prefab | 4 +- 13 files changed, 338 insertions(+), 13 deletions(-) create mode 100644 Assets/02_Scripts/ITransPossible.cs create mode 100644 Assets/02_Scripts/ITransPossible.cs.meta create mode 100644 Assets/04_Textures/Panels.meta create mode 100644 Assets/04_Textures/Panels/Panel_Minus.png create mode 100644 Assets/04_Textures/Panels/Panel_Minus.png.meta create mode 100644 Assets/04_Textures/Panels/Panel_Plus.png create mode 100644 Assets/04_Textures/Panels/Panel_Plus.png.meta diff --git a/Assets/01_Scenes/MyProject/GameScene.unity b/Assets/01_Scenes/MyProject/GameScene.unity index fcc394ea..d155cc79 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:a6a2e7478871730095bdc0699982727fee651e80c113b5e5cd59b16e0c6e01a3 -size 13289533 +oid sha256:4574f161dffa2c2e5d23312aa7a9ae935fab250704c43b9be30dd1f6a1d5a7c2 +size 13289838 diff --git a/Assets/01_Scenes/MyProject/GameStartScene.unity b/Assets/01_Scenes/MyProject/GameStartScene.unity index 9ef6f996..4c90da24 100644 --- a/Assets/01_Scenes/MyProject/GameStartScene.unity +++ b/Assets/01_Scenes/MyProject/GameStartScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3d9ec9cff79b5930601e1dfedf85fc09b128449060d90c32ec2093dc2369ae9 -size 58926 +oid sha256:4583fa61338d26b8aa7f786a7fdc4ec55076f7a8454dc4a642e329ff4510454d +size 247537 diff --git a/Assets/02_Scripts/ITransPossible.cs b/Assets/02_Scripts/ITransPossible.cs new file mode 100644 index 00000000..59c08996 --- /dev/null +++ b/Assets/02_Scripts/ITransPossible.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public interface ITransScenePossible +{ + public void OnSceneLoaded(); +} diff --git a/Assets/02_Scripts/ITransPossible.cs.meta b/Assets/02_Scripts/ITransPossible.cs.meta new file mode 100644 index 00000000..566f5da0 --- /dev/null +++ b/Assets/02_Scripts/ITransPossible.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 11e9ee061937f074a9f21ae44c697eb3 \ No newline at end of file diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs b/Assets/02_Scripts/Managers/SceneLoadManager.cs index e7a63848..87cecde9 100644 --- a/Assets/02_Scripts/Managers/SceneLoadManager.cs +++ b/Assets/02_Scripts/Managers/SceneLoadManager.cs @@ -1,9 +1,7 @@ using System; -using System.Runtime.CompilerServices; using System.Threading.Tasks; using UnityEngine; using UnityEngine.SceneManagement; - public class SceneLoadManager : MonoBehaviour { public static SceneLoadManager Instance; @@ -30,6 +28,7 @@ private void Awake() private void Start() { SceneManager.sceneLoaded += OnSceneLoaded; + OnSceneLoaded(SceneManager.GetActiveScene(), LoadSceneMode.Single); } private void Update() @@ -41,10 +40,23 @@ private void Update() } } + //씬이 로드되었을때 호출 private void OnSceneLoaded(Scene scene, LoadSceneMode mode) { - // 씬이 로드될 때마다 - + Debug.Log("씬 로드됨"); + + if(scene.name == "GameScene") + { + MonoBehaviour[] allObjs = UnityEngine.Object.FindObjectsByType(FindObjectsSortMode.None); + + foreach (var obj in allObjs) + { + if (obj is ITransScenePossible itsp) + { + itsp.OnSceneLoaded(); + } + } + } } public async Awaitable FadeLoadingCanvas(bool isOut,float fadeTime) diff --git a/Assets/02_Scripts/Player/PlayerController.cs b/Assets/02_Scripts/Player/PlayerController.cs index 40f70cf6..01c247b5 100644 --- a/Assets/02_Scripts/Player/PlayerController.cs +++ b/Assets/02_Scripts/Player/PlayerController.cs @@ -1,7 +1,7 @@ using UnityEngine; using VRShopping.UI; -public class PlayerController : MonoBehaviour +public class PlayerController : MonoBehaviour,ITransScenePossible { private Animator _anim; @@ -16,6 +16,11 @@ private void Awake() } private void Start() + { + + } + + public void OnSceneLoaded() { InputManager.Instance.XRLeftControllerPrimaryButton_Event += this.ToggleShoppingOrderList; } diff --git a/Assets/04_Textures/Panels.meta b/Assets/04_Textures/Panels.meta new file mode 100644 index 00000000..3a958f2f --- /dev/null +++ b/Assets/04_Textures/Panels.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02521055af674f942a7047e5c98affc0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04_Textures/Panels/Panel_Minus.png b/Assets/04_Textures/Panels/Panel_Minus.png new file mode 100644 index 00000000..405b322b --- /dev/null +++ b/Assets/04_Textures/Panels/Panel_Minus.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61c653beb8346f52ec6e82be87a6cd6580ce0543b7a41186f13193fd39aaea02 +size 586 diff --git a/Assets/04_Textures/Panels/Panel_Minus.png.meta b/Assets/04_Textures/Panels/Panel_Minus.png.meta new file mode 100644 index 00000000..f70b1f87 --- /dev/null +++ b/Assets/04_Textures/Panels/Panel_Minus.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 1d034960d2050a443827e34bac47b33c +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/04_Textures/Panels/Panel_Plus.png b/Assets/04_Textures/Panels/Panel_Plus.png new file mode 100644 index 00000000..20fd982c --- /dev/null +++ b/Assets/04_Textures/Panels/Panel_Plus.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd554d4161ef86439a425efcff08d1c3c7ab1d1d5e7678556d4a182fdce2a7b9 +size 878 diff --git a/Assets/04_Textures/Panels/Panel_Plus.png.meta b/Assets/04_Textures/Panels/Panel_Plus.png.meta new file mode 100644 index 00000000..7cecb027 --- /dev/null +++ b/Assets/04_Textures/Panels/Panel_Plus.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 2e5a325a6e749bd4f865e263c1ae3453 +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/Shopping/Prefabs/CheckoutItemRow.prefab b/Assets/07_UI/Shopping/Prefabs/CheckoutItemRow.prefab index 8637bf19..e9a6aa3c 100644 --- a/Assets/07_UI/Shopping/Prefabs/CheckoutItemRow.prefab +++ b/Assets/07_UI/Shopping/Prefabs/CheckoutItemRow.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab038135f2b0f3448dbc6b6e2d0c9804125b693528849ea634033e8dd7e5cfea -size 21294 +oid sha256:2838161eaa20968d3134cbd7029c3f7a7caeeee5a640cefbe403531dd159641a +size 21436 diff --git a/Assets/Supermarket Store/Prefabs/ShelfCheckouts.prefab b/Assets/Supermarket Store/Prefabs/ShelfCheckouts.prefab index a0c90c0e..d46ad024 100644 --- a/Assets/Supermarket Store/Prefabs/ShelfCheckouts.prefab +++ b/Assets/Supermarket Store/Prefabs/ShelfCheckouts.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:695570d799e46425fc16571dbdef1287b0d05b9a929c9838282275f50b37c5b9 -size 75647 +oid sha256:794d6b641fccbabfd790c23aff50e9022b9a3be9d19137c936caa4439015e005 +size 74683