diff --git a/blender/Models/Market_Stand_Yellow Base Color.png b/blender/Models/Market_Stand_Yellow Base Color.png new file mode 100644 index 0000000..034d742 --- /dev/null +++ b/blender/Models/Market_Stand_Yellow Base Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:580dbc659f428ab2f5a7f7537b2230299605cbb382a2c816dfb12e6d8af10d3b +size 34649 diff --git a/blender/Models/Market_Stand_Yellow.blend b/blender/Models/Market_Stand_Yellow.blend new file mode 100644 index 0000000..745b99f --- /dev/null +++ b/blender/Models/Market_Stand_Yellow.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cfc01d044752582385057bf0733c232c94c8ddc67a008e74d211a9eb99e9970 +size 990622 diff --git a/blender/Models/Market_Stand_Yellow.fbx b/blender/Models/Market_Stand_Yellow.fbx new file mode 100644 index 0000000..b0ad340 --- /dev/null +++ b/blender/Models/Market_Stand_Yellow.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3aa171abfc21d8ddb1ca7777736c9e00eec789f89a07c4d2832dc1fc7a55634b +size 223708 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials.meta b/blueberryPeak/Assets/Materials/Char.meta similarity index 77% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Materials.meta rename to blueberryPeak/Assets/Materials/Char.meta index e0ce7db..c2b6514 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials.meta +++ b/blueberryPeak/Assets/Materials/Char.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 39a0a640d0a52eb41bf4b571b981dd1c +guid: 1f2712e541acf44baac24ef18cbcb8fd folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/blueberryPeak/Assets/Materials/Fox.mat b/blueberryPeak/Assets/Materials/Char/Fox.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Fox.mat rename to blueberryPeak/Assets/Materials/Char/Fox.mat diff --git a/blueberryPeak/Assets/Materials/Fox.mat.meta b/blueberryPeak/Assets/Materials/Char/Fox.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Fox.mat.meta rename to blueberryPeak/Assets/Materials/Char/Fox.mat.meta diff --git a/blueberryPeak/Assets/Materials/New Material.mat b/blueberryPeak/Assets/Materials/Char/MotherFox.mat similarity index 99% rename from blueberryPeak/Assets/Materials/New Material.mat rename to blueberryPeak/Assets/Materials/Char/MotherFox.mat index 0700e04..208b952 100644 --- a/blueberryPeak/Assets/Materials/New Material.mat +++ b/blueberryPeak/Assets/Materials/Char/MotherFox.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: New Material + m_Name: MotherFox m_Shader: {fileID: -6465566751694194690, guid: 6ec9b3c213ee8974e943a7e5bfb49b7b, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 diff --git a/blueberryPeak/Assets/Materials/New Material.mat.meta b/blueberryPeak/Assets/Materials/Char/MotherFox.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/New Material.mat.meta rename to blueberryPeak/Assets/Materials/Char/MotherFox.mat.meta diff --git a/blueberryPeak/Assets/Materials/Env/Trees.meta b/blueberryPeak/Assets/Materials/Foliage.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees.meta rename to blueberryPeak/Assets/Materials/Foliage.meta diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New2.mat b/blueberryPeak/Assets/Materials/Foliage/Berries.mat similarity index 92% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New2.mat rename to blueberryPeak/Assets/Materials/Foliage/Berries.mat index f1d0d49..dd9fc38 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New2.mat +++ b/blueberryPeak/Assets/Materials/Foliage/Berries.mat @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2009612029983336909 +--- !u!114 &-852961805318461917 MonoBehaviour: m_ObjectHideFlags: 11 m_CorrespondingSourceObject: {fileID: 0} @@ -20,7 +20,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Bush Base Color_New2 + m_Name: Berries m_Shader: {fileID: -6465566751694194690, guid: 6ec9b3c213ee8974e943a7e5bfb49b7b, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -38,7 +38,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 840ca9bc1a2d7f547a03688b2b853b84, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -62,7 +62,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 840ca9bc1a2d7f547a03688b2b853b84, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -82,7 +82,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Texture: - m_Texture: {fileID: 2800000, guid: 840ca9bc1a2d7f547a03688b2b853b84, type: 3} + m_Texture: {fileID: 2800000, guid: fef64f1bf3ab44146b667d75ceac1f14, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -124,6 +124,7 @@ Material: - _Parallax: 0.005 - _QueueControl: 0 - _QueueOffset: 0 + - _RECEIVE_SHADOWS_OFF: 0 - _ReceiveShadows: 1 - _Shades: 0.49 - _Smoothness: 0.5 diff --git a/blueberryPeak/Assets/Materials/ToonShader.mat.meta b/blueberryPeak/Assets/Materials/Foliage/Berries.mat.meta similarity index 79% rename from blueberryPeak/Assets/Materials/ToonShader.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/Berries.mat.meta index e28220c..15708d5 100644 --- a/blueberryPeak/Assets/Materials/ToonShader.mat.meta +++ b/blueberryPeak/Assets/Materials/Foliage/Berries.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c40ac749869e04351a232d538465484d +guid: e3725f56f17df41a28fc805f1ead394d NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New3.mat b/blueberryPeak/Assets/Materials/Foliage/Bush.mat similarity index 87% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New3.mat rename to blueberryPeak/Assets/Materials/Foliage/Bush.mat index 00ca3f7..6e41792 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New3.mat +++ b/blueberryPeak/Assets/Materials/Foliage/Bush.mat @@ -7,8 +7,8 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Bush Base Color_New3 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Name: Bush + m_Shader: {fileID: -6465566751694194690, guid: 6ec9b3c213ee8974e943a7e5bfb49b7b, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] @@ -17,8 +17,7 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS m_LockedProperties: @@ -26,7 +25,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 2800000, guid: 840ca9bc1a2d7f547a03688b2b853b84, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: @@ -50,7 +49,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 840ca9bc1a2d7f547a03688b2b853b84, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -69,6 +68,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _Texture: + m_Texture: {fileID: 2800000, guid: 8a30a566805820348954c27a68ba748b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -101,11 +104,16 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 + - _Max: 1 - _Metallic: 0 + - _Min: 0.3 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 + - _RECEIVE_SHADOWS_OFF: 0 - _ReceiveShadows: 1 + - _Shades: 0.49 - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 @@ -121,7 +129,7 @@ Material: - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 ---- !u!114 &3752152396776932834 +--- !u!114 &4781340768794525862 MonoBehaviour: m_ObjectHideFlags: 11 m_CorrespondingSourceObject: {fileID: 0} diff --git a/blueberryPeak/Assets/Materials/Material.002.mat.meta b/blueberryPeak/Assets/Materials/Foliage/Bush.mat.meta similarity index 79% rename from blueberryPeak/Assets/Materials/Material.002.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/Bush.mat.meta index c2779f4..27022cd 100644 --- a/blueberryPeak/Assets/Materials/Material.002.mat.meta +++ b/blueberryPeak/Assets/Materials/Foliage/Bush.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b6187e2bbe805f49a24550ecab2983f +guid: 9265d7720eb8d4845824ffd188cd76ca NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/blueberryPeak/Assets/Materials/Env/Trees/Pinetree.mat b/blueberryPeak/Assets/Materials/Foliage/Pinetree.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/Pinetree.mat rename to blueberryPeak/Assets/Materials/Foliage/Pinetree.mat diff --git a/blueberryPeak/Assets/Materials/Env/Trees/Pinetree.mat.meta b/blueberryPeak/Assets/Materials/Foliage/Pinetree.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/Pinetree.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/Pinetree.mat.meta diff --git a/blueberryPeak/Assets/Materials/Env/Trees/TreeDark.mat b/blueberryPeak/Assets/Materials/Foliage/TreeDark.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/TreeDark.mat rename to blueberryPeak/Assets/Materials/Foliage/TreeDark.mat diff --git a/blueberryPeak/Assets/Materials/Env/Trees/TreeDark.mat.meta b/blueberryPeak/Assets/Materials/Foliage/TreeDark.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/TreeDark.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/TreeDark.mat.meta diff --git a/blueberryPeak/Assets/Materials/Env/Trees/TreeLight.mat b/blueberryPeak/Assets/Materials/Foliage/TreeLight.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/TreeLight.mat rename to blueberryPeak/Assets/Materials/Foliage/TreeLight.mat diff --git a/blueberryPeak/Assets/Materials/Env/Trees/TreeLight.mat.meta b/blueberryPeak/Assets/Materials/Foliage/TreeLight.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/TreeLight.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/TreeLight.mat.meta diff --git a/blueberryPeak/Assets/Materials/Env/Trees/TreeMedium.mat b/blueberryPeak/Assets/Materials/Foliage/TreeMedium.mat similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/TreeMedium.mat rename to blueberryPeak/Assets/Materials/Foliage/TreeMedium.mat diff --git a/blueberryPeak/Assets/Materials/Env/Trees/TreeMedium.mat.meta b/blueberryPeak/Assets/Materials/Foliage/TreeMedium.mat.meta similarity index 100% rename from blueberryPeak/Assets/Materials/Env/Trees/TreeMedium.mat.meta rename to blueberryPeak/Assets/Materials/Foliage/TreeMedium.mat.meta diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush.meta b/blueberryPeak/Assets/Materials/Market.meta similarity index 77% rename from blueberryPeak/Assets/Textures/Bluberry_Bush.meta rename to blueberryPeak/Assets/Materials/Market.meta index 80a21aa..a90e6a0 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush.meta +++ b/blueberryPeak/Assets/Materials/Market.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fb034a0f7c4608100b253da2186f878c +guid: a7e137c1f4e5840f7bbae5f47fee4a2c folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/blueberryPeak/Assets/Materials/Market/MarketStandBlue.mat b/blueberryPeak/Assets/Materials/Market/MarketStandBlue.mat new file mode 100644 index 0000000..ee3704a --- /dev/null +++ b/blueberryPeak/Assets/Materials/Market/MarketStandBlue.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MarketStandBlue + m_Shader: {fileID: -6465566751694194690, guid: 6ec9b3c213ee8974e943a7e5bfb49b7b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + 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} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + 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} + - _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} + - _ParallaxMap: + 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} + - _Texture: + m_Texture: {fileID: 2800000, guid: d8deacd8fa9374f888f955dfcea8ce93, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Max: 1 + - _Metallic: 0 + - _Min: 0.3 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _RECEIVE_SHADOWS_OFF: 0 + - _ReceiveShadows: 1 + - _Shades: 0.49 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 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} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2803183385485453452 +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: 9 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New2.mat.meta b/blueberryPeak/Assets/Materials/Market/MarketStandBlue.mat.meta similarity index 79% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New2.mat.meta rename to blueberryPeak/Assets/Materials/Market/MarketStandBlue.mat.meta index ad54cdc..ba16109 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New2.mat.meta +++ b/blueberryPeak/Assets/Materials/Market/MarketStandBlue.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3bad85bf34f52ad49850486618489928 +guid: dd4a01abb30564bcf8307f01304e299a NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/blueberryPeak/Assets/Materials/ToonShader.mat b/blueberryPeak/Assets/Materials/Market/MarketStandRed.mat similarity index 96% rename from blueberryPeak/Assets/Materials/ToonShader.mat rename to blueberryPeak/Assets/Materials/Market/MarketStandRed.mat index e0c3ada..93b3967 100644 --- a/blueberryPeak/Assets/Materials/ToonShader.mat +++ b/blueberryPeak/Assets/Materials/Market/MarketStandRed.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ToonShader + m_Name: MarketStandRed m_Shader: {fileID: -6465566751694194690, guid: 6ec9b3c213ee8974e943a7e5bfb49b7b, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 @@ -69,7 +69,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _Texture: - m_Texture: {fileID: 2800000, guid: 93233fa16dcce419085b3f36e3cc46a6, type: 3} + m_Texture: {fileID: 2800000, guid: 50e34e449daae417b83374d26468300a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - unity_Lightmaps: @@ -111,6 +111,7 @@ Material: - _Parallax: 0.005 - _QueueControl: 0 - _QueueOffset: 0 + - _RECEIVE_SHADOWS_OFF: 0 - _ReceiveShadows: 1 - _Shades: 0.49 - _Smoothness: 0.5 diff --git a/blueberryPeak/Assets/Materials/Material.003.mat.meta b/blueberryPeak/Assets/Materials/Market/MarketStandRed.mat.meta similarity index 79% rename from blueberryPeak/Assets/Materials/Material.003.mat.meta rename to blueberryPeak/Assets/Materials/Market/MarketStandRed.mat.meta index b18f59d..4420f7e 100644 --- a/blueberryPeak/Assets/Materials/Material.003.mat.meta +++ b/blueberryPeak/Assets/Materials/Market/MarketStandRed.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a8c7f15b14f40df478fbf02532a40a79 +guid: e9af28bb0bcc6408196e2fb02717d2ca NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/blueberryPeak/Assets/Materials/Market/MarketStandYellow.mat b/blueberryPeak/Assets/Materials/Market/MarketStandYellow.mat new file mode 100644 index 0000000..109b662 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Market/MarketStandYellow.mat @@ -0,0 +1,144 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MarketStandYellow + m_Shader: {fileID: -6465566751694194690, guid: 6ec9b3c213ee8974e943a7e5bfb49b7b, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + 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} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + 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} + - _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} + - _ParallaxMap: + 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} + - _Texture: + m_Texture: {fileID: 2800000, guid: a20605290a2ae44739496414fda865d9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Max: 1 + - _Metallic: 0 + - _Min: 0.3 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _RECEIVE_SHADOWS_OFF: 0 + - _ReceiveShadows: 1 + - _Shades: 0.49 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 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} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &2803183385485453452 +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: 9 diff --git a/blueberryPeak/Assets/Materials/Market/MarketStandYellow.mat.meta b/blueberryPeak/Assets/Materials/Market/MarketStandYellow.mat.meta new file mode 100644 index 0000000..c44f59c --- /dev/null +++ b/blueberryPeak/Assets/Materials/Market/MarketStandYellow.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19be2d900b1b04175bd85934310048d1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Materials/Material.002.mat b/blueberryPeak/Assets/Materials/Material.002.mat deleted file mode 100644 index a55b626..0000000 --- a/blueberryPeak/Assets/Materials/Material.002.mat +++ /dev/null @@ -1,138 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-318673653038007055 -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: 9 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Material.002 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - 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} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - 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} - - _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} - - _ParallaxMap: - 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} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _UVSec: 0 - - _WorkflowMode: 1 - - _ZWrite: 1 - m_Colors: - - _BaseColor: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _Color: {r: 0.9063317, g: 0.9063317, b: 0.9063317, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/blueberryPeak/Assets/Materials/Material.003.mat b/blueberryPeak/Assets/Materials/Material.003.mat deleted file mode 100644 index 0da583d..0000000 --- a/blueberryPeak/Assets/Materials/Material.003.mat +++ /dev/null @@ -1,138 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &-9144359278050869504 -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: 9 ---- !u!21 &2100000 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Material.003 - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 2800000, guid: 4ea2ffdff6485518994c5b9f07778b79, type: 3} - 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} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - 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: 2800000, guid: 4ea2ffdff6485518994c5b9f07778b79, type: 3} - 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} - - _ParallaxMap: - 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} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _AddPrecomputedVelocity: 0 - - _AlphaClip: 0 - - _AlphaToMask: 0 - - _Blend: 0 - - _BlendModePreserveSpecular: 1 - - _BumpScale: 1 - - _ClearCoatMask: 0 - - _ClearCoatSmoothness: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailAlbedoMapScale: 1 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 - - _EnvironmentReflections: 1 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _QueueOffset: 0 - - _ReceiveShadows: 1 - - _Smoothness: 0.5 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _SrcBlendAlpha: 1 - - _Surface: 0 - - _UVSec: 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: 0} - - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - m_BuildTextureStacks: [] - m_AllowLocking: 1 diff --git a/blueberryPeak/Assets/Models/Bush_No_Blueberries.fbx.meta b/blueberryPeak/Assets/Models/Bush_No_Blueberries.fbx.meta index d4e915c..31c9b57 100644 --- a/blueberryPeak/Assets/Models/Bush_No_Blueberries.fbx.meta +++ b/blueberryPeak/Assets/Models/Bush_No_Blueberries.fbx.meta @@ -8,7 +8,7 @@ ModelImporter: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: Bush Base Color_New2 - second: {fileID: 2800000, guid: 3b0a5755dc0f8484e8c0b0620aebbc7a, type: 3} + second: {fileID: 2800000, guid: cd09e2927eaae49b2b19c3f4e812c54d, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/blueberryPeak/Assets/Models/Market_Stand.fbx b/blueberryPeak/Assets/Models/Market_Stand.fbx new file mode 100644 index 0000000..7c50565 --- /dev/null +++ b/blueberryPeak/Assets/Models/Market_Stand.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb15bf9c25b3adb04177d49db50e9fa8aabec13a179c666ab65a88efb3b4b057 +size 223452 diff --git a/blueberryPeak/Assets/Models/Market_Stand.fbx.meta b/blueberryPeak/Assets/Models/Market_Stand.fbx.meta new file mode 100644 index 0000000..c738cea --- /dev/null +++ b/blueberryPeak/Assets/Models/Market_Stand.fbx.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: f6e58059e4fde40fc8cf1c2c3b418cea +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: Market_Stand Base Color + second: {fileID: 2800000, guid: 50e34e449daae417b83374d26468300a, type: 3} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + 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: 1 + 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 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Models/Market_Stand_Blue.fbx b/blueberryPeak/Assets/Models/Market_Stand_Blue.fbx new file mode 100644 index 0000000..6c492ee --- /dev/null +++ b/blueberryPeak/Assets/Models/Market_Stand_Blue.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a3510da46b00e933e89dc792c8f4e10e521f33c22c5cc4f77ef9083176be72e +size 229804 diff --git a/blueberryPeak/Assets/Models/Market_Stand_Blue.fbx.meta b/blueberryPeak/Assets/Models/Market_Stand_Blue.fbx.meta new file mode 100644 index 0000000..f14da15 --- /dev/null +++ b/blueberryPeak/Assets/Models/Market_Stand_Blue.fbx.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: aa3885ad4ed644f51beff39374dd9a02 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: Market_Stand_Blue_New Base Color + second: {fileID: 2800000, guid: 8ac214133e21c4b8f835913f4fabf5d0, type: 3} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + 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: 1 + 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 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Models/Market_Stand_Yellow.fbx b/blueberryPeak/Assets/Models/Market_Stand_Yellow.fbx new file mode 100644 index 0000000..b0ad340 --- /dev/null +++ b/blueberryPeak/Assets/Models/Market_Stand_Yellow.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3aa171abfc21d8ddb1ca7777736c9e00eec789f89a07c4d2832dc1fc7a55634b +size 223708 diff --git a/blueberryPeak/Assets/Models/Market_Stand_Yellow.fbx.meta b/blueberryPeak/Assets/Models/Market_Stand_Yellow.fbx.meta new file mode 100644 index 0000000..3a7a051 --- /dev/null +++ b/blueberryPeak/Assets/Models/Market_Stand_Yellow.fbx.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 46527e22a8c2845229b21c2741201584 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: Market_Stand_Yellow Base Color + second: {fileID: 2800000, guid: a20605290a2ae44739496414fda865d9, type: 3} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + 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: 1 + 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 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_No_Blueberries.prefab b/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_No_Blueberries.prefab index 11bcb75..fbcb08d 100644 --- a/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_No_Blueberries.prefab +++ b/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_No_Blueberries.prefab @@ -51,7 +51,7 @@ PrefabInstance: - target: {fileID: -7511558181221131132, guid: 8cefd73b11e429b40ab8e61600eaf74d, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 1175dafa17677164d92540795a205815, type: 2} + objectReference: {fileID: 2100000, guid: 9265d7720eb8d4845824ffd188cd76ca, type: 2} - target: {fileID: 919132149155446097, guid: 8cefd73b11e429b40ab8e61600eaf74d, type: 3} propertyPath: m_Name value: Bush_No_Blueberries diff --git a/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_With_Blueberriess.prefab b/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_With_Blueberriess.prefab index 1292b06..5333ed2 100644 --- a/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_With_Blueberriess.prefab +++ b/blueberryPeak/Assets/Prefabs/Env/BlueberryBushes/Bush_With_Blueberriess.prefab @@ -10,15 +10,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} propertyPath: m_LocalPosition.x - value: 1.3060246 + value: -4.57 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} propertyPath: m_LocalPosition.y - value: -8.877999 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} propertyPath: m_LocalPosition.z - value: 8.592692 + value: -1.2799997 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} propertyPath: m_LocalRotation.w @@ -48,14 +48,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8107455364528491257, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e3725f56f17df41a28fc805f1ead394d, type: 2} + - target: {fileID: -3335556693246621393, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e3725f56f17df41a28fc805f1ead394d, type: 2} + - target: {fileID: -2734212762107803641, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e3725f56f17df41a28fc805f1ead394d, type: 2} - target: {fileID: 919132149155446097, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} propertyPath: m_Name value: Bush_With_Blueberriess objectReference: {fileID: 0} + - target: {fileID: 1300030549721962991, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e3725f56f17df41a28fc805f1ead394d, type: 2} + - target: {fileID: 4639304693913943131, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e3725f56f17df41a28fc805f1ead394d, type: 2} - target: {fileID: 5453915583638957547, guid: d17453879435f2149b8e7c5efef8fb4e, type: 3} propertyPath: 'm_Materials.Array.data[0]' value: - objectReference: {fileID: 2100000, guid: 3bad85bf34f52ad49850486618489928, type: 2} + objectReference: {fileID: 2100000, guid: 9265d7720eb8d4845824ffd188cd76ca, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/blueberryPeak/Assets/Prefabs/Market.meta b/blueberryPeak/Assets/Prefabs/Market.meta new file mode 100644 index 0000000..7039bad --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Market.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 960f8cd0e1c414a27a3148922da88932 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab b/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab new file mode 100644 index 0000000..516a83f --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2798492699886383226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6388507312777474817} + m_Layer: 0 + m_Name: MarketStandBlue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6388507312777474817 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2798492699886383226} + 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: + - {fileID: 8120873627341393092} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8591068140458797871 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6388507312777474817} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalScale.x + value: 0.49999997 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalScale.y + value: 0.375 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalScale.z + value: 0.74999994 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6390365 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalRotation.y + value: 0.7691764 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 100.56 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: dd4a01abb30564bcf8307f01304e299a, type: 2} + - target: {fileID: 919132149155446097, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + propertyPath: m_Name + value: Market_Stand_Blue + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} +--- !u!4 &8120873627341393092 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: aa3885ad4ed644f51beff39374dd9a02, type: 3} + m_PrefabInstance: {fileID: 8591068140458797871} + m_PrefabAsset: {fileID: 0} diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab.meta b/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab.meta new file mode 100644 index 0000000..db8d5d0 --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandBlue.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f5fc95b83cdc04ce5ab872b987734457 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab b/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab new file mode 100644 index 0000000..a762398 --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &120085904763539730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3360928438094827899} + m_Layer: 0 + m_Name: MarketStandRed + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3360928438094827899 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 120085904763539730} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -9.45, y: 1.25, z: -7.83} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8153514856433456890} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &8551671507597357329 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3360928438094827899} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalRotation.w + value: 0.3756584 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalRotation.y + value: 0.9267582 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 135.87 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: e9af28bb0bcc6408196e2fb02717d2ca, type: 2} + - target: {fileID: 919132149155446097, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + propertyPath: m_Name + value: Model + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} +--- !u!4 &8153514856433456890 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f6e58059e4fde40fc8cf1c2c3b418cea, type: 3} + m_PrefabInstance: {fileID: 8551671507597357329} + m_PrefabAsset: {fileID: 0} diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab.meta b/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab.meta new file mode 100644 index 0000000..f8d8341 --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandRed.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 769601db8b7db4407baa2ac6e9035898 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab b/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab new file mode 100644 index 0000000..775cba1 --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab @@ -0,0 +1,112 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5470033698652855659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4452929253159274350} + m_Layer: 0 + m_Name: MarketStandYellow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4452929253159274350 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5470033698652855659} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -4.86, y: 1.25, z: -9.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5108572145008979851} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4715253630671407200 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4452929253159274350} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalScale.y + value: 0.375 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalScale.z + value: 0.74999994 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 46527e22a8c2845229b21c2741201584, type: 3} + propertyPath: m_Name + value: Model + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 46527e22a8c2845229b21c2741201584, type: 3} +--- !u!4 &5108572145008979851 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 46527e22a8c2845229b21c2741201584, type: 3} + m_PrefabInstance: {fileID: 4715253630671407200} + m_PrefabAsset: {fileID: 0} diff --git a/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab.meta b/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab.meta new file mode 100644 index 0000000..301281d --- /dev/null +++ b/blueberryPeak/Assets/Prefabs/Market/MarketStandYellow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ab6fe263a82114a37a9e14b7a958dd39 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Scenes/Market.unity b/blueberryPeak/Assets/Scenes/Market.unity index 0f73ab5..5b90363 100644 --- a/blueberryPeak/Assets/Scenes/Market.unity +++ b/blueberryPeak/Assets/Scenes/Market.unity @@ -125,7 +125,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -187,7 +187,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -249,7 +249,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -305,6 +305,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 269692911} m_PrefabAsset: {fileID: 0} +--- !u!4 &298430448 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1238150515} + m_PrefabAsset: {fileID: 0} --- !u!1 &339437996 GameObject: m_ObjectHideFlags: 0 @@ -426,13 +431,70 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!1001 &385903562 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -23.92 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -1.2200003 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &387076977 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -488,13 +550,70 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 387076977} m_PrefabAsset: {fileID: 0} +--- !u!1001 &426013450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (13) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -22.57 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -4.1099997 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &543865638 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -550,6 +669,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 543865638} m_PrefabAsset: {fileID: 0} +--- !u!1001 &557878052 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (3) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -1.6099997 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &587148751 PrefabInstance: m_ObjectHideFlags: 0 @@ -630,7 +806,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -692,7 +868,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -748,13 +924,18 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 607695578} m_PrefabAsset: {fileID: 0} +--- !u!4 &632719321 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1854002703} + m_PrefabAsset: {fileID: 0} --- !u!1001 &640950110 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -816,7 +997,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 119775285696500936, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_Name @@ -832,7 +1013,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalScale.z - value: 0.22760013 + value: 0.22760014 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalPosition.x @@ -884,6 +1065,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} m_PrefabInstance: {fileID: 644262109} m_PrefabAsset: {fileID: 0} +--- !u!4 &648157820 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 385903562} + m_PrefabAsset: {fileID: 0} --- !u!1 &658155166 GameObject: m_ObjectHideFlags: 0 @@ -947,7 +1133,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -1009,7 +1195,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -1065,13 +1251,23 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 679198291} m_PrefabAsset: {fileID: 0} +--- !u!4 &685338617 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 2134369987} + m_PrefabAsset: {fileID: 0} +--- !u!4 &692772974 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1173434708} + m_PrefabAsset: {fileID: 0} --- !u!1001 &704862451 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -1133,7 +1329,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -1189,17 +1385,74 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 710338005} m_PrefabAsset: {fileID: 0} +--- !u!1 &737437260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 737437261} + m_Layer: 0 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &737437261 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 737437260} + 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: + - {fileID: 120334023} + - {fileID: 44069945} + - {fileID: 1668265198} + - {fileID: 1358425462} + - {fileID: 387076978} + - {fileID: 607695579} + - {fileID: 1407981807} + - {fileID: 1842695913} + - {fileID: 1283452097} + - {fileID: 968475483} + - {fileID: 945868017} + - {fileID: 1573882008} + - {fileID: 543865639} + - {fileID: 2120212727} + - {fileID: 1730174300} + - {fileID: 1851946836} + - {fileID: 1318199077} + - {fileID: 1213867935} + - {fileID: 2016292009} + - {fileID: 1079771525} + - {fileID: 640950111} + - {fileID: 704862452} + - {fileID: 959459145} + - {fileID: 883573913} + - {fileID: 913787269} + - {fileID: 644262110} + m_Father: {fileID: 1997102453} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &747480637 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x - value: 3.69 + value: 3.6899996 objectReference: {fileID: 0} - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.y @@ -1251,13 +1504,18 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 747480637} m_PrefabAsset: {fileID: 0} +--- !u!4 &795294156 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 893033526} + m_PrefabAsset: {fileID: 0} --- !u!1001 &837716097 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -1319,7 +1577,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 119775285696500936, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_Name @@ -1387,13 +1645,137 @@ Transform: m_CorrespondingSourceObject: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} m_PrefabInstance: {fileID: 883573912} m_PrefabAsset: {fileID: 0} +--- !u!4 &889767565 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1319963764} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &893033526 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (2) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -17.81 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: 0.32000065 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} +--- !u!4 &901493387 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1988476082} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &910443847 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (6) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -3.79 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: 1.7399998 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &913787268 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 119775285696500936, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_Name @@ -1405,11 +1787,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalScale.y - value: 0.1991506 + value: 0.19915059 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalScale.z - value: 0.19915012 + value: 0.19915013 objectReference: {fileID: 0} - target: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} propertyPath: m_LocalPosition.x @@ -1467,7 +1849,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -1523,13 +1905,18 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 945868016} m_PrefabAsset: {fileID: 0} +--- !u!4 &954077719 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1662607343} + m_PrefabAsset: {fileID: 0} --- !u!1001 &959459144 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -1585,13 +1972,18 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 959459144} m_PrefabAsset: {fileID: 0} +--- !u!4 &961518467 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1179821666} + m_PrefabAsset: {fileID: 0} --- !u!1001 &968475482 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -1653,7 +2045,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -1709,13 +2101,28 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 984013216} m_PrefabAsset: {fileID: 0} +--- !u!4 &994437609 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 426013450} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1026759694 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 2056916129} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1071596299 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 910443847} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1079771524 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -1845,13 +2252,127 @@ Transform: m_CorrespondingSourceObject: {fileID: 784284187896041074, guid: d06aa92da2e0e41bcbe945a2507081a6, type: 3} m_PrefabInstance: {fileID: 1113811735} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1173434708 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (10) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -9.07 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -0.26000023 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} +--- !u!1001 &1179821666 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (4) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -17.62 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5100002 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &1213867934 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -1907,13 +2428,75 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1213867934} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1238150515 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (12) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -25.91 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -6.04 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} +--- !u!4 &1271999374 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 1404861283} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1275227193 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -1975,7 +2558,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2037,7 +2620,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -2093,13 +2676,70 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 1318199076} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1319963764 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (14) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -4.57 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -1.2799997 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &1358425461 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -2155,13 +2795,70 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 1358425461} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1404861283 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (8) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -12.09 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: 2.3200006 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &1407981806 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2223,7 +2920,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2285,7 +2982,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2341,13 +3038,18 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1596612586} m_PrefabAsset: {fileID: 0} +--- !u!4 &1629294860 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 557878052} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1634734485 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -2355,7 +3057,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_LocalPosition.x - value: 4.61 + value: 4.6099997 objectReference: {fileID: 0} - target: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_LocalPosition.y @@ -2403,13 +3105,75 @@ Transform: m_CorrespondingSourceObject: {fileID: 9177461735404041097, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} m_PrefabInstance: {fileID: 1634734485} m_PrefabAsset: {fileID: 0} +--- !u!4 &1660756549 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + m_PrefabInstance: {fileID: 2062790876} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1662607343 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (11) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -1.0299997 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -2.83 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &1668265197 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -2471,7 +3235,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2533,7 +3297,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -2669,7 +3433,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2731,7 +3495,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2793,7 +3557,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -2849,6 +3613,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1851946835} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1854002703 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (1) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -22.25 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: 0.07000065 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &1901831602 PrefabInstance: m_ObjectHideFlags: 0 @@ -2920,7 +3741,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8365212550460025139, guid: 041a7753de2ca406f89305ec64b81a9d, type: 3} propertyPath: m_Name @@ -2982,7 +3803,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 8525954521814844473, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} propertyPath: m_Name @@ -3038,13 +3859,60 @@ Transform: m_CorrespondingSourceObject: {fileID: 9014401998805048963, guid: 8c75047ed6d9f49b59c8bd4d1b5ddee3, type: 3} m_PrefabInstance: {fileID: 1909325124} m_PrefabAsset: {fileID: 0} +--- !u!1 &1955319717 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1955319718} + m_Layer: 0 + m_Name: Blueberries + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1955319718 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1955319717} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12.09, y: 0.49999988, z: 9.95} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 648157820} + - {fileID: 632719321} + - {fileID: 795294156} + - {fileID: 1629294860} + - {fileID: 961518467} + - {fileID: 901493387} + - {fileID: 1071596299} + - {fileID: 1660756549} + - {fileID: 1271999374} + - {fileID: 685338617} + - {fileID: 692772974} + - {fileID: 954077719} + - {fileID: 298430448} + - {fileID: 994437609} + - {fileID: 889767565} + - {fileID: 1026759694} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1978613828 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -3165,6 +4033,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5fb9400a010bc46b99b6c550e52506a3, type: 3} +--- !u!1001 &1988476082 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (5) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -25.59 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: 2.0600004 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1 &1997102452 GameObject: m_ObjectHideFlags: 0 @@ -3194,51 +4119,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 120334023} - - {fileID: 44069945} - - {fileID: 1668265198} - - {fileID: 1358425462} - - {fileID: 387076978} - - {fileID: 607695579} - - {fileID: 1407981807} - - {fileID: 1842695913} - - {fileID: 1283452097} - - {fileID: 968475483} - - {fileID: 945868017} - - {fileID: 1905158338} - - {fileID: 269692912} - - {fileID: 984013217} - - {fileID: 606021563} - - {fileID: 1634734486} - - {fileID: 1573882008} - - {fileID: 1823004390} - - {fileID: 1909325125} - - {fileID: 837716098} - - {fileID: 1596612587} - - {fileID: 710338006} - - {fileID: 1717879033} - - {fileID: 543865639} - - {fileID: 2120212727} - - {fileID: 1730174300} - - {fileID: 1851946836} - - {fileID: 1318199077} - - {fileID: 1213867935} - - {fileID: 2016292009} - - {fileID: 664352377} - - {fileID: 679198292} - - {fileID: 2009556791} - - {fileID: 747480638} - - {fileID: 1978613829} - - {fileID: 1275227194} - - {fileID: 1079771525} - - {fileID: 640950111} - - {fileID: 704862452} - - {fileID: 959459145} - - {fileID: 883573913} + - {fileID: 737437261} + - {fileID: 2016859939} - {fileID: 587148752} - {fileID: 1113811736} - - {fileID: 913787269} - - {fileID: 644262110} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2009556790 @@ -3247,11 +4131,11 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 2016859939} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x - value: 0.66 + value: 0.65999985 objectReference: {fileID: 0} - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.y @@ -3263,19 +4147,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalRotation.w - value: 0.75900733 + value: 0.7590074 objectReference: {fileID: 0} - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalRotation.x - value: -0.051584527 + value: -0.05158453 objectReference: {fileID: 0} - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalRotation.y - value: -0.6488216 + value: -0.64882165 objectReference: {fileID: 0} - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalRotation.z - value: 0.016655795 + value: 0.016655797 objectReference: {fileID: 0} - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3309,7 +4193,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -3365,6 +4249,168 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 2016292008} m_PrefabAsset: {fileID: 0} +--- !u!1 &2016859938 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2016859939} + m_Layer: 0 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2016859939 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016859938} + 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: + - {fileID: 1905158338} + - {fileID: 269692912} + - {fileID: 984013217} + - {fileID: 606021563} + - {fileID: 1634734486} + - {fileID: 1823004390} + - {fileID: 1909325125} + - {fileID: 837716098} + - {fileID: 1596612587} + - {fileID: 710338006} + - {fileID: 1717879033} + - {fileID: 664352377} + - {fileID: 679198292} + - {fileID: 2009556791} + - {fileID: 747480638} + - {fileID: 1978613829} + - {fileID: 1275227194} + m_Father: {fileID: 1997102453} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &2056916129 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (15) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} +--- !u!1001 &2062790876 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (7) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -3.21 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -19.220001 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} --- !u!1001 &2071877021 PrefabInstance: m_ObjectHideFlags: 0 @@ -3375,15 +4421,15 @@ PrefabInstance: m_Modifications: - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.x - value: 7.44 + value: 14.89 objectReference: {fileID: 0} - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.y - value: 2.37 + value: 1.608 objectReference: {fileID: 0} - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalPosition.z - value: 5.27 + value: -5.49 objectReference: {fileID: 0} - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: m_LocalRotation.w @@ -3415,7 +4461,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: cameraOffset.x - value: 10 + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} + propertyPath: cameraOffset.y + value: 20 objectReference: {fileID: 0} - target: {fileID: 3740866600301396226, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3} propertyPath: cameraOffset.z @@ -3440,7 +4490,7 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 1997102453} + m_TransformParent: {fileID: 737437261} m_Modifications: - target: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} propertyPath: m_LocalPosition.x @@ -3496,6 +4546,205 @@ Transform: m_CorrespondingSourceObject: {fileID: 188868778669148300, guid: ec25ba3ffc67f419a855d3ecbb1d1e06, type: 3} m_PrefabInstance: {fileID: 2120212726} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2134369987 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1955319718} + m_Modifications: + - target: {fileID: 2630037540465012823, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_Name + value: Bush_With_Blueberriess (9) + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.x + value: -13.95 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalPosition.z + value: -0.6399994 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3401367369672272621, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8ad6cc069840cbb4fab063174a981f78, type: 3} +--- !u!1001 &1781515877030545122 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 120085904763539730, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_Name + value: MarketStandRed + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalPosition.x + value: -10.9 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalPosition.y + value: 0.873 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalPosition.z + value: -8.74 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3360928438094827899, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} + 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: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 769601db8b7db4407baa2ac6e9035898, type: 3} +--- !u!1001 &5365273697810426995 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalPosition.x + value: -4.25 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalPosition.y + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalPosition.z + value: -9.84 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7404528 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalRotation.y + value: 0.6721083 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 84.46 + objectReference: {fileID: 0} + - target: {fileID: 4452929253159274350, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5470033698652855659, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} + 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: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ab6fe263a82114a37a9e14b7a958dd39, type: 3} --- !u!1001 &6256147545252888024 PrefabInstance: m_ObjectHideFlags: 0 @@ -3506,7 +4755,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_LocalPosition.x - value: 12.93 + value: 55.5 objectReference: {fileID: 0} - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_LocalPosition.y @@ -3518,11 +4767,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_LocalRotation.y @@ -3534,7 +4783,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 2666620144834527649, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -3544,15 +4793,100 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 4965917414565539174, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + propertyPath: near clip plane + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8080420989084569541, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} propertyPath: m_Name value: Camera objectReference: {fileID: 0} + - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8538518650932330681, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 606b0b0fab65b431d8563c3d78c7a99c, type: 3} +--- !u!1001 &7216438787318960321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2798492699886383226, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_Name + value: MarketStandBlue + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalPosition.x + value: -7.56 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalPosition.y + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalPosition.z + value: -9.76 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6388507312777474817, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f5fc95b83cdc04ce5ab872b987734457, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -3565,3 +4899,7 @@ SceneRoots: - {fileID: 1980360249} - {fileID: 1759510291} - {fileID: 1997102453} + - {fileID: 1781515877030545122} + - {fileID: 7216438787318960321} + - {fileID: 5365273697810426995} + - {fileID: 1955319718} diff --git a/blueberryPeak/Assets/Shaders/Toon/ToonShader.shadergraph b/blueberryPeak/Assets/Shaders/Toon/ToonShader.shadergraph index a257020..60ee445 100644 --- a/blueberryPeak/Assets/Shaders/Toon/ToonShader.shadergraph +++ b/blueberryPeak/Assets/Shaders/Toon/ToonShader.shadergraph @@ -538,7 +538,7 @@ "scalar product" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -618,7 +618,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -698,7 +698,7 @@ "sun" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -731,7 +731,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -767,7 +767,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -803,7 +803,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1077,7 +1077,7 @@ "float2" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1259,7 +1259,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1325,7 +1325,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1628,7 +1628,7 @@ "down" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1761,7 +1761,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1803,7 +1803,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -1860,7 +1860,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -2159,7 +2159,7 @@ "divided by" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -2381,7 +2381,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -2425,7 +2425,7 @@ "float2" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -2492,7 +2492,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -2610,7 +2610,7 @@ "x" ], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { @@ -2664,7 +2664,7 @@ ], "synonyms": [], "m_Precision": 0, - "m_PreviewExpanded": true, + "m_PreviewExpanded": false, "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png deleted file mode 100644 index b3d2c8f..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 -size 23938 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png deleted file mode 100644 index b3d2c8f..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 -size 23938 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png deleted file mode 100644 index b3d2c8f..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 -size 23938 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 4.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 4.png deleted file mode 100644 index b3d2c8f..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 -size 23938 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 4.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 4.png.meta deleted file mode 100644 index cd9f61c..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 4.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 65ee353b8aac5b74294199a4362faad1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 5.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 5.png deleted file mode 100644 index b3d2c8f..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 -size 23938 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 5.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 5.png.meta deleted file mode 100644 index d990f6f..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 5.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 3fcd235e71660f84aafc427892a638b5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png.meta deleted file mode 100644 index 9efb702..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 4ea2ffdff6485518994c5b9f07778b79 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png deleted file mode 100644 index 89fd4fe..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:776010fc37dc3e3f924b71588e1f901eefe0cdbe7165e84114f01c575a578961 -size 60682 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png.meta deleted file mode 100644 index 73c5049..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 8850c2469ef431a78a2dd6b7359f534e -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New2.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New2.png.meta deleted file mode 100644 index 2865aa1..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New2.png.meta +++ /dev/null @@ -1,117 +0,0 @@ -fileFormatVersion: 2 -guid: 840ca9bc1a2d7f547a03688b2b853b84 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 0 - wrapV: 0 - wrapW: 0 - nPOTScale: 1 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 0 - spriteTessellationDetail: -1 - textureType: 0 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 4 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 4 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - customData: - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spriteCustomMetadata: - entries: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New3.mat.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New3.mat.meta deleted file mode 100644 index bfe2638..0000000 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Materials/Bush Base Color_New3.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1175dafa17677164d92540795a205815 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Blueberry Base Color.png b/blueberryPeak/Assets/Textures/Blueberry Base Color.png deleted file mode 100644 index b3d2c8f..0000000 --- a/blueberryPeak/Assets/Textures/Blueberry Base Color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 -size 23938 diff --git a/blueberryPeak/Assets/Textures/Bush Base Color_New2.png b/blueberryPeak/Assets/Textures/Bush Base Color_New2.png deleted file mode 100644 index 0f49e45..0000000 --- a/blueberryPeak/Assets/Textures/Bush Base Color_New2.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aad4d626809a0c72c19e0a61879320e787cc8df44f0c7c74fb920e734e2c6bf6 -size 63080 diff --git a/blueberryPeak/Assets/Textures/Char.meta b/blueberryPeak/Assets/Textures/Char.meta new file mode 100644 index 0000000..85d04bf --- /dev/null +++ b/blueberryPeak/Assets/Textures/Char.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6190c051dbd39488dba37d286a1de8bc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Fox Base Color.png b/blueberryPeak/Assets/Textures/Char/Fox Base Color.png similarity index 100% rename from blueberryPeak/Assets/Textures/Fox Base Color.png rename to blueberryPeak/Assets/Textures/Char/Fox Base Color.png diff --git a/blueberryPeak/Assets/Textures/Fox Base Color.png.meta b/blueberryPeak/Assets/Textures/Char/Fox Base Color.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Fox Base Color.png.meta rename to blueberryPeak/Assets/Textures/Char/Fox Base Color.png.meta diff --git a/blueberryPeak/Assets/Textures/Mom_Fox Base Color.png b/blueberryPeak/Assets/Textures/Char/Mom_Fox Base Color.png similarity index 100% rename from blueberryPeak/Assets/Textures/Mom_Fox Base Color.png rename to blueberryPeak/Assets/Textures/Char/Mom_Fox Base Color.png diff --git a/blueberryPeak/Assets/Textures/Mom_Fox Base Color.png.meta b/blueberryPeak/Assets/Textures/Char/Mom_Fox Base Color.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Mom_Fox Base Color.png.meta rename to blueberryPeak/Assets/Textures/Char/Mom_Fox Base Color.png.meta diff --git a/blueberryPeak/Assets/Materials/Env.meta b/blueberryPeak/Assets/Textures/Env.meta similarity index 77% rename from blueberryPeak/Assets/Materials/Env.meta rename to blueberryPeak/Assets/Textures/Env.meta index f27e145..d117852 100644 --- a/blueberryPeak/Assets/Materials/Env.meta +++ b/blueberryPeak/Assets/Textures/Env.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fd660084e0dea45ba8841402e6fbafb2 +guid: 6e7465573018b4829b06c981859a983a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/blueberryPeak/Assets/Textures/Grass.png b/blueberryPeak/Assets/Textures/Env/Grass.png similarity index 100% rename from blueberryPeak/Assets/Textures/Grass.png rename to blueberryPeak/Assets/Textures/Env/Grass.png diff --git a/blueberryPeak/Assets/Textures/Grass.png.meta b/blueberryPeak/Assets/Textures/Env/Grass.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Grass.png.meta rename to blueberryPeak/Assets/Textures/Env/Grass.png.meta diff --git a/blueberryPeak/Assets/Textures/path.png b/blueberryPeak/Assets/Textures/Env/path.png similarity index 100% rename from blueberryPeak/Assets/Textures/path.png rename to blueberryPeak/Assets/Textures/Env/path.png diff --git a/blueberryPeak/Assets/Textures/path.png.meta b/blueberryPeak/Assets/Textures/Env/path.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/path.png.meta rename to blueberryPeak/Assets/Textures/Env/path.png.meta diff --git a/blueberryPeak/Assets/Textures/rock.png b/blueberryPeak/Assets/Textures/Env/rock.png similarity index 100% rename from blueberryPeak/Assets/Textures/rock.png rename to blueberryPeak/Assets/Textures/Env/rock.png diff --git a/blueberryPeak/Assets/Textures/rock.png.meta b/blueberryPeak/Assets/Textures/Env/rock.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/rock.png.meta rename to blueberryPeak/Assets/Textures/Env/rock.png.meta diff --git a/blueberryPeak/Assets/Textures/sand.png b/blueberryPeak/Assets/Textures/Env/sand.png similarity index 100% rename from blueberryPeak/Assets/Textures/sand.png rename to blueberryPeak/Assets/Textures/Env/sand.png diff --git a/blueberryPeak/Assets/Textures/sand.png.meta b/blueberryPeak/Assets/Textures/Env/sand.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/sand.png.meta rename to blueberryPeak/Assets/Textures/Env/sand.png.meta diff --git a/blueberryPeak/Assets/Textures/Foliage.meta b/blueberryPeak/Assets/Textures/Foliage.meta new file mode 100644 index 0000000..e495c4a --- /dev/null +++ b/blueberryPeak/Assets/Textures/Foliage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8180afb26f7b24fd78c17e846a5ff618 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png b/blueberryPeak/Assets/Textures/Foliage/Blueberry Base Color.png similarity index 100% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png rename to blueberryPeak/Assets/Textures/Foliage/Blueberry Base Color.png diff --git a/blueberryPeak/Assets/Textures/Blueberry Base Color.png.meta b/blueberryPeak/Assets/Textures/Foliage/Blueberry Base Color.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Blueberry Base Color.png.meta rename to blueberryPeak/Assets/Textures/Foliage/Blueberry Base Color.png.meta diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New2.png b/blueberryPeak/Assets/Textures/Foliage/Bush Base Color_New2.png similarity index 100% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New2.png rename to blueberryPeak/Assets/Textures/Foliage/Bush Base Color_New2.png diff --git a/blueberryPeak/Assets/Textures/Bush Base Color_New2.png.meta b/blueberryPeak/Assets/Textures/Foliage/Bush Base Color_New2.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Bush Base Color_New2.png.meta rename to blueberryPeak/Assets/Textures/Foliage/Bush Base Color_New2.png.meta diff --git a/blueberryPeak/Assets/Textures/Pine_Tree Base Color.png b/blueberryPeak/Assets/Textures/Foliage/Pine_Tree Base Color.png similarity index 100% rename from blueberryPeak/Assets/Textures/Pine_Tree Base Color.png rename to blueberryPeak/Assets/Textures/Foliage/Pine_Tree Base Color.png diff --git a/blueberryPeak/Assets/Textures/Pine_Tree Base Color.png.meta b/blueberryPeak/Assets/Textures/Foliage/Pine_Tree Base Color.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Pine_Tree Base Color.png.meta rename to blueberryPeak/Assets/Textures/Foliage/Pine_Tree Base Color.png.meta diff --git a/blueberryPeak/Assets/Textures/Tree_Dark Base Color.png b/blueberryPeak/Assets/Textures/Foliage/Tree_Dark Base Color.png similarity index 100% rename from blueberryPeak/Assets/Textures/Tree_Dark Base Color.png rename to blueberryPeak/Assets/Textures/Foliage/Tree_Dark Base Color.png diff --git a/blueberryPeak/Assets/Textures/Tree_Dark Base Color.png.meta b/blueberryPeak/Assets/Textures/Foliage/Tree_Dark Base Color.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Tree_Dark Base Color.png.meta rename to blueberryPeak/Assets/Textures/Foliage/Tree_Dark Base Color.png.meta diff --git a/blueberryPeak/Assets/Textures/Tree_Light Base Color.png b/blueberryPeak/Assets/Textures/Foliage/Tree_Light Base Color.png similarity index 100% rename from blueberryPeak/Assets/Textures/Tree_Light Base Color.png rename to blueberryPeak/Assets/Textures/Foliage/Tree_Light Base Color.png diff --git a/blueberryPeak/Assets/Textures/Tree_Light Base Color.png.meta b/blueberryPeak/Assets/Textures/Foliage/Tree_Light Base Color.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Tree_Light Base Color.png.meta rename to blueberryPeak/Assets/Textures/Foliage/Tree_Light Base Color.png.meta diff --git a/blueberryPeak/Assets/Textures/Tree_Mid Dark Base Color.png b/blueberryPeak/Assets/Textures/Foliage/Tree_Mid Dark Base Color.png similarity index 100% rename from blueberryPeak/Assets/Textures/Tree_Mid Dark Base Color.png rename to blueberryPeak/Assets/Textures/Foliage/Tree_Mid Dark Base Color.png diff --git a/blueberryPeak/Assets/Textures/Tree_Mid Dark Base Color.png.meta b/blueberryPeak/Assets/Textures/Foliage/Tree_Mid Dark Base Color.png.meta similarity index 100% rename from blueberryPeak/Assets/Textures/Tree_Mid Dark Base Color.png.meta rename to blueberryPeak/Assets/Textures/Foliage/Tree_Mid Dark Base Color.png.meta diff --git a/blueberryPeak/Assets/Textures/MarketStand.meta b/blueberryPeak/Assets/Textures/MarketStand.meta new file mode 100644 index 0000000..34b20d4 --- /dev/null +++ b/blueberryPeak/Assets/Textures/MarketStand.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dfe662c05dbcb4202b86869a97ffa5fb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/MarketStand/Market_Stand Base Color.png b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand Base Color.png new file mode 100644 index 0000000..b039c76 --- /dev/null +++ b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand Base Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a834d91293b203d546734f984de09033857b53f800ee22c7493e4f427eeab13 +size 34391 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png.meta b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand Base Color.png.meta similarity index 77% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png.meta rename to blueberryPeak/Assets/Textures/MarketStand/Market_Stand Base Color.png.meta index 6188f0c..305fed1 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png.meta +++ b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand Base Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e9a630c75b93b8438ad3faf435af8c4 +guid: 50e34e449daae417b83374d26468300a TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,6 +93,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Blue Base Color.png b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Blue Base Color.png new file mode 100644 index 0000000..7f2201a --- /dev/null +++ b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Blue Base Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:014042e4c91aef98ede783a68e60a7ab20bbe531ac67a5467c487df38308737e +size 40640 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png.meta b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Blue Base Color.png.meta similarity index 77% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png.meta rename to blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Blue Base Color.png.meta index 0627f8d..690d154 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png.meta +++ b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Blue Base Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6a8dc6f738f7dd5fead9095857b4c9d7 +guid: d8deacd8fa9374f888f955dfcea8ce93 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,6 +93,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Yellow Base Color.png b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Yellow Base Color.png new file mode 100644 index 0000000..034d742 --- /dev/null +++ b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Yellow Base Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:580dbc659f428ab2f5a7f7537b2230299605cbb382a2c816dfb12e6d8af10d3b +size 34649 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png.meta b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Yellow Base Color.png.meta similarity index 77% rename from blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png.meta rename to blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Yellow Base Color.png.meta index 899c41c..9503823 100644 --- a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png.meta +++ b/blueberryPeak/Assets/Textures/MarketStand/Market_Stand_Yellow Base Color.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7619e1bac4a1928bbfd23efa4835ab5 +guid: a20605290a2ae44739496414fda865d9 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -93,6 +93,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: []