nikola with 7 hours of love
This commit is contained in:
cemt1363
2026-06-07 07:20:09 +02:00
parent 9e47568284
commit e250dd7d98
8 changed files with 2083 additions and 82 deletions
+84 -1
View File
@@ -325,6 +325,84 @@ MonoBehaviour:
windDuration: 5
minTimeBetweenWind: 5
maxTimeBetweenWind: 20
--- !u!1 &3305680538921911605
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4182013112082979600}
- component: {fileID: 819903978197543782}
m_Layer: 0
m_Name: EndGameCollider
m_TagString: Finish
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4182013112082979600
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3305680538921911605}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9116616677718499696}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &819903978197543782
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3305680538921911605}
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.87610245, y: -9.736291}
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: 38.655807, y: 1.5620251}
m_EdgeRadius: 0
--- !u!1 &4793699127412580766
GameObject:
m_ObjectHideFlags: 0
@@ -543,6 +621,7 @@ Transform:
- {fileID: 5160298664346334946}
- {fileID: 965258171059657372}
- {fileID: 6693531426554259445}
- {fileID: 4182013112082979600}
m_Father: {fileID: 3683337692723927349}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8295206769285972704
@@ -727,6 +806,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8e2ad5a7116f03541a6489c22953c195, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PatternSelecter
lastTreeNumber: 15
spriteRenderer: {fileID: 0}
endTreeSprite: {fileID: 0}
confine: {fileID: 0}
confiner2D: {fileID: 0}
--- !u!114 &2764455090306147063
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -740,7 +824,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TreeSpawner
treePrefab: {fileID: 8851845362353968682}
treeEndPrefab: {fileID: 7965980422394357575, guid: 47245d0c97e0a45abb095112b1c09f71, type: 3}
player: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3}
--- !u!1001 &34702570033108687
PrefabInstance:
+1 -1
View File
@@ -18,7 +18,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2133968236930401948, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2292616461387842948, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
+144 -40
View File
@@ -291,43 +291,89 @@ MonoBehaviour:
m_PostInfinity: 2
m_RotationOrder: 4
CustomBlends: {fileID: 0}
--- !u!1 &526821479 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
m_PrefabInstance: {fileID: 1681788161}
m_PrefabAsset: {fileID: 0}
--- !u!114 &526821483
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 526821479}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 021d37d1b6e71b143adc6f4842f7d76c, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::TreeSpawner
treePrefab: {fileID: 526821479}
treeEndPrefab: {fileID: 0}
player: {fileID: 662084242}
--- !u!114 &526821489
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 526821479}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e2ad5a7116f03541a6489c22953c195, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::PatternSelecter
--- !u!4 &662084242 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6566899495513628888, guid: d56297e435f8410a584581d73d99d2e4, type: 3}
m_PrefabInstance: {fileID: 1445156949}
m_PrefabAsset: {fileID: 0}
--- !u!1 &730228758
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 730228759}
- component: {fileID: 730228760}
m_Layer: 0
m_Name: CameraConfine
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &730228759
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 730228758}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.6441, y: 6.31478, 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!61 &730228760
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 730228758}
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: 1
m_UsedByEffector: 0
m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, 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: 57.55, y: 21.5}
m_EdgeRadius: 0
--- !u!1 &750131489
GameObject:
m_ObjectHideFlags: 0
@@ -340,6 +386,7 @@ GameObject:
- component: {fileID: 750131491}
- component: {fileID: 750131493}
- component: {fileID: 750131494}
- component: {fileID: 750131495}
m_Layer: 0
m_Name: CinemachineCamera
m_TagString: Untagged
@@ -437,6 +484,26 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f0a87a1c7758eb34587daa15a89d59d4, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::DownwardCamera
--- !u!114 &750131495
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 750131489}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f453f694addf4275988fac205bc91968, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineConfiner2D
BoundingShape2D: {fileID: 730228760}
Damping: 0.5
SlowingDistance: 5
OversizeWindow:
Enabled: 0
MaxWindowSize: 0
Padding: 0
m_LegacyMaxWindowSize: -2
--- !u!1 &809899006
GameObject:
m_ObjectHideFlags: 0
@@ -1087,6 +1154,22 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 472209926893914684, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalPosition.x
value: -2.74
objectReference: {fileID: 0}
- target: {fileID: 472209926893914684, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalPosition.y
value: -6.35
objectReference: {fileID: 0}
- target: {fileID: 819903978197543782, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_Size.y
value: 3.4464679
objectReference: {fileID: 0}
- target: {fileID: 819903978197543782, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_Offset.y
value: -8.794069
objectReference: {fileID: 0}
- target: {fileID: 2257095878498355338, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalScale.x
value: 10
@@ -1099,6 +1182,10 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: -2
objectReference: {fileID: 0}
- target: {fileID: 2764455090306147063, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: player
value:
objectReference: {fileID: 662084242}
- target: {fileID: 3683337692723927349, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalScale.x
value: 1
@@ -1147,6 +1234,18 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4609816774950413053, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalPosition.y
value: -4.83
objectReference: {fileID: 0}
- target: {fileID: 5615831806268684012, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: endTreeSprite
value:
objectReference: {fileID: 7024218491085898663, guid: b814efef9b884f24c8d7e5c2fb610405, type: 3}
- target: {fileID: 5615831806268684012, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: lastTreeNumber
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6662925900208362018, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_LocalPosition.x
value: -5.49
@@ -1155,6 +1254,14 @@ PrefabInstance:
propertyPath: m_LocalPosition.y
value: -0.78
objectReference: {fileID: 0}
- target: {fileID: 7892839606168318537, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
propertyPath: m_IsActive
value: 0
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_SortingOrder
value: 2
@@ -1168,15 +1275,11 @@ PrefabInstance:
value: Tree
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_RemovedGameObjects:
- {fileID: 145447140513284141, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
- {fileID: 6393388893951408727, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
insertIndex: -1
addedObject: {fileID: 526821483}
- targetCorrespondingSourceObject: {fileID: 8851845362353968682, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
insertIndex: -1
addedObject: {fileID: 526821489}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 63a81e9c39aed7249bdeb557c0054e6c, type: 3}
--- !u!1 &1706699695
GameObject:
@@ -1792,3 +1895,4 @@ SceneRoots:
- {fileID: 1670488070}
- {fileID: 1254619237}
- {fileID: 2035351422}
- {fileID: 730228759}
+3
View File
@@ -76,6 +76,9 @@ public class DamageHandler : MonoBehaviour
private void OnCollisionEnter2D(Collision2D other)
{
if(other.collider.CompareTag("Finish")){
SceneManager.LoadScene(5, LoadSceneMode.Single);
}
float fallSpeed = lastYVelocity;
// Check if we hit hard enough
+23
View File
@@ -1,11 +1,22 @@
using Unity.Cinemachine;
using UnityEngine;
public class PatternSelecter : MonoBehaviour
{
[SerializeField]
private int lastTreeNumber = 8;
public SpriteRenderer spriteRenderer;
public Sprite endTreeSprite;
public BoxCollider2D confine;
public CinemachineConfiner2D confiner2D;
void Start()
{
spriteRenderer = GetComponent<SpriteRenderer>();
confine = GameObject.Find("CameraConfine").GetComponent<BoxCollider2D>();
confiner2D = GameObject.Find("CinemachineCamera").GetComponent<CinemachineConfiner2D>();
foreach (Transform child in transform)
{
child.gameObject.SetActive(false);
@@ -15,10 +26,22 @@ public class PatternSelecter : MonoBehaviour
{
transform.GetChild(0).gameObject.SetActive(true);
}
else if (TreeSpawner.treeCount == lastTreeNumber) // end tree case
{
transform.GetChild(transform.childCount - 1).gameObject.SetActive(true);
spriteRenderer.sprite = endTreeSprite;
transform.localScale = new Vector3(1.05f, 1.05f, 1.05f);
transform.localPosition += new Vector3(0.27f,0.54f,0f);
confine.size += new Vector2(0f, 38f);
confiner2D.InvalidateBoundingShapeCache();
}
else
{
int randomIndex = Random.Range(1, transform.childCount - 1);
transform.GetChild(randomIndex).gameObject.SetActive(true);
confine.size += new Vector2(0f,43f);
confiner2D.InvalidateBoundingShapeCache();
}
}
}
+26 -39
View File
@@ -1,59 +1,46 @@
using System;
using UnityEngine;
public class TreeSpawner : MonoBehaviour
{
[SerializeField]
private GameObject treePrefab;
[SerializeField]
private GameObject treeEndPrefab;
public GameObject treePrefab;
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 && treeCount < maxTreeCount)
{
if (player.position.y < transform.position.y - 3f)
{
hasSpawned = true;
if (hasSpawned) return;
float treeHeight = spriteRenderer.bounds.size.y;
Vector3 spawnPos = transform.position + Vector3.down * treeHeight + new Vector3(0, 0.2f, 0);
Debug.Log("Player Y: " + player.position.y + " | Tree Y + 2: " + (transform.position.y + 2f));
treeCount++;
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);
}
}
if (player.position.y < transform.position.y - 2f)
{
Debug.Log("AUTO SPAWN TRIGGERED");
// Delete trees that are far above the player
if (player.position.y < transform.position.y - 40f)
{
gameObject.SetActive(false);
}
else
{
gameObject.SetActive(true);
hasSpawned = true;
float treeHeight = GetComponent<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);
TreeSpawner spawner = newTree.GetComponent<TreeSpawner>();
spawner.player = player;
spawner.treePrefab = treePrefab;
}
}
}
File diff suppressed because it is too large Load Diff
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f0603f367b8288a43bebeb61dcfb0a09
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant: