From 8174d1d07d4217c3730aa5f415fd1277f1bf0a62 Mon Sep 17 00:00:00 2001 From: Eric-Holman <138829227+Eric-Holman@users.noreply.github.com> Date: Mon, 10 Jul 2023 23:44:47 -0400 Subject: [PATCH 1/3] testing --- .../Assets/Graphics/Backgrounds/Main Menu.cs | 16 +++++ .../Graphics/Backgrounds/Main Menu.cs.meta | 11 +++ .../Assets/Graphics/Backgrounds/MainMenu.cs | 5 +- .../Start Menu Background 1.controller | 72 +++++++++++++++++++ .../Start Menu Background 1.controller.meta | 8 +++ 5 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs create mode 100644 TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs.meta create mode 100644 TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller create mode 100644 TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller.meta diff --git a/TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs new file mode 100644 index 00000000..2b11895b --- /dev/null +++ b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs @@ -0,0 +1,16 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MainMenu : MonoBehaviour +{ + public void PlayGame() + { + SceneManager.LoadScene(SceneManager.GetAciveScene().buildIndex * 1); + } + + public void QuitGame() + { + Application.Quit(); + } +} diff --git a/TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs.meta b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs.meta new file mode 100644 index 00000000..7963669f --- /dev/null +++ b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Main Menu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 220a6f2f07fa940479257d606bb442b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TechwiseRPGProject/Assets/Graphics/Backgrounds/MainMenu.cs b/TechwiseRPGProject/Assets/Graphics/Backgrounds/MainMenu.cs index 51ba8490..2b11895b 100644 --- a/TechwiseRPGProject/Assets/Graphics/Backgrounds/MainMenu.cs +++ b/TechwiseRPGProject/Assets/Graphics/Backgrounds/MainMenu.cs @@ -1,17 +1,16 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using UnityEngine.SceneManagement; + public class MainMenu : MonoBehaviour { public void PlayGame() { - SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex + 1); + SceneManager.LoadScene(SceneManager.GetAciveScene().buildIndex * 1); } public void QuitGame() { - Debug.Log("QUIT)"); Application.Quit(); } } diff --git a/TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller new file mode 100644 index 00000000..68af4538 --- /dev/null +++ b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-4532435118961048736 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Newest BAckground Animated + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 20bb5fd2d1973084fa63e3124f8dd245, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-2372550116105059033 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -4532435118961048736} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -4532435118961048736} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Start Menu Background 1 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2372550116105059033} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller.meta b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller.meta new file mode 100644 index 00000000..87f9f0ed --- /dev/null +++ b/TechwiseRPGProject/Assets/Graphics/Backgrounds/Start Menu Background 1.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92b1dac3168d0384c89b0297e3e3724c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: From 53409d5df8c5b80ee11bcf9c7b3aeb432c2c689c Mon Sep 17 00:00:00 2001 From: Eric-Holman <138829227+Eric-Holman@users.noreply.github.com> Date: Mon, 10 Jul 2023 22:26:36 -0400 Subject: [PATCH 2/3] Background Changes + Color Changed Color and Background From 65a8f27c5a5a6070b01d6c5857ab850c4a209a36 Mon Sep 17 00:00:00 2001 From: Eric-Holman <138829227+Eric-Holman@users.noreply.github.com> Date: Sat, 15 Jul 2023 00:43:27 -0400 Subject: [PATCH 3/3] Pause Menu --- .../Assets/Icons/Material.preset | 811 ++++++++++++ .../Assets/Icons/Material.preset.meta | 8 + TechwiseRPGProject/Assets/PauseMenu.cs | 52 + TechwiseRPGProject/Assets/PauseMenu.cs.meta | 11 + .../Assets/{Update.unity => Scene Open.unity} | 1157 ++++++++++++++++- ...pdate.unity.meta => Scene Open.unity.meta} | 0 .../Fonts & Materials/Oswald Bold SDF.asset | 8 + .../Fonts & Materials/Roboto-Bold SDF.asset | 8 + .../LiberationSans SDF - Fallback.asset | 8 + .../ProjectSettings/EditorBuildSettings.asset | 8 + 10 files changed, 2042 insertions(+), 29 deletions(-) create mode 100644 TechwiseRPGProject/Assets/Icons/Material.preset create mode 100644 TechwiseRPGProject/Assets/Icons/Material.preset.meta create mode 100644 TechwiseRPGProject/Assets/PauseMenu.cs create mode 100644 TechwiseRPGProject/Assets/PauseMenu.cs.meta rename TechwiseRPGProject/Assets/{Update.unity => Scene Open.unity} (78%) rename TechwiseRPGProject/Assets/{Update.unity.meta => Scene Open.unity.meta} (100%) diff --git a/TechwiseRPGProject/Assets/Icons/Material.preset b/TechwiseRPGProject/Assets/Icons/Material.preset new file mode 100644 index 00000000..4958bc67 --- /dev/null +++ b/TechwiseRPGProject/Assets/Icons/Material.preset @@ -0,0 +1,811 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!181963792 &2655988077585873504 +Preset: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Material + m_TargetType: + m_NativeTypeID: 21 + m_ManagedTypePPtr: {fileID: 0} + m_ManagedTypeFallback: + m_Properties: + - target: {fileID: 0} + propertyPath: m_Shader + value: + objectReference: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3} + - target: {fileID: 0} + propertyPath: m_ValidKeywords.Array.size + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ValidKeywords.Array.data[0] + value: BEVEL_ON + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ValidKeywords.Array.data[1] + value: GLOW_ON + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_ValidKeywords.Array.data[2] + value: UNDERLAY_ON + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_InvalidKeywords.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LightmapFlags + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_EnableInstancingVariants + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_DoubleSidedGI + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_CustomRenderQueue + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: stringTagMap.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: disabledShaderPasses.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.size + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[0].first + value: _BumpMap + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[0].second.m_Texture + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[0].second.m_Scale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[0].second.m_Scale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[0].second.m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[0].second.m_Offset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[1].first + value: _Cube + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[1].second.m_Texture + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[1].second.m_Scale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[1].second.m_Scale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[1].second.m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[1].second.m_Offset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[2].first + value: _FaceTex + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[2].second.m_Texture + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[2].second.m_Scale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[2].second.m_Scale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[2].second.m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[2].second.m_Offset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[3].first + value: _MainTex + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[3].second.m_Texture + value: + objectReference: {fileID: 6118288836725464457, guid: c85ef282494e98b4d885590f662756cb, type: 2} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[3].second.m_Scale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[3].second.m_Scale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[3].second.m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[3].second.m_Offset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[4].first + value: _OutlineTex + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[4].second.m_Texture + value: + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[4].second.m_Scale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[4].second.m_Scale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[4].second.m_Offset.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_TexEnvs.Array.data[4].second.m_Offset.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Ints.Array.size + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.size + value: 51 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[0].first + value: _Ambient + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[0].second + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[1].first + value: _Bevel + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[1].second + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[2].first + value: _BevelClamp + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[2].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[3].first + value: _BevelOffset + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[3].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[4].first + value: _BevelRoundness + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[4].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[5].first + value: _BevelWidth + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[5].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[6].first + value: _BumpFace + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[6].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[7].first + value: _BumpOutline + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[7].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[8].first + value: _ColorMask + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[8].second + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[9].first + value: _CullMode + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[9].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[10].first + value: _Diffuse + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[10].second + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[11].first + value: _FaceDilate + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[11].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[12].first + value: _FaceUVSpeedX + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[12].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[13].first + value: _FaceUVSpeedY + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[13].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[14].first + value: _GlowInner + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[14].second + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[15].first + value: _GlowOffset + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[15].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[16].first + value: _GlowOuter + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[16].second + value: 0.05 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[17].first + value: _GlowPower + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[17].second + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[18].first + value: _GradientScale + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[18].second + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[19].first + value: _LightAngle + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[19].second + value: 3.1416 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[20].first + value: _MaskSoftnessX + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[20].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[21].first + value: _MaskSoftnessY + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[21].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[22].first + value: _OutlineSoftness + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[22].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[23].first + value: _OutlineUVSpeedX + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[23].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[24].first + value: _OutlineUVSpeedY + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[24].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[25].first + value: _OutlineWidth + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[25].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[26].first + value: _PerspectiveFilter + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[26].second + value: 0.875 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[27].first + value: _Reflectivity + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[27].second + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[28].first + value: _ScaleRatioA + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[28].second + value: 0.8333333 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[29].first + value: _ScaleRatioB + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[29].second + value: 0.6770833 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[30].first + value: _ScaleRatioC + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[30].second + value: 0.6770833 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[31].first + value: _ScaleX + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[31].second + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[32].first + value: _ScaleY + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[32].second + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[33].first + value: _ShaderFlags + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[33].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[34].first + value: _Sharpness + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[34].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[35].first + value: _SpecularPower + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[35].second + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[36].first + value: _Stencil + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[36].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[37].first + value: _StencilComp + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[37].second + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[38].first + value: _StencilOp + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[38].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[39].first + value: _StencilReadMask + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[39].second + value: 255 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[40].first + value: _StencilWriteMask + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[40].second + value: 255 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[41].first + value: _TextureHeight + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[41].second + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[42].first + value: _TextureWidth + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[42].second + value: 512 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[43].first + value: _UnderlayDilate + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[43].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[44].first + value: _UnderlayOffsetX + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[44].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[45].first + value: _UnderlayOffsetY + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[45].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[46].first + value: _UnderlaySoftness + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[46].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[47].first + value: _VertexOffsetX + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[47].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[48].first + value: _VertexOffsetY + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[48].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[49].first + value: _WeightBold + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[49].second + value: 0.75 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[50].first + value: _WeightNormal + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Floats.Array.data[50].second + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.size + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[0].first + value: _ClipRect + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[0].second.r + value: -32767 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[0].second.g + value: -32767 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[0].second.b + value: 32767 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[0].second.a + value: 32767 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[1].first + value: _EnvMatrixRotation + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[1].second.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[1].second.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[1].second.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[1].second.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[2].first + value: _FaceColor + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[2].second.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[2].second.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[2].second.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[2].second.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[3].first + value: _GlowColor + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[3].second.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[3].second.g + value: 0.90907556 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[3].second.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[3].second.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[4].first + value: _MaskCoord + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[4].second.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[4].second.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[4].second.b + value: 32767 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[4].second.a + value: 32767 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[5].first + value: _OutlineColor + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[5].second.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[5].second.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[5].second.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[5].second.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[6].first + value: _ReflectFaceColor + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[6].second.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[6].second.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[6].second.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[6].second.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[7].first + value: _ReflectOutlineColor + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[7].second.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[7].second.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[7].second.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[7].second.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[8].first + value: _SpecularColor + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[8].second.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[8].second.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[8].second.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[8].second.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[9].first + value: _UnderlayColor + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SavedProperties.m_Colors.Array.data[9].second.a + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_BuildTextureStacks.Array.size + value: 0 + objectReference: {fileID: 0} + m_ExcludedProperties: [] diff --git a/TechwiseRPGProject/Assets/Icons/Material.preset.meta b/TechwiseRPGProject/Assets/Icons/Material.preset.meta new file mode 100644 index 00000000..61f3161b --- /dev/null +++ b/TechwiseRPGProject/Assets/Icons/Material.preset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f131db50b074404f97a0fbcae034750 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2655988077585873504 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TechwiseRPGProject/Assets/PauseMenu.cs b/TechwiseRPGProject/Assets/PauseMenu.cs new file mode 100644 index 00000000..36415c2b --- /dev/null +++ b/TechwiseRPGProject/Assets/PauseMenu.cs @@ -0,0 +1,52 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class PauseMenu : MonoBehaviour +{ + public static bool GameIsPaused = false; + + public GameObject pauseMenuUI; + + void Update() + { + if (Input.GetKeyDown(KeyCode.Escape)) + { + if (GameIsPaused) + { + Resume(); + } else + { + Pause(); + } + } + } + + public void Resume () + { + pauseMenuUI.SetActive(false); + Time.timeScale = 1f; + GameIsPaused = false; + } + void Pause () + { + pauseMenuUI.SetActive(true); + Time.timeScale = 0f; + GameIsPaused = true; + } + + public void LoadMenu() + + { + Time.timeScale = 1f; + SceneManager.LoadScene("Menu"); + } + + public void QuitGame() + { + Debug.Log("Quitting game..."); + Application.Quit(); + } +} + diff --git a/TechwiseRPGProject/Assets/PauseMenu.cs.meta b/TechwiseRPGProject/Assets/PauseMenu.cs.meta new file mode 100644 index 00000000..08df7c14 --- /dev/null +++ b/TechwiseRPGProject/Assets/PauseMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9e4058925feaab54e861a6adfba2e03d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TechwiseRPGProject/Assets/Update.unity b/TechwiseRPGProject/Assets/Scene Open.unity similarity index 78% rename from TechwiseRPGProject/Assets/Update.unity rename to TechwiseRPGProject/Assets/Scene Open.unity index 5914f695..8ffbbf4b 100644 --- a/TechwiseRPGProject/Assets/Update.unity +++ b/TechwiseRPGProject/Assets/Scene Open.unity @@ -1125,6 +1125,7 @@ GameObject: - component: {fileID: 311455975} - component: {fileID: 311455980} - component: {fileID: 311455979} + - component: {fileID: 311455981} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -1210,6 +1211,7 @@ RectTransform: - {fileID: 2015870098} - {fileID: 515827823} - {fileID: 1625779712} + - {fileID: 1086248966} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1242,6 +1244,154 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 31849f5aeb3859846a0abd1d8e8f5320, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &311455981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 311455974} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e4058925feaab54e861a6adfba2e03d, type: 3} + m_Name: + m_EditorClassIdentifier: + pauseMenuUI: {fileID: 0} +--- !u!1 &320450055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320450056} + - component: {fileID: 320450058} + - component: {fileID: 320450057} + m_Layer: 5 + m_Name: Options + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &320450056 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320450055} + 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: 961365271} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, 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 &320450057 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320450055} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: Options + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 44.55 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &320450058 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320450055} + m_CullTransparentMesh: 1 --- !u!1 &348449729 GameObject: m_ObjectHideFlags: 0 @@ -1302,8 +1452,13 @@ MonoBehaviour: m_Calls: [] m_text: SFX Volume m_isRightToLeft: 0 +<<<<<<< Updated upstream:TechwiseRPGProject/Assets/Update.unity m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} +======= + m_fontAsset: {fileID: 11400000, guid: c85ef282494e98b4d885590f662756cb, type: 2} + m_sharedMaterial: {fileID: 5825884557203387499, guid: c85ef282494e98b4d885590f662756cb, type: 2} +>>>>>>> Stashed changes:TechwiseRPGProject/Assets/Scene Open.unity m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1453,6 +1608,128 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 461436076} m_CullTransparentMesh: 1 +--- !u!1 &512304197 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 512304198} + - component: {fileID: 512304201} + - component: {fileID: 512304200} + - component: {fileID: 512304199} + m_Layer: 5 + m_Name: Continue Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &512304198 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 512304197} + 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: 1906697921} + m_Father: {fileID: 1086248966} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -95.1529} + m_SizeDelta: {x: 153.9136, y: 54.3454} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &512304199 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 512304197} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 512304200} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &512304200 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 512304197} + 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: 1, g: 1, b: 1, 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: 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 &512304201 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 512304197} + m_CullTransparentMesh: 1 --- !u!1 &515827821 GameObject: m_ObjectHideFlags: 0 @@ -2592,7 +2869,7 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &1008167201 +--- !u!1 &961365270 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2600,35 +2877,157 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1008167202} - - component: {fileID: 1008167204} - - component: {fileID: 1008167203} + - component: {fileID: 961365271} + - component: {fileID: 961365274} + - component: {fileID: 961365273} + - component: {fileID: 961365272} m_Layer: 5 - m_Name: Quit Button Text + m_Name: Options Button m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1008167202 +--- !u!224 &961365271 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1008167201} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 961365270} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.3182, y: 1.3182, z: 1.3182} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 37425631} - m_RootOrder: 0 + m_Children: + - {fileID: 320450056} + m_Father: {fileID: 1086248966} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -95.152916} + m_SizeDelta: {x: 153.9136, y: 54.3454} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &961365272 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961365270} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 961365273} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &961365273 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961365270} + 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: 1, g: 1, b: 1, 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: 10905, 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 &961365274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 961365270} + m_CullTransparentMesh: 1 +--- !u!1 &1008167201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1008167202} + - component: {fileID: 1008167204} + - component: {fileID: 1008167203} + m_Layer: 5 + m_Name: Quit Button Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1008167202 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008167201} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3182, y: 1.3182, z: 1.3182} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 37425631} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, 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 &1008167203 MonoBehaviour: @@ -2727,6 +3126,128 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1008167201} m_CullTransparentMesh: 1 +--- !u!1 &1018855230 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1018855231} + - component: {fileID: 1018855234} + - component: {fileID: 1018855233} + - component: {fileID: 1018855232} + m_Layer: 5 + m_Name: Quit Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1018855231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018855230} + 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: 1447283820} + m_Father: {fileID: 1086248966} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.000025868, y: -179.7176} + m_SizeDelta: {x: 153.91, y: 46.7375} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1018855232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018855230} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1018855233} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1018855233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018855230} + 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: 1, g: 1, b: 1, 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: 10905, 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 &1018855234 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1018855230} + m_CullTransparentMesh: 1 --- !u!1 &1039952977 GameObject: m_ObjectHideFlags: 0 @@ -2863,8 +3384,13 @@ MonoBehaviour: m_Calls: [] m_text: Music Volume m_isRightToLeft: 0 +<<<<<<< Updated upstream:TechwiseRPGProject/Assets/Update.unity m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} +======= + m_fontAsset: {fileID: 11400000, guid: c85ef282494e98b4d885590f662756cb, type: 2} + m_sharedMaterial: {fileID: 5825884557203387499, guid: c85ef282494e98b4d885590f662756cb, type: 2} +>>>>>>> Stashed changes:TechwiseRPGProject/Assets/Scene Open.unity m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3059,6 +3585,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1072791089 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3126,6 +3664,159 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +<<<<<<< Updated upstream:TechwiseRPGProject/Assets/Update.unity +======= +--- !u!114 &1072791092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1072791086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31849f5aeb3859846a0abd1d8e8f5320, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1086248965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1086248966} + - component: {fileID: 1086248969} + - component: {fileID: 1086248968} + - component: {fileID: 1086248967} + - component: {fileID: 1086248970} + m_Layer: 5 + m_Name: Pause Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1086248966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086248965} + 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: 512304198} + - {fileID: 961365271} + - {fileID: 1018855231} + m_Father: {fileID: 311455978} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 8, y: 107} + m_SizeDelta: {x: 204.1259, y: 68.0396} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1086248967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086248965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1086248968} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1086248968 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086248965} + 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: 1, g: 1, b: 1, 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: 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 &1086248969 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086248965} + m_CullTransparentMesh: 1 +--- !u!114 &1086248970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1086248965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e4058925feaab54e861a6adfba2e03d, type: 3} + m_Name: + m_EditorClassIdentifier: + pauseMenuUI: {fileID: 0} +>>>>>>> Stashed changes:TechwiseRPGProject/Assets/Scene Open.unity --- !u!1 &1269114423 GameObject: m_ObjectHideFlags: 0 @@ -3201,13 +3892,148 @@ RectTransform: m_AnchoredPosition: {x: -6.499997, y: 0} m_SizeDelta: {x: -13, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1269230618 +--- !u!114 &1269230618 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269230616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: Options Menu + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c85ef282494e98b4d885590f662756cb, type: 2} + m_sharedMaterial: {fileID: 5825884557203387499, guid: c85ef282494e98b4d885590f662756cb, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4287532686 + m_fontColor: {r: 0.5568628, g: 0.5568628, b: 0.5568628, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 97690656 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 42.4 + m_fontSizeBase: 32 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 14.849899, y: -9.281193, z: 12.99379, w: 9.281191} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1269230619 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1269230616} + m_CullTransparentMesh: 1 +--- !u!1 &1447283819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1447283820} + - component: {fileID: 1447283822} + - component: {fileID: 1447283821} + m_Layer: 5 + m_Name: Quit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1447283820 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1447283819} + 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: 1018855231} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, 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 &1447283821 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269230616} + m_GameObject: {fileID: 1447283819} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -3221,17 +4047,17 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Options Menu + m_text: Quit m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c85ef282494e98b4d885590f662756cb, type: 2} - m_sharedMaterial: {fileID: 5825884557203387499, guid: c85ef282494e98b4d885590f662756cb, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4287532686 - m_fontColor: {r: 0.5568628, g: 0.5568628, b: 0.5568628, a: 1} + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -3243,13 +4069,13 @@ MonoBehaviour: m_spriteAsset: {fileID: 0} m_tintAllSprites: 0 m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: 97690656 + m_TextStyleHashCode: -1183493901 m_overrideHtmlColors: 0 m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 42.4 - m_fontSizeBase: 32 + m_fontSize: 41.8 + m_fontSizeBase: 24 m_fontWeight: 400 m_enableAutoSizing: 1 m_fontSizeMin: 18 @@ -3284,19 +4110,19 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 14.849899, y: -9.281193, z: 12.99379, w: 9.281191} + m_margin: {x: 0, y: 0, z: 0, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1269230619 +--- !u!222 &1447283822 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1269230616} + m_GameObject: {fileID: 1447283819} m_CullTransparentMesh: 1 --- !u!1 &1484513381 GameObject: @@ -3904,6 +4730,279 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797152389} m_CullTransparentMesh: 1 +<<<<<<< Updated upstream:TechwiseRPGProject/Assets/Update.unity +======= +--- !u!1 &1906697920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1906697921} + - component: {fileID: 1906697923} + - component: {fileID: 1906697922} + m_Layer: 5 + m_Name: Continue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1906697921 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1906697920} + 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: 512304198} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 84.00002} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1906697922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1906697920} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: Continue + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 38.35 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1906697923 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1906697920} + m_CullTransparentMesh: 1 +--- !u!1 &1980945370 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1980945371} + - component: {fileID: 1980945373} + - component: {fileID: 1980945372} + m_Layer: 5 + m_Name: Options Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1980945371 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980945370} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 7.542032} + m_LocalScale: {x: 0.73999995, y: 0.73999995, z: 0.73999995} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1625779712} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -242.5, y: 56} + m_SizeDelta: {x: 387.1564, y: 120.4875} + m_Pivot: {x: 0.5, y: 0.5000003} +--- !u!114 &1980945372 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980945370} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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_text: Return of the Fallen + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c85ef282494e98b4d885590f662756cb, type: 2} + m_sharedMaterial: {fileID: 5825884557203387499, guid: c85ef282494e98b4d885590f662756cb, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4286743170 + m_fontColor: {r: 0.50980395, g: 0.50980395, b: 0.50980395, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: 97690656 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50.6 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: -20.31976, z: 0, w: 13.854347} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1980945373 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1980945370} + m_CullTransparentMesh: 1 +>>>>>>> Stashed changes:TechwiseRPGProject/Assets/Scene Open.unity --- !u!1 &1994545299 GameObject: m_ObjectHideFlags: 0 diff --git a/TechwiseRPGProject/Assets/Update.unity.meta b/TechwiseRPGProject/Assets/Scene Open.unity.meta similarity index 100% rename from TechwiseRPGProject/Assets/Update.unity.meta rename to TechwiseRPGProject/Assets/Scene Open.unity.meta diff --git a/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset b/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset index dd075397..18c6655d 100644 --- a/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset +++ b/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Oswald Bold SDF.asset @@ -271,6 +271,10 @@ Texture2D: m_Width: 0 m_Height: 0 m_CompleteImageSize: 0 +<<<<<<< Updated upstream +======= + m_MipsStripped: 0 +>>>>>>> Stashed changes m_TextureFormat: 1 m_MipCount: 1 m_IsReadable: 1 @@ -289,6 +293,10 @@ Texture2D: m_WrapW: 0 m_LightmapFormat: 0 m_ColorSpace: 0 +<<<<<<< Updated upstream +======= + m_PlatformBlob: +>>>>>>> Stashed changes image data: 0 _typelessdata: m_StreamData: diff --git a/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset b/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset index aa6869b4..d44454c4 100644 --- a/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset +++ b/TechwiseRPGProject/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset @@ -271,6 +271,10 @@ Texture2D: m_Width: 0 m_Height: 0 m_CompleteImageSize: 0 +<<<<<<< Updated upstream +======= + m_MipsStripped: 0 +>>>>>>> Stashed changes m_TextureFormat: 1 m_MipCount: 1 m_IsReadable: 1 @@ -289,6 +293,10 @@ Texture2D: m_WrapW: 0 m_LightmapFormat: 0 m_ColorSpace: 0 +<<<<<<< Updated upstream +======= + m_PlatformBlob: +>>>>>>> Stashed changes image data: 0 _typelessdata: m_StreamData: diff --git a/TechwiseRPGProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/TechwiseRPGProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index e907cc73..a2b5e7a3 100644 --- a/TechwiseRPGProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/TechwiseRPGProject/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -317,6 +317,10 @@ Texture2D: m_Width: 0 m_Height: 0 m_CompleteImageSize: 0 +<<<<<<< Updated upstream +======= + m_MipsStripped: 0 +>>>>>>> Stashed changes m_TextureFormat: 1 m_MipCount: 1 m_IsReadable: 1 @@ -335,6 +339,10 @@ Texture2D: m_WrapW: 0 m_LightmapFormat: 0 m_ColorSpace: 0 +<<<<<<< Updated upstream +======= + m_PlatformBlob: +>>>>>>> Stashed changes image data: 0 _typelessdata: m_StreamData: diff --git a/TechwiseRPGProject/ProjectSettings/EditorBuildSettings.asset b/TechwiseRPGProject/ProjectSettings/EditorBuildSettings.asset index 4b41bba3..abe4439b 100644 --- a/TechwiseRPGProject/ProjectSettings/EditorBuildSettings.asset +++ b/TechwiseRPGProject/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,14 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 +<<<<<<< Updated upstream path: Assets/Scenes/Loading Screen.unity guid: 2cda990e2423bbf4892e6590ba056729 +======= + path: Assets/Scene Open.unity + guid: 85ec2b0d1950058498b99ca4e405e911 + - enabled: 1 + path: Assets/PlayerMovementtester.unity + guid: 82dc7f44478f0f14294ec0c90c7c17c9 +>>>>>>> Stashed changes m_configObjects: {}