From 6e96537b25f892f2fd27a70e52ce3b1738540c97 Mon Sep 17 00:00:00 2001 From: shakurass Date: Sat, 26 Apr 2014 13:38:34 -0600 Subject: [PATCH] Resolving conflicts. --- .../{Shanking Cube.prefab => Shanking Detector.prefab} | 4 ++-- ...hanking Cube.prefab.meta => Shanking Detector.prefab.meta} | 0 Assets/Scenes/Main.unity | 4 ++-- Assets/{ => Scripts}/CameraController.cs | 0 Assets/{ => Scripts}/CameraController.cs.meta | 0 Assets/{ => Scripts}/ShankTimer.cs | 0 Assets/{ => Scripts}/ShankTimer.cs.meta | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename Assets/Prefabs/{Shanking Cube.prefab => Shanking Detector.prefab} (96%) rename Assets/Prefabs/{Shanking Cube.prefab.meta => Shanking Detector.prefab.meta} (100%) rename Assets/{ => Scripts}/CameraController.cs (100%) rename Assets/{ => Scripts}/CameraController.cs.meta (100%) rename Assets/{ => Scripts}/ShankTimer.cs (100%) rename Assets/{ => Scripts}/ShankTimer.cs.meta (100%) diff --git a/Assets/Prefabs/Shanking Cube.prefab b/Assets/Prefabs/Shanking Detector.prefab similarity index 96% rename from Assets/Prefabs/Shanking Cube.prefab rename to Assets/Prefabs/Shanking Detector.prefab index 4ece5f7..009c815 100644 --- a/Assets/Prefabs/Shanking Cube.prefab +++ b/Assets/Prefabs/Shanking Detector.prefab @@ -13,7 +13,7 @@ GameObject: - 23: {fileID: 2300000} - 114: {fileID: 11400000} m_Layer: 0 - m_Name: Shanking Cube + m_Name: Shanking Detector m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -27,7 +27,7 @@ Transform: m_GameObject: {fileID: 100000} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 6.66666651, y: .0625, z: .166666672} + m_LocalScale: {x: 2, y: .100000001, z: .100000001} m_Children: [] m_Father: {fileID: 0} --- !u!23 &2300000 diff --git a/Assets/Prefabs/Shanking Cube.prefab.meta b/Assets/Prefabs/Shanking Detector.prefab.meta similarity index 100% rename from Assets/Prefabs/Shanking Cube.prefab.meta rename to Assets/Prefabs/Shanking Detector.prefab.meta diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index bb313cb..dcacb0b 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -376,7 +376,7 @@ MonoBehaviour: speed: 10 nextFire: 1 fireRate: 1 - shank: {fileID: 0} + shank: {fileID: 100000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2} shankSpawn: {fileID: 2119789981} --- !u!1 &1043241741 GameObject: @@ -821,7 +821,7 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 2119789980} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .947009742, y: .199999988, z: 0} + m_LocalPosition: {x: 1.38053739, y: .199999988, z: 0} m_LocalScale: {x: .100000001, y: .100000001, z: .100000001} m_Children: [] m_Father: {fileID: 972571124} diff --git a/Assets/CameraController.cs b/Assets/Scripts/CameraController.cs similarity index 100% rename from Assets/CameraController.cs rename to Assets/Scripts/CameraController.cs diff --git a/Assets/CameraController.cs.meta b/Assets/Scripts/CameraController.cs.meta similarity index 100% rename from Assets/CameraController.cs.meta rename to Assets/Scripts/CameraController.cs.meta diff --git a/Assets/ShankTimer.cs b/Assets/Scripts/ShankTimer.cs similarity index 100% rename from Assets/ShankTimer.cs rename to Assets/Scripts/ShankTimer.cs diff --git a/Assets/ShankTimer.cs.meta b/Assets/Scripts/ShankTimer.cs.meta similarity index 100% rename from Assets/ShankTimer.cs.meta rename to Assets/Scripts/ShankTimer.cs.meta