From 0865eee42f91c74bbc9b0e0dba3c8dc4a2536b64 Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Wed, 27 Dec 2023 10:54:16 +0100 Subject: [PATCH] added animation, pickaxe, fixed lookaround --- Assets/IMG/Animations/Player.meta | 8 + Assets/IMG/Animations/Player/Mining.anim | 697 ++++++++++++++++++ Assets/IMG/Animations/Player/Mining.anim.meta | 8 + .../Player/PlayerAnimator.controller | 101 +++ .../Player/PlayerAnimator.controller.meta | 8 + Assets/Prefabs/FBX/pickaxe.fbx | Bin 0 -> 19052 bytes Assets/Prefabs/FBX/pickaxe.fbx.meta | 109 +++ Assets/Prefabs/pickaxe.prefab | 71 ++ Assets/Prefabs/pickaxe.prefab.meta | 7 + Assets/Scenes/GameScene.unity | 97 +++ Assets/Scenes/MenuScene.unity | 225 +----- Assets/Scripts/Controls.cs | 86 ++- Assets/Scripts/Fight.cs | 2 +- Assets/Scripts/Handler/ButtonHandler.cs | 4 +- Assets/Scripts/Handler/FileHandler.cs | 4 +- Assets/Scripts/Player/PlayerCamera.cs | 24 - Assets/Scripts/Player/PlayerGameObject.cs | 53 +- UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 340 +++++---- UserSettings/Layouts/default-2022.dwlt | 152 ++-- 20 files changed, 1450 insertions(+), 550 deletions(-) create mode 100644 Assets/IMG/Animations/Player.meta create mode 100644 Assets/IMG/Animations/Player/Mining.anim create mode 100644 Assets/IMG/Animations/Player/Mining.anim.meta create mode 100644 Assets/IMG/Animations/Player/PlayerAnimator.controller create mode 100644 Assets/IMG/Animations/Player/PlayerAnimator.controller.meta create mode 100644 Assets/Prefabs/FBX/pickaxe.fbx create mode 100644 Assets/Prefabs/FBX/pickaxe.fbx.meta create mode 100644 Assets/Prefabs/pickaxe.prefab create mode 100644 Assets/Prefabs/pickaxe.prefab.meta diff --git a/Assets/IMG/Animations/Player.meta b/Assets/IMG/Animations/Player.meta new file mode 100644 index 0000000..f5dbc78 --- /dev/null +++ b/Assets/IMG/Animations/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3cf45c452660581d2bdb7fda4aa48afb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Animations/Player/Mining.anim b/Assets/IMG/Animations/Player/Mining.anim new file mode 100644 index 0000000..c338409 --- /dev/null +++ b/Assets/IMG/Animations/Player/Mining.anim @@ -0,0 +1,697 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mining + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -90, y: 0, z: 90} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: -90, y: 0, z: 61.716} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: -29.814, y: -28.284, z: 90} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: -90, y: 0, z: 61.708} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: -29.814, y: -28.284, z: 90} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: -90, y: 0, z: 61.708} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: -90, y: 0, z: 90} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: pickaxe + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.58, y: -0.374, z: -0.046} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0.75175714, y: 0.069000006, z: 0.7514484} + inSlope: {x: 0.008996482, y: 0, z: 0} + outSlope: {x: 0.008996482, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.33333334 + value: {x: 0.75250685, y: 0.06626868, z: 0.7500547} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 0.7517569, y: 0.06900114, z: 0.75144887} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.6666667 + value: {x: 0.75250685, y: 0.06626868, z: 0.7500547} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.8333333 + value: {x: 0.7517569, y: 0.06900114, z: 0.75144887} + inSlope: {x: -0.008999349, y: 0, z: 0} + outSlope: {x: -0.008999349, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 0.58, y: -0.374, z: -0.046} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: pickaxe + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 4284607334 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 4284607334 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.58 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.75175714 + inSlope: 0.008996482 + outSlope: 0.008996482 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.75250685 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.7517569 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.75250685 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.7517569 + inSlope: -0.008999349 + outSlope: -0.008999349 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.58 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.374 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.069000006 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.06626868 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.06900114 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.06626868 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.06900114 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.374 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.046 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.7514484 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 0.7500547 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.75144887 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 0.7500547 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0.75144887 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -0.046 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: -29.814 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -29.814 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: -90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: -28.284 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: -28.284 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 61.716 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.33333334 + value: 90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 61.708 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.6666667 + value: 90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.8333333 + value: 61.708 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 90 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: pickaxe + classID: 4 + script: {fileID: 0} + flags: 0 + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/IMG/Animations/Player/Mining.anim.meta b/Assets/IMG/Animations/Player/Mining.anim.meta new file mode 100644 index 0000000..606ab64 --- /dev/null +++ b/Assets/IMG/Animations/Player/Mining.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dfe6f42559279b9f2a43256075839781 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/IMG/Animations/Player/PlayerAnimator.controller b/Assets/IMG/Animations/Player/PlayerAnimator.controller new file mode 100644 index 0000000..6293b53 --- /dev/null +++ b/Assets/IMG/Animations/Player/PlayerAnimator.controller @@ -0,0 +1,101 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5770798371515671020 +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: 4026934837641483164} + m_Position: {x: 390, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: -3519760693848770016} + m_Position: {x: 430, y: 10, 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: 130, z: 0} + m_ExitPosition: {x: 800, y: 130, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 4026934837641483164} +--- !u!1102 &-3519760693848770016 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mining + 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: dfe6f42559279b9f2a43256075839781, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerAnimator + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5770798371515671020} + 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} +--- !u!1102 &4026934837641483164 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: New State + 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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/IMG/Animations/Player/PlayerAnimator.controller.meta b/Assets/IMG/Animations/Player/PlayerAnimator.controller.meta new file mode 100644 index 0000000..37871c9 --- /dev/null +++ b/Assets/IMG/Animations/Player/PlayerAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 515553cb3dbcb3375abd626d237d3132 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/FBX/pickaxe.fbx b/Assets/Prefabs/FBX/pickaxe.fbx new file mode 100644 index 0000000000000000000000000000000000000000..36282bebddf2363f5104c54356d808b68863321a GIT binary patch literal 19052 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 literal 0 HcmV?d00001 diff --git a/Assets/Prefabs/FBX/pickaxe.fbx.meta b/Assets/Prefabs/FBX/pickaxe.fbx.meta new file mode 100644 index 0000000..d498bbe --- /dev/null +++ b/Assets/Prefabs/FBX/pickaxe.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: b9080aeec35f41d30a8843321f730ea8 +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/pickaxe.prefab b/Assets/Prefabs/pickaxe.prefab new file mode 100644 index 0000000..6dbb684 --- /dev/null +++ b/Assets/Prefabs/pickaxe.prefab @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1447487966108478078 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalScale.x + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalScale.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalScale.z + value: 25 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalPosition.x + value: -3.0251021 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalPosition.y + value: 1.791 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalPosition.z + value: 2.183 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} + propertyPath: m_Name + value: pickaxe + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b9080aeec35f41d30a8843321f730ea8, type: 3} diff --git a/Assets/Prefabs/pickaxe.prefab.meta b/Assets/Prefabs/pickaxe.prefab.meta new file mode 100644 index 0000000..97275d9 --- /dev/null +++ b/Assets/Prefabs/pickaxe.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e64f006a5463aa56927e7c3fbcb7b35 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 2eab4ef..5376150 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -19681,6 +19681,7 @@ GameObject: - component: {fileID: 1031315372} - component: {fileID: 1031315373} - component: {fileID: 1031315374} + - component: {fileID: 1031315375} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -19775,6 +19776,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 963194228} + - {fileID: 2137776343} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1031315371 @@ -19948,6 +19950,27 @@ MonoBehaviour: - localeIdentifier: m_Code: de value: 20 +--- !u!95 &1031315375 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1031315366} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 515553cb3dbcb3375abd626d237d3132, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1031718408 GameObject: m_ObjectHideFlags: 0 @@ -39941,6 +39964,80 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2131094128} m_CullTransparentMesh: 1 +--- !u!1001 &2137776342 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1031315370} + m_Modifications: + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalScale.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalScale.y + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalScale.z + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalPosition.x + value: 0.578 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalPosition.y + value: -0.212 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalPosition.z + value: -0.005 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1790158256870610735, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + propertyPath: m_Name + value: pickaxe + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} +--- !u!4 &2137776343 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1413070214906580373, guid: 7e64f006a5463aa56927e7c3fbcb7b35, type: 3} + m_PrefabInstance: {fileID: 2137776342} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 3006474..fc4682f 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -9339,7 +9339,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 @@ -9953,78 +9953,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ecb843ecde843f11c98ebad43887bfde, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1013631589 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1013631590} - - component: {fileID: 1013631592} - - component: {fileID: 1013631591} - m_Layer: 5 - m_Name: imgDecoration2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1013631590 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013631589} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1481292146} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0} - m_AnchorMax: {x: 1, y: 0.25} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1013631591 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013631589} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 9aa1176862b83ed4fa1198bd3233fa7d, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1013631592 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1013631589} - m_CullTransparentMesh: 1 --- !u!1 &1020237090 GameObject: m_ObjectHideFlags: 0 @@ -12753,7 +12681,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: German + m_Text: 800x600 --- !u!222 &1225249785 CanvasRenderer: m_ObjectHideFlags: 0 @@ -14774,78 +14702,6 @@ MonoBehaviour: m_WaitForCompletion: 0 m_LocalVariables: [] m_PropertyPath: m_Options.m_Options.Array.data[1].m_Text ---- !u!1 &1354139369 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1354139370} - - component: {fileID: 1354139372} - - component: {fileID: 1354139371} - m_Layer: 5 - m_Name: imgDecoration1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1354139370 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354139369} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1481292146} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0.1, y: 0.3} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1354139371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354139369} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: 89314fa0ee3e9a743b477aa030269f54, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1354139372 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1354139369} - m_CullTransparentMesh: 1 --- !u!1 &1357862246 GameObject: m_ObjectHideFlags: 0 @@ -16268,78 +16124,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1430500584} m_CullTransparentMesh: 1 ---- !u!1 &1436626605 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1436626606} - - component: {fileID: 1436626608} - - component: {fileID: 1436626607} - m_Layer: 5 - m_Name: imgDecoration3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1436626606 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1436626605} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1481292146} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4, y: 0} - m_AnchorMax: {x: 0.5, y: 0.2} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1436626607 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1436626605} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 2800000, guid: d1cd07fe499fa4049bf24d9cb128072e, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1436626608 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1436626605} - m_CullTransparentMesh: 1 --- !u!1 &1437304200 GameObject: m_ObjectHideFlags: 0 @@ -16835,9 +16619,6 @@ RectTransform: - {fileID: 180050799} - {fileID: 1375575131} - {fileID: 2093776663} - - {fileID: 1436626606} - - {fileID: 1354139370} - - {fileID: 1013631590} - {fileID: 1122914073} - {fileID: 2008818877} m_Father: {fileID: 343734138} @@ -24099,6 +23880,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 5 + mouseSpeed: 100 + controllerSpeed: 0.01 --- !u!23 &2110460589 MeshRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index 20089fe..c725a82 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -36,6 +36,39 @@ public class Controls : MonoBehaviour // Update is called once per frame void Update() { + if (uihandler.state == UIState.GAME && playerInput.currentActionMap.name != "MainGame") + { + playerInput.SwitchCurrentActionMap("MainGame"); + } + if (uihandler.state != UIState.GAME && playerInput.currentActionMap.name != "Menu") + { + playerInput.SwitchCurrentActionMap("Menu"); + } + if (!player.GetComponent().takeDamage(0)) + { + if (!uihandler.isPlayerInFight()) + { + if (uihandler.canPlayerRotate()) + { + player.GetComponent().lookAround(view, playerInput.currentControlScheme == "Controller"); + } + if (uihandler.canPlayerMove()) + { + player.GetComponent().move(input); + } + } + } + } + + public void FixedUpdate() + { + if (direction != MoveDirection.None) + { + AxisEventData data = new AxisEventData(EventSystem.current); + data.moveDir = direction; + data.selectedObject = EventSystem.current.currentSelectedGameObject; + ExecuteEvents.Execute(data.selectedObject, data, ExecuteEvents.moveHandler); + } if (playerInput.currentControlScheme == "Controller") { if (Cursor.lockState != CursorLockMode.Locked) @@ -60,39 +93,6 @@ public class Controls : MonoBehaviour GameObject.Find("txtInteraction_Tutorial").GetComponent().text = GameObject.Find("txtInteraction_Tutorial").GetComponent().text.Replace("[E]", "[ButtonEast]"); GameObject.Find("txtTutorialGoal").GetComponent().text = GameObject.Find("txtTutorialGoal").GetComponent().text.Replace("[Start]", "[ESC]"); } - if (uihandler.state == UIState.GAME && playerInput.currentActionMap.name != "MainGame") - { - playerInput.SwitchCurrentActionMap("MainGame"); - } - if (uihandler.state != UIState.GAME && playerInput.currentActionMap.name != "Menu") - { - playerInput.SwitchCurrentActionMap("Menu"); - } - if (!player.GetComponent().takeDamage(0)) - { - if (!uihandler.isPlayerInFight()) - { - if (uihandler.canPlayerRotate()) - { - playerCam.GetComponent().lookAround(view, playerInput.currentControlScheme == "Controller"); - } - if (uihandler.canPlayerMove()) - { - player.GetComponent().move(input); - } - } - } - } - - public void FixedUpdate() - { - if (direction != MoveDirection.None) - { - AxisEventData data = new AxisEventData(EventSystem.current); - data.moveDir = direction; - data.selectedObject = EventSystem.current.currentSelectedGameObject; - ExecuteEvents.Execute(data.selectedObject, data, ExecuteEvents.moveHandler); - } } public void OnLooking(InputValue value) @@ -145,8 +145,8 @@ public class Controls : MonoBehaviour GameObject.Find("Inventory").GetComponent().addItem(new Item("Wood")); break; case "Stone": + StartCoroutine(playAnimation(target, "Mining")); GameObject.Find("Inventory").GetComponent().addItem(new Item("Rock")); - Destroy(target); break; case "NPC": target.GetComponent().interact(); @@ -194,6 +194,24 @@ public class Controls : MonoBehaviour Destroy(target); } + IEnumerator playAnimation(GameObject target, string key) + { + player.GetComponent().Play(key); + Animator animator = player.GetComponent(); + AnimationClip[] clips = animator.runtimeAnimatorController.animationClips; + float length = 0; + foreach (AnimationClip clip in clips) + { + if (clip.name.ToLower() == key.ToLower()) + { + length = clip.length; + break; + } + } + yield return new WaitForSeconds(length); + Destroy(target); + } + public void OnInventory() { uihandler.switchInventory(); diff --git a/Assets/Scripts/Fight.cs b/Assets/Scripts/Fight.cs index 93912f0..931f3f3 100644 --- a/Assets/Scripts/Fight.cs +++ b/Assets/Scripts/Fight.cs @@ -20,7 +20,7 @@ public class Fight : MonoBehaviour this.enemy = enemy; this.player = player; enemy.GetComponent().scaleEnemy(player.GetComponent()); - enemy.transform.rotation = Quaternion.Euler(0, GameObject.Find("Main Camera").transform.rotation.y + 180f, 0); + enemy.transform.rotation = Quaternion.Euler(0, player.transform.rotation.y + 180f, 0); uihandler = GameObject.Find("UIHandler").GetComponent(); uihandler.openFight(); diff --git a/Assets/Scripts/Handler/ButtonHandler.cs b/Assets/Scripts/Handler/ButtonHandler.cs index 79a0e90..02de93e 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("Player").GetComponent().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent().value; + GameObject.Find("Player").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..3fe9aab 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("Player").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("Player").GetComponent().controllerSpeed = float.Parse(line.Split(':')[1]); } break; } diff --git a/Assets/Scripts/Player/PlayerCamera.cs b/Assets/Scripts/Player/PlayerCamera.cs index 4767188..903fbbf 100644 --- a/Assets/Scripts/Player/PlayerCamera.cs +++ b/Assets/Scripts/Player/PlayerCamera.cs @@ -8,19 +8,12 @@ namespace Assets.Scripts.Player public class PlayerCamera : MonoBehaviour { UIHandler uihandler; - GameObject player; - Vector2 rotation = Vector2.zero; - public float mouseSpeed = 100; //the sensibility - public float controllerSpeed = 0.01f; //the sensibility - float xMaxLimit = 50.0f; - float xMinLimit = -50.0f; GameObject interact; // Start is called before the first frame update void Start() { uihandler = GameObject.Find("UIHandler").GetComponent(); - player = gameObject.transform.parent.gameObject; interact = GameObject.Find("pnlInteract"); interact.transform.localScale = new Vector3(0, 0, 0); } @@ -29,7 +22,6 @@ namespace Assets.Scripts.Player void Update() { transform.position = new Vector3(transform.parent.transform.position.x, transform.position.y, transform.parent.transform.position.z); - } private void FixedUpdate() @@ -37,22 +29,6 @@ namespace Assets.Scripts.Player showInformation(); } - public void lookAround(Vector2 view, bool isController) - { - rotation.y += view.x; - rotation.x += -view.y; - //rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit); - if (isController) - { - transform.eulerAngles = rotation * (controllerSpeed * Time.deltaTime); - } - else - { - transform.eulerAngles = rotation * mouseSpeed; - //TODO: Look at camera movement -> Not rly smooth. Weird drag - } - } - public GameObject interactWithObject() { RaycastHit hit; diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index 5db2a65..2303c72 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -25,6 +25,11 @@ namespace Assets.Scripts.Player DateTime jumpTimer; DateTime now; int bobbingDirection = -1; + public float mouseSpeed = 100; //the sensibility + public float controllerSpeed = 0.01f; //the sensibility + float xMaxLimit = 45.0f; + float xMinLimit = -45.0f; + Vector2 rotation = Vector2.zero; private void OnEnable() { @@ -157,8 +162,6 @@ namespace Assets.Scripts.Player } Vector3 movement = new Vector3(input.x, 0, input.z); - movement = camera.transform.TransformDirection(movement); - movement.y = 0; gameObject.transform.Translate(movement * speed * Time.deltaTime); if (input.z != 0) @@ -180,7 +183,7 @@ namespace Assets.Scripts.Player public void getRotation() { GameObject needle = GameObject.Find("imgNeedle"); - float rotation = GameObject.Find("Main Camera").transform.rotation.eulerAngles.y; + float rotation = gameObject.transform.rotation.eulerAngles.y; if (rotation < 0) { rotation += 360; @@ -218,19 +221,21 @@ namespace Assets.Scripts.Player { worldGenerator.changeCurrentTile(col.gameObject); - worldGenerator.createTile(new Vector3(-1,0,0)); - worldGenerator.createTile(new Vector3(1,0,0)); - worldGenerator.createTile(new Vector3(0,0,1)); - worldGenerator.createTile(new Vector3(0,0,-1)); + worldGenerator.createTile(new Vector3(-1, 0, 0)); + worldGenerator.createTile(new Vector3(1, 0, 0)); + worldGenerator.createTile(new Vector3(0, 0, 1)); + worldGenerator.createTile(new Vector3(0, 0, -1)); - worldGenerator.createTile(new Vector3(-1,0,-1)); - worldGenerator.createTile(new Vector3(1,0,-1)); - worldGenerator.createTile(new Vector3(-1,0,1)); - worldGenerator.createTile(new Vector3(1,0,1)); + worldGenerator.createTile(new Vector3(-1, 0, -1)); + worldGenerator.createTile(new Vector3(1, 0, -1)); + worldGenerator.createTile(new Vector3(-1, 0, 1)); + worldGenerator.createTile(new Vector3(1, 0, 1)); } - if(col.name.Contains("House")){ - if(!col.transform.Find("Door").GetComponent().hasInteracted){ + if (col.name.Contains("House")) + { + if (!col.transform.Find("Door").GetComponent().hasInteracted) + { transform.position = new Vector3(transform.position.x + 10, 10, transform.position.z); } } @@ -349,7 +354,8 @@ namespace Assets.Scripts.Player { if (player != null) { - if(player.takeDamage(amount, inventory.getEquipmentBonus()["DEX"], inventory.getEquipmentBonus()["INT"])){ + if (player.takeDamage(amount, inventory.getEquipmentBonus()["DEX"], inventory.getEquipmentBonus()["INT"])) + { audioHandler.playDamage(); return true; } @@ -360,7 +366,8 @@ namespace Assets.Scripts.Player public int castSkill(int skillnumber) { int damage = player.castSkill(skillnumber, inventory.getEquipmentBonus()["INT"], inventory.getEquipmentBonus()["STR"], inventory.getEquipmentBonus()["DEX"]); - if(damage > 0){ + if (damage > 0) + { player.getSkill(skillnumber).playSound(audioHandler); } return damage; @@ -375,5 +382,21 @@ namespace Assets.Scripts.Player { player.regainSecondary(inventory.getEquipmentBonus()["MPR"], inventory.getEquipmentBonus()["MP"]); } + + public void lookAround(Vector2 view, bool isController) + { + rotation.y += view.x; + rotation.x += -view.y; + rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit); + if (isController) + { + transform.eulerAngles = rotation * (controllerSpeed * Time.deltaTime); + } + else + { + transform.eulerAngles = rotation * mouseSpeed; + //TODO: Look at camera movement -> Not rly smooth. Weird drag + } + } } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8c05ffe..fe8b97c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,10 @@ EditorUserSettings: value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d flags: 0 RecentlyUsedSceneGuid-3: - value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedSceneGuid-4: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 56060d5e5301505e0f5a5a2344200944154e4128792a2763297b4a30b2e2363a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 43be066..8fb3f65 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -8,23 +8,22 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 1 + m_EditorHideFlags: 0 m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 15} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1920 - height: 970 + height: 942 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} - vertical: 0 - controlID: 41 + vertical: 1 + controlID: 43 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,10 +44,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 - y: 90 + x: 2226 + y: 118 width: 1212 - height: 664 + height: 644 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -283,8 +282,8 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 - snapOffset: {x: 0, y: 0} + displayed: 0 + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Particles @@ -368,9 +367,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 27.05847, y: -17.999172, z: -7.0689836} + m_Target: {x: -1.12699, y: -0.20633137, z: -1.9598122} speed: 2 - m_Value: {x: 27.05847, y: -17.999172, z: -7.0689836} + m_Value: {x: -1.12699, y: -0.20633137, z: -1.9598122} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -416,13 +415,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.17115292, y: -0.75002754, z: 0.21327797, w: -0.6021382} + m_Target: {x: -0.0542671, y: 0.9448148, z: -0.24827406, w: -0.20633337} speed: 2 - m_Value: {x: -0.17184159, y: -0.7498267, z: 0.21413562, w: -0.601977} + m_Value: {x: -0.055262774, y: 0.94387805, z: -0.2505395, w: -0.2080151} m_Size: - m_Target: 23.850779 + m_Target: 3.6111107 speed: 2 - m_Value: 23.850777 + m_Value: 3.6111107 m_Ortho: m_Target: 0 speed: 2 @@ -461,17 +460,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 12} + - {fileID: 16} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1520 - height: 970 - m_MinSize: {x: 200, y: 100} - m_MaxSize: {x: 16192, y: 16192} - vertical: 1 - controlID: 42 + width: 1920 + height: 942 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 44 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -486,18 +485,43 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 5} - - {fileID: 7} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 y: 0 width: 1520 - height: 685 + height: 942 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 45 +--- !u!114 &5 +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: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1520 + height: 665 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 43 ---- !u!114 &5 + controlID: 46 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -515,15 +539,15 @@ MonoBehaviour: x: 0 y: 0 width: 306 - height: 685 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 6} + height: 665 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 7} m_Panes: - - {fileID: 6} + - {fileID: 7} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -543,10 +567,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 90 + x: 1920 + y: 118 width: 305 - height: 664 + height: 644 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -560,9 +584,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 02f80000 - m_LastClickedID: 63490 - m_ExpandedIDs: ae9bfeff1ea0feff96c4fefff2f9ffff2cfbffff04e5000002f80000 + m_SelectedIDs: 9ae6ffff + m_LastClickedID: -6502 + m_ExpandedIDs: 2cfbffff14600000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -578,7 +602,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 6} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -586,7 +610,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 6f1193b7c6ac3e64ca0e317b16d20212 ---- !u!114 &7 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -604,118 +628,18 @@ MonoBehaviour: x: 306 y: 0 width: 1214 - height: 685 + height: 665 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} m_Panes: - {fileID: 2} - - {fileID: 8} - {fileID: 9} - {fileID: 10} - {fileID: 11} + - {fileID: 12} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &8 -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: 306 - y: 90 - width: 1212 - height: 664 - 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: 1212 - height: 643 - m_Scale: {x: 0.59537035, y: 0.59537035} - m_Translation: {x: 606, y: 321.5} - m_MarginLeft: 0 - m_MarginRight: 0 - m_MarginTop: 0 - m_MarginBottom: 0 - m_LastShownAreaInsideMargins: - serializedVersion: 2 - x: -1017.8538 - y: -540 - width: 2035.7076 - height: 1080 - m_MinimalGUI: 1 - m_defaultScale: 0.59537035 - m_LastWindowPixelSize: {x: 1212, y: 664} - m_ClearInEditMode: 1 - m_NoCameraWarning: 1 - m_LowResolutionForAspectRatios: 01000000000000000000 - m_XRRenderMode: 0 - m_RenderTexture: {fileID: 0} + m_LastSelected: 4 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -792,7 +716,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 7} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ControlPickerViewState: m_AdvancedDropdownState: @@ -1344,6 +1268,76 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 --- !u!114 &12 +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: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 2226 + y: 118 + width: 1212 + height: 644 + 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: 0.8063158 + e01: 0 + e02: 0 + e03: -25.315796 + e10: 0 + e11: 0.8063158 + e12: 0 + e13: 225.9 + 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 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1359,18 +1353,18 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 685 + y: 665 width: 1520 - height: 285 + height: 277 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 14} m_Panes: - - {fileID: 13} - {fileID: 14} + - {fileID: 15} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &13 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1390,10 +1384,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 775 + x: 1920 + y: 783 width: 1519 - height: 264 + height: 256 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1415,7 +1409,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/IMG/Animations/Player m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1423,16 +1417,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/IMG/Animations/Player m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 28} - m_SelectedIDs: 1a640000 - m_LastClickedID: 25626 - m_ExpandedIDs: 00000000486300001c64000000ca9a3b + scrollPos: {x: 0, y: 56} + m_SelectedIDs: 50d20000 + m_LastClickedID: 53840 + m_ExpandedIDs: 00000000566a0000586a0000fe6a0000026b0000226b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1460,7 +1454,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000048630000 + m_ExpandedIDs: 00000000566a0000586a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1485,8 +1479,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 02f80000 - m_LastClickedInstanceID: 63490 + m_SelectedInstanceIDs: 9ae6ffff + m_LastClickedInstanceID: -6502 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: @@ -1516,7 +1510,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 335 ---- !u!114 &14 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1550,7 +1544,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &15 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1568,15 +1562,15 @@ MonoBehaviour: x: 1520 y: 0 width: 400 - height: 970 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + height: 942 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 16} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1596,10 +1590,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1520 - y: 90 + x: 3440 + y: 118 width: 399 - height: 949 + height: 921 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 03c30cf..579e6ef 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 0 - y: 32 + x: 1920 + y: 60 width: 1920 - height: 1020 + height: 992 m_ShowMode: 4 - m_Title: Game + m_Title: Project m_RootView: {fileID: 3} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -43,11 +43,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 970 + height: 942 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 4337 + controlID: 68 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -69,7 +69,7 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 1020 + height: 992 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -114,7 +114,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 1000 + y: 972 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} @@ -139,11 +139,11 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 970 + height: 942 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 4338 + controlID: 69 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,11 +164,11 @@ MonoBehaviour: x: 0 y: 0 width: 1520 - height: 970 + height: 942 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 4339 + controlID: 70 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,11 +189,11 @@ MonoBehaviour: x: 0 y: 0 width: 1520 - height: 685 + height: 665 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 18226 + controlID: 45 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -212,7 +212,7 @@ MonoBehaviour: x: 0 y: 0 width: 306 - height: 685 + height: 665 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -230,7 +230,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -238,17 +238,17 @@ MonoBehaviour: x: 306 y: 0 width: 1214 - height: 685 - m_MinSize: {x: 102, y: 121} + height: 665 + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} - {fileID: 16} - {fileID: 15} - {fileID: 17} - {fileID: 18} - m_Selected: 2 + m_Selected: 0 m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: @@ -266,9 +266,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 685 + y: 665 width: 1520 - height: 285 + height: 277 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} m_ActualView: {fileID: 19} @@ -295,9 +295,9 @@ MonoBehaviour: x: 1520 y: 0 width: 400 - height: 970 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + height: 942 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} @@ -323,10 +323,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 307 - y: 19 + x: 2226 + y: 118 width: 1212 - height: 664 + height: 644 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -381,7 +381,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: unity-search-toolbar index: 1 @@ -420,7 +420,7 @@ MonoBehaviour: collapsed: 0 displayed: 1 snapOffset: {x: -111, y: 2.3769531} - snapOffsetDelta: {x: 0, y: 22.623047} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation index: 0 @@ -433,7 +433,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Light Settings index: 0 @@ -459,7 +459,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Constraints index: 1 @@ -472,7 +472,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Cloth Collisions index: 2 @@ -524,7 +524,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Occlusion Culling index: 3 @@ -537,7 +537,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Physics Debugger index: 4 @@ -550,7 +550,7 @@ MonoBehaviour: collapsed: 0 displayed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: Scene View/Scene Visibility index: 5 @@ -561,7 +561,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -638,17 +638,17 @@ MonoBehaviour: m_OverlaysVisible: 1 m_WindowGUID: b85945ae8dd2cea46915e8777ee5c800 m_Gizmos: 1 - m_OverrideSceneCullingMask: 0 - m_SceneIsLit: 0 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 1 m_SceneLighting: 1 m_2DMode: 0 m_isRotationLocked: 0 m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 3.7822053, y: -2.7566025, z: -1.6370035} + m_Target: {x: 1.1264353, y: -3.5449042, z: -0.7932298} speed: 2 - m_Value: {x: 3.7822053, y: -2.7566025, z: -1.6370035} + m_Value: {x: 985.51117, y: 542.1973, z: -293.29828} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -659,7 +659,7 @@ MonoBehaviour: m_SceneViewState: m_AlwaysRefresh: 0 showFog: 1 - showSkybox: 0 + showSkybox: 1 showFlares: 1 showImageEffects: 1 showParticleSystems: 1 @@ -694,13 +694,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.16788082, y: 0.79394746, z: -0.25306168, w: 0.52665776} + m_Target: {x: -0.009152747, y: 0.980144, z: -0.19220214, w: -0.046377912} speed: 2 - m_Value: {x: 0.16788542, y: 0.7939692, z: -0.25306863, w: 0.5266722} + m_Value: {x: -0.00903823, y: -0.003717085, z: 0.00017100993, w: -0.99995226} m_Size: - m_Target: 2.7486944 + m_Target: 13.108301 speed: 2 - m_Value: 2.7486944 + m_Value: 125.05943 m_Ortho: m_Target: 0 speed: 2 @@ -745,10 +745,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 90 + x: 1920 + y: 118 width: 305 - height: 664 + height: 644 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -762,9 +762,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: aa010400 - m_LastClickedID: 262570 - m_ExpandedIDs: 7253fcff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 20fbffffae5b0000746400007e650000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -808,10 +808,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 - y: 90 + x: 2226 + y: 118 width: 1212 - height: 664 + height: 644 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -867,22 +867,22 @@ MonoBehaviour: x: 0 y: 21 width: 1212 - height: 643 - m_Scale: {x: 0.59537035, y: 0.59537035} - m_Translation: {x: 606, y: 321.5} + height: 623 + m_Scale: {x: 0.57685184, y: 0.57685184} + m_Translation: {x: 606, y: 311.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1017.8538 + x: -1050.5297 y: -540 - width: 2035.7076 + width: 2101.0593 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.59537035 - m_LastWindowPixelSize: {x: 1212, y: 664} + m_defaultScale: 0.57685184 + m_LastWindowPixelSize: {x: 1212, y: 644} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1535,10 +1535,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 775 + x: 1920 + y: 783 width: 1519 - height: 264 + height: 256 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1560,7 +1560,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Sounds m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1568,16 +1568,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs + - Assets/Sounds m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 28} - m_SelectedIDs: 16640000 - m_LastClickedID: 25622 - m_ExpandedIDs: 000000004863000000ca9a3b + scrollPos: {x: 0, y: 56} + m_SelectedIDs: 726b0000 + m_LastClickedID: 27506 + m_ExpandedIDs: 00000000be6a00005448010000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1605,7 +1605,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000004863000000ca9a3b + m_ExpandedIDs: 00000000be6a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1632,7 +1632,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1715,10 +1715,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1520 - y: 90 + x: 3440 + y: 118 width: 399 - height: 949 + height: 921 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0