diff --git a/ShipShooter/Assembly-CSharp-Editor-vs.csproj b/ShipShooter/Assembly-CSharp-Editor-vs.csproj new file mode 100644 index 00000000..791c5a0d --- /dev/null +++ b/ShipShooter/Assembly-CSharp-Editor-vs.csproj @@ -0,0 +1,120 @@ + + + + Debug + AnyCPU + 10.0.20506 + 2.0 + {CBCFE89D-A6E1-C4CD-D963-6428CD524560} + Library + Properties + + Assembly-CSharp-Editor + v3.5 + 512 + Assets + + + true + full + false + Temp\bin\Debug\ + DEBUG;TRACE;UNITY_5_1_3;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN + prompt + 4 + 0169 + + + pdbonly + true + Temp\bin\Release\ + TRACE + prompt + 4 + 0169 + + + + + + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.dll + + + + + + + + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll + + + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll + + + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll + + + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll + + + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.Graphs.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/androidplayer/UnityEditor.Android.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/wp8support/UnityEditor.WP8.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/metrosupport/UnityEditor.Metro.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/blackberryplayer/UnityEditor.BB10.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/TizenPlayer/TizenPlayer/UnityEditor.Tizen.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/stvplayer/STVPlayer/UnityEditor.SamsungTV.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/webglsupport/UnityEditor.WebGL.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/linuxstandalonesupport/UnityEditor.LinuxStandalone.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/windowsstandalonesupport/UnityEditor.WindowsStandalone.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/macstandalonesupport/UnityEditor.OSXStandalone.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll + + + + + {B99BC696-7CE4-0F5D-8CA4-C88F69287869} Assembly-CSharp-vs + + + + + diff --git a/ShipShooter/Assembly-CSharp-Editor.csproj b/ShipShooter/Assembly-CSharp-Editor.csproj index 7267ae56..44bcc834 100644 --- a/ShipShooter/Assembly-CSharp-Editor.csproj +++ b/ShipShooter/Assembly-CSharp-Editor.csproj @@ -5,10 +5,10 @@ AnyCPU 10.0.20506 2.0 - {CBCFE89D-A6E1-C4CD-D963-6428CD524560} Library Properties + Assembly-CSharp-Editor v3.5 512 @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_2_0;UNITY_5_2;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_REFLECTION_BUFFERS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN + DEBUG;TRACE;UNITY_5_1_3;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN prompt 4 0169 @@ -28,6 +28,7 @@ pdbonly true Temp\bin\Release\ + TRACE prompt 4 0169 @@ -48,9 +49,6 @@ - - C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll - C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll @@ -63,6 +61,9 @@ C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll + + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll + C:/Program Files/Unity/Editor/Data/Managed/UnityEditor.Graphs.dll @@ -78,6 +79,9 @@ C:/Program Files/Unity/Editor/Data/PlaybackEngines/metrosupport/UnityEditor.Metro.Extensions.dll + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/blackberryplayer/UnityEditor.BB10.Extensions.dll + C:/Program Files/Unity/Editor/Data/PlaybackEngines/TizenPlayer/TizenPlayer/UnityEditor.Tizen.Extensions.dll @@ -96,13 +100,14 @@ C:/Program Files/Unity/Editor/Data/PlaybackEngines/macstandalonesupport/UnityEditor.OSXStandalone.Extensions.dll - - C:/Program Files/Unity/Editor/Data/Managed/Mono.Cecil.dll - C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll + + + {B99BC696-7CE4-0F5D-8CA4-C88F69287869} Assembly-CSharp + + + diff --git a/ShipShooter/Assembly-CSharp.csproj b/ShipShooter/Assembly-CSharp.csproj index 1047bc32..6f8815ae 100644 --- a/ShipShooter/Assembly-CSharp.csproj +++ b/ShipShooter/Assembly-CSharp.csproj @@ -5,10 +5,10 @@ AnyCPU 10.0.20506 2.0 - {B99BC696-7CE4-0F5D-8CA4-C88F69287869} Library Properties + Assembly-CSharp v3.5 512 @@ -19,7 +19,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_5_2_0;UNITY_5_2;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_RAKNET;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_METRICS;ENABLE_REFLECTION_BUFFERS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;ENABLE_ANDROID_ATLAS_ETC1_COMPRESSION;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_LOG_MIXED_STACKTRACE;ENABLE_UNITYWEBREQUEST;ENABLE_EVENT_QUEUE;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN + DEBUG;TRACE;UNITY_5_1_3;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN prompt 4 0169 @@ -28,6 +28,7 @@ pdbonly true Temp\bin\Release\ + TRACE prompt 4 0169 @@ -62,8 +63,8 @@ C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll - - C:/Program Files/Unity/Editor/Data/Managed/Mono.Cecil.dll + + C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll diff --git a/ShipShooter/Assets/Environment.meta b/ShipShooter/Assets/Environment.meta deleted file mode 100644 index d8572ba2..00000000 --- a/ShipShooter/Assets/Environment.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f4f74ab9f5c52454dbfd40e744839567 -folderAsset: yes -timeCreated: 1446681686 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/ShipShooter/Assets/Scenes/GameScene.unity b/ShipShooter/Assets/Scenes/GameScene.unity index eb2b8ceb..76ea1b99 100644 Binary files a/ShipShooter/Assets/Scenes/GameScene.unity and b/ShipShooter/Assets/Scenes/GameScene.unity differ diff --git a/ShipShooter/Assets/Scripts/EnemySpawner.cs b/ShipShooter/Assets/Scripts/EnemySpawner.cs index a86f16e8..0a6607af 100644 --- a/ShipShooter/Assets/Scripts/EnemySpawner.cs +++ b/ShipShooter/Assets/Scripts/EnemySpawner.cs @@ -6,6 +6,7 @@ public class EnemySpawner : MonoBehaviour { //Numbers public int randomNum = 0; + //Enemy Spawns public GameObject enemy1_left1; public int enemy1count = 0; @@ -29,6 +30,8 @@ public class EnemySpawner : MonoBehaviour { public Vector3 spawn11 = new Vector3(13.0f, 17.0f, 5.0f); public Vector3 spawn12 = new Vector3(16.0f, 17.0f, 5.0f); + public Vector3 enemyAngle = new Vector3 (0.0f, 90.0f, 270.0f); + //Enemy Types public GameObject enemy1; @@ -40,7 +43,7 @@ public class EnemySpawner : MonoBehaviour { } public void Onslaught() { - randomNum = 1; + randomNum = Random.Range (1,3); StartCoroutine(EnemySpawn()); } @@ -50,39 +53,90 @@ public class EnemySpawner : MonoBehaviour { Onslaught(); } + public void EdgeSpawn() + { + enemy1_left1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle)); + enemy1_right1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle)); + iTween.MoveTo(enemy1_left1, iTween.Hash("path", iTweenPath.GetPath("LeftCurve1"), "time", 10)); + iTween.MoveTo(enemy1_right1, iTween.Hash("path", iTweenPath.GetPath("RightCurve1"), "time", 10)); + + } + public void EdgeSpawnIn() + { + enemy1_left2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle)); + enemy1_right2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle)); + + iTween.MoveTo(enemy1_left2, iTween.Hash("path", iTweenPath.GetPath("LeftCurve2"), "time", 10)); + iTween.MoveTo(enemy1_right2, iTween.Hash("path", iTweenPath.GetPath("RightCurve2"), "time", 10)); + + } + + public void EdgeSpawnLast() + { + enemy1_left3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.Euler(enemyAngle)); + enemy1_right3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.Euler(enemyAngle)); + + iTween.MoveTo(enemy1_left3, iTween.Hash("path", iTweenPath.GetPath("LeftCurve3"), "time", 10)); + iTween.MoveTo(enemy1_right3, iTween.Hash("path", iTweenPath.GetPath("RightCurve3"), "time", 10)); + + } + //IEnumerator IEnumerator EnemySpawn() { if (enemy1count < 1) { - if (randomNum == 1) - { - Debug.Log("Enumerator Starts"); - enemy1count = 1; - enemy1_left1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.identity); - enemy1_right1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.identity); - - iTween.MoveTo(enemy1_left1, iTween.Hash("path", iTweenPath.GetPath("LeftCurve1"), "time", 10)); - iTween.MoveTo(enemy1_right1, iTween.Hash("path", iTweenPath.GetPath("RightCurve1"), "time", 10)); +// if (randomNum == 1) +// { +// Debug.Log("Enumerator Starts"); +// enemy1count = 1; +//// enemy1_left1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle)); +//// enemy1_right1 = (GameObject)Instantiate(enemy1, spawn1, Quaternion.Euler(enemyAngle)); +// +//// iTween.MoveTo(enemy1_left1, iTween.Hash("path", iTweenPath.GetPath("LeftCurve1"), "time", 10)); +//// iTween.MoveTo(enemy1_right1, iTween.Hash("path", iTweenPath.GetPath("RightCurve1"), "time", 10)); +// +// EdgeSpawn(); +// +// yield return new WaitForSeconds(0.2f); +//// enemy1_left2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle)); +//// enemy1_right2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.Euler(enemyAngle)); +//// +//// iTween.MoveTo(enemy1_left2, iTween.Hash("path", iTweenPath.GetPath("LeftCurve2"), "time", 10)); +//// iTween.MoveTo(enemy1_right2, iTween.Hash("path", iTweenPath.GetPath("RightCurve2"), "time", 10)); +// EdgeSpawnIn(); +// +// yield return new WaitForSeconds(0.2f); +//// enemy1_left3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.Euler(enemyAngle)); +//// enemy1_right3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.Euler(enemyAngle)); +//// +//// iTween.MoveTo(enemy1_left3, iTween.Hash("path", iTweenPath.GetPath("LeftCurve3"), "time", 10)); +//// iTween.MoveTo(enemy1_right3, iTween.Hash("path", iTweenPath.GetPath("RightCurve3"), "time", 10)); +// EdgeSpawnLast(); +// Debug.Log("enumerator Ends"); +// randomNum = Random.Range (1,3); +// enemy1count = 0; +// } - yield return new WaitForSeconds(0.2f); - enemy1_left2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.identity); - enemy1_right2 = (GameObject)Instantiate(enemy1, spawn2, Quaternion.identity); + switch (randomNum) + { + case 1: + EdgeSpawn(); + EdgeSpawnIn(); + EdgeSpawnLast(); + yield return new WaitForSeconds(.2f); + randomNum = Random.Range(1,3); + break; - iTween.MoveTo(enemy1_left2, iTween.Hash("path", iTweenPath.GetPath("LeftCurve2"), "time", 10)); - iTween.MoveTo(enemy1_right2, iTween.Hash("path", iTweenPath.GetPath("RightCurve2"), "time", 10)); - - yield return new WaitForSeconds(0.2f); - enemy1_left3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.identity); - enemy1_right3 = (GameObject)Instantiate(enemy1, spawn3, Quaternion.identity); - - iTween.MoveTo(enemy1_left3, iTween.Hash("path", iTweenPath.GetPath("LeftCurve3"), "time", 10)); - iTween.MoveTo(enemy1_right3, iTween.Hash("path", iTweenPath.GetPath("RightCurve3"), "time", 10)); - - Debug.Log("enumerator Ends"); - } + case 2: + Debug.Log("switch works"); + yield return new WaitForSeconds(.2f); + randomNum = Random.Range(1,3); + break; + } } + yield return new WaitForSeconds(1f); } } diff --git a/ShipShooter/Library/AssetServerCacheV3 b/ShipShooter/Library/AssetServerCacheV3 index 03101cd0..ffe4714f 100644 Binary files a/ShipShooter/Library/AssetServerCacheV3 and b/ShipShooter/Library/AssetServerCacheV3 differ diff --git a/ShipShooter/Library/CurrentLayout.dwlt b/ShipShooter/Library/CurrentLayout.dwlt index 704a9c58..6770802c 100644 Binary files a/ShipShooter/Library/CurrentLayout.dwlt and b/ShipShooter/Library/CurrentLayout.dwlt differ diff --git a/ShipShooter/Library/EditorUserBuildSettings.asset b/ShipShooter/Library/EditorUserBuildSettings.asset index 395b1718..46c8185c 100644 Binary files a/ShipShooter/Library/EditorUserBuildSettings.asset and b/ShipShooter/Library/EditorUserBuildSettings.asset differ diff --git a/ShipShooter/Library/ProjectSettings.asset b/ShipShooter/Library/ProjectSettings.asset index 9b6e32a2..ee586954 100644 Binary files a/ShipShooter/Library/ProjectSettings.asset and b/ShipShooter/Library/ProjectSettings.asset differ diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb index 532b9dff..e129ac9b 100644 Binary files a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb and b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb differ diff --git a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 47b692d7..f9500950 100644 Binary files a/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/ShipShooter/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp b/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp index 4b7aca63..1021efe1 100644 --- a/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp +++ b/ShipShooter/Library/ScriptAssemblies/BuiltinAssemblies.stamp @@ -1,2 +1,2 @@ -0000.55e0ab26.0000 -0000.55e0ab44.0000 \ No newline at end of file +0000.55d3536a.0000 +0000.55d3538a.0000 \ No newline at end of file diff --git a/ShipShooter/Library/ScriptMapper b/ShipShooter/Library/ScriptMapper index c796a7e9..9bdaad71 100644 Binary files a/ShipShooter/Library/ScriptMapper and b/ShipShooter/Library/ScriptMapper differ diff --git a/ShipShooter/Library/ShaderCache/1/19231b32877d99154861783af612e6ed.bin b/ShipShooter/Library/ShaderCache/1/19231b32877d99154861783af612e6ed.bin new file mode 100644 index 00000000..106511e6 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/1/19231b32877d99154861783af612e6ed.bin differ diff --git a/ShipShooter/Library/ShaderCache/1/19a7e37f8c2844f0b3c683113f8f7810.bin b/ShipShooter/Library/ShaderCache/1/19a7e37f8c2844f0b3c683113f8f7810.bin new file mode 100644 index 00000000..e9d6aa7b Binary files /dev/null and b/ShipShooter/Library/ShaderCache/1/19a7e37f8c2844f0b3c683113f8f7810.bin differ diff --git a/ShipShooter/Library/ShaderCache/1/1b5497711e23bc2e125666a469fc9a35.bin b/ShipShooter/Library/ShaderCache/1/1b5497711e23bc2e125666a469fc9a35.bin new file mode 100644 index 00000000..3fb09750 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/1/1b5497711e23bc2e125666a469fc9a35.bin differ diff --git a/ShipShooter/Library/ShaderCache/6/627ae0e2ad68e36b853b120e1b4b1edd.bin b/ShipShooter/Library/ShaderCache/6/627ae0e2ad68e36b853b120e1b4b1edd.bin new file mode 100644 index 00000000..5be1b9a8 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/6/627ae0e2ad68e36b853b120e1b4b1edd.bin differ diff --git a/ShipShooter/Library/ShaderCache/7/75eaf57ff949929c8637d56a17010a9e.bin b/ShipShooter/Library/ShaderCache/7/75eaf57ff949929c8637d56a17010a9e.bin new file mode 100644 index 00000000..e71630a5 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/7/75eaf57ff949929c8637d56a17010a9e.bin differ diff --git a/ShipShooter/Library/ShaderCache/9/9d27ef3bc3f229d22fb55de4cc737e0a.bin b/ShipShooter/Library/ShaderCache/9/9d27ef3bc3f229d22fb55de4cc737e0a.bin new file mode 100644 index 00000000..aec50c89 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/9/9d27ef3bc3f229d22fb55de4cc737e0a.bin differ diff --git a/ShipShooter/Library/ShaderCache/b/b2e70fe904ddbdd63b3ea4247f3f9141.bin b/ShipShooter/Library/ShaderCache/b/b2e70fe904ddbdd63b3ea4247f3f9141.bin new file mode 100644 index 00000000..7178fa3c Binary files /dev/null and b/ShipShooter/Library/ShaderCache/b/b2e70fe904ddbdd63b3ea4247f3f9141.bin differ diff --git a/ShipShooter/Library/ShaderCache/d/d19b497adfbb33350ab141008947f859.bin b/ShipShooter/Library/ShaderCache/d/d19b497adfbb33350ab141008947f859.bin new file mode 100644 index 00000000..1d043acc Binary files /dev/null and b/ShipShooter/Library/ShaderCache/d/d19b497adfbb33350ab141008947f859.bin differ diff --git a/ShipShooter/Library/ShaderCache/d/d24c4466f054dcb883f661ae23d75f92.bin b/ShipShooter/Library/ShaderCache/d/d24c4466f054dcb883f661ae23d75f92.bin new file mode 100644 index 00000000..a8c922c5 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/d/d24c4466f054dcb883f661ae23d75f92.bin differ diff --git a/ShipShooter/Library/ShaderCache/d/d25b754e23feef7cd8de34b2df7e2020.bin b/ShipShooter/Library/ShaderCache/d/d25b754e23feef7cd8de34b2df7e2020.bin new file mode 100644 index 00000000..bb5564ce Binary files /dev/null and b/ShipShooter/Library/ShaderCache/d/d25b754e23feef7cd8de34b2df7e2020.bin differ diff --git a/ShipShooter/Library/ShaderCache/d/dabebd9c0df5b078fea09820b257f9a6.bin b/ShipShooter/Library/ShaderCache/d/dabebd9c0df5b078fea09820b257f9a6.bin new file mode 100644 index 00000000..a045b4cd Binary files /dev/null and b/ShipShooter/Library/ShaderCache/d/dabebd9c0df5b078fea09820b257f9a6.bin differ diff --git a/ShipShooter/Library/ShaderCache/e/eb62e9dc95ae6bb5081c8636890b1916.bin b/ShipShooter/Library/ShaderCache/e/eb62e9dc95ae6bb5081c8636890b1916.bin new file mode 100644 index 00000000..d86221ce Binary files /dev/null and b/ShipShooter/Library/ShaderCache/e/eb62e9dc95ae6bb5081c8636890b1916.bin differ diff --git a/ShipShooter/Library/ShaderCache/e/edcfb9bd791069d0c5d09b842d2b5353.bin b/ShipShooter/Library/ShaderCache/e/edcfb9bd791069d0c5d09b842d2b5353.bin new file mode 100644 index 00000000..11bf0c75 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/e/edcfb9bd791069d0c5d09b842d2b5353.bin differ diff --git a/ShipShooter/Library/ShaderCache/f/f42e5afb2965cfbd42b4b3768197b507.bin b/ShipShooter/Library/ShaderCache/f/f42e5afb2965cfbd42b4b3768197b507.bin new file mode 100644 index 00000000..da59dbd3 Binary files /dev/null and b/ShipShooter/Library/ShaderCache/f/f42e5afb2965cfbd42b4b3768197b507.bin differ diff --git a/ShipShooter/Library/assetDatabase3 b/ShipShooter/Library/assetDatabase3 index cb8b3fcd..731443d1 100644 Binary files a/ShipShooter/Library/assetDatabase3 and b/ShipShooter/Library/assetDatabase3 differ diff --git a/ShipShooter/Library/expandedItems b/ShipShooter/Library/expandedItems index 7e75c6a7..96b36194 100644 Binary files a/ShipShooter/Library/expandedItems and b/ShipShooter/Library/expandedItems differ diff --git a/ShipShooter/Library/metadata/00/00000000000000002000000000000000 b/ShipShooter/Library/metadata/00/00000000000000002000000000000000 index 1ea56878..1bbdb79b 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000002000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000002000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000003000000000000000 b/ShipShooter/Library/metadata/00/00000000000000003000000000000000 index 15eb9c61..fa76b01b 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000003000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000003000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 b/ShipShooter/Library/metadata/00/00000000000000004000000000000000 index ec4e2cf7..25e08c40 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000004000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000004000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000004100000000000000 b/ShipShooter/Library/metadata/00/00000000000000004100000000000000 index c3669ecc..6b3a6863 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000004100000000000000 and b/ShipShooter/Library/metadata/00/00000000000000004100000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000005000000000000000 b/ShipShooter/Library/metadata/00/00000000000000005000000000000000 index 6b8432dc..f0c289ff 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000005000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000005000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000005100000000000000 b/ShipShooter/Library/metadata/00/00000000000000005100000000000000 index 9d844868..0ce314b5 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000005100000000000000 and b/ShipShooter/Library/metadata/00/00000000000000005100000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000006000000000000000 b/ShipShooter/Library/metadata/00/00000000000000006000000000000000 index c3614c4c..d895dbc1 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000006000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000006000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000006100000000000000 b/ShipShooter/Library/metadata/00/00000000000000006100000000000000 index 566ce138..b7e6d692 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000006100000000000000 and b/ShipShooter/Library/metadata/00/00000000000000006100000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000007000000000000000 b/ShipShooter/Library/metadata/00/00000000000000007000000000000000 index 8212f8cf..64b33af9 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000007000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000007000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000008000000000000000 b/ShipShooter/Library/metadata/00/00000000000000008000000000000000 index 0b161d10..ed253ac2 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000008000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000008000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/00000000000000009000000000000000 b/ShipShooter/Library/metadata/00/00000000000000009000000000000000 index bc6cd950..2ce2b35b 100644 Binary files a/ShipShooter/Library/metadata/00/00000000000000009000000000000000 and b/ShipShooter/Library/metadata/00/00000000000000009000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/0000000000000000a000000000000000 b/ShipShooter/Library/metadata/00/0000000000000000a000000000000000 index 13ab2448..a9256d3f 100644 Binary files a/ShipShooter/Library/metadata/00/0000000000000000a000000000000000 and b/ShipShooter/Library/metadata/00/0000000000000000a000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 b/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 index b5981990..b262c12d 100644 Binary files a/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 and b/ShipShooter/Library/metadata/00/0000000000000000b000000000000000 differ diff --git a/ShipShooter/Library/metadata/00/0000000000000000c000000000000000 b/ShipShooter/Library/metadata/00/0000000000000000c000000000000000 index d525f9b0..e03ac892 100644 Binary files a/ShipShooter/Library/metadata/00/0000000000000000c000000000000000 and b/ShipShooter/Library/metadata/00/0000000000000000c000000000000000 differ diff --git a/ShipShooter/Library/metadata/04/0401554a0e6f9466db3c1a798d358b8c b/ShipShooter/Library/metadata/04/0401554a0e6f9466db3c1a798d358b8c index f11b4309..0e081abb 100644 Binary files a/ShipShooter/Library/metadata/04/0401554a0e6f9466db3c1a798d358b8c and b/ShipShooter/Library/metadata/04/0401554a0e6f9466db3c1a798d358b8c differ diff --git a/ShipShooter/Library/metadata/07/07331fa72baf58646aefcd44795b4a38 b/ShipShooter/Library/metadata/07/07331fa72baf58646aefcd44795b4a38 index ebf9777c..a3dc4e02 100644 Binary files a/ShipShooter/Library/metadata/07/07331fa72baf58646aefcd44795b4a38 and b/ShipShooter/Library/metadata/07/07331fa72baf58646aefcd44795b4a38 differ diff --git a/ShipShooter/Library/metadata/08/085d9842593af44d8a507541ce47bc6e b/ShipShooter/Library/metadata/08/085d9842593af44d8a507541ce47bc6e index 7ee7c7fa..99d4aa4f 100644 Binary files a/ShipShooter/Library/metadata/08/085d9842593af44d8a507541ce47bc6e and b/ShipShooter/Library/metadata/08/085d9842593af44d8a507541ce47bc6e differ diff --git a/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86 b/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86 index 9cc8f910..ad6d2ea8 100644 Binary files a/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86 and b/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86 differ diff --git a/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86.info b/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86.info index ca42e0e5..e61e805f 100644 Binary files a/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86.info and b/ShipShooter/Library/metadata/0f/0f81f87c6e186a44db952bf81761cb86.info differ diff --git a/ShipShooter/Library/metadata/17/17799b66b509c40a78360036fcfbc8bc b/ShipShooter/Library/metadata/17/17799b66b509c40a78360036fcfbc8bc index 55c53b59..ffe45484 100644 Binary files a/ShipShooter/Library/metadata/17/17799b66b509c40a78360036fcfbc8bc and b/ShipShooter/Library/metadata/17/17799b66b509c40a78360036fcfbc8bc differ diff --git a/ShipShooter/Library/metadata/2c/2cd963efa0be1416c93438361364da95 b/ShipShooter/Library/metadata/2c/2cd963efa0be1416c93438361364da95 index 5e696c65..5202f30b 100644 Binary files a/ShipShooter/Library/metadata/2c/2cd963efa0be1416c93438361364da95 and b/ShipShooter/Library/metadata/2c/2cd963efa0be1416c93438361364da95 differ diff --git a/ShipShooter/Library/metadata/2d/2d045b6a2856f2c408a0cd6048e9a44a b/ShipShooter/Library/metadata/2d/2d045b6a2856f2c408a0cd6048e9a44a index f44f3943..517bebf9 100644 Binary files a/ShipShooter/Library/metadata/2d/2d045b6a2856f2c408a0cd6048e9a44a and b/ShipShooter/Library/metadata/2d/2d045b6a2856f2c408a0cd6048e9a44a differ diff --git a/ShipShooter/Library/metadata/30/306b891d3a27e9c4bb799664b4d385a7 b/ShipShooter/Library/metadata/30/306b891d3a27e9c4bb799664b4d385a7 index 1d2e6204..965f91f3 100644 Binary files a/ShipShooter/Library/metadata/30/306b891d3a27e9c4bb799664b4d385a7 and b/ShipShooter/Library/metadata/30/306b891d3a27e9c4bb799664b4d385a7 differ diff --git a/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf b/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf index a2da3321..8bb7283b 100644 Binary files a/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf and b/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf differ diff --git a/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf.info b/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf.info index 03a8f6de..962fcfaa 100644 Binary files a/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf.info and b/ShipShooter/Library/metadata/32/32d3579bd8f5f6241b49b539273374bf.info differ diff --git a/ShipShooter/Library/metadata/3d/3d2e08407829a435b84ff5ac7f8b3aef b/ShipShooter/Library/metadata/3d/3d2e08407829a435b84ff5ac7f8b3aef index b67d4e39..73e9419b 100644 Binary files a/ShipShooter/Library/metadata/3d/3d2e08407829a435b84ff5ac7f8b3aef and b/ShipShooter/Library/metadata/3d/3d2e08407829a435b84ff5ac7f8b3aef differ diff --git a/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186 b/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186 index 3a99e1a3..701651c5 100644 Binary files a/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186 and b/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186 differ diff --git a/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186.info b/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186.info index c17ab166..5f0a4e4d 100644 Binary files a/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186.info and b/ShipShooter/Library/metadata/3f/3f48ea41e61710040923f469acf37186.info differ diff --git a/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558 b/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558 index d6376e6b..0f818e3a 100644 Binary files a/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558 and b/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558 differ diff --git a/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558.info b/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558.info index f0efeb55..0dfa36a3 100644 Binary files a/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558.info and b/ShipShooter/Library/metadata/3f/3fbf95a2d2858dd48bce20220c5a7558.info differ diff --git a/ShipShooter/Library/metadata/43/43cccde8f11edda44bc0d059bba65b9f b/ShipShooter/Library/metadata/43/43cccde8f11edda44bc0d059bba65b9f index 2a631d6f..d2148b74 100644 Binary files a/ShipShooter/Library/metadata/43/43cccde8f11edda44bc0d059bba65b9f and b/ShipShooter/Library/metadata/43/43cccde8f11edda44bc0d059bba65b9f differ diff --git a/ShipShooter/Library/metadata/46/469ffe30a4f3a43d99d202b74660b1e5 b/ShipShooter/Library/metadata/46/469ffe30a4f3a43d99d202b74660b1e5 index 17897eca..322fae77 100644 Binary files a/ShipShooter/Library/metadata/46/469ffe30a4f3a43d99d202b74660b1e5 and b/ShipShooter/Library/metadata/46/469ffe30a4f3a43d99d202b74660b1e5 differ diff --git a/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81 b/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81 index 0eaddf0b..f0c586de 100644 Binary files a/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81 and b/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81 differ diff --git a/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81.info b/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81.info index a03bb2fd..fe401391 100644 Binary files a/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81.info and b/ShipShooter/Library/metadata/4d/4d76cf62453cd1f4094b8e171ff0aa81.info differ diff --git a/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0 b/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0 index a7d099ea..ccaccb55 100644 Binary files a/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0 and b/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0 differ diff --git a/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0.info b/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0.info index de35f41e..8133d461 100644 Binary files a/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0.info and b/ShipShooter/Library/metadata/54/54a87e53019e1b343ad48dac27f35ce0.info differ diff --git a/ShipShooter/Library/metadata/54/54eaf9a88aebdfe4da18d167b8d28cc7 b/ShipShooter/Library/metadata/54/54eaf9a88aebdfe4da18d167b8d28cc7 index 7f661e38..ef398564 100644 Binary files a/ShipShooter/Library/metadata/54/54eaf9a88aebdfe4da18d167b8d28cc7 and b/ShipShooter/Library/metadata/54/54eaf9a88aebdfe4da18d167b8d28cc7 differ diff --git a/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476 b/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476 index 8a8f733e..cf508a03 100644 Binary files a/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476 and b/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476 differ diff --git a/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476.info b/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476.info index 41e06bc0..68c1eb3a 100644 Binary files a/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476.info and b/ShipShooter/Library/metadata/56/56b0d6ee5e807464cb248e4b4e28e476.info differ diff --git a/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e b/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e index bd51b21f..d6b54cd1 100644 Binary files a/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e and b/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e differ diff --git a/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e.info b/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e.info index acd8f901..08268030 100644 Binary files a/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e.info and b/ShipShooter/Library/metadata/57/57a475639063d7f4d95a8bb3a6ce394e.info differ diff --git a/ShipShooter/Library/metadata/5b/5b86adfdad41e734a8d0ad730d9eaee6 b/ShipShooter/Library/metadata/5b/5b86adfdad41e734a8d0ad730d9eaee6 index ea064ae7..037c07d7 100644 Binary files a/ShipShooter/Library/metadata/5b/5b86adfdad41e734a8d0ad730d9eaee6 and b/ShipShooter/Library/metadata/5b/5b86adfdad41e734a8d0ad730d9eaee6 differ diff --git a/ShipShooter/Library/metadata/5c/5c3a9bdd3fd997b49a2ef1239b24e147 b/ShipShooter/Library/metadata/5c/5c3a9bdd3fd997b49a2ef1239b24e147 index 69b50241..44755f5b 100644 Binary files a/ShipShooter/Library/metadata/5c/5c3a9bdd3fd997b49a2ef1239b24e147 and b/ShipShooter/Library/metadata/5c/5c3a9bdd3fd997b49a2ef1239b24e147 differ diff --git a/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268 b/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268 index 9b931946..c8934d25 100644 Binary files a/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268 and b/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268 differ diff --git a/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268.info b/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268.info index a513556f..11f8971b 100644 Binary files a/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268.info and b/ShipShooter/Library/metadata/5e/5e40c4e9842e865428d0fec4b5a3b268.info differ diff --git a/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7 b/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7 index 4317a267..41743bb7 100644 Binary files a/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7 and b/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7 differ diff --git a/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7.info b/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7.info index 8c5318de..de89aaeb 100644 Binary files a/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7.info and b/ShipShooter/Library/metadata/5f/5f32cd94baa94578a686d4b9d6b660f7.info differ diff --git a/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d b/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d index c81bb1a6..6f6e9d68 100644 Binary files a/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d and b/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d differ diff --git a/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d.info b/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d.info index ea0757bb..1d037138 100644 Binary files a/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d.info and b/ShipShooter/Library/metadata/65/654bffcadc71c7848a843adf1a4bd29d.info differ diff --git a/ShipShooter/Library/metadata/6b/6bf45a0ab38a1458999f7d05487b4d52 b/ShipShooter/Library/metadata/6b/6bf45a0ab38a1458999f7d05487b4d52 index 34f6e4e5..91ca31b4 100644 Binary files a/ShipShooter/Library/metadata/6b/6bf45a0ab38a1458999f7d05487b4d52 and b/ShipShooter/Library/metadata/6b/6bf45a0ab38a1458999f7d05487b4d52 differ diff --git a/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26 b/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26 index 97af19de..77d4430c 100644 Binary files a/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26 and b/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26 differ diff --git a/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26.info b/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26.info index b9516da8..95028d96 100644 Binary files a/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26.info and b/ShipShooter/Library/metadata/6f/6ffdc1109f146e94aadecee927f14e26.info differ diff --git a/ShipShooter/Library/metadata/71/71bcd13e2c27e8941bd380ca7a4c019f b/ShipShooter/Library/metadata/71/71bcd13e2c27e8941bd380ca7a4c019f index e5714a19..1a47490f 100644 Binary files a/ShipShooter/Library/metadata/71/71bcd13e2c27e8941bd380ca7a4c019f and b/ShipShooter/Library/metadata/71/71bcd13e2c27e8941bd380ca7a4c019f differ diff --git a/ShipShooter/Library/metadata/72/7208c311d8c3d2148b1752c60f462229 b/ShipShooter/Library/metadata/72/7208c311d8c3d2148b1752c60f462229 index fa495d6d..17ba7dd5 100644 Binary files a/ShipShooter/Library/metadata/72/7208c311d8c3d2148b1752c60f462229 and b/ShipShooter/Library/metadata/72/7208c311d8c3d2148b1752c60f462229 differ diff --git a/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06 b/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06 index 5f41348f..631d0600 100644 Binary files a/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06 and b/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06 differ diff --git a/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06.info b/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06.info index 49bdad96..e8eddebf 100644 Binary files a/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06.info and b/ShipShooter/Library/metadata/72/7248ebb8f59eaf74cbc4edfec27d4b06.info differ diff --git a/ShipShooter/Library/metadata/76/766f29702ce4e4a1584e5147c88629a2 b/ShipShooter/Library/metadata/76/766f29702ce4e4a1584e5147c88629a2 index bad6c221..fa642cdd 100644 Binary files a/ShipShooter/Library/metadata/76/766f29702ce4e4a1584e5147c88629a2 and b/ShipShooter/Library/metadata/76/766f29702ce4e4a1584e5147c88629a2 differ diff --git a/ShipShooter/Library/metadata/79/797ae283e17aa4827a330e531ef47b73 b/ShipShooter/Library/metadata/79/797ae283e17aa4827a330e531ef47b73 index 3e7fe77e..a4588060 100644 Binary files a/ShipShooter/Library/metadata/79/797ae283e17aa4827a330e531ef47b73 and b/ShipShooter/Library/metadata/79/797ae283e17aa4827a330e531ef47b73 differ diff --git a/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81 b/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81 index f161b9b9..a298ed91 100644 Binary files a/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81 and b/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81 differ diff --git a/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81.info b/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81.info index e5c62a33..99415a3f 100644 Binary files a/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81.info and b/ShipShooter/Library/metadata/7a/7a6380bbee6894b4bae5e86c0c3a2c81.info differ diff --git a/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f b/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f index 11225ba8..163bbba4 100644 Binary files a/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f and b/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f differ diff --git a/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f.info b/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f.info index 73bd0c20..d3588611 100644 Binary files a/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f.info and b/ShipShooter/Library/metadata/7b/7bc948f9a0a39aa4ea6585c5b690245f.info differ diff --git a/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f b/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f index 1a55a044..08b285e8 100644 Binary files a/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f and b/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f differ diff --git a/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f.info b/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f.info index f32f6de9..f6037898 100644 Binary files a/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f.info and b/ShipShooter/Library/metadata/80/80a3616ca19596e4da0f10f14d241e9f.info differ diff --git a/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba b/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba index 071e8d48..7cf0fd99 100644 Binary files a/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba and b/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba differ diff --git a/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba.info b/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba.info index 369e8738..bcc0a175 100644 Binary files a/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba.info and b/ShipShooter/Library/metadata/87/870353891bb340e2b2a9c8707e7419ba.info differ diff --git a/ShipShooter/Library/metadata/8a/8a32d65a6a0c443f79048586c9648b05 b/ShipShooter/Library/metadata/8a/8a32d65a6a0c443f79048586c9648b05 index b79c0022..f320b947 100644 Binary files a/ShipShooter/Library/metadata/8a/8a32d65a6a0c443f79048586c9648b05 and b/ShipShooter/Library/metadata/8a/8a32d65a6a0c443f79048586c9648b05 differ diff --git a/ShipShooter/Library/metadata/90/9036b8076da40aa4bbfa8c39d824e915 b/ShipShooter/Library/metadata/90/9036b8076da40aa4bbfa8c39d824e915 index f20a745e..f40b0a50 100644 Binary files a/ShipShooter/Library/metadata/90/9036b8076da40aa4bbfa8c39d824e915 and b/ShipShooter/Library/metadata/90/9036b8076da40aa4bbfa8c39d824e915 differ diff --git a/ShipShooter/Library/metadata/99/99aae065ca13f46398c1f65ebc52f413 b/ShipShooter/Library/metadata/99/99aae065ca13f46398c1f65ebc52f413 index 0a72eab3..ca33d721 100644 Binary files a/ShipShooter/Library/metadata/99/99aae065ca13f46398c1f65ebc52f413 and b/ShipShooter/Library/metadata/99/99aae065ca13f46398c1f65ebc52f413 differ diff --git a/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160 b/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160 index 750c2d02..90140ee6 100644 Binary files a/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160 and b/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160 differ diff --git a/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160.info b/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160.info index fc7dd555..2e0184a7 100644 Binary files a/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160.info and b/ShipShooter/Library/metadata/99/99ee536575f33814eaf3dd4f401b3160.info differ diff --git a/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561 b/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561 index 8374ee0e..afcc6ecd 100644 Binary files a/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561 and b/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561 differ diff --git a/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561.info b/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561.info index 40c0f549..c8323e23 100644 Binary files a/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561.info and b/ShipShooter/Library/metadata/9b/9ba0cff1ddf5f374c8f742219e772561.info differ diff --git a/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd b/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd index dbf3a001..caed56d7 100644 Binary files a/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd and b/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd differ diff --git a/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd.info b/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd.info index 853173f7..27f22f1d 100644 Binary files a/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd.info and b/ShipShooter/Library/metadata/9c/9c358f32af4d7784aa8dbf51c63af4bd.info differ diff --git a/ShipShooter/Library/metadata/a0/a0fbd16cf167148268ecb856d017aee7 b/ShipShooter/Library/metadata/a0/a0fbd16cf167148268ecb856d017aee7 index caf74083..682e21cd 100644 Binary files a/ShipShooter/Library/metadata/a0/a0fbd16cf167148268ecb856d017aee7 and b/ShipShooter/Library/metadata/a0/a0fbd16cf167148268ecb856d017aee7 differ diff --git a/ShipShooter/Library/metadata/a5/a5febb99e33f8f743912d24d1fe94c20 b/ShipShooter/Library/metadata/a5/a5febb99e33f8f743912d24d1fe94c20 index acca7396..3b73008f 100644 Binary files a/ShipShooter/Library/metadata/a5/a5febb99e33f8f743912d24d1fe94c20 and b/ShipShooter/Library/metadata/a5/a5febb99e33f8f743912d24d1fe94c20 differ diff --git a/ShipShooter/Library/metadata/b0/b08d27c24c30f494baa03630445bde2a b/ShipShooter/Library/metadata/b0/b08d27c24c30f494baa03630445bde2a index 7a29a306..f4c657aa 100644 Binary files a/ShipShooter/Library/metadata/b0/b08d27c24c30f494baa03630445bde2a and b/ShipShooter/Library/metadata/b0/b08d27c24c30f494baa03630445bde2a differ diff --git a/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a b/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a index e3932c91..68f0e017 100644 Binary files a/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a and b/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a differ diff --git a/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a.info b/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a.info index f7f3e8e4..3b4a38c0 100644 Binary files a/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a.info and b/ShipShooter/Library/metadata/b8/b80b09eb6f534ee40afeb3009e93e02a.info differ diff --git a/ShipShooter/Library/metadata/b8/b8d9d8ca408b6484eb25aa1be2f7919b b/ShipShooter/Library/metadata/b8/b8d9d8ca408b6484eb25aa1be2f7919b index e3dd0b09..456f729c 100644 Binary files a/ShipShooter/Library/metadata/b8/b8d9d8ca408b6484eb25aa1be2f7919b and b/ShipShooter/Library/metadata/b8/b8d9d8ca408b6484eb25aa1be2f7919b differ diff --git a/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96 b/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96 index 5904cca5..1bb880bd 100644 Binary files a/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96 and b/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96 differ diff --git a/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96.info b/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96.info index c1a910b1..c02119b3 100644 Binary files a/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96.info and b/ShipShooter/Library/metadata/be/be10fc2a1b44c42ab8d6af8637b7bb96.info differ diff --git a/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997 b/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997 index 0ba09c97..94d833e7 100644 Binary files a/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997 and b/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997 differ diff --git a/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997.info b/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997.info index 239a5361..3d175908 100644 Binary files a/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997.info and b/ShipShooter/Library/metadata/c6/c641cd34d01b082469077f9ab397f997.info differ diff --git a/ShipShooter/Library/metadata/d2/d2ef3b15c32eb43108261a87963b8937 b/ShipShooter/Library/metadata/d2/d2ef3b15c32eb43108261a87963b8937 index f069c861..f66c168a 100644 Binary files a/ShipShooter/Library/metadata/d2/d2ef3b15c32eb43108261a87963b8937 and b/ShipShooter/Library/metadata/d2/d2ef3b15c32eb43108261a87963b8937 differ diff --git a/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71 b/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71 index 0238f9ca..cee6330a 100644 Binary files a/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71 and b/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71 differ diff --git a/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71.info b/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71.info index e609fe8a..63f8151a 100644 Binary files a/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71.info and b/ShipShooter/Library/metadata/d4/d47ee4706e775e0438860d293e39bc71.info differ diff --git a/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6 b/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6 index 85ac8c3e..5700f128 100644 Binary files a/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6 and b/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6 differ diff --git a/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6.info b/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6.info index fe982ed4..ea8cd3e0 100644 Binary files a/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6.info and b/ShipShooter/Library/metadata/d6/d66b3e2d0214e794fa7d6751645268b6.info differ diff --git a/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c b/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c index 9c88b299..ddb7beb1 100644 Binary files a/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c and b/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c differ diff --git a/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c.info b/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c.info index 27201ae8..5f4e3d1b 100644 Binary files a/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c.info and b/ShipShooter/Library/metadata/d9/d9b175b25b514e0499cb761a804d198c.info differ diff --git a/ShipShooter/Library/metadata/da/da56545009beb874ab17b50ab4dfd5df b/ShipShooter/Library/metadata/da/da56545009beb874ab17b50ab4dfd5df index 04e99740..8eaa54a1 100644 Binary files a/ShipShooter/Library/metadata/da/da56545009beb874ab17b50ab4dfd5df and b/ShipShooter/Library/metadata/da/da56545009beb874ab17b50ab4dfd5df differ diff --git a/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b b/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b index 1e32a3de..902b4bfc 100644 Binary files a/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b and b/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b differ diff --git a/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b.info b/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b.info index fa8ee296..046553d7 100644 Binary files a/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b.info and b/ShipShooter/Library/metadata/e0/e03f48c9e82951e4e85b74a14aca100b.info differ diff --git a/ShipShooter/Library/metadata/e8/e824886ca6f7c40a4a622b6a82c50c9c b/ShipShooter/Library/metadata/e8/e824886ca6f7c40a4a622b6a82c50c9c index c6f75e25..f96a2d9e 100644 Binary files a/ShipShooter/Library/metadata/e8/e824886ca6f7c40a4a622b6a82c50c9c and b/ShipShooter/Library/metadata/e8/e824886ca6f7c40a4a622b6a82c50c9c differ diff --git a/ShipShooter/Library/metadata/f1/f162bf6fcb2d5544e9cce62346a145e0 b/ShipShooter/Library/metadata/f1/f162bf6fcb2d5544e9cce62346a145e0 index 8aca46a1..cab7d4f0 100644 Binary files a/ShipShooter/Library/metadata/f1/f162bf6fcb2d5544e9cce62346a145e0 and b/ShipShooter/Library/metadata/f1/f162bf6fcb2d5544e9cce62346a145e0 differ diff --git a/ShipShooter/Library/metadata/f3/f3bb37550d4444b87ad7543d746b1c95 b/ShipShooter/Library/metadata/f3/f3bb37550d4444b87ad7543d746b1c95 index 6057e14c..e06e61d2 100644 Binary files a/ShipShooter/Library/metadata/f3/f3bb37550d4444b87ad7543d746b1c95 and b/ShipShooter/Library/metadata/f3/f3bb37550d4444b87ad7543d746b1c95 differ diff --git a/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd b/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd index 1e1ec1f5..4798b5db 100644 Binary files a/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd and b/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd differ diff --git a/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd.info b/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd.info index 63501393..e18df734 100644 Binary files a/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd.info and b/ShipShooter/Library/metadata/f4/f428414a3bb58774a818d9b17ae890dd.info differ diff --git a/ShipShooter/Library/metadata/f4/f4f74ab9f5c52454dbfd40e744839567 b/ShipShooter/Library/metadata/f4/f4f74ab9f5c52454dbfd40e744839567 deleted file mode 100644 index 77b81b27..00000000 Binary files a/ShipShooter/Library/metadata/f4/f4f74ab9f5c52454dbfd40e744839567 and /dev/null differ diff --git a/ShipShooter/Library/metadata/f4/f4f74ab9f5c52454dbfd40e744839567.info b/ShipShooter/Library/metadata/f4/f4f74ab9f5c52454dbfd40e744839567.info deleted file mode 100644 index 6a786128..00000000 Binary files a/ShipShooter/Library/metadata/f4/f4f74ab9f5c52454dbfd40e744839567.info and /dev/null differ diff --git a/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 b/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 index ce65b181..21be4e74 100644 Binary files a/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 and b/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8 differ diff --git a/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8.info b/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8.info index 7b08f1cd..e7417f52 100644 Binary files a/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8.info and b/ShipShooter/Library/metadata/f5/f5f67c52d1564df4a8936ccd202a3bd8.info differ diff --git a/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d b/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d index c83228f8..a3c1904e 100644 Binary files a/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d and b/ShipShooter/Library/metadata/f7/f7772ef56e6010145ace7cd4ac93f07d differ diff --git a/ShipShooter/Library/metadata/fe/fee89e7023b014869aee949adecdc426 b/ShipShooter/Library/metadata/fe/fee89e7023b014869aee949adecdc426 index f4d41305..208e2be2 100644 Binary files a/ShipShooter/Library/metadata/fe/fee89e7023b014869aee949adecdc426 and b/ShipShooter/Library/metadata/fe/fee89e7023b014869aee949adecdc426 differ diff --git a/ShipShooter/ProjectSettings/ProjectSettings.asset b/ShipShooter/ProjectSettings/ProjectSettings.asset index 9b6e32a2..ee586954 100644 Binary files a/ShipShooter/ProjectSettings/ProjectSettings.asset and b/ShipShooter/ProjectSettings/ProjectSettings.asset differ diff --git a/ShipShooter/ProjectSettings/ProjectVersion.txt b/ShipShooter/ProjectSettings/ProjectVersion.txt index e040c5c1..c609863d 100644 --- a/ShipShooter/ProjectSettings/ProjectVersion.txt +++ b/ShipShooter/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.2.0f3 +m_EditorVersion: 5.1.3f1 m_StandardAssetsVersion: 0 diff --git a/ShipShooter/ShipShooter-csharp.sln b/ShipShooter/ShipShooter-csharp.sln new file mode 100644 index 00000000..4bf464f9 --- /dev/null +++ b/ShipShooter/ShipShooter-csharp.sln @@ -0,0 +1,46 @@ +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2008 + +Project("{64FF17DC-4364-F401-F3C3-A5842A6F1663}") = "ShipShooter", "Assembly-CSharp-vs.csproj", "{B99BC696-7CE4-0F5D-8CA4-C88F69287869}" +EndProject +Project("{64FF17DC-4364-F401-F3C3-A5842A6F1663}") = "ShipShooter", "Assembly-CSharp-Editor-vs.csproj", "{CBCFE89D-A6E1-C4CD-D963-6428CD524560}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B99BC696-7CE4-0F5D-8CA4-C88F69287869}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B99BC696-7CE4-0F5D-8CA4-C88F69287869}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B99BC696-7CE4-0F5D-8CA4-C88F69287869}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B99BC696-7CE4-0F5D-8CA4-C88F69287869}.Release|Any CPU.Build.0 = Release|Any CPU + {CBCFE89D-A6E1-C4CD-D963-6428CD524560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CBCFE89D-A6E1-C4CD-D963-6428CD524560}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CBCFE89D-A6E1-C4CD-D963-6428CD524560}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CBCFE89D-A6E1-C4CD-D963-6428CD524560}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = Assembly-CSharp.csproj + Policies = $0 + $0.TextStylePolicy = $1 + $1.inheritsSet = null + $1.scope = text/x-csharp + $0.CSharpFormattingPolicy = $2 + $2.inheritsSet = Mono + $2.inheritsScope = text/x-csharp + $2.scope = text/x-csharp + $0.TextStylePolicy = $3 + $3.FileWidth = 120 + $3.TabWidth = 4 + $3.IndentWidth = 4 + $3.EolMarker = Unix + $3.inheritsSet = Mono + $3.inheritsScope = text/plain + $3.scope = text/plain + EndGlobalSection + +EndGlobal diff --git a/ShipShooter/ShipShooter.sln b/ShipShooter/ShipShooter.sln index 47d813d7..7e7c5ecd 100644 --- a/ShipShooter/ShipShooter.sln +++ b/ShipShooter/ShipShooter.sln @@ -23,7 +23,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution StartupItem = Assembly-CSharp.csproj Policies = $0 $0.TextStylePolicy = $1 diff --git a/ShipShooter/ShipShooter.userprefs b/ShipShooter/ShipShooter.userprefs new file mode 100644 index 00000000..ea08967f --- /dev/null +++ b/ShipShooter/ShipShooter.userprefs @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Week 8 Project/Week 8 Project.userprefs b/Week 8 Project/Week 8 Project.userprefs index e556f69e..8fd6cd9f 100644 --- a/Week 8 Project/Week 8 Project.userprefs +++ b/Week 8 Project/Week 8 Project.userprefs @@ -1,9 +1,8 @@  - - + + - - +