diff --git a/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller b/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller index 29a1c55..87aecf3 100644 --- a/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller +++ b/FlufflParty/Assets/BlenderFiles/CoinAnimated.controller @@ -59,7 +59,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -5454848988904016368} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 380, y: 140, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/FlufflParty/Assets/BlenderFiles/Wheel.blend b/FlufflParty/Assets/BlenderFiles/Wheel.blend new file mode 100644 index 0000000..d3d1a73 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Wheel.blend differ diff --git a/FlufflParty/Assets/BlenderFiles/Wheel.blend.meta b/FlufflParty/Assets/BlenderFiles/Wheel.blend.meta new file mode 100644 index 0000000..0132326 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Wheel.blend.meta @@ -0,0 +1,106 @@ +fileFormatVersion: 2 +guid: 02bdfdc88d4cfc04fa3afceeb7102737 +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/BlenderFiles/Wheel.blend1 b/FlufflParty/Assets/BlenderFiles/Wheel.blend1 new file mode 100644 index 0000000..78799b7 Binary files /dev/null and b/FlufflParty/Assets/BlenderFiles/Wheel.blend1 differ diff --git a/FlufflParty/Assets/BlenderFiles/Wheel.blend1.meta b/FlufflParty/Assets/BlenderFiles/Wheel.blend1.meta new file mode 100644 index 0000000..d98bf91 --- /dev/null +++ b/FlufflParty/Assets/BlenderFiles/Wheel.blend1.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7a7836e126053bf4680abcc2aba3ed06 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/Wheel.meta b/FlufflParty/Assets/Materials/Wheel.meta new file mode 100644 index 0000000..de54614 --- /dev/null +++ b/FlufflParty/Assets/Materials/Wheel.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 84ca625e67ea8ad4fb19a303ba8e3222 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat b/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat new file mode 100644 index 0000000..099f0ec --- /dev/null +++ b/FlufflParty/Assets/Materials/Wheel/WheelMetal.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: WheelMetal + 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.64 + - _GlossyReflections: 1 + - _Metallic: 1 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.6132076, g: 0.6132076, b: 0.6132076, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat.meta b/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat.meta new file mode 100644 index 0000000..e2b5787 --- /dev/null +++ b/FlufflParty/Assets/Materials/Wheel/WheelMetal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 726cdcd398ce6cb459dc589edfc170ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Materials/Wheel/WheelWood.mat b/FlufflParty/Assets/Materials/Wheel/WheelWood.mat new file mode 100644 index 0000000..0dfb3bd --- /dev/null +++ b/FlufflParty/Assets/Materials/Wheel/WheelWood.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: WheelWood + 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.53333336, b: 0.3254902, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/FlufflParty/Assets/Materials/Wheel/WheelWood.mat.meta b/FlufflParty/Assets/Materials/Wheel/WheelWood.mat.meta new file mode 100644 index 0000000..2ab8814 --- /dev/null +++ b/FlufflParty/Assets/Materials/Wheel/WheelWood.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 64cc093c1ce7db34da5385b3a1313b18 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 1f09b90..0c41f28 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -198,7 +198,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bbd5093a72be95c4893d4945fc77fb63, type: 3} propertyPath: m_LocalPosition.x @@ -287,7 +287,7 @@ Transform: - {fileID: 543450651594602143} - {fileID: 1645278604} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705507993 GameObject: @@ -408,6 +408,71 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &1584096221 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalPosition.x + value: 84.068245 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalPosition.y + value: -0.037 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalPosition.z + value: 94.656746 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 64cc093c1ce7db34da5385b3a1313b18, type: 2} + - target: {fileID: -7511558181221131132, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 726cdcd398ce6cb459dc589edfc170ba, type: 2} + - target: {fileID: 919132149155446097, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} + propertyPath: m_Name + value: Wheel + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} --- !u!1 &1607968977 GameObject: m_ObjectHideFlags: 0 @@ -490,7 +555,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 24.531, y: 0, z: 0} --- !u!1001 &1645278603 PrefabInstance: @@ -638,7 +703,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &543450651594602143 stripped Transform: