Browse Source

Some bug fixes

main
Joshua Reason 2 years ago
parent
commit
e67d3a25e7
13 changed files with 48 additions and 66 deletions
  1. +20
    -6
      Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab
  2. BIN
      Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset
  3. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset.meta
  4. +2
    -44
      Assets/Prefabs/2D Camera.prefab
  5. +2
    -2
      Assets/Prefabs/Level Manager.prefab
  6. BIN
      Assets/Scenes/Credits.unity
  7. BIN
      Assets/Scenes/Main Menu.unity
  8. BIN
      Assets/Scenes/Official Levels/Level 1.unity
  9. BIN
      Assets/Scenes/Official Levels/Level 2.unity
  10. BIN
      Assets/Scenes/Official Levels/Level 3.unity
  11. BIN
      Assets/Scenes/Official Levels/Level 4.unity
  12. +0
    -1
      Assets/Scripts/SneakyTextController.cs
  13. BIN
      ProjectSettings/EditorBuildSettings.asset

+ 20
- 6
Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab View File

@ -71,6 +71,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741825 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} - first: {x: -3, y: -3, z: 0}
second: second:
serializedVersion: 2 serializedVersion: 2
@ -235,7 +245,7 @@ Tilemap:
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 19 m_TileIndex: 19
m_TileSpriteIndex: 4
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0 m_TileMatrixIndex: 0
m_TileColorIndex: 0 m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
@ -295,16 +305,18 @@ Tilemap:
m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2} m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, type: 2} m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 9c83d77c813badc43b04e037759a44df, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 3977439943124479116, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: 3977439943124479116, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: -6252805913084083930, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: -6252805913084083930, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 5492486684686113971, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: 5492486684686113971, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 2
- m_RefCount: 1
m_Data: {fileID: 2940010051858493779, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: 2940010051858493779, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 6892907418128013141, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: 6892907418128013141, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
@ -332,8 +344,10 @@ Tilemap:
m_Data: {fileID: 8843726661577706292, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: 8843726661577706292, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 2004466711981498611, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3} m_Data: {fileID: 2004466711981498611, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: 4014216390142967927, guid: 955c0bce688a12046b99aa20d31ae763, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 20
- m_RefCount: 21
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
@ -370,7 +384,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 21
- m_RefCount: 22
m_Data: {r: 1, g: 1, b: 1, a: 1} m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: [] m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
@ -488,7 +502,7 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0} m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0 m_CellLayout: 0
m_CellSwizzle: 0 m_CellSwizzle: 0
--- !u!114 &6939106024771849074
--- !u!114 &4722214546484427390
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

BIN
Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset (Stored with Git LFS) View File

size 784

+ 8
- 0
Assets/Art Assets/Tiles/Environment/Decor/castle_BG4.asset.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9c83d77c813badc43b04e037759a44df
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

+ 2
- 44
Assets/Prefabs/2D Camera.prefab View File

@ -568,7 +568,6 @@ GameObject:
- component: {fileID: 2742648450655999647} - component: {fileID: 2742648450655999647}
- component: {fileID: 2742648450655999840} - component: {fileID: 2742648450655999840}
- component: {fileID: 2742648450655999646} - component: {fileID: 2742648450655999646}
- component: {fileID: 2742648450655999841}
- component: {fileID: 1188007456} - component: {fileID: 1188007456}
m_Layer: 0 m_Layer: 0
m_Name: Camera Mask m_Name: Camera Mask
@ -618,7 +617,7 @@ Camera:
far clip plane: 1000 far clip plane: 1000
field of view: 60 field of view: 60
orthographic: 1 orthographic: 1
orthographic size: 10
orthographic size: 5.7
m_Depth: 0 m_Depth: 0
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
@ -648,26 +647,6 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_imageEffect: {fileID: 4800000, guid: 70997f99a8685d34a9333b2aab2df541, type: 3} m_imageEffect: {fileID: 4800000, guid: 70997f99a8685d34a9333b2aab2df541, type: 3}
m_mat: {fileID: 0} 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 --- !u!114 &1188007456
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -740,7 +719,6 @@ GameObject:
- component: {fileID: 2742648452306802125} - component: {fileID: 2742648452306802125}
- component: {fileID: 2742648452306802122} - component: {fileID: 2742648452306802122}
- component: {fileID: 2742648452306802127} - component: {fileID: 2742648452306802127}
- component: {fileID: 2742648452306802129}
- component: {fileID: 7035977061392704193} - component: {fileID: 7035977061392704193}
- component: {fileID: 515301201} - component: {fileID: 515301201}
m_Layer: 0 m_Layer: 0
@ -794,7 +772,7 @@ Camera:
far clip plane: 5000 far clip plane: 5000
field of view: 40 field of view: 40
orthographic: 1 orthographic: 1
orthographic size: 5
orthographic size: 5.7
m_Depth: 0 m_Depth: 0
m_CullingMask: m_CullingMask:
serializedVersion: 2 serializedVersion: 2
@ -832,26 +810,6 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_imageEffect: {fileID: 0} m_imageEffect: {fileID: 0}
m_mat: {fileID: 2100000, guid: 65c1434865079454a94a84f692299fcb, type: 2} 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 --- !u!114 &7035977061392704193
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 2
- 2
Assets/Prefabs/Level Manager.prefab View File

@ -286,10 +286,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100 m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1 m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ReferenceResolution: {x: 1920, y: 1080}
m_ScreenMatchMode: 0 m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0 m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3 m_PhysicalUnit: 3

BIN
Assets/Scenes/Credits.unity (Stored with Git LFS) View File

size 39418

BIN
Assets/Scenes/Main Menu.unity (Stored with Git LFS) View File

size 46214

BIN
Assets/Scenes/Official Levels/Level 1.unity (Stored with Git LFS) View File

size 190668

BIN
Assets/Scenes/Official Levels/Level 2.unity (Stored with Git LFS) View File

size 1968215

BIN
Assets/Scenes/Official Levels/Level 3.unity (Stored with Git LFS) View File

size 596483

BIN
Assets/Scenes/Official Levels/Level 4.unity (Stored with Git LFS) View File

size 390083

+ 0
- 1
Assets/Scripts/SneakyTextController.cs View File

@ -46,7 +46,6 @@ public class SneakyTextController : MonoBehaviour
private void OnLightChange(float value) private void OnLightChange(float value)
{ {
Debug.Log("Here");
if (!m_hasTriggered && !m_freezePlayer) if (!m_hasTriggered && !m_freezePlayer)
{ {

BIN
ProjectSettings/EditorBuildSettings.asset (Stored with Git LFS) View File

size 756 size 756

Loading…
Cancel
Save