diff --git a/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab b/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab index d608e1e..12009f4 100644 --- a/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab +++ b/Assets/Prefabs/Network Prefabs/LobbyPlayer.prefab @@ -136,7 +136,7 @@ MonoBehaviour: playerHookSpeed: 2 springForce: Infinity damperForce: Infinity - breakForce: 600 + breakForce: 500 ropeSwing: 5 dashSpeed: 15 smallProjectile: {fileID: 1556668439340832, guid: be1300b1777602f448d537a75a9093c3, diff --git a/Assets/Prefabs/Plateform/Grass-Test.meta b/Assets/Prefabs/Plateform/Grass-Test.meta new file mode 100644 index 0000000..9e3c958 --- /dev/null +++ b/Assets/Prefabs/Plateform/Grass-Test.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8b69505a270decc4e8b68063c6da908b +folderAsset: yes +timeCreated: 1521042318 +licenseType: Free +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Plateform/Grass/Corner New/Corner LB.prefab.meta b/Assets/Prefabs/Plateform/Grass/Corner New/Corner LB.prefab.meta new file mode 100644 index 0000000..9ffbb3c --- /dev/null +++ b/Assets/Prefabs/Plateform/Grass/Corner New/Corner LB.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b75ea6d267756174e80dbecd7e5bcec5 +timeCreated: 1521398064 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 2745163..2d05395 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -158,6 +158,11 @@ MonoBehaviour: bothUnder: {fileID: 1661840454744596, guid: 19551d06920c9a045b4d0ab5f1547e89, type: 2} bothTop: {fileID: 1661840454744596, guid: 19551d06920c9a045b4d0ab5f1547e89, type: 2} + cornerLT: {fileID: 0} + cornerRT: {fileID: 0} + cornerLTR: {fileID: 0} + cornerRTL: {fileID: 0} + cornerLTRT: {fileID: 0} - name: Grass color: {r: 0, g: 0.57254905, b: 0.27058825, a: 1} leftPrefab: {fileID: 1037734339487326, guid: 1fb321ec5ba5d524da0ea02bf1f2504e, @@ -175,6 +180,13 @@ MonoBehaviour: bothUnder: {fileID: 1710824422509366, guid: ae09be590c720b94c9bcfe9c694f0483, type: 2} bothTop: {fileID: 1724861978939794, guid: 45e587651c0c8ea469e4cdf1b1780b37, type: 2} + cornerLT: {fileID: 1850966508838052, guid: d4d865444db48c948a1dc42dbeb119bf, type: 2} + cornerRT: {fileID: 1245870273711524, guid: a3d9c21cd1a1d204c8bfe1efd32a64b9, type: 2} + cornerLTR: {fileID: 1306458225700728, guid: a6b4d25f488caee458b5b206219e7723, + type: 2} + cornerRTL: {fileID: 1234851170367280, guid: 38abf4387bce93c47bc5cbb0baac5a61, + type: 2} + cornerLTRT: {fileID: 0} maps: - {fileID: 2800000, guid: ab48ff158f5fffb42ab4f6043d6fcce1, type: 3} --- !u!4 &51791410 @@ -300,7 +312,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!81 &2054270501 AudioListener: m_ObjectHideFlags: 0 diff --git a/Assets/Script/MapGenerator.cs b/Assets/Script/MapGenerator.cs index a8a0b7a..1c25e3a 100644 --- a/Assets/Script/MapGenerator.cs +++ b/Assets/Script/MapGenerator.cs @@ -34,8 +34,8 @@ public class MapGenerator : MonoBehaviour Vector3 bottomRight = new Vector3(map.width, 0, 0); cam.transform.position = new Vector3(map.width / 2, map.height / 2, -Vector3.Distance(topLeft, bottomRight) / 2.5f); - NetworkManager netManager = GameObject.Find("GameManager").GetComponent(); - StartCoroutine(netManager.SetDeathZone(topLeft, bottomRight)); + //NetworkManager netManager = GameObject.Find("GameManager").GetComponent(); + //StartCoroutine(netManager.SetDeathZone(topLeft, bottomRight)); } private void CreateTile(int x, int y)