Browse Source

Merge branch 'main' into jeff

# Conflicts:
#	Assets/Scenes/Level 2.unity
jeff
Jeff 2 years ago
parent
commit
5fbd8247aa
78 changed files with 1777 additions and 109 deletions
  1. +1
    -1
      Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta
  2. +8
    -0
      Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c
  3. +41
    -0
      Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat
  4. +12
    -0
      Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta
  5. +9
    -9
      Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta
  6. +6
    -6
      Assets/Art Assets/Textures/Environ/castle_tileset.png.meta
  7. +29
    -29
      Assets/Art Assets/Textures/Environ/decor.png.meta
  8. BIN
      Assets/Art Assets/Textures/Environ/water.png
  9. +1
    -1
      Assets/Art Assets/Textures/Environ/water.png.meta
  10. +337
    -11
      Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab
  11. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset
  12. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler.asset.meta
  13. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset
  14. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler2.asset.meta
  15. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset
  16. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler3.asset.meta
  17. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset
  18. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler4.asset.meta
  19. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset
  20. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_dangler5.asset.meta
  21. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset
  22. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark1.asset.meta
  23. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset
  24. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark2.asset.meta
  25. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset
  26. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_dark3.asset.meta
  27. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset
  28. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light1.asset.meta
  29. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset
  30. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light2.asset.meta
  31. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset
  32. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_grass_light3.asset.meta
  33. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset
  34. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_leaf.asset.meta
  35. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset
  36. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_leaf2.asset.meta
  37. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset
  38. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_plant1.asset.meta
  39. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset
  40. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_plant2.asset.meta
  41. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset
  42. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_trunk.asset.meta
  43. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset
  44. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_vine.asset.meta
  45. BIN
      Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset
  46. +8
    -0
      Assets/Art Assets/Tiles/Environment/Decor/decor_vine2.asset.meta
  47. +13
    -33
      Assets/Art Assets/Tiles/Environment/Main Palette.prefab
  48. BIN
      Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset
  49. +8
    -0
      Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset.meta
  50. BIN
      Assets/Art Assets/Tiles/Environment/Rule tiles/Light_Grass.asset
  51. +473
    -0
      Assets/Prefabs/Player.prefab
  52. +7
    -0
      Assets/Prefabs/Player.prefab.meta
  53. +211
    -0
      Assets/Prefabs/spikes_3.prefab
  54. +7
    -0
      Assets/Prefabs/spikes_3.prefab.meta
  55. BIN
      Assets/Scenes/Level 1.unity
  56. +37
    -0
      Assets/Scripts/Character/CharacterReset.cs
  57. +11
    -0
      Assets/Scripts/Character/CharacterReset.cs.meta
  58. +13
    -9
      Assets/Scripts/DarknessController.cs
  59. +14
    -0
      Assets/Scripts/IResettable.cs
  60. +11
    -0
      Assets/Scripts/IResettable.cs.meta
  61. +19
    -0
      Assets/Scripts/KillPlayer.cs
  62. +11
    -0
      Assets/Scripts/KillPlayer.cs.meta
  63. +113
    -0
      Assets/Scripts/LevelManager.cs
  64. +11
    -0
      Assets/Scripts/LevelManager.cs.meta
  65. +62
    -0
      Assets/Scripts/SneakyTextController.cs
  66. +11
    -0
      Assets/Scripts/SneakyTextController.cs.meta
  67. +14
    -2
      Assets/Scripts/TextController.cs
  68. +34
    -0
      Assets/Scripts/TimerController.cs
  69. +11
    -0
      Assets/Scripts/TimerController.cs.meta
  70. BIN
      Assets/Variables/Runtime/LightAmount.asset
  71. +8
    -0
      Assets/Variables/Runtime/LightAmount.asset.meta
  72. BIN
      Assets/Variables/Runtime/Timer.asset
  73. +8
    -0
      Assets/Variables/Runtime/Timer.asset.meta
  74. BIN
      Assets/Variables/Runtime/freezePlayer.asset
  75. +0
    -0
      Assets/Variables/Runtime/freezePlayer.asset.meta
  76. BIN
      Assets/Variables/Runtime/isNoInput.asset
  77. BIN
      Assets/Variables/Runtime/isPlayerDead.asset
  78. +8
    -0
      Assets/Variables/Runtime/isPlayerDead.asset.meta

Assets/Art Assets/Tilemaps.meta → Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 85233f4a34a589945870b124282bf234
guid: fbb382cd1cd301046ad6790c048b0c6c
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 8
- 0
Assets/Art Assets/Textures/Chars/Moose Angel/Materials.meta~77db7eb71343ea6a91583afc81271a936526016c View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9132b80b553bb3f40b9a29cc65955c79
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 41
- 0
Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat View File

@ -0,0 +1,41 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: monster_0
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
<<<<<<< HEAD
m_Texture: {fileID: 2800000, guid: 4f66e39be2d476f46bb700a5268dcfb8, type: 3}
=======
m_Texture: {fileID: 2800000, guid: 6ba5faafd9a8ff44b8f96dbe81c4f0f2, type: 3}
>>>>>>> 77db7eb71343ea6a91583afc81271a936526016c
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- PixelSnap: 0
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

+ 12
- 0
Assets/Art Assets/Textures/Chars/Moose Angel/Materials/monster_0.mat.meta View File

@ -0,0 +1,12 @@
fileFormatVersion: 2
<<<<<<< HEAD
guid: 4cfcd558d1d29fe49a8f2d60afff1640
=======
guid: ca80fac3bd969f84eaf173691c89d17a
>>>>>>> 77db7eb71343ea6a91583afc81271a936526016c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

+ 9
- 9
Assets/Art Assets/Textures/Chars/Moose Angel/monster_0.png.meta View File

@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 11 serializedVersion: 11
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
sRGBTexture: 1 sRGBTexture: 1
linearTexture: 0 linearTexture: 0
fadeOut: 0 fadeOut: 0
@ -35,24 +35,24 @@ TextureImporter:
filterMode: 1 filterMode: 1
aniso: 2 aniso: 2
mipBias: 0 mipBias: 0
wrapU: 0
wrapV: 0
wrapU: 1
wrapV: 1
wrapW: 0 wrapW: 0
nPOTScale: 1
nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 0
spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
spritePivot: {x: 0.5, y: 0.5} spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 48
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 0
textureType: 8
textureShape: 1 textureShape: 1
singleChannelComponent: 0 singleChannelComponent: 0
flipbookRows: 1 flipbookRows: 1
@ -129,7 +129,7 @@ TextureImporter:
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID:
spriteID: 5e97eb03825dee720800000000000000
internalID: 0 internalID: 0
vertices: [] vertices: []
indices: indices:

+ 6
- 6
Assets/Art Assets/Textures/Environ/castle_tileset.png.meta View File

@ -155,8 +155,8 @@ TextureImporter:
y: 149 y: 149
width: 18 width: 18
height: 23 height: 23
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.4854355, y: 0.64819}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -176,8 +176,8 @@ TextureImporter:
y: 146 y: 146
width: 7 width: 7
height: 26 height: 26
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.4625484, y: 0.7117621}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -386,8 +386,8 @@ TextureImporter:
y: 115 y: 115
width: 16 width: 16
height: 39 height: 39
alignment: 0
pivot: {x: 0.5, y: 0.5}
alignment: 9
pivot: {x: 0.5, y: 0.21}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []

+ 29
- 29
Assets/Art Assets/Textures/Environ/decor.png.meta View File

@ -229,9 +229,9 @@ TextureImporter:
x: 110 x: 110
y: 87 y: 87
width: 22 width: 22
height: 22
alignment: 0
pivot: {x: 0.5, y: 0.5}
height: 26
alignment: 9
pivot: {x: 0.5, y: 0.3}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -250,7 +250,7 @@ TextureImporter:
x: 134 x: 134
y: 87 y: 87
width: 21 width: 21
height: 11
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -269,9 +269,9 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 63 x: 63
y: 84
width: 11
height: 11
y: 79
width: 12
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -290,9 +290,9 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 78 x: 78
y: 85
y: 80
width: 11 width: 11
height: 11
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -313,7 +313,7 @@ TextureImporter:
x: 17 x: 17
y: 64 y: 64
width: 11 width: 11
height: 8
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -333,8 +333,8 @@ TextureImporter:
serializedVersion: 2 serializedVersion: 2
x: 31 x: 31
y: 64 y: 64
width: 12
height: 13
width: 13
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -377,8 +377,8 @@ TextureImporter:
y: 60 y: 60
width: 16 width: 16
height: 16 height: 16
alignment: 9
pivot: {x: 0.30898008, y: 0.3043206}
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -395,9 +395,9 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 114 x: 114
y: 63
width: 13
height: 13
y: 60
width: 14
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -416,9 +416,9 @@ TextureImporter:
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 130 x: 130
y: 66
width: 10
height: 10
y: 60
width: 16
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -436,10 +436,10 @@ TextureImporter:
name: decor_leaf2 name: decor_leaf2
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 146
y: 69
width: 7
height: 7
x: 140
y: 60
width: 16
height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@ -524,8 +524,8 @@ TextureImporter:
y: 64 y: 64
width: 16 width: 16
height: 16 height: 16
alignment: 9
pivot: {x: 0.5029521, y: 0.52519226}
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []
@ -541,12 +541,12 @@ TextureImporter:
name: decor_grass_light3 name: decor_grass_light3
rect: rect:
serializedVersion: 2 serializedVersion: 2
x: 63
x: 69
y: 64 y: 64
width: 16 width: 16
height: 16 height: 16
alignment: 9
pivot: {x: 0.5275324, y: 0.7190136}
alignment: 0
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
outline: [] outline: []
physicsShape: [] physicsShape: []

BIN
Assets/Art Assets/Textures/Environ/water.png (Stored with Git LFS) View File

size 855

+ 1
- 1
Assets/Art Assets/Textures/Environ/water.png.meta View File

@ -234,7 +234,7 @@ TextureImporter:
serializedVersion: 2 serializedVersion: 2
x: 81 x: 81
y: 34 y: 34
width: 15
width: 16
height: 16 height: 16
alignment: 0 alignment: 0
pivot: {x: 0.5, y: 0.5} pivot: {x: 0.5, y: 0.5}

+ 337
- 11
Assets/Art Assets/Tiles/Environment/Decor/Decor.prefab View File

@ -40,17 +40,343 @@ Tilemap:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 207219532527442833} m_GameObject: {fileID: 207219532527442833}
m_Enabled: 1 m_Enabled: 1
m_Tiles: {}
m_Tiles:
- first: {x: -3, y: -4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 3
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: -4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 16
m_TileSpriteIndex: 16
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: -4, z: 0}
second:
serializedVersion: 2
m_TileIndex: 17
m_TileSpriteIndex: 17
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 10
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 4
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 12
m_TileSpriteIndex: 12
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 13
m_TileSpriteIndex: 13
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 1, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 14
m_TileSpriteIndex: 14
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 15
m_TileSpriteIndex: 15
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: -2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 0
m_TileSpriteIndex: 6
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: -2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 8
m_TileSpriteIndex: 8
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: -2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 9
m_TileSpriteIndex: 9
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: -2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 11
m_TileSpriteIndex: 11
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -3, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 2
m_TileSpriteIndex: 1
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 0, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 5
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 1, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 6
m_TileSpriteIndex: 7
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 2, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 7
m_TileSpriteIndex: 10
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 18
m_TileSpriteIndex: 9
m_TileMatrixIndex: 1
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741826
- first: {x: 0, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 19
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741826
- first: {x: 1, y: 2, z: 0}
second:
serializedVersion: 2
m_TileIndex: 20
m_TileSpriteIndex: 6
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741826
m_AnimatedTiles: {} m_AnimatedTiles: {}
m_TileAssetArray: []
m_TileSpriteArray: []
m_TileMatrixArray: []
m_TileColorArray: []
m_TileAssetArray:
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 42887f6d5043c584cbeba66d2c292997, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 468577ca5eb83ee4fa2dcf002db111bb, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 17b5769bf11658642aa1398c84b52de5, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 608a5dae37280714f8cf223d1e55af36, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b89b2c71c6d19024d8a0e8b8d4dffae0, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 3f6b88bc87c349d4c846678526efec67, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: dedb652534fdf8e479c2c9e13c289cb3, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ceaa9ad119734f445adb9d2afe46c5b5, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: dc21ae937ccab774e877f26dc76e3663, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 20053426a2883e840acf35a3daf6e2c7, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 4d5934146a24cc448807d80ee0ea7ac4, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 4a791de422e6b974ebabf5477f5e6910, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 5db14b24781d4604ebf310a4506120e2, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: ae0527ae03ebba64c844879e3ae11f07, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 4ec242bb4dc92dd4891f18687f108d10, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 75af4365a47098c47813c84ba5591cac, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 82d8acd40f132eb41b356d9628d41ff5, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: fc758a4a2e9715f4182e31a103aebed3, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 801e7deada1d1f74aa59f589a72283ba, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, 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_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: 5492486684686113971, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 2
m_Data: {fileID: 2940010051858493779, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: 6892907418128013141, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 2
m_Data: {fileID: -667873837454055024, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: -6709542322131757786, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: 968779181053603064, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 2
m_Data: {fileID: -2484269097896370145, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: -626145753933744596, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: -5763186658515932357, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: 3772985552029500671, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: -8736868614615867972, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: -2603311821418127281, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: -3579472602480421216, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: 8843726661577706292, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: 2004466711981498611, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
m_TileMatrixArray:
- m_RefCount: 20
m_Data:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: -1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 21
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: [] m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1 m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: 0, y: 0, z: 0}
m_Size: {x: 0, y: 0, z: 1}
m_Origin: {x: -3, y: -4, z: 0}
m_Size: {x: 6, y: 7, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0 m_TileOrientation: 0
m_TileOrientationMatrix: m_TileOrientationMatrix:
@ -80,7 +406,7 @@ TilemapRenderer:
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
m_ReceiveShadows: 0 m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_DynamicOccludee: 0
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 0 m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0 m_ReflectionProbeUsage: 0
@ -111,7 +437,7 @@ TilemapRenderer:
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: 0 m_SortingOrder: 0
m_ChunkSize: {x: 32, y: 32, z: 32} m_ChunkSize: {x: 32, y: 32, z: 32}
m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
m_ChunkCullingBounds: {x: 0.1875, y: 0.6374999, z: 0}
m_MaxChunkCount: 16 m_MaxChunkCount: 16
m_MaxFrameAge: 16 m_MaxFrameAge: 16
m_SortOrder: 0 m_SortOrder: 0
@ -128,7 +454,7 @@ GameObject:
m_Component: m_Component:
- component: {fileID: 7576806196340136164} - component: {fileID: 7576806196340136164}
- component: {fileID: 1997545516578526669} - component: {fileID: 1997545516578526669}
m_Layer: 0
m_Layer: 31
m_Name: Decor m_Name: Decor
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -162,7 +488,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 &-2098696893971261258
--- !u!114 &6939106024771849074
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

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

size 787

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

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

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

size 789

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

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

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

size 788

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

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

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

size 787

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

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

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

size 789

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

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

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

size 791

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

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

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

size 791

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

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

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

size 792

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

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

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

size 793

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

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

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

size 792

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

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

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

size 792

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

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

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

size 785

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

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

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

size 785

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

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

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

size 787

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

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

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

size 787

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

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

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

size 786

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

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

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

size 784

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

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

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

size 785

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

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

+ 13
- 33
Assets/Art Assets/Tiles/Environment/Main Palette.prefab View File

@ -85,32 +85,12 @@ Tilemap:
second: second:
serializedVersion: 2 serializedVersion: 2
m_TileIndex: 0 m_TileIndex: 0
m_TileSpriteIndex: 0
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741826
- first: {x: -1, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 1
m_TileSpriteIndex: 1 m_TileSpriteIndex: 1
m_TileMatrixIndex: 0 m_TileMatrixIndex: 0
m_TileColorIndex: 0 m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535 m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0 dummyAlignment: 0
m_AllTileFlags: 1073741826 m_AllTileFlags: 1073741826
- first: {x: 0, y: 1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 2
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741826
m_AnimatedTiles: m_AnimatedTiles:
- first: {x: -3, y: -1, z: 0} - first: {x: -3, y: -1, z: 0}
second: second:
@ -132,16 +112,16 @@ Tilemap:
- {fileID: -8328159106608433595, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - {fileID: -8328159106608433595, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3}
- {fileID: -6668061196424841238, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - {fileID: -6668061196424841238, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3}
- {fileID: 9092607584915671340, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3} - {fileID: 9092607584915671340, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3}
m_AnimationSpeed: 0.1
m_AnimationSpeed: 10
m_AnimationTimeOffset: 0 m_AnimationTimeOffset: 0
m_IsLooping: 1 m_IsLooping: 1
m_TileAssetArray: m_TileAssetArray:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 41dc0ce13e6dac749be38cdb2fd3f82c, type: 2} m_Data: {fileID: 11400000, guid: 41dc0ce13e6dac749be38cdb2fd3f82c, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: a27d337ded5adbe40a4529f815645d59, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d184dcfeb2570c643849848d0f87bbe1, type: 2}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: 2d0fbfd998c41a54490519bec3c02a68, type: 2} m_Data: {fileID: 11400000, guid: 2d0fbfd998c41a54490519bec3c02a68, type: 2}
- m_RefCount: 1 - m_RefCount: 1
@ -151,12 +131,12 @@ Tilemap:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 11400000, guid: d74d57b7ff7cf6f4abb145381fdcf614, type: 2} m_Data: {fileID: 11400000, guid: d74d57b7ff7cf6f4abb145381fdcf614, type: 2}
m_TileSpriteArray: m_TileSpriteArray:
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: -1039700332371458674, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} m_Data: {fileID: -1039700332371458674, guid: 955c0bce688a12046b99aa20d31ae763, type: 3}
- m_RefCount: 1
m_Data: {fileID: -3553767443181825458, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 1
m_Data: {fileID: -667873837454055024, guid: 0301ab4cfc7da344ba66df511dd05824, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: -1078892822073738303, guid: 955c0bce688a12046b99aa20d31ae763, type: 3} m_Data: {fileID: -1078892822073738303, guid: 955c0bce688a12046b99aa20d31ae763, type: 3}
- m_RefCount: 1 - m_RefCount: 1
@ -166,7 +146,7 @@ Tilemap:
- m_RefCount: 1 - m_RefCount: 1
m_Data: {fileID: 7149751655148466542, guid: 907033fa4bb32a0429d4c09e84be38c5, type: 3} m_Data: {fileID: 7149751655148466542, guid: 907033fa4bb32a0429d4c09e84be38c5, type: 3}
m_TileMatrixArray: m_TileMatrixArray:
- m_RefCount: 6
- m_RefCount: 4
m_Data: m_Data:
e00: 1 e00: 1
e01: 0 e01: 0
@ -203,7 +183,7 @@ Tilemap:
e32: 0 e32: 0
e33: 1 e33: 1
m_TileColorArray: m_TileColorArray:
- m_RefCount: 7
- m_RefCount: 5
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
@ -317,11 +297,11 @@ Grid:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6929633759649683794} m_GameObject: {fileID: 6929633759649683794}
m_Enabled: 1 m_Enabled: 1
m_CellSize: {x: 0.9375, y: 1, z: 0}
m_CellSize: {x: 1, y: 1, z: 0}
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 &1276535526792874766
--- !u!114 &8641224787687036702
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}

BIN
Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset (Stored with Git LFS) View File

size 1440

+ 8
- 0
Assets/Art Assets/Tiles/Environment/Rule tiles/Danglers.asset.meta View File

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

BIN
Assets/Art Assets/Tiles/Environment/Rule tiles/Light_Grass.asset (Stored with Git LFS) View File

size 1133 size 1133

+ 473
- 0
Assets/Prefabs/Player.prefab View File

@ -0,0 +1,473 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4668322654876184655
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4668322654876184626}
- component: {fileID: 4668322654876184653}
- component: {fileID: 4668322654876184652}
- component: {fileID: 4668322654876184627}
- component: {fileID: 4668322654876184630}
- component: {fileID: 4668322654876184625}
- component: {fileID: 4668322654876184624}
- component: {fileID: 4668322654876184631}
- component: {fileID: -4453463038580551382}
m_Layer: 7
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4668322654876184626
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -13.03, y: -5.21, z: -0.17}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_Children:
- {fileID: 4668322656625073464}
- {fileID: 4668322656710469013}
- {fileID: 4668322655870949457}
- {fileID: 4668322655423990997}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4668322654876184653
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -9095717837082945937, guid: bd3cb4af8406d4436a2ae8c2aafe1f8d, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 2}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!50 &4668322654876184652
Rigidbody2D:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 6200000, guid: 6c2f9af082941ef45abc8e6a22e1c9ef, type: 2}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 4
--- !u!70 &4668322654876184627
CapsuleCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Size: {x: 1, y: 2}
m_Direction: 0
--- !u!114 &4668322654876184630
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Actions: {fileID: -944628639613478452, guid: 34d55f77ac416ab45b29345bb7e6a913, type: 3}
m_NotificationBehavior: 2
m_UIInputModule: {fileID: 0}
m_DeviceLostEvent:
m_PersistentCalls:
m_Calls: []
m_DeviceRegainedEvent:
m_PersistentCalls:
m_Calls: []
m_ControlsChangedEvent:
m_PersistentCalls:
m_Calls: []
m_ActionEvents:
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4668322654876184624}
m_TargetAssemblyTypeName: CharacterInputController, Assembly-CSharp
m_MethodName: OnMove
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: d1943f36-92e5-4335-a3f3-dd2e9e553ba6
m_ActionName: Level/Move[/Keyboard/w,/Keyboard/s,/Keyboard/a,/Keyboard/d,/Keyboard/upArrow,/Keyboard/downArrow,/Keyboard/leftArrow,/Keyboard/rightArrow]
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 4668322654876184624}
m_TargetAssemblyTypeName: CharacterInputController, Assembly-CSharp
m_MethodName: OnJump
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: e7ae7276-c64d-43bb-8719-ef3178e194a0
m_ActionName: Level/Jump[/Keyboard/space,/Keyboard/w]
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Level
m_SplitScreenIndex: -1
m_Camera: {fileID: 0}
--- !u!114 &4668322654876184625
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32250bba13a1233448b3ff49db05c141, type: 3}
m_Name:
m_EditorClassIdentifier:
m_JumpForce: 100
m_WallJumpMultiplier: 3
m_CrouchSpeed: 0.36
m_MovementSmoothing: 0.05
m_AirControl: 1
m_WhatIsGround:
serializedVersion: 2
m_Bits: 512
m_GroundCheck: {fileID: 4668322656625073464}
m_CeilingCheck: {fileID: 4668322656710469013}
m_WallCheck: {fileID: 4668322655870949457}
m_CrouchDisableCollider: {fileID: 0}
OnLandEvent:
m_PersistentCalls:
m_Calls: []
OnCrouchEvent:
m_PersistentCalls:
m_Calls: []
--- !u!114 &4668322654876184624
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b0511d3cc433b7e41906b4911f68a962, type: 3}
m_Name:
m_EditorClassIdentifier:
m_characterController: {fileID: 4668322654876184625}
m_playerInput:
Variable: {fileID: 11400000, guid: ae129d59580dbe94fa385299e3dfb47d, type: 2}
m_useLocal: 0
m_localValue: 0
m_noInputAllowed:
Variable: {fileID: 11400000, guid: ea1cffffa7e1ed34ca1fe3d3af13777c, type: 2}
m_useLocal: 0
m_localValue: 0
m_speed: 2
--- !u!95 &4668322654876184631
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &-4453463038580551382
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322654876184655}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 49dda9eea2761864e9eac5cdb5c83f57, type: 3}
m_Name:
m_EditorClassIdentifier:
m_isPlayerDead:
Variable: {fileID: 11400000, guid: a1586014535831a4e80b30178ff5ced4, type: 2}
m_useLocal: 0
m_localValue: 0
--- !u!1 &4668322655423990996
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4668322655423990997}
- component: {fileID: 4668322655423991003}
- component: {fileID: 4668322655423991002}
m_Layer: 7
m_Name: char_dude_sheet_0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4668322655423990997
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322655423990996}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.063, y: 0.383, z: 0}
m_LocalScale: {x: 1.6666665, y: 1.6666665, z: 1.6666665}
m_Children: []
m_Father: {fileID: 4668322654876184626}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &4668322655423991003
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322655423990996}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 8758575904115477578, guid: aa8c58dcbc4c4a44891bacb2bc1e3480, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.23, y: 0.25}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!95 &4668322655423991002
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322655423990996}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 49a569a83db15b14bb24e4093bd3b6de, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &4668322655870949456
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4668322655870949457}
m_Layer: 7
m_Name: Hand
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4668322655870949457
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322655870949456}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.5, y: -0.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4668322654876184626}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4668322656625073467
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4668322656625073464}
m_Layer: 7
m_Name: Feet
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4668322656625073464
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322656625073467}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4668322654876184626}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4668322656710469012
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4668322656710469013}
m_Layer: 7
m_Name: Head
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4668322656710469013
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4668322656710469012}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.61, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4668322654876184626}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 7
- 0
Assets/Prefabs/Player.prefab.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b4a65ba6dfdde8742903c22557f538a1
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 211
- 0
Assets/Prefabs/spikes_3.prefab View File

@ -0,0 +1,211 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2568405382520894643
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8078117592371321287}
- component: {fileID: 1043124044502169818}
- component: {fileID: 1793437425226485100}
- component: {fileID: 5792353894968254291}
m_Layer: 0
m_Name: spikes_3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8078117592371321287
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2568405382520894643}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -8.62, y: -4.87, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6045522938640616061}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1043124044502169818
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2568405382520894643}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -8328159106608433595, guid: d593933f03721d04b8e6a35a8ff8d5e3, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!61 &1793437425226485100
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2568405382520894643}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
--- !u!114 &5792353894968254291
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2568405382520894643}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1ac34d7ad4f935b4a92bff7901ea1180, type: 3}
m_Name:
m_EditorClassIdentifier:
m_isDead:
Variable: {fileID: 0}
m_useLocal: 1
m_localValue: 0
--- !u!1 &2740308402194940216
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6045522938640616061}
- component: {fileID: 2090863402335022966}
m_Layer: 0
m_Name: we
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6045522938640616061
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2740308402194940216}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.47, y: 0.79, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8078117592371321287}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &2090863402335022966
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2740308402194940216}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: -2413806693520163455, guid: ebe73ca9363db456bacf42c025bb4847, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1, y: 1}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0

+ 7
- 0
Assets/Prefabs/spikes_3.prefab.meta View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bbc251b61efff9b49a4a402c3cdc304c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

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

size 285040

+ 37
- 0
Assets/Scripts/Character/CharacterReset.cs View File

@ -0,0 +1,37 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Variables;
public class CharacterReset : MonoBehaviour, IResettable
{
[SerializeField, Header("References")]
Reference<bool> m_isPlayerDead;
private Vector3 m_startPosition;
private Quaternion m_startRotation;
public void OnLevelLoad()
{
m_startPosition = transform.position;
m_startRotation = transform.rotation;
}
public void OnResetEnd()
{
}
public IEnumerator OnResetStart(float time)
{
transform.position = m_startPosition;
transform.rotation = m_startRotation;
m_isPlayerDead.Value = false;
yield break;
}
}

+ 11
- 0
Assets/Scripts/Character/CharacterReset.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 49dda9eea2761864e9eac5cdb5c83f57
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 13
- 9
Assets/Scripts/DarknessController.cs View File

@ -10,6 +10,9 @@ public class DarknessController : MonoBehaviour
[SerializeField, Header("References")] [SerializeField, Header("References")]
private Material m_darknessMat; private Material m_darknessMat;
[SerializeField]
private Reference<float> m_lightLevel;
[SerializeField] [SerializeField]
private Reference<bool> m_isInputDown; private Reference<bool> m_isInputDown;
@ -23,8 +26,7 @@ public class DarknessController : MonoBehaviour
private AnimationCurve m_lightCurve = AnimationCurve.Linear(0,0,1,1); private AnimationCurve m_lightCurve = AnimationCurve.Linear(0,0,1,1);
[ShowNonSerializedField]
private float m_currentDarknessLevel = 1;
[ShowNonSerializedField] [ShowNonSerializedField]
private bool m_isDarknessChanging; private bool m_isDarknessChanging;
@ -32,13 +34,15 @@ public class DarknessController : MonoBehaviour
private void OnEnable() private void OnEnable()
{ {
m_isInputDown.OnValueChanged += OnInputChange; m_isInputDown.OnValueChanged += OnInputChange;
m_darknessMat.SetFloat("_Apply",1);
m_darknessMat.SetFloat("_Apply", 1);
m_lightLevel.Value = 1;
} }
private void OnDisable() private void OnDisable()
{ {
m_isInputDown.OnValueChanged -= OnInputChange; m_isInputDown.OnValueChanged -= OnInputChange;
m_darknessMat.SetFloat("_Apply", 1); m_darknessMat.SetFloat("_Apply", 1);
m_lightLevel.Value = 1;
} }
@ -69,24 +73,24 @@ public class DarknessController : MonoBehaviour
private IEnumerator ChangeDarkness(float end, float time, AnimationCurve curve) private IEnumerator ChangeDarkness(float end, float time, AnimationCurve curve)
{ {
float start = m_currentDarknessLevel;
float start = m_lightLevel;
float elapsedTime = 0; float elapsedTime = 0;
time = Mathf.InverseLerp(end, start, m_currentDarknessLevel) * time;
time = Mathf.InverseLerp(end, start, m_lightLevel) * time;
m_isDarknessChanging = true; m_isDarknessChanging = true;
while(elapsedTime < time) while(elapsedTime < time)
{ {
m_currentDarknessLevel = Mathf.Lerp(start, end, curve.Evaluate(elapsedTime / time));
m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel);
m_lightLevel.Value = Mathf.Lerp(start, end, curve.Evaluate(elapsedTime / time));
m_darknessMat.SetFloat("_Apply", m_lightLevel);
yield return new WaitForEndOfFrame(); yield return new WaitForEndOfFrame();
elapsedTime += Time.deltaTime; elapsedTime += Time.deltaTime;
} }
m_isDarknessChanging = false; m_isDarknessChanging = false;
m_currentDarknessLevel = end;
m_darknessMat.SetFloat("_Apply", m_currentDarknessLevel);
m_lightLevel.Value = end;
m_darknessMat.SetFloat("_Apply", m_lightLevel);
} }

+ 14
- 0
Assets/Scripts/IResettable.cs View File

@ -0,0 +1,14 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public interface IResettable
{
public void OnLevelLoad();
public IEnumerator OnResetStart(float time);
public void OnResetEnd();
}

+ 11
- 0
Assets/Scripts/IResettable.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: ad996d168724ecc4e88b3854210fcbfc
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 19
- 0
Assets/Scripts/KillPlayer.cs View File

@ -0,0 +1,19 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Variables;
public class KillPlayer : MonoBehaviour
{
[SerializeField]
private Reference<bool> m_isDead;
private void OnTriggerEnter2D(Collider2D collision)
{
if (collision.CompareTag("Player"))
m_isDead.Value = true;
}
}

+ 11
- 0
Assets/Scripts/KillPlayer.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1ac34d7ad4f935b4a92bff7901ea1180
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 113
- 0
Assets/Scripts/LevelManager.cs View File

@ -0,0 +1,113 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using NaughtyAttributes;
using Variables;
public class LevelManager : MonoBehaviour
{
[SerializeField, Header("References")]
Reference<bool> m_isPlayerDead;
[SerializeField]
Reference<bool> m_freezePlayer;
[SerializeField]
Reference<bool> m_isVictory;
[SerializeField]
Reference<float> m_timer;
[SerializeField, BoxGroup("Level Settings")]
private string m_levelName = "Level 1";
[SerializeField, BoxGroup("Level Settings")]
private float m_timeInLevel = 10;
[SerializeField]
private float m_resetTime = 1;
[SerializeField]
private string m_nextSceneToLoad = "Level 2";
private IResettable[] m_allResetable;
private void Start()
{
m_allResetable = FindObjectsOfType<MonoBehaviour>().OfType<IResettable>().ToArray();
m_timer.Value = m_timeInLevel;
foreach (IResettable resettable in m_allResetable)
{
resettable.OnLevelLoad();
}
}
private void Update()
{
if (!m_freezePlayer)
m_timer.Value -= Time.deltaTime;
}
private void OnEnable()
{
m_isPlayerDead.OnValueChanged += OnPlayerDeadChange;
m_isVictory.OnValueChanged += OnPlayerVictoryChange;
}
private void OnDisable()
{
m_isPlayerDead.OnValueChanged -= OnPlayerDeadChange;
m_isVictory.OnValueChanged -= OnPlayerVictoryChange;
}
private IEnumerator DeathRoutine()
{
m_freezePlayer.Value = true;
m_timer.Value = m_timeInLevel;
foreach (IResettable resettable in m_allResetable)
StartCoroutine(resettable.OnResetStart(m_resetTime));
yield return new WaitForSeconds(m_resetTime);
foreach (IResettable resettable in m_allResetable)
resettable.OnResetEnd();
m_freezePlayer.Value = false;
}
private void OnPlayerDeadChange(bool value)
{
if (value)
{
StartCoroutine(DeathRoutine());
}
}
private void OnPlayerVictoryChange(bool value)
{
}
}

+ 11
- 0
Assets/Scripts/LevelManager.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 2022aae2eff786945bf401469695230a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

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

@ -0,0 +1,62 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Variables;
public class SneakyTextController : MonoBehaviour
{
[SerializeField]
private Reference<float> m_lightLevel;
[SerializeField]
private Reference<bool> m_freezePlayer;
[SerializeField]
private float m_time = 10;
[SerializeField]
private TMPro.TextMeshProUGUI m_text;
private bool m_hasTriggered = false;
private void OnEnable()
{
m_lightLevel.OnValueChanged += OnLightChange;
}
private void OnDisable()
{
m_lightLevel.OnValueChanged -= OnLightChange;
}
private void Start()
{
m_text.gameObject.SetActive(false);
}
private void OnLightChange(float value)
{
Color color = m_text.color;
color.a = 1 - m_lightLevel;
m_text.color = color;
if (!m_hasTriggered && !m_freezePlayer)
{
m_hasTriggered = true;
StartCoroutine(Timer( m_time));
}
}
private IEnumerator Timer(float time)
{
Debug.Log("here");
m_text.gameObject.SetActive(true);
yield return new WaitForSeconds(time);
m_text.gameObject.SetActive(false);
}
}

+ 11
- 0
Assets/Scripts/SneakyTextController.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d6f991527b7c3d5419b9f5e0f73d598d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

+ 14
- 2
Assets/Scripts/TextController.cs View File

@ -5,7 +5,7 @@ using UnityEngine.UI;
using TMPro; using TMPro;
using NaughtyAttributes; using NaughtyAttributes;
public class TextController : MonoBehaviour
public class TextController : MonoBehaviour, IResettable
{ {
[SerializeField] [SerializeField]
@ -139,10 +139,22 @@ public class TextController : MonoBehaviour
m_goText.gameObject.SetActive(false); m_goText.gameObject.SetActive(false);
} }
public void OnLevelLoad()
{
}
public IEnumerator OnResetStart(float time)
{
yield return new WaitForSeconds(time - gotime);
m_goText.gameObject.SetActive(true);
yield return new WaitForSeconds(gotime);
m_goText.gameObject.SetActive(false);
}
public void OnResetEnd()
{
}
} }

+ 34
- 0
Assets/Scripts/TimerController.cs View File

@ -0,0 +1,34 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
using Variables;
public class TimerController : MonoBehaviour
{
[SerializeField]
private Reference<float> m_time;
private Color m_defaultColor;
private void OnEnable()
{
m_time.OnValueChanged += OnTimeChange;
}
private void OnDisable()
{
m_time.OnValueChanged -= OnTimeChange;
}
private void OnTimeChange(float value)
{
}
}

+ 11
- 0
Assets/Scripts/TimerController.cs.meta View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5e65af424b40dd845ae91bb2d24af0c9
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Variables/Runtime/LightAmount.asset (Stored with Git LFS) View File

size 465

+ 8
- 0
Assets/Variables/Runtime/LightAmount.asset.meta View File

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

BIN
Assets/Variables/Runtime/Timer.asset (Stored with Git LFS) View File

size 459

+ 8
- 0
Assets/Variables/Runtime/Timer.asset.meta View File

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

BIN
Assets/Variables/Runtime/freezePlayer.asset (Stored with Git LFS) View File

size 466

Assets/Variables/Runtime/isNoInput.asset.meta → Assets/Variables/Runtime/freezePlayer.asset.meta View File


BIN
Assets/Variables/Runtime/isNoInput.asset (Stored with Git LFS) View File

size 463

BIN
Assets/Variables/Runtime/isPlayerDead.asset (Stored with Git LFS) View File

size 466

+ 8
- 0
Assets/Variables/Runtime/isPlayerDead.asset.meta View File

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

Loading…
Cancel
Save