diff --git a/Assets/Scripts/Collector.cs b/Assets/Scripts/Collector.cs index 158be9a418b7441375ca38ae1d3c2b6162106cb9..47fe40ef3d3ca17450fe1a6429c04d253d84d6a3 100644 --- a/Assets/Scripts/Collector.cs +++ b/Assets/Scripts/Collector.cs @@ -57,7 +57,7 @@ public class Collector : MonoBehaviour } } if (target != null) - transform.position = Vector3.MoveTowards(new Vector3(transform.position.x, transform.position.y,transform.position.z), move_to.transform.position, speed * Time.deltaTime); + transform.position = Vector2.MoveTowards(new Vector2(transform.position.x, transform.position.y), move_to.transform.position, speed * Time.deltaTime); } private void OnTriggerEnter2D(Collider2D collision) { diff --git a/Assets/Sprites/bilberry.png.meta b/Assets/Sprites/bilberry.png.meta index bae72f6cb259fae792f56b1fe4fe5e1496e2ad0c..0b5748b76418a8c585bcc1f2832b6cd7ded90083 100644 --- a/Assets/Sprites/bilberry.png.meta +++ b/Assets/Sprites/bilberry.png.meta @@ -1,9 +1,23 @@ fileFormatVersion: 2 +<<<<<<< HEAD guid: f85d51a973c87b04692395ace7bbb53d TextureImporter: fileIDToRecycleName: {} externalObjects: {} serializedVersion: 9 +======= +guid: dde5606cbdab11afc87431367dca6696 +TextureImporter: + fileIDToRecycleName: + 21300000: bilberry_0 + 21300002: bilberry_1 + 21300004: bilberry_2 + 21300006: bilberry_3 + 21300008: bilberry_4 + 21300010: bilberry_5 + externalObjects: {} + serializedVersion: 7 +>>>>>>> c144ec98ed3df10cff691d1ef9681c5c4c2be766 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -40,7 +54,11 @@ TextureImporter: nPOTScale: 0 lightmap: 0 compressionQuality: 50 +<<<<<<< HEAD spriteMode: 1 +======= + spriteMode: 2 +>>>>>>> c144ec98ed3df10cff691d1ef9681c5c4c2be766 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -69,6 +87,7 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 +<<<<<<< HEAD spriteSheet: serializedVersion: 2 sprites: [] @@ -76,6 +95,146 @@ TextureImporter: physicsShape: [] bones: [] spriteID: 279b46b7cdee93742b12cd9b807c97da +======= + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: bilberry_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 877cff87778aaebe79e9d86847ac5ef1 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: bilberry_1 + rect: + serializedVersion: 2 + x: 128 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 7fa07a994a0a0b723abf32dc95e34acf + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: bilberry_2 + rect: + serializedVersion: 2 + x: 256 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 88365fd521d52effead5ccd28f8f740f + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: bilberry_3 + rect: + serializedVersion: 2 + x: 384 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b5c28560f4befbbebb8f3d4a1a45c9b6 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: bilberry_4 + rect: + serializedVersion: 2 + x: 512 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d77916cad24f098b4a7dfb38e62af0a0 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: bilberry_5 + rect: + serializedVersion: 2 + x: 640 + y: 0 + width: 128 + height: 128 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d26057aa2debb759eab5608e2d88d6f9 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 097e26d958152dae4b6460317905a5f4 +>>>>>>> c144ec98ed3df10cff691d1ef9681c5c4c2be766 vertices: [] indices: edges: [] diff --git a/villager.png b/Assets/Sprites/villager.png similarity index 100% rename from villager.png rename to Assets/Sprites/villager.png