PBA3H25ABU/ClearTheZone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.bib.de/PBA3H25ABU/ClearTheZone

Browse Source
This commit is contained in:
GodGodGod20081
2026-06-12 12:52:53 +02:00
parent 5cb6dbc6ab 572cc5a8b0
commit 701aee6d2f
9 changed files with 290 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Menue.unity
+52 -3
View File
@@ -201,7 +201,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 341578677}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 553970791}
m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp
m_MethodName: ChangeScene
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Story1
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &341578677
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -331,6 +343,7 @@ GameObject:
- component: {fileID: 553970789}
- component: {fileID: 553970788}
- component: {fileID: 553970787}
- component: {fileID: 553970791}
m_Layer: 5
m_Name: Canvas
m_TagString: Untagged
@@ -424,6 +437,18 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &553970791
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 553970786}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 039d8264ac1c9ed42a3657361d73ced5, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::SceneManager
--- !u!1 &665899625
GameObject:
m_ObjectHideFlags: 0
@@ -712,7 +737,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1279372964}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 553970791}
m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp
m_MethodName: Quit
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1279372964
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -912,7 +949,19 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1498331877}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 553970791}
m_TargetAssemblyTypeName: UIHandler, Assembly-CSharp
m_MethodName: ChangeScene
m_Mode: 5
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument: Random
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1498331877
MonoBehaviour:
m_ObjectHideFlags: 0
Assets/Scenes/Random.unity
+88
View File
@@ -119,6 +119,63 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &356968797
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3945699778904299871, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5850548977863442861, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
propertyPath: m_Name
value: AR
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 46014def5fa85504abb9cc3190ae45e3, type: 3}
--- !u!1 &366012393
GameObject:
m_ObjectHideFlags: 0
@@ -221,6 +278,7 @@ GameObject:
m_Component:
- component: {fileID: 1367817611}
- component: {fileID: 1367817610}
- component: {fileID: 1367817612}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
@@ -308,9 +366,39 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &1367817612
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1367817609}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 366012396}
- {fileID: 1367817611}
- {fileID: 356968797}
Assets/Scenes/Story1.unity
+88
View File
@@ -129,6 +129,7 @@ GameObject:
m_Component:
- component: {fileID: 667962613}
- component: {fileID: 667962612}
- component: {fileID: 667962614}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
@@ -216,6 +217,92 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!114 &667962614
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 667962611}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalLightData
m_UsePipelineSettings: 1
m_AdditionalLightsShadowResolutionTier: 2
m_CustomShadowLayers: 0
m_LightCookieSize: {x: 1, y: 1}
m_LightCookieOffset: {x: 0, y: 0}
m_SoftShadowQuality: 0
m_RenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_ShadowRenderingLayersMask:
serializedVersion: 0
m_Bits: 1
m_Version: 4
m_LightLayerMask: 1
m_ShadowLayerMask: 1
m_RenderingLayers: 1
m_ShadowRenderingLayers: 1
--- !u!1001 &1064253376
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8784282306228562304, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9006118872082338741, guid: 88c46c91955699a44af1f347871e9712, type: 3}
propertyPath: m_Name
value: Wand_Cube
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 88c46c91955699a44af1f347871e9712, type: 3}
--- !u!1 &1636241674
GameObject:
m_ObjectHideFlags: 0
@@ -314,3 +401,4 @@ SceneRoots:
m_Roots:
- {fileID: 1636241677}
- {fileID: 667962613}
- {fileID: 1064253376}
Assets/Scripts/PlayerController.cs
+23
View File
@@ -0,0 +1,23 @@
//Oliver
using UnityEngine;
using UnityEngine.UI;
public class PlayerController : MonoBehaviour
{
private int speed;
Vector3 position = Vector3.zero;
private Text score;
private int points;
Rigidbody rb;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
rb = GetComponent<Rigidbody>;
}
// Update is called once per frame
void Update()
{
}
}
Assets/Scripts/PlayerController.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 5e857b6f5c4484c449d9e726f2fc5d36
Assets/Scripts/UIHandler.cs
+26
View File
@@ -0,0 +1,26 @@
// Oliver
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UI;
public class UIHandler : MonoBehaviour
{
public void Start()
{
}
public void ChangeScene(string sceneName)
{
SceneManager.LoadScene(sceneName);
}
public void Quit()
{
#if UNITY_EDITOR
UnityEditor.EditorApplication.isPlaying = false;
#else
Application.Quit();
#endif
}
}
Assets/Scripts/UIHandler.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 039d8264ac1c9ed42a3657361d73ced5
ProjectSettings/EditorBuildSettings.asset
+8 -2
View File
@@ -6,8 +6,14 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
path: Assets/Scenes/Test_Scene.unity
guid: 99c9720ab356a0642a771bea13969a05
path: Assets/Scenes/Menue.unity
guid: e6a36e5d13f813b4887da46ee4b26234
- enabled: 1
path: Assets/Scenes/Random.unity
guid: 83a44fbd84b326f4884f7139bafcbabf
- enabled: 1
path: Assets/Scenes/Story1.unity
guid: a12c64270a5146f4eb756ca10899ee54
m_configObjects:
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3}
m_UseUCBPForAssetBundles: 0
ProjectSettings/ProjectSettings.asset
+1 -1
View File
@@ -922,7 +922,7 @@ PlayerSettings:
qnxGraphicConfPath:
apiCompatibilityLevel: 6
captureStartupLogs: {}
activeInputHandler: 1
activeInputHandler: 2
windowsGamepadBackendHint: 0
cloudProjectId: d30d193c-eff6-410a-8888-31392bb82cbb
framebufferDepthMemorylessMode: 0