diff --git a/blueberryPeak/Assets/Materials/Materials.meta b/blueberryPeak/Assets/Materials/Do you need that Materials.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Char.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Char.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Char.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Char.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Char/Fox.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Char/Fox.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Char/Fox.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Char/Fox.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Char/Fox.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Char/Fox.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Char/Fox.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Char/Fox.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Char/MotherFox.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Char/MotherFox.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Char/MotherFox.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Char/MotherFox.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Char/MotherFox.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Char/MotherFox.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Char/MotherFox.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Char/MotherFox.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Demo.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Demo.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Demo.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Demo.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Demo/DemoBlue.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoBlue.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Demo/DemoBlue.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoBlue.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Demo/DemoBlue.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoBlue.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Demo/DemoBlue.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoBlue.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Demo/DemoGreen.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoGreen.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Demo/DemoGreen.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoGreen.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Demo/DemoGreen.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoGreen.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Demo/DemoGreen.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoGreen.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Demo/DemoRed.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoRed.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Demo/DemoRed.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoRed.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Demo/DemoRed.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoRed.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Demo/DemoRed.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Demo/DemoRed.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage.meta diff --git a/blueberryPeak/Assets/Materials/Foliage/Bush+/Berries.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Berries.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Foliage/Bush+/Berries.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Berries.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/Berries.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Berries.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/Berries.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Berries.mat.meta diff --git a/blueberryPeak/Assets/Materials/Foliage/Bush+/Bush.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Bush.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Foliage/Bush+/Bush.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Bush.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/Bush.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Bush.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/Bush.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Bush.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/Pinetree.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Pinetree.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/Pinetree.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Pinetree.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/Pinetree.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Pinetree.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/Pinetree.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/Pinetree.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/TreeDark.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeDark.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/TreeDark.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeDark.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/TreeDark.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeDark.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/TreeDark.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeDark.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/TreeLight.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeLight.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/TreeLight.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeLight.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/TreeLight.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeLight.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/TreeLight.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeLight.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/TreeMedium.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeMedium.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/TreeMedium.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeMedium.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/TreeMedium.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeMedium.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/TreeMedium.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Foliage/TreeMedium.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Forest.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Forest.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Forest.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Forest.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Forest/SplitLog.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Forest/SplitLog.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Forest/SplitLog.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Forest/SplitLog.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Forest/SplitLog.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Forest/SplitLog.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Forest/SplitLog.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Forest/SplitLog.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Market.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Market.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Market.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Market.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Market/MarketStandBlue.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandBlue.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Market/MarketStandBlue.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandBlue.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Market/MarketStandBlue.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandBlue.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Market/MarketStandBlue.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandBlue.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Market/MarketStandRed.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandRed.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Market/MarketStandRed.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandRed.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Market/MarketStandRed.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandRed.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Market/MarketStandRed.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandRed.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Market/MarketStandYellow.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandYellow.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Market/MarketStandYellow.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandYellow.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Market/MarketStandYellow.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandYellow.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Market/MarketStandYellow.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Market/MarketStandYellow.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Mom_Fox Base Color 1.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Mom_Fox Base Color 1.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Mom_Fox Base Color 1.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Mom_Fox Base Color 1.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Mom_Fox Base Color 1.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Mom_Fox Base Color 1.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Mom_Fox Base Color 1.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Mom_Fox Base Color 1.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Grass.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Grass.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Grass.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Grass.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Grass.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Grass.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Grass.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Grass.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/GrassWithRock.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/GrassWithRock.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/GrassWithRock.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/GrassWithRock.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/GrassWithRock.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/GrassWithRock.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/GrassWithRock.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/GrassWithRock.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Ocean.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Ocean.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Ocean.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Ocean.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Ocean.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Ocean.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Ocean.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Ocean.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Path.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Path.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Path.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Path.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Path.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Path.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Path.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Path.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Rock.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Rock.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Rock.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Rock.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Rock.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Rock.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Rock.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Rock.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Sand.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Sand.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Sand.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Sand.mat diff --git a/blueberryPeak/Assets/Materials/Materials/Terrain/Sand.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Sand.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Terrain/Sand.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/Terrain/Sand.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/flower.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/flower.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/flower.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/flower.mat diff --git a/blueberryPeak/Assets/Materials/Materials/flower.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/flower.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/flower.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/flower.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/redFlower.mat b/blueberryPeak/Assets/Materials/Do you need that Materials/redFlower.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/redFlower.mat rename to blueberryPeak/Assets/Materials/Do you need that Materials/redFlower.mat diff --git a/blueberryPeak/Assets/Materials/Materials/redFlower.mat.meta b/blueberryPeak/Assets/Materials/Do you need that Materials/redFlower.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/redFlower.mat.meta rename to blueberryPeak/Assets/Materials/Do you need that Materials/redFlower.mat.meta diff --git a/blueberryPeak/Assets/Materials/Foliage/Bush+.meta b/blueberryPeak/Assets/Materials/Foliage/Bush.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Foliage/Bush+.meta rename to blueberryPeak/Assets/Materials/Foliage/Bush.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/Berries.mat b/blueberryPeak/Assets/Materials/Foliage/Bush/Berries.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/Berries.mat rename to blueberryPeak/Assets/Materials/Foliage/Bush/Berries.mat diff --git a/blueberryPeak/Assets/Materials/Foliage/Bush+/Berries.mat.meta b/blueberryPeak/Assets/Materials/Foliage/Bush/Berries.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Foliage/Bush+/Berries.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/Bush/Berries.mat.meta diff --git a/blueberryPeak/Assets/Materials/Materials/Foliage/Bush.mat b/blueberryPeak/Assets/Materials/Foliage/Bush/Bush.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Materials/Foliage/Bush.mat rename to blueberryPeak/Assets/Materials/Foliage/Bush/Bush.mat diff --git a/blueberryPeak/Assets/Materials/Foliage/Bush+/Bush.mat.meta b/blueberryPeak/Assets/Materials/Foliage/Bush/Bush.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Foliage/Bush+/Bush.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/Bush/Bush.mat.meta diff --git a/blueberryPeak/Assets/Materials/Material.mat b/blueberryPeak/Assets/Materials/Material.mat index 174b9df..0777b9f 100644 --- a/blueberryPeak/Assets/Materials/Material.mat +++ b/blueberryPeak/Assets/Materials/Material.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 0f6bb51ff58819342b8c1013d95101e7, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/blueberryPeak/Assets/Materials/Material.mat.meta b/blueberryPeak/Assets/Materials/Material.mat.meta index 0865856..d845c74 100644 --- a/blueberryPeak/Assets/Materials/Material.mat.meta +++ b/blueberryPeak/Assets/Materials/Material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1b9693fccb53d8841b745724a5c60381 +guid: c01d0a2e4869548c49a3974961e8c1cf NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab b/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab index 9fd2e68..dc273a1 100644 --- a/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab @@ -84,6 +84,10 @@ PrefabInstance: propertyPath: m_Name value: Market_Stand_Blue objectReference: {fileID: 0} + - target: {fileID: 7144434438207769088, guid: 032582a4bd6ccc44694208c06f48c202, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: d47829b852ec54e498421daec71b2374, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab b/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab index 91e776e..c751c50 100644 --- a/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab @@ -42,15 +42,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 6cfb430acef73a54481052a25c1df79b, type: 3} propertyPath: m_LocalPosition.x - value: 15.96 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 6cfb430acef73a54481052a25c1df79b, type: 3} propertyPath: m_LocalPosition.y - value: 2.83 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 6cfb430acef73a54481052a25c1df79b, type: 3} propertyPath: m_LocalPosition.z - value: 1.23 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 6cfb430acef73a54481052a25c1df79b, type: 3} propertyPath: m_LocalRotation.w @@ -84,6 +84,10 @@ PrefabInstance: propertyPath: m_Name value: Market_Stand_Red objectReference: {fileID: 0} + - target: {fileID: 7144434438207769088, guid: 6cfb430acef73a54481052a25c1df79b, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 2fd33b7c1538c4212b69de82c088de35, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab b/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab index b3812ae..ba31425 100644 --- a/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab @@ -42,15 +42,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 8e7306895b605c84cbc78c01dda2696f, type: 3} propertyPath: m_LocalPosition.x - value: 4.86 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8e7306895b605c84cbc78c01dda2696f, type: 3} propertyPath: m_LocalPosition.y - value: -1.25 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8e7306895b605c84cbc78c01dda2696f, type: 3} propertyPath: m_LocalPosition.z - value: 9.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8e7306895b605c84cbc78c01dda2696f, type: 3} propertyPath: m_LocalRotation.w @@ -84,6 +84,10 @@ PrefabInstance: propertyPath: m_Name value: Market_Stand_Yellow objectReference: {fileID: 0} + - target: {fileID: 7144434438207769088, guid: 8e7306895b605c84cbc78c01dda2696f, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 9d2300de4d8a8477f9203dcc9c8e58e2, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/blueberryPeak/Assets/Scenes/Garden.unity b/blueberryPeak/Assets/Scenes/Garden.unity new file mode 100644 index 0000000..4d1a4e6 --- /dev/null +++ b/blueberryPeak/Assets/Scenes/Garden.unity @@ -0,0 +1,398 @@ +%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: 10 + 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.212, g: 0.227, b: 0.259, 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: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + 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_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 1 + m_PVRFilteringGaussRadiusAO: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + 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 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &21705129 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 21705131} + - component: {fileID: 21705130} + - component: {fileID: 21705132} + 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 &21705130 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21705129} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + 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: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!4 &21705131 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21705129} + serializedVersion: 2 + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!114 &21705132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 21705129} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 0 +--- !u!1 &318415815 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 318415818} + - component: {fileID: 318415817} + - component: {fileID: 318415816} + 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 &318415816 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318415815} + m_Enabled: 1 +--- !u!20 &318415817 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318415815} + 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_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + 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 &318415818 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 318415815} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1097348979 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1097348981} + - component: {fileID: 1097348980} + m_Layer: 0 + m_Name: WwiseGlobal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1097348980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1097348979} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c9d5ddca75153324c9685094dbef0fc9, type: 3} + m_Name: + m_EditorClassIdentifier: + InitializationSettings: {fileID: 11400000, guid: 69d39931291d213498bf7bbd3d60e88f, type: 2} + basePath: + language: + defaultPoolSize: 0 + lowerPoolSize: 0 + streamingPoolSize: 0 + memoryCutoffThreshold: 0 + monitorPoolSize: 0 + monitorQueuePoolSize: 0 + callbackManagerBufferSize: 0 + spatialAudioPoolSize: 0 + maxSoundPropagationDepth: 0 + engineLogging: 0 +--- !u!4 &1097348981 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1097348979} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 318415818} + - {fileID: 21705131} + - {fileID: 1097348981} diff --git a/blueberryPeak/Assets/Scenes/Garden.unity.meta b/blueberryPeak/Assets/Scenes/Garden.unity.meta new file mode 100644 index 0000000..cc7c000 --- /dev/null +++ b/blueberryPeak/Assets/Scenes/Garden.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 790d6e51f17ff45ce8b91983b0868201 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Scenes/Market.unity b/blueberryPeak/Assets/Scenes/Market.unity index d5a10cc..f821e9e 100644 --- a/blueberryPeak/Assets/Scenes/Market.unity +++ b/blueberryPeak/Assets/Scenes/Market.unity @@ -4843,30 +4843,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8153514856433456890, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} - propertyPath: m_LocalScale.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8153514856433456890, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} - propertyPath: m_LocalScale.y - value: 0.375 - objectReference: {fileID: 0} - - target: {fileID: 8153514856433456890, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} - propertyPath: m_LocalScale.z - value: 0.75 - objectReference: {fileID: 0} - - target: {fileID: 8153514856433456890, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} - propertyPath: m_LocalPosition.x - value: 0.68 - objectReference: {fileID: 0} - - target: {fileID: 8153514856433456890, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} - propertyPath: m_LocalPosition.z - value: 0.57 - objectReference: {fileID: 0} - - target: {fileID: 8153514856433456890, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4882,7 +4858,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.x - value: -4.25 + value: -13.5 objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.y @@ -4890,7 +4866,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalPosition.z - value: -9.84 + value: -5.73 objectReference: {fileID: 0} - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} propertyPath: m_LocalRotation.w @@ -4924,10 +4900,6 @@ PrefabInstance: propertyPath: m_Name value: MarketStandYellow objectReference: {fileID: 0} - - target: {fileID: 6246043601393472740, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} - propertyPath: 'm_Materials.Array.data[0]' - value: - objectReference: {fileID: 2100000, guid: 19be2d900b1b04175bd85934310048d1, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/blueberryPeak/Assets/Textures/FoxHouse.meta b/blueberryPeak/Assets/Textures/FoxHouse.meta index fcc9e0a..6cbd00c 100644 --- a/blueberryPeak/Assets/Textures/FoxHouse.meta +++ b/blueberryPeak/Assets/Textures/FoxHouse.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9c619a0d720def44bb7a46fb7eb62848 +guid: aebf9fd619aa44b83b62451a445f07fd folderAsset: yes DefaultImporter: externalObjects: {}