From e67d3a25e7d55b11fb72a242e01b40c0f7cb5b01 Mon Sep 17 00:00:00 2001 From: jreason Date: Sun, 30 Jan 2022 19:44:10 +1100 Subject: [PATCH] Some bug fixes --- .../Tiles/Environment/Decor/Decor.prefab | 26 ++++++++--- .../Tiles/Environment/Decor/castle_BG4.asset | 3 ++ .../Environment/Decor/castle_BG4.asset.meta | 8 ++++ Assets/Prefabs/2D Camera.prefab | 46 +------------------ Assets/Prefabs/Level Manager.prefab | 4 +- Assets/Scenes/Credits.unity | 4 +- Assets/Scenes/Main Menu.unity | 4 +- Assets/Scenes/Official Levels/Level 1.unity | 4 +- Assets/Scenes/Official Levels/Level 2.unity | 4 +- Assets/Scenes/Official Levels/Level 3.unity | 4 +- Assets/Scenes/Official Levels/Level 4.unity | 4 +- Assets/Scripts/SneakyTextController.cs | 1 - ProjectSettings/EditorBuildSettings.asset | 2 +- 13 files changed, 48 insertions(+), 66 deletions(-) create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset create mode 100644 Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset.meta diff --git a/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab b/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab index d26b0a0..5694f33 100644 --- a/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab +++ b/Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab @@ -71,6 +71,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 21 + m_TileSpriteIndex: 18 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -3, y: -3, z: 0} second: serializedVersion: 2 @@ -235,7 +245,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 19 - m_TileSpriteIndex: 4 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -295,16 +305,18 @@ Tilemap: m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 9c83d77c813badc43b04e037759a44df, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: 3977439943124479116, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - m_RefCount: 1 m_Data: {fileID: -6252805913084083930, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - m_RefCount: 1 m_Data: {fileID: 5492486684686113971, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - - m_RefCount: 2 + - m_RefCount: 1 m_Data: {fileID: 2940010051858493779, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - m_RefCount: 1 m_Data: {fileID: 6892907418128013141, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} @@ -332,8 +344,10 @@ Tilemap: m_Data: {fileID: 8843726661577706292, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} - m_RefCount: 1 m_Data: {fileID: 2004466711981498611, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 4014216390142967927, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} m_TileMatrixArray: - - m_RefCount: 20 + - m_RefCount: 21 m_Data: e00: 1 e01: 0 @@ -370,7 +384,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 21 + - m_RefCount: 22 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -488,7 +502,7 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 ---- !u!114 &6939106024771849074 +--- !u!114 &4722214546484427390 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset b/Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset new file mode 100644 index 0000000..2ad7c97 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:912c6de93e8e86680c8a8b0d0f105f19639520e97c99e3d44c6361bec5a65d51 +size 784 diff --git a/Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset.meta b/Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset.meta new file mode 100644 index 0000000..9dd3c20 --- /dev/null +++ b/Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9c83d77c813badc43b04e037759a44df +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/2D Camera.prefab b/Assets/Prefabs/2D Camera.prefab index 0606794..bfbd822 100644 --- a/Assets/Prefabs/2D Camera.prefab +++ b/Assets/Prefabs/2D Camera.prefab @@ -568,7 +568,6 @@ GameObject: - component: {fileID: 2742648450655999647} - component: {fileID: 2742648450655999840} - component: {fileID: 2742648450655999646} - - component: {fileID: 2742648450655999841} - component: {fileID: 1188007456} m_Layer: 0 m_Name: Camera Mask @@ -618,7 +617,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 10 + orthographic size: 5.7 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -648,26 +647,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_imageEffect: {fileID: 4800000, guid: 70997f99a8685d34a9333b2aab2df541, type: 3} m_mat: {fileID: 0} ---- !u!114 &2742648450655999841 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2742648450655999644} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AssetsPPU: 100 - m_RefResolutionX: 1920 - m_RefResolutionY: 1080 - m_UpscaleRT: 0 - m_PixelSnapping: 1 - m_CropFrameX: 0 - m_CropFrameY: 0 - m_StretchFill: 0 --- !u!114 &1188007456 MonoBehaviour: m_ObjectHideFlags: 0 @@ -740,7 +719,6 @@ GameObject: - component: {fileID: 2742648452306802125} - component: {fileID: 2742648452306802122} - component: {fileID: 2742648452306802127} - - component: {fileID: 2742648452306802129} - component: {fileID: 7035977061392704193} - component: {fileID: 515301201} m_Layer: 0 @@ -794,7 +772,7 @@ Camera: far clip plane: 5000 field of view: 40 orthographic: 1 - orthographic size: 5 + orthographic size: 5.7 m_Depth: 0 m_CullingMask: serializedVersion: 2 @@ -832,26 +810,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_imageEffect: {fileID: 0} m_mat: {fileID: 2100000, guid: 65c1434865079454a94a84f692299fcb, type: 2} ---- !u!114 &2742648452306802129 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2742648452306802123} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6a160d838ff8b4b4693ac20007e008c7, type: 3} - m_Name: - m_EditorClassIdentifier: - m_AssetsPPU: 100 - m_RefResolutionX: 1920 - m_RefResolutionY: 1080 - m_UpscaleRT: 0 - m_PixelSnapping: 1 - m_CropFrameX: 0 - m_CropFrameY: 0 - m_StretchFill: 0 --- !u!114 &7035977061392704193 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Level Manager.prefab b/Assets/Prefabs/Level Manager.prefab index e90b710..1f2ad80 100644 --- a/Assets/Prefabs/Level Manager.prefab +++ b/Assets/Prefabs/Level Manager.prefab @@ -286,10 +286,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 diff --git a/Assets/Scenes/Credits.unity b/Assets/Scenes/Credits.unity index 75392c0..65f8531 100644 --- a/Assets/Scenes/Credits.unity +++ b/Assets/Scenes/Credits.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f1293c746b47bfa5f2e9108aeac4fb2da195efc4f12d231869772e262972df55 -size 43780 +oid sha256:7008220909b128ea9a9963ab908662439876b19f3b51846983ae07232b1b72fd +size 39418 diff --git a/Assets/Scenes/Main Menu.unity b/Assets/Scenes/Main Menu.unity index 0737129..e9879a3 100644 --- a/Assets/Scenes/Main Menu.unity +++ b/Assets/Scenes/Main Menu.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2a2fa9ffad2a6eba08e099734d8bc33fe234160c3ea40c718e71d704d605eedf -size 50576 +oid sha256:f9af27c12eb83dfa6337f6b7e6475d66f4f90e87426edeff3e03fc307d816973 +size 46214 diff --git a/Assets/Scenes/Official Levels/Level 1.unity b/Assets/Scenes/Official Levels/Level 1.unity index 92c52d1..8521933 100644 --- a/Assets/Scenes/Official Levels/Level 1.unity +++ b/Assets/Scenes/Official Levels/Level 1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5edf73ee2b397122bc1ac044dde95f513d3473c5b4faf375842a68935432edea -size 184288 +oid sha256:ecfafc2464459d48cc9cb1c9c410084954f4c3158419fa11b60843a90dd3b819 +size 190668 diff --git a/Assets/Scenes/Official Levels/Level 2.unity b/Assets/Scenes/Official Levels/Level 2.unity index e5ebf67..06d179a 100644 --- a/Assets/Scenes/Official Levels/Level 2.unity +++ b/Assets/Scenes/Official Levels/Level 2.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:987bc7c38924344ed2a47674dfab2076e1d9281427e961ac385ce69817be6bcf -size 1968208 +oid sha256:9d4e281f80b5587e52572c2d437b81e5b2e2b1300cba4196e27915fd84f343e5 +size 1968215 diff --git a/Assets/Scenes/Official Levels/Level 3.unity b/Assets/Scenes/Official Levels/Level 3.unity index 129fa31..8123982 100644 --- a/Assets/Scenes/Official Levels/Level 3.unity +++ b/Assets/Scenes/Official Levels/Level 3.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c09c87c646e4db66842c941aff944b9fd39f4bf25f86396c1494e358f49627a9 -size 596582 +oid sha256:c3fc78d912c027e9234353562c9e669c83c014dbd9a0900209da9bec7c106eb5 +size 596483 diff --git a/Assets/Scenes/Official Levels/Level 4.unity b/Assets/Scenes/Official Levels/Level 4.unity index e7f8327..b4fa96a 100644 --- a/Assets/Scenes/Official Levels/Level 4.unity +++ b/Assets/Scenes/Official Levels/Level 4.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a3685fa1d01a9c2e9c6522b0e3ccd980a2c0d555ec2fe4b1c79b5e3b4076cae -size 389483 +oid sha256:8ac6db0bee2ec7e3d906ba88a597d4ab4b8b361043289d6bb7bfce1136f26761 +size 390083 diff --git a/Assets/Scripts/SneakyTextController.cs b/Assets/Scripts/SneakyTextController.cs index 94f0612..a37293f 100644 --- a/Assets/Scripts/SneakyTextController.cs +++ b/Assets/Scripts/SneakyTextController.cs @@ -46,7 +46,6 @@ public class SneakyTextController : MonoBehaviour private void OnLightChange(float value) { - Debug.Log("Here"); if (!m_hasTriggered && !m_freezePlayer) { diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 40e51a9..daecdc2 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ec0637cbcd76b43003b0cd035b1c526536c2ddc856be353fa6fb5b0afdd6c74 +oid sha256:97cc5d845f79c14fbb168a7f0148f66b8af26072d1522da75df2832f3a8d73e4 size 756