Changed descriptions fixed textbubles

mainClown · Dec 9, 2024 · 5f602fa · 5f602fa
1 parent 5d76b9a
commit 5f602fa
Show file tree

Hide file tree

Showing 7 changed files with 162 additions and 77 deletions.
diff --git a/UnityProject/Assets/Scenes/BathroomScene.unity b/UnityProject/Assets/Scenes/BathroomScene.unity
@@ -312,8 +312,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0423\u043C\u044B\u0442\u044C\u0441\u044F (\u0445\u0437 \u043F\u0435\u0440\u0435\u0438\u043C\u0435\u043D\u0443\u0439\u0442\u0435
-    \u0441\u0430\u043C\u0438 \u0432\u0441\u0435 \u043F\u043E\u0434\u043F\u0438\u0441\u0438)"
+  Name: "\u0420\u0430\u043A\u043E\u0432\u0438\u043D\u0430"
   ItemId: 16
   InventorySprite: {fileID: 0}
   HighlightSprite: {fileID: 21300000, guid: a3a27a5be3f9a324788d09bc9f6d175d, type: 3}
@@ -889,7 +888,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NecessaryItems: 140000000f000000
   LocationSceneName: HallScene
-  LocationDisplay: "\u0412 \u043A\u043E\u0440\u0438\u0434\u043E\u0440"
+  LocationDisplay: "\u041A\u043E\u0440\u0438\u0434\u043E\u0440"
   NextLocationItems: none
   HighlightSprite: {fileID: 21300000, guid: 399e5a2d8a50fc7449cebd63adb786d5, type: 3}
   NoHighlightSprite: {fileID: 21300000, guid: 399e5a2d8a50fc7449cebd63adb786d5, type: 3}
@@ -981,7 +980,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0441\u0443\u0445\u043E\u0439\u044A \u0448\u0430\u043C\u043F\u0443\u0443"
+  Name: "\u0421\u0443\u0445\u043E\u0439 \u0448\u0430\u043C\u043F\u0443\u043D\u044C"
   ItemId: 17
   InventorySprite: {fileID: 21300000, guid: 5229dd1ccb2df664fa00a44ebc01d077, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 2f98221e8d7d06b43b0736ee97019544, type: 3}
@@ -1074,7 +1073,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "*\u0443\u043D\u0438\u0447\u0442\u043E\u0436\u0430\u044E\u0449\u0438\u0439_\u0437\u0430\u043F\u0430\u0445_10K*"
+  Name: "\u0414\u0435\u0437\u043E\u0434\u043E\u0440\u0430\u043D\u0442"
   ItemId: 19
   InventorySprite: {fileID: 21300000, guid: 39fc4a466af609b4c97d1a80387badfb, type: 3}
   HighlightSprite: {fileID: 21300000, guid: ede58ec6f0d4ca646a3ebfb9a07d3153, type: 3}
@@ -1269,7 +1268,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: Bruh..
+  Name: "\u0420\u0430\u0441\u0447\u0435\u0441\u043A\u0430"
   ItemId: 20
   InventorySprite: {fileID: 21300000, guid: ee1ee3b248cd1184bae2933c85bb8061, type: 3}
   HighlightSprite: {fileID: 21300000, guid: e3ac528e5d58d374091ebd62f6d00c29, type: 3}
@@ -1362,7 +1361,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u043A\u043E\u043B\u0451\u0441\u0430"
+  Name: "\u0422\u0430\u0431\u043B\u0435\u0442\u043D\u0438\u0446\u0430"
   ItemId: 18
   InventorySprite: {fileID: 21300000, guid: 99720c9ff9abf4940beb311051b0c31d, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 9edd170ac168cd04388718b9f9f42b18, type: 3}

diff --git a/UnityProject/Assets/Scenes/BedroomScene.unity b/UnityProject/Assets/Scenes/BedroomScene.unity
@@ -210,7 +210,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0422\u0440\u0443\u0441\u044B Phillip Plain"
+  Name: "\u041E\u0434\u0435\u0436\u0434\u0430"
   ItemId: 2
   InventorySprite: {fileID: 21300000, guid: 172aa4fdac5787c40b6faf16d7c54828, type: 3}
   HighlightSprite: {fileID: 21300000, guid: d08db4fb66efcba4995018ad4d435740, type: 3}
@@ -341,7 +341,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D\u0447\u0435\u0433)))"
+  Name: "\u0422\u0435\u043B\u0435\u0444\u043E\u043D"
   ItemId: 1
   InventorySprite: {fileID: 21300000, guid: 052c2fdb665f1aa4d997455331f1e6a1, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 613a50d7ef13f9541b599fed2b6e9943, type: 3}
@@ -539,8 +539,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u041E\u0442\u0447\u0451\u0442 \u043E \u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0438
-    \u043F\u0440\u043E\u0435\u043A\u0442\u0430"
+  Name: "\u0414\u043E\u043A\u043B\u0430\u0434"
   ItemId: 4
   InventorySprite: {fileID: 21300000, guid: 3c0d6c33515b83a4d80cfe066cb934d6, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 726a05d815ff2814a968f0d09251d25d, type: 3}
@@ -725,7 +724,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u041A\u043E\u043D\u0441\u043F\u0435\u043A\u0442\u0438\u043A"
+  Name: "\u041A\u043E\u043D\u0441\u043F\u0435\u043A\u0442"
   ItemId: 3
   InventorySprite: {fileID: 21300000, guid: 41bea6b5bef465e4c80ec254f4d6cd43, type: 3}
   HighlightSprite: {fileID: 21300000, guid: cfcf189e2e4ce014dbe9aaea3c211efe, type: 3}
@@ -972,7 +971,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: Big pensil
+  Name: "\u041F\u0435\u043D\u0430\u043B"
   ItemId: 7
   InventorySprite: {fileID: 21300000, guid: 1a58f5c0f2cb31d4d86f8cd64675378f, type: 3}
   HighlightSprite: {fileID: 21300000, guid: f2b7bce8a9871a14399e3c77b3d31575, type: 3}
@@ -1333,8 +1332,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u042E\u0441\u0431 \u0437\u0434\u0435\u0441\u044C, \u0437\u0434\u0435\u0441\u044C
-    \u0432\u0441\u0435"
+  Name: USB
   ItemId: 5
   InventorySprite: {fileID: 21300000, guid: 3033cdd9672cdda419f779e4f7148781, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 2f160a1656c83bf4ebd28fde26886960, type: 3}
@@ -1580,8 +1578,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NecessaryItems: 0100000002000000
   LocationSceneName: HallScene
-  LocationDisplay: "\u0412 \u043A\u043E\u0440\u0438\u0434\u043E\u0440 (\u043A\u0430\u043A
-    \u0436\u0435 \u044F \u0443\u0441\u0442\u0430\u043B \u043F\u043E\u043C\u043E\u0433\u0438\u0442\u0435)"
+  LocationDisplay: "\u041A\u043E\u0440\u0438\u0434\u043E\u0440"
   NextLocationItems: 8,9,10,11,12,13,14
   HighlightSprite: {fileID: 21300000, guid: 90b7e5ac78efb764f83537fff2cb59b5, type: 3}
   NoHighlightSprite: {fileID: 21300000, guid: 90b7e5ac78efb764f83537fff2cb59b5, type: 3}
@@ -1673,7 +1670,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: powerbank
+  Name: "\u041F\u0430\u0432\u0435\u0440\u0431\u0430\u043D\u043A"
   ItemId: 6
   InventorySprite: {fileID: 21300000, guid: 2c20e515088d31640858ae4cb893a234, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 317e09f51804fcf4598f22ec93d93de6, type: 3}

diff --git a/UnityProject/Assets/Scenes/HallScene.unity b/UnityProject/Assets/Scenes/HallScene.unity
@@ -210,7 +210,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0421\u0442\u0443\u0434\u0430\u043A"
+  Name: "\u0421\u0442\u0443\u0434\u0435\u043D\u0447\u0435\u0441\u043A\u0438\u0439"
   ItemId: 10
   InventorySprite: {fileID: 21300000, guid: f44292fa1b2c1ea408cd9517b62872ef, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 7061e4b6d977a1b48a90722beaa30a65, type: 3}
@@ -303,7 +303,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u041A\u043B\u044E\u0447\u0438 \u043E\u0442 \u0445\u0430\u0442\u044B"
+  Name: "\u041A\u043B\u044E\u0447\u0438"
   ItemId: 12
   InventorySprite: {fileID: 21300000, guid: da80ad98828cc65419e1c8fd5e019cbe, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 9624b7c56dbba6b47aafad3160812eef, type: 3}
@@ -398,7 +398,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NecessaryItems: 080000000c0000000e0000000f0000001400000018000000
   LocationSceneName: EndingScene
-  LocationDisplay: "\u041D\u0430 \u0432\u044B\u0445\u043E\u0434"
+  LocationDisplay: "\u0412\u044B\u0445\u043E\u0434 \u0438\u0437 \u0434\u043E\u043C\u0430"
   NextLocationItems: none
   HighlightSprite: {fileID: 21300000, guid: e44bb7e3ca227cb4ba8ef626270c0058, type: 3}
   NoHighlightSprite: {fileID: 21300000, guid: e44bb7e3ca227cb4ba8ef626270c0058, type: 3}
@@ -781,7 +781,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NecessaryItems: 
   LocationSceneName: KitchenScene
-  LocationDisplay: "\u041D\u0430 \u043A\u0443\u0445\u043D\u044E"
+  LocationDisplay: "\u041A\u0443\u0445\u043D\u044F"
   NextLocationItems: 21,22,23,24,25
   HighlightSprite: {fileID: 21300000, guid: da0283004977da545affaaca1058a2f0, type: 3}
   NoHighlightSprite: {fileID: 21300000, guid: da0283004977da545affaaca1058a2f0, type: 3}
@@ -873,7 +873,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0410\u043C\u0431\u0440\u0435\u043B\u043B\u0430"
+  Name: "\u0417\u043E\u043D\u0442\u0438\u043A"
   ItemId: 13
   InventorySprite: {fileID: 21300000, guid: 7d18a100734c5c14fbcd13f5572c3473, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 4d161d2ad48071949bb65b2a73f0b933, type: 3}
@@ -1041,7 +1041,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0411\u043E\u0442\u044B"
+  Name: "\u0421\u0430\u043F\u043E\u0433\u0438"
   ItemId: 14
   InventorySprite: {fileID: 21300000, guid: 9d318e7734c92614b8ddb6cb1c8f8ea5, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 880014d3986ba0140b67790e89f6599c, type: 3}
@@ -1361,8 +1361,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NecessaryItems: 
   LocationSceneName: BedroomScene
-  LocationDisplay: "\u0412 \u0441\u043F\u0430\u043B\u044C\u043D\u044E (\u0443\u0440\u0430
-    \u0441\u043F\u0430\u0442\u0435\u043D\u044C\u043A\u0430\u0442\u044C)"
+  LocationDisplay: "\u0421\u043F\u0430\u043B\u044C\u043D\u044F"
   NextLocationItems: none
   HighlightSprite: {fileID: 21300000, guid: cf7d4881552faa84581a00e05f3e50b6, type: 3}
   NoHighlightSprite: {fileID: 21300000, guid: cf7d4881552faa84581a00e05f3e50b6, type: 3}
@@ -1556,7 +1555,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u041F(\u0440)\u043E\u043F\u0443\u0441\u043A"
+  Name: "\u041F\u0440\u043E\u043F\u0443\u0441\u043A"
   ItemId: 9
   InventorySprite: {fileID: 21300000, guid: d50cd52fcb5c9794e98c922f746d48f3, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 7566d57fa83c4564ea681a4c249826b3, type: 3}

diff --git a/UnityProject/Assets/Scenes/KitchenScene.unity b/UnityProject/Assets/Scenes/KitchenScene.unity
@@ -210,7 +210,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0428\u043E\u043A\u043E\u043B\u0430\u0434"
+  Name: "\u0428\u043E\u043A\u043E\u043B\u0430\u0434\u043A\u0430"
   ItemId: 21
   InventorySprite: {fileID: 21300000, guid: bd5fc66536d8dde4589aa1e93b576d16, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 1843dfae371157248be5b4f6c94ee456, type: 3}
@@ -507,9 +507,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u0435\u0441\u043B\u0438 \u043E\u0442\u043A\u0440\u044B\u0432\u0430\u0442\u044C
-    \u0441\u043D\u043E\u0432\u0430 \u0438 \u0441\u043D\u043E\u0432\u0430, \u0445\u043E\u043B\u043E\u0434\u043E\u0441
-    \u043E\u0442 \u044D\u0442\u043E\u0433\u043E \u043D\u0435 \u043D\u0430\u043F\u043E\u043B\u043D\u0438\u0442\u0441\u044F"
+  Name: "\u0425\u043E\u043B\u043E\u0434\u0438\u043B\u044C\u043D\u0438\u043A"
   ItemId: 23
   InventorySprite: {fileID: 0}
   HighlightSprite: {fileID: 21300000, guid: 46238b696879aa84eb995a6b603ad613, type: 3}
@@ -694,7 +692,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u043E\u0431\u0435\u0434 (\u0441\u043F\u0430\u0441\u0438\u0431\u043E \u043C\u0430\u043C\u0435)"
+  Name: "\u041E\u0431\u0435\u0434"
   ItemId: 24
   InventorySprite: {fileID: 21300000, guid: 5f45fb7e369bad54eb4bbf3110913dff, type: 3}
   HighlightSprite: {fileID: 21300000, guid: cfefb769daef5134082a4a8d0227c4ff, type: 3}
@@ -855,7 +853,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u043D\u0430\u0443\u0448\u043D\u0438\u043A\u0438"
+  Name: "\u041D\u0430\u0443\u0448\u043D\u0438\u043A\u0438"
   ItemId: 25
   InventorySprite: {fileID: 21300000, guid: 3052c4eb7df6cc54f918f163a9d9a95b, type: 3}
   HighlightSprite: {fileID: 21300000, guid: ddbc3691ab5bf424bb99274541d62fec, type: 3}
@@ -950,7 +948,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   NecessaryItems: 18000000
   LocationSceneName: HallScene
-  LocationDisplay: "\u0412 \u043A\u043E\u0440\u0438\u0434\u043E\u0440"
+  LocationDisplay: "\u041A\u043E\u0440\u0438\u0434\u043E\u0440"
   NextLocationItems: none
   HighlightSprite: {fileID: 21300000, guid: 4bbb5cf9e48d1314a81248f46f9baaf6, type: 3}
   NoHighlightSprite: {fileID: 21300000, guid: 4bbb5cf9e48d1314a81248f46f9baaf6, type: 3}
@@ -1269,7 +1267,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c5b11fd55b204364a898400bad40583e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: "\u043F\u043E \u043A\u043E\u0444\u0435\u0439\u043A\u0443?"
+  Name: "\u041A\u043E\u0444\u0435"
   ItemId: 22
   InventorySprite: {fileID: 21300000, guid: f0cba516e8627d74c949dffeb2f3e5f5, type: 3}
   HighlightSprite: {fileID: 21300000, guid: 9b5c0102d3e72b545a4e0e23cdb121f3, type: 3}

diff --git a/UnityProject/Assets/Scripts/Door.cs b/UnityProject/Assets/Scripts/Door.cs
@@ -70,10 +70,21 @@ public void OpenLocation()
                         }
                     }
                 }
+                if (TextBubble.ItemsToShow.Count > 0)
+                {
+                    for (int i = 0; i < LstItems.Count; i++)
+                    {
+                        for (int j = 0; j < InventoryItems.Count; j++)
+                        {
+                            if (LstItems[i] == InventoryItems[j])
+                                NoLocationItemsInMesgs = false;
+                        }
+                    }
+                }
                 if (NoLocationItemsInMesgs)
                     TextBubble.Instance.AddItemsToShow(LstItems);
             }
-            Debug.Log(TextBubble.ItemsToShow.Count);
+            //Debug.Log(TextBubble.ItemsToShow.Count);
             if (LocationSceneName == "EndingScene")
                 Ending.Instance.ShowEnding(true);
             SceneManager.LoadScene(LocationSceneName);