From bba74aa884ca2912492f44f8a6b3a7928fe32bfe Mon Sep 17 00:00:00 2001 From: Tore Bergebakken Date: Tue, 24 Dec 2024 16:47:07 +0100 Subject: [PATCH] Add santa hats --- .../Player/{PlayeRed.mat => PlayerRed.mat} | 2 +- .../{PlayeRed.mat.meta => PlayerRed.mat.meta} | 0 Assets/Materials/Props/SantaHat.mat | 180 ++++++++++++++++++ Assets/Materials/Props/SantaHat.mat.meta | 8 + Assets/Models/Props/SantaHat.fbx | Bin 0 -> 40492 bytes Assets/Models/Props/SantaHat.fbx.meta | 108 +++++++++++ Assets/Prefabs/Input/Player.prefab | 83 +++++++- Assets/Prefabs/Input/PokerPlayer.prefab | 108 ++++++++--- Assets/Prefabs/Props/SantaHat.prefab | 149 +++++++++++++++ Assets/Prefabs/Props/SantaHat.prefab.meta | 7 + Assets/Scripts/Gamestate/PlayerManager.cs | 4 + Assets/Textures/Props/SantaHat.png | Bin 0 -> 270 bytes Assets/Textures/Props/SantaHat.png.meta | 124 ++++++++++++ 13 files changed, 744 insertions(+), 29 deletions(-) rename Assets/Materials/Player/{PlayeRed.mat => PlayerRed.mat} (99%) rename Assets/Materials/Player/{PlayeRed.mat.meta => PlayerRed.mat.meta} (100%) create mode 100644 Assets/Materials/Props/SantaHat.mat create mode 100644 Assets/Materials/Props/SantaHat.mat.meta create mode 100644 Assets/Models/Props/SantaHat.fbx create mode 100644 Assets/Models/Props/SantaHat.fbx.meta create mode 100644 Assets/Prefabs/Props/SantaHat.prefab create mode 100644 Assets/Prefabs/Props/SantaHat.prefab.meta create mode 100644 Assets/Textures/Props/SantaHat.png create mode 100644 Assets/Textures/Props/SantaHat.png.meta 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 0000000000000000000000000000000000000000..a61e9ed9735ec5c79cf2c4de9bfc38bff764033f GIT binary patch literal 40492 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 b{Ohs*Uq@!oMPFocI|<_>E5XXjJLLZl6pSRi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..704d574ecc8d7027b2bff9457ff2c1492dd517d0 GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqW~mXLX}-P;T0pi0i&x?c27V_8 z7|p=MD8;}Elwky74n}D>TL8#sIP38z1xRt`ySWvE_+W5LYuh;>gR{UR5-7+m1j3A$ z?$-SQ3TAq`IEF|_w)T2+9Z=wLQCHI2)AQZlW#M;?67?MumZ;UOD7mO}X!c1JML$oC z^ahS78Rd76O|Cu5*^zR3>Zc%G19QbB=A>gOrZwfiE0c2{&t24>FL^g?bC?ImtM!Xk j_uW2y>)_i@tLvEgEv8Bx&X7D)19Fn5tDnm{r-UW|Ir&c7 literal 0 HcmV?d00001 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: