From 76e38e91f0a3cb952c2fd129e82193afadd0e5bf Mon Sep 17 00:00:00 2001 From: Ktaylor Date: Wed, 24 Apr 2024 08:49:06 -0400 Subject: [PATCH] Final fixes --- Assets/Models/Materials/Sukh smiling.mat | 2 +- Assets/Models/Sukh_Popout.prefab | 18 ++--- .../Props/SM_Prop_Camp_Stick_01.prefab | 81 +++++++++++-------- 3 files changed, 54 insertions(+), 47 deletions(-) diff --git a/Assets/Models/Materials/Sukh smiling.mat b/Assets/Models/Materials/Sukh smiling.mat index ed6b5402..644f2d58 100644 --- a/Assets/Models/Materials/Sukh smiling.mat +++ b/Assets/Models/Materials/Sukh smiling.mat @@ -49,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 6511a3c43d452684aba1e66e3d807922, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Sukh_Popout.prefab b/Assets/Models/Sukh_Popout.prefab index 04246339..76767596 100644 --- a/Assets/Models/Sukh_Popout.prefab +++ b/Assets/Models/Sukh_Popout.prefab @@ -63,7 +63,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 2257bb3f89246384eb19dc7451e85382, type: 2} + - {fileID: 2100000, guid: 7f05e698744c43f49a4ff89578840e2c, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -134,8 +134,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 3.18, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8883634209604188560} m_Father: {fileID: 0} @@ -154,9 +154,9 @@ MonoBehaviour: m_EditorClassIdentifier: angle: 60 speed: 1 - delay: 1 - axis: {x: 0, y: 0, z: 1} - halfPendulum: 0 + delay: 0 + axis: {x: 1, y: 0, z: 0} + halfPendulum: 1 --- !u!1001 &5153034098846805510 PrefabInstance: m_ObjectHideFlags: 0 @@ -169,10 +169,6 @@ PrefabInstance: propertyPath: m_Name value: SM_Prop_Camp_Stick_01 objectReference: {fileID: 0} - - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} - propertyPath: m_LocalScale.x - value: 10 - objectReference: {fileID: 0} - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} propertyPath: m_LocalScale.y value: 1 @@ -191,7 +187,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} propertyPath: m_LocalPosition.z - value: 5 + value: 5.85 objectReference: {fileID: 0} - target: {fileID: 4824902004772602, guid: 645455512bfea4b46a5661d3944cf69b, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab b/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab index 95c1bd3d..65786f48 100644 --- a/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab +++ b/Assets/PolygonDungeonRealms/Prefabs/Props/SM_Prop_Camp_Stick_01.prefab @@ -1,22 +1,12 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1237612601484384} - m_IsPrefabParent: 1 --- !u!1 &1237612601484384 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 4824902004772602} - component: {fileID: 33985483330261082} @@ -31,29 +21,46 @@ GameObject: m_IsActive: 1 --- !u!4 &4824902004772602 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1237612601484384} + serializedVersion: 2 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_LocalScale: {x: 12, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33985483330261082 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1237612601484384} + m_Mesh: {fileID: 4300000, guid: 10c94e22fa4f67e4d9b42edcae19358e, type: 3} --- !u!23 &23168214457156090 MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1237612601484384} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 2a12d3fc0532ba64e972160db18dfd99, type: 2} m_StaticBatchInfo: @@ -63,9 +70,11 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 1 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -74,24 +83,26 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &33985483330261082 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1237612601484384} - m_Mesh: {fileID: 4300000, guid: 10c94e22fa4f67e4d9b42edcae19358e, type: 3} + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &64119236156671362 MeshCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1237612601484384} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 5 m_Convex: 1 - m_InflateMesh: 0 - m_SkinWidth: 0.01 + m_CookingOptions: 30 m_Mesh: {fileID: 43828786835275654, guid: 50da5137ba1355c41b61e06f0b9bb85f, type: 2}