일부 이미지 추가 및 수정

Assets/Prefabs/TetrisMap/PortalSurface.prefab

@@ -20,7 +20,7 @@ GameObject:
   m_Component:
   - component: {fileID: 4131413436280266}
   - component: {fileID: 212754017166168550}
-  m_Layer: 18
+  m_Layer: 12
   m_Name: PortalSurface
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/UI/In-Game UI/InventoryUI/InventoryManager.prefab

@@ -57,4 +57,5 @@ MonoBehaviour:
   popoutStrengthMultiplier: 9
   popoutTime: 0.1
   price: {fileID: 114275555228777956, guid: 4ec53eab8ea50de4ea5b9ff658d83ca0, type: 2}
-  coolUI: {fileID: 0}
+  woodSign: {fileID: 1484813200104594, guid: bea3b6164d7328b47a8d3598ac875cb3, type: 2}
+  coolUI: {fileID: 1160080494873608, guid: 6ae07b01931768f4f8924c0ab07ce9f7, type: 2}

Assets/Prefabs/UI/pointer.prefab

@@ -19,7 +19,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 224143477354382802}
-  - component: {fileID: 212477622257528900}
   - component: {fileID: 114513527214926720}
   - component: {fileID: 222894299963575462}
   - component: {fileID: 114981003207703380}
@@ -68,7 +67,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 2c9cb87102d86ec44a8661784a5a42c3, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 16bd596a38ea90b4aa76cc267605b9f0, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -76,52 +75,6 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
---- !u!212 &212477622257528900
-SpriteRenderer:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1254762634421800}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RenderingLayerMask: 4294967295
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: 0}
-  m_Color: {r: 0.5943396, g: 0.025231387, b: 0.025231387, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 0.26, y: 0.32}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 0
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!222 &222894299963575462
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -137,7 +90,7 @@ RectTransform:
   m_GameObject: {fileID: 1254762634421800}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0

Assets/Prefabs/UI/woodsign.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1484813200104594}
+  m_IsPrefabAsset: 1
+--- !u!1 &1484813200104594
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4341061936626376}
+  - component: {fileID: 212083349423044556}
+  m_Layer: 0
+  m_Name: woodsign
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4341061936626376
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1484813200104594}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &212083349423044556
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1484813200104594}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 070a11f0da1346e40abaf7b09f756e82, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 2}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/UI/woodsign.prefab.meta

+fileFormatVersion: 2
+guid: bea3b6164d7328b47a8d3598ac875cb3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/CameraController.cs

@@ -108,7 +108,7 @@ public class CameraController : MonoBehaviour {
                     transform.position = new Vector3(coord.x, coord.y, -1);
                     GetComponent<Camera>().orthographicSize = Mathf.Lerp(GetComponent<Camera>().orthographicSize, sizeDestination, Mathf.Sqrt(Time.deltaTime));
                 }
-                GetComponent<Camera>().cullingMask = 1 << LayerMask.NameToLayer("Tetris") | 1 << LayerMask.NameToLayer("PortalSurface");
+                GetComponent<Camera>().cullingMask = 1 << LayerMask.NameToLayer("Tetris") | 1 << LayerMask.NameToLayer("Portal");
                 transform.position = tetrisCameraCoord;
             }
             GetComponent<Camera>().orthographicSize = sizeDestination;

Assets/Scripts/Item/InventoryManager.cs

@@ -14,6 +14,7 @@ public class InventoryManager : Singleton<InventoryManager> {
     public float popoutStrengthMultiplier;
     public float popoutTime;
     public Text price;
+    public GameObject woodSign;
     GameObject player;
 
     public GameObject coolUI;
@@ -191,6 +192,7 @@ public class InventoryManager : Singleton<InventoryManager> {
             GameObject tmpItem = ItemInstantiate(itemPool[(int)quality][0], pos, popoutStrength);
             tmpItem.GetComponent<DroppedObject>().price = _price;
             tmpItem.GetComponent<DroppedObject>().priceTag = Instantiate(price, new Vector3(0, 0, 0), Quaternion.identity, GameManager.Instance.textCanvas.transform);
+            Instantiate(woodSign, tmpItem.transform.position + new Vector3(0.5f, 0, 0), Quaternion.identity, MapManager.currentRoom.transform);
             return tmpItem;
         }
         return null;
@@ -263,6 +265,7 @@ public class InventoryManager : Singleton<InventoryManager> {
             GameObject tmpItem = AddonInstantiate(addonPool[(int)quality][0], pos, popoutStrength);
             tmpItem.GetComponent<DroppedObject>().price = _price;
             tmpItem.GetComponent<DroppedObject>().priceTag = Instantiate(price, new Vector3(0, 0, 0), Quaternion.identity, GameManager.Instance.textCanvas.transform);
+            Instantiate(woodSign, tmpItem.transform.position + new Vector3(0.5f, 0, 0), Quaternion.identity, MapManager.currentRoom.transform);
             return tmpItem;
         }
         return null;

Assets/Scripts/Pointer.cs

@@ -18,6 +18,8 @@ public class Pointer : MonoBehaviour {
 
         width = can.GetComponent<RectTransform>().sizeDelta.x / 2;
         height = can.GetComponent<RectTransform>().sizeDelta.y / 2;
+        cam = Camera.main;
+        can = InventoryManager.Instance.ui.GetComponent<Canvas>();
 
     }
 	

Assets/Scripts/UI/In-game UI/LifeStoneScript/LifeStoneManager.cs

@@ -177,6 +177,7 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
         PopoutGenerator(tmpObj, popoutStrength);
         tmpObj.GetComponent<DroppedObject>().price = _price;
         tmpObj.GetComponent<DroppedObject>().priceTag = Instantiate(InventoryManager.Instance.price, new Vector3(0, 0, 0), Quaternion.identity, GameManager.Instance.textCanvas.transform);
+        Instantiate(InventoryManager.Instance.woodSign, tmpObj.transform.position + new Vector3(0.5f, 0, 0), Quaternion.identity, MapManager.currentRoom.transform);
         return tmpObj;
     }
 

Assets/Sprites/TestRopeUP.png.meta → Assets/Sprites/TETRIS.png.meta

 fileFormatVersion: 2
-guid: 45bbd91799285994eb276ebedd1d1469
+guid: ce1deca4af716c14db06506ea062d8d6
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -43,14 +43,14 @@ TextureImporter:
   spriteMode: 1
   spriteExtrude: 1
   spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 64
+  alignment: 9
+  spritePivot: {x: 0.5, y: 0.505}
+  spritePixelsToUnits: 0.665
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
-  spriteTessellationDetail: 0
+  spriteTessellationDetail: -1
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
@@ -80,28 +80,13 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
-    physicsShape:
-    - - {x: -5, y: 32}
-      - {x: -5, y: -32}
-      - {x: 5, y: -32}
-      - {x: 5, y: 32}
+    physicsShape: []
     bones: []
-    spriteID: c975ab65379a7f04e9967ce030f43ea5
+    spriteID: e2b02003cd7971b4ca733428db217692
     vertices: []
     indices: 
     edges: []

Assets/Sprites/TetrisBackground.png.meta → Assets/Sprites/enemyarrow.png.meta

 fileFormatVersion: 2
-guid: b24577721d6695a42ad348deb62c5b55
+guid: 16bd596a38ea90b4aa76cc267605b9f0
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -44,8 +44,8 @@ TextureImporter:
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
-  spritePivot: {x: 0, y: 0.5}
-  spritePixelsToUnits: 10.666667
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 32
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
@@ -63,7 +63,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -74,18 +74,7 @@ TextureImporter:
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -97,7 +86,7 @@ TextureImporter:
     outline: []
     physicsShape: []
     bones: []
-    spriteID: f03f8ec7aa415b444a5a90b1c3187ade
+    spriteID: b67a3a9f9c22b654398dc5e3e819ad4e
     vertices: []
     indices: 
     edges: []

Assets/Sprites/TestRopeDown.png.meta → Assets/Sprites/woodsign.png.meta

 fileFormatVersion: 2
-guid: a7ade53056ed4934c87daaec91a44354
+guid: 070a11f0da1346e40abaf7b09f756e82
 TextureImporter:
   fileIDToRecycleName: {}
   externalObjects: {}
@@ -31,7 +31,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: 0
+    filterMode: -1
     aniso: -1
     mipBias: -100
     wrapU: 1
@@ -45,12 +45,12 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 64
+  spritePixelsToUnits: 32
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
-  spriteTessellationDetail: 0
+  spriteTessellationDetail: -1
   textureType: 8
   textureShape: 1
   singleChannelComponent: 0
@@ -80,28 +80,13 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - serializedVersion: 2
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
-    physicsShape:
-    - - {x: -5, y: -32}
-      - {x: 6, y: -32}
-      - {x: 6, y: 32}
-      - {x: -5, y: 32}
+    physicsShape: []
     bones: []
-    spriteID: c78b3c713d0b01e44a9c1d98d426998d
+    spriteID: b1fdc62e5c3cba446912b6bc51b9205a
     vertices: []
     indices: 
     edges: []