Merge branch 'Smurjo/art-assets' into art-assets

# Conflicts: # UOP1_Project/Assets/Art/Accessories.meta # UOP1_Project/Assets/Art/Accessories/Earring.meta # UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx # UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx.meta # UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat # UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat.meta # UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab # UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab.meta
4 年前 · 6a57501a
--- a/UOP1_Project/Assets/Art/Accessories.meta
+++ b/UOP1_Project/Assets/Art/Accessories.meta
+fileFormatVersion: 2
+guid: 18a77127ccac52b4eb3902097a050dc5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Scenes/Townsfolk
+++ b/UOP1_Project/Assets/Scenes/Townsfolk
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.73202205, g: 0.83686644, b: 0.8867924, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 2100000, guid: 7e555a006a082a9488c1e4b99f47ebfe, type: 2}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 11
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 30
+    m_AtlasSize: 1024
+    m_AO: 1
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 3
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 0
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 1
+    m_BakeBackend: 1
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 512
+    m_PVRBounces: 1
+    m_PVREnvironmentSampleCount: 256
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 2
+    m_PVRDenoiserTypeIndirect: 2
+    m_PVRDenoiserTypeAO: 2
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 1
+    m_PVRCulling: 0
+    m_PVRFilteringGaussRadiusDirect: 2
+    m_PVRFilteringGaussRadiusIndirect: 4
+    m_PVRFilteringGaussRadiusAO: 0
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_UseShadowmask: 0
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &655582258
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 655582260}
+  - component: {fileID: 655582259}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!108 &655582259
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 655582258}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 1
+  m_Shape: 0
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 1
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 4.61e-43, y: 2.7081e-41, z: 0, w: -1}
+  m_UseBoundingSphereOverride: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!4 &655582260
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 655582258}
+  m_LocalRotation: {x: 0.79132515, y: -0.36416066, z: 0.053742368, w: 0.48816326}
+  m_LocalPosition: {x: 0, y: 3, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 54.266003, y: 207.59, z: 243.76599}
+--- !u!1 &958718626
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 958718629}
+  - component: {fileID: 958718628}
+  - component: {fileID: 958718627}
+  m_Layer: 0
+  m_Name: Plane
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 4294967295
+  m_IsActive: 1
+--- !u!23 &958718627
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 958718626}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: e6df0864f2dccac4f93025eba0cd643d, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  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
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &958718628
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 958718626}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &958718629
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 958718626}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 5, y: 5, z: 5}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1040943625
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 9069557822918714605}
+    m_Modifications:
+    - target: {fileID: 3884050136059514061, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_Name
+      value: Earring
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0.474
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.922
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.4133076
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.91059154
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4516331601362343543, guid: c7e73a40ebc409f4aa5c5ad818cca3ef,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 48.826004
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: c7e73a40ebc409f4aa5c5ad818cca3ef, type: 3}
+--- !u!1 &1285597145
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1285597148}
+  - component: {fileID: 1285597147}
+  - component: {fileID: 1285597146}
+  - component: {fileID: 1285597149}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &1285597146
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285597145}
+  m_Enabled: 1
+--- !u!20 &1285597147
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285597145}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 41
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &1285597148
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285597145}
+  m_LocalRotation: {x: -0.0047106748, y: 0.99449325, z: -0.05134467, w: -0.091240905}
+  m_LocalPosition: {x: 2.98, y: 1, z: 7.96}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 5.9110003, y: 190.484, z: 0}
+--- !u!114 &1285597149
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1285597145}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+--- !u!1 &1829969738
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1829969739}
+  m_Layer: 0
+  m_Name: Characters
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1829969739
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1829969738}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &9069557822918714604
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 8150639118454869313, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_Name
+      value: Townsfolk_M
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 2.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 963eb11d04d7192468b645c523fcab8f, type: 3}
+--- !u!4 &9069557822918714605 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 8815571646897690619, guid: 963eb11d04d7192468b645c523fcab8f,
+    type: 3}
+  m_PrefabInstance: {fileID: 9069557822918714604}
+  m_PrefabAsset: {fileID: 0}
--- a/UOP1_Project/Assets/Scenes/Townsfolk
+++ b/UOP1_Project/Assets/Scenes/Townsfolk
+fileFormatVersion: 2
+guid: 808de2f421b06b340a40f3bb1e65c755
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx
+++ b/UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx
+Kaydara FBX Binary  �MFBXHeaderExtension\FBXHeaderVersionI�x
+FBXVersionI��EncryptionTypeI�CreationTimeStamp�VersionI��YearI��MonthIDayI'HourI?MinuteI/WSecondI-tMillisecondI_�.CreatorS)Blender (stable FBX IO) - 2.83.1 - 4.20.3@'	SceneInfoSGlobalInfoSceneInfoSUserData
TypeSUserData7VersionIdMetaDataeVersionId|TitleS�SubjectS�AuthorS�KeywordsS�RevisionS�CommentS3Properties70g9PSDocumentUrlSKStringSUrlSS/foobar.fbx�<PSSrcDocumentUrlSKStringSUrlSS/foobar.fbx�$PSOriginalSCompoundSS=LPSOriginal|ApplicationVendorSKStringSSSBlender Foundation�OPSOriginal|ApplicationNameSKStringSSSBlender (stable FBX IO)�APSOriginal|ApplicationVersionSKStringSSS2.83.1DMPSOriginal|DateTime_GMTSDateTimeSSS01/01/1970 00:00:00.000�<PSOriginal|FileNameSKStringSSS/foobar.fbx�%PS	LastSavedSCompoundSSMPSLastSaved|ApplicationVendorSKStringSSSBlender FoundationzPPSLastSaved|ApplicationNameSKStringSSSBlender (stable FBX IO)�BPSLastSaved|ApplicationVersionSKStringSSS2.83.1&NPSLastSaved|DateTime_GMTSDateTimeSSS01/01/1970 00:00:00.000uFileIdR(�*��$�¿Ȱ*�+���CreationTimeS1970-01-01 10:00:00:000�.CreatorS)Blender (stable FBX IO) - 2.83.1 - 4.20.3jGlobalSettings VersionI�]Properties70p)PSUpAxisSintSIntegerSI�-PS
+UpAxisSignSintSIntegerSI�,PS	FrontAxisSintSIntegerSI#	0PS
FrontAxisSignSintSIntegerSI����]	,PS	CoordAxisSintSIntegerSI�	0PS
CoordAxisSignSintSIntegerSI�����	1PSOriginalUpAxisSintSIntegerSI����
+5PSOriginalUpAxisSignSintSIntegerSIc
+8PSUnitScaleFactorSdoubleSNumberSD�?�
+@PSOriginalUnitScaleFactorSdoubleSNumberSD�?HPSAmbientColorSColorRGBSColorSDDDVAPS
DefaultCameraSKStringSSSProducer Perspective�%PSTimeModeSenumSSI�3PS
TimeSpanStartSKTimeSTimeSL
+2PSTimeSpanStopSKTimeSTimeSL����
+P8PSCustomFrameRateSdoubleSNumberSD8@�
	Documents�CountI�
DocumentL+I8SSceneSScened
Properties70
&PSSourceObjectSobjectSSW
3PSActiveAnimStackNameSKStringSSS�
	RootNodeL�
+References�+Definitions�
VersionIdCountIV
+ObjectTypeSGlobalSettingsICountI�
+ObjectTypeSGeometry�CountI�PropertyTemplateSFbxMesh�Properties70"APSColorSColorRGBSColorSD�������?D�������?D�������?tDPSBBoxMinSVector3DSVectorSDDD�DPSBBoxMaxSVector3DSVectorSDDD/PSPrimary VisibilitySboolSSI;*PS
Casts ShadowsSboolSSIu,PSReceive ShadowsSboolSSI?$
+
+ObjectTypeSModel�CountI2$PropertyTemplateSFbxNode%$Properties70V2PSQuaternionInterpolateSenumSSI�KPSRotationOffsetSVector3DSVectorSDDDJPS
RotationPivotSVector3DSVectorSDDD_JPS
ScalingOffsetSVector3DSVectorSDDD�IPSScalingPivotSVector3DSVectorSDDD�.PSTranslationActiveSboolSSIKKPSTranslationMinSVector3DSVectorSDDD�KPSTranslationMaxSVector3DSVectorSDDD�,PSTranslationMinXSboolSSI,PSTranslationMinYSboolSSIR,PSTranslationMinZSboolSSI�,PSTranslationMaxXSboolSSI�,PSTranslationMaxYSboolSSI,PSTranslationMaxZSboolSSI8*PS
RotationOrderSenumSSI|6PSRotationSpaceForLimitOnlySboolSSI�;PSRotationStiffnessXSdoubleSNumberSD;PSRotationStiffnessYSdoubleSNumberSDW;PSRotationStiffnessZSdoubleSNumberSD�0PSAxisLenSdoubleSNumberSD$@�HPSPreRotationSVector3DSVectorSDDDBIPSPostRotationSVector3DSVectorSDDD{+PSRotationActiveSboolSSI�HPSRotationMinSVector3DSVectorSDDD'HPSRotationMaxSVector3DSVectorSDDD^)PSRotationMinXSboolSSI�)PSRotationMinYSboolSSI�)PSRotationMinZSboolSSI)PSRotationMaxXSboolSSI:)PSRotationMaxYSboolSSIq)PSRotationMaxZSboolSSI�(PSInheritTypeSenumSSI�*PS
ScalingActiveSboolSSI4GPS
+ScalingMinSVector3DSVectorSDDD�GPS
+ScalingMaxSVector3DSVectorSD�?D�?D�?�(PSScalingMinXSboolSSI�(PSScalingMinYSboolSSI+(PSScalingMinZSboolSSIa(PSScalingMaxXSboolSSI�(PSScalingMaxYSboolSSI�(PSScalingMaxZSboolSSI,QPSGeometricTranslationSVector3DSVectorSDDD�NPSGeometricRotationSVector3DSVectorSDDD�MPSGeometricScalingSVector3DSVectorSD�?D�?D�?'6PS
MinDampRangeXSdoubleSNumberSDk6PS
MinDampRangeYSdoubleSNumberSD�6PS
MinDampRangeZSdoubleSNumberSD�6PS
MaxDampRangeXSdoubleSNumberSD76PS
MaxDampRangeYSdoubleSNumberSD{6PS
MaxDampRangeZSdoubleSNumberSD�9PSMinDampStrengthXSdoubleSNumberSD	9PSMinDampStrengthYSdoubleSNumberSDP9PSMinDampStrengthZSdoubleSNumberSD�9PSMaxDampStrengthXSdoubleSNumberSD�9PSMaxDampStrengthYSdoubleSNumberSD% 9PSMaxDampStrengthZSdoubleSNumberSDj 7PSPreferedAngleXSdoubleSNumberSD� 7PSPreferedAngleYSdoubleSNumberSD� 7PSPreferedAngleZSdoubleSNumberSD*!(PSLookAtPropertySobjectSSb!*PSUpVectorPropertySobjectSS�!!PSShowSboolSSI�!8PSNegativePercentShapeSupportSboolSSI"8PSDefaultAttributeIndexSintSIntegerSI����N"#PSFreezeSboolSSI"#PSLODBoxSboolSSI�"NPSLcl TranslationSLcl TranslationSSADDD1#HPSLcl RotationSLcl RotationSSADDD�#FPSLcl ScalingSLcl ScalingSSAD�?D�?D�?�#2PS
+VisibilityS
+VisibilitySSAD�?$EPSVisibility InheritanceSVisibility InheritanceSSI�+
+ObjectTypeSMaterialz$CountI�+PropertyTemplateSFbxSurfacePhong�+Properties70%1PSShadingModelSKStringSSSPhong8%'PS
+MultiLayerSboolSSI�%BPS
EmissiveColorSColorSSADDD�%2PSEmissiveFactorSNumberSSAD�?&APSAmbientColorSColorSSAD�������?D�������?D�������?V&1PS
AmbientFactorSNumberSSAD�?�&APSDiffuseColorSColorSSAD�������?D�������?D�������?�&1PS
DiffuseFactorSNumberSSAD�?7'EPSTransparentColorSColorSSADDD{'6PSTransparencyFactorSNumberSSAD�'+PSOpacitySNumberSSAD�?(FPS	NormalMapSVector3DSVectorSDDDW(APSBumpSVector3DSVectorSDDD�(3PS
+BumpFactorSdoubleSNumberSD�?�(MPSDisplacementColorSColorRGBSColorSDDD<);PSDisplacementFactorSdoubleSNumberSD�?�)SPSVectorDisplacementColorSColorRGBSColorSDDD�)APSVectorDisplacementFactorSdoubleSNumberSD�?<*BPS
SpecularColorSColorSSAD�������?D�������?D�������?|*2PSSpecularFactorSNumberSSAD�?�*-PS	ShininessSNumberSSAD4@�*5PSShininessExponentSNumberSSAD4@L+DPSReflectionColorSColorSSADDD�+4PSReflectionFactorSNumberSSAD�?�BObjects�=(GeometryL_$�"SEarringGeometrySMesh9,Properties70Z,GeometryVersionI|�.KVerticesd�>xeTMH�Q}D�?9��b>$�v���y�S�hע'���
+!z��M��<0�`T"0��>q�*
+�ٴy�)���(�����.�̛s�sϽO)���RJ-�5��[T�=�Ex2|�6���[����z;�Kϖҳ�:��u����v&�>�Q>��_Wj[���.��&3�6�V��c��w����&�&��[�տ��4�U��u�M��V���J~�:s���;�t�an}�������ۨ�_�C��vt?��L7�~�~$w���+��Z�o�9Q)���gݳ0�~�v������
+}��'�������'�W�p�J~����W���u���k6���ү��7GzM~?t��C����\����W�^�.��g.sM�
+~��}'��r�͍��_9���K�wb���,9ϒ��z�<_���ߵbN��|�+��;��KU�|���M�}�H�C���o�O�E����u�o���Jߣʙ.���:	��ߘ/���y�W���]̳9�'�6��m/����uu��CW�C����.�W���J���&�q�]�'2��{%��{%��{Քo|�Ϻ�TO��x0�PolygonVertexIndexi��x�iKVa�ᷲԲ��YMm����EaHE$�DE$�Po�Ձ�����^�9��`0�#�}8������L�W�������X��I{������������}�5�������v֛�oi޲����p�������>X�?��z�K��ls�#�Oy�NƉx�>V�(6��zG�c��ls��Ã�<^�c6ަ�����Z�Y�T�K��m��rx����l��7�����x�v֛��4/�3��rx����R\����U���v�;�Ӽd������)�׵X���+U��Y�Y�r�H��m��rx����V܌�������$���+i^���_��xݏ{�8}�j�F<L;�ݎ�i^���_��x����AzK����?8�y�y�6w9<x�3��5ܧ���;��G��7����������p1�Edgesix�x
�;+����Q�3$��ɍR$���(e@"J(e@"J��R$��AQ�/�+�S'� �X��7�D�L6�T�L7�L��6�\�̷�B�,��R�,��J����ZC�Yo��6�l����n��v�m����9숣�9N9팳�9o؈Q\t�eW\u�u7�t�mw�u�}<��cO<��s/���ko���{|��g_|��w?���o���}X0$�7LayerElementNormalI�1VersionIe�1NameS�1MappingInformationTypeSByPolygonVertex*2ReferenceInformationTypeSDirect�7CNormalsd�6x��}L�U�oKʜ�#�n	aM�����i4�ލ�z$]Q:@q,1�h�5
+S�������t)���a�����y�6�ɌZ:ȱ�����m���{���s�����ߣ�
+fVw4*�l�ޖ�Ie\�(cm�ź_g�k���
v�����`Ou�����Cb�����o���q��c^-L�	���.�][xQl���%����c26�U`^�>;"�A��A�W?�_ƺ*����8"�Q�/d�tuU�'������Υ�ܳ}-2��~Z~�^\���6t=�_��cTt�P��U��u2fy`yӫk{�y{8D\���!��B���k�d_=#������G;#�\�7k�w��ͳ�9� ��OoO�u����;ſ�,�C~wm�?��N�U�z{Oe����>B����:q�{V��vlxTl�1�ٗ��t�������7~A��Z��1.�NX����� ����qd��8��<ԙz2u̜���mh��ڶ�6�.�x��{�{C��Sﴣ?��2ϗpg�}���/�?ؓ���#��q�#.;%q�;���qg���ϸ3]ʅ�=V����R��H���_��1���9"�6�{���:�
+\ݗ��;|�g�g��N�uz��ּ�'��>L7܊����W���?��;�H�e�S�D�qa�Y�8�Q����
_�+\�]��7��^Q�!�9�^"�R��g��\ڇb�}ݟ_q4u���楔�d��~�8iGGt�9��K��ld��s	�2��pd�2�w�K�P��N�p`��_q_��o�n;�Қ�"�5˞_�}�̟߉mGe}T�|Y�Gs��oЗ<(�����e�X�k<����t���O�/��8�x���;�e\�ydu�8�
O��G�����Wp?6��M��߼�m�oJ
�2�n�aܿ�u��`�{����r\���hi�{�̺oD���tM���/���Թ���qgY��Ɲ�R.���:!]ҽ��1*Nǹ1����O��̗�K~����˸�l��������#����p4��i��W�9
+��7��82]�f��ǽy���i�e�)GR����.;_�;��1�~
+�K,�u�w2�sЗ�,yU���7��
��p��'��z�Vn���ؠ�K�3����W���7L���3�Hu7m�q� �0�5���	G/��qg������q�M{|�
k��USo���G;N'w��S��M�˸�S��5�Zr������8ۇ�Uo���ot�~�e�0�0�q���XU��q'u��e�S�D�qa�Y�0���
+�n�j��pͯ�D�=��?��;�Ⱦ/1�L�}b�G/����˸P��N���#�3������,����~oduH�+��h]�����t�& ;LayerElementUVI�7VersionIe�7
+NameSUVMap8MappingInformationTypeSByPolygonVertexP8ReferenceInformationTypeS
IndexToDirect�9RUVdxEx]�1JCA����V���yQK[�3��
+b!����F��&�`a»�����I���|�3����+em?W�5ht7[tx�ǳ透���'�Oė����l/��s=�\_y�������2w�=������{V����a����|L^�O7�����]|8*�z^f�O��_y�x�7~f�z�������z����g?L���t�o����t8O�����a?/�x�Z<�b�����˹�}�6μOyyg�a�~(.�G~����_Ɏ�����/gBd��'��[����Lv}�Ǽ׵��q�C���ߧ�i>y?������
+����-Q^;NUVIndexi�Ax5��2@@�q
�$"�AH�~���/{U��ڥ�>��i�&��U��r��S���e���j�����Ǯ7��V��q~�����x.���q6;(۞{�a��Y|�ߚ/�����e����ɲ��i�`�Y�봘�{��q6;,&˞{���f���bޗ���q6[,&˞{���f��Y1W�{��8�M�ɲ��i�`�Y3�Ẏ���s��>ԴX��3��`�Y�u^��=k}�ͮ�ɲ��i�`N�5[ߊ�X޳���l��,{��f&�uY/��/�Y���즘,{��f&��W~̯�=���쨘,{��f&��ǎw|;v}����Vv����<LayerElementMaterialI_;VersionIeu;NameS�;MappingInformationTypeSAllSame�;ReferenceInformationTypeS
IndexToDirect<	Materialsi�=LayerI?<VersionId�<LayerElement�<TypeSLayerElementNormal�<
+TypedIndexI=LayerElement�<TypeSLayerElementUV=
+TypedIndexI{=LayerElementR=TypeSLayerElementMaterialn=
+TypedIndexIZ?%ModelL�,�SEarringModelSMesh�=VersionI��>Properties70T>HPSLcl RotationSLcl RotationSSAD�''�V�DD�>8PSDefaultAttributeIndexSintSIntegerSI�>(PSInheritTypeSenumSSI�>
+MultiLayerI?	MultiTakeI*?ShadingCM?CullingS
+CullingOff�B$MaterialL�SEarringMaterialS�?VersionIf�?
+ShadingModelSPhong�?
+MultiLayerI�BProperties70S@APSDiffuseColorSColorSSAD����?D����?D����?�@APSAmbientColorSColorSSAD@n�?D@n�?D@n�?�@1PS
AmbientFactorSNumberSSAD"A3PS
+BumpFactorSdoubleSNumberSDrABPS
SpecularColorSColorSSAD����?D����?D����?�A2PSSpecularFactorSNumberSSAD�?�A-PS	ShininessSNumberSSAD9@0B5PSShininessExponentSNumberSSAD9@�BDPSReflectionColorSColorSSAD����?D����?D����?�B4PSReflectionFactorSNumberSSAD�CConnections*CCSOOL�,�LQCCSOOL_$�"L�,�xCCSOOL�L�,��CTakes�CCurrentS���	���f�v���&~��Z�j���~���u�)
--- a/UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab
+++ b/UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &6671540367366977837
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: b80f1c54efdbcf240bbe2e9c8c71d926, type: 2}
+    - target: {fileID: 919132149155446097, guid: 3601568af8b2a674d9f4f0ab6cc084f4,
+        type: 3}
+      propertyPath: m_Name
+      value: Earring
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3601568af8b2a674d9f4f0ab6cc084f4, type: 3}
--- a/UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat.meta
+++ b/UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat.meta
+fileFormatVersion: 2
+guid: b80f1c54efdbcf240bbe2e9c8c71d926
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab.meta
+++ b/UOP1_Project/Assets/Art/Accessories/Earring/Earring.prefab.meta
+fileFormatVersion: 2
+guid: c7e73a40ebc409f4aa5c5ad818cca3ef
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat
+++ b/UOP1_Project/Assets/Art/Accessories/Earring/Earring.mat
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2393192685866386222
+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: 2
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Earring
+  m_Shader: {fileID: -6465566751694194690, guid: bf36778a400a0894b86a1f49c422fa62,
+    type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        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}
+    - _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}
+    - _MainTexture:
+        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}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _LightProbeContribution: 3.5
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _OutlineDepthSensitivity: 0.25
+    - _OutlineNormalsSensitivity: 0.8
+    - _OutlineThickness: 2
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 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}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _MainColor: {r: 0.990566, g: 0.78668445, b: 0.032707386, a: 1}
+    - _Offset: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _SpecularColor: {r: 0.99056596, g: 0.9274005, b: 0.7709594, a: 1}
+    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
--- a/UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx.meta
+++ b/UOP1_Project/Assets/Art/Accessories/Earring/Earring.fbx.meta
+fileFormatVersion: 2
+guid: 3601568af8b2a674d9f4f0ab6cc084f4
+ModelImporter:
+  serializedVersion: 19301
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 0
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 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
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 1
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 8
+    useFileScale: 1
+  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: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/UOP1_Project/Assets/Art/Accessories/Earring.meta
+++ b/UOP1_Project/Assets/Art/Accessories/Earring.meta
+fileFormatVersion: 2
+guid: f8624e600abe30e43af4a9d1af07486a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: