diff --git a/Assets/Materials/Horsetraits/Wistful.mat b/Assets/Materials/Horsetraits/Cow.mat similarity index 98% rename from Assets/Materials/Horsetraits/Wistful.mat rename to Assets/Materials/Horsetraits/Cow.mat index 37fe868..59ca1e8 100644 --- a/Assets/Materials/Horsetraits/Wistful.mat +++ b/Assets/Materials/Horsetraits/Cow.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Wistful + m_Name: Cow m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 2100000, guid: cf44c9f74ad95dd45962d0b6a335c703, type: 2} m_ModifiedSerializedProperties: 0 diff --git a/Assets/Materials/Horsetraits/Wistful.mat.meta b/Assets/Materials/Horsetraits/Cow.mat.meta similarity index 100% rename from Assets/Materials/Horsetraits/Wistful.mat.meta rename to Assets/Materials/Horsetraits/Cow.mat.meta diff --git a/Assets/Models/HorsetraitFrames/Horsetrait_Cow.fbx b/Assets/Models/HorsetraitFrames/Horsetrait_Cow.fbx new file mode 100644 index 0000000..11234c4 Binary files /dev/null and b/Assets/Models/HorsetraitFrames/Horsetrait_Cow.fbx differ diff --git a/Assets/Models/HorsetraitFrames/Horsetrait_Cow.fbx.meta b/Assets/Models/HorsetraitFrames/Horsetrait_Cow.fbx.meta new file mode 100644 index 0000000..1cdac22 --- /dev/null +++ b/Assets/Models/HorsetraitFrames/Horsetrait_Cow.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 5f203a307a236994f93c006ea625a6a0 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + 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 + importPhysicalCameras: 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: 0 + 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: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyroP/Arcade/HeliCave/Materials/Arcade/screenHeliCave.mat b/Assets/MyroP/Arcade/HeliCave/Materials/Arcade/screenHeliCave.mat index 37911d6..46734c9 100644 --- a/Assets/MyroP/Arcade/HeliCave/Materials/Arcade/screenHeliCave.mat +++ b/Assets/MyroP/Arcade/HeliCave/Materials/Arcade/screenHeliCave.mat @@ -85,6 +85,6 @@ Material: - _ZWrite: 1 m_Colors: - _Color: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0.9883372, g: 0.9883372, b: 0.9883372, a: 1} + - _EmissionColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.254717, g: 0.254717, b: 0.254717, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/Game Room.prefab b/Assets/Prefabs/Game Room.prefab index 6b66bb2..be5b3fd 100644 --- a/Assets/Prefabs/Game Room.prefab +++ b/Assets/Prefabs/Game Room.prefab @@ -1234,6 +1234,7 @@ Transform: - {fileID: 3790741201565964360} - {fileID: 4805083370601343825} - {fileID: 4097243820787019252} + - {fileID: 6990642724725730990} - {fileID: 1275522257179020427} - {fileID: 6038214494843976484} - {fileID: 8995297989063158186} @@ -9978,6 +9979,250 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7114709594258899020} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7388570771218450757 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3871954906234844699} + m_Modifications: + - target: {fileID: -7511558181221131132, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.25 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 56d1036ce35ee4d40923a6c762943b53, type: 2} + - target: {fileID: -7511558181221131132, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 354d7d3b293dbf34989ea72185348a72, type: 2} + - target: {fileID: -7511558181221131132, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: af7843994ae89b946963272f5f328cf4, type: 2} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_DirtyAABB + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_AABB.m_Center.x + value: 0.006349885 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_AABB.m_Center.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_AABB.m_Center.z + value: 0.52 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_AABB.m_Extent.x + value: 0.006350155 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_AABB.m_Extent.y + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_AABB.m_Extent.z + value: 0.58 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_UpdateWhenOffscreen + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 3a55c945ca7511c41994ec693832fc58, type: 2} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 354d7d3b293dbf34989ea72185348a72, type: 2} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: af7843994ae89b946963272f5f328cf4, type: 2} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_BlendShapeWeights.Array.data[0] + value: 47.7 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 890b5a07d0c3c5b4fa18f3cee9819e90, + type: 3} + propertyPath: m_BlendShapeWeights.Array.data[1] + value: 44.3 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 53efd1ae258e3ef4480827714b5bd96f, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 53efd1ae258e3ef4480827714b5bd96f, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 3a55c945ca7511c41994ec693832fc58, type: 2} + - target: {fileID: -7511558181221131132, guid: 53efd1ae258e3ef4480827714b5bd96f, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 354d7d3b293dbf34989ea72185348a72, type: 2} + - target: {fileID: -7511558181221131132, guid: 53efd1ae258e3ef4480827714b5bd96f, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: f5f22a97cda8e574f81c42b690e732d2, type: 2} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalPosition.x + value: 5.639 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalPosition.z + value: -4.5411005 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_ScaleInLightmap + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 8f1e383e04a17ad4583407f7f89def1a, type: 2} + - target: {fileID: -7511558181221131132, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 354d7d3b293dbf34989ea72185348a72, type: 2} + - target: {fileID: -7511558181221131132, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: f5f22a97cda8e574f81c42b690e732d2, type: 2} + - target: {fileID: -3887185075125053422, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_DirtyAABB + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_AABB.m_Center.x + value: 0.006349885 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_AABB.m_Center.y + value: 0.9999996 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_AABB.m_Center.z + value: 1.0000002 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_AABB.m_Extent.x + value: 0.006350155 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_AABB.m_Extent.y + value: 0.9999998 + objectReference: {fileID: 0} + - target: {fileID: -3887185075125053422, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_AABB.m_Extent.z + value: 1.0000002 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_Name + value: Horsetrait_Cow + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5f203a307a236994f93c006ea625a6a0, type: 3} +--- !u!4 &6990642724725730990 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5f203a307a236994f93c006ea625a6a0, + type: 3} + m_PrefabInstance: {fileID: 7388570771218450757} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8098454516676735399 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TheStable.unity b/Assets/Scenes/TheStable.unity index 15cd9ea..d06e546 100644 --- a/Assets/Scenes/TheStable.unity +++ b/Assets/Scenes/TheStable.unity @@ -25373,11 +25373,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1416802129971500225, guid: f6322afa7e50353478912b02ed5a6732, - type: 3} - propertyPath: m_BoxProjection - value: 1 - objectReference: {fileID: 0} - target: {fileID: 1587131771352766949, guid: f6322afa7e50353478912b02ed5a6732, type: 3} propertyPath: serializationData.Prefab @@ -82034,7 +82029,7 @@ Light: m_BounceIntensity: 1 m_ColorTemperature: 5800 m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 1.02e-43, y: 6e-44, z: 2.2e-44, w: 4.3167e-41} + m_BoundingSphereOverride: {x: 0, y: 6e-44, z: 9.5e-44, w: 1.517e-41} m_UseBoundingSphereOverride: 0 m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 diff --git a/Assets/Scenes/TheStable/LightingData.asset b/Assets/Scenes/TheStable/LightingData.asset index 28996d5..059bdf6 100644 Binary files a/Assets/Scenes/TheStable/LightingData.asset and b/Assets/Scenes/TheStable/LightingData.asset differ diff --git a/Assets/Textures/Horsetraits.png b/Assets/Textures/Horsetraits.png index 2e1f37c..70b7e61 100644 Binary files a/Assets/Textures/Horsetraits.png and b/Assets/Textures/Horsetraits.png differ