diff --git a/Assets/Scriptable Objects/Fighter.asset b/Assets/Scriptable Objects/Fighter.asset index b11c3a23de8562d655388a0e2d0305d7516eee5c..ba6e8e28f09c8eade83329f856417a4ad1207de9 100644 --- a/Assets/Scriptable Objects/Fighter.asset +++ b/Assets/Scriptable Objects/Fighter.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Fighter m_EditorClassIdentifier: title: Fighter - description: Fighter is a strong pet with a fire element that can help player to - fight enemies - image: {fileID: 21300000, guid: 072317a3bd5fb86489a6f88f724221e8, type: 3} + description: Fighter is a strong pet that can help player to fight enemies + image: {fileID: 21300000, guid: 92c525885d3f4ec4fac0df3d68824f7f, type: 3} price: 50 itemPrefab: {fileID: 4893785644411561827, guid: 0b5e7ba132663464dadc282f3aa60701, type: 3} diff --git a/Assets/Scriptable Objects/Healer.asset b/Assets/Scriptable Objects/Healer.asset index 884e4aa892f1f3abef5a89311eaaf6617045ddd7..0e2fcf4cc577c8cbffa46dd6df0851ef380ddfbd 100644 --- a/Assets/Scriptable Objects/Healer.asset +++ b/Assets/Scriptable Objects/Healer.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: Healer m_EditorClassIdentifier: title: Healer - description: Healer is the weakest pet and can't do anything to help player - image: {fileID: 21300000, guid: 0a43723e9f82f04469e70be12651b634, type: 3} + description: Healer is a support pet that can heal player overtime + image: {fileID: 21300000, guid: c579a115ee1847a44be2cdbd71b0aee6, type: 3} price: 50 itemPrefab: {fileID: 8853103978792596861, guid: e423576042eb4d944a7b6de92623a3a6, type: 3} diff --git a/Assets/Sprites/attack.png b/Assets/Sprites/attack.png deleted file mode 100644 index db5486c26761c0f907c7f360a4c736915bd98566..0000000000000000000000000000000000000000 Binary files a/Assets/Sprites/attack.png and /dev/null differ diff --git a/Assets/Sprites/buff.png b/Assets/Sprites/buff.png deleted file mode 100644 index 545227641fd80b1fe3b0b36638c3eef6db54f626..0000000000000000000000000000000000000000 Binary files a/Assets/Sprites/buff.png and /dev/null differ diff --git a/Assets/Sprites/buff.png.meta b/Assets/Sprites/buff.png.meta deleted file mode 100644 index 94a7f68a79fdf39f4d7f71330a1b70daa89e919c..0000000000000000000000000000000000000000 --- a/Assets/Sprites/buff.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 995423665c388b142a7343323d997aeb -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 0 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/fighter_pet.jpg b/Assets/Sprites/fighter_pet.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a8b17bc1d959587c6a22d35d462eb574efd960f6 Binary files /dev/null and b/Assets/Sprites/fighter_pet.jpg differ diff --git a/Assets/Sprites/healer.png.meta b/Assets/Sprites/fighter_pet.jpg.meta similarity index 98% rename from Assets/Sprites/healer.png.meta rename to Assets/Sprites/fighter_pet.jpg.meta index f033f3ebca9292fbfff1f2b6b4472518d88a20f1..2c939af0fac728e529163ae8ab32ef0d6ee29052 100644 --- a/Assets/Sprites/healer.png.meta +++ b/Assets/Sprites/fighter_pet.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0a43723e9f82f04469e70be12651b634 +guid: 92c525885d3f4ec4fac0df3d68824f7f TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Sprites/healer.png b/Assets/Sprites/healer.png deleted file mode 100644 index 1df519807617e6a84ac079d364dc80f0a892db52..0000000000000000000000000000000000000000 Binary files a/Assets/Sprites/healer.png and /dev/null differ diff --git a/Assets/Sprites/healer_pet.jpg b/Assets/Sprites/healer_pet.jpg new file mode 100644 index 0000000000000000000000000000000000000000..da3ce77c9738909c1d089501d0f57e0075130a0f Binary files /dev/null and b/Assets/Sprites/healer_pet.jpg differ diff --git a/Assets/Sprites/attack.png.meta b/Assets/Sprites/healer_pet.jpg.meta similarity index 98% rename from Assets/Sprites/attack.png.meta rename to Assets/Sprites/healer_pet.jpg.meta index 60a795526544ebf23f3a507d33c235519146c0c8..11622904cb9c973d1b6ee5c9e46b0edcf89b94c8 100644 --- a/Assets/Sprites/attack.png.meta +++ b/Assets/Sprites/healer_pet.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 072317a3bd5fb86489a6f88f724221e8 +guid: c579a115ee1847a44be2cdbd71b0aee6 TextureImporter: internalIDToNameTable: [] externalObjects: {}