marcin/beyond
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wasteland fixes. load next level trigger

Browse Source
This commit is contained in:
szczuras4
2025-11-13 20:23:25 +01:00
parent b4f42cd414
commit 7641a55abe
5 changed files with 914 additions and 16454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Assets/Prefabs/Environments/Trees/DryTree1_2.prefab
View File

@@ -25,13 +25,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 697643398779995642}
serializedVersion: 2
m_LocalRotation: {x: 0.000000028871003, y: -0, z: 0.0000000027939682, 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: 6092136001238120400}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &7917086162189998497
MeshFilter:
@@ -49,9 +49,17 @@ MeshCollider:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 697643398779995642}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 4
serializedVersion: 5
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -5475723283201142710, guid: a17e5056aa251744a8024f590820d619, type: 3}
@@ -80,13 +88,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1143484819231093987}
serializedVersion: 2
m_LocalRotation: {x: 0.000000028871003, y: -0, z: 0.0000000027939682, 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: 6092136001238120400}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &934714131646740098
MeshFilter:
@@ -113,6 +121,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -163,13 +174,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3810806540010128459}
serializedVersion: 2
m_LocalRotation: {x: 0.000000028871003, y: -0, z: 0.0000000027939682, 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: 6092136001238120400}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8340697897997634453
MeshFilter:
@@ -196,6 +207,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
@@ -245,6 +259,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5881394727257946147}
serializedVersion: 2
m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -255,7 +270,6 @@ Transform:
- {fileID: 1176070670483802115}
- {fileID: 7406465048342723393}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!205 &1494775905786636476
LODGroup:
@@ -271,7 +285,7 @@ LODGroup:
m_AnimateCrossFading: 0
m_LastLODIsBillboard: 0
m_LODs:
- screenRelativeHeight: 0.74367267
- screenRelativeHeight: 0.6060225
fadeTransitionWidth: 0
renderers:
- renderer: {fileID: 4238387060805878768}
@@ -309,13 +323,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7214291656053942842}
serializedVersion: 2
m_LocalRotation: {x: 0.000000028871003, y: -0, z: 0.0000000027939682, 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: 6092136001238120400}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8836098550743373832
MeshFilter:
@@ -342,6 +356,9 @@ MeshRenderer:
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:

17242
Assets/Scenes/01_Wasteland/Wasteland.unity
View File

File diff suppressed because it is too large Load Diff

37
Assets/Scripts/Triggers/LoadLevelTrigger.cs
View File

@@ -7,26 +7,41 @@ namespace Beyond
{
public class LoadLevelTrigger : MonoBehaviour
{
public int m_playerLayer;
public int m_levelToLoad = 1;
// Start is called before the first frame update
// Nowa, preferowana zmienna: nazwa sceny do załadowania
[Tooltip("Wpisz nazwę sceny, która ma zostać załadowana. Ma priorytet nad indeksem.")]
public string levelToLoadByName;
// Stara zmienna, teraz jako opcja zapasowa
[Tooltip("Wpisz numer (indeks) sceny z Build Settings. Używane, jeśli nazwa sceny jest pusta.")]
public int levelToLoadByIndex = 1;
// Nie musisz tego ustawiać w inspektorze, Start() zrobi to za Ciebie
private int m_playerLayer;
void Start()
{
m_playerLayer = LayerMask.NameToLayer("Player");
}
// Update is called once per frame
void Update()
{
}
private void OnTriggerEnter(Collider other)
{
// Sprawdzamy, czy obiekt, który wszedł w trigger, jest na warstwie gracza
if (other.gameObject.layer == m_playerLayer)
{
SceneManager.LoadScene(m_levelToLoad);
// Sprawdzamy, czy nazwa sceny została podana w Inspektorze
if (!string.IsNullOrEmpty(levelToLoadByName))
{
// Jeśli tak, ładujemy scenę po nazwie
Debug.Log($"Ładowanie sceny o nazwie: {levelToLoadByName}");
SceneManager.LoadScene(levelToLoadByName);
}
else
{
// Jeśli nie, używamy numeru (indeksu) jako alternatywy
Debug.Log($"Ładowanie sceny o indeksie: {levelToLoadByIndex}");
SceneManager.LoadScene(levelToLoadByIndex);
}
}
}
}
}
}

4
Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat vendored
View File

@@ -65,11 +65,11 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BlendOp: 2
- _BlendOp: 0
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _DstBlend: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1

54
ProjectSettings/EditorBuildSettings.asset
View File

@@ -8,63 +8,15 @@ EditorBuildSettings:
- enabled: 0
path: Assets/Scenes/MainMenu/MainMenu.unity
guid: f76c4914eb27147428d79b9f7a1c000a
- enabled: 1
path: Assets/Scenes/Old_Levels!/TestHub.unity
guid: 236f59b04e57a4940aab8cfaeccb71b5
- enabled: 1
path: Assets/Scenes/Old_Levels!/Land_01/demo_postptrocesINTRO.unity
guid: e96c2977de1cfbd42842bca9554dc468
- enabled: 0
path: Assets/Scenes/Old_Levels!/Intro.unity
guid: 4b539ebea87e44d9d9a11edf96f9313e
- enabled: 0
path: Assets/Scenes/Old_Levels!/Land_01/Land_of_Death_Wasteland.unity
guid: a1589cdbd2c30d24086609fde063c860
- enabled: 0
path: Assets/Scenes/Old_Levels!/Land_01/Land_Of_Death_Demo.unity
guid: e39ef5fabe05d4cc7a91b22299648632
- enabled: 0
path: Assets/Scenes/Old_Levels!/Garden_level/Garden_Oasis.unity
guid: 3c0585b34333d514e9ccf717fbbe3a01
- enabled: 0
path: Assets/Scenes/Old_Levels!/Garden_level/Garden_Demo.unity
guid: b1c9422e4f14e8d4ea7db3e8489a2938
- enabled: 0
path: Assets/Scenes/04_City_of_Feathers/Temple.unity
guid: 4d0a751b6b50dec4d984b2eb03973e2d
- enabled: 0
path: Assets/Scenes/Old_Levels!/Land_01/Land_of_Death_River1_Valley.unity
guid: c672bce19ca8ee545afdbe5a1b0f6a78
- enabled: 0
path: Assets/Scenes/Old_Levels!/Scrolls_chamber/Chamber_of_Ancient_Scrolls.unity
guid: 6d23f0db5664db8458b52027615e1733
- enabled: 0
path: Assets/Scenes/Old_Levels!/Court of law/Court_of_Justice.unity
guid: cf627dbd1138764468513f92eaea5743
- enabled: 0
path: Assets/Scenes/Old_Levels!/Garden_level/Grove_of_Remembrance.unity
guid: 627a24353843c25429684b490270c756
- enabled: 0
path: Assets/Scenes/Old_Levels!/Court of law/Court_Level.unity
guid: aee785a308939054d910e67af5bce6de
- enabled: 1
path: Assets/Scenes/Old_Levels!/Empty.unity
guid: 2b62be7385be240ca97d45739994679b
- enabled: 1
path: Assets/Scenes/Old_Levels!/Portal/Portal.unity
guid: cf1147d8227221747a9f5884efeaeab3
- enabled: 0
path: Assets/Scenes/Old_Levels!/Land_01/Land_of_Death_River1_Valley02.unity
guid: dabdc796f82531d42b4dfb1bab670dda
- enabled: 1
path: Assets/Scenes/00_Fight_Arena/Fight_Arena.unity
guid: c403a1db592cfb34988bc76714980ecf
- enabled: 0
path: Assets/Scenes/Old_Levels!/Land_01/Land_Of_Death_ARENAS.unity
guid: 3ac39dab4b05aa540af7a4bbd73b2a5a
- enabled: 1
path: Assets/Scenes/01_Wasteland/Wasteland.unity
guid: 397bf3b86d1ff9f408fe6b3d8662de22
- enabled: 1
path: Assets/Scenes/02_Ruined_Town/Ruined_Town.unity
guid: ba0c7302a14a53241953c821d0f4a6c2
m_configObjects:
com.unity.addressableassets: {fileID: 11400000, guid: 272caeb75b6504dcb987edb253f851b7,
type: 2}