머지함

Assets/Prefabs/TetrisMap/TetrisMap.prefab

@@ -75,12 +75,12 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: -2
-  m_Sprite: {fileID: 21300000, guid: b24577721d6695a42ad348deb62c5b55, type: 3}
+  m_Sprite: {fileID: 21300000, guid: ce1deca4af716c14db06506ea062d8d6, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
   m_DrawMode: 0
-  m_Size: {x: 26.6, y: 54.76}
+  m_Size: {x: 252.63158, y: 511.27817}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
   m_WasSpriteAssigned: 1

Assets/Prefabs/UI/Clock.prefab

@@ -54,7 +54,7 @@ GameObject:
   m_Component:
   - component: {fileID: 224766102616962246}
   - component: {fileID: 114934333361816604}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Clock
   m_TagString: Untagged
   m_Icon: {fileID: 0}

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

@@ -34,7 +34,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1562977808542142}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 881.1023, y: 401.53445, z: 22.914007}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -58,4 +58,4 @@ MonoBehaviour:
   popoutTime: 0.1
   price: {fileID: 114275555228777956, guid: 4ec53eab8ea50de4ea5b9ff658d83ca0, type: 2}
   woodSign: {fileID: 1484813200104594, guid: bea3b6164d7328b47a8d3598ac875cb3, type: 2}
-  coolUI: {fileID: 1160080494873608, guid: 6ae07b01931768f4f8924c0ab07ce9f7, type: 2}
+  coolUI: {fileID: 0}

Assets/Prefabs/UI/Minimap.prefab

@@ -22,7 +22,7 @@ GameObject:
   - component: {fileID: 222391154653508470}
   - component: {fileID: 114803669402421014}
   - component: {fileID: 225190357821637096}
-  m_Layer: 5
+  m_Layer: 14
   m_Name: Minimap
   m_TagString: Untagged
   m_Icon: {fileID: 0}

Assets/Prefabs/UI/woodsign.prefab

@@ -72,8 +72,8 @@ SpriteRenderer:
   m_AutoUVMaxDistance: 0.5
   m_AutoUVMaxAngle: 89
   m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
+  m_SortingLayerID: -1016753049
+  m_SortingLayer: 4
   m_SortingOrder: 0
   m_Sprite: {fileID: 21300000, guid: 070a11f0da1346e40abaf7b09f756e82, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}

Assets/Scenes/PlayScene.unity

@@ -520,7 +520,7 @@ Prefab:
     - target: {fileID: 224028503877495078, guid: 7a2325fd567a39f4695487b1c08e4ee9,
         type: 2}
       propertyPath: m_RootOrder
-      value: 4
+      value: 3
       objectReference: {fileID: 0}
     - target: {fileID: 224028503877495078, guid: 7a2325fd567a39f4695487b1c08e4ee9,
         type: 2}
@@ -992,12 +992,6 @@ Prefab:
       propertyPath: m_RootOrder
       value: 8
       objectReference: {fileID: 0}
-    - target: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
-        type: 2}
-      propertyPath: droppedPrefab
-      value: 
-      objectReference: {fileID: 1610049888013262, guid: ee63f05b79e18ce4bad2c226aa70a28e,
-        type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 668207ef06c134e40b24375977c2c930, type: 2}
   m_IsPrefabAsset: 0
@@ -1099,7 +1093,7 @@ Prefab:
     - target: {fileID: 224766102616962246, guid: 6716cb822904bb248a894f7aec342a54,
         type: 2}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 224766102616962246, guid: 6716cb822904bb248a894f7aec342a54,
         type: 2}
@@ -1469,15 +1463,15 @@ Prefab:
     m_Modifications:
     - target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
       propertyPath: m_LocalPosition.x
-      value: 881.1023
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
       propertyPath: m_LocalPosition.y
-      value: 401.53445
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
       propertyPath: m_LocalPosition.z
-      value: 22.914007
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4572407437849470, guid: 62a83d11a7addc342ad436145784e698, type: 2}
       propertyPath: m_LocalRotation.x
@@ -1499,6 +1493,11 @@ Prefab:
       propertyPath: m_RootOrder
       value: 10
       objectReference: {fileID: 0}
+    - target: {fileID: 114939219159237616, guid: 62a83d11a7addc342ad436145784e698,
+        type: 2}
+      propertyPath: coolUI
+      value: 
+      objectReference: {fileID: 1864071040}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 62a83d11a7addc342ad436145784e698, type: 2}
   m_IsPrefabAsset: 0
@@ -1602,6 +1601,116 @@ Prefab:
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c179f0931cfabec428a868a6edc543b0, type: 2}
   m_IsPrefabAsset: 0
+--- !u!1001 &1864071038
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2088383385}
+    m_Modifications:
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_AnchorMin.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+        type: 2}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 6ae07b01931768f4f8924c0ab07ce9f7, type: 2}
+  m_IsPrefabAsset: 0
+--- !u!224 &1864071039 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 224380954982412028, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+    type: 2}
+  m_PrefabInternal: {fileID: 1864071038}
+--- !u!1 &1864071040 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1160080494873608, guid: 6ae07b01931768f4f8924c0ab07ce9f7,
+    type: 2}
+  m_PrefabInternal: {fileID: 1864071038}
 --- !u!224 &1917907224 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 224028503877495078, guid: 7a2325fd567a39f4695487b1c08e4ee9,
@@ -1813,9 +1922,10 @@ RectTransform:
   - {fileID: 1209430809}
   - {fileID: 179350393}
   - {fileID: 1504194383}
-  - {fileID: 713371876}
   - {fileID: 1917907224}
+  - {fileID: 713371876}
   - {fileID: 50226940}
+  - {fileID: 1864071039}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scripts/CameraController.cs

@@ -14,6 +14,10 @@ public class CameraController : MonoBehaviour {
     public Vector3 tetrisCameraCoord = new Vector3(108, 240, -1);
     public const float tetrisCameraSize = 300f;
     public const float inGameCameraSize = 4.5f;
+    Vector3 inGameClockCoord = new Vector3(-120, 460, 0);
+    Vector3 tetrisClockCoord = new Vector3(-645, 950, 0);
+    Vector3 inGameLeftRoomCoord = new Vector3(-120, 380, 0);
+    Vector3 tetrisLeftRoomCoord = new Vector3(-645, 875, 0);
 
     public Vector3 originPos;
     
@@ -74,6 +78,8 @@ public class CameraController : MonoBehaviour {
             if (gameState == GameState.Ingame)
             {
                 GameManager.Instance.minimap.SetActive(true);
+                MapManager.Instance.clock.GetComponent<RectTransform>().Translate(inGameClockCoord - tetrisClockCoord);
+                GameManager.Instance.leftRoomCount.rectTransform.Translate(inGameLeftRoomCoord - tetrisLeftRoomCoord);
                 GameManager.gameState = GameState.Ingame;
                 StartCoroutine(MapManager.Instance.RoomFadeIn(MapManager.currentRoom));
                 grid.transform.position = Vector3.zero;
@@ -89,6 +95,8 @@ public class CameraController : MonoBehaviour {
             else if (gameState == GameState.Tetris || gameState == GameState.Portal)
             {
                 GameManager.Instance.minimap.SetActive(false);
+                MapManager.Instance.clock.GetComponent<RectTransform>().Translate(tetrisClockCoord - inGameClockCoord);
+                GameManager.Instance.leftRoomCount.rectTransform.Translate(tetrisLeftRoomCoord - inGameLeftRoomCoord);
                 if (gameState == GameState.Tetris)
                     GameManager.gameState = GameState.Tetris;
                 else if(gameState == GameState.Portal)

Assets/Scripts/Item/InventoryManager.cs

@@ -192,7 +192,6 @@ 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;
@@ -265,7 +264,6 @@ 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/TetrisMap/Rooms/GoldRoomInGame.cs

@@ -92,8 +92,10 @@ public class GoldRoomInGame : RoomInGame {
             }
             if(itemGoods[i] != null)
             {
-                itemGoods[i].GetComponent<DroppedObject>().priceTag.transform.position = itemGoods[i].transform.position + new Vector3(0, 1, 0);
+                itemGoods[i].GetComponent<DroppedObject>().priceSign
+                    = Instantiate(InventoryManager.Instance.woodSign, itemGoods[i].transform.position + new Vector3(0.5f, 0, 0), Quaternion.identity, MapManager.currentRoom.transform);
                 itemGoods[i].GetComponent<DroppedObject>().priceTag.text = itemInfo.price[i].ToString();
+                itemGoods[i].GetComponent<DroppedObject>().priceTag.transform.position = itemGoods[i].GetComponent<DroppedObject>().priceSign.transform.position + new Vector3(0, 0.65f, 0);
             }
         }
     }

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

@@ -7,4 +7,5 @@ public class DroppedObject : MonoBehaviour
 {
     public int price = 0;
     public Text priceTag;
+    public GameObject priceSign;
 }

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

@@ -176,9 +176,7 @@ public class LifeStoneManager : Singleton<LifeStoneManager> {
         tmpObj.GetComponent<DroppedLifeStone>().Init(CreateLifeStoneInfo(size, goldPer, ameNum), pos);
         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;
+        tmpObj.GetComponent<DroppedObject>().priceTag = Instantiate(InventoryManager.Instance.price, new Vector3(0, 0, 0), Quaternion.identity, GameManager.Instance.textCanvas.transform);return tmpObj;
     }
 
     /// <summary>