From 5513738969c471297e759582cfc9b9f23cda1d7d Mon Sep 17 00:00:00 2001 From: Sofiia-Khrystyna Date: Thu, 12 Jun 2025 10:44:57 +0200 Subject: [PATCH 1/7] new bush --- blender/Models/Bush_With_Blueberries.blend | 3 --- blender/Models/Bush_With_Blueberries.fbx | 3 --- blender/Models/Bush_With_Blueberries_New.blend | 3 +++ blender/Models/Bush_With_Blueberries_New.fbx | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 blender/Models/Bush_With_Blueberries.blend delete mode 100644 blender/Models/Bush_With_Blueberries.fbx create mode 100644 blender/Models/Bush_With_Blueberries_New.blend create mode 100644 blender/Models/Bush_With_Blueberries_New.fbx diff --git a/blender/Models/Bush_With_Blueberries.blend b/blender/Models/Bush_With_Blueberries.blend deleted file mode 100644 index 3ba3398..0000000 --- a/blender/Models/Bush_With_Blueberries.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfefc190d0968a77d183f5906c16fff2219b34abaeabd79fd93e2f366779bb44 -size 705990 diff --git a/blender/Models/Bush_With_Blueberries.fbx b/blender/Models/Bush_With_Blueberries.fbx deleted file mode 100644 index 8190efe..0000000 --- a/blender/Models/Bush_With_Blueberries.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e278c54b31f827bffa655bc09e1d329ea9431580a670301c08bded3dd95bfdac -size 227036 diff --git a/blender/Models/Bush_With_Blueberries_New.blend b/blender/Models/Bush_With_Blueberries_New.blend new file mode 100644 index 0000000..cf5368e --- /dev/null +++ b/blender/Models/Bush_With_Blueberries_New.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3807fd0f7dd2b577cee8e8d700f0535ca6c942dc49f542d494b91092274d0d79 +size 706822 diff --git a/blender/Models/Bush_With_Blueberries_New.fbx b/blender/Models/Bush_With_Blueberries_New.fbx new file mode 100644 index 0000000..f16e9db --- /dev/null +++ b/blender/Models/Bush_With_Blueberries_New.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:347a3356842d7f80c84a59dd4526a24c276edfd0182a53f4910bf7c2e95b9547 +size 227084 From f056fe12e0a4295e0a410f2c37a16380286ca66b Mon Sep 17 00:00:00 2001 From: Sofiia-Khrystyna Date: Thu, 12 Jun 2025 11:53:54 +0200 Subject: [PATCH 2/7] new blueberry bush --- blender/Models/Bush Base Color_New.png | 3 +++ blender/Models/Bush_With_Blueberries.blend | 3 +++ blender/Models/Bush_With_Blueberries_NewTex.fbx | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 blender/Models/Bush Base Color_New.png create mode 100644 blender/Models/Bush_With_Blueberries.blend create mode 100644 blender/Models/Bush_With_Blueberries_NewTex.fbx diff --git a/blender/Models/Bush Base Color_New.png b/blender/Models/Bush Base Color_New.png new file mode 100644 index 0000000..89fd4fe --- /dev/null +++ b/blender/Models/Bush Base Color_New.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:776010fc37dc3e3f924b71588e1f901eefe0cdbe7165e84114f01c575a578961 +size 60682 diff --git a/blender/Models/Bush_With_Blueberries.blend b/blender/Models/Bush_With_Blueberries.blend new file mode 100644 index 0000000..366ddad --- /dev/null +++ b/blender/Models/Bush_With_Blueberries.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b5e5d6e0360e71a6d5d652fd0ac30779a5712593eb089768448d4fd1fbec0463 +size 780226 diff --git a/blender/Models/Bush_With_Blueberries_NewTex.fbx b/blender/Models/Bush_With_Blueberries_NewTex.fbx new file mode 100644 index 0000000..74f798e --- /dev/null +++ b/blender/Models/Bush_With_Blueberries_NewTex.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2afd545133f27d7585ddb5a8900d0300a54774877b951eb525e6a582a301b494 +size 382092 From 3727f9d7c9686be669463128fbf13d7a3a1db5e0 Mon Sep 17 00:00:00 2001 From: Sofiia-Khrystyna Date: Thu, 12 Jun 2025 12:13:26 +0200 Subject: [PATCH 3/7] lighter bush --- blender/Models/Bush Base Color_New2.png | 3 +++ blender/Models/Bush_With_Blueberries_NewNew.blend | 3 +++ blender/Models/Bush_With_Blueberries_NewTex2.fbx | 3 +++ 3 files changed, 9 insertions(+) create mode 100644 blender/Models/Bush Base Color_New2.png create mode 100644 blender/Models/Bush_With_Blueberries_NewNew.blend create mode 100644 blender/Models/Bush_With_Blueberries_NewTex2.fbx diff --git a/blender/Models/Bush Base Color_New2.png b/blender/Models/Bush Base Color_New2.png new file mode 100644 index 0000000..0f49e45 --- /dev/null +++ b/blender/Models/Bush Base Color_New2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aad4d626809a0c72c19e0a61879320e787cc8df44f0c7c74fb920e734e2c6bf6 +size 63080 diff --git a/blender/Models/Bush_With_Blueberries_NewNew.blend b/blender/Models/Bush_With_Blueberries_NewNew.blend new file mode 100644 index 0000000..2200fc6 --- /dev/null +++ b/blender/Models/Bush_With_Blueberries_NewNew.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8eb8521c07dbc49b362d42a7b76f3499b8fa0c74e37a021403608335decc8b1b +size 780706 diff --git a/blender/Models/Bush_With_Blueberries_NewTex2.fbx b/blender/Models/Bush_With_Blueberries_NewTex2.fbx new file mode 100644 index 0000000..4dc09b2 --- /dev/null +++ b/blender/Models/Bush_With_Blueberries_NewTex2.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bf32624238cc36954a3c6cf552349f9e2de7a8dd96c00c875b53f16c311acb17 +size 382108 From 2490ceb485e624e02dcfbf0f345d7c0f6f1a307e Mon Sep 17 00:00:00 2001 From: Sofiia-Khrystyna Date: Thu, 12 Jun 2025 12:29:20 +0200 Subject: [PATCH 4/7] bush no blueberries --- blender/Models/Bush_No_Blueberries.blend | 3 +++ blender/Models/Bush_No_Blueberries.fbx | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 blender/Models/Bush_No_Blueberries.blend create mode 100644 blender/Models/Bush_No_Blueberries.fbx diff --git a/blender/Models/Bush_No_Blueberries.blend b/blender/Models/Bush_No_Blueberries.blend new file mode 100644 index 0000000..5baa5d5 --- /dev/null +++ b/blender/Models/Bush_No_Blueberries.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:461ee869dbbacdea0b5a0bfe4d3c1d38c3f37412ef3c73238d06f900494dbbca +size 707766 diff --git a/blender/Models/Bush_No_Blueberries.fbx b/blender/Models/Bush_No_Blueberries.fbx new file mode 100644 index 0000000..0e9e021 --- /dev/null +++ b/blender/Models/Bush_No_Blueberries.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e511bbd5f579950c56838145e23225791252dceb86f63e201541d72e97639062 +size 216732 From 705c389dba3b8d0a28394003ac65098f37152760 Mon Sep 17 00:00:00 2001 From: Florian Schmid Date: Thu, 12 Jun 2025 13:14:11 +0200 Subject: [PATCH 5/7] :sparkles: removed old models --- blueberryPeak/Assets/Materials/Demo.meta | 8 ++ .../Assets/Materials/Demo/DemoBlue.mat | 136 ++++++++++++++++++ .../Assets/Materials/Demo/DemoBlue.mat.meta | 8 ++ .../Assets/Materials/Demo/DemoGreen.mat | 136 ++++++++++++++++++ .../Assets/Materials/Demo/DemoGreen.mat.meta | 8 ++ .../Assets/Materials/Demo/DemoRed.mat | 47 ++++++ .../Assets/Materials/Demo/DemoRed.mat.meta | 8 ++ .../Models/Bush_With_Blueberries_New.fbx | 3 - .../Models/Bush_With_Blueberries_New.fbx.meta | 107 -------------- .../Assets/Textures/Bluberry_Bush.meta | 8 ++ .../Bluberry_Bush/Blueberry Base Color 1.png | 3 + .../Blueberry Base Color 1.png.meta | 117 +++++++++++++++ .../Bluberry_Bush/Blueberry Base Color 2.png | 3 + .../Blueberry Base Color 2.png.meta | 117 +++++++++++++++ .../Bluberry_Bush/Blueberry Base Color 3.png | 3 + .../Blueberry Base Color 3.png.meta | 117 +++++++++++++++ .../Bluberry_Bush/Blueberry Base Color.png | 3 + .../Blueberry Base Color.png.meta | 117 +++++++++++++++ .../Bluberry_Bush/Bush Base Color_New 1.png | 3 + .../Bush Base Color_New 1.png.meta | 117 +++++++++++++++ .../Bluberry_Bush/Bush Base Color_New.png | 3 + .../Bush Base Color_New.png.meta | 117 +++++++++++++++ 22 files changed, 1079 insertions(+), 110 deletions(-) create mode 100644 blueberryPeak/Assets/Materials/Demo.meta create mode 100644 blueberryPeak/Assets/Materials/Demo/DemoBlue.mat create mode 100644 blueberryPeak/Assets/Materials/Demo/DemoBlue.mat.meta create mode 100644 blueberryPeak/Assets/Materials/Demo/DemoGreen.mat create mode 100644 blueberryPeak/Assets/Materials/Demo/DemoGreen.mat.meta create mode 100644 blueberryPeak/Assets/Materials/Demo/DemoRed.mat create mode 100644 blueberryPeak/Assets/Materials/Demo/DemoRed.mat.meta delete mode 100644 blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx delete mode 100644 blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx.meta create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush.meta create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png.meta create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png.meta create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png.meta create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png.meta create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New 1.png create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New 1.png.meta create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png create mode 100644 blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png.meta diff --git a/blueberryPeak/Assets/Materials/Demo.meta b/blueberryPeak/Assets/Materials/Demo.meta new file mode 100644 index 0000000..5adf705 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Demo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0f9615e1fe50eae55a59e1ac2695d7d8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Materials/Demo/DemoBlue.mat b/blueberryPeak/Assets/Materials/Demo/DemoBlue.mat new file mode 100644 index 0000000..6acbaea --- /dev/null +++ b/blueberryPeak/Assets/Materials/Demo/DemoBlue.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-6917072784317890129 +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: DemoBlue + 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: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0.13092232, b: 1, a: 1} + - _Color: {r: 0, g: 0.13092229, 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 diff --git a/blueberryPeak/Assets/Materials/Demo/DemoBlue.mat.meta b/blueberryPeak/Assets/Materials/Demo/DemoBlue.mat.meta new file mode 100644 index 0000000..4eb7351 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Demo/DemoBlue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9760cdc8dc21e7b1db86d350e240161f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Materials/Demo/DemoGreen.mat b/blueberryPeak/Assets/Materials/Demo/DemoGreen.mat new file mode 100644 index 0000000..806cd37 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Demo/DemoGreen.mat @@ -0,0 +1,136 @@ +%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: DemoGreen + 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: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 1, b: 0.0009946823, a: 1} + - _Color: {r: 0, g: 1, b: 0.0009946823, 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 &8497305927804254559 +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/Demo/DemoGreen.mat.meta b/blueberryPeak/Assets/Materials/Demo/DemoGreen.mat.meta new file mode 100644 index 0000000..4570c16 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Demo/DemoGreen.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2a5cc5170e257942ba083353c4db63a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Materials/Demo/DemoRed.mat b/blueberryPeak/Assets/Materials/Demo/DemoRed.mat new file mode 100644 index 0000000..a3a71ba --- /dev/null +++ b/blueberryPeak/Assets/Materials/Demo/DemoRed.mat @@ -0,0 +1,47 @@ +%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: DemoRed + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 2100000, guid: f2a5cc5170e257942ba083353c4db63a, type: 2} + 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: [] + m_Ints: [] + m_Floats: [] + m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &717172814785806778 +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/Demo/DemoRed.mat.meta b/blueberryPeak/Assets/Materials/Demo/DemoRed.mat.meta new file mode 100644 index 0000000..5473344 --- /dev/null +++ b/blueberryPeak/Assets/Materials/Demo/DemoRed.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c20fe50a6b55977fbd24c001ecb4fff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx b/blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx deleted file mode 100644 index 3928864..0000000 --- a/blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f81d15e629f4a2925e51a9761eaaac270762f4ab8bfaff5d9f2b7ff37a38c9d -size 226892 diff --git a/blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx.meta b/blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx.meta deleted file mode 100644 index 1b43524..0000000 --- a/blueberryPeak/Assets/Models/Bush_With_Blueberries_New.fbx.meta +++ /dev/null @@ -1,107 +0,0 @@ -fileFormatVersion: 2 -guid: 099e7e3507cfe4cc78f826ce48f32770 -ModelImporter: - serializedVersion: 22200 - internalIDToNameTable: [] - externalObjects: {} - 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/Textures/Bluberry_Bush.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush.meta new file mode 100644 index 0000000..80a21aa --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb034a0f7c4608100b253da2186f878c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png new file mode 100644 index 0000000..b3d2c8f --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 +size 23938 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png.meta new file mode 100644 index 0000000..6188f0c --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 1.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 6e9a630c75b93b8438ad3faf435af8c4 +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 2.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png new file mode 100644 index 0000000..b3d2c8f --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png @@ -0,0 +1,3 @@ +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.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png.meta new file mode 100644 index 0000000..0627f8d --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 2.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 6a8dc6f738f7dd5fead9095857b4c9d7 +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 3.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png new file mode 100644 index 0000000..b3d2c8f --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png @@ -0,0 +1,3 @@ +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.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png.meta new file mode 100644 index 0000000..899c41c --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color 3.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: b7619e1bac4a1928bbfd23efa4835ab5 +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 b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png new file mode 100644 index 0000000..b3d2c8f --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a054781048b526ab29a1ad4645efe8f990284550850f2823b689eed1ed132110 +size 23938 diff --git a/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png.meta new file mode 100644 index 0000000..9efb702 --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Blueberry Base Color.png.meta @@ -0,0 +1,117 @@ +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 1.png b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New 1.png new file mode 100644 index 0000000..89fd4fe --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New 1.png @@ -0,0 +1,3 @@ +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 1.png.meta b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New 1.png.meta new file mode 100644 index 0000000..c993bd4 --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New 1.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: b87a602a5f0febdaebf2b15cf383e07b +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 new file mode 100644 index 0000000..89fd4fe --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..73c5049 --- /dev/null +++ b/blueberryPeak/Assets/Textures/Bluberry_Bush/Bush Base Color_New.png.meta @@ -0,0 +1,117 @@ +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: From 070bfa2495178f921a704d56b111815fd20e1010 Mon Sep 17 00:00:00 2001 From: Sofiia-Khrystyna Date: Thu, 12 Jun 2025 13:25:27 +0200 Subject: [PATCH 6/7] fixed bushes --- blender/Models/Bush Base Color.png | 3 --- blender/Models/Bush Base Color_New.png | 3 --- blender/Models/Bush_No_Blueberries.fbx | 2 +- blender/Models/Bush_With_Blueberries.blend | 3 --- blender/Models/Bush_With_Blueberries_New.blend | 3 --- blender/Models/Bush_With_Blueberries_New.fbx | 3 --- blender/Models/Bush_With_Blueberries_NewNew.blend | 3 --- blender/Models/Bush_With_Blueberries_NewTex.fbx | 3 --- blender/Models/Bush_With_Blueberries_NewTex2.fbx | 3 --- blender/Models/Bush_With_Blueberriess.blend | 3 +++ blender/Models/Bush_With_Blueberriess.fbx | 3 +++ 11 files changed, 7 insertions(+), 25 deletions(-) delete mode 100644 blender/Models/Bush Base Color.png delete mode 100644 blender/Models/Bush Base Color_New.png delete mode 100644 blender/Models/Bush_With_Blueberries.blend delete mode 100644 blender/Models/Bush_With_Blueberries_New.blend delete mode 100644 blender/Models/Bush_With_Blueberries_New.fbx delete mode 100644 blender/Models/Bush_With_Blueberries_NewNew.blend delete mode 100644 blender/Models/Bush_With_Blueberries_NewTex.fbx delete mode 100644 blender/Models/Bush_With_Blueberries_NewTex2.fbx create mode 100644 blender/Models/Bush_With_Blueberriess.blend create mode 100644 blender/Models/Bush_With_Blueberriess.fbx diff --git a/blender/Models/Bush Base Color.png b/blender/Models/Bush Base Color.png deleted file mode 100644 index ccac32e..0000000 --- a/blender/Models/Bush Base Color.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:00b21ad7691ec08285d0f24b6f90acff6fbad58a4e0675cac324c5610a9082bd -size 33698 diff --git a/blender/Models/Bush Base Color_New.png b/blender/Models/Bush Base Color_New.png deleted file mode 100644 index 89fd4fe..0000000 --- a/blender/Models/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/blender/Models/Bush_No_Blueberries.fbx b/blender/Models/Bush_No_Blueberries.fbx index 0e9e021..4def1e6 100644 --- a/blender/Models/Bush_No_Blueberries.fbx +++ b/blender/Models/Bush_No_Blueberries.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e511bbd5f579950c56838145e23225791252dceb86f63e201541d72e97639062 +oid sha256:161f88507d051c12f854fe0ec78b456a19fc8e0c5bdd5999d0ef96c2a18f275a size 216732 diff --git a/blender/Models/Bush_With_Blueberries.blend b/blender/Models/Bush_With_Blueberries.blend deleted file mode 100644 index 366ddad..0000000 --- a/blender/Models/Bush_With_Blueberries.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5e5d6e0360e71a6d5d652fd0ac30779a5712593eb089768448d4fd1fbec0463 -size 780226 diff --git a/blender/Models/Bush_With_Blueberries_New.blend b/blender/Models/Bush_With_Blueberries_New.blend deleted file mode 100644 index cf5368e..0000000 --- a/blender/Models/Bush_With_Blueberries_New.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3807fd0f7dd2b577cee8e8d700f0535ca6c942dc49f542d494b91092274d0d79 -size 706822 diff --git a/blender/Models/Bush_With_Blueberries_New.fbx b/blender/Models/Bush_With_Blueberries_New.fbx deleted file mode 100644 index f16e9db..0000000 --- a/blender/Models/Bush_With_Blueberries_New.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:347a3356842d7f80c84a59dd4526a24c276edfd0182a53f4910bf7c2e95b9547 -size 227084 diff --git a/blender/Models/Bush_With_Blueberries_NewNew.blend b/blender/Models/Bush_With_Blueberries_NewNew.blend deleted file mode 100644 index 2200fc6..0000000 --- a/blender/Models/Bush_With_Blueberries_NewNew.blend +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8eb8521c07dbc49b362d42a7b76f3499b8fa0c74e37a021403608335decc8b1b -size 780706 diff --git a/blender/Models/Bush_With_Blueberries_NewTex.fbx b/blender/Models/Bush_With_Blueberries_NewTex.fbx deleted file mode 100644 index 74f798e..0000000 --- a/blender/Models/Bush_With_Blueberries_NewTex.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2afd545133f27d7585ddb5a8900d0300a54774877b951eb525e6a582a301b494 -size 382092 diff --git a/blender/Models/Bush_With_Blueberries_NewTex2.fbx b/blender/Models/Bush_With_Blueberries_NewTex2.fbx deleted file mode 100644 index 4dc09b2..0000000 --- a/blender/Models/Bush_With_Blueberries_NewTex2.fbx +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bf32624238cc36954a3c6cf552349f9e2de7a8dd96c00c875b53f16c311acb17 -size 382108 diff --git a/blender/Models/Bush_With_Blueberriess.blend b/blender/Models/Bush_With_Blueberriess.blend new file mode 100644 index 0000000..bd4b455 --- /dev/null +++ b/blender/Models/Bush_With_Blueberriess.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5e93f3a7c5f310d47d12b61beee11f690ba61d778a169e19f03bbc844be7b8b +size 784834 diff --git a/blender/Models/Bush_With_Blueberriess.fbx b/blender/Models/Bush_With_Blueberriess.fbx new file mode 100644 index 0000000..246bce9 --- /dev/null +++ b/blender/Models/Bush_With_Blueberriess.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5bb81eecd3a69b6afeb057fd919d8c2fa090521f39f22444fa8265e61459b3ac +size 384460 From 33a99ad7a9fe1bd82fc7de83736399dd20a4c256 Mon Sep 17 00:00:00 2001 From: Sofiia-Khrystyna Date: Thu, 12 Jun 2025 13:30:13 +0200 Subject: [PATCH 7/7] blueberry --- blender/Models/Blueberry.blend | 3 +++ blender/Models/Blueberry.fbx | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 blender/Models/Blueberry.blend create mode 100644 blender/Models/Blueberry.fbx diff --git a/blender/Models/Blueberry.blend b/blender/Models/Blueberry.blend new file mode 100644 index 0000000..3c58b88 --- /dev/null +++ b/blender/Models/Blueberry.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1cb76f1e135bc2dac26d4aa5923ebdde170ebbc23905dc15064685e28e1a1df +size 645266 diff --git a/blender/Models/Blueberry.fbx b/blender/Models/Blueberry.fbx new file mode 100644 index 0000000..4a254ef --- /dev/null +++ b/blender/Models/Blueberry.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df1f8e6b419190f8b629feaf682330d165060ef45eb43ab2a029f35cce53eb1a +size 68268