Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

2020-02-01 10:43:51 -05:00
parent 0bf6f4473c 9b23e5deff
commit edcd568d1c
40 changed files with 1056 additions and 473 deletions
--- a/Assets/Sprites/Controls.meta
+++ b/Assets/Sprites/Controls.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 394b12e250ac73549b5a1bd20b0c4910
+guid: bf9fc495ca38d7d4d804ad1d2df0f4c5
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Sprites/Palette/Ground.prefab
+++ b/Assets/Sprites/Palette/Ground.prefab
@@ -85,6 +85,78 @@ Tilemap:
  m_GameObject: {fileID: 8096341112039888982}
  m_Enabled: 1
  m_Tiles:
+  - first: {x: 1, y: -2, z: 0}
+    second:
+      m_TileIndex: 9
+      m_TileSpriteIndex: 9
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 2, y: -2, z: 0}
+    second:
+      m_TileIndex: 10
+      m_TileSpriteIndex: 10
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 3, y: -2, z: 0}
+    second:
+      m_TileIndex: 11
+      m_TileSpriteIndex: 11
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 4, y: -2, z: 0}
+    second:
+      m_TileIndex: 12
+      m_TileSpriteIndex: 12
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 1, y: -1, z: 0}
+    second:
+      m_TileIndex: 5
+      m_TileSpriteIndex: 5
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 2, y: -1, z: 0}
+    second:
+      m_TileIndex: 6
+      m_TileSpriteIndex: 6
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 3, y: -1, z: 0}
+    second:
+      m_TileIndex: 7
+      m_TileSpriteIndex: 7
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 4, y: -1, z: 0}
+    second:
+      m_TileIndex: 8
+      m_TileSpriteIndex: 8
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
  - first: {x: 0, y: 0, z: 0}
    second:
      m_TileIndex: 0
@@ -94,15 +166,110 @@ Tilemap:
      m_ObjectToInstantiate: {fileID: 0}
      m_TileFlags: 1
      m_ColliderType: 1
+  - first: {x: 1, y: 0, z: 0}
+    second:
+      m_TileIndex: 1
+      m_TileSpriteIndex: 1
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 2, y: 0, z: 0}
+    second:
+      m_TileIndex: 2
+      m_TileSpriteIndex: 2
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 3, y: 0, z: 0}
+    second:
+      m_TileIndex: 3
+      m_TileSpriteIndex: 3
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: 4, y: 0, z: 0}
+    second:
+      m_TileIndex: 4
+      m_TileSpriteIndex: 4
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
  m_AnimatedTiles: {}
  m_TileAssetArray:
  - m_RefCount: 1
    m_Data: {fileID: 11400000, guid: 45e32cdeeb7c7994cbd282d9fd4279ec, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: acfb1a24829c222459b4e7b3f9ef1979, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 792bbff4b5cbdd94a8bb77e0cab20092, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 357cc7dbbbc9f2d499765eeef6b1a7e1, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 0d661879aadfdea49b6893bcd0914fc0, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: bb8913c52df1e3e4592bb628d3cfcd29, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: e5ebf1aa755fe7d45af230ba4633dbeb, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: ff986232243791144b1cddd949fc1b01, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 87c9e3a940556bd43bb8fb53bad70c86, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 72512fd510bbaa54abcab943acdfad9d, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: d984d708c74d6f640a9423c3c7795843, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 5eef42e4a88fc664aa76a955cb761e11, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: b17ba82f5835cc342ad6aed9a0eca161, type: 2}
  m_TileSpriteArray:
  - m_RefCount: 1
    m_Data: {fileID: 21300000, guid: 37077009adda5004cad02be3083a5bff, type: 3}
-  m_TileMatrixArray:
  - m_RefCount: 1
+    m_Data: {fileID: 5128404823516449641, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -7494565826870185609, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -1276243126919895308, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 497625347627070440, guid: 06179a7b27612804c9315624bd8657bc, type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -4287313831331593054, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 1682001453285782507, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -8713056654604128177, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -7916580030001191015, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 7688254355190835736, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -4561162811808795676, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -1686891228976523781, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 9152558812498457952, guid: 06179a7b27612804c9315624bd8657bc,
+      type: 3}
+  m_TileMatrixArray:
+  - m_RefCount: 13
    m_Data:
      e00: 1
      e01: 0
@@ -121,12 +288,12 @@ Tilemap:
      e32: 0
      e33: 1
  m_TileColorArray:
-  - m_RefCount: 1
+  - m_RefCount: 13
    m_Data: {r: 1, g: 1, b: 1, a: 1}
  m_AnimationFrameRate: 1
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Origin: {x: 0, y: 0, z: 0}
-  m_Size: {x: 1, y: 1, z: 1}
+  m_Origin: {x: 0, y: -2, z: 0}
+  m_Size: {x: 5, y: 3, z: 1}
  m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
  m_TileOrientation: 0
  m_TileOrientationMatrix:
--- a/Assets/Sprites/Player/JrDev.png.meta
+++ b/Assets/Sprites/Player/JrDev.png.meta
@@ -4,25 +4,25 @@ TextureImporter:
  internalIDToNameTable:
  - first:
      213: 7394781096031462559
-    second: JrDev_Idle
+    second: JrDevIdle
  - first:
      213: -1717341178490256666
-    second: JrDev_Run1
+    second: JrDevRun1
  - first:
      213: 5052719299223408713
-    second: JrDev_Run2
+    second: JrDevRun2
  - first:
      213: -8899148160246948828
-    second: JrDev_Jump
+    second: JrDevJump
  - first:
      213: 111747663661122317
-    second: JrDev_Fall
+    second: JrDevFall
  externalObjects: {}
  serializedVersion: 10
  mipmaps:
    mipMapMode: 0
    enableMipMap: 0
-    sRGBTexture: 0
+    sRGBTexture: 1
    linearTexture: 0
    fadeOut: 0
    borderMipMap: 0
@@ -62,7 +62,7 @@ TextureImporter:
  spritePivot: {x: 0.5, y: 0.5}
  spritePixelsToUnits: 16
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
+  spriteGenerateFallbackPhysicsShape: 0
  alphaUsage: 1
  alphaIsTransparency: 1
  spriteTessellationDetail: -1
@@ -78,7 +78,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@@ -90,7 +90,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@@ -102,7 +102,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@@ -114,7 +114,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@@ -126,7 +126,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@@ -138,7 +138,7 @@ TextureImporter:
    maxTextureSize: 2048
    resizeAlgorithm: 0
    textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
    compressionQuality: 50
    crunchedCompression: 0
    allowsAlphaSplitting: 0
@@ -149,7 +149,7 @@ TextureImporter:
    serializedVersion: 2
    sprites:
    - serializedVersion: 2
-      name: JrDev_Idle
+      name: JrDevIdle
      rect:
        serializedVersion: 2
        x: 0
@@ -170,7 +170,7 @@ TextureImporter:
      edges: []
      weights: []
    - serializedVersion: 2
-      name: JrDev_Run1
+      name: JrDevRun1
      rect:
        serializedVersion: 2
        x: 64
@@ -191,7 +191,7 @@ TextureImporter:
      edges: []
      weights: []
    - serializedVersion: 2
-      name: JrDev_Run2
+      name: JrDevRun2
      rect:
        serializedVersion: 2
        x: 128
@@ -212,7 +212,7 @@ TextureImporter:
      edges: []
      weights: []
    - serializedVersion: 2
-      name: JrDev_Jump
+      name: JrDevJump
      rect:
        serializedVersion: 2
        x: 0
@@ -233,7 +233,7 @@ TextureImporter:
      edges: []
      weights: []
    - serializedVersion: 2
-      name: JrDev_Fall
+      name: JrDevFall
      rect:
        serializedVersion: 2
        x: 64
--- a/Assets/Sprites/Player/JrDevIdle.anim
+++ b/Assets/Sprites/Player/JrDevIdle.anim
@@ -17,21 +17,37 @@ AnimationClip:
  m_PositionCurves: []
  m_ScaleCurves: []
  m_FloatCurves: []
-  m_PPtrCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 7394781096031462559, guid: f983f27dec2fe7c428c3a3ed78b900d1,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
  m_SampleRate: 60
  m_WrapMode: 0
  m_Bounds:
    m_Center: {x: 0, y: 0, z: 0}
    m_Extent: {x: 0, y: 0, z: 0}
  m_ClipBindingConstant:
-    genericBindings: []
-    pptrCurveMapping: []
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 7394781096031462559, guid: f983f27dec2fe7c428c3a3ed78b900d1, type: 3}
  m_AnimationClipSettings:
    serializedVersion: 2
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1
+    m_StopTime: 0.016666668
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
@@ -50,4 +66,11 @@ AnimationClip:
  m_EulerEditorCurves: []
  m_HasGenericRootTransform: 0
  m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 0
+    functionName: 
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0
--- a/Assets/Sprites/Player/Player.controller
+++ b/Assets/Sprites/Player/Player.controller
@@ -11,10 +11,10 @@ AnimatorStateMachine:
  m_ChildStates:
  - serializedVersion: 1
    m_State: {fileID: -2991084837782200938}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 290, y: 190, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 218451160527659384}
-    m_Position: {x: 235, y: 65, z: 0}
+    m_Position: {x: 280, y: 10, z: 0}
  m_ChildStateMachines: []
  m_AnyStateTransitions: []
  m_EntryTransitions: []
@@ -35,7 +35,8 @@ AnimatorState:
  m_Name: JrDevIdle
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 6827210264901212170}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -59,7 +60,13 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: Player
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: IsRunning
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@@ -83,7 +90,8 @@ AnimatorState:
  m_Name: JrDevRun
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 3208414158787817513}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -99,3 +107,53 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &3208414158787817513
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: IsRunning
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -2991084837782200938}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &6827210264901212170
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: IsRunning
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 218451160527659384}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
--- a/Assets/Sprites/Player/hero.png
+++ b/Assets/Sprites/Player/hero.png
--- a/Assets/Sprites/Player/hero.png.meta
+++ b/Assets/Sprites/Player/hero.png.meta
@@ -1,115 +0,0 @@
-fileFormatVersion: 2
-guid: 2df6c10caf1039b4b8017ed74c32574c
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 10
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 0
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 16
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: