diff --git a/Assets/Images/ScreenCapture_1024x500.png b/Assets/Images/ScreenCapture_1024x500.png
deleted file mode 100644
index 4ae2a0012471c35132949d360c28c882f5f884d0..0000000000000000000000000000000000000000
--- a/Assets/Images/ScreenCapture_1024x500.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8762353a977cdc02121201b5aa826b0186fd62085c30abe9077e3fbf4eb402e1
-size 263498
diff --git a/Assets/Images/ScreenCapture_1024x500.png.meta b/Assets/Images/ScreenCapture_1024x500.png.meta
deleted file mode 100644
index ecc3f67fcf3f62542ed172d912acaeb1812c042b..0000000000000000000000000000000000000000
--- a/Assets/Images/ScreenCapture_1024x500.png.meta
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: c096e221b5bfbeb43ab515c047274b82
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- 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
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- vTOnly: 0
- ignoreMasterTextureLimit: 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
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Images/frameit_logo_512x512.png b/Assets/Images/frameit_logo_512x512.png
deleted file mode 100644
index 2ca5ce9e48e20274ed2f5311a4995438f35f0d84..0000000000000000000000000000000000000000
--- a/Assets/Images/frameit_logo_512x512.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b17fddfb76263d3e21bd0d3ec140b0e3f2e93eb71557b0b59af18aa953e7bbba
-size 27179
diff --git a/Assets/Images/frameit_logo_512x512.png.meta b/Assets/Images/frameit_logo_512x512.png.meta
deleted file mode 100644
index c247271b733f9a6031d39ab8be5f4266ae887a6c..0000000000000000000000000000000000000000
--- a/Assets/Images/frameit_logo_512x512.png.meta
+++ /dev/null
@@ -1,98 +0,0 @@
-fileFormatVersion: 2
-guid: f9c7a85535e5dbe45aacbbcc5e4df5e1
-TextureImporter:
- internalIDToNameTable: []
- externalObjects: {}
- serializedVersion: 11
- 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
- isReadable: 0
- streamingMipmaps: 0
- streamingMipmapsPriority: 0
- vTOnly: 0
- ignoreMasterTextureLimit: 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
- platformSettings:
- - serializedVersion: 3
- buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
- resizeAlgorithm: 0
- textureFormat: -1
- textureCompression: 1
- compressionQuality: 50
- crunchedCompression: 0
- allowsAlphaSplitting: 0
- overridden: 0
- androidETC2FallbackOverride: 0
- forceMaximumCompressionQuality_BC6H_BC7: 0
- spriteSheet:
- serializedVersion: 2
- sprites: []
- outline: []
- physicsShape: []
- bones: []
- spriteID:
- internalID: 0
- vertices: []
- indices:
- edges: []
- weights: []
- secondaryTextures: []
- nameFileIdTable: {}
- spritePackingTag:
- pSDRemoveMatte: 0
- pSDShowRemoveMatteOption: 0
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Scenes/Worlds/RiverWorld.unity b/Assets/Scenes/Worlds/RiverWorld.unity
index 767d80559b5aea2d7e14b0cbc8c0692094fec628..b0e3784d9ebd36ea3e790ef30c19862b21118fee 100644
--- a/Assets/Scenes/Worlds/RiverWorld.unity
+++ b/Assets/Scenes/Worlds/RiverWorld.unity
@@ -39596,6 +39596,16 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 477551547577237433, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 477551547577237433, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 500168219642005183, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_PresetInfoIsWorld
@@ -40131,6 +40141,21 @@ PrefabInstance:
propertyPath: m_Name
value: RightBttn_02 (1)
objectReference: {fileID: 0}
+ - target: {fileID: 6452121699428694375, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6452121699428694375, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6452121699428694375, guid: caf448c160a07214f8cf74da91506980,
+ type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 6652188390175341001, guid: caf448c160a07214f8cf74da91506980,
type: 3}
propertyPath: m_Enabled
@@ -54867,6 +54892,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 1961703113}
+ - component: {fileID: 1961703114}
m_Layer: 0
m_Name: Forest_Elements
m_TagString: Untagged
@@ -55358,6 +55384,19 @@ Transform:
m_Father: {fileID: 117995034}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1961703114
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1961703112}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 074a9f7a28b409e4ba8e4d3f5e38a821, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ smallObjectsCollision: 0
--- !u!1001 &1967470652
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/Worlds/TreeWorld.unity b/Assets/Scenes/Worlds/TreeWorld.unity
index 06e98fbc138a64d6741a11d08986952878f136d6..1796c450f8feb4feb5baeacd9c9fb2e9cf2c9dc4 100644
--- a/Assets/Scenes/Worlds/TreeWorld.unity
+++ b/Assets/Scenes/Worlds/TreeWorld.unity
@@ -2805,6 +2805,7 @@ Transform:
m_LocalRotation: {x: 0.53561664, y: 0.09193187, z: -0.096480295, w: 0.8338795}
m_LocalPosition: {x: 10.78083, y: 50.209194, z: -40.722504}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1967250179}
m_RootOrder: 0
@@ -6163,6 +6164,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -6211,6 +6213,7 @@ Transform:
m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: 0.4865, y: 0, z: 0.0405}
m_LocalScale: {x: 1, y: 0.025, z: 40}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1451305264}
m_RootOrder: 2
@@ -6946,6 +6949,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 1871548913918342015, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 3020720017683626808, guid: b07552db700124a4680401e6fb94c186,
type: 3}
propertyPath: m_RootOrder
@@ -7046,6 +7054,181 @@ PrefabInstance:
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
+ - target: {fileID: 3231672575110126845, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3231672575110126845, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3256035397108630737, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609488098195152, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609489478905716, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609489478905716, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609489478905716, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609489736415446, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609489736415446, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609489736415446, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3404609489736415446, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4731305740779601639, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4731305740779601639, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4731305740779601639, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4731305740779601639, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4731305740779601639, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4731305740779601639, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6928983013286334827, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8097096504714927087, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 940
+ objectReference: {fileID: 0}
+ - target: {fileID: 8182354677883374721, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8554046384749769582, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8554046384749769582, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8554046384749769582, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8554046384749769582, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8554046384749769582, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8554046384749769582, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8969443860621186287, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8969443860621186287, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchorMin.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8969443860621186287, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 8969443860621186287, guid: b07552db700124a4680401e6fb94c186,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 0
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b07552db700124a4680401e6fb94c186, type: 3}
--- !u!1001 &363562701
@@ -7167,6 +7350,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.6712012, y: 0.65208524, z: 1.0587499}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
@@ -8174,6 +8358,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -8222,6 +8407,7 @@ Transform:
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0.5005}
m_LocalScale: {x: 1, y: 0.025000025, z: 40.000046}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1451305264}
m_RootOrder: 0
@@ -8288,6 +8474,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
@@ -10736,6 +10923,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -10784,6 +10972,7 @@ Transform:
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: -0.42600003}
m_LocalScale: {x: 1, y: 0.025000025, z: 40.000046}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1451305264}
m_RootOrder: 1
@@ -13339,6 +13528,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -10.78083, y: -0.20919383, z: 0.7225029}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1967250179}
m_Father: {fileID: 0}
@@ -13972,6 +14162,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 10.78083, y: 0.20919383, z: -0.7225029}
m_LocalScale: {x: 4, y: 1, z: 4}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1675643438}
- {fileID: 1451305264}
@@ -29532,6 +29723,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 20, y: 0.5, z: 20}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 422404981}
- {fileID: 535944728}
@@ -33288,6 +33480,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -33336,6 +33529,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 20, y: 0.00001, z: 20}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 684756692}
m_RootOrder: 0
@@ -38639,6 +38833,7 @@ Transform:
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: 138245307}
- {fileID: 684756692}
@@ -39642,6 +39837,7 @@ Transform:
m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: -0.391, y: 0, z: 0.0405}
m_LocalScale: {x: 1, y: 0.025, z: 40}
+ m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1451305264}
m_RootOrder: 3
@@ -39670,6 +39866,7 @@ MeshRenderer:
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@@ -41725,6 +41922,7 @@ GameObject:
m_Component:
- component: {fileID: 2103446016}
- component: {fileID: 2103446017}
+ - component: {fileID: 2103446018}
m_Layer: 0
m_Name: Forest_Elements
m_TagString: Untagged
@@ -41742,6 +41940,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 33.98083, y: -1.1366726, z: 19.177496}
m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 465508637}
- {fileID: 1049405286}
@@ -42235,6 +42434,19 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 29ae4419000718842b9edc6a95b7ffdc, type: 3}
m_Name:
m_EditorClassIdentifier:
+--- !u!114 &2103446018
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2103446015}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 074a9f7a28b409e4ba8e4d3f5e38a821, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ smallObjectsCollision: 0
--- !u!4 &2114990511 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3356751432537613521, guid: ffbddc4ef9676cc419e81e06aaa836d8,
diff --git a/Assets/Scripts/InteractionEngine/ForestElementsManager.cs b/Assets/Scripts/InteractionEngine/ForestElementsManager.cs
new file mode 100644
index 0000000000000000000000000000000000000000..81a62c0489f12e1eea5c4e0d2a3f5ad2efb1da0a
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/ForestElementsManager.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ForestElementsManager : MonoBehaviour
+{
+
+ [SerializeField] bool smallObjectsCollision = false;
+
+ private System.Action<GameObject> disableSmallObjectCollision = (gameObj) =>
+ {
+ if (gameObj.name.Contains("Grass_01") || gameObj.name.Contains("Grass_02") || gameObj.name.Contains("Mushroom_01") || gameObj.name.Contains("Mushroom_02") || gameObj.name.Contains("Branch_01"))
+ {
+ gameObj.GetComponent<MeshCollider>().enabled = false;
+ }
+ };
+
+ // Start is called before the first frame update
+ void Start()
+ {
+ if (!smallObjectsCollision)
+ {
+ gameObject.ForAllChildren(disableSmallObjectCollision);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/InteractionEngine/ForestElementsManager.cs.meta b/Assets/Scripts/InteractionEngine/ForestElementsManager.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..fa2515390e20ab0867793828d0aba7df2280b5a6
--- /dev/null
+++ b/Assets/Scripts/InteractionEngine/ForestElementsManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 074a9f7a28b409e4ba8e4d3f5e38a821
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
index b810524624a293cd5ff31d3600a1d53881ee24c1..ef02208bc1d9a2cf274e52fbe2b78a8f57280b90 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Gadget.cs
@@ -126,7 +126,7 @@ public void Init(bool overrite)
if (!GadgetBehaviour.DataContainerGadgetDict.ContainsKey(GadgetID))
{
- Debug.LogError("No " + GadgetID.ToString() + "in assigned " + typeof(DataContainerGadgetCollection).Name + "!");
+ Debug.LogError("No " + GadgetID.ToString() + " in assigned " + typeof(DataContainerGadgetCollection).Name + "!");
return;
}
var data_cache = GadgetBehaviour.DataContainerGadgetDict[GadgetID];
diff --git a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
index b2746c71c60476ce6ecd0d6187168b3ea75a37d4..7cdc692c8b0093c0e977876e133bdeeaaa581dc1 100644
--- a/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
+++ b/Assets/Scripts/InteractionEngine/Gadgets/Tape.cs
@@ -67,6 +67,6 @@ protected override void _Update_Range()
MaxRange,
};
GadgetBehaviour.Cursor.MaxRange = NewMaxRange;
- Debug.Log("MaxRange :" + NewMaxRange);
+ //Debug.Log("MaxRange :" + NewMaxRange);
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/InteractionEngine/WorldCursor.cs b/Assets/Scripts/InteractionEngine/WorldCursor.cs
index 069beae959f5c829208109bcd2803ebdc372d136..67c859e4453c1263050a1f59edc127dd87dfcb9c 100644
--- a/Assets/Scripts/InteractionEngine/WorldCursor.cs
+++ b/Assets/Scripts/InteractionEngine/WorldCursor.cs
@@ -283,7 +283,7 @@ void updateMaxRange()
MaxRange,
};
- Debug.Log("WorldCursorMaxRange :" + MaxRange_);
+ //Debug.Log("WorldCursorMaxRange :" + MaxRange_);
}