diff --git a/FlufflParty/Assets/BlenderFiles/Mushroom.blend b/FlufflParty/Assets/BlenderFiles/Mushroom.blend new file mode 100644 index 0000000..6897b92 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Mushroom.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend.meta b/FlufflParty/Assets/BlenderFiles/Mushroom.blend.meta similarity index 98% rename from FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend.meta rename to FlufflParty/Assets/BlenderFiles/Mushroom.blend.meta index 1429453..352d186 100644 --- a/FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend.meta +++ b/FlufflParty/Assets/BlenderFiles/Mushroom.blend.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cec4ed17571357146b2492f71b9bb5e3 +guid: 4e52562c1222351499196c7be78e933b ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] diff --git a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 new file mode 100644 index 0000000..3bc74a1 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta new file mode 100644 index 0000000..9e99a9c --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Mushroom.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 3e77ecfe144111444b7a6837a089680f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend b/FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend deleted file mode 100644 index cd5d330..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/3Coins.blend and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinField.xcf b/FlufflParty/Assets/BlenderFiles/Textures/CoinField.xcf new file mode 100644 index 0000000..2bc2924 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/CoinField.xcf differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinField.xcf.meta b/FlufflParty/Assets/BlenderFiles/Textures/CoinField.xcf.meta new file mode 100644 index 0000000..e3aa33b --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/CoinField.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2960070885debe44a850750cf7adb2cc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinLooseField.xcf b/FlufflParty/Assets/BlenderFiles/Textures/CoinLooseField.xcf new file mode 100644 index 0000000..c29b25c Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/CoinLooseField.xcf differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinLooseField.xcf.meta b/FlufflParty/Assets/BlenderFiles/Textures/CoinLooseField.xcf.meta new file mode 100644 index 0000000..88880bf --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/CoinLooseField.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c6a63114ccf070c40b34a73f36bd467f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png index 4347d5e..3e54667 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png and b/FlufflParty/Assets/BlenderFiles/Textures/CoinSprite.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png new file mode 100644 index 0000000..38ee317 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png.meta b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png.meta new file mode 100644 index 0000000..14ef6e3 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: 4551a4ab02fad01409935d51adc1d17b +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 + - 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 + - serializedVersion: 3 + buildTarget: Android + 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/BlenderFiles/Textures/Mushroom_Item.xcf b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.xcf new file mode 100644 index 0000000..281ce7f Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.xcf differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.xcf.meta b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.xcf.meta new file mode 100644 index 0000000..c71c08e --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Textures/Mushroom_Item.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dea407d7afcf5ef4587229ad6271a394 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/BlenderFiles/Textures/VSField.png b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png index c7d9100..256f46f 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/VSField.png and b/FlufflParty/Assets/BlenderFiles/Textures/VSField.png differ diff --git a/FlufflParty/Assets/BlenderFiles/Textures/VSField.xcf b/FlufflParty/Assets/BlenderFiles/Textures/VSField.xcf index 2bc2924..db2e5f2 100644 Binary files a/FlufflParty/Assets/BlenderFiles/Textures/VSField.xcf and b/FlufflParty/Assets/BlenderFiles/Textures/VSField.xcf differ diff --git a/FlufflParty/Assets/BlenderFiles/Tumbleweed.blend.meta b/FlufflParty/Assets/BlenderFiles/Tumbleweed.blend.meta new file mode 100644 index 0000000..9bc74fd --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Tumbleweed.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: f6f7e83a062c79445932393ed3d386f7 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/PlayerFields/CoinField.mat b/FlufflParty/Assets/Materials/PlayerFields/CoinField.mat index 38e6721..eb1a830 100644 --- a/FlufflParty/Assets/Materials/PlayerFields/CoinField.mat +++ b/FlufflParty/Assets/Materials/PlayerFields/CoinField.mat @@ -41,7 +41,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 621fcc7d4328e544fb8a1af633d4d5aa, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.495283, g: 0.61954206, b: 1, a: 1} + - _Color: {r: 0.49411765, g: 0.61960787, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/PlayerFields/CoinLooseFIeld.mat b/FlufflParty/Assets/Materials/PlayerFields/CoinLooseFIeld.mat index f43fe6c..5a14c81 100644 --- a/FlufflParty/Assets/Materials/PlayerFields/CoinLooseFIeld.mat +++ b/FlufflParty/Assets/Materials/PlayerFields/CoinLooseFIeld.mat @@ -41,7 +41,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 853c427e405b5034ca5e8192478bb4e1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0.4575472, b: 0.4575472, a: 1} + - _Color: {r: 1, g: 0.43867922, b: 0.43867922, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat b/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat index 3c43d8b..563d9b3 100644 --- a/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat +++ b/FlufflParty/Assets/Materials/PlayerFields/ItemField.mat @@ -41,7 +41,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 4551a4ab02fad01409935d51adc1d17b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -75,6 +75,6 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 1, g: 0.88596517, b: 0.2971698, a: 1} + - _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/UnluckyField.mat b/FlufflParty/Assets/Materials/PlayerFields/UnluckyField.mat new file mode 100644 index 0000000..171d344 --- /dev/null +++ b/FlufflParty/Assets/Materials/PlayerFields/UnluckyField.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: UnluckyField + 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: 0} + 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: 0.6195175, b: 0.3066038, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/PlayerFields/UnluckyField.mat.meta b/FlufflParty/Assets/Materials/PlayerFields/UnluckyField.mat.meta new file mode 100644 index 0000000..a49f5d0 --- /dev/null +++ b/FlufflParty/Assets/Materials/PlayerFields/UnluckyField.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50d59ec4e3717ab46815fe06f5eac000 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Prefabs/PlayerField_Unlucky.prefab b/FlufflParty/Assets/Prefabs/PlayerField_Unlucky.prefab new file mode 100644 index 0000000..f779ca2 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/PlayerField_Unlucky.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7674362363978120917 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7046760420148421743} + - component: {fileID: 6225316987031366602} + - component: {fileID: 8178593654993411840} + m_Layer: 0 + m_Name: PlayerField_Unlucky + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7046760420148421743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674362363978120917} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 87.78047, y: -0.00000047683716, z: 106.69161} + 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 &6225316987031366602 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674362363978120917} + m_Mesh: {fileID: -2124705421725058983, guid: bcff3b6992a10f245b41c89e969ecf52, type: 3} +--- !u!23 &8178593654993411840 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7674362363978120917} + 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: 50d59ec4e3717ab46815fe06f5eac000, 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_Unlucky.prefab.meta b/FlufflParty/Assets/Prefabs/PlayerField_Unlucky.prefab.meta new file mode 100644 index 0000000..f8983c6 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/PlayerField_Unlucky.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e474218c7655cf42ad6601be4907cbb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 2d0c896..08e5655 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -381,6 +381,7 @@ Transform: - {fileID: 543450652862463034} - {fileID: 543450653608409113} - {fileID: 543450653142084051} + - {fileID: 8319586650617658673} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1193,6 +1194,71 @@ Transform: m_CorrespondingSourceObject: {fileID: 8533737750045391386, guid: c9cb904746f5e4a4aa33fc14b6e8137f, type: 3} m_PrefabInstance: {fileID: 8765860533721231819} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1350522154497546590 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_RootOrder + value: 32 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalScale.y + value: 0.6999999 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalScale.z + value: 0.6999999 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalPosition.x + value: -44.69 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707916 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalPosition.z + value: 6.7 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7674362363978120917, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + propertyPath: m_Name + value: PlayerField_Unlucky + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} --- !u!1001 &1491656888046090692 PrefabInstance: m_ObjectHideFlags: 0 @@ -1337,7 +1403,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1938175372135920003, guid: 1421fa765e4ed524a918035e56557fb9, type: 3} propertyPath: m_LocalPosition.x - value: -40.574 + value: -46.14 objectReference: {fileID: 0} - target: {fileID: 1938175372135920003, guid: 1421fa765e4ed524a918035e56557fb9, type: 3} propertyPath: m_LocalPosition.y @@ -1345,7 +1411,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1938175372135920003, guid: 1421fa765e4ed524a918035e56557fb9, type: 3} propertyPath: m_LocalPosition.z - value: 10.659 + value: 6.6 objectReference: {fileID: 0} - target: {fileID: 1938175372135920003, guid: 1421fa765e4ed524a918035e56557fb9, type: 3} propertyPath: m_LocalRotation.w @@ -2295,7 +2361,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.x - value: -43.58 + value: -43.24 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.y @@ -2303,7 +2369,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalPosition.z - value: 8.85 + value: 8.46 objectReference: {fileID: 0} - target: {fileID: 8630449442833824813, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} propertyPath: m_LocalRotation.w @@ -2339,6 +2405,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 80d097c3941e16842b887b6fed03f3b9, type: 3} +--- !u!4 &8319586650617658673 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7046760420148421743, guid: 7e474218c7655cf42ad6601be4907cbb, type: 3} + m_PrefabInstance: {fileID: 1350522154497546590} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8337303559691228557 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 052a531..3b00720 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1109 m_ShowMode: 4 - m_Title: Scene + m_Title: Inspector m_RootView: {fileID: 6} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 17 + controlID: 98 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -93,7 +93,7 @@ MonoBehaviour: x: 0 y: 0 width: 377 - height: 631 + height: 667 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: 631 + y: 667 width: 1477 - height: 428 + height: 392 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 13} @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 94 + controlID: 45 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -244,11 +244,11 @@ MonoBehaviour: x: 0 y: 0 width: 1477 - height: 631 + height: 667 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 95 + controlID: 46 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,7 +267,7 @@ MonoBehaviour: x: 377 y: 0 width: 1100 - height: 631 + height: 667 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 12} @@ -299,7 +299,7 @@ MonoBehaviour: x: 377 y: 73 width: 1098 - height: 610 + height: 646 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: 87.45722, y: 7.4519415, z: 107.63183} + m_Target: {x: 93.01604, y: 1.8346989, z: 106.972694} speed: 2 - m_Value: {x: 87.45722, y: 7.4519415, z: 107.63183} + m_Value: {x: 93.01604, y: 1.8346989, z: 106.972694} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -532,9 +532,9 @@ MonoBehaviour: m_Size: {x: 0, y: 0} yGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} @@ -546,17 +546,17 @@ MonoBehaviour: m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 0, y: 0} - m_ShowGrid: 1 + m_ShowGrid: 0 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.07541168, y: -0.9233086, z: 0.2919944, w: -0.23828052} + m_Target: {x: -0.0044538896, y: -0.97194755, z: 0.23508157, w: -0.01804119} speed: 2 - m_Value: {x: -0.07452701, y: -0.92391586, z: 0.29218662, w: -0.23548315} + m_Value: {x: -0.0041006664, y: -0.97183233, z: 0.23505384, w: -0.016580839} m_Size: - m_Target: 3.2348912 + m_Target: 3.6915483 speed: 2 - m_Value: 3.0955896 + m_Value: 3.532582 m_Ortho: m_Target: 0 speed: 2 @@ -602,9 +602,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 704 + y: 740 width: 1476 - height: 407 + height: 371 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -622,22 +622,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/BlenderFiles + - Assets/Prefabs m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/BlenderFiles + - Assets/Prefabs m_LastFoldersGridSize: -1 m_LastProjectPath: F:\Unity\flufflparty\FlufflParty m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: ac5c0000 - m_LastClickedID: 23724 - m_ExpandedIDs: 00000000a45c0000a65c000000ca9a3b + scrollPos: {x: 0, y: 53} + m_SelectedIDs: e65c0000 + m_LastClickedID: 23782 + m_ExpandedIDs: 00000000a05c0000a25c0000cc5c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -653,7 +653,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -665,7 +665,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a45c0000a65c0000 + m_ExpandedIDs: 00000000a05c0000a25c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -785,7 +785,7 @@ MonoBehaviour: x: 0 y: 73 width: 376 - height: 610 + height: 646 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: 30fbffff + m_ExpandedIDs: 32fbffff745a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: