From f661c7e20ff44cde3a03220298b7a6237e69d15d Mon Sep 17 00:00:00 2001 From: KrolMel Date: Thu, 3 Nov 2022 20:30:40 +0100 Subject: [PATCH] Fixed bugs Fixed spawn bug --- Assets/NewGame.cs | 6 +- Assets/Scenes/CaveEntrance.unity | 294 ++++++++++-------- Assets/Scenes/OutsideWizardsHouse.unity | 88 +++--- Assets/Scenes/SampleScene.unity | 2 +- Assets/Scenes/WizardHouse.unity | 6 +- .../MainCharacter/MainCharacterManager.cs | 8 +- .../SceneManager/OnMapAppearanceMethod.cs | 1 + .../SceneManager/SaveDynamicObjects.cs | 16 +- 8 files changed, 236 insertions(+), 185 deletions(-) diff --git a/Assets/NewGame.cs b/Assets/NewGame.cs index 1a7406ce..255c99be 100644 --- a/Assets/NewGame.cs +++ b/Assets/NewGame.cs @@ -13,7 +13,7 @@ public class NewGame : MonoBehaviour // !!! comment on changed elements int rock = 1; - PlayerPrefs.SetInt("rock", rock); // Is it use anywhere? I have not found + PlayerPrefs.SetInt("rock", rock); // Is it used anywhere? I have not found it /* string pickaxe1 = "create"; PlayerPrefs.SetString("pickaxe1", pickaxe1); @@ -41,10 +41,12 @@ public class NewGame : MonoBehaviour //PlayerPrefs.SetInt("continued", 0); - PlayerPrefs.SetInt("rock", 0); // Is it use anywhere? I have not found + PlayerPrefs.SetInt("rock", 0); // Is it used anywhere? I have not found it //PlayerPrefs.SetInt("goldOre", 0); PlayerPrefs.SetInt("pickaxe", 0); + + OnMapAppearanceMethod.Gateway = OnMapAppearanceMethodEnum.NewGame; } } diff --git a/Assets/Scenes/CaveEntrance.unity b/Assets/Scenes/CaveEntrance.unity index 6bfceb47..492baa40 100644 --- a/Assets/Scenes/CaveEntrance.unity +++ b/Assets/Scenes/CaveEntrance.unity @@ -150387,8 +150387,8 @@ Tilemap: - first: {x: -3, y: -27, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -150397,8 +150397,8 @@ Tilemap: - first: {x: -2, y: -27, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 57 + m_TileSpriteIndex: 57 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -150437,8 +150437,8 @@ Tilemap: - first: {x: 2, y: -27, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 59 + m_TileSpriteIndex: 59 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -150447,8 +150447,8 @@ Tilemap: - first: {x: 3, y: -27, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -151587,8 +151587,8 @@ Tilemap: - first: {x: -4, y: -26, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 57 + m_TileSpriteIndex: 57 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -151667,8 +151667,8 @@ Tilemap: - first: {x: 4, y: -26, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 59 + m_TileSpriteIndex: 59 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -152787,8 +152787,8 @@ Tilemap: - first: {x: -5, y: -25, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 57 + m_TileSpriteIndex: 57 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -152887,8 +152887,8 @@ Tilemap: - first: {x: 5, y: -25, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 59 + m_TileSpriteIndex: 59 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -153987,8 +153987,8 @@ Tilemap: - first: {x: -6, y: -24, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 57 + m_TileSpriteIndex: 57 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -154107,8 +154107,8 @@ Tilemap: - first: {x: 6, y: -24, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 60 + m_TileSpriteIndex: 60 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155137,8 +155137,8 @@ Tilemap: - first: {x: -12, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155147,8 +155147,8 @@ Tilemap: - first: {x: -11, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155157,8 +155157,8 @@ Tilemap: - first: {x: -10, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155167,8 +155167,8 @@ Tilemap: - first: {x: -9, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155177,8 +155177,8 @@ Tilemap: - first: {x: -8, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155187,8 +155187,8 @@ Tilemap: - first: {x: -7, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 57 + m_TileSpriteIndex: 57 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155317,8 +155317,8 @@ Tilemap: - first: {x: 6, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 59 + m_TileSpriteIndex: 59 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155597,8 +155597,8 @@ Tilemap: - first: {x: 34, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -155607,8 +155607,8 @@ Tilemap: - first: {x: 35, y: -23, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 35 + m_TileSpriteIndex: 35 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156337,8 +156337,8 @@ Tilemap: - first: {x: -13, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 55 + m_TileSpriteIndex: 55 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156347,8 +156347,8 @@ Tilemap: - first: {x: -12, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156357,8 +156357,8 @@ Tilemap: - first: {x: -11, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156367,8 +156367,8 @@ Tilemap: - first: {x: -10, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156377,8 +156377,8 @@ Tilemap: - first: {x: -9, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156387,8 +156387,8 @@ Tilemap: - first: {x: -8, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156397,8 +156397,8 @@ Tilemap: - first: {x: -7, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 56 + m_TileSpriteIndex: 56 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156537,8 +156537,8 @@ Tilemap: - first: {x: 7, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 59 + m_TileSpriteIndex: 59 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156797,8 +156797,8 @@ Tilemap: - first: {x: 33, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 57 + m_TileSpriteIndex: 57 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156827,8 +156827,8 @@ Tilemap: - first: {x: 36, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 59 + m_TileSpriteIndex: 59 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -156837,8 +156837,8 @@ Tilemap: - first: {x: 37, y: -22, z: 0} second: serializedVersion: 2 - m_TileIndex: 27 - m_TileSpriteIndex: 27 + m_TileIndex: 61 + m_TileSpriteIndex: 61 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -157607,8 +157607,8 @@ Tilemap: - first: {x: -7, y: -21, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 58 + m_TileSpriteIndex: 58 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -158047,8 +158047,8 @@ Tilemap: - first: {x: 37, y: -21, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 60 + m_TileSpriteIndex: 60 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -158817,8 +158817,8 @@ Tilemap: - first: {x: -7, y: -20, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 58 + m_TileSpriteIndex: 58 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -159257,8 +159257,8 @@ Tilemap: - first: {x: 37, y: -20, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 60 + m_TileSpriteIndex: 60 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -160027,8 +160027,8 @@ Tilemap: - first: {x: -7, y: -19, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 58 + m_TileSpriteIndex: 58 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -160427,8 +160427,8 @@ Tilemap: - first: {x: 33, y: -19, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 56 + m_TileSpriteIndex: 56 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -160457,8 +160457,8 @@ Tilemap: - first: {x: 36, y: -19, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 55 + m_TileSpriteIndex: 55 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -161237,8 +161237,8 @@ Tilemap: - first: {x: -7, y: -18, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 58 + m_TileSpriteIndex: 58 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -161367,8 +161367,8 @@ Tilemap: - first: {x: 6, y: -18, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 55 + m_TileSpriteIndex: 55 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -161647,8 +161647,8 @@ Tilemap: - first: {x: 34, y: -18, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -161657,8 +161657,8 @@ Tilemap: - first: {x: 35, y: -18, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -162447,8 +162447,8 @@ Tilemap: - first: {x: -7, y: -17, z: 0} second: serializedVersion: 2 - m_TileIndex: 25 - m_TileSpriteIndex: 25 + m_TileIndex: 58 + m_TileSpriteIndex: 58 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -162567,8 +162567,8 @@ Tilemap: - first: {x: 5, y: -17, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 55 + m_TileSpriteIndex: 55 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -163677,8 +163677,8 @@ Tilemap: - first: {x: -5, y: -16, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 56 + m_TileSpriteIndex: 56 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -163767,8 +163767,8 @@ Tilemap: - first: {x: 4, y: -16, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 55 + m_TileSpriteIndex: 55 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -164667,8 +164667,8 @@ Tilemap: - first: {x: -27, y: -15, z: 0} second: serializedVersion: 2 - m_TileIndex: 35 - m_TileSpriteIndex: 35 + m_TileIndex: 52 + m_TileSpriteIndex: 52 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -164677,8 +164677,8 @@ Tilemap: - first: {x: -26, y: -15, z: 0} second: serializedVersion: 2 - m_TileIndex: 36 - m_TileSpriteIndex: 36 + m_TileIndex: 54 + m_TileSpriteIndex: 54 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -164897,8 +164897,8 @@ Tilemap: - first: {x: -4, y: -15, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 36 + m_TileSpriteIndex: 36 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -164907,8 +164907,8 @@ Tilemap: - first: {x: -3, y: -15, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 56 + m_TileSpriteIndex: 56 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -164967,8 +164967,8 @@ Tilemap: - first: {x: 3, y: -15, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 55 + m_TileSpriteIndex: 55 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -165877,8 +165877,8 @@ Tilemap: - first: {x: -27, y: -14, z: 0} second: serializedVersion: 2 - m_TileIndex: 7 - m_TileSpriteIndex: 7 + m_TileIndex: 53 + m_TileSpriteIndex: 53 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -166127,8 +166127,8 @@ Tilemap: - first: {x: -2, y: -14, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 56 + m_TileSpriteIndex: 56 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -166167,8 +166167,8 @@ Tilemap: - first: {x: 2, y: -14, z: 0} second: serializedVersion: 2 - m_TileIndex: 17 - m_TileSpriteIndex: 17 + m_TileIndex: 55 + m_TileSpriteIndex: 55 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -182350,7 +182350,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 686e9fe81494066489a520e476c9273f, type: 2} - m_RefCount: 44 m_Data: {fileID: 11400000, guid: b3e5bfb8ce43cc84f8de0801093fc3d1, type: 2} - - m_RefCount: 53 + - m_RefCount: 52 m_Data: {fileID: 11400000, guid: 291d7c945ec865b42af2e3aee1da3fd4, type: 2} - m_RefCount: 449 m_Data: {fileID: 11400000, guid: 66f854fef0f2b5449bacfd2a6284f73a, type: 2} @@ -182370,7 +182370,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 18afbe90addbb7b47b4b4bea0a108202, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 97b2fe468c70606458ec96dd2e749669, type: 2} - - m_RefCount: 297 + - m_RefCount: 249 m_Data: {fileID: 11400000, guid: 70e0457ab49fb0340abb27d44adfba4b, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: 351522b4aedcab64d8677d05a03f3e28, type: 2} @@ -182386,11 +182386,11 @@ Tilemap: m_Data: {fileID: 11400000, guid: 7d273434ca7d0014f942cb1effc9ff54, type: 2} - m_RefCount: 16 m_Data: {fileID: 11400000, guid: 56dd94f367ecfcf4b98929964aaf61e2, type: 2} - - m_RefCount: 7 + - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 86be9359598ec774fb3bbdb3bbd37f11, type: 2} - m_RefCount: 34 m_Data: {fileID: 11400000, guid: ad3b716eb34dd3b4ba7e49bfa909488c, type: 2} - - m_RefCount: 12 + - m_RefCount: 11 m_Data: {fileID: 11400000, guid: 0d571fde5bd65f540b6943fe8cb79611, type: 2} - m_RefCount: 19 m_Data: {fileID: 11400000, guid: 40be1845f7730a642bc8eed050fb1dfd, type: 2} @@ -182406,12 +182406,12 @@ Tilemap: m_Data: {fileID: 11400000, guid: d69a66f20aedd474784c9e37f6c00990, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 5ed8d296b33379041aef8035b92b6be4, type: 2} + - m_RefCount: 9 + m_Data: {fileID: 11400000, guid: c459ab4b363a4074c919ffb3b3c1a3d5, type: 2} + - m_RefCount: 8 + m_Data: {fileID: 11400000, guid: ba30fc82a67f6a341a0ca5634887fd19, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 3a2ce8ece6071a74182587a235d60369, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: b0b9f16a8b7d3834cb8f44371d2364e4, type: 2} - - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 42ac661db8d4bbc449dde7eaaa458dde, type: 2} + m_Data: {fileID: 11400000, guid: cb9132504d4d40241ae09a972f843ab4, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: d803d9aca249341499433f05bbdbf467, type: 2} - m_RefCount: 2 @@ -182440,12 +182440,26 @@ Tilemap: m_Data: {fileID: 11400000, guid: c04324d4ba259a14dab4e96689e4a6a6, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 6c4a2a294acddad438ea84f781461b17, type: 2} - - m_RefCount: 3 + - m_RefCount: 4 m_Data: {fileID: 11400000, guid: 9a094ae6c156e6d41ae447c7852740be, type: 2} - - m_RefCount: 3 + - m_RefCount: 4 m_Data: {fileID: 11400000, guid: e0774afc610d18b42b15be9e36c99db9, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: ef7fdcb13da3fd143a5fd58d719ef785, type: 2} + - m_RefCount: 7 + m_Data: {fileID: 11400000, guid: b0b9f16a8b7d3834cb8f44371d2364e4, type: 2} + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: 42ac661db8d4bbc449dde7eaaa458dde, type: 2} + - m_RefCount: 6 + m_Data: {fileID: 11400000, guid: 4d31dc1f4124b3d4da11d9b4ef642105, type: 2} + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: 44cabadf23c986045a641937a9218a09, type: 2} + - m_RefCount: 6 + m_Data: {fileID: 11400000, guid: 6029c741062eae84abd8f107f583e689, type: 2} + - m_RefCount: 3 + m_Data: {fileID: 11400000, guid: b48623ed52b8f104b95e7a8a8116a22d, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 7f5daa62a4fa2864093ca18b77e21940, type: 2} m_TileSpriteArray: - m_RefCount: 2 m_Data: {fileID: 5645862648581343036, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} @@ -182461,7 +182475,7 @@ Tilemap: m_Data: {fileID: -2961633642670687773, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 44 m_Data: {fileID: 143340375940321821, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 53 + - m_RefCount: 52 m_Data: {fileID: -7102680011226402523, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 449 m_Data: {fileID: 8769440877673374286, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} @@ -182481,7 +182495,7 @@ Tilemap: m_Data: {fileID: -309742679407729220, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 1 m_Data: {fileID: -3618694647267801487, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 297 + - m_RefCount: 249 m_Data: {fileID: -9055055133928199304, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 297 m_Data: {fileID: 49636420498249401, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} @@ -182497,11 +182511,11 @@ Tilemap: m_Data: {fileID: 8071107729507811273, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 16 m_Data: {fileID: -6535199938272828537, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 7 + - m_RefCount: 6 m_Data: {fileID: -5523404503783508057, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 34 m_Data: {fileID: -1383170167583078356, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 12 + - m_RefCount: 11 m_Data: {fileID: 4277035358511813220, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 19 m_Data: {fileID: -4685564899218281214, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} @@ -182517,12 +182531,12 @@ Tilemap: m_Data: {fileID: -1355270939746514160, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 5 m_Data: {fileID: -7394375637179823380, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} + - m_RefCount: 9 + m_Data: {fileID: 7979533475412647284, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 8 + m_Data: {fileID: -8816494724139487580, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 1 - m_Data: {fileID: -6924645478570902714, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 1419850892359332867, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 7553333444985756381, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + m_Data: {fileID: -1689090090486459338, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 3 m_Data: {fileID: 2257595441615189468, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 2 @@ -182551,12 +182565,26 @@ Tilemap: m_Data: {fileID: 7020179883400639532, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 1 m_Data: {fileID: -5711204113590076306, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 3 + - m_RefCount: 4 m_Data: {fileID: -5535862162147368494, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 3 + - m_RefCount: 4 m_Data: {fileID: 4026838099618165060, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 9080061795920535526, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 7 + m_Data: {fileID: 1419850892359332867, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 5 + m_Data: {fileID: 7553333444985756381, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 6 + m_Data: {fileID: 5938177142972023496, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 5 + m_Data: {fileID: -1094894392808581162, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 6 + m_Data: {fileID: 4135711781636913447, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 3 + m_Data: {fileID: 535536378937371503, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -786679429421804572, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} m_TileMatrixArray: - m_RefCount: 5889 m_Data: @@ -217569,7 +217597,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 93 - m_TileSpriteIndex: 93 + m_TileSpriteIndex: 94 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -219462,10 +219490,10 @@ Tilemap: m_Data: {fileID: -1949138965465017344, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 2 m_Data: {fileID: 1394513479713255319, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 9050711099634460043, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 9050711099634460043, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 2 m_Data: {fileID: -30910539988732823, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 2 diff --git a/Assets/Scenes/OutsideWizardsHouse.unity b/Assets/Scenes/OutsideWizardsHouse.unity index 76973948..612cd53d 100644 --- a/Assets/Scenes/OutsideWizardsHouse.unity +++ b/Assets/Scenes/OutsideWizardsHouse.unity @@ -285392,8 +285392,8 @@ Tilemap: - first: {x: 144, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -285402,8 +285402,8 @@ Tilemap: - first: {x: 145, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -287612,8 +287612,8 @@ Tilemap: - first: {x: 128, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -287622,8 +287622,8 @@ Tilemap: - first: {x: 129, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -290092,8 +290092,8 @@ Tilemap: - first: {x: 136, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -290102,8 +290102,8 @@ Tilemap: - first: {x: 137, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -290152,8 +290152,8 @@ Tilemap: - first: {x: 142, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -290162,8 +290162,8 @@ Tilemap: - first: {x: 143, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -290212,8 +290212,8 @@ Tilemap: - first: {x: 148, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -290222,8 +290222,8 @@ Tilemap: - first: {x: 149, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -292622,8 +292622,8 @@ Tilemap: - first: {x: 145, y: 4, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -292632,8 +292632,8 @@ Tilemap: - first: {x: 146, y: 4, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -300092,8 +300092,8 @@ Tilemap: - first: {x: 152, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -300102,8 +300102,8 @@ Tilemap: - first: {x: 153, y: 7, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -305022,8 +305022,8 @@ Tilemap: - first: {x: 154, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 39 - m_TileSpriteIndex: 20 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -305032,8 +305032,8 @@ Tilemap: - first: {x: 155, y: 9, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -337832,8 +337832,8 @@ Tilemap: - first: {x: 94, y: 22, z: 0} second: serializedVersion: 2 - m_TileIndex: 68 - m_TileSpriteIndex: 68 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -337842,8 +337842,8 @@ Tilemap: - first: {x: 95, y: 22, z: 0} second: serializedVersion: 2 - m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileIndex: 73 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -425833,7 +425833,7 @@ Tilemap: m_TileAssetArray: - m_RefCount: 916 m_Data: {fileID: 11400000, guid: 66d3a18bb874dea4397430a450d2dcd2, type: 2} - - m_RefCount: 6446 + - m_RefCount: 6430 m_Data: {fileID: 11400000, guid: d69a66f20aedd474784c9e37f6c00990, type: 2} - m_RefCount: 914 m_Data: {fileID: 11400000, guid: a26b64cc0661c464fb6058e828920ef2, type: 2} @@ -425909,7 +425909,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 3f0a10eff90a25346a525236e3760d3e, type: 2} - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 73bf0867b4d6f3847b31652eb3950f0d, type: 2} - - m_RefCount: 101 + - m_RefCount: 100 m_Data: {fileID: 11400000, guid: 5ed8d296b33379041aef8035b92b6be4, type: 2} - m_RefCount: 438 m_Data: {fileID: 11400000, guid: 584bad315f02fca4a93ceca07693afc1, type: 2} @@ -425967,7 +425967,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 56b6ab91ab3a77640be441b34d797f6f, type: 2} - m_RefCount: 7 m_Data: {fileID: 11400000, guid: 541e6a33318684f4f995340c364ed227, type: 2} - - m_RefCount: 266 + - m_RefCount: 265 m_Data: {fileID: 11400000, guid: a9ce6ca776bb00842b81932a8cf6ea2e, type: 2} - m_RefCount: 141 m_Data: {fileID: 11400000, guid: a5f356c61f2af334ab6f9e8feefeead1, type: 2} @@ -425977,12 +425977,12 @@ Tilemap: m_Data: {fileID: 11400000, guid: 4f93b992f96f0fe448df379f0b2d3565, type: 2} - m_RefCount: 57 m_Data: {fileID: 11400000, guid: 00611fa507c2a2d478a9e57097e8b16d, type: 2} - - m_RefCount: 888 + - m_RefCount: 906 m_Data: {fileID: 11400000, guid: 9596769ea6df4414696f628c2fc44ca8, type: 2} m_TileSpriteArray: - m_RefCount: 916 m_Data: {fileID: -95218347053548597, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 6446 + - m_RefCount: 6430 m_Data: {fileID: -1355270939746514160, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 914 m_Data: {fileID: 7706398472070550282, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} @@ -426020,7 +426020,7 @@ Tilemap: m_Data: {fileID: 6338239303608930796, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 30 m_Data: {fileID: -8254073374960315074, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - - m_RefCount: 101 + - m_RefCount: 100 m_Data: {fileID: -7394375637179823380, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 4 m_Data: {fileID: -2800556608301795531, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} @@ -426072,7 +426072,7 @@ Tilemap: m_Data: {fileID: 7104919503858039896, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 8 m_Data: {fileID: 1419850892359332867, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 888 + - m_RefCount: 906 m_Data: {fileID: -1933240692946450925, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 4 m_Data: {fileID: -6402857492380795889, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} @@ -426116,7 +426116,7 @@ Tilemap: m_Data: {fileID: 3945142523180803502, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 7 m_Data: {fileID: 880558330007934427, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 266 + - m_RefCount: 265 m_Data: {fileID: 7681903327190599789, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 141 m_Data: {fileID: -4420781712680604251, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index fe74d9b2..7131af55 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -133500,7 +133500,7 @@ MonoBehaviour: currentMapName: coords: {x: 0, y: 0, z: 0} nextMapName: WizardHouse - respawnCoords: {x: 0.55, y: -11.5, z: 10} + respawnCoords: {x: -5, y: 1.5, z: 10} --- !u!50 &1995903833 Rigidbody2D: serializedVersion: 4 diff --git a/Assets/Scenes/WizardHouse.unity b/Assets/Scenes/WizardHouse.unity index 05daa839..b8c55f08 100644 --- a/Assets/Scenes/WizardHouse.unity +++ b/Assets/Scenes/WizardHouse.unity @@ -31310,9 +31310,9 @@ MonoBehaviour: gateway: id: 0 currentMapName: - coords: {x: 0.55, y: -10.48, z: 0} + coords: {x: 3.5, y: -15.5, z: 0} nextMapName: OutsideWizardsHouse - respawnCoords: {x: 0, y: -4.5, z: 10} + respawnCoords: {x: 0.5, y: 1, z: 10} --- !u!50 &1585128605 Rigidbody2D: serializedVersion: 4 @@ -36892,6 +36892,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: slider: {fileID: 1871643639} + maxExp: 0 + exp: 0 --- !u!114 &1871643639 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs b/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs index 184d3bc6..21b81732 100644 --- a/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs +++ b/Assets/Scripts/SceneManager/MainCharacter/MainCharacterManager.cs @@ -64,7 +64,7 @@ public class MainCharacterManager : MonoBehaviour var x = PlayerPrefs.GetFloat("gateway.respawnCoords.x"); var y = PlayerPrefs.GetFloat("gateway.respawnCoords.y"); var z = PlayerPrefs.GetFloat("gateway.respawnCoords.z"); - + Debug.Log("Gateway"); return new Vector3(x, y, z); } case OnMapAppearanceMethodEnum.LoadGame: @@ -73,7 +73,7 @@ public class MainCharacterManager : MonoBehaviour var x = PlayerPrefs.GetFloat("gateway.respawnCoords.x"); var y = PlayerPrefs.GetFloat("gateway.respawnCoords.y"); var z = PlayerPrefs.GetFloat("gateway.respawnCoords.z"); - + Debug.Log("Load Game"); return new Vector3(x, y, z); } default: @@ -91,6 +91,10 @@ public class MainCharacterManager : MonoBehaviour { return new Vector3(0.5f, -37, 10); } + case "WizardHouse": + { + return new Vector3(-5, 1.5f, 10); + } default: { return avatar.transform.position; diff --git a/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs b/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs index a9dbcaa6..9c24476c 100644 --- a/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs +++ b/Assets/Scripts/SceneManager/OnMapAppearanceMethod.cs @@ -21,6 +21,7 @@ public class OnMapAppearanceMethod : MonoBehaviour { Gateway = OnMapAppearanceMethodEnum.NewGame; } + Debug.Log("Set Gateway"); } diff --git a/Assets/Scripts/SceneManager/SaveDynamicObjects.cs b/Assets/Scripts/SceneManager/SaveDynamicObjects.cs index 9b90d067..b88ee33c 100644 --- a/Assets/Scripts/SceneManager/SaveDynamicObjects.cs +++ b/Assets/Scripts/SceneManager/SaveDynamicObjects.cs @@ -25,10 +25,24 @@ public class SaveDynamicObjects : MonoBehaviour SaveSampleScene(); break; } + case "CaveEntrance": + { + break; + } + case "WizardHouse": + { + //TODO dynamic elements if added + break; + } + case "OutsideWizardsHouse": + { + //TODO dynamic elements if added + break; + } default: { Debug.Log("Niedopasowano sceny podczaas zapisu dynamicznych elementow"); - break; + break; } } }