diff --git a/Assets/Model/EventControlTile.cs b/Assets/Model/EventControlTile.cs index 95fd97f..ddbc868 100644 --- a/Assets/Model/EventControlTile.cs +++ b/Assets/Model/EventControlTile.cs @@ -14,13 +14,16 @@ namespace Assets.Model public Tile tile; public Tile successTile; public Vector3Int position; + public bool isPlusTile; + public bool isPerformed; - public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position) + public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position, bool isPlusTile = false) { this.keyCode = keyCode; this.tile = tile; this.successTile = successTile; this.position = position; + this.isPlusTile = isPlusTile; } } } diff --git a/Assets/Model/TileToKeyMappings.cs b/Assets/Model/TileToKeyMappings.cs new file mode 100644 index 0000000..e048e1e --- /dev/null +++ b/Assets/Model/TileToKeyMappings.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Assets.Model +{ + public static class TileToKeyMappings + { + } +} diff --git a/Assets/Model/TileToKeyMappings.cs.meta b/Assets/Model/TileToKeyMappings.cs.meta new file mode 100644 index 0000000..46557ca --- /dev/null +++ b/Assets/Model/TileToKeyMappings.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 20e8174d6ba84bf439ff63bfdcdc3389 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Bug.prefab b/Assets/Prefabs/Bug.prefab index bad02d9..b76863e 100644 --- a/Assets/Prefabs/Bug.prefab +++ b/Assets/Prefabs/Bug.prefab @@ -141,7 +141,7 @@ Rigidbody2D: m_Mass: 1 m_LinearDrag: 0 m_AngularDrag: 0.05 - m_GravityScale: 1 + m_GravityScale: 2 m_Material: {fileID: 0} m_Interpolate: 0 m_SleepingMode: 0 diff --git a/Assets/Scenes/LevelOne.unity b/Assets/Scenes/LevelOne.unity index e6b82cc..c321f16 100644 --- a/Assets/Scenes/LevelOne.unity +++ b/Assets/Scenes/LevelOne.unity @@ -459,7 +459,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1008122163} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!483693784 &193535122 TilemapRenderer: @@ -1284,7 +1284,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -1415,7 +1415,6 @@ Transform: - {fileID: 1713017494} - {fileID: 1671840917} - {fileID: 1247097598} - - {fileID: 1491654} - {fileID: 193535121} m_Father: {fileID: 0} m_RootOrder: 1 @@ -1509,7 +1508,8 @@ MonoBehaviour: m_EditorClassIdentifier: player: {fileID: 1671840916} offsetY: 2 - interpolate: 0.6 + offsetZ: -10 + interpolate: 0.3 --- !u!4 &1146013793 stripped Transform: m_CorrespondingSourceObject: {fileID: 5711328081315814049, guid: fe8fb0c1c30f84b43885e84de26e0f11, @@ -1900,7 +1900,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -2059,6 +2059,192 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &1759518263 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1759518264} + - component: {fileID: 1759518267} + - component: {fileID: 1759518266} + - component: {fileID: 1759518265} + m_Layer: 0 + m_Name: Event Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1759518264 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759518263} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 827621097} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1759518265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759518263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 555a3f8aa89a0e84fb6c43249a117f93, type: 3} + m_Name: + m_EditorClassIdentifier: + camera: {fileID: 1337282922} + tile: {fileID: 11400000, guid: 1f7bfa5ee72002646806268d14bfeb3b, type: 2} + tiles: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + successTiles: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + successTile: {fileID: 11400000, guid: ae6e7a8b9fa2433448a66da4090e310c, type: 2} + plusTile: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2} + framesPerControlTile: 15 + nextControlYOffset: 1 + nextControlXOffset: -1 + tileMapClearDelayInSeconds: 0.5 +--- !u!483693784 &1759518266 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759518263} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 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_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1759518267 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759518263} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + m_TileSpriteArray: + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + m_TileMatrixArray: + - m_RefCount: 0 + m_Data: + e00: NaN + e01: NaN + e02: -0.0000000555834 + e03: 0 + e10: NaN + e11: NaN + e12: 1.18e-43 + e13: 0 + e20: 0 + e21: -0.000000055583342 + e22: 0 + e23: 0 + e30: 0 + e31: 1.18e-43 + e32: 0 + e33: 0 + m_TileColorArray: + - m_RefCount: 0 + m_Data: {r: 6.129018e-32, g: 6.129018e-32, b: 6.129018e-32, a: 6.129018e-32} + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 68, y: 6, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + 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 --- !u!1 &1882958979 GameObject: m_ObjectHideFlags: 0 @@ -2574,7 +2760,7 @@ CompositeCollider2D: Y: 310000000 - - X: 1930000000 Y: 320000000 - - X: 1920000000 + - X: 2000000000 Y: 320000000 - X: 1920000000 Y: 300000000 @@ -2914,7 +3100,7 @@ CompositeCollider2D: Y: 220000000 - X: 1220000000 Y: 200000000 - - X: 1430000000 + - X: 430000000 Y: 200000000 - - X: 2050000000 Y: 220000000 @@ -2932,21 +3118,15 @@ CompositeCollider2D: Y: 210000000 - X: 1990000000 Y: 210000000 - - - X: 1900000000 - Y: 200000000 - - X: 1890000000 - Y: 200000000 - - X: 1890000000 + - - X: 1920000000 Y: 220000000 - - X: 1880000000 + - X: 1910000000 Y: 220000000 - - X: 1880000000 - Y: 200000000 - - X: 1860000000 - Y: 200000000 - - X: 1860000000 - Y: 220000000 - - X: 1850000000 + - X: 1910000000 + Y: 210000000 + - X: 1920000000 + Y: 210000000 + - - X: 1850000000 Y: 220000000 - X: 1850000000 Y: 200000000 @@ -2956,6 +3136,28 @@ CompositeCollider2D: Y: 160000000 - X: 1900000000 Y: 160000000 + - X: 1900000000 + Y: 200000000 + - X: 1890000000 + Y: 200000000 + - X: 1890000000 + Y: 220000000 + - X: 1880000000 + Y: 220000000 + - X: 1880000000 + Y: 200000000 + - X: 1860000000 + Y: 200000000 + - X: 1860000000 + Y: 220000000 + - - X: 1990000000 + Y: 210000000 + - X: 1990000000 + Y: 200000000 + - X: 2000000000 + Y: 200000000 + - X: 2000000000 + Y: 160000000 - - X: 430000000 Y: 220000000 - X: 410000000 @@ -2990,11 +3192,13 @@ CompositeCollider2D: Y: 200000000 - X: 2000000000 Y: 210000000 - - X: 1990000000 - Y: 210000000 - - X: 1990000000 + - - X: 1430000000 + Y: 220000000 + - X: 1220000000 + Y: 220000000 + - X: 1220000000 Y: 200000000 - - X: 2000000000 + - X: 1430000000 Y: 200000000 - X: 2000000000 Y: 160000000 @@ -3104,6 +3308,24 @@ CompositeCollider2D: Y: 180000000 - X: 710000000 Y: 180000000 + - - X: 1960000000 + Y: 190000000 + - X: 1740000000 + Y: 190000000 + - X: 1740000000 + Y: 200000000 + - X: 1760000000 + Y: 200000000 + - X: 1760000000 + Y: 190000000 + - X: 1770000000 + Y: 190000000 + - X: 1770000000 + Y: 180000000 + - X: 1760000000 + Y: 180000000 + - X: 1760000000 + Y: 160000000 - - X: 1960000000 Y: 190000000 - X: 1940000000 @@ -3168,6 +3390,18 @@ CompositeCollider2D: Y: 120000000 - X: 2110000000 Y: 120000000 + - - X: 2110000000 + Y: 140000000 + - X: 2090000000 + Y: 140000000 + - X: 2090000000 + Y: 130000000 + - X: 2080000000 + Y: 130000000 + - X: 2080000000 + Y: 120000000 + - X: 2110000000 + Y: 120000000 - - X: 450000000 Y: 120000000 - X: 370000000 @@ -3352,13 +3586,13 @@ CompositeCollider2D: Y: 60000000 - X: 290000000 Y: 60000000 - - - X: 1880000000 + - - X: 2220000000 + Y: 80000000 + - X: 2169999872 + Y: 80000000 + - X: 2169999872 Y: 50000000 - - X: 1880000000 - Y: 70000000 - - X: 2020000000 - Y: 70000000 - - X: 2020000000 + - X: 2220000000 Y: 50000000 - - X: 380000000 Y: 70000000 @@ -3456,6 +3690,14 @@ CompositeCollider2D: Y: -200000000 - X: 910000000 Y: -200000000 + - - X: 1800000000 + Y: 60000000 + - X: 1770000000 + Y: 60000000 + - X: 1770000000 + Y: 40000000 + - X: 1800000000 + Y: 40000000 - - X: 840000000 Y: 50000000 - X: 760000000 @@ -3556,14 +3798,6 @@ CompositeCollider2D: Y: -60000000 - X: 2160000000 Y: -60000000 - - - X: 1750000000 - Y: 10000000 - - X: 1670000000 - Y: 10000000 - - X: 1670000000 - Y: -20000000 - - X: 1750000000 - Y: -20000000 - - X: 1660000000 Y: -40000000 - X: 1640000000 @@ -3672,6 +3906,14 @@ CompositeCollider2D: Y: -150000000 - X: 1320000000 Y: -150000000 + - - X: 1510000000 + Y: -130000000 + - X: 1490000000 + Y: -130000000 + - X: 1490000000 + Y: -150000000 + - X: 1510000000 + Y: -150000000 - - X: 2270000128 Y: -140000000 - X: 2260000000 @@ -3762,11 +4004,11 @@ CompositeCollider2D: Y: -200000000 - - X: 1110000000 Y: -180000000 - - X: 1020000000 + - X: 570000000 Y: -180000000 - - X: 1020000000 + - X: 570000000 Y: -200000000 - - X: 1110000000 + - X: 590000000 Y: -200000000 - - X: 790000000 Y: -180000000 @@ -4132,6 +4374,22 @@ CompositeCollider2D: - {x: 200.99997, y: 20} - {x: 200, y: 19.999971} - {x: 200.00003, y: 16} + - - {x: 189.99997, y: 16} + - {x: 189.99997, y: 20} + - {x: 189, y: 20.000029} + - {x: 188.99997, y: 22} + - {x: 188, y: 21.999971} + - {x: 187.99997, y: 20} + - {x: 186, y: 19.999971} + - {x: 186.00003, y: 16} + - - {x: 142.99997, y: 20} + - {x: 142.99997, y: 22} + - {x: 122, y: 21.999971} + - {x: 122.00003, y: 20} + - - {x: 42.999973, y: 20} + - {x: 42.999973, y: 22} + - {x: 41, y: 21.999971} + - {x: 41.00003, y: 20} - - {x: 185.99997, y: 20} - {x: 185.99997, y: 22} - {x: 185, y: 21.999971} @@ -4462,6 +4720,14 @@ CompositeCollider2D: - {x: 115.99998, y: -8} - {x: 113, y: -8.00003} - {x: 113.00003, y: -11} + - - {x: 154.99997, y: -11} + - {x: 154.99997, y: -9} + - {x: 153, y: -9.00003} + - {x: 153.00003, y: -11} + - - {x: 146.99997, y: -11} + - {x: 146.99997, y: -9} + - {x: 145, y: -9.00003} + - {x: 145.00003, y: -11} - - {x: 213.99997, y: -17} - {x: 214.00003, y: -11} - {x: 223.00002, y: -10.99997} @@ -43982,7 +44248,7 @@ PrefabInstance: - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 8554420466772133694, guid: f859e1c9214db2c4eaaeff51febb3222, type: 3} @@ -44093,11 +44359,6 @@ PrefabInstance: propertyPath: m_BodyType value: 0 objectReference: {fileID: 0} - - target: {fileID: 3827363133515929334, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, - type: 3} - propertyPath: m_GravityScale - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3827363133515929335, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} propertyPath: movementSpeed @@ -44122,7 +44383,7 @@ PrefabInstance: type: 3} propertyPath: eventControls value: - objectReference: {fileID: 1491655} + objectReference: {fileID: 1759518265} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef13d4cb4d0a2b043b4f2a6cc75ca48a, type: 3} --- !u!1001 &7653345758327600075 diff --git a/Assets/Scripts/CameraMovement.cs b/Assets/Scripts/CameraMovement.cs index 477b215..e95bc62 100644 --- a/Assets/Scripts/CameraMovement.cs +++ b/Assets/Scripts/CameraMovement.cs @@ -6,7 +6,8 @@ public class CameraMovement : MonoBehaviour { [SerializeField] GameObject player; [SerializeField] float offsetY = 0; - [SerializeField] float interpolate = 0.2f; + [SerializeField] float offsetZ = -10; + [SerializeField] float interpolate = 0.2f; private void Start() { @@ -16,5 +17,6 @@ public class CameraMovement : MonoBehaviour private void Update() { transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), interpolate); + transform.position = new Vector3(transform.position.x, transform.position.y, offsetZ); } } diff --git a/Assets/Scripts/EventControls.cs b/Assets/Scripts/EventControls.cs index 6eadd5b..bcd1ece 100644 --- a/Assets/Scripts/EventControls.cs +++ b/Assets/Scripts/EventControls.cs @@ -1,6 +1,7 @@ using Assets.Model; using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; using UnityEngine.Tilemaps; @@ -8,7 +9,10 @@ public class EventControls : MonoBehaviour { [SerializeField] private Camera camera; [SerializeField] private Tile tile; + [SerializeField] private List tiles; + [SerializeField] private List successTiles; [SerializeField] private Tile successTile; + [SerializeField] private Tile plusTile; [SerializeField] private float framesPerControlTile = 15; [SerializeField] private int nextControlYOffset = 0; [SerializeField] private int nextControlXOffset = 0; @@ -32,7 +36,9 @@ public class EventControls : MonoBehaviour private Collider2D currentPlayerCollider; private Collider2D currentEnemyCollider; - private Queue eventControlTilesInCycle; + private List eventControlTilesInCycle; + private Queue eventControlTilesInCycleQueue; + private bool? isControlTile = null; private int framesPerSecond => 60; private Vector3Int nextControlOffSetAsVector => new Vector3Int(nextControlXOffset, nextControlYOffset, 0); @@ -55,7 +61,7 @@ public class EventControls : MonoBehaviour private void Start() { tilemap = GetComponent(); - eventControlTilesInCycle = new Queue(); + eventControlTilesInCycle = new List(); } private void Update() @@ -85,10 +91,28 @@ public class EventControls : MonoBehaviour initialCameraPosition = GetCameraPosition(); // Store tiles for event cycle - var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition() + nextControlOffSetAsVector); /* TODO: Hard code */ - eventControlTilesInCycle.Enqueue(eventControlTile); + EventControlTile eventControlTile = null; + if (isControlTile == null || isControlTile.GetValueOrDefault()) + { + eventControlTile = new EventControlTile(KeyCode.Q, + tile, + successTile, + GetNextTilePosition() + nextControlOffSetAsVector); /* TODO: Hard code */ + isControlTile = false; + } + else + { + eventControlTile = new EventControlTile(KeyCode.Escape, + plusTile, + null, + GetNextTilePosition() + nextControlOffSetAsVector, + true); /* TODO: Hard code */ + isControlTile = true; + } - tilemap.SetTile(eventControlTile.position, tile); + eventControlTilesInCycle.Add(eventControlTile); + + tilemap.SetTile(eventControlTile.position, eventControlTile.tile); nextControlAccumalator = 0; numberOfControlTilesSet++; @@ -96,6 +120,7 @@ public class EventControls : MonoBehaviour else if (numberOfControlTilesSet == maxNumberOfControlTiles) { initialCameraPosition = null; + isControlTile = null; eventDrawn = true; } else @@ -122,14 +147,15 @@ public class EventControls : MonoBehaviour nextControlAccumalator = 0; if (currentEventControl == null) - currentEventControl = eventControlTilesInCycle.Dequeue(); + currentEventControl = eventControlTilesInCycle.First(x => !x.isPlusTile && !x.isPerformed); if (Input.GetKeyDown(currentEventControl.keyCode)) { + currentEventControl.isPerformed = true; tilemap.SetTile(currentEventControl.position, currentEventControl.successTile); currentEventControl = null; - if (eventControlTilesInCycle.Count == 0) + if (eventControlTilesInCycle.Where(x => !x.isPlusTile && !x.isPerformed).Count() == 0) { eventTriggered = false; eventCycleAccumalator = 0; diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index f7df07b..2b9ae61 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -116,7 +116,7 @@ public class Player : MonoBehaviour private void FlipSprite() { - if (Mathf.Abs(rigidBody.velocity.x) > Mathf.Epsilon && (Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.LeftArrow))) + if (Mathf.Abs(rigidBody.velocity.x) > runErrorThreshold && (Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.LeftArrow))) { transform.localScale = new Vector2(Mathf.Sign(rigidBody.velocity.x), 1f); } diff --git a/Assets/Sprites/Controls/Control W Success.asset b/Assets/Sprites/Controls/Buttons_0.asset similarity index 78% rename from Assets/Sprites/Controls/Control W Success.asset rename to Assets/Sprites/Controls/Buttons_0.asset index 4bedf93..3bf0b9c 100644 --- a/Assets/Sprites/Controls/Control W Success.asset +++ b/Assets/Sprites/Controls/Buttons_0.asset @@ -10,10 +10,11 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} - m_Name: Control W Success + m_Name: Buttons_0 m_EditorClassIdentifier: - m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} - m_Color: {r: 0.066082224, g: 0.9339623, b: 0.12693371, a: 1} + m_Sprite: {fileID: 8894201953851282084, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_Transform: e00: 1 e01: 0 diff --git a/Assets/Sprites/Controls/Control W Success.asset.meta b/Assets/Sprites/Controls/Buttons_0.asset.meta similarity index 79% rename from Assets/Sprites/Controls/Control W Success.asset.meta rename to Assets/Sprites/Controls/Buttons_0.asset.meta index 8f04672..a37018d 100644 --- a/Assets/Sprites/Controls/Control W Success.asset.meta +++ b/Assets/Sprites/Controls/Buttons_0.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6cf7a50810d16f2468acc06180743d07 +guid: 1f7bfa5ee72002646806268d14bfeb3b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Sprites/Controls/Buttons_1.asset b/Assets/Sprites/Controls/Buttons_1.asset new file mode 100644 index 0000000..cca6acc --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_1.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_1 + m_EditorClassIdentifier: + m_Sprite: {fileID: 7664807735657788756, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Control W.asset.meta b/Assets/Sprites/Controls/Buttons_1.asset.meta similarity index 79% rename from Assets/Sprites/Controls/Control W.asset.meta rename to Assets/Sprites/Controls/Buttons_1.asset.meta index bbef4c4..015031a 100644 --- a/Assets/Sprites/Controls/Control W.asset.meta +++ b/Assets/Sprites/Controls/Buttons_1.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7ece7857530facb42b843eed2526c86a +guid: ae6e7a8b9fa2433448a66da4090e310c NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Sprites/Controls/Buttons_10.asset b/Assets/Sprites/Controls/Buttons_10.asset new file mode 100644 index 0000000..f4a78fa --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_10.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_10 + m_EditorClassIdentifier: + m_Sprite: {fileID: 3100856887975758742, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_10.asset.meta b/Assets/Sprites/Controls/Buttons_10.asset.meta new file mode 100644 index 0000000..2a5201e --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_10.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c5438b1315e8d840b6c482e9710993c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_11.asset b/Assets/Sprites/Controls/Buttons_11.asset new file mode 100644 index 0000000..5cd37ef --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_11.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_11 + m_EditorClassIdentifier: + m_Sprite: {fileID: 4520375771122408675, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_11.asset.meta b/Assets/Sprites/Controls/Buttons_11.asset.meta new file mode 100644 index 0000000..fc245fe --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_11.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3c7dcade26bec746bd38fb794264216 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_2.asset b/Assets/Sprites/Controls/Buttons_2.asset new file mode 100644 index 0000000..c04b907 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_2.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_2 + m_EditorClassIdentifier: + m_Sprite: {fileID: -5402412272178277761, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_2.asset.meta b/Assets/Sprites/Controls/Buttons_2.asset.meta new file mode 100644 index 0000000..cd5c463 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_2.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2678bd928e9a0943ad5fadb602db819 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_3.asset b/Assets/Sprites/Controls/Buttons_3.asset new file mode 100644 index 0000000..ca7ba58 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_3.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_3 + m_EditorClassIdentifier: + m_Sprite: {fileID: 2013261503205373015, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_3.asset.meta b/Assets/Sprites/Controls/Buttons_3.asset.meta new file mode 100644 index 0000000..f730292 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_3.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2144cee47e8929f4cb0ce23b78f8f4ad +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_4.asset b/Assets/Sprites/Controls/Buttons_4.asset new file mode 100644 index 0000000..46be870 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_4.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_4 + m_EditorClassIdentifier: + m_Sprite: {fileID: 3760674464881954987, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_4.asset.meta b/Assets/Sprites/Controls/Buttons_4.asset.meta new file mode 100644 index 0000000..3f4ce51 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_4.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e85f8319cdf4358448a9002845cfbd5a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_5.asset b/Assets/Sprites/Controls/Buttons_5.asset new file mode 100644 index 0000000..af8935f --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_5.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_5 + m_EditorClassIdentifier: + m_Sprite: {fileID: -7811504096720598664, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_5.asset.meta b/Assets/Sprites/Controls/Buttons_5.asset.meta new file mode 100644 index 0000000..f1e6da4 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccb4ffcdbc096b448881b3a12ed1bfce +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_6.asset b/Assets/Sprites/Controls/Buttons_6.asset new file mode 100644 index 0000000..3157be7 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_6.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_6 + m_EditorClassIdentifier: + m_Sprite: {fileID: -7814535901586335685, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_6.asset.meta b/Assets/Sprites/Controls/Buttons_6.asset.meta new file mode 100644 index 0000000..503d9d5 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_6.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: db1d65b4da209fa489ba3d7582dbff24 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_7.asset b/Assets/Sprites/Controls/Buttons_7.asset new file mode 100644 index 0000000..03e387b --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_7.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_7 + m_EditorClassIdentifier: + m_Sprite: {fileID: -3243065930256096816, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_7.asset.meta b/Assets/Sprites/Controls/Buttons_7.asset.meta new file mode 100644 index 0000000..0eac61a --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_7.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cb7c540b9df3b994fb4320684eb0ff65 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_8.asset b/Assets/Sprites/Controls/Buttons_8.asset new file mode 100644 index 0000000..0de1b89 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_8.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_8 + m_EditorClassIdentifier: + m_Sprite: {fileID: -5316896731886317114, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_8.asset.meta b/Assets/Sprites/Controls/Buttons_8.asset.meta new file mode 100644 index 0000000..b7c2838 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_8.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: daea938cbd864e0479f663f746bb9950 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Buttons_9.asset b/Assets/Sprites/Controls/Buttons_9.asset new file mode 100644 index 0000000..8758748 --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_9.asset @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Buttons_9 + m_EditorClassIdentifier: + m_Sprite: {fileID: 7219830438018454713, guid: 41e19859471e9554081441f3912fd642, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + 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_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Sprites/Controls/Buttons_9.asset.meta b/Assets/Sprites/Controls/Buttons_9.asset.meta new file mode 100644 index 0000000..8103cbe --- /dev/null +++ b/Assets/Sprites/Controls/Buttons_9.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f3b494a9dede1e34cbf612b95ee136ec +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Control W.png b/Assets/Sprites/Controls/Control W.png deleted file mode 100644 index 8eb1b1e..0000000 Binary files a/Assets/Sprites/Controls/Control W.png and /dev/null differ diff --git a/Assets/Sprites/Controls/Control W.png.meta b/Assets/Sprites/Controls/Control W.png.meta deleted file mode 100644 index 149d694..0000000 --- a/Assets/Sprites/Controls/Control W.png.meta +++ /dev/null @@ -1,103 +0,0 @@ -fileFormatVersion: 2 -guid: 7c63d0c80ca19b944a6838f2becbc094 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 10 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - 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: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 3 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 4 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: 4 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: - - - {x: 0, y: 2} - - {x: -1.7320509, y: 0.99999994} - - {x: -1.7320508, y: -1.0000001} - - {x: 0.00000017484555, y: -2} - - {x: 1.7320509, y: -0.9999998} - - {x: 1.7320509, y: 0.9999998} - physicsShape: - - - {x: 0, y: 2} - - {x: -1.7320509, y: 0.99999994} - - {x: -1.7320508, y: -1.0000001} - - {x: 0.00000017484555, y: -2} - - {x: 1.7320509, y: -0.9999998} - - {x: 1.7320509, y: 0.9999998} - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/Controls/Control W.asset b/Assets/Sprites/Controls/Plus.asset similarity index 87% rename from Assets/Sprites/Controls/Control W.asset rename to Assets/Sprites/Controls/Plus.asset index f789d34..65cae6f 100644 --- a/Assets/Sprites/Controls/Control W.asset +++ b/Assets/Sprites/Controls/Plus.asset @@ -10,9 +10,9 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} - m_Name: Control W + m_Name: Plus m_EditorClassIdentifier: - m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} + m_Sprite: {fileID: 21300000, guid: 7b479c9679b034648b04c7b0bb947faf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_Transform: e00: 1 diff --git a/Assets/Sprites/Controls/Plus.asset.meta b/Assets/Sprites/Controls/Plus.asset.meta new file mode 100644 index 0000000..637d84b --- /dev/null +++ b/Assets/Sprites/Controls/Plus.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee14e10b7ac07bd449e0f1d5ea99eb42 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Controls/Plus.png.meta b/Assets/Sprites/Controls/Plus.png.meta index 97d3add..f021c9e 100644 --- a/Assets/Sprites/Controls/Plus.png.meta +++ b/Assets/Sprites/Controls/Plus.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 16 + spritePixelsToUnits: 18 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 diff --git a/Assets/Sprites/Palette/Event Controls.prefab b/Assets/Sprites/Palette/Event Controls.prefab index 1e82ddc..ce62554 100644 --- a/Assets/Sprites/Palette/Event Controls.prefab +++ b/Assets/Sprites/Palette/Event Controls.prefab @@ -85,7 +85,79 @@ Tilemap: m_GameObject: {fileID: 7903917978724306658} m_Enabled: 1 m_Tiles: - - first: {x: -2, y: 1, z: 0} + - first: {x: -6, y: -2, z: 0} + second: + m_TileIndex: 10 + m_TileSpriteIndex: 9 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -5, y: -2, z: 0} + second: + m_TileIndex: 11 + m_TileSpriteIndex: 10 + 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: 11 + 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: 13 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -6, y: -1, z: 0} + second: + m_TileIndex: 6 + m_TileSpriteIndex: 5 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -5, y: -1, z: 0} + second: + m_TileIndex: 7 + m_TileSpriteIndex: 6 + 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: 7 + 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: 9 + m_TileSpriteIndex: 8 + 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: 1 m_TileSpriteIndex: 0 @@ -94,10 +166,37 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 - - first: {x: 0, y: 1, z: 0} + - first: {x: -6, y: 0, z: 0} second: - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_ObjectToInstantiate: {fileID: 0} + m_TileFlags: 1 + m_ColliderType: 1 + - first: {x: -5, y: 0, z: 0} + second: + m_TileIndex: 3 + m_TileSpriteIndex: 2 + 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: 3 + 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: 5 + m_TileSpriteIndex: 4 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_ObjectToInstantiate: {fileID: 0} @@ -105,15 +204,75 @@ Tilemap: m_ColliderType: 1 m_AnimatedTiles: {} m_TileAssetArray: + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2} + m_Data: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2} - m_RefCount: 1 - m_Data: {fileID: 11400000, guid: 6cf7a50810d16f2468acc06180743d07, type: 2} + m_Data: {fileID: 11400000, guid: 1f7bfa5ee72002646806268d14bfeb3b, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: ae6e7a8b9fa2433448a66da4090e310c, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: c2678bd928e9a0943ad5fadb602db819, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 2144cee47e8929f4cb0ce23b78f8f4ad, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: e85f8319cdf4358448a9002845cfbd5a, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: ccb4ffcdbc096b448881b3a12ed1bfce, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: db1d65b4da209fa489ba3d7582dbff24, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: cb7c540b9df3b994fb4320684eb0ff65, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: daea938cbd864e0479f663f746bb9950, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: f3b494a9dede1e34cbf612b95ee136ec, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 4c5438b1315e8d840b6c482e9710993c, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: e3c7dcade26bec746bd38fb794264216, type: 2} m_TileSpriteArray: - - m_RefCount: 2 - m_Data: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 7b479c9679b034648b04c7b0bb947faf, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 8894201953851282084, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: 7664807735657788756, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: -5402412272178277761, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: 2013261503205373015, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: 3760674464881954987, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: -7811504096720598664, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: -7814535901586335685, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: -3243065930256096816, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: -5316896731886317114, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: 7219830438018454713, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: 3100856887975758742, guid: 41e19859471e9554081441f3912fd642, + type: 3} + - m_RefCount: 1 + m_Data: {fileID: 4520375771122408675, guid: 41e19859471e9554081441f3912fd642, + type: 3} m_TileMatrixArray: - - m_RefCount: 2 + - m_RefCount: 13 m_Data: e00: 1 e01: 0 @@ -132,12 +291,14 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 2 + - m_RefCount: 13 m_Data: {r: 1, g: 1, b: 1, a: 1} + - m_RefCount: 0 + m_Data: {r: -6.304267e+13, g: -6.304267e+13, b: -6.304267e+13, a: -6.304267e+13} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -2, y: 0, z: 0} - m_Size: {x: 3, y: 2, z: 1} + m_Origin: {x: -6, y: -2, z: 0} + m_Size: {x: 7, y: 4, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -196,7 +357,7 @@ TilemapRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_ChunkSize: {x: 32, y: 32, z: 32} - m_ChunkCullingBounds: {x: 0, y: 0, z: 0} + m_ChunkCullingBounds: {x: 0.1875, y: 0.1875, z: 0} m_MaxChunkCount: 16 m_MaxFrameAge: 16 m_SortOrder: 0 diff --git a/Assets/Sprites/Player/BugFight.anim b/Assets/Sprites/Player/BugFight.anim new file mode 100644 index 0000000..e11feec --- /dev/null +++ b/Assets/Sprites/Player/BugFight.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BugFight + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 324873849759012965, guid: 74e17f82f177d874bb8c8117a62939a5, + type: 3} + - time: 0.083333336 + value: {fileID: -4102844690915655467, guid: 74e17f82f177d874bb8c8117a62939a5, + type: 3} + - time: 0.16666667 + value: {fileID: -3465671070239941490, guid: 74e17f82f177d874bb8c8117a62939a5, + type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 324873849759012965, guid: 74e17f82f177d874bb8c8117a62939a5, type: 3} + - {fileID: -4102844690915655467, guid: 74e17f82f177d874bb8c8117a62939a5, type: 3} + - {fileID: -3465671070239941490, guid: 74e17f82f177d874bb8c8117a62939a5, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.25 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Sprites/Player/BugFight.anim.meta b/Assets/Sprites/Player/BugFight.anim.meta new file mode 100644 index 0000000..7913537 --- /dev/null +++ b/Assets/Sprites/Player/BugFight.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 784d0899d352c39428548fc7aa7de282 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/BugFight.png b/Assets/Sprites/Player/BugFight.png new file mode 100644 index 0000000..77fda1c Binary files /dev/null and b/Assets/Sprites/Player/BugFight.png differ diff --git a/Assets/Sprites/Player/BugFight.png.meta b/Assets/Sprites/Player/BugFight.png.meta new file mode 100644 index 0000000..a3779c6 --- /dev/null +++ b/Assets/Sprites/Player/BugFight.png.meta @@ -0,0 +1,223 @@ +fileFormatVersion: 2 +guid: 74e17f82f177d874bb8c8117a62939a5 +TextureImporter: + internalIDToNameTable: + - first: + 213: 324873849759012965 + second: BugFight0 + - first: + 213: -4102844690915655467 + second: BugFight1 + - first: + 213: -3465671070239941490 + second: BugFight2 + 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: 2 + 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: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: BugFight0 + rect: + serializedVersion: 2 + x: 0 + y: 160 + width: 120 + height: 80 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 3d7d444c711313d45a8261c6e7ecce7b + internalID: 324873849759012965 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BugFight1 + rect: + serializedVersion: 2 + x: 0 + y: 80 + width: 120 + height: 80 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a22b67a2d0bd5c845bff847e2f7cc5c0 + internalID: -4102844690915655467 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: BugFight2 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 120 + height: 80 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ae5509f90b487dd4ea8bb13f1413238f + internalID: -3465671070239941490 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/GameObject.controller b/Assets/Sprites/Player/GameObject.controller new file mode 100644 index 0000000..52b1856 --- /dev/null +++ b/Assets/Sprites/Player/GameObject.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-1903111495984819043 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BugFight + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 784d0899d352c39428548fc7aa7de282, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GameObject + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 7953468951862002194} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &7953468951862002194 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1903111495984819043} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1903111495984819043} diff --git a/Assets/Sprites/Player/GameObject.controller.meta b/Assets/Sprites/Player/GameObject.controller.meta new file mode 100644 index 0000000..f5f0171 --- /dev/null +++ b/Assets/Sprites/Player/GameObject.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f821f03859ad6e45b226cf6be7f908e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: