From eea4992538295af3b9f3b03a0c407c777db09ad7 Mon Sep 17 00:00:00 2001 From: finnchen123 Date: Sun, 25 Jan 2026 11:40:22 +0100 Subject: [PATCH] Reworked main menu to be a bit more "modern" --- Assets/Scenes/MenuScene.unity | 1567 ++---------------------- Assets/Scripts/Handler/SceneHandler.cs | 4 +- Assets/Scripts/Menu/UIHandlerMenu.cs | 22 +- UserSettings/EditorUserSettings.asset | 4 +- UserSettings/Layouts/default-6000.dwlt | 294 ++--- 5 files changed, 187 insertions(+), 1704 deletions(-) diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 18ebab4..a50fe7d 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -187,7 +187,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1222323149} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: AudioHandler, Assembly-CSharp m_MethodName: changeVolumeMusic m_Mode: 1 @@ -566,124 +566,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 31142781} m_CullTransparentMesh: 1 ---- !u!1 &37305980 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 37305981} - - component: {fileID: 37305983} - - component: {fileID: 37305982} - - component: {fileID: 37305984} - m_Layer: 5 - m_Name: txtTitle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &37305981 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37305980} - 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: 2095452659} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.9} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &37305982 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37305980} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 40 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 50 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Options ---- !u!222 &37305983 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37305980} - m_CullTransparentMesh: 1 ---- !u!114 &37305984 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 37305980} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540777 - references: - version: 2 - RefIds: - - rid: 6167802955520540777 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 37305982} - m_TrackedProperties: - items: - - rid: 6167802955520540778 - m_UpdateType: 0 - - rid: 6167802955520540778 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 204887003230208 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &70214462 GameObject: m_ObjectHideFlags: 0 @@ -1209,203 +1091,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &141021448 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 141021449} - - component: {fileID: 141021451} - - component: {fileID: 141021450} - - component: {fileID: 141021452} - m_Layer: 5 - m_Name: txtInformation_Creation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &141021449 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141021448} - 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: 1375575131} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.8} - m_AnchorMax: {x: 1, y: 0.9} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &141021450 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141021448} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Your stats would be:' ---- !u!222 &141021451 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141021448} - m_CullTransparentMesh: 1 ---- !u!114 &141021452 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 141021448} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540739 - references: - version: 2 - RefIds: - - rid: 6167802955520540739 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 141021450} - m_TrackedProperties: - items: - - rid: 6167802955520540740 - m_UpdateType: 0 - - rid: 6167802955520540740 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 204228258426880 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text ---- !u!1 &157667576 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 157667577} - - component: {fileID: 157667579} - - component: {fileID: 157667578} - m_Layer: 5 - m_Name: txtSecondary_Creation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &157667577 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157667576} - 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: 1375575131} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.3} - m_AnchorMax: {x: 1, y: 0.4} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &157667578 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157667576} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Mana: 10' ---- !u!222 &157667579 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 157667576} - m_CullTransparentMesh: 1 --- !u!1 &173092794 GameObject: m_ObjectHideFlags: 0 @@ -1614,124 +1299,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &180050798 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 180050799} - - component: {fileID: 180050801} - - component: {fileID: 180050800} - - component: {fileID: 180050802} - m_Layer: 5 - m_Name: txtTitle - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &180050799 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 180050798} - 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: 1481292146} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.85} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &180050800 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 180050798} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 30 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 3 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Create your character ---- !u!222 &180050801 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 180050798} - m_CullTransparentMesh: 1 ---- !u!114 &180050802 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 180050798} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540775 - references: - version: 2 - RefIds: - - rid: 6167802955520540775 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 180050800} - m_TrackedProperties: - items: - - rid: 6167802955520540776 - m_UpdateType: 0 - - rid: 6167802955520540776 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 204854480596992 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &180478761 GameObject: m_ObjectHideFlags: 0 @@ -3416,6 +2983,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1440330140} + - {fileID: 1108847506} - {fileID: 474550037} - {fileID: 2095452659} - {fileID: 1481292146} @@ -4190,7 +3758,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1108847506} - {fileID: 1541851306} - {fileID: 1554744550} - {fileID: 743820208} @@ -4198,9 +3765,9 @@ RectTransform: m_Father: {fileID: 343734138} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0.2, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -200, y: -100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &474550038 MonoBehaviour: @@ -5582,124 +5149,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 668547645} m_CullTransparentMesh: 1 ---- !u!1 &675301511 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 675301512} - - component: {fileID: 675301514} - - component: {fileID: 675301513} - - component: {fileID: 675301515} - m_Layer: 5 - m_Name: txtIntelligence_Creation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &675301512 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675301511} - 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: 1375575131} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.6} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &675301513 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675301511} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Intelligence: 3' ---- !u!222 &675301514 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675301511} - m_CullTransparentMesh: 1 ---- !u!114 &675301515 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 675301511} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540741 - references: - version: 2 - RefIds: - - rid: 6167802955520540741 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 675301513} - m_TrackedProperties: - items: - - rid: 6167802955520540742 - m_UpdateType: 0 - - rid: 6167802955520540742 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 204284738924544 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &686373972 GameObject: m_ObjectHideFlags: 0 @@ -6085,10 +5534,10 @@ RectTransform: - {fileID: 185642657} m_Father: {fileID: 474550037} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4, y: 0.4} - m_AnchorMax: {x: 0.6, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &743820210 MonoBehaviour: @@ -7257,196 +6706,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 845733261} m_CullTransparentMesh: 1 ---- !u!1 &847644619 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 847644620} - - component: {fileID: 847644623} - - component: {fileID: 847644622} - - component: {fileID: 847644621} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &847644620 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 847644619} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1310071130} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!82 &847644621 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 847644619} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 8300000, guid: a643b25dcc17f2f458d98e5a494862a7, type: 3} - m_PlayOnAwake: 1 - m_Volume: 0.5 - m_Pitch: 1 - Loop: 1 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!81 &847644622 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 847644619} - m_Enabled: 1 ---- !u!20 &847644623 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 847644619} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &851916010 GameObject: m_ObjectHideFlags: 0 @@ -8970,10 +8229,10 @@ RectTransform: - {fileID: 196244595} m_Father: {fileID: 474550037} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4, y: 0.3} - m_AnchorMax: {x: 0.6, y: 0.4} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -150} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1049670408 MonoBehaviour: @@ -9799,17 +9058,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1108847505} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 474550037} + m_Father: {fileID: 343734138} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.2, y: 0.8} - m_AnchorMax: {x: 0.8, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -60} + m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1108847507 MonoBehaviour: @@ -10273,58 +9532,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194965989} m_CullTransparentMesh: 1 ---- !u!1 &1222323148 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1222323150} - - component: {fileID: 1222323149} - m_Layer: 0 - m_Name: AudioHandler - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1222323149 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222323148} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f49961101d617314a83ae0efcd6e4e53, type: 3} - m_Name: - m_EditorClassIdentifier: - buttonClick: {fileID: 8300000, guid: 868b5a8cd8cd1d04897adf179c585721, type: 3} - damage: {fileID: 8300000, guid: 4cf436ecbedc5834a9f7a3a95c528fe7, type: 3} - explosion: {fileID: 8300000, guid: 209619ec9971fd246b339da87c73e288, type: 3} - hit: {fileID: 8300000, guid: 65753950b9b5d05428f59054596d617b, type: 3} - hitDagger: {fileID: 8300000, guid: d9ba382877a5e4741a322762686763e1, type: 3} - IceHit: {fileID: 8300000, guid: 8f3b9e769760f0f428f7a848385fcd6f, type: 3} - LevelUp: {fileID: 8300000, guid: e339df95ea34c164ca490d495a5dfa76, type: 3} - jump: {fileID: 8300000, guid: f728b8c49918c904586cd5f3f636e088, type: 3} ---- !u!4 &1222323150 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1222323148} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1217.8605, y: 407.45404, z: -105.65576} - 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!1 &1225249782 GameObject: m_ObjectHideFlags: 0 @@ -10440,124 +9647,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 28} m_Pivot: {x: 0.5, y: 1} ---- !u!1 &1262821115 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1262821116} - - component: {fileID: 1262821118} - - component: {fileID: 1262821117} - - component: {fileID: 1262821119} - m_Layer: 5 - m_Name: txtHealth_Creation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1262821116 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1262821115} - 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: 1375575131} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.4} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1262821117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1262821115} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Health: 110' ---- !u!222 &1262821118 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1262821115} - m_CullTransparentMesh: 1 ---- !u!114 &1262821119 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1262821115} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540737 - references: - version: 2 - RefIds: - - rid: 6167802955520540737 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1262821117} - m_TrackedProperties: - items: - - rid: 6167802955520540738 - m_UpdateType: 0 - - rid: 6167802955520540738 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 204205768568832 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &1279141932 GameObject: m_ObjectHideFlags: 0 @@ -10867,207 +9956,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1303451072} m_CullTransparentMesh: 1 ---- !u!1001 &1310071129 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalScale.x - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalScale.y - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalScale.z - value: 0.25 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8750254720628266467, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - insertIndex: -1 - addedObject: {fileID: 847644620} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8750254720628266467, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - insertIndex: -1 - addedObject: {fileID: 1310071132} - - targetCorrespondingSourceObject: {fileID: 8750254720628266467, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - insertIndex: -1 - addedObject: {fileID: 1310071133} - m_SourcePrefab: {fileID: 100100000, guid: bc3d049faf6b198a1812d684306308b0, type: 3} ---- !u!4 &1310071130 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8224970270671884121, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - m_PrefabInstance: {fileID: 1310071129} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1310071131 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8750254720628266467, guid: bc3d049faf6b198a1812d684306308b0, type: 3} - m_PrefabInstance: {fileID: 1310071129} - m_PrefabAsset: {fileID: 0} ---- !u!82 &1310071132 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1310071131} - m_Enabled: 1 - serializedVersion: 4 - OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 0 - m_Volume: 0.5 - m_Pitch: 1 - Loop: 0 - Mute: 0 - Spatialize: 0 - SpatializePostEffects: 0 - Priority: 128 - DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 - Pan2D: 0 - rolloffMode: 0 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - panLevelCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - spreadCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - reverbZoneMixCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 ---- !u!114 &1310071133 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1310071131} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac07c553f4e010e8299fb870481dcc49, type: 3} - m_Name: - m_EditorClassIdentifier: - speed: 5 - leftHands: [] - rightHands: [] - isArmed: 0 --- !u!1 &1311414695 GameObject: m_ObjectHideFlags: 0 @@ -11078,7 +9966,7 @@ GameObject: m_Component: - component: {fileID: 1311414698} - component: {fileID: 1311414697} - - component: {fileID: 1311414696} + - component: {fileID: 1311414699} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -11086,26 +9974,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1311414696 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1311414695} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &1311414697 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11136,6 +10004,37 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1311414699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1311414695} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!1 &1314582266 GameObject: m_ObjectHideFlags: 0 @@ -11807,9 +10706,9 @@ RectTransform: m_Father: {fileID: 2095452659} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.1} - m_AnchorMax: {x: 1, y: 0.9} - m_AnchoredPosition: {x: 0, y: 12.5} - m_SizeDelta: {x: -100, y: -25} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1348951834 Animator: @@ -12427,87 +11326,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Text ---- !u!1 &1375575130 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1375575131} - - component: {fileID: 1375575133} - - component: {fileID: 1375575132} - m_Layer: 5 - m_Name: pnlInformation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1375575131 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375575130} - 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: - - {fileID: 141021449} - - {fileID: 1618237073} - - {fileID: 1747008757} - - {fileID: 675301512} - - {fileID: 1262821116} - - {fileID: 157667577} - m_Father: {fileID: 1481292146} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.75, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1375575132 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375575130} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.27058825, g: 0.4117647, b: 0.5647059, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1375575133 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1375575130} - m_CullTransparentMesh: 1 --- !u!1 &1398740018 GameObject: m_ObjectHideFlags: 0 @@ -13142,8 +11960,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 350, y: -250} - m_SizeDelta: {x: 700, y: 500} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1440330142 CanvasRenderer: @@ -13166,14 +11984,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.07717874, g: 0.16196828, b: 0.2811321, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: d4b2a4de5e982f066a1963aa65bedb2b, type: 3} + m_Texture: {fileID: 0} m_UVRect: serializedVersion: 2 x: 0 @@ -13443,17 +12261,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 180050799} - - {fileID: 1375575131} - {fileID: 2093776663} - {fileID: 1122914073} - {fileID: 2008818877} m_Father: {fileID: 343734138} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.22, y: 0.02} + m_AnchorMax: {x: 0.98, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -200, y: -100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1481292147 MonoBehaviour: @@ -13642,10 +12458,10 @@ RectTransform: - {fileID: 205373052} m_Father: {fileID: 474550037} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4, y: 0.6} - m_AnchorMax: {x: 0.6, y: 0.7} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 150} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1541851308 MonoBehaviour: @@ -13775,10 +12591,10 @@ RectTransform: - {fileID: 2067052853} m_Father: {fileID: 474550037} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4, y: 0.5} - m_AnchorMax: {x: 0.6, y: 0.6} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 50} + m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1554744552 MonoBehaviour: @@ -14682,124 +13498,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1609529336} m_CullTransparentMesh: 1 ---- !u!1 &1618237072 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1618237073} - - component: {fileID: 1618237075} - - component: {fileID: 1618237074} - - component: {fileID: 1618237076} - m_Layer: 5 - m_Name: txtStrength_Creation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1618237073 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618237072} - 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: 1375575131} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.7} - m_AnchorMax: {x: 1, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1618237074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618237072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'Strength: 7' ---- !u!222 &1618237075 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618237072} - m_CullTransparentMesh: 1 ---- !u!114 &1618237076 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618237072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540773 - references: - version: 2 - RefIds: - - rid: 6167802955520540773 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1618237074} - m_TrackedProperties: - items: - - rid: 6167802955520540774 - m_UpdateType: 0 - - rid: 6167802955520540774 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 204826445869056 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &1619728938 GameObject: m_ObjectHideFlags: 0 @@ -15940,7 +14638,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1222323149} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: AudioHandler, Assembly-CSharp m_MethodName: changeVolumeEffects m_Mode: 1 @@ -16139,124 +14837,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1745437621} m_CullTransparentMesh: 1 ---- !u!1 &1747008756 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1747008757} - - component: {fileID: 1747008759} - - component: {fileID: 1747008758} - - component: {fileID: 1747008760} - m_Layer: 5 - m_Name: txtDexterity_Creation - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1747008757 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747008756} - 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: 1375575131} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.6} - m_AnchorMax: {x: 1, y: 0.7} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -20, y: -10} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1747008758 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747008756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.1764706, g: 0.84705883, b: 0.5058824, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 2b8c3fce9287a0e499b95c5a3fb17529, type: 3} - m_FontSize: 14 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: G ---- !u!222 &1747008759 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747008756} - m_CullTransparentMesh: 1 ---- !u!114 &1747008760 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1747008756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540729 - references: - version: 2 - RefIds: - - rid: 6167802955520540729 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1747008758} - m_TrackedProperties: - items: - - rid: 6167802955520540730 - m_UpdateType: 0 - - rid: 6167802955520540730 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 203809884991488 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &1754062989 GameObject: m_ObjectHideFlags: 0 @@ -18922,16 +17502,15 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 37305981} - {fileID: 1348951833} - {fileID: 813310407} - {fileID: 173416686} m_Father: {fileID: 343734138} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.22, y: 0.02} + m_AnchorMax: {x: 0.98, y: 0.8} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -300, y: -100} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2095452660 MonoBehaviour: @@ -19294,11 +17873,9 @@ RectTransform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1310071129} - {fileID: 343734138} - {fileID: 1945274722} - {fileID: 686373974} - - {fileID: 1222323150} - {fileID: 1920075167} - {fileID: 1311414698} - {fileID: 356515707} diff --git a/Assets/Scripts/Handler/SceneHandler.cs b/Assets/Scripts/Handler/SceneHandler.cs index 9020b3e..5fa72b8 100644 --- a/Assets/Scripts/Handler/SceneHandler.cs +++ b/Assets/Scripts/Handler/SceneHandler.cs @@ -24,8 +24,8 @@ namespace Assets.Scripts } if (!hasSceneHandler) { - DontDestroyOnLoad(this.gameObject); - this.gameObject.name = "SceneHandlerLoaded"; + DontDestroyOnLoad(gameObject); + gameObject.name = "SceneHandlerLoaded"; } } diff --git a/Assets/Scripts/Menu/UIHandlerMenu.cs b/Assets/Scripts/Menu/UIHandlerMenu.cs index 69ec0c3..9fa78e9 100644 --- a/Assets/Scripts/Menu/UIHandlerMenu.cs +++ b/Assets/Scripts/Menu/UIHandlerMenu.cs @@ -22,29 +22,13 @@ namespace Assets.Scripts.Menu FileHandler.loadOptions(false); options.transform.localScale = new Vector3(0,0,0); characterCreation.transform.localScale = new Vector3(0,0,0); - mainMenu.transform.localScale = new Vector3(1,1,1); SteamWorksHandler.getStandardAchievement("StartAchievement"); EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart")); } public void startGame(SceneHandler sceneHandler) { - int cityAmount = 0; - switch (GameObject.Find("dropSize").GetComponent().value) - { - case 0: - cityAmount = 5; - break; - case 1: - cityAmount = 10; - break; - case 2: - cityAmount = 20; - break; - case 3: - cityAmount = 40; - break; - } + int cityAmount = GameObject.Find("dropSize").GetComponent().value * 5 + 5; PlayerPrefs.SetInt("cityAmount", cityAmount); PlayerPrefs.SetInt("class", GameObject.Find("dropClass").GetComponent().value); PlayerPrefs.SetInt("race", GameObject.Find("dropRace").GetComponent().value); @@ -102,7 +86,6 @@ namespace Assets.Scripts.Menu { options.transform.localScale = new Vector3(0,0,0); characterCreation.transform.localScale = new Vector3(1,1,1); - mainMenu.transform.localScale = new Vector3(0,0,0); EventSystem.current.SetSelectedGameObject(GameObject.Find("inName")); } @@ -110,7 +93,6 @@ namespace Assets.Scripts.Menu { options.transform.localScale = new Vector3(0,0,0); characterCreation.transform.localScale = new Vector3(0,0,0); - mainMenu.transform.localScale = new Vector3(1,1,1); EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart")); } @@ -118,7 +100,6 @@ namespace Assets.Scripts.Menu { options.transform.localScale = new Vector3(1,1,1); characterCreation.transform.localScale = new Vector3(0,0,0); - mainMenu.transform.localScale = new Vector3(0,0,0); FileHandler.loadOptionDisplay(); EventSystem.current.SetSelectedGameObject(GameObject.Find("btnAudio")); showOptionView("audio"); @@ -128,7 +109,6 @@ namespace Assets.Scripts.Menu { options.transform.localScale = new Vector3(0,0,0); characterCreation.transform.localScale = new Vector3(0,0,0); - mainMenu.transform.localScale = new Vector3(1,1,1); EventSystem.current.SetSelectedGameObject(GameObject.Find("btnStart")); } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 5a71027..ececa2f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,10 +18,10 @@ EditorUserSettings: value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d flags: 0 RecentlyUsedSceneGuid-4: - value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-5: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 03652eb..b16fdb5 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -1,30 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.ContainerWindow - m_PixelRect: - serializedVersion: 2 - x: 3840 - y: 28 - width: 1920 - height: 1052 - m_ShowMode: 0 - m_Title: Game - m_RootView: {fileID: 4} - m_MinSize: {x: 100, y: 126} - m_MaxSize: {x: 4000, y: 4026} - m_Maximized: 0 ---- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -38,68 +14,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 1920 + x: 0 y: 28 width: 1920 - height: 971 + height: 998 m_ShowMode: 4 - m_Title: Hierarchy - m_RootView: {fileID: 5} + m_Title: Project + m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_Maximized: 0 ---- !u!114 &3 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.DockArea - m_Children: [] - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 1052 - m_MinSize: {x: 100, y: 126} - m_MaxSize: {x: 4000, y: 4026} - m_ActualView: {fileID: 18} - m_Panes: - - {fileID: 18} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &4 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: UnityEditor.dll::UnityEditor.SplitView - m_Children: - - {fileID: 3} - m_Position: - serializedVersion: 2 - x: 0 - y: 0 - width: 1920 - height: 1052 - m_MinSize: {x: 100, y: 126} - m_MaxSize: {x: 4000, y: 4026} - vertical: 0 - controlID: 14 - draggingID: 0 ---- !u!114 &5 +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -112,22 +37,22 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 8} - - {fileID: 7} + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 - height: 971 + height: 998 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 m_TopViewHeight: 36 m_UseBottomView: 1 m_BottomViewHeight: 20 ---- !u!114 &6 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -149,7 +74,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &7 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -165,12 +90,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 951 + y: 978 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &8 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -183,19 +108,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 9} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 36 width: 1920 - height: 915 + height: 942 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 125 + controlID: 115 draggingID: 0 ---- !u!114 &9 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -208,20 +133,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 15} + - {fileID: 7} + - {fileID: 12} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 - height: 915 + height: 942 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 126 + controlID: 116 draggingID: 0 ---- !u!114 &10 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -234,20 +159,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: + - {fileID: 8} - {fileID: 11} - - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1454 - height: 915 + width: 1585 + height: 942 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 64 + controlID: 66 draggingID: 0 ---- !u!114 &11 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -260,20 +185,20 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 12} - - {fileID: 13} + - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1454 - height: 626 + width: 1585 + height: 666 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 65 + controlID: 41 draggingID: 0 ---- !u!114 &12 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,16 +215,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 359 - height: 626 + width: 272 + height: 666 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 17} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &13 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -309,23 +234,24 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 359 + x: 272 y: 0 - width: 1095 - height: 626 - m_MinSize: {x: 202, y: 226} + width: 1313 + height: 666 + m_MinSize: {x: 102, y: 126} m_MaxSize: {x: 4002, y: 4026} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 16} - m_Selected: 0 + - {fileID: 13} + - {fileID: 15} + m_Selected: 1 m_LastSelected: 0 ---- !u!114 &14 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -341,18 +267,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 626 - width: 1454 - height: 289 + y: 666 + width: 1585 + height: 276 m_MinSize: {x: 231, y: 276} m_MaxSize: {x: 10001, y: 10026} - m_ActualView: {fileID: 19} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 19} - - {fileID: 20} + - {fileID: 16} + - {fileID: 17} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &15 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -367,18 +293,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1454 + x: 1585 y: 0 - width: 466 - height: 915 + width: 335 + height: 942 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 21} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -399,10 +325,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 360 - y: 24 - width: 1093 - height: 600 + x: 272 + y: 91 + width: 1311 + height: 660 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -929,9 +855,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 97.26449, y: 79.453186, z: -124.13573} + m_Target: {x: 956.78033, y: 695.2206, z: -952.8458} speed: 2 - m_Value: {x: 97.26449, y: 79.453186, z: -124.13573} + m_Value: {x: 956.78033, y: 695.2206, z: -952.8458} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -977,13 +903,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.42115283, y: 0.37659967, z: -0.1979821, w: -0.8009632} + m_Target: {x: -0.07120285, y: -0.00030142665, z: 0.000060114395, w: -0.9974253} speed: 2 - m_Value: {x: -0.4211528, y: 0.37659967, z: -0.1979821, w: -0.80096316} + m_Value: {x: -0.07120285, y: -0.00030142665, z: 0.0000601144, w: -0.9974254} m_Size: - m_Target: 0.30661905 + m_Target: 49.981224 speed: 2 - m_Value: 0.30661905 + m_Value: 49.981224 m_Ortho: m_Target: 0 speed: 2 @@ -1004,7 +930,7 @@ MonoBehaviour: m_LastSceneViewRotation: {x: -0.15849097, y: 0.83661556, z: -0.318175, w: -0.41673577} m_LastSceneViewOrtho: 0 m_Viewpoint: - m_SceneView: {fileID: 16} + m_SceneView: {fileID: 13} m_CameraOverscanSettings: m_Opacity: 50 m_Scale: 1 @@ -1017,7 +943,7 @@ MonoBehaviour: name: Contributors / Receivers section: Lighting m_ViewIsLockedToObject: 0 ---- !u!114 &17 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1040,8 +966,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 358 - height: 600 + width: 271 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1075,7 +1001,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1083,7 +1009,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 ---- !u!114 &18 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1104,10 +1030,10 @@ MonoBehaviour: m_TextWithWhitespace: "Game\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 26 - width: 1920 - height: 1026 + x: 273 + y: 24 + width: 1311 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1163,30 +1089,30 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1920 - height: 1005 - m_Scale: {x: 0.93055564, y: 0.9305556} - m_Translation: {x: 960, y: 502.5} + width: 1311 + height: 638 + m_Scale: {x: 0.59074074, y: 0.59074074} + m_Translation: {x: 655.5, y: 319} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1031.6417 + x: -1109.6238 y: -540 - width: 2063.2834 + width: 2219.2476 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.9305556 - m_LastWindowPixelSize: {x: 1920, y: 1026} + m_defaultScale: 0.59074074 + m_LastWindowPixelSize: {x: 1311, y: 659} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} m_showToolbar: 1 ---- !u!114 &19 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1208,9 +1134,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 650 - width: 1453 - height: 263 + y: 690 + width: 1584 + height: 250 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1233,7 +1159,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Scenes m_Globs: [] m_ProductIds: m_AnyWithAssetOrigin: 0 @@ -1243,16 +1169,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: /media/nicola/M2SSD/Programmieren/Unity/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 46} - m_SelectedIDs: 629c0000 - m_LastClickedID: 40034 - m_ExpandedIDs: 000000008a9b00008c9b00008e9b0000909b0000929b0000 + m_SelectedIDs: ce930000 + m_LastClickedID: 37838 + m_ExpandedIDs: 00000000f0920000f2920000f4920000f6920000f8920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1269,7 +1195,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1281,7 +1207,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000008a9b00008c9b00008e9b0000909b0000929b0000 + m_ExpandedIDs: 00000000f0920000f2920000f4920000f6920000f8920000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1327,7 +1253,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 1 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 14} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -1339,7 +1265,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &20 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1360,10 +1286,10 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 1920 - y: 715 - width: 1455 - height: 265 + x: 0 + y: 777 + width: 1584 + height: 257 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1375,7 +1301,7 @@ MonoBehaviour: m_SaveData: [] m_ContainerData: [] m_OverlaysVisible: 1 ---- !u!114 &21 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1396,10 +1322,10 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1455 + x: 1586 y: 24 - width: 465 - height: 889 + width: 334 + height: 916 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0