diff --git a/Game/Assets/Images/Tree base.PNG b/Game/Assets/Images/Tree base.PNG new file mode 100644 index 0000000..87eea21 Binary files /dev/null and b/Game/Assets/Images/Tree base.PNG differ diff --git a/Game/Assets/Images/Tree base.PNG.meta b/Game/Assets/Images/Tree base.PNG.meta new file mode 100644 index 0000000..768e6ca --- /dev/null +++ b/Game/Assets/Images/Tree base.PNG.meta @@ -0,0 +1,195 @@ +fileFormatVersion: 2 +guid: 4e5dbe3863ad35643b453144bb017a99 +TextureImporter: + internalIDToNameTable: + - first: + 213: -8641620402995635528 + second: Tree base_0 + - first: + 213: -5523223670318519024 + second: Tree base_1 + - first: + 213: -7943099077329062254 + second: Tree base_2 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + 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: + - serializedVersion: 2 + name: Tree base_0 + rect: + serializedVersion: 2 + x: 378 + y: 2131 + width: 9 + height: 29 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8ba5dab570cc21880800000000000000 + internalID: -8641620402995635528 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tree base_1 + rect: + serializedVersion: 2 + x: 387 + y: 4 + width: 1157 + height: 2156 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 01da2abc5519953b0800000000000000 + internalID: -5523223670318519024 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Tree base_2 + rect: + serializedVersion: 2 + x: 378 + y: 5 + width: 9 + height: 30 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2967118397174c190800000000000000 + internalID: -7943099077329062254 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + Tree base_0: -8641620402995635528 + Tree base_1: -5523223670318519024 + Tree base_2: -7943099077329062254 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Game/Assets/Scenes/cems scene.unity b/Game/Assets/Scenes/cems scene.unity index 7658004..5d7ca7e 100644 --- a/Game/Assets/Scenes/cems scene.unity +++ b/Game/Assets/Scenes/cems scene.unity @@ -394,84 +394,6 @@ MonoBehaviour: m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 m_Version: 2 ---- !u!1 &1859642725 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1859642727} - - component: {fileID: 1859642726} - m_Layer: 0 - m_Name: TreeTriggerBottom - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &1859642726 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1859642725} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: 2, y: 0} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0, y: 0} - oldSize: {x: 0, y: 0} - newSize: {x: 0, y: 0} - adaptiveTilingThreshold: 0 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 30, y: 1} - m_EdgeRadius: 0 ---- !u!4 &1859642727 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1859642725} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.3946, y: -6.28091, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &5794961297083258421 PrefabInstance: m_ObjectHideFlags: 0 @@ -480,17 +402,45 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 416544106080536276, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9975641 + objectReference: {fileID: 0} + - target: {fileID: 416544106080536276, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalRotation.y + value: -0.06975647 + objectReference: {fileID: 0} + - target: {fileID: 416544106080536276, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -8 + objectReference: {fileID: 0} + - target: {fileID: 731006480404616409, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Offset.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_LocalScale.y - value: 0.001 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.x + value: 0.8366327 + objectReference: {fileID: 0} + - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_LocalScale.y + value: 0.8284174 objectReference: {fileID: 0} - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_LocalPosition.x - value: -0.4 + value: -0.17 objectReference: {fileID: 0} - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_LocalPosition.y - value: -3 + value: 0.12 objectReference: {fileID: 0} - target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_LocalPosition.z @@ -524,10 +474,62 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5029488714018677603, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Size.x + value: 19.199999 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Size.y + value: 21.605274 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4e5dbe3863ad35643b453144bb017a99, type: 3} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Color.b + value: 0.9803922 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Color.g + value: 0.9803922 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_SortingOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_WasSpriteAssigned + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} propertyPath: m_Name value: Tree objectReference: {fileID: 0} + - target: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8863759867266962758, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -541,4 +543,3 @@ SceneRoots: - {fileID: 5794961297083258421} - {fileID: 906924948} - {fileID: 127014195} - - {fileID: 1859642727} diff --git a/Game/Assets/Scripts/TreeSpawner.cs b/Game/Assets/Scripts/TreeSpawner.cs index e2a1a24..baf5176 100644 --- a/Game/Assets/Scripts/TreeSpawner.cs +++ b/Game/Assets/Scripts/TreeSpawner.cs @@ -5,21 +5,10 @@ public class TreeSpawner : MonoBehaviour public GameObject treePrefab; public Transform spawnPoint; - private bool hasSpawned = false; - private static float nextAllowedSpawnTime = 0f; - private void OnTriggerEnter2D(Collider2D other) { if (!other.CompareTag("Player")) return; - if (hasSpawned) return; - - if (Time.time < nextAllowedSpawnTime) return; - - hasSpawned = true; - nextAllowedSpawnTime = Time.time + 1f; Instantiate(treePrefab, spawnPoint.position, Quaternion.identity); - - gameObject.SetActive(false); } } \ No newline at end of file