diff --git a/Assets/Characters/Sophie.fbm.meta b/Assets/Characters/Sophie.fbm.meta new file mode 100644 index 00000000..216c7002 --- /dev/null +++ b/Assets/Characters/Sophie.fbm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 73651c4b4b18e9a4d9024ea5e31adc06 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Diffuse.png b/Assets/Characters/Sophie.fbm/Ch02_1001_Diffuse.png new file mode 100644 index 00000000..15246a24 Binary files /dev/null and b/Assets/Characters/Sophie.fbm/Ch02_1001_Diffuse.png differ diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Diffuse.png.meta b/Assets/Characters/Sophie.fbm/Ch02_1001_Diffuse.png.meta new file mode 100644 index 00000000..c0717b78 --- /dev/null +++ b/Assets/Characters/Sophie.fbm/Ch02_1001_Diffuse.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 54072eafe5f27b44b88869d2dadf8a33 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Glossiness.png b/Assets/Characters/Sophie.fbm/Ch02_1001_Glossiness.png new file mode 100644 index 00000000..2cccdd1b Binary files /dev/null and b/Assets/Characters/Sophie.fbm/Ch02_1001_Glossiness.png differ diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Glossiness.png.meta b/Assets/Characters/Sophie.fbm/Ch02_1001_Glossiness.png.meta new file mode 100644 index 00000000..d07e4f61 --- /dev/null +++ b/Assets/Characters/Sophie.fbm/Ch02_1001_Glossiness.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: d76a383068b7f29429a365324f2a282f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Normal.png b/Assets/Characters/Sophie.fbm/Ch02_1001_Normal.png new file mode 100644 index 00000000..90c8e447 Binary files /dev/null and b/Assets/Characters/Sophie.fbm/Ch02_1001_Normal.png differ diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Normal.png.meta b/Assets/Characters/Sophie.fbm/Ch02_1001_Normal.png.meta new file mode 100644 index 00000000..2d52a968 --- /dev/null +++ b/Assets/Characters/Sophie.fbm/Ch02_1001_Normal.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 9c22fab3c03a5cd418a4a92a0a4bba07 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Specular.png b/Assets/Characters/Sophie.fbm/Ch02_1001_Specular.png new file mode 100644 index 00000000..fa309c8b Binary files /dev/null and b/Assets/Characters/Sophie.fbm/Ch02_1001_Specular.png differ diff --git a/Assets/Characters/Sophie.fbm/Ch02_1001_Specular.png.meta b/Assets/Characters/Sophie.fbm/Ch02_1001_Specular.png.meta new file mode 100644 index 00000000..1339b2a8 --- /dev/null +++ b/Assets/Characters/Sophie.fbm/Ch02_1001_Specular.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 6017161cbf8078c4aaf01ddc15efa2c3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Sophie.fbm/Ch02_1002_Diffuse.png b/Assets/Characters/Sophie.fbm/Ch02_1002_Diffuse.png new file mode 100644 index 00000000..75645d63 Binary files /dev/null and b/Assets/Characters/Sophie.fbm/Ch02_1002_Diffuse.png differ diff --git a/Assets/Characters/Sophie.fbm/Ch02_1002_Diffuse.png.meta b/Assets/Characters/Sophie.fbm/Ch02_1002_Diffuse.png.meta new file mode 100644 index 00000000..08dfb579 --- /dev/null +++ b/Assets/Characters/Sophie.fbm/Ch02_1002_Diffuse.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: 67bc2c926b580c84d95731dd8438ad13 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Sophie.fbm/Ch02_1002_Normal.png b/Assets/Characters/Sophie.fbm/Ch02_1002_Normal.png new file mode 100644 index 00000000..b0fb99e8 Binary files /dev/null and b/Assets/Characters/Sophie.fbm/Ch02_1002_Normal.png differ diff --git a/Assets/Characters/Sophie.fbm/Ch02_1002_Normal.png.meta b/Assets/Characters/Sophie.fbm/Ch02_1002_Normal.png.meta new file mode 100644 index 00000000..4e255893 --- /dev/null +++ b/Assets/Characters/Sophie.fbm/Ch02_1002_Normal.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: aefaec790c11b9248b811edf66e70019 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + 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: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + 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: 0 + spriteTessellationDetail: -1 + textureType: 0 + 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 + 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FollowPath.cs b/Assets/Scripts/FollowPath.cs deleted file mode 100644 index 65dd318d..00000000 --- a/Assets/Scripts/FollowPath.cs +++ /dev/null @@ -1,59 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -public class FollowPath : MonoBehaviour -{ - public enum MovementTypes - { - Moveing, Lerping - - } - - public MovementTypes MovementType = MovementTypes.Moveing; - public MovementPath MyPath; - public float speed = 1; - public float maxDistance = .1f; - - public IEnumerator pointInPath; - - // Start is called before the first frame update - void Start() - { - if (MyPath == null) - { - Debug.Log("path not attached"); - return; - } - pointInPath = MyPath.GetNextPathPoint(); - pointInPath.MoveNext(); - if (pointInPath.Current == null) - { - Debug.Log("need points"); - return; - } - transform.position = pointInPath.Current.position; - } - - // Update is called once per frame - void Update() - { - if (pointInPath == null || pointInPath.Current == null) - { - return; - } - if (MovementType == MovementTypes.Moveing) - { - transform.position = Vector3.MoveTowards(transform.position, pointInPath.Current.position, Time.deltaTime * speed); - } - else - { - transform.position = Vector3.Lerp(transform.position, pointInPath.Current.position, Time.deltaTime * speed); - } - - var distanceSqare = (transform.position - pointInPath.Current.position).sqrMagnitude; - if (distanceSqare < maxDistance * maxDistance) - { - pointInPath.MoveNext(); - } - } -} diff --git a/Assets/Scripts/FollowPath.cs.meta b/Assets/Scripts/FollowPath.cs.meta deleted file mode 100644 index fd82f13c..00000000 --- a/Assets/Scripts/FollowPath.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a17411f0f5c4b764fb4afd65c74cbcb5 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs b/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs index b9ec9ac5..d9b128c7 100644 --- a/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs +++ b/Assets/Scripts/InteractableObjects/BaseInteractableObject.cs @@ -4,6 +4,7 @@ public class BaseInteractableObject : MonoBehaviour { [SerializeField] public Transform _playerArrivePoint; + public virtual void Interact(Player player) { Debug.Log("Interact with some object"); diff --git a/Assets/Scripts/InteractableObjects/ColaFreezer.cs b/Assets/Scripts/InteractableObjects/ColaFreezer.cs index 8db44f42..ad138f09 100644 --- a/Assets/Scripts/InteractableObjects/ColaFreezer.cs +++ b/Assets/Scripts/InteractableObjects/ColaFreezer.cs @@ -8,9 +8,13 @@ public class ColaFreezer : BaseInteractableObject public override void Interact(Player player) { - var transform = Instantiate(_foodObjectSO.prefab, _playerArrivePoint); - var foodObject = transform.GetComponent(); - player.SetFoodObject(foodObject); - } + if (!player.HasFoodObject()) + { + // Spawn new object and set to player + var transform = Instantiate(_foodObjectSO.prefab, _playerArrivePoint); + var foodObject = transform.GetComponent(); + player.SetFoodObject(foodObject); + } + } } diff --git a/Assets/Scripts/InteractableObjects/Fridge.cs b/Assets/Scripts/InteractableObjects/Fridge.cs index dbfba4a0..38b8e26a 100644 --- a/Assets/Scripts/InteractableObjects/Fridge.cs +++ b/Assets/Scripts/InteractableObjects/Fridge.cs @@ -1,10 +1,26 @@ +using System.Collections.Generic; using UnityEngine; public class Fridge : BaseInteractableObject { + private const int _maxCapacity=4; + private List _foodObjects= new List(); + public override void Interact(Player player) { - Debug.Log("Interact with Fridge"); + if (player.HasFoodObject()) + { + if (_foodObjects.Count < _maxCapacity) + { + _foodObjects.Add(player.GetFoodObject()); + player.ClearFoodObject(); + Debug.Log($"Fridge have {_foodObjects.Count} pices of food"); + } + else + Debug.Log($"Fridge is full"); + } } + + } diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Player/Player.cs index 8724ea46..8f0479ac 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Player/Player.cs @@ -120,23 +120,6 @@ public class Player : MonoBehaviour } } - public void SetFoodObject(FoodObject foodObject) - { - foodObject.transform.parent = _holdPoint; - foodObject.transform.localPosition = Vector3.zero; - _foodObject = foodObject; - Debug.Log($"player hold {foodObject.GetFoodObjectSO().name}"); - - } - public FoodObject GetFoodObject() - { - return _foodObject; - } - public void ClearFoodObject() - { - _foodObject = null; - } - private TaskStatus MoveToPoint() { SetPlayerAnimation(AnimationStates.Walking); @@ -257,4 +240,27 @@ public class Player : MonoBehaviour return attr != null; } + + public void SetFoodObject(FoodObject foodObject) + { + foodObject.transform.parent = _holdPoint; + foodObject.transform.localPosition = Vector3.zero; + _foodObject = foodObject; + Debug.Log($"player hold {foodObject.GetFoodObjectSO().name}"); + + } + public FoodObject GetFoodObject() + { + return _foodObject; + } + public void ClearFoodObject() + { + Destroy(_foodObject.gameObject); + _foodObject = null; + } + + public bool HasFoodObject() + { + return _foodObject != null; + } } diff --git a/Assets/UMotionEditor.meta b/Assets/UMotionEditor.meta new file mode 100644 index 00000000..61aee735 --- /dev/null +++ b/Assets/UMotionEditor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f69af39498a0fa04282b04321ce84c54 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UMotionEditor/Plugins.meta b/Assets/UMotionEditor/Plugins.meta new file mode 100644 index 00000000..2e83def0 --- /dev/null +++ b/Assets/UMotionEditor/Plugins.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 83e9e52216f5f1d478734af0b92631bc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UMotionEditor/Plugins/Application.meta b/Assets/UMotionEditor/Plugins/Application.meta new file mode 100644 index 00000000..b25f8611 --- /dev/null +++ b/Assets/UMotionEditor/Plugins/Application.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2120ddf17b335af40ab2b2115ae7bf12 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UMotionEditor/Plugins/Editor.meta b/Assets/UMotionEditor/Plugins/Editor.meta new file mode 100644 index 00000000..87315cc2 --- /dev/null +++ b/Assets/UMotionEditor/Plugins/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a2782f592c662a6408f092e8ec6b8f53 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 45228aea..d37bccc4 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.animation.rigging": "1.2.1", "com.unity.collab-proxy": "2.0.0", "com.unity.ide.rider": "3.0.18", "com.unity.ide.visualstudio": "2.0.17", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index d82abedf..dedd871d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,15 @@ { "dependencies": { + "com.unity.animation.rigging": { + "version": "1.2.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.4.1", + "com.unity.test-framework": "1.1.24" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.8.2", "depth": 1,