From cb033ea487117a9e69d7ec24ccf7f02690c41a71 Mon Sep 17 00:00:00 2001 From: Finnchen123 Date: Sat, 7 Jun 2025 10:15:59 +0200 Subject: [PATCH] Reworked camera handling and localization a bit --- .../StringTable/MyTexts Shared Data.asset | 8 +- Assets/Locals/StringTable/MyTexts_de.asset | 20 +- Assets/Locals/StringTable/MyTexts_en.asset | 6 +- Assets/Scenes/GameScene.unity | 197 +++--------------- Assets/Scenes/MenuScene.unity | 34 +-- Assets/Scripts/Controls.cs | 4 +- Assets/Scripts/Handler/SceneHandler.cs | 2 +- Assets/Scripts/Player/PlayerCamera.cs | 4 +- Assets/Scripts/Player/PlayerGameObject.cs | 2 +- UserSettings/EditorUserSettings.asset | 11 +- UserSettings/Search.settings | 21 ++ settings.txt | 2 +- 12 files changed, 101 insertions(+), 210 deletions(-) diff --git a/Assets/Locals/StringTable/MyTexts Shared Data.asset b/Assets/Locals/StringTable/MyTexts Shared Data.asset index b5e0f5a..b239f3a 100644 --- a/Assets/Locals/StringTable/MyTexts Shared Data.asset +++ b/Assets/Locals/StringTable/MyTexts Shared Data.asset @@ -1341,19 +1341,19 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 131170344725151744 - m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlControlsKeyboard/txtSensitivityMouse_2 + m_Key: txtSensitivityMouseHorizontal m_Metadata: m_Items: [] - m_Id: 131170584358322176 - m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsKeyboard/txtSensitivityMouse_2 + m_Key: txtSensitivityMouseVertical m_Metadata: m_Items: [] - m_Id: 131171548708503552 - m_Key: MenuScene/Canvas/Options/Settings/pnlContent/pnlControlsController/txtSensitivityController_2 + m_Key: txtSensitivityControllerHorizontal m_Metadata: m_Items: [] - m_Id: 131171550805655552 - m_Key: GameScene/Canvas/Options/Settings/pnlContent/pnlControlsController/txtSensitivityController_2 + m_Key: txtSensitivityControllerVertical m_Metadata: m_Items: [] m_Metadata: diff --git a/Assets/Locals/StringTable/MyTexts_de.asset b/Assets/Locals/StringTable/MyTexts_de.asset index 4646610..ae40e0a 100644 --- a/Assets/Locals/StringTable/MyTexts_de.asset +++ b/Assets/Locals/StringTable/MyTexts_de.asset @@ -16,7 +16,8 @@ MonoBehaviour: m_Code: de m_SharedData: {fileID: 11400000, guid: 493a625c00a76ca27985d7f7e8d2cb79, type: 2} m_Metadata: - m_Items: [] + m_Items: + - rid: 4979123178073489615 m_TableData: - m_Id: 1850510929920 m_Localized: Eiszapfen @@ -932,9 +933,10 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 207592409001984 - m_Localized: 'Empfindlichkeit Horizontal:' + m_Localized: 'Empfindlichkeit Vertikal:' m_Metadata: - m_Items: [] + m_Items: + - rid: 4979123178073489615 - m_Id: 207625044881408 m_Localized: "F\xE4higkeiten" m_Metadata: @@ -1350,7 +1352,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 131170344725151744 - m_Localized: 'Empfindlichkeit Vertikal:' + m_Localized: 'Empfindlichkeit Horizontal:' m_Metadata: m_Items: [] - m_Id: 131170584358322176 @@ -1358,7 +1360,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 131171548708503552 - m_Localized: 'Empfindlichkeit Vertikal:' + m_Localized: 'Empfindlichkeit Horizontal:' m_Metadata: m_Items: [] - m_Id: 131171550805655552 @@ -1367,4 +1369,10 @@ MonoBehaviour: m_Items: [] references: version: 2 - RefIds: [] + RefIds: + - rid: 4979123178073489615 + type: {class: SmartFormatTag, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} + data: + m_Entries: + m_SharedEntries: + - id: 207592409001984 diff --git a/Assets/Locals/StringTable/MyTexts_en.asset b/Assets/Locals/StringTable/MyTexts_en.asset index e4557d3..e2f7906 100644 --- a/Assets/Locals/StringTable/MyTexts_en.asset +++ b/Assets/Locals/StringTable/MyTexts_en.asset @@ -952,7 +952,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 207592409001984 - m_Localized: 'Sensitivity Horizontal:' + m_Localized: 'Sensitivity Vertical:' m_Metadata: m_Items: [] - m_Id: 207625044881408 @@ -1393,7 +1393,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 131170344725151744 - m_Localized: 'Sensitivity Vertical:' + m_Localized: 'Sensitivity Horizontal:' m_Metadata: m_Items: [] - m_Id: 131170584358322176 @@ -1401,7 +1401,7 @@ MonoBehaviour: m_Metadata: m_Items: [] - m_Id: 131171548708503552 - m_Localized: 'Sensitivity Vertical:' + m_Localized: 'Sensitivity Horizontal:' m_Metadata: m_Items: [] - m_Id: 131171550805655552 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 2e44dff..48a5764 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -365,9 +365,8 @@ GameObject: - component: {fileID: 11077168} - component: {fileID: 11077167} - component: {fileID: 11077169} - - component: {fileID: 11077170} m_Layer: 5 - m_Name: txtSensitivityController + m_Name: txtSensitivityControllerHorizontal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -450,7 +449,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 m_TableEntryReference: - m_KeyId: 207547915825152 + m_KeyId: 131171548708503552 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -474,44 +473,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!114 &11077170 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 11077165} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540891 - references: - version: 2 - RefIds: - - rid: 6167802955520540891 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 11077167} - m_TrackedProperties: - items: - - rid: 6167802955520540892 - m_UpdateType: 0 - - rid: 6167802955520540892 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 207547915825152 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &24840618 GameObject: m_ObjectHideFlags: 0 @@ -10065,9 +10026,8 @@ GameObject: - component: {fileID: 501593235} - component: {fileID: 501593234} - component: {fileID: 501593236} - - component: {fileID: 501593237} m_Layer: 5 - m_Name: txtSensitivityMouse + m_Name: txtSensitivityMouseHorizontal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10150,7 +10110,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 m_TableEntryReference: - m_KeyId: 207592409001984 + m_KeyId: 131170344725151744 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -10174,44 +10134,6 @@ MonoBehaviour: references: version: 2 RefIds: [] ---- !u!114 &501593237 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 501593232} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540893 - references: - version: 2 - RefIds: - - rid: 6167802955520540893 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 501593234} - m_TrackedProperties: - items: - - rid: 6167802955520540894 - m_UpdateType: 0 - - rid: 6167802955520540894 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 207592409001984 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!1 &506672577 GameObject: m_ObjectHideFlags: 0 @@ -11554,7 +11476,7 @@ GameObject: - component: {fileID: 575372021} - component: {fileID: 575372020} m_Layer: 5 - m_Name: slideSensitivityMouseHorizontal + m_Name: slideSensitivityMouseVertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13778,7 +13700,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Window + m_Text: Fenster --- !u!222 &709576934 CanvasRenderer: m_ObjectHideFlags: 0 @@ -13995,7 +13917,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: 800x600 + m_Text: Deutsch --- !u!222 &722907595 CanvasRenderer: m_ObjectHideFlags: 0 @@ -18763,6 +18685,7 @@ GameObject: m_Component: - component: {fileID: 923848396} - component: {fileID: 923848397} + - component: {fileID: 923848398} m_Layer: 0 m_Name: LookingHead m_TagString: Untagged @@ -18840,6 +18763,22 @@ MonoBehaviour: x: 1 y: 1 z: 1 +--- !u!114 &923848398 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 923848395} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjects: [] + references: + version: 2 + RefIds: [] --- !u!1 &926355124 GameObject: m_ObjectHideFlags: 0 @@ -31955,9 +31894,8 @@ GameObject: - component: {fileID: 1618461712} - component: {fileID: 1618461711} - component: {fileID: 1618461710} - - component: {fileID: 1618461709} m_Layer: 5 - m_Name: txtSensitivityController_2 + m_Name: txtSensitivityControllerVertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -31982,44 +31920,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1618461709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1618461707} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540891 - references: - version: 2 - RefIds: - - rid: 6167802955520540891 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1618461711} - m_TrackedProperties: - items: - - rid: 6167802955520540892 - m_UpdateType: 0 - - rid: 6167802955520540892 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 207547915825152 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!114 &1618461710 MonoBehaviour: m_ObjectHideFlags: 0 @@ -32929,9 +32829,8 @@ GameObject: - component: {fileID: 1663827364} - component: {fileID: 1663827363} - component: {fileID: 1663827362} - - component: {fileID: 1663827361} m_Layer: 5 - m_Name: txtSensitivityMouse_2 + m_Name: txtSensitivityMouseVertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -32956,44 +32855,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1663827361 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1663827359} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 69beb381e244f92449b8c4cf954630e9, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjects: - - rid: 6167802955520540893 - references: - version: 2 - RefIds: - - rid: 6167802955520540893 - type: {class: TrackedUGuiGraphic, ns: UnityEngine.Localization.PropertyVariants.TrackedObjects, asm: Unity.Localization} - data: - m_Target: {fileID: 1663827363} - m_TrackedProperties: - items: - - rid: 6167802955520540894 - m_UpdateType: 0 - - rid: 6167802955520540894 - type: {class: LocalizedStringProperty, ns: UnityEngine.Localization.PropertyVariants.TrackedProperties, asm: Unity.Localization} - data: - m_Localized: - m_TableReference: - m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 - m_TableEntryReference: - m_KeyId: 207592409001984 - m_Key: - m_FallbackState: 0 - m_WaitForCompletion: 0 - m_LocalVariables: [] - m_PropertyPath: m_Text --- !u!114 &1663827362 MonoBehaviour: m_ObjectHideFlags: 0 @@ -35188,7 +35049,7 @@ GameObject: - component: {fileID: 1779969096} - component: {fileID: 1779969097} m_Layer: 5 - m_Name: slideSensitivityMouseVertical + m_Name: slideSensitivityMouseHorizontal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -39699,9 +39560,9 @@ RectTransform: m_Children: - {fileID: 202464363} - {fileID: 501593233} - - {fileID: 575372021} - - {fileID: 1663827360} - {fileID: 1779969096} + - {fileID: 1663827360} + - {fileID: 575372021} - {fileID: 2062604363} - {fileID: 268391723} - {fileID: 252956361} diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 577697f..c387bcf 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -13,7 +13,7 @@ OcclusionCullingSettings: --- !u!104 &2 RenderSettings: m_ObjectHideFlags: 0 - serializedVersion: 9 + serializedVersion: 10 m_Fog: 0 m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} m_FogMode: 3 @@ -42,8 +42,8 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 + serializedVersion: 13 + m_BakeOnSceneLoad: 0 m_GISettings: serializedVersion: 2 m_BounceScale: 1 @@ -66,9 +66,6 @@ LightmapSettings: m_LightmapParameters: {fileID: 0} m_LightmapsBakeMode: 1 m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 m_ReflectionCompression: 2 m_MixedBakeMode: 2 m_BakeBackend: 1 @@ -2735,7 +2732,7 @@ GameObject: - component: {fileID: 201666021} - component: {fileID: 201666023} m_Layer: 5 - m_Name: txtSensitivityMouse + m_Name: txtSensitivityMouseHorizontal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2834,7 +2831,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 m_TableEntryReference: - m_KeyId: 204732065640448 + m_KeyId: 131170344725151744 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -8580,7 +8577,7 @@ GameObject: - component: {fileID: 808004694} - component: {fileID: 808004693} m_Layer: 5 - m_Name: txtSensitivityController_2 + m_Name: txtSensitivityControllerVertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8637,7 +8634,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 m_TableEntryReference: - m_KeyId: 131171548708503552 + m_KeyId: 131171550805655552 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -9368,6 +9365,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 8300000, guid: a643b25dcc17f2f458d98e5a494862a7, type: 3} + m_Resource: {fileID: 8300000, guid: a643b25dcc17f2f458d98e5a494862a7, type: 3} m_PlayOnAwake: 1 m_Volume: 0.5 m_Pitch: 1 @@ -9826,7 +9824,7 @@ GameObject: - component: {fileID: 890610387} - component: {fileID: 890610386} m_Layer: 5 - m_Name: txtSensitivityMouse_2 + m_Name: txtSensitivityMouseVertical m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9883,7 +9881,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 m_TableEntryReference: - m_KeyId: 131170344725151744 + m_KeyId: 131170584358322176 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 @@ -10076,7 +10074,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: Small (5 cities) + m_Text: K --- !u!222 &929276014 CanvasRenderer: m_ObjectHideFlags: 0 @@ -13599,7 +13597,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: German + m_Text: 800x600 --- !u!222 &1225249785 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14518,6 +14516,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 0 m_Volume: 0.5 m_Pitch: 1 @@ -15518,7 +15517,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1348951834 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -15532,6 +15531,7 @@ Animator: m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -17635,7 +17635,7 @@ GameObject: - component: {fileID: 1480371320} - component: {fileID: 1480371322} m_Layer: 5 - m_Name: txtSensitivityController + m_Name: txtSensitivityControllerHorizontal m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17734,7 +17734,7 @@ MonoBehaviour: m_TableReference: m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79 m_TableEntryReference: - m_KeyId: 204708862750720 + m_KeyId: 131171548708503552 m_Key: m_FallbackState: 0 m_WaitForCompletion: 0 diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index 8881041..abd0184 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -56,11 +56,11 @@ public class Controls : MonoBehaviour if (uihandler.canPlayerRotate()) { if(playerInput.currentControlScheme == "Controller"){ - playerCam.GetComponent().lookAround(view, sensitivityController * multiplier); + playerCam.GetComponent().LookUpAndDown(view, sensitivityController * multiplier); player.GetComponent().rotate(view, sensitivityController * multiplier); } else{ - playerCam.GetComponent().lookAround(view, sensitivityMouse * multiplier); + playerCam.GetComponent().LookUpAndDown(view, sensitivityMouse * multiplier); player.GetComponent().rotate(view, sensitivityMouse * multiplier); } } diff --git a/Assets/Scripts/Handler/SceneHandler.cs b/Assets/Scripts/Handler/SceneHandler.cs index 4349f6b..9020b3e 100644 --- a/Assets/Scripts/Handler/SceneHandler.cs +++ b/Assets/Scripts/Handler/SceneHandler.cs @@ -14,7 +14,7 @@ namespace Assets.Scripts { SceneManager.sceneLoaded += OnSceneLoaded; bool hasSceneHandler = false; - foreach (Object o in FindObjectsOfType(typeof(MonoBehaviour))) + foreach (Object o in FindObjectsByType(FindObjectsSortMode.None)) { if (o.name == "SceneHandlerLoaded") { diff --git a/Assets/Scripts/Player/PlayerCamera.cs b/Assets/Scripts/Player/PlayerCamera.cs index c8c864b..4142f46 100644 --- a/Assets/Scripts/Player/PlayerCamera.cs +++ b/Assets/Scripts/Player/PlayerCamera.cs @@ -43,10 +43,10 @@ namespace Assets.Scripts.Player return null; } - public void lookAround(Vector2 view, Vector2 speed) + public void LookUpAndDown(Vector2 view, Vector2 speed) { GameObject target = GameObject.Find("targetLooking"); - target.transform.localPosition = target.transform.localPosition + new Vector3(0,view.y,0) * speed.x;// * Time.deltaTime; + target.transform.localPosition = target.transform.localPosition + new Vector3(0,view.y,0) * speed.y;// * Time.deltaTime; if(target.transform.localPosition.y >= 2){ target.transform.localPosition = new Vector3(target.transform.localPosition.x,2f,target.transform.localPosition.z); } diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 1422847..910e46a 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -183,7 +183,7 @@ namespace Assets.Scripts.Player } public void rotate(Vector2 input, Vector2 speed){ - transform.Rotate(Vector3.up, input.x * speed.y);// * Time.deltaTime); + transform.Rotate(Vector3.up, input.x * speed.x);// * Time.deltaTime); } public void getRotation() diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8a467a5..ececa2f 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,17 +12,17 @@ EditorUserSettings: value: 0503045757070c095e0b087612765b40474f4979757d24647c71496ae7b8313e flags: 0 RecentlyUsedSceneGuid-2: - value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a - flags: 0 - RecentlyUsedSceneGuid-3: value: 5354065550010c035a0d0f7b15715a474515417b7d7f23607d2a456ae7b4656a flags: 0 - RecentlyUsedSceneGuid-4: + RecentlyUsedSceneGuid-3: value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d flags: 0 - RecentlyUsedSceneGuid-5: + RecentlyUsedSceneGuid-4: value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 + RecentlyUsedSceneGuid-5: + value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a + flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 @@ -60,3 +60,4 @@ EditorUserSettings: m_VCAllowAsyncUpdate: 1 m_VCScanLocalPackagesOnConnect: 1 m_ArtifactGarbageCollection: 1 + m_CompressAssetsOnImport: 1 diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 44c3819..0570e0b 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1,5 +1,6 @@ trackSelection = true refreshSearchWindowsInPlayMode = false +pickerAdvancedUI = false fetchPreview = true defaultFlags = 0 keepOpen = false @@ -24,6 +25,10 @@ scopes = { "last_search.45F3178B" = "" "OpenInspectorPreview.45F3178B" = "0" "currentGroup.45F3178B" = "all" + "picker_window_position_offset.075BCD15" = "1282;187;626;560" + "picker_visibility_flags.075BCD15" = "264" + "picker_item_size.075BCD15" = "96" + "picker_inspector.075BCD15" = "0" } providers = { packages = { @@ -81,10 +86,26 @@ providers = { priority = 100 defaultAction = null } + presets_provider = { + active = false + priority = -10 + defaultAction = null + } } objectSelectors = { } recentSearches = [ + "st: controllerho" + "st: controllervert" + "st: contr" + "st: mousehori" + "st: mouseh" + "st: controllerver" + "st: controllerh" + "st: controllerhori" + "st: contro" + "st: controllerverti" + "st: co" " " "MenuScene/Canvas/CharacterCreation/pnlInput/dropRace 4" ] diff --git a/settings.txt b/settings.txt index e841388..d55c6bd 100644 --- a/settings.txt +++ b/settings.txt @@ -4,4 +4,4 @@ Language:en Music:0 Effects:0 SensitivityController:1/1 -SensitivityMouse:5.285715/75.14285 \ No newline at end of file +SensitivityMouse:59.292/3.892872 \ No newline at end of file