diff --git a/Assets/Materials/Player/PlayeRed.mat b/Assets/Materials/Player/PlayerRed.mat similarity index 99% rename from Assets/Materials/Player/PlayeRed.mat rename to Assets/Materials/Player/PlayerRed.mat index e5554220a..bd5b836ed 100644 --- a/Assets/Materials/Player/PlayeRed.mat +++ b/Assets/Materials/Player/PlayerRed.mat @@ -20,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: PlayeRed + m_Name: PlayerRed m_Shader: {fileID: -6465566751694194690, guid: f8ec4cafbe9538b4aa600770a5a8bf02, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/Player/PlayeRed.mat.meta b/Assets/Materials/Player/PlayerRed.mat.meta similarity index 100% rename from Assets/Materials/Player/PlayeRed.mat.meta rename to Assets/Materials/Player/PlayerRed.mat.meta diff --git a/Assets/Materials/Props/SantaHat.mat b/Assets/Materials/Props/SantaHat.mat new file mode 100644 index 000000000..86f29ed65 --- /dev/null +++ b/Assets/Materials/Props/SantaHat.mat @@ -0,0 +1,180 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-2941887051954300681 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SantaHat + m_Shader: {fileID: -6465566751694194690, guid: c5f92ba5fc8552c4dacafaa631cd2fb8, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - MAIN_LIGHT_CALCULATE_SHADOWS + - _MAIN_LIGHT_SHADOWS_CASCADE + - _SHADOWS_SOFT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: e103454945b3bc115ae159b63b4e69a7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: e103454945b3bc115ae159b63b4e69a7, 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} + - _Metallic_Map: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Metallic_Texture: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal_Map: + 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} + - _SampleTexture2D_ff3f3dfb8d024d00a3406fb548bfed46_Texture_1: + m_Texture: {fileID: 2800000, guid: 2f6a188b3fdeed84e9663c94fc54cd49, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Texture: + m_Texture: {fileID: 2800000, guid: e7a4544adbed1773f824b8872b06d94e, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Triplanar_0910a226a35b49eaa87ebc7a7af0a7de_Texture_1: + m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Triplanar_6ca021b8b8b84617a472c2608835416d_Texture_1: + m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Triplanar_8082379ce2a14f38b8de533a506ee294_Texture_1: + m_Texture: {fileID: 2800000, guid: 5ef5d25785740444ab670640848feec7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - MAIN_LIGHT_CALCULATE_SHADOWS: 1 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _BendStartOffset: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _MAIN_LIGHT_SHADOWS_CASCADE: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SHADOWS_SOFT: 1 + - _Shadow_Texture: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _Texture_Intensity: 1 + - _UVSec: 0 + - _Use_Normal_Map: 0 + - _Use_Specular: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Distance: {r: 0, g: 0, b: 0, a: 0} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + - _Texture_Tiling: {r: 1, g: 1, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Props/SantaHat.mat.meta b/Assets/Materials/Props/SantaHat.mat.meta new file mode 100644 index 000000000..e8d16d2ec --- /dev/null +++ b/Assets/Materials/Props/SantaHat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 51e0f88bf96e8cc4a8042a1dfefb0f16 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Props/SantaHat.fbx b/Assets/Models/Props/SantaHat.fbx new file mode 100644 index 000000000..a61e9ed97 Binary files /dev/null and b/Assets/Models/Props/SantaHat.fbx differ diff --git a/Assets/Models/Props/SantaHat.fbx.meta b/Assets/Models/Props/SantaHat.fbx.meta new file mode 100644 index 000000000..e8d6a493e --- /dev/null +++ b/Assets/Models/Props/SantaHat.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 49ff0e50edc25702189d47763d578060 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + 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 + strictVertexDataChecks: 0 + 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 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Input/Player.prefab b/Assets/Prefabs/Input/Player.prefab index f0964c393..c5ed36c3d 100644 --- a/Assets/Prefabs/Input/Player.prefab +++ b/Assets/Prefabs/Input/Player.prefab @@ -89,6 +89,8 @@ MonoBehaviour: - {fileID: 4694945426238970737} - {fileID: 6630205048431922019} - {fileID: 5451690850857455061} + accessoryMeshes: + - {fileID: 205432122182318478} playerIK: {fileID: 142658303258642700} deathKnockbackForceMultiplier: 150 jumpSounds: {fileID: 11400000, guid: 4dd848facbacd2a46a109bfbf8743e61, type: 2} @@ -3892,7 +3894,10 @@ PrefabInstance: objectReference: {fileID: 6717855691676836013} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 1836582594069031064, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} + insertIndex: -1 + addedObject: {fileID: 5144741382407369348} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} --- !u!136 &81475404505055794 stripped @@ -3976,6 +3981,11 @@ Animator: m_CorrespondingSourceObject: {fileID: 1855191387732965845, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} m_PrefabInstance: {fileID: 3287810421515891185} m_PrefabAsset: {fileID: 0} +--- !u!4 &3809055772196624745 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1836582594069031064, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} + m_PrefabInstance: {fileID: 3287810421515891185} + m_PrefabAsset: {fileID: 0} --- !u!54 &4321660441894553452 stripped Rigidbody: m_CorrespondingSourceObject: {fileID: 1610381490425935517, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} @@ -4061,3 +4071,74 @@ CapsuleCollider: m_CorrespondingSourceObject: {fileID: 5957741010195904037, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} m_PrefabInstance: {fileID: 3287810421515891185} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6321872900137511535 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3809055772196624745} + m_Modifications: + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6643860067142381233, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_Name + value: SantaHat + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} +--- !u!1 &205432122182318478 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6152509200883569633, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + m_PrefabInstance: {fileID: 6321872900137511535} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5144741382407369348 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + m_PrefabInstance: {fileID: 6321872900137511535} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Input/PokerPlayer.prefab b/Assets/Prefabs/Input/PokerPlayer.prefab index 53a6c5781..34791a36d 100644 --- a/Assets/Prefabs/Input/PokerPlayer.prefab +++ b/Assets/Prefabs/Input/PokerPlayer.prefab @@ -61,9 +61,75 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6314087752690433938} - m_Father: {fileID: 4105237329408622016} + m_Father: {fileID: 330410954468659755} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: -16.201, y: 6.543, z: -11.75} +--- !u!1001 &1227873939551290250 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4550522445847765819} + m_Modifications: + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalPosition.y + value: -0.00601 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalPosition.z + value: -0.00001 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.w + value: -0.9996839 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.x + value: -0.025133453 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.y + value: 0.00062473246 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalRotation.z + value: -0.000015704565 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6643860067142381233, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + propertyPath: m_Name + value: SantaHat + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} +--- !u!4 &131816294672751457 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1215416573279983851, guid: b3a6f3cc0897aa4c5943b6fa03b639f9, type: 3} + m_PrefabInstance: {fileID: 1227873939551290250} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3079662320804535659 PrefabInstance: m_ObjectHideFlags: 0 @@ -610,7 +676,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2694035758976947706, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} propertyPath: m_Name - value: Player 1 Variant + value: PokerPlayer objectReference: {fileID: 0} - target: {fileID: 2694035758976947706, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} propertyPath: m_IsActive @@ -694,7 +760,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3326176138852896576, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} propertyPath: m_RootOrder - value: -1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3326176138852896576, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} propertyPath: m_LocalScale.x @@ -1323,20 +1389,25 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 1316620135651827883, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} + - targetCorrespondingSourceObject: {fileID: 3326176138852896576, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} insertIndex: -1 addedObject: {fileID: 3722212432168366906} - targetCorrespondingSourceObject: {fileID: 1158816869561500055, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} insertIndex: -1 addedObject: {fileID: 542294270276252905} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 1266040591694595935, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} + - targetCorrespondingSourceObject: {fileID: 1557010300291989072, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} insertIndex: -1 - addedObject: {fileID: 894274834962624690} + addedObject: {fileID: 131816294672751457} + m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 2824392466739999942, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} insertIndex: -1 addedObject: {fileID: 6224809631321374205} m_SourcePrefab: {fileID: 100100000, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} +--- !u!4 &330410954468659755 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3326176138852896576, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} + m_PrefabInstance: {fileID: 3079662320804535659} + m_PrefabAsset: {fileID: 0} --- !u!1 &977115554959993261 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2824392466739999942, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} @@ -1354,33 +1425,16 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2490cdf137ad7fc4aabf077078241f7b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &4105237329408622016 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1316620135651827883, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} - m_PrefabInstance: {fileID: 3079662320804535659} - m_PrefabAsset: {fileID: 0} --- !u!4 &4227148722984983804 stripped Transform: m_CorrespondingSourceObject: {fileID: 1158816869561500055, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} m_PrefabInstance: {fileID: 3079662320804535659} m_PrefabAsset: {fileID: 0} ---- !u!1 &4264004660816976436 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1266040591694595935, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} +--- !u!4 &4550522445847765819 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1557010300291989072, guid: 27ac4408b426ae745a1792dde18c79ba, type: 3} m_PrefabInstance: {fileID: 3079662320804535659} m_PrefabAsset: {fileID: 0} ---- !u!114 &894274834962624690 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4264004660816976436} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2490cdf137ad7fc4aabf077078241f7b, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &5776601163197356153 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Props/SantaHat.prefab b/Assets/Prefabs/Props/SantaHat.prefab new file mode 100644 index 000000000..282859269 --- /dev/null +++ b/Assets/Prefabs/Props/SantaHat.prefab @@ -0,0 +1,149 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6643860067142381233 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1215416573279983851} + m_Layer: 3 + m_Name: SantaHat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1215416573279983851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6643860067142381233} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6785176594430069083} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &6459133098279956144 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1215416573279983851} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalScale.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalScale.z + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalPosition.y + value: 0.0067999843 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalRotation.y + value: 1.3272461e-10 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalRotation.z + value: 5.890041e-11 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 51e0f88bf96e8cc4a8042a1dfefb0f16, type: 2} + - target: {fileID: -7511558181221131132, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 5f65972e6ab4a740fad1948f72b8cf15, type: 2} + - target: {fileID: 919132149155446097, guid: 49ff0e50edc25702189d47763d578060, type: 3} + propertyPath: m_Name + value: SantaHat + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 49ff0e50edc25702189d47763d578060, type: 3} + insertIndex: -1 + addedObject: {fileID: 3206629445115352236} + m_SourcePrefab: {fileID: 100100000, guid: 49ff0e50edc25702189d47763d578060, type: 3} +--- !u!1 &6152509200883569633 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 49ff0e50edc25702189d47763d578060, type: 3} + m_PrefabInstance: {fileID: 6459133098279956144} + m_PrefabAsset: {fileID: 0} +--- !u!114 &3206629445115352236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6152509200883569633} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2eb4e58302d4c64298bd7019f43c89e, type: 3} + m_Name: + m_EditorClassIdentifier: + jiggleMaterial: {fileID: 2100000, guid: 51e0f88bf96e8cc4a8042a1dfefb0f16, type: 2} + jiggleMaterialIndex: 0 + wobbleOriginOffset: 0.5 + elasticity: 6 + distanceScale: 1 +--- !u!4 &6785176594430069083 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 49ff0e50edc25702189d47763d578060, type: 3} + m_PrefabInstance: {fileID: 6459133098279956144} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Props/SantaHat.prefab.meta b/Assets/Prefabs/Props/SantaHat.prefab.meta new file mode 100644 index 000000000..ff3923ffa --- /dev/null +++ b/Assets/Prefabs/Props/SantaHat.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b3a6f3cc0897aa4c5943b6fa03b639f9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Gamestate/PlayerManager.cs b/Assets/Scripts/Gamestate/PlayerManager.cs index 035bffb19..f2365493b 100644 --- a/Assets/Scripts/Gamestate/PlayerManager.cs +++ b/Assets/Scripts/Gamestate/PlayerManager.cs @@ -100,6 +100,9 @@ public Transform AiTarget [SerializeField] protected GameObject[] meshBase; + [SerializeField] + private GameObject[] accessoryMeshes; + [SerializeField] protected PlayerIK playerIK; public PlayerIK PlayerIK => playerIK; @@ -491,6 +494,7 @@ public virtual void SetLayer(int playerIndex) // Set correct layer on self, mesh and gun (TODO) gameObject.layer = playerLayer; meshBase.ToList().ForEach(mesh => SetLayerOnSubtree(mesh, playerLayer)); + accessoryMeshes.ToList().ForEach(mesh => SetLayerOnSubtree(mesh, playerLayer)); if (hudController) SetLayerOnSubtree(hudController.gameObject, LayerMask.NameToLayer("Gun " + playerIndex)); } diff --git a/Assets/Textures/Props/SantaHat.png b/Assets/Textures/Props/SantaHat.png new file mode 100644 index 000000000..704d574ec Binary files /dev/null and b/Assets/Textures/Props/SantaHat.png differ diff --git a/Assets/Textures/Props/SantaHat.png.meta b/Assets/Textures/Props/SantaHat.png.meta new file mode 100644 index 000000000..660be5f97 --- /dev/null +++ b/Assets/Textures/Props/SantaHat.png.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: e7a4544adbed1773f824b8872b06d94e +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: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 32 + 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: