From 2e6a93d0a625ff373eba4311da274302c802544a Mon Sep 17 00:00:00 2001 From: MarcoHampel Date: Fri, 2 Feb 2024 19:40:21 -0500 Subject: [PATCH] New changes to files --- .gitattributes | 58 ++++++++++++++++++- .../EnemyExperimentation1.unity | 18 +++--- 2 files changed, 66 insertions(+), 10 deletions(-) diff --git a/.gitattributes b/.gitattributes index 8f5af78..c74b5f7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,56 @@ -Assets/Models/*.fbx filter=lfs diff=lfs merge=lfs -text - filter=lfs diff=lfs merge=lfs -text -Assets/Models/Astronaut_with_skeleton_updated_no_feet.fbx filter=lfs diff=lfs merge=lfs -text +## Unity ## + +*.cs diff=csharp text +*.cginc text +*.shader text + +*.mat merge=unityyamlmerge eol=lf +*.anim merge=unityyamlmerge eol=lf +*.unity merge=unityyamlmerge eol=lf +*.prefab merge=unityyamlmerge eol=lf +*.physicsMaterial2D merge=unityyamlmerge eol=lf +*.physicMaterial merge=unityyamlmerge eol=lf +*.asset merge=unityyamlmerge eol=lf +*.meta merge=unityyamlmerge eol=lf +*.controller merge=unityyamlmerge eol=lf + + +## git-lfs ## + +#Image +*.jpg filter=lfs diff=lfs merge=lfs -text +*.jpeg filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.gif filter=lfs diff=lfs merge=lfs -text +*.psd filter=lfs diff=lfs merge=lfs -text +*.ai filter=lfs diff=lfs merge=lfs -text +*.tif filter=lfs diff=lfs merge=lfs -text + +#Audio +*.mp3 filter=lfs diff=lfs merge=lfs -text +*.wav filter=lfs diff=lfs merge=lfs -text +*.ogg filter=lfs diff=lfs merge=lfs -text + +#Video +*.mp4 filter=lfs diff=lfs merge=lfs -text +*.mov filter=lfs diff=lfs merge=lfs -text + +#3D Object +*.FBX filter=lfs diff=lfs merge=lfs -text *.fbx filter=lfs diff=lfs merge=lfs -text +*.blend filter=lfs diff=lfs merge=lfs -text +*.obj filter=lfs diff=lfs merge=lfs -text + +#ETC +*.a filter=lfs diff=lfs merge=lfs -text +*.exr filter=lfs diff=lfs merge=lfs -text +*.tga filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.dll filter=lfs diff=lfs merge=lfs -text +*.unitypackage filter=lfs diff=lfs merge=lfs -text +*.aif filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.rns filter=lfs diff=lfs merge=lfs -text +*.reason filter=lfs diff=lfs merge=lfs -text +*.lxo filter=lfs diff=lfs merge=lfs -text \ No newline at end of file diff --git a/Assets/Scenes/Experimentation/EnemyExperimentation1.unity b/Assets/Scenes/Experimentation/EnemyExperimentation1.unity index 8ee6e81..1bdd0cd 100644 --- a/Assets/Scenes/Experimentation/EnemyExperimentation1.unity +++ b/Assets/Scenes/Experimentation/EnemyExperimentation1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 2140.1504, g: 1460.8994, b: 1184.2715, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -267,7 +267,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3} propertyPath: m_RootOrder - value: 16 + value: 17 objectReference: {fileID: 0} - target: {fileID: 718690339124133420, guid: c154daaf377c39b4d89906ec77082bee, type: 3} propertyPath: m_LocalPosition.x @@ -2386,7 +2386,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 6fa6726c37e5430458b3f7702871a8da, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 6fa6726c37e5430458b3f7702871a8da, type: 3} propertyPath: m_LocalScale.x @@ -2471,7 +2471,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1841410271473095026, guid: 89324426fa3e07540966ca8ecc69279e, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 1841410271473095026, guid: 89324426fa3e07540966ca8ecc69279e, type: 3} propertyPath: m_LocalPosition.x @@ -2790,6 +2790,10 @@ PrefabInstance: propertyPath: m_Name value: SpeedySpiderMonster objectReference: {fileID: 0} + - target: {fileID: 8417361359673230750, guid: e8c95314bdadb644b87be50d00a64f8c, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c7673a4f936351d4da381a8cbebd6571, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e8c95314bdadb644b87be50d00a64f8c, type: 3} --- !u!1001 &1974411537 @@ -2801,7 +2805,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: dac256f768a92694eaabad36235f22a5, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: dac256f768a92694eaabad36235f22a5, type: 3} propertyPath: m_LocalScale.x @@ -4002,7 +4006,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2646791548311929742, guid: 921205ad18755e043ab119bf41a01a60, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 2646791548311929742, guid: 921205ad18755e043ab119bf41a01a60, type: 3} propertyPath: m_LocalPosition.x @@ -6115,7 +6119,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7982337625154020194, guid: db61f30670495034d8ce2e8c7448cec9, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 7982337625154020194, guid: db61f30670495034d8ce2e8c7448cec9, type: 3} propertyPath: m_LocalPosition.x