diff --git a/.gitignore b/.gitignore index cf2ba9a..ecc5793 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,5 @@ crashlytics-build.properties mono_crash* BuildLinux/ -BuildWindows/ \ No newline at end of file +BuildWindows/ +Assets/TextMesh Pro \ No newline at end of file diff --git a/Assets/Prefabs/slime.prefab b/Assets/Prefabs/slime.prefab index 4b73271..2c543ab 100644 --- a/Assets/Prefabs/slime.prefab +++ b/Assets/Prefabs/slime.prefab @@ -1,5 +1,258 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1755437404601407390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1490485691279698368} + - component: {fileID: 2823500805711375321} + - component: {fileID: 2095238798181559198} + m_Layer: 5 + m_Name: pnlHealth + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1490485691279698368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755437404601407390} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8692566566668546467} + m_Father: {fileID: 8927601208402363686} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2823500805711375321 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755437404601407390} + m_CullTransparentMesh: 1 +--- !u!114 &2095238798181559198 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755437404601407390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1873279497245847383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8927601208402363686} + - component: {fileID: 4898475509121882234} + - component: {fileID: 7219702916767965912} + - component: {fileID: 985266517551115690} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8927601208402363686 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1873279497245847383} + m_LocalRotation: {x: -0, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 10, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1490485691279698368} + m_Father: {fileID: 4016379320889883386} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.75} + m_SizeDelta: {x: 0.2, y: 0.05} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4898475509121882234 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1873279497245847383} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &7219702916767965912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1873279497245847383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.CanvasScaler + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &985266517551115690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1873279497245847383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.GraphicRaycaster + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &2454216620873436980 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8692566566668546467} + - component: {fileID: 7163846638090094393} + - component: {fileID: 2408993422533026150} + m_Layer: 5 + m_Name: pnlFill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8692566566668546467 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2454216620873436980} + 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: 1490485691279698368} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7163846638090094393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2454216620873436980} + m_CullTransparentMesh: 1 +--- !u!114 &2408993422533026150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2454216620873436980} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.UI.Image + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &4493055063801180089 GameObject: m_ObjectHideFlags: 0 @@ -181,7 +434,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} propertyPath: m_LocalPosition.x - value: -29.780752 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} propertyPath: m_LocalPosition.y @@ -189,7 +442,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} propertyPath: m_LocalPosition.z - value: 26.58583 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} propertyPath: m_LocalRotation.w @@ -239,6 +492,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} insertIndex: -1 addedObject: {fileID: 1643418974084022053} + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} + insertIndex: -1 + addedObject: {fileID: 8927601208402363686} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 07d4f52b1d00e531cb997ce759ba7528, type: 3} insertIndex: -1 diff --git a/Assets/Scripts/InteractableObjects/Enemy.cs b/Assets/Scripts/InteractableObjects/Enemy.cs index d1041fe..c6fa375 100644 --- a/Assets/Scripts/InteractableObjects/Enemy.cs +++ b/Assets/Scripts/InteractableObjects/Enemy.cs @@ -20,6 +20,7 @@ namespace Assets.Scripts.InteractableObjects Stopwatch jumpTimer; bool followsPlayer; bool isAttacking; + bool isAttackOnCooldown; Stopwatch attackTimer; // Start is called before the first frame update @@ -30,41 +31,57 @@ namespace Assets.Scripts.InteractableObjects jumpTimer.Start(); followsPlayer = false; isAttacking = false; + isAttackOnCooldown = false; attackTimer = new Stopwatch(); - //Nothing } // Update is called once per frame void Update() { - if (gameObject.activeSelf) + Jump(); + if (isAttacking) { - if (!isJumping) + Attack(); + } + } + + void Attack() + { + if (!isAttackOnCooldown) + { + attackTimer.Start(); + isAttackOnCooldown = true; + } + if (attackTimer.ElapsedMilliseconds >= 2000) + { + attackTimer.Reset(); + isAttackOnCooldown = false; + } + } + + void Jump() + { + if (!isJumping) + { + jumpTimer.Start(); + isJumping = true; + Vector3 jumpVector; + if (followsPlayer) { - jumpTimer.Start(); - isJumping = true; - Vector3 jumpVector; - if (followsPlayer) - { - jumpVector = GameObject.Find("Player").transform.position - gameObject.transform.position; - jumpVector *= 0.25f * Mathf.Log10(jumpVector.magnitude); - jumpVector.y = 5; - } - else - { - jumpVector = new Vector3(rand.Next(-5, 5), 10, rand.Next(-5, 5)); - } - gameObject.GetComponent().AddForce(jumpVector, ForceMode.Impulse); + jumpVector = GameObject.Find("Player").transform.position - gameObject.transform.position; + jumpVector *= 0.25f * Mathf.Log10(jumpVector.magnitude); + jumpVector.y = 5; } - if (jumpTimer.ElapsedMilliseconds >= 5000) + else { - jumpTimer.Reset(); - isJumping = false; - } - if (gameObject.transform.position.x > 1000 || gameObject.transform.position.x > 5000 || gameObject.transform.position.x > 5000) - { - UnityEngine.Debug.Log("BUG!"); + jumpVector = new Vector3(rand.Next(-5, 5), 10, rand.Next(-5, 5)); } + gameObject.GetComponent().AddForce(jumpVector, ForceMode.Impulse); + } + if (jumpTimer.ElapsedMilliseconds >= 5000) + { + jumpTimer.Reset(); + isJumping = false; } } @@ -76,7 +93,7 @@ namespace Assets.Scripts.InteractableObjects } } - public void handleAttack() + public void HandleAttack() { isAttacking = true; //Create attack logic here @@ -86,10 +103,11 @@ namespace Assets.Scripts.InteractableObjects { followsPlayer = isFollowing; isAttacking = false; - //Stop attacks + attackTimer.Reset(); + isAttackOnCooldown = false; } - public void handleDetection() + public void HandleDetection() { followsPlayer = true; } diff --git a/Assets/Scripts/Player/PlayerGameObject.cs b/Assets/Scripts/Player/PlayerGameObject.cs index dd50955..61739e6 100644 --- a/Assets/Scripts/Player/PlayerGameObject.cs +++ b/Assets/Scripts/Player/PlayerGameObject.cs @@ -242,10 +242,10 @@ namespace Assets.Scripts.Player switch (col.name) { case "AttackRange": - enemy.handleAttack(); + enemy.HandleAttack(); break; case "DetectionRange": - enemy.handleDetection(); + enemy.HandleDetection(); break; case "FollowRange": //Do nothing, as it needs to be detected first diff --git a/Assets/TextMesh Pro.meta b/Assets/TextMesh Pro.meta new file mode 100755 index 0000000..f9da8b5 --- /dev/null +++ b/Assets/TextMesh Pro.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f54d1bd14bd3ca042bd867b519fee8cc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/README b/README index 0b3a9ca..2e66149 100644 --- a/README +++ b/README @@ -33,4 +33,11 @@ TODO: - NO Equipment!!!! - Maybe keys for chests/doors - Maybe torches for caves -- Add a Compendium to the game \ No newline at end of file +- Add a Compendium to the game +- Change scaling and exp values of enemies + - Enemies generated on a new tile scale with player + - No further scaling or always adapting to player? + - If always adapt, only to player stats! No equipment stats! + - Exp scaling should be influenced by enemy scaling +- Add health bar and enemy name above slimes +- Remove fight UI completely \ No newline at end of file diff --git a/UserSettings/Layouts/default-6000.dwlt b/UserSettings/Layouts/default-6000.dwlt index 68cf126..3155fcf 100644 --- a/UserSettings/Layouts/default-6000.dwlt +++ b/UserSettings/Layouts/default-6000.dwlt @@ -41,9 +41,9 @@ MonoBehaviour: x: 1920 y: 28 width: 1920 - height: 971 + height: 998 m_ShowMode: 4 - m_Title: Scene + m_Title: Inspector m_RootView: {fileID: 5} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -97,7 +97,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 126} m_MaxSize: {x: 4000, y: 4026} vertical: 0 - controlID: 4852 + controlID: 14 draggingID: 0 --- !u!114 &5 MonoBehaviour: @@ -120,7 +120,7 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 971 + height: 998 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -165,7 +165,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 951 + y: 978 width: 1920 height: 20 m_MinSize: {x: 0, y: 0} @@ -189,11 +189,11 @@ MonoBehaviour: x: 0 y: 36 width: 1920 - height: 915 + height: 942 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 18 + controlID: 62 draggingID: 0 --- !u!114 &9 MonoBehaviour: @@ -215,11 +215,11 @@ MonoBehaviour: x: 0 y: 0 width: 1920 - height: 915 + height: 942 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 19 + controlID: 63 draggingID: 0 --- !u!114 &10 MonoBehaviour: @@ -240,12 +240,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1456 - height: 915 + width: 1454 + height: 942 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 20 + controlID: 64 draggingID: 0 --- !u!114 &11 MonoBehaviour: @@ -266,12 +266,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1456 - height: 624 + width: 1454 + height: 644 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 21 + controlID: 65 draggingID: 0 --- !u!114 &12 MonoBehaviour: @@ -290,8 +290,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 361 - height: 624 + width: 359 + height: 644 m_MinSize: {x: 201, y: 226} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 17} @@ -314,10 +314,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 361 + x: 359 y: 0 width: 1095 - height: 624 + height: 644 m_MinSize: {x: 202, y: 226} m_MaxSize: {x: 4002, y: 4026} m_ActualView: {fileID: 16} @@ -335,23 +335,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 624 - width: 1456 - height: 291 - m_MinSize: {x: 101, y: 126} - m_MaxSize: {x: 4001, y: 4026} - m_ActualView: {fileID: 20} + y: 644 + width: 1454 + height: 298 + m_MinSize: {x: 231, y: 276} + m_MaxSize: {x: 10001, y: 10026} + m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} - {fileID: 20} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -367,10 +367,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1456 + x: 1454 y: 0 - width: 464 - height: 915 + width: 466 + height: 942 m_MinSize: {x: 276, y: 76} m_MaxSize: {x: 4001, y: 4026} m_ActualView: {fileID: 21} @@ -399,10 +399,10 @@ MonoBehaviour: m_TextWithWhitespace: "Scene\u200B" m_Pos: serializedVersion: 2 - x: 362 + x: 360 y: 24 width: 1093 - height: 598 + height: 618 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -459,11 +459,11 @@ MonoBehaviour: displayed: 0 id: unity-search-toolbar index: 2 - contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":1,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":1,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 1 layout: 1 size: {x: 0, y: 0} @@ -515,11 +515,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Light Settings index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -543,11 +543,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Constraints index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -557,11 +557,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Cloth Collisions index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -613,11 +613,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Occlusion Culling index: 3 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -627,11 +627,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Physics Debugger index: 4 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -641,11 +641,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Scene Visibility index: 5 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -781,11 +781,11 @@ MonoBehaviour: displayed: 0 id: Brush Attributes index: 2 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -809,11 +809,11 @@ MonoBehaviour: displayed: 0 id: Terrain Tools index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -823,11 +823,11 @@ MonoBehaviour: displayed: 0 id: Brush Masks index: 1 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -837,11 +837,11 @@ MonoBehaviour: displayed: 0 id: Scene View/Lighting Visualization Colors index: 0 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -865,11 +865,11 @@ MonoBehaviour: displayed: 0 id: SceneView/CamerasOverlay index: 9 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -879,11 +879,11 @@ MonoBehaviour: displayed: 0 id: Scene View/PBR Validation Settings index: 10 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -893,11 +893,11 @@ MonoBehaviour: displayed: 0 id: unity-spline-inspector index: 11 - contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' + contents: '{"m_Layout":4,"m_Collapsed":false,"m_Folded":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":25.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}' floating: 0 collapsed: 0 snapOffset: {x: 0, y: 0} - snapOffsetDelta: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 25} snapCorner: 0 layout: 4 size: {x: 0, y: 0} @@ -929,9 +929,9 @@ MonoBehaviour: m_AudioPlay: 0 m_DebugDrawModesUseInteractiveLightBakingData: 0 m_Position: - m_Target: {x: 160.92558, y: 44.309845, z: -43.20334} + m_Target: {x: 97.26449, y: 79.453186, z: -124.13573} speed: 2 - m_Value: {x: 160.92558, y: 44.309845, z: -43.20334} + m_Value: {x: 0.1591852, y: -2.916478, z: -18.185755} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -977,13 +977,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.119701125, y: 0.86540914, z: -0.24722783, w: -0.41900206} + m_Target: {x: -0.42115283, y: 0.37659967, z: -0.1979821, w: -0.8009632} speed: 2 - m_Value: {x: -0.11970438, y: 0.8654327, z: -0.24723455, w: -0.41901344} + m_Value: {x: 0.0018710041, y: 0.99589354, z: -0.08215267, w: 0.0024397895} m_Size: m_Target: 0.30661905 speed: 2 - m_Value: 0.30661905 + m_Value: 9.470363 m_Ortho: m_Target: 0 speed: 2 @@ -1040,8 +1040,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 24 - width: 360 - height: 598 + width: 358 + height: 618 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1058,7 +1058,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 68a2fdff92a2fdffacacfdffb8aefdff0eb8fdff38b8fdff7004feff9a04feff7a94feffe6f9feffe66affff12fbffffbe9300001a460100404901009e490100d0ec01000a0103006c0b0500740d05004c110500 + m_ExpandedIDs: ce91ffff80f0ffffa0f0ffffa8f4ffff7af5ffffd69c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1075,7 +1075,7 @@ MonoBehaviour: m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_TrimLeadingAndTrailingWhitespace: 0 - m_ClientGUIView: {fileID: 12} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -1207,10 +1207,10 @@ MonoBehaviour: m_TextWithWhitespace: "Project\u200B" m_Pos: serializedVersion: 2 - x: 1920 - y: 733 - width: 1455 - height: 274 + x: 0 + y: 668 + width: 1453 + height: 272 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1249,10 +1249,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: b69b0000 - m_LastClickedID: 39862 - m_ExpandedIDs: 00000000ec9a0000ee9a0000f09a0000f29a0000f49a0000 + scrollPos: {x: 0, y: 46} + m_SelectedIDs: 2c9c0000 + m_LastClickedID: 39980 + m_ExpandedIDs: 000000008a9b00008c9b00008e9b0000909b0000929b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1281,7 +1281,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ec9a0000ee9a0000f09a0000f29a0000f49a0000 + m_ExpandedIDs: 000000008a9b00008c9b00008e9b0000909b0000929b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1360,8 +1360,8 @@ MonoBehaviour: m_TextWithWhitespace: "Console\u200B" m_Pos: serializedVersion: 2 - x: 0 - y: 648 + x: 1920 + y: 715 width: 1455 height: 265 m_SerializedDataModeController: @@ -1396,10 +1396,10 @@ MonoBehaviour: m_TextWithWhitespace: "Inspector\u200B" m_Pos: serializedVersion: 2 - x: 1457 + x: 1455 y: 24 - width: 463 - height: 889 + width: 465 + height: 916 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0