diff --git a/Assets/Prefabs/tambourine.prefab b/Assets/Prefabs/tambourine.prefab index d2275ef..f80eaf4 100644 --- a/Assets/Prefabs/tambourine.prefab +++ b/Assets/Prefabs/tambourine.prefab @@ -76,7 +76,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: b5f64a07787ea48ad8d00b3ec2d138e4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -108,6 +108,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &7137590925806210046 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GrappleScene.unity b/Assets/Scenes/GrappleScene.unity index 4a42a12..9b1e8dc 100644 --- a/Assets/Scenes/GrappleScene.unity +++ b/Assets/Scenes/GrappleScene.unity @@ -494,11 +494,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3} propertyPath: m_LocalPosition.x - value: 0.12876314 + value: -30.82 objectReference: {fileID: 0} - target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3} propertyPath: m_LocalPosition.y - value: 2.1793785 + value: -6.39 objectReference: {fileID: 0} - target: {fileID: 493245979038171992, guid: d175e4c5882b2464ab0425220d00a671, type: 3} propertyPath: m_LocalPosition.z @@ -538,7 +538,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 493245979038171997, guid: d175e4c5882b2464ab0425220d00a671, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4018407283885727215, guid: d175e4c5882b2464ab0425220d00a671, type: 3} + propertyPath: range + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: 4018407283885727215, guid: d175e4c5882b2464ab0425220d00a671, type: 3} + propertyPath: moveSpeed + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -1937,6 +1945,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -2039,6 +2048,7 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 @@ -10836,7 +10846,7 @@ GameObject: - component: {fileID: 1957280655} - component: {fileID: 1957280654} m_Layer: 0 - m_Name: Square (5) + m_Name: GrappleBox m_TagString: grappleSurface m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10964,7 +10974,7 @@ SpriteRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 0.30709326, g: 0.9716981, b: 0.35929897, a: 1} + m_Color: {r: 0.30709326, g: 0.9716981, b: 0.35929897, a: 0} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 diff --git a/Assets/Scripts/EnemyPatrol.cs b/Assets/Scripts/EnemyPatrol.cs index 666661a..cab5739 100644 --- a/Assets/Scripts/EnemyPatrol.cs +++ b/Assets/Scripts/EnemyPatrol.cs @@ -27,4 +27,9 @@ public class EnemyPatrol : MonoBehaviour { transform.position += new Vector3(movementVector.x, 0, 0) * Time.deltaTime; } } + + void OnDrawGizmos() { + Gizmos.color = Color.green; + Gizmos.DrawLine(new Vector3(transform.position.x - range, transform.position.y, transform.position.z), new Vector3(transform.position.x + range, transform.position.y, transform.position.z)); + } } diff --git a/Packages/manifest.json b/Packages/manifest.json index d87e85b..78d8b67 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,14 +1,14 @@ { "dependencies": { - "com.unity.collab-proxy": "2.0.0", + "com.unity.collab-proxy": "2.0.3", "com.unity.feature.2d": "1.0.0", "com.unity.ide.rider": "3.0.18", "com.unity.ide.visualstudio": "2.0.17", "com.unity.ide.vscode": "1.2.5", - "com.unity.inputsystem": "1.4.4", + "com.unity.inputsystem": "1.5.1", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.2", + "com.unity.timeline": "1.7.4", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.8.0", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 98dcf62..0fe185e 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "9.0.1", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { @@ -51,7 +51,7 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.1", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { @@ -71,7 +71,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "3.0.3", + "version": "3.1.0", "depth": 1, "source": "registry", "dependencies": { @@ -83,7 +83,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.2", + "version": "1.8.4", "depth": 3, "source": "registry", "dependencies": { @@ -92,7 +92,7 @@ "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.0", + "version": "2.0.3", "depth": 0, "source": "registry", "dependencies": {}, @@ -120,13 +120,13 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.0.1", + "com.unity.2d.animation": "9.0.2", "com.unity.2d.pixel-perfect": "5.0.3", "com.unity.2d.psdimporter": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.1", + "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.0.3" + "com.unity.2d.tilemap.extras": "3.1.0" } }, "com.unity.ide.rider": { @@ -155,7 +155,7 @@ "url": "https://packages.unity.com" }, "com.unity.inputsystem": { - "version": "1.4.4", + "version": "1.5.1", "depth": 0, "source": "registry", "dependencies": { @@ -191,7 +191,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.7.2", + "version": "1.7.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 36ea832..e4e1acd 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.2.4f1 -m_EditorVersionWithRevision: 2022.2.4f1 (8216e0211249) +m_EditorVersion: 2022.2.15f1 +m_EditorVersionWithRevision: 2022.2.15f1 (30d813e1a2a9)