Skip to content

Commit

Permalink
lots of art
Browse files Browse the repository at this point in the history
  • Loading branch information
kaikue committed Oct 26, 2021
1 parent 12aba9e commit 7cec33e
Show file tree
Hide file tree
Showing 155 changed files with 8,902 additions and 35 deletions.
18 changes: 10 additions & 8 deletions Assets/Prefabs/player.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
m_Sprite: {fileID: 21300000, guid: 3ea998f80cef40242899082cfc3f8c98, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand Down Expand Up @@ -270,15 +270,17 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
facingLeft: 0
standSprite: {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
jumpSprite: {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
doubleJumpSprite: {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
fallSprite: {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
standSprite: {fileID: 21300000, guid: 3ea998f80cef40242899082cfc3f8c98, type: 3}
jumpSprite: {fileID: 21300000, guid: f00f43e28ced78a499c87519a5903a0c, type: 3}
doubleJumpSprite: {fileID: 21300000, guid: f00f43e28ced78a499c87519a5903a0c, type: 3}
fallSprite: {fileID: 21300000, guid: 20e5c3ea8c4771e40b638799bd0de9b5, type: 3}
attackSprite: {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
dashSprite: {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
dashSprite: {fileID: 21300000, guid: 069417e4b168bd545afb607a65551ff9, type: 3}
runSprites:
- {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
- {fileID: 21300000, guid: 147945b44b696db4abc3e29037929cb7, type: 3}
- {fileID: 21300000, guid: 3ea998f80cef40242899082cfc3f8c98, type: 3}
- {fileID: 21300000, guid: 7b8356e278c669e4ebd0240597f8b92f, type: 3}
- {fileID: 21300000, guid: 3ea998f80cef40242899082cfc3f8c98, type: 3}
- {fileID: 21300000, guid: 5ddf042bd361c6d4f9e2d1305a213562, type: 3}
jumpSound: {fileID: 0}
doubleJumpSound: {fileID: 0}
landSound: {fileID: 0}
Expand Down
61 changes: 39 additions & 22 deletions Assets/Prefabs/skeleton.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ GameObject:
- component: {fileID: 6311582435455102420}
- component: {fileID: 6311582435455102427}
- component: {fileID: 6311582435455102422}
- component: {fileID: 6968240672213199400}
- component: {fileID: 1224655538279616733}
- component: {fileID: 4365934258713016456}
- component: {fileID: 6968240672213199400}
- component: {fileID: 4509749265469220884}
m_Layer: 0
m_Name: skeleton
m_TagString: Damage
Expand All @@ -29,7 +30,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6311582435455102426}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
Expand Down Expand Up @@ -76,7 +77,7 @@ SpriteRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 6a6bf44dcc66ce2439a7dbdaf2f0c719, type: 3}
m_Sprite: {fileID: 21300000, guid: e792a1179c74fd74e9cc5b851d2ca072, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
Expand All @@ -100,19 +101,41 @@ BoxCollider2D:
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_Offset: {x: 0, y: -0.0315}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 0.5625, y: 1}
oldSize: {x: 0.75, y: 1}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.5625, y: 1}
m_Size: {x: 0.5, y: 0.937}
m_EdgeRadius: 0
--- !u!68 &6968240672213199400
EdgeCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6311582435455102426}
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_EdgeRadius: 0
m_Points:
- {x: -0.25, y: -0.48}
- {x: 0.25, y: -0.48}
m_AdjacentStartPoint: {x: 0, y: 0}
m_AdjacentEndPoint: {x: 0, y: 0}
m_UseAdjacentStartPoint: 0
m_UseAdjacentEndPoint: 0
--- !u!50 &1224655538279616733
Rigidbody2D:
serializedVersion: 4
Expand Down Expand Up @@ -147,25 +170,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
hits: 2
--- !u!68 &6968240672213199400
EdgeCollider2D:
--- !u!114 &4509749265469220884
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6311582435455102426}
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_EdgeRadius: 0
m_Points:
- {x: -0.25, y: -0.5}
- {x: 0.25, y: -0.5}
m_AdjacentStartPoint: {x: 0, y: 0}
m_AdjacentEndPoint: {x: 0, y: 0}
m_UseAdjacentStartPoint: 0
m_UseAdjacentEndPoint: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5bf306590dd5ee4b95aeb6122ee8a10, type: 3}
m_Name:
m_EditorClassIdentifier:
sprites:
- {fileID: 21300000, guid: e792a1179c74fd74e9cc5b851d2ca072, type: 3}
- {fileID: 21300000, guid: d691d043aa90408408e6863705fc80af, type: 3}
frameTime: 0.4
34 changes: 34 additions & 0 deletions Assets/Scripts/Blinker.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class Blinker : MonoBehaviour
{
public Sprite[] sprites;
public float frameTime = 0.4f;

private float frameTimer = 0;
private int spriteIndex = 0;
private SpriteRenderer sr;

private void Start()
{
sr = GetComponent<SpriteRenderer>();
sr.sprite = sprites[0];
}

private void Update()
{
frameTimer += Time.deltaTime;
if (frameTimer >= frameTime)
{
frameTimer = 0;
spriteIndex++;
if (spriteIndex >= sprites.Length)
{
spriteIndex = 0;
}
sr.sprite = sprites[spriteIndex];
}
}
}
11 changes: 11 additions & 0 deletions Assets/Scripts/Blinker.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Sprites/decorations.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Sprites/decorations/chain.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
120 changes: 120 additions & 0 deletions Assets/Sprites/decorations/chain.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Sprites/decorations/chainbottom.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 7cec33e

Please sign in to comment.