diff --git a/Assets/Farming Asset Pack/Split Assets/farming_tileset_000.png.meta b/Assets/Farming Asset Pack/Split Assets/farming_tileset_000.png.meta index 08b9965..b37eaba 100644 --- a/Assets/Farming Asset Pack/Split Assets/farming_tileset_000.png.meta +++ b/Assets/Farming Asset Pack/Split Assets/farming_tileset_000.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -76,6 +76,30 @@ TextureImporter: 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: Server + 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: [] diff --git a/Assets/Farming Asset Pack/Split Assets/farming_tileset_107.png.meta b/Assets/Farming Asset Pack/Split Assets/farming_tileset_107.png.meta index 2cd587e..a1e23af 100644 --- a/Assets/Farming Asset Pack/Split Assets/farming_tileset_107.png.meta +++ b/Assets/Farming Asset Pack/Split Assets/farming_tileset_107.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 @@ -47,7 +47,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 32 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -67,6 +67,30 @@ TextureImporter: - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 + resizeAlgorithm: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Items/Usable/Hoe.asset b/Assets/Items/Usable/Hoe.asset index 30a20cf..4695b22 100644 --- a/Assets/Items/Usable/Hoe.asset +++ b/Assets/Items/Usable/Hoe.asset @@ -15,6 +15,6 @@ MonoBehaviour: displayName: Hoe description: on the streets id: 0 - selectedSprite: {fileID: 21300238, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} - defaultSprite: {fileID: 21300212, guid: 2700e06d970d112489ff23cfb58c3f78, type: 3} + selectedSprite: {fileID: 21300000, guid: 2b99ea4b77726f546a2925690263b82e, type: 3} + defaultSprite: {fileID: 21300000, guid: b1cc4f234b4dc684a84810adb240bf16, type: 3} cost: 50 diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index e71aedd..b29fbc7 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -1638,7 +1638,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2006577139} m_HandleRect: {fileID: 2006577138} m_Direction: 2 - m_Value: 1 + m_Value: 0.9999998 m_Size: 0.59324205 m_NumberOfSteps: 0 m_OnValueChanged: @@ -4967,7 +4967,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1278234712} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.52, y: 3.09, z: -1} + m_LocalPosition: {x: -5.57, y: -2.97, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5010,7 +5010,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tile: {fileID: 4752245148499717901, guid: ea81011a3ce83fb4386934728a92ee2d, type: 3} - cameraGameObject: {fileID: 0} + cameraGameObject: {fileID: 598358736} --- !u!4 &1291863651 Transform: m_ObjectHideFlags: 0 @@ -6888,6 +6888,7 @@ MonoBehaviour: startItems: - {fileID: 11400000, guid: 008a8fdd2c3a95745acafee4087a855d, type: 2} - {fileID: 11400000, guid: 430db451ae959f34b8fba8d8b17276fd, type: 2} + - {fileID: 11400000, guid: ea1a26b19bc34a0ba29bad77253c7266, type: 2} --- !u!114 &1800469992 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6905,6 +6906,7 @@ MonoBehaviour: - {fileID: 11400000, guid: d651d57ba97a4246a0094409e29fe56a, type: 2} - {fileID: 11400000, guid: 430db451ae959f34b8fba8d8b17276fd, type: 2} - {fileID: 11400000, guid: 008a8fdd2c3a95745acafee4087a855d, type: 2} + - {fileID: 11400000, guid: ea1a26b19bc34a0ba29bad77253c7266, type: 2} --- !u!1001 &1805366398 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 3b3ab36..968b365 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -40,7 +40,7 @@ public class PlayerController : MonoBehaviour { public void SetSelectedItem(UsableItem item) { if(_inventory.items.ContainsKey(item)) { _selectedItem = item; - Cursor.SetCursor(item.selectedSprite.texture, Vector2.zero, CursorMode.Auto); + Cursor.SetCursor(item.defaultSprite.texture, Vector2.zero, CursorMode.Auto); } else { Debug.Log("An item requested to select isn't in the inventory" + item); } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 3dcb827..90d6509 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.2f1 -m_EditorVersionWithRevision: 2021.3.2f1 (d6360bedb9a0) +m_EditorVersion: 2021.3.1f1 +m_EditorVersionWithRevision: 2021.3.1f1 (3b70a0754835)