diff --git a/Assets/IMG/Materials/Crosshair.mat b/Assets/IMG/Materials/Crosshair.mat new file mode 100644 index 0000000..587f9dd --- /dev/null +++ b/Assets/IMG/Materials/Crosshair.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Crosshair + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/IMG/Materials/Crosshair.mat.meta b/Assets/IMG/Materials/Crosshair.mat.meta new file mode 100644 index 0000000..87aef38 --- /dev/null +++ b/Assets/IMG/Materials/Crosshair.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b54ad27a69e6176a09065f7f8bcffc67 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Locals/StringTable/MyTexts Shared Data.asset b/Assets/Locals/StringTable/MyTexts Shared Data.asset index 34fd5bf..a22e3e4 100644 --- a/Assets/Locals/StringTable/MyTexts Shared Data.asset +++ b/Assets/Locals/StringTable/MyTexts Shared Data.asset @@ -1312,6 +1312,10 @@ MonoBehaviour: m_Key: escapeFail m_Metadata: m_Items: [] + - m_Id: 128242867786776576 + m_Key: normal + m_Metadata: + m_Items: [] m_Metadata: m_Items: [] m_KeyGenerator: diff --git a/Assets/Locals/StringTable/MyTexts_de.asset b/Assets/Locals/StringTable/MyTexts_de.asset index 4d379f1..e5ad55d 100644 --- a/Assets/Locals/StringTable/MyTexts_de.asset +++ b/Assets/Locals/StringTable/MyTexts_de.asset @@ -1321,6 +1321,10 @@ MonoBehaviour: m_Localized: Deine Flucht ist gescheitert! m_Metadata: m_Items: [] + - m_Id: 128242867786776576 + m_Localized: ' ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Locals/StringTable/MyTexts_en.asset b/Assets/Locals/StringTable/MyTexts_en.asset index ef1524f..d2b71cf 100644 --- a/Assets/Locals/StringTable/MyTexts_en.asset +++ b/Assets/Locals/StringTable/MyTexts_en.asset @@ -1364,6 +1364,10 @@ MonoBehaviour: m_Localized: You were unable to escape! m_Metadata: m_Items: [] + - m_Id: 128242867786776576 + m_Localized: ' ' + m_Metadata: + m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 43bdfd6..89edd90 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -2861,7 +2861,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 m_TableEntryReference: - m_KeyId: 0 + m_KeyId: 13166285942803 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -5418,6 +5418,43 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 302144438} m_CullTransparentMesh: 1 +--- !u!1 &309920028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 309920029} + m_Layer: 2 + m_Name: crosshair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &309920029 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 309920028} + m_LocalRotation: {x: -0.70710665, y: 4.6566107e-10, z: -3.6437336e-11, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 30} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 927922403} + - {fileID: 1438812380} + m_Father: {fileID: 1083922200} + m_LocalEulerAnglesHint: {x: -90, 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &315955575 PrefabInstance: m_ObjectHideFlags: 0 @@ -9527,6 +9564,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 487360473} + - component: {fileID: 487360474} m_Layer: 0 m_Name: targetLooking m_TagString: Untagged @@ -9534,21 +9572,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &487360473 -Transform: +--- !u!224 &487360473 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 487360472} - serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.2, z: 2} + m_LocalPosition: {x: 0, y: 0, z: 2} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 923848396} 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: 1.2} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &487360474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 487360472} + m_CullTransparentMesh: 1 --- !u!1 &496796917 GameObject: m_ObjectHideFlags: 0 @@ -18493,6 +18543,116 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 926355124} m_CullTransparentMesh: 1 +--- !u!1 &927922402 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 927922403} + - component: {fileID: 927922406} + - component: {fileID: 927922405} + - component: {fileID: 927922404} + m_Layer: 2 + m_Name: pnlVertical + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &927922403 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927922402} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.001, y: 1, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 309920029} + 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: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!64 &927922404 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927922402} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &927922405 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927922402} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b54ad27a69e6176a09065f7f8bcffc67, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &927922406 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 927922402} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &934724952 GameObject: m_ObjectHideFlags: 0 @@ -21082,7 +21242,8 @@ Transform: m_LocalPosition: {x: 0, y: 0.007000003, z: 0.002999995} m_LocalScale: {x: 0.0025000004, y: 0.0024999988, z: 0.0024999992} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 309920029} m_Father: {fileID: 5217556178789079230} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.1250005} --- !u!114 &1083922201 @@ -21097,8 +21258,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ccf47fd0e7044a6f08a0f3353ee62cf5, type: 3} m_Name: m_EditorClassIdentifier: - mouseSpeed: 100 - controllerSpeed: 0.01 --- !u!82 &1083922202 AudioSource: m_ObjectHideFlags: 0 @@ -26200,6 +26359,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5becc189f2c76a14490d22e7435bbf40, type: 3} m_Name: m_EditorClassIdentifier: + mouseSpeed: 10 + controllerSpeed: 1 --- !u!114 &1368298272 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27479,6 +27640,116 @@ MonoBehaviour: references: version: 2 RefIds: [] +--- !u!1 &1438812379 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1438812380} + - component: {fileID: 1438812383} + - component: {fileID: 1438812382} + - component: {fileID: 1438812381} + m_Layer: 2 + m_Name: pnlHorizontal + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1438812380 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1438812379} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 1, z: 0.001} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 309920029} + 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!64 &1438812381 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1438812379} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1438812382 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1438812379} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b54ad27a69e6176a09065f7f8bcffc67, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1438812383 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1438812379} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1441909029 PrefabInstance: m_ObjectHideFlags: 0 @@ -34442,7 +34713,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Weight: 1 m_Effectors: - - m_Transform: {fileID: 487360473} + - m_Transform: {fileID: 0} m_Style: shape: {fileID: 4300000, guid: e050c2b16fe384bd994474655a4b4968, type: 2} color: {r: 1, g: 0, b: 0, a: 0.5} @@ -34450,6 +34721,14 @@ MonoBehaviour: position: {x: 0, y: 0, z: 0} rotation: {x: 0, y: 0, z: 0} m_Visible: 1 + - m_Transform: {fileID: 487360473} + m_Style: + shape: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} + color: {r: 1, g: 0, b: 0, a: 1} + size: 0.1 + position: {x: 0, y: 0, z: 0} + rotation: {x: 0, y: 0, z: 0} + m_Visible: 1 --- !u!4 &1823440144 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index 5617857..5aa4075 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -20,6 +20,9 @@ public class Controls : MonoBehaviour PlayerInput playerInput; MoveDirection direction; + public float mouseSpeed = 10f; //the sensibility + public float controllerSpeed = 1f; //the sensibility + void Start() { @@ -51,7 +54,14 @@ public class Controls : MonoBehaviour { if (uihandler.canPlayerRotate()) { - playerCam.GetComponent().lookAround(view, playerInput.currentControlScheme == "Controller"); + if(playerInput.currentControlScheme == "Controller"){ + playerCam.GetComponent().lookAround(view, controllerSpeed); + player.GetComponent().rotate(view, controllerSpeed); + } + else{ + playerCam.GetComponent().lookAround(view, mouseSpeed); + player.GetComponent().rotate(view, mouseSpeed); + } } if (uihandler.canPlayerMove()) { diff --git a/Assets/Scripts/Handler/ButtonHandler.cs b/Assets/Scripts/Handler/ButtonHandler.cs index 79a0e90..8f6305f 100644 --- a/Assets/Scripts/Handler/ButtonHandler.cs +++ b/Assets/Scripts/Handler/ButtonHandler.cs @@ -85,8 +85,8 @@ namespace Assets.Scripts saveText = saveText + uihandler.saveVideoSettings() + "\r\n"; saveText = saveText + uihandler.saveLanguage() + "\r\n"; saveText = saveText + audioHandler.saveAudioSettings() + "\r\n"; - GameObject.Find("Main Camera").GetComponent().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent().value; - GameObject.Find("Main Camera").GetComponent().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent().value; + GameObject.Find("Controls").GetComponent().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent().value; + GameObject.Find("Controls").GetComponent().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent().value; saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent().value + "\r\n"; saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent().value; FileHandler.saveOptions(saveText); diff --git a/Assets/Scripts/Handler/FileHandler.cs b/Assets/Scripts/Handler/FileHandler.cs index b6dc138..bb45aa0 100644 --- a/Assets/Scripts/Handler/FileHandler.cs +++ b/Assets/Scripts/Handler/FileHandler.cs @@ -104,12 +104,12 @@ namespace Assets.Scripts break; case "SensitivityMouse": if(isIngame){ - GameObject.Find("Main Camera").GetComponent().mouseSpeed = float.Parse(line.Split(':')[1]); + GameObject.Find("Controls").GetComponent().mouseSpeed = float.Parse(line.Split(':')[1]); } break; case "SensitivityController": if(isIngame){ - GameObject.Find("Main Camera").GetComponent().controllerSpeed = float.Parse(line.Split(':')[1]); + GameObject.Find("Controls").GetComponent().controllerSpeed = float.Parse(line.Split(':')[1]); } break; } diff --git a/Assets/Scripts/Player/PlayerCamera.cs b/Assets/Scripts/Player/PlayerCamera.cs index 75ae446..d4af4b0 100644 --- a/Assets/Scripts/Player/PlayerCamera.cs +++ b/Assets/Scripts/Player/PlayerCamera.cs @@ -10,8 +10,6 @@ namespace Assets.Scripts.Player { UIHandler uihandler; GameObject interact; - public float mouseSpeed = 10f; //the sensibility - public float controllerSpeed = 1f; //the sensibility // Start is called before the first frame update void Start() @@ -45,24 +43,10 @@ namespace Assets.Scripts.Player return null; } - public void lookAround(Vector2 view, bool isController) + public void lookAround(Vector2 view, float speed) { GameObject target = GameObject.Find("targetLooking"); - if (isController) - { - target.transform.localPosition = target.transform.localPosition + new Vector3(view.x,view.y,0) * controllerSpeed * Time.deltaTime; - } - else - { - target.transform.localPosition = target.transform.localPosition + new Vector3(view.x,view.y,0) * mouseSpeed * Time.deltaTime; - } - - if(target.transform.localPosition.x >= 3){ - target.transform.localPosition = new Vector3(3f,target.transform.localPosition.y,target.transform.localPosition.z); - } - if(target.transform.localPosition.x <= -3){ - target.transform.localPosition = new Vector3(-3f,target.transform.localPosition.y,target.transform.localPosition.z); - } + target.transform.localPosition = target.transform.localPosition + new Vector3(0,view.y,0) * speed * Time.deltaTime; if(target.transform.localPosition.y >= 2){ target.transform.localPosition = new Vector3(target.transform.localPosition.x,2f,target.transform.localPosition.z); } @@ -80,7 +64,7 @@ namespace Assets.Scripts.Player if (hit.collider.gameObject.tag.ToLower().Contains("object")) { string obj = hit.collider.gameObject.tag.Split(':')[1]; - if (hit.distance <= 3 && !obj.ToLower().Equals("house")) + if (hit.distance <= 10 && !obj.ToLower().Equals("house")) { if (!uihandler.isPlayerInFight()) { diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 887f7cb..52fd7bc 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -10,6 +10,8 @@ using Assets.Scripts.Races; using Newtonsoft.Json.Linq; using UnityEngine.InputSystem; using Assets.Scripts.InteractableObjects; +using UnityEngine.UIElements; +using UnityEngine.Animations; namespace Assets.Scripts.Player { @@ -185,6 +187,10 @@ namespace Assets.Scripts.Player GameObject.Find("QuestLog").GetComponent().updateQuests("explore", gameObject, 1); } + public void rotate(Vector2 input, float speed){ + transform.Rotate(Vector3.up, input.x * speed * 10 * Time.deltaTime); + } + public void getRotation() { GameObject needle = GameObject.Find("imgNeedle"); diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 3620dd0..438619a 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -19,11 +19,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 942 + height: 938 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 53 + controlID: 43 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -33,21 +33,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 11500000, guid: 03b8c364c5fbffe4c949a4ceb342fb8a, type: 3} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 900, y: 600} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Localization Tables + m_Image: {fileID: 2800000, guid: 0218b7b4bcdd48e49b9b41dd0068b868, type: 3} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2304 - y: 118 - width: 1164 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 641 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -58,72 +58,6 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - /home/nicola/Schreibtisch/TalesOfNovariel/Library/PlayModeViewStates/8c07e338a3375881eb377e4bdb98cd97 - m_PlayModeViewName: GameView - m_ShowGizmos: 1 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 1 - m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1164 - height: 626 - m_Scale: {x: 0.5796296, y: 0.5796296} - m_Translation: {x: 582, y: 312.99997} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -1004.08954 - y: -540 - width: 2008.1791 - height: 1080 - m_MinimalGUI: 1 - m_defaultScale: 0.5796296 - m_LastWindowPixelSize: {x: 1164, y: 647} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,17 +72,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 16} + - {fileID: 18} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1920 - height: 942 + height: 938 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 54 + controlID: 44 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -163,17 +97,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 5} - - {fileID: 13} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1550 - height: 942 + width: 1622 + height: 938 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 55 + controlID: 45 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,12 +127,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1550 - height: 668 + width: 1622 + height: 662 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 56 + controlID: 46 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -216,8 +150,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 384 - height: 668 + width: 332 + height: 662 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 7} @@ -246,9 +180,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 118 - width: 383 - height: 647 + y: 122 + width: 331 + height: 641 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -262,25 +196,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0ad6f8ff + m_SelectedIDs: 5e090000 m_LastClickedID: 0 - m_ExpandedIDs: 1650f6ff3463f6ff8474f6ff588ef6ffb496f6ff7699f6ffa099f6ffb4abf6ff02baf6ff7ad0f6ff1e02f7ff4821f7ffa02ff7ffd03df7ff1056f7ff6c69f7ff527af7ffb08df7ffcaccf7ff4afff7ff1a14f8ff3620f8ffa22ef8ffc23df8fff651f8ff286df8ffac79f8ffbc88f8ff22a0f8ffdeb7f8ff72caf8ff76dbf8fffcdcf8ffeaa0f9ffe6b1f9ff183dfaff8a50faff7057faff9e57faffd457faff0068fafffe7bfafff090faff149dfaff14a5faff9ca6faff54ebfaff58ebfaff5cebfaff60ebfaff68ebfaff6cebfaff70ebfaff74ebfaff88ebfaff8cebfaff90ebfaff94ebfaff98ebfaff9cebfaffb0ebfaffb4ebfaffb8ebfaffbcebfaffc0ebfaffc4ebfaffccebfaffd0ebfaffd4ebfaffd8ebfaffdcebfaffe0ebfaffe4ebfafff0ebfaffd825fbffb644fbff0277fbff1a85fbffd28dfbfffc8dfbff288efbff468ffbffd6d1fbfffa6cfcffe885fcff442cfdff8676fdff8a76fdff8e76fdff9276fdff9a76fdff9e76fdffa276fdffa676fdffba76fdffbe76fdffc276fdffc676fdffca76fdffce76fdffe276fdffe676fdffea76fdffee76fdfff276fdfff676fdff0277fdff0a77fdff0e77fdff1277fdff2277fdff3677fdff7478fdff3279fdff687afdfffa9bfdffb89efdff44a7fdffd8acfdffc6edfdffcaedfdffceedfdffd2edfdffdaedfdffdeedfdffe2edfdffe6edfdffeeedfdfff2edfdfffaedfdfffeedfdff02eefdff06eefdff0aeefdff32eefdff46eefdff4aeefdff4eeefdff52eefdff76eefdff7aeefdffd6fffdffe60afeffec0afeff4225feff4625feff5025feff16a9ffff20a9ffff68f7ffff18ba0000f20801009cce0100aad001009e500300b0590300ea590300fa5a03009c140500be140500cc140500f2140500f41405005a150500681505006a15050074150500dc490500124a0500884a0500daed0500fced05000aee050030ee050032ee050058ee05006eee050098ee0500a6ee0500a8ee0500b2ee0500b6ee05004a23060080230600f623060094c40700b0c407007cc6070066c70700d4c70700ecc70700a8c9070044cb0700a8ce070046d10700acd20700acfb0700c8fb070094fd07007efe0700ecfe070004ff0700c00008005c020800c00508005e080800c40908001a410800724a08005e4e08001e7808003a7808000a7a0800f47a0800627b08007a7b0800367d0800d27e08009281080036820800d48408007e8508003a8608005eda08007ada08004adc080034dd08008add0800a8dd0800c0dd08007cdf080018e1080054e20800e2e3080086e40800cae508002ae70800d4e7080090e80800f4110900c413090004150900a81709005c1b0900b61b0900a41e0900a21f0900b41f0900728d0900da960900cc9a0900d4bf09008a860a0076920a0046be0a0032ca0a00e6120b00d21e0b0018590b0004650b004a9f0b0036ab0b0004d70b00f0e20b00be0e0c00a41a0c0068460c004e520c00127e0c00f8890c0028c40c00d0c90c000ed00c003e0a0d00e60f0d0024160d00c05e0d0068640d00a66a0d00be050e00660b0e00a4110e00baae0e0062b40e00a0ba0e00dcf40e0084fa0e00c2000f00882c0f0030320f006e380f00a2720f004a780f00887e0f00de9b0f0086a10f00c4a70f0020c50f00c8ca0f0006d10f005eee0f0006f40f0044fa0f00b65d10005e6310009c691000580d1100001311003e1911005a4a11005c501100b4521100d49f1100d6a511002ea81100ced71100d0dd110028e01100ca0f1200cc15120024181200885612008a5c1200e25e1200ec5e1200fc5e1200465f1200745f1200785f1200965f1200f65f1200828e120084941200dc961200e6961200f6961200409712006e9712007297120090971200f0971200bcb71200bebd120016c01200 + m_ExpandedIDs: 76d2feff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Player - m_OriginalName: Player + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -332816 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -298,16 +232,16 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: LocalizationTablesWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 384 + x: 332 y: 0 - width: 1166 - height: 668 - m_MinSize: {x: 102, y: 121} + width: 1290 + height: 662 + m_MinSize: {x: 902, y: 621} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: @@ -315,8 +249,9 @@ MonoBehaviour: - {fileID: 10} - {fileID: 11} - {fileID: 12} + - {fileID: 13} - {fileID: 2} - m_Selected: 4 + m_Selected: 5 m_LastSelected: 0 --- !u!114 &9 MonoBehaviour: @@ -338,10 +273,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2304 - y: 118 - width: 1164 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -654,7 +589,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -663,6 +598,32 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: APV Overlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Cinemachine Tool Settings + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: b85945ae8dd2cea46915e8777ee5c800 m_Gizmos: 1 @@ -674,9 +635,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -33.042046, y: 12.678872, z: 3.5343304} + m_Target: {x: 25.992912, y: 11.057134, z: -15.056614} speed: 2 - m_Value: {x: -33.042046, y: 12.678872, z: 3.5343304} + m_Value: {x: 25.992912, y: 11.057134, z: -15.056614} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -722,13 +683,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.09164139, y: 0.67661995, z: -0.083929546, w: -0.7253741} + m_Target: {x: -0.07058, y: -0.8598145, z: 0.12325598, w: -0.48889694} speed: 2 - m_Value: {x: -0.09166777, y: 0.67681473, z: -0.08395371, w: -0.72558296} + m_Value: {x: 0.07058, y: 0.8598145, z: -0.12325599, w: 0.48889694} m_Size: - m_Target: 17.945047 + m_Target: 22.643044 speed: 2 - m_Value: 17.945047 + m_Value: 22.643044 m_Ortho: m_Target: 0 speed: 2 @@ -754,6 +715,106 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &10 +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: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2252 + y: 122 + width: 1288 + height: 640 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /home/nicola/Schreibtisch/TalesOfNovariel/Library/PlayModeViewStates/8c07e338a3375881eb377e4bdb98cd97 + m_PlayModeViewName: GameView + m_ShowGizmos: 1 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 1 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1288 + height: 619 + m_Scale: {x: 0.57314813, y: 0.57314813} + m_Translation: {x: 644, y: 309.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1123.6188 + y: -540 + width: 2247.2375 + height: 1080 + m_MinimalGUI: 1 + m_defaultScale: 0.57314813 + m_LastWindowPixelSize: {x: 1288, y: 640} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -773,10 +834,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2304 - y: 118 - width: 1164 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1311,7 +1372,7 @@ MonoBehaviour: m_Text: Input (Input Actions) m_Image: {fileID: 0} m_Tooltip: ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1331,10 +1392,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2234 - y: 118 - width: 1234 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1367,7 +1428,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1376,21 +1437,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03b8c364c5fbffe4c949a4ceb342fb8a, type: 3} + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 900, y: 600} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Localization Tables - m_Image: {fileID: 0} + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2234 - y: 118 - width: 1234 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1401,7 +1462,43 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &13 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: -152.8396 + e10: 0 + e11: 1 + e12: 0 + e13: 330.24146 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1417,18 +1514,19 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 668 - width: 1550 - height: 274 + y: 662 + width: 1622 + height: 276 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 14} - {fileID: 15} + - {fileID: 16} + - {fileID: 17} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1449,9 +1547,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 786 - width: 1549 - height: 253 + y: 784 + width: 1621 + height: 255 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1473,7 +1571,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/IMG/Animations/Player + - Assets/Locals m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1481,16 +1579,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/IMG/Animations/Player + - Assets/Locals m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 120} - m_SelectedIDs: 5a5d0000 - m_LastClickedID: 23898 - m_ExpandedIDs: 00000000925c0000485d00004c5d0000525d00005c5d000000ca9a3b + scrollPos: {x: 0, y: 72} + m_SelectedIDs: 52070000 + m_LastClickedID: 1874 + m_ExpandedIDs: 00000000ea0600003e0700001e08000092080000ba08000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1506,7 +1604,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 13} + m_ClientGUIView: {fileID: 14} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -1518,7 +1616,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000925c0000 + m_ExpandedIDs: 00000000ea0600003e0700001e08000092080000ba080000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1543,8 +1641,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 0ad6f8ff - m_LastClickedInstanceID: -469494 + m_SelectedInstanceIDs: 5e090000 + m_LastClickedInstanceID: 2398 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: @@ -1574,7 +1672,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1595,9 +1693,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 786 - width: 1549 - height: 253 + y: 783 + width: 1621 + height: 256 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1608,7 +1706,44 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &16 +--- !u!114 &17 +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: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1920 + y: 778 + width: 1621 + height: 261 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 204018 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1623,18 +1758,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1550 + x: 1622 y: 0 - width: 370 - height: 942 + width: 298 + height: 938 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 17} + - {fileID: 19} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1654,10 +1789,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3470 - y: 118 - width: 369 - height: 921 + x: 3542 + y: 122 + width: 297 + height: 917 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index e93f0e7..7d2f116 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -15,11 +15,11 @@ MonoBehaviour: m_PixelRect: serializedVersion: 2 x: 1920 - y: 60 + y: 64 width: 1920 - height: 992 + height: 988 m_ShowMode: 4 - m_Title: Scene + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 992 + height: 988 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 972 + y: 968 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} @@ -114,11 +114,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 942 + height: 938 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 70 + controlID: 51 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,11 +139,11 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 942 + height: 938 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 71 + controlID: 52 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,11 +164,11 @@ MonoBehaviour: x: 0 y: 0 width: 1622 - height: 942 + height: 938 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 72 + controlID: 53 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,7 +193,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 73 + controlID: 23 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -215,9 +215,9 @@ MonoBehaviour: height: 662 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 16} + - {fileID: 14} m_Selected: 0 m_LastSelected: 0 --- !u!114 &10 @@ -230,7 +230,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: LocalizationTablesWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -239,18 +239,18 @@ MonoBehaviour: y: 0 width: 1290 height: 662 - m_MinSize: {x: 202, y: 221} + m_MinSize: {x: 902, y: 621} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 17} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} - {fileID: 15} + - {fileID: 16} + - {fileID: 17} - {fileID: 18} - {fileID: 19} - - {fileID: 20} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 5 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -269,16 +269,16 @@ MonoBehaviour: x: 0 y: 662 width: 1622 - height: 280 + height: 276 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 21} + m_ActualView: {fileID: 20} m_Panes: + - {fileID: 20} - {fileID: 21} - {fileID: 22} - - {fileID: 14} m_Selected: 0 - m_LastSelected: 2 + m_LastSelected: 1 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -297,7 +297,7 @@ MonoBehaviour: x: 1622 y: 0 width: 298 - height: 942 + height: 938 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 23} @@ -314,126 +314,19 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 11500000, guid: 03b8c364c5fbffe4c949a4ceb342fb8a, type: 3} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} + m_MinSize: {x: 900, y: 600} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Localization Tables + m_Image: {fileID: 2800000, guid: 0218b7b4bcdd48e49b9b41dd0068b868, type: 3} m_Tooltip: m_Pos: serializedVersion: 2 x: 2252 - y: 118 - width: 1288 - height: 639 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: -152.8396 - e10: 0 - e11: 1 - e12: 0 - e13: 330.24146 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 0 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &14 -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: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 1920 - y: 778 - width: 1621 - height: 261 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: 204018 ---- !u!114 &15 -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: 12015, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Game - m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 2252 - y: 118 + y: 122 width: 1288 height: 641 m_SerializedDataModeController: @@ -446,73 +339,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_SerializedViewNames: - - UnityEditor.DeviceSimulation.SimulatorWindow - m_SerializedViewValues: - - /home/nicola/Schreibtisch/TalesOfNovariel/Library/PlayModeViewStates/8c07e338a3375881eb377e4bdb98cd97 - m_PlayModeViewName: GameView - m_ShowGizmos: 1 - m_TargetDisplay: 0 - m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1920, y: 1080} - m_TextureFilterMode: 0 - m_TextureHideFlags: 61 - m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 - m_UseMipMap: 0 - m_VSyncEnabled: 0 - m_Gizmos: 1 - m_Stats: 0 - m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 - m_ZoomArea: - m_HRangeLocked: 0 - m_VRangeLocked: 0 - hZoomLockedByDefault: 0 - vZoomLockedByDefault: 0 - m_HBaseRangeMin: -960 - m_HBaseRangeMax: 960 - m_VBaseRangeMin: -540 - m_VBaseRangeMax: 540 - m_HAllowExceedBaseRangeMin: 1 - m_HAllowExceedBaseRangeMax: 1 - m_VAllowExceedBaseRangeMin: 1 - m_VAllowExceedBaseRangeMax: 1 - m_ScaleWithWindow: 0 - m_HSlider: 0 - m_VSlider: 0 - m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 - m_EnableSliderZoomHorizontal: 0 - m_EnableSliderZoomVertical: 0 - m_UniformScale: 1 - m_UpDirection: 1 - m_DrawArea: - serializedVersion: 2 - x: 0 - y: 21 - width: 1288 - height: 620 - m_Scale: {x: 0.5740741, y: 0.5740741} - m_Translation: {x: 644, y: 310} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -1121.8064 - y: -540 - width: 2243.6128 - height: 1080 - m_MinimalGUI: 1 - m_defaultScale: 0.5740741 - m_LastWindowPixelSize: {x: 1288, y: 641} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} ---- !u!114 &16 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -533,7 +360,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 118 + y: 122 width: 331 height: 641 m_SerializedDataModeController: @@ -549,9 +376,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 56090000 m_LastClickedID: 0 - m_ExpandedIDs: 28fbffff5e7300005a770000 + m_ExpandedIDs: ded2feff10a80000a0aa0000faaa0000aaab000020ac0000f4ac0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -575,7 +402,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 ---- !u!114 &17 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -596,7 +423,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 2252 - y: 118 + y: 122 width: 1288 height: 641 m_SerializedDataModeController: @@ -933,6 +760,19 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Cinemachine Tool Settings + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: b85945ae8dd2cea46915e8777ee5c800 m_Gizmos: 1 @@ -944,9 +784,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -2.709066, y: 11.971142, z: 66.5046} + m_Target: {x: 25.992912, y: 11.057134, z: -15.056614} speed: 2 - m_Value: {x: -2.709066, y: 11.971142, z: 66.5046} + m_Value: {x: -0.55497044, y: -0.06195605, z: 0.07799015} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -992,13 +832,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.060247198, y: -0.019505113, z: 0.00299335, w: 0.99733967} + m_Target: {x: -0.07058, y: -0.8598145, z: 0.12325598, w: -0.48889694} speed: 2 - m_Value: {x: 0.060287736, y: -0.019013394, z: 0.002964822, w: 0.99799556} + m_Value: {x: -0.00959617, y: 0.97118896, z: -0.23476727, w: -0.039803635} m_Size: - m_Target: 33.22372 + m_Target: 22.643044 speed: 2 - m_Value: 33.22372 + m_Value: 1.626575 m_Ortho: m_Target: 0 speed: 2 @@ -1023,7 +863,107 @@ MonoBehaviour: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &18 +--- !u!114 &16 +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: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2252 + y: 122 + width: 1288 + height: 640 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /home/nicola/Schreibtisch/TalesOfNovariel/Library/PlayModeViewStates/8c07e338a3375881eb377e4bdb98cd97 + m_PlayModeViewName: GameView + m_ShowGizmos: 1 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 1920, y: 1080} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 1 + m_Stats: 0 + m_SelectedSizes: 03000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -960 + m_HBaseRangeMax: 960 + m_VBaseRangeMin: -540 + m_VBaseRangeMax: 540 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 1288 + height: 619 + m_Scale: {x: 0.57314813, y: 0.57314813} + m_Translation: {x: 644, y: 309.5} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -1123.6188 + y: -540 + width: 2247.2375 + height: 1080 + m_MinimalGUI: 1 + m_defaultScale: 0.57314813 + m_LastWindowPixelSize: {x: 1288, y: 640} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 01000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1043,10 +983,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2304 - y: 118 - width: 1164 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 641 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1581,7 +1521,7 @@ MonoBehaviour: m_Text: Input (Input Actions) m_Image: {fileID: 0} m_Tooltip: ---- !u!114 &19 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1601,10 +1541,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2234 - y: 118 - width: 1234 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1637,7 +1577,7 @@ MonoBehaviour: m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 0} m_SearchString: ---- !u!114 &20 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1646,21 +1586,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 03b8c364c5fbffe4c949a4ceb342fb8a, type: 3} + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 900, y: 600} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Localization Tables - m_Image: {fileID: 0} + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 2234 - y: 118 - width: 1234 - height: 647 + x: 2252 + y: 122 + width: 1288 + height: 640 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1671,7 +1611,43 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &21 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_ValueSerializationHelper: + - e00: 1 + e01: 0 + e02: 0 + e03: -152.8396 + e10: 0 + e11: 1 + e12: 0 + e13: 330.24146 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -5770798371515671020, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1692,9 +1668,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 780 + y: 784 width: 1621 - height: 259 + height: 255 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1716,7 +1692,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs/FBX + - Assets/Locals/StringTable m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1724,16 +1700,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs/FBX + - Assets/Locals/StringTable m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 68} - m_SelectedIDs: 907e0000 - m_LastClickedID: 32400 - m_ExpandedIDs: 000000005a7c00005c7c00005e7c0000607c0000827e000000ca9a3b + scrollPos: {x: 0, y: 72} + m_SelectedIDs: 56090000 + m_LastClickedID: 2390 + m_ExpandedIDs: 00000000ea0600003e070000520700001e0800008e080000b608000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1761,7 +1737,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000005a7c00005c7c00005e7c0000607c0000 + m_ExpandedIDs: 00000000ea0600003e0700001e0800008e080000b6080000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1817,7 +1793,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &22 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1838,9 +1814,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 1920 - y: 786 - width: 1549 - height: 253 + y: 784 + width: 1621 + height: 255 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1851,6 +1827,43 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 +--- !u!114 &22 +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: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1920 + y: 778 + width: 1621 + height: 261 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 204018 --- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1872,9 +1885,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 3542 - y: 118 + y: 122 width: 297 - height: 921 + height: 917 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 2c3c3da..f3f0f26 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -14,7 +14,7 @@ scopes = { "last_search.B655092D" = "st:desc" "OpenInspectorPreview.B655092D" = "0" "currentGroup.B655092D" = "all" - "picker_window_position_offset.45F317DD" = "80;358;320;551" + "picker_window_position_offset.45F317DD" = "-22;358;320;552" "picker_search_text.45F317DD" = "" "last_search.45F317DD" = "" "OpenInspectorPreview.45F317DD" = "0" diff --git a/settings.txt b/settings.txt index 3c325c8..e4bd973 100644 --- a/settings.txt +++ b/settings.txt @@ -3,5 +3,5 @@ Mode:0 Language:de Music:0 Effects:0 -SensitivityMouse:6.897082 +SensitivityMouse:10 SensitivityController:6.234979 \ No newline at end of file