nikola/DropToTheRoots
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'TreeEnd'

Browse Source
This commit is contained in:
go38coz
2026-06-07 03:58:09 +02:00
parent d6707c74db a7d8dbb6f1
commit 96a193ae14
7 changed files with 11488 additions and 5617 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Assets/Prefabs/ObstaclePreFabs/Hole.prefab
-14
View File
@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 7329357223832181834}
- component: {fileID: 1230242963583950091}
- component: {fileID: 9204716000211697423}
- component: {fileID: -7265910902094411698}
m_Layer: 0
m_Name: Hole
m_TagString: Hole
@@ -130,16 +129,3 @@ CapsuleCollider2D:
m_Offset: {x: 0, y: 0}
m_Size: {x: 0.8, y: 0.8}
m_Direction: 0
--- !u!114 &-7265910902094411698
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3028864304894384228}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: bbf8ab4673d6bf447aab098a12320431, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::SceneController
sceneIndex: 2
Game/Assets/Prefabs/Tree.prefab
+11132 -2
View File
File diff suppressed because it is too large Load Diff
Game/Assets/Prefabs/TreeEnd.prefab
+288
View File
@@ -0,0 +1,288 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &1465018464958951789
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1876449400558542855, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1917119939359824370, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2133968236930401948, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2292616461387842948, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2406579955948392942, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2764455090306147063, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: treeEndPrefab
value:
objectReference: {fileID: 7965980422394357575}
- target: {fileID: 2913225976882218261, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalScale.x
value: 1.05
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalScale.y
value: 1.05
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalScale.z
value: 1.05
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 7024218491085898663, guid: b814efef9b884f24c8d7e5c2fb610405, type: 3}
- target: {fileID: 8100904432411870408, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_SortingOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8295206769285972704, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_Name
value: TreeEnd
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 6124830262035862982, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 347334796122540369, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 1854383947200579255, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 4672494111088488940, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6275042726098549181, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 1867126597670769693, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 7221170016960187832, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 2437037360725321199, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 7424960433631194809, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6820144760494818601, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 4911919652427104679, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6632875216196754577, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 275006466706633828, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 8910206275163805538, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 4503223525291784446, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 499371924871354282, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 253523022306633764, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 598396088029121988, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 4456315543725853537, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 4975225490978657150, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 8636931366463989083, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6222318139055545573, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 1448615728048579746, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6846552438190088611, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 3555023420444989234, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 2292616461387842948, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 2104471098995738086, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 5508971228422213656, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 8135723577016691134, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 2651830777454513491, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6423960365140449881, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 4753827148166546826, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 3316001935601739475, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6170791444840597357, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 7792401190796350633, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 8965125842372535198, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 2406579955948392942, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 2050339920281000790, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
insertIndex: 4
addedObject: {fileID: 7312364484271942833}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
insertIndex: -1
addedObject: {fileID: 8693903375261158607}
m_SourcePrefab: {fileID: 100100000, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
--- !u!4 &585626021125089851 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2050339920281000790, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
m_PrefabInstance: {fileID: 1465018464958951789}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7965980422394357575 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
m_PrefabInstance: {fileID: 1465018464958951789}
m_PrefabAsset: {fileID: 0}
--- !u!61 &8693903375261158607
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7965980422394357575}
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: 0, y: -9.041363}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 38.399998, y: 19.73}
newSize: {x: 1, y: 1}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Size: {x: 38.399998, y: 1.647274}
m_EdgeRadius: 0
--- !u!1001 &6641738787534465573
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 585626021125089851}
m_Modifications:
- target: {fileID: 61515306837786669, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_Name
value: RealBranch 1 (1)
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalScale.x
value: 0.8014
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalScale.y
value: 0.597983
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalPosition.x
value: 0.52
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalPosition.y
value: -6.56
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
--- !u!4 &7312364484271942833 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4131646927061829268, guid: 896b889c2d3f2ea4bad01f22809f7c4e, type: 3}
m_PrefabInstance: {fileID: 6641738787534465573}
m_PrefabAsset: {fileID: 0}
Game/Assets/Prefabs/TreeEnd.prefab.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 47245d0c97e0a45abb095112b1c09f71
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Game/Assets/Scenes/0_MainScene.unity
+31 -5588
View File
File diff suppressed because it is too large Load Diff
Game/Assets/Scripts/PatternSelecter.cs
-7
View File
@@ -3,8 +3,6 @@ using UnityEngine;
public class PatternSelecter : MonoBehaviour
{
[SerializeField]
private int lastTreeNumber = 8;
void Start()
{
@@ -17,11 +15,6 @@ public class PatternSelecter : MonoBehaviour
{
transform.GetChild(0).gameObject.SetActive(true);
}
else if (TreeSpawner.treeCount == lastTreeNumber)
{
transform.GetChild(transform.childCount - 1).gameObject.SetActive(true);
}
else
{
int randomIndex = Random.Range(1, transform.childCount - 1);
Game/Assets/Scripts/TreeSpawner.cs
+30 -6
View File
@@ -1,35 +1,59 @@
using System;
using UnityEngine;
public class TreeSpawner : MonoBehaviour
{
public GameObject treePrefab;
[SerializeField]
private GameObject treePrefab;
[SerializeField]
private GameObject treeEndPrefab;
public Transform player;
[SerializeField]
private static int maxTreeCount = 1;
private bool hasSpawned = false;
public static int treeCount;
private SpriteRenderer spriteRenderer;
private void Start()
{
spriteRenderer = GetComponent<SpriteRenderer>();
}
void Update()
{
if (hasSpawned == false)
if (hasSpawned == false && treeCount < maxTreeCount)
{
if (player.position.y < transform.position.y - 3f)
{
hasSpawned = true;
float treeHeight = GetComponent<SpriteRenderer>().bounds.size.y;
float treeHeight = spriteRenderer.bounds.size.y;
Vector3 spawnPos = transform.position + Vector3.down * treeHeight + new Vector3(0, 0.2f, 0);
treeCount++;
GameObject newTree = Instantiate(treePrefab, spawnPos, Quaternion.identity);
Debug.Log($"Spawned Treee{treeCount}");
if(treeCount == maxTreeCount)
{
spawnPos += new Vector3(0.27f,0.54f,0);
Instantiate(treeEndPrefab, spawnPos, Quaternion.identity);
}
else Instantiate(treePrefab, spawnPos, Quaternion.identity);
}
}
// Delete trees that are far above the player
if (player.position.y < transform.position.y - 40f)
{
Destroy(gameObject);
gameObject.SetActive(false);
}
else
{
gameObject.SetActive(true);
}
}
}