diff --git a/FlufflParty/Assets/BlenderFiles/Materials.meta b/FlufflParty/Assets/BlenderFiles/Materials.meta new file mode 100644 index 0000000..33f65f9 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82dcc45800c41924ba1ee825fe0481f9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Materials/CoinSprite.mat b/FlufflParty/Assets/BlenderFiles/Materials/CoinSprite.mat new file mode 100644 index 0000000..e3450ee --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Materials/CoinSprite.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: CoinSprite + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 7dd49c33817e9e540be187ce6b1678c5, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/BlenderFiles/Materials/CoinSprite.mat.meta b/FlufflParty/Assets/BlenderFiles/Materials/CoinSprite.mat.meta new file mode 100644 index 0000000..c9ea82d --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Materials/CoinSprite.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0c9fc965ad294344285706e9a3e2d069 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/VSField.png b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png new file mode 100644 index 0000000..c7d9100 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/VSField.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png.meta new file mode 100644 index 0000000..c301d11 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 9d08f141a0f703b479b20a25632111a7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 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 + 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 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat b/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat new file mode 100644 index 0000000..784a7f6 --- /dev/null +++ b/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: VSFIeld + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 9d08f141a0f703b479b20a25632111a7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat.meta b/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat.meta new file mode 100644 index 0000000..1f3845d --- /dev/null +++ b/FlufflParty/Assets/Materials/PlayerFields/VSFIeld.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64a2e19948a778945842a97f204dc7be +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/PlayerField_VS.prefab b/FlufflParty/Assets/Prefabs/PlayerField_VS.prefab new file mode 100644 index 0000000..631db0a --- /dev/null +++ b/FlufflParty/Assets/Prefabs/PlayerField_VS.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &268665820721341489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 644488152736743051} + - component: {fileID: 4566215827465777454} + - component: {fileID: 1781879898823837156} + m_Layer: 0 + m_Name: PlayerField_VS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &644488152736743051 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268665820721341489} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 94.80454, y: 0.0000026226044, z: 104.662025} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4566215827465777454 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268665820721341489} + m_Mesh: {fileID: -2124705421725058983, guid: bcff3b6992a10f245b41c89e969ecf52, type: 3} +--- !u!23 &1781879898823837156 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268665820721341489} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 42db707c721233547876203e2553789b, type: 2} + - {fileID: 2100000, guid: 64a2e19948a778945842a97f204dc7be, type: 2} + - {fileID: -876546973899608171, guid: bcff3b6992a10f245b41c89e969ecf52, type: 3} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/FlufflParty/Assets/Prefabs/PlayerField_VS.prefab.meta b/FlufflParty/Assets/Prefabs/PlayerField_VS.prefab.meta new file mode 100644 index 0000000..f271d56 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/PlayerField_VS.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0fd8341a290a9fc4bb33e95d73b1a24c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 06d2ac2..b386f3c 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -132,7 +132,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} propertyPath: m_LocalScale.y @@ -198,7 +198,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 7071106116130886719, guid: fd4d2de2d235db54389206462a42c57f, type: 3} propertyPath: m_LocalScale.y @@ -264,7 +264,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3} propertyPath: m_RootOrder - value: 21 + value: 20 objectReference: {fileID: 0} - target: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3} propertyPath: m_LocalScale.y @@ -373,10 +373,11 @@ Transform: - {fileID: 543450651741855857} - {fileID: 2041259436246033217} - {fileID: 2139568768} - - {fileID: 1400632171} - {fileID: 543450653096789260} + - {fileID: 1400632171} - {fileID: 543450653628136511} - {fileID: 543450652514961522} + - {fileID: 543450652862463034} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -707,7 +708,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3} propertyPath: m_RootOrder - value: 24 + value: 23 objectReference: {fileID: 0} - target: {fileID: 6264285776840265041, guid: 8a4c1f56cdf3b264b9f27207969fdf01, type: 3} propertyPath: m_LocalScale.y @@ -893,6 +894,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} m_PrefabInstance: {fileID: 7645439968679386787} m_PrefabAsset: {fileID: 0} +--- !u!4 &543450652862463034 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + m_PrefabInstance: {fileID: 1115511661407503025} + m_PrefabAsset: {fileID: 0} --- !u!4 &543450652951801009 stripped Transform: m_CorrespondingSourceObject: {fileID: 3236109498566566965, guid: 9df1281bec48f1c40a35dfa77c718b77, type: 3} @@ -941,7 +947,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 1086640587503067309, guid: 06e960ba226dd6e4c972ec724166cc0d, type: 3} propertyPath: m_LocalPosition.x @@ -998,7 +1004,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} propertyPath: m_LocalPosition.x @@ -1055,7 +1061,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 759317280592271221, guid: 21af0a851af2ba64ab4c64416c6fb4b1, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 759317280592271221, guid: 21af0a851af2ba64ab4c64416c6fb4b1, type: 3} propertyPath: m_LocalPosition.x @@ -1099,6 +1105,71 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 21af0a851af2ba64ab4c64416c6fb4b1, type: 3} +--- !u!1001 &1115511661407503025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 268665820721341489, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_Name + value: PlayerField_VS + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_RootOrder + value: 28 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalScale.y + value: 0.6999999 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalScale.z + value: 0.6999999 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalPosition.x + value: -38.5 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalPosition.y + value: 38.70792 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalPosition.z + value: 8.18 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 644488152736743051, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0fd8341a290a9fc4bb33e95d73b1a24c, type: 3} --- !u!4 &1138138515521539025 stripped Transform: m_CorrespondingSourceObject: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} @@ -1113,7 +1184,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1385375255678050833, guid: e98484d0aabc85c46a15d1bf861baa5b, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 1385375255678050833, guid: e98484d0aabc85c46a15d1bf861baa5b, type: 3} propertyPath: m_LocalPosition.x @@ -1174,7 +1245,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} propertyPath: m_RootOrder - value: 23 + value: 22 objectReference: {fileID: 0} - target: {fileID: 2008249026352490839, guid: 7d773f4891db8a049a62818a17512bd5, type: 3} propertyPath: m_LocalPosition.x @@ -1236,7 +1307,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3236109498566566965, guid: 9df1281bec48f1c40a35dfa77c718b77, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 3236109498566566965, guid: 9df1281bec48f1c40a35dfa77c718b77, type: 3} propertyPath: m_LocalPosition.x @@ -1293,7 +1364,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2972129319899864026, guid: e96b020884c733e40a35ed59c1ebe355, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2972129319899864026, guid: e96b020884c733e40a35ed59c1ebe355, type: 3} propertyPath: m_LocalPosition.x @@ -1346,7 +1417,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} propertyPath: m_LocalPosition.x @@ -1403,7 +1474,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3718633661091795347, guid: 32834830c53dc024995f18a65060a2ce, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3718633661091795347, guid: 32834830c53dc024995f18a65060a2ce, type: 3} propertyPath: m_LocalPosition.x @@ -1469,7 +1540,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_RootOrder - value: 22 + value: 21 objectReference: {fileID: 0} - target: {fileID: 4148714147383538834, guid: 616c4d7a7df3216439e209b540a24966, type: 3} propertyPath: m_LocalPosition.x @@ -1595,7 +1666,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_RootOrder - value: 25 + value: 24 objectReference: {fileID: 0} - target: {fileID: 4995878451819512375, guid: d69691ce9db049442848ba367670c069, type: 3} propertyPath: m_LocalScale.x @@ -1668,7 +1739,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} propertyPath: m_LocalPosition.x - value: -36.595665 + value: -49.84 objectReference: {fileID: 0} - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} propertyPath: m_LocalPosition.y @@ -1676,7 +1747,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} propertyPath: m_LocalPosition.z - value: 6.681038 + value: -1.33 objectReference: {fileID: 0} - target: {fileID: 5445783194010943027, guid: 38e99aa56206e634b83e1dcd05f0be6a, type: 3} propertyPath: m_LocalRotation.w @@ -1721,7 +1792,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5455393635236505095, guid: a2eb45a45513da04fa56db28034493e4, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: 5455393635236505095, guid: a2eb45a45513da04fa56db28034493e4, type: 3} propertyPath: m_LocalPosition.x @@ -1778,7 +1849,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8680370992906925654, guid: 4c45f1da82168544688424fb1df22297, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: 8680370992906925654, guid: 4c45f1da82168544688424fb1df22297, type: 3} propertyPath: m_LocalPosition.x @@ -1831,7 +1902,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 5819133972839638946, guid: 04532602dcbfa4946b4b30a12173fb12, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5819133972839638946, guid: 04532602dcbfa4946b4b30a12173fb12, type: 3} propertyPath: m_LocalPosition.x @@ -1892,7 +1963,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6696708220561039824, guid: 42ff4322cd19e9f428c4bb2b9d6d3bb7, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6696708220561039824, guid: 42ff4322cd19e9f428c4bb2b9d6d3bb7, type: 3} propertyPath: m_LocalPosition.x @@ -1949,7 +2020,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} propertyPath: m_LocalPosition.x @@ -2011,7 +2082,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8011016568452836462, guid: 0cef3a16626a60b4dacfd9d0c8311962, type: 3} propertyPath: m_RootOrder - value: 14 + value: 13 objectReference: {fileID: 0} - target: {fileID: 8011016568452836462, guid: 0cef3a16626a60b4dacfd9d0c8311962, type: 3} propertyPath: m_LocalPosition.x @@ -2068,7 +2139,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} propertyPath: m_LocalScale.y @@ -2129,7 +2200,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} propertyPath: m_LocalPosition.x @@ -2186,7 +2257,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 1585359140388994828, guid: 5f6fe4eec1bc656458eebd9867f08b47, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: 1585359140388994828, guid: 5f6fe4eec1bc656458eebd9867f08b47, type: 3} propertyPath: m_LocalPosition.x diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 7263499..052a531 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: Scene m_RootView: {fileID: 6} - m_MinSize: {x: 875, y: 371} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 1 --- !u!114 &2 @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 92 + controlID: 17 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -64,9 +64,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1414 + x: 1477 y: 0 - width: 506 + width: 443 height: 1059 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -92,8 +92,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 365 - height: 592 + width: 377 + height: 631 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -117,9 +117,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 592 - width: 1414 - height: 467 + y: 631 + width: 1477 + height: 428 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 13} @@ -150,7 +150,7 @@ MonoBehaviour: y: 0 width: 1920 height: 1109 - m_MinSize: {x: 875, y: 371} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 30 @@ -218,12 +218,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1414 + width: 1477 height: 1059 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 93 + controlID: 94 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,12 +243,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1414 - height: 592 + width: 1477 + height: 631 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 94 + controlID: 95 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -264,17 +264,17 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 365 + x: 377 y: 0 - width: 1049 - height: 592 + width: 1100 + height: 631 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 12} m_Panes: - - {fileID: 16} - {fileID: 12} - m_Selected: 1 + - {fileID: 16} + m_Selected: 0 m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: @@ -296,10 +296,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -31635 - y: -31970 - width: 1047 - height: 571 + x: 377 + y: 73 + width: 1098 + height: 610 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -501,9 +501,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 83.03163, y: 4.0775976, z: 105.344154} + m_Target: {x: 87.45722, y: 7.4519415, z: 107.63183} speed: 2 - m_Value: {x: 83.03163, y: 4.0775976, z: 105.344154} + m_Value: {x: 87.45722, y: 7.4519415, z: 107.63183} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -550,19 +550,19 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.19043839, y: 0.7756979, z: -0.27641672, w: 0.5344523} + m_Target: {x: -0.07541168, y: -0.9233086, z: 0.2919944, w: -0.23828052} speed: 2 - m_Value: {x: 0.18960644, y: 0.7772902, z: -0.2769841, w: 0.53211766} + m_Value: {x: -0.07452701, y: -0.92391586, z: 0.29218662, w: -0.23548315} m_Size: - m_Target: 2.8755915 + m_Target: 3.2348912 speed: 2 - m_Value: 2.8755927 + m_Value: 3.0955896 m_Ortho: m_Target: 0 speed: 2 m_Value: 0 m_CameraSettings: - m_Speed: 1 + m_Speed: 1.005 m_SpeedNormalized: 0.5 m_SpeedMin: 0.01 m_SpeedMax: 2 @@ -601,10 +601,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -32000 - y: -31378 - width: 1413 - height: 446 + x: 0 + y: 704 + width: 1476 + height: 407 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -622,22 +622,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Materials/Fields + - Assets/BlenderFiles m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Materials/Fields + - Assets/BlenderFiles m_LastFoldersGridSize: -1 m_LastProjectPath: F:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 885c0000 - m_LastClickedID: 23688 - m_ExpandedIDs: 00000000725c0000745c000000ca9a3b + m_SelectedIDs: ac5c0000 + m_LastClickedID: 23724 + m_ExpandedIDs: 00000000a45c0000a65c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -665,7 +665,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000725c0000745c0000 + m_ExpandedIDs: 00000000a45c0000a65c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -692,7 +692,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -741,9 +741,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -30586 - y: -31970 - width: 505 + x: 1477 + y: 73 + width: 442 height: 1038 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: @@ -782,10 +782,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: -32000 - y: -31970 - width: 364 - height: 571 + x: 0 + y: 73 + width: 376 + height: 610 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -795,7 +795,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 30fbffff7c5a0000 + m_ExpandedIDs: 30fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -839,10 +839,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 365 + x: 377 y: 73 - width: 1047 - height: 571 + width: 1098 + height: 610 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -853,7 +853,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1047, y: 550} + m_TargetSize: {x: 1098, y: 589} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -868,10 +868,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -523.5 - m_HBaseRangeMax: 523.5 - m_VBaseRangeMin: -275 - m_VBaseRangeMax: 275 + m_HBaseRangeMin: -549 + m_HBaseRangeMax: 549 + m_VBaseRangeMin: -294.5 + m_VBaseRangeMax: 294.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -889,23 +889,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1047 - height: 550 + width: 1098 + height: 589 m_Scale: {x: 1, y: 1} - m_Translation: {x: 523.5, y: 275} + m_Translation: {x: 549, y: 294.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -523.5 - y: -275 - width: 1047 - height: 550 + x: -549 + y: -294.5 + width: 1098 + height: 589 m_MinimalGUI: 1 m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1047, y: 571} + m_LastWindowPixelSize: {x: 1098, y: 610} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000