diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 8334a3ff..cc39f214 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -2,6 +2,8 @@ latest + C:\Program Files\Unity\Editor\Data\Tools\RoslynScripts + unity_csc.bat Debug @@ -9,7 +11,7 @@ 10.0.20506 2.0 - {D5EF9C65-C1CF-2945-82BC-AC510A67670E} + {A20B30E1-2795-4054-F705-FB8C5A46A3FC} Library Properties Assembly-CSharp @@ -22,7 +24,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;UNITY_2019_3_9;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_VSTU;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER + DEBUG;TRACE;UNITY_2019_3_9;UNITY_2019_3;UNITY_2019;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;PLATFORM_STANDALONE;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER prompt 4 0169 @@ -44,691 +46,696 @@ false false - - {E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Unity/VSTU - Game:1 - StandaloneWindows:5 - 2019.3.9f1 - - - - - C:\Program Files\Unity\Hub\Editor\2019.3.9f1\Editor\Data\Managed/UnityEngine/UnityEngine.dll + C:\Program Files\Unity\Editor\Data\Managed/UnityEngine/UnityEngine.dll - C:\Program Files\Unity\Hub\Editor\2019.3.9f1\Editor\Data\Managed/UnityEditor.dll + C:\Program Files\Unity\Editor\Data\Managed/UnityEditor.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/Unity.Timeline.Editor.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/Unity.VSCode.Editor.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/UnityEngine.UI.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/Unity.Timeline.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/Unity.Rider.Editor.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/Unity.TextMeshPro.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Library/ScriptAssemblies/UnityEditor.UI.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Assets/Photon/PhotonLibs/Photon3Unity3D.dll - - - D:/Academics/CIS-568-Game-Design/HaystackHoarder/visual2/Assets/Photon/PhotonLibs/WebSocket/websocket-sharp.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/Microsoft.Win32.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.AppContext.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Concurrent.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.NonGeneric.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Specialized.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.EventBasedAsync.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.TypeConverter.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Console.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Data.Common.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Contracts.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Debug.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.FileVersionInfo.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Process.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.StackTrace.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TextWriterTraceListener.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tools.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TraceSource.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tracing.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Drawing.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Dynamic.Runtime.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Calendars.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.ZipFile.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.DriveInfo.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Watcher.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.IsolatedStorage.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.MemoryMappedFiles.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Pipes.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.UnmanagedMemoryStream.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Expressions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Parallel.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Queryable.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Http.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NameResolution.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NetworkInformation.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Ping.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Requests.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Security.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Sockets.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebHeaderCollection.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.Client.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ObjectModel.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Reader.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.ResourceManager.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Writer.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.CompilerServices.VisualC.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Handles.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Numerics.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Formatters.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Json.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Xml.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Claims.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Algorithms.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Csp.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Encoding.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Primitives.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.X509Certificates.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Principal.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.SecureString.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.Extensions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.RegularExpressions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Overlapped.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.Parallel.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Thread.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.ThreadPool.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Timer.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ValueTuple.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.ReaderWriter.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XDocument.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlDocument.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlSerializer.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.XDocument.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Numerics.Vectors.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/mscorlib.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ComponentModel.Composition.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Core.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Data.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Drawing.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.IO.Compression.FileSystem.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Net.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Numerics.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Runtime.Serialization.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ServiceModel.Web.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Transactions.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Web.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Windows.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Linq.dll - - - C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/Unity.Timeline.Editor.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/Unity.VSCode.Editor.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/UnityEngine.UI.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/Unity.Timeline.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/Unity.Rider.Editor.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/Unity.TextMeshPro.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Library/ScriptAssemblies/UnityEditor.UI.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + + + C:/Program Files/Unity/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Assets/Photon/PhotonLibs/Photon3Unity3D.dll + + + C:/Users/Janine/Documents/CIS568/HaystackHoarder/Assets/Photon/PhotonLibs/WebSocket/websocket-sharp.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll + + + C:/Program Files/Unity/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Core.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Runtime.Serialization.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.Linq.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.Vectors.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Net.Http.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Microsoft.CSharp.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Data.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/Microsoft.Win32.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/netstandard.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.AppContext.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Concurrent.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.NonGeneric.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Specialized.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Annotations.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.EventBasedAsync.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.TypeConverter.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Console.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Data.Common.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Contracts.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Debug.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.FileVersionInfo.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Process.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.StackTrace.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TextWriterTraceListener.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Tools.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TraceSource.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Drawing.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Dynamic.Runtime.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Calendars.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Compression.ZipFile.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.DriveInfo.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Watcher.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.IsolatedStorage.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.MemoryMappedFiles.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Pipes.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.UnmanagedMemoryStream.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Expressions.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Parallel.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Queryable.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Http.Rtc.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NameResolution.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NetworkInformation.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Ping.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Requests.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Security.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Sockets.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebHeaderCollection.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.Client.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ObjectModel.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.ILGeneration.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.Lightweight.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Reader.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.ResourceManager.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Writer.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.CompilerServices.VisualC.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Handles.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Numerics.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Formatters.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Json.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Xml.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Claims.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Algorithms.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Csp.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Encoding.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.X509Certificates.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Principal.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.SecureString.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Duplex.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Http.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.NetTcp.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Primitives.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Security.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.Extensions.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.RegularExpressions.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Overlapped.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.Parallel.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Thread.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.ThreadPool.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Timer.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ValueTuple.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.ReaderWriter.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XDocument.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlDocument.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlSerializer.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/UnityScript.Lang.dll + + + C:/Program Files/Unity/Editor/Data/MonoBleedingEdge/lib/mono/unityscript/Boo.Lang.dll + - {DB4D7C1C-75BE-D43F-CF44-5E9E0513EEAB} + {8434FD4D-52F7-E87D-25D0-CAAA5ADD9119} PhotonUnityNetworking.Utilities.PhotonPlayer.Editor - {F0073942-F52A-1C16-280C-7655C9BA46F4} + {E51FEAE7-E6AB-4A2D-1115-C79435650A31} PunDemos.DemoHubEditor - {6C6C6FEF-4920-1808-33E5-1867F585C2ED} + {D1D88B60-0FEA-7FCB-7DB8-880768A2C5EB} PunDemos.DemoSlotcarEditor - {4FBD0FA6-A2DD-B118-40A0-E076CFAA6CB5} + {A8BD6E1D-B563-B841-0379-62403142911F} PhotonUnityNetworking.Demos - {AA58238B-1B38-B634-2752-D66DAD413D47} + {53B535DB-58F2-5DDF-29AA-5D633D41E4FA} PhotonUnityNetworking.Utilities - {0498F3B1-BD24-4504-7402-C5DE6660F9B6} + {F22785DB-C924-8511-A55A-8DDBB42901E8} PhotonWebSocket - {39A9F55E-C8B1-62A8-89C8-2C1583C2E119} + {3EFBD9B4-B1F5-F28A-309E-786A056D60C6} PhotonRealtime - {7D5B33D0-48A4-8C68-9CF4-D55136E1E5E5} + {CEA175CB-BD8F-0ADF-E494-DCF2DF2341E3} PhotonUnityNetworking - {90142D04-1108-F962-42A5-75338791E1C3} + {BC5F3D00-A59E-8BEA-CDDD-C8C6CF78904E} PhotonChat - {15F0317D-71AA-52A1-713D-270B7CC75AED} + {5FE314A4-A8E1-CEAC-83E8-B9E069B8B332} PhotonUnityNetworking.Utilities.Culling.Editor - {68CD2B1B-1007-D120-5AEB-62961811F00D} + {1214E117-677B-2750-5B61-1F441F75A46D} PhotonUnityNetworking.Editor - - \ No newline at end of file + diff --git a/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset b/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset index 24ba77a1..368cfae9 100644 --- a/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset +++ b/Assets/Photon/PhotonUnityNetworking/Code/Editor/PunSceneSettingsFile.asset @@ -1,21 +1,16 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fc3284eace5a64d4bb516df7d7effdb9, type: 3} - m_Name: PunSceneSettingsFile - m_EditorClassIdentifier: - SceneSettingsListFoldoutOpen: 1 - MinViewIdPerScene: - - sceneAsset: {fileID: 102900000, guid: 559222f4671e440cba71aecba1de3505, type: 3} - sceneName: SceneView_A - minViewId: 2 - - sceneAsset: {fileID: 102900000, guid: a81615022a16c489aac8daadf8f51fae, type: 3} - sceneName: SceneView_B - minViewId: 10 +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fc3284eace5a64d4bb516df7d7effdb9, type: 3} + m_Name: PunSceneSettingsFile + m_EditorClassIdentifier: + SceneSettingsListFoldoutOpen: 1 + MinViewIdPerScene: [] diff --git a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset index 62755478..6207c597 100644 --- a/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset +++ b/Assets/Photon/PhotonUnityNetworking/Resources/PhotonServerSettings.asset @@ -49,6 +49,8 @@ MonoBehaviour: - feedAnimal - Fire - FixFence + - followAnimal + - placeAnimal - RemoveFuel - RespawnSpaceship - StealBale @@ -57,9 +59,9 @@ MonoBehaviour: - SwitchScenes - updateFenceScript - updateFenceScriptFix + - updateGameState + - updatePenNumber - UpdatePlayerCount - - followAnimal - - placeAnimal DisableAutoOpenWizard: 1 ShowSettings: 0 DevRegionSetOnce: 1 diff --git a/Assets/Prefabs/GlobalObject.prefab b/Assets/Prefabs/GlobalObject.prefab index b5ebb436..e840318e 100644 --- a/Assets/Prefabs/GlobalObject.prefab +++ b/Assets/Prefabs/GlobalObject.prefab @@ -107,7 +107,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5804692930863718317} - m_RootOrder: 8 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -184,7 +184,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5804692930863718317} - m_RootOrder: 4 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -265,7 +265,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 373, y: 324} + m_AnchoredPosition: {x: 373, y: 300} m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8247006754156941660 @@ -338,7 +338,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5804692930863718317} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -917,7 +917,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5804692930863718317} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -994,7 +994,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5804692930863718317} - m_RootOrder: 9 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1118,6 +1118,83 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Final Score +--- !u!1 &6160906942750293847 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8335517072229522071} + - component: {fileID: 3973607748599996997} + - component: {fileID: 2458296915774370739} + m_Layer: 5 + m_Name: AnimalsPlayer2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8335517072229522071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6160906942750293847} + 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_Children: [] + m_Father: {fileID: 5804692930863718317} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 373, y: 275} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &3973607748599996997 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6160906942750293847} + m_CullTransparentMesh: 0 +--- !u!114 &2458296915774370739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6160906942750293847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Player 2 Score: 0' --- !u!1 &6254733548645539046 GameObject: m_ObjectHideFlags: 0 @@ -1152,7 +1229,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -230, y: 324} + m_AnchoredPosition: {x: -230, y: 300} m_SizeDelta: {x: 250, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &625863840874476871 @@ -1225,6 +1302,8 @@ RectTransform: - {fileID: 6763496041244279658} - {fileID: 5853858758956291893} - {fileID: 2756875936568352976} + - {fileID: 3060347633511876101} + - {fileID: 8335517072229522071} - {fileID: 8797833810400528098} - {fileID: 8907820054494808034} - {fileID: 7988866080312811959} @@ -1270,7 +1349,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5804692930863718317} - m_RootOrder: 5 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1351,7 +1430,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 324} + m_AnchoredPosition: {x: 0, y: 300} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6763496041244279660 @@ -1470,12 +1549,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1024, y: 768} m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1537,6 +1616,83 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: +--- !u!1 &7628124243021211404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3060347633511876101} + - component: {fileID: 6713572539572339017} + - component: {fileID: 8493724014549121709} + m_Layer: 5 + m_Name: AnimalsPlayer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3060347633511876101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7628124243021211404} + 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_Children: [] + m_Father: {fileID: 5804692930863718317} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -230, y: 275} + m_SizeDelta: {x: 250, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &6713572539572339017 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7628124243021211404} + m_CullTransparentMesh: 0 +--- !u!114 &8493724014549121709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7628124243021211404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'Player 1 Score: 0' --- !u!1 &8260894581228606246 GameObject: m_ObjectHideFlags: 0 @@ -1644,7 +1800,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5804692930863718317} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1735,6 +1891,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fbee02debcd415946bd0e5623fef3dec, type: 3} m_Name: m_EditorClassIdentifier: + numPlayers: 2 backgroundAC: {fileID: 8300000, guid: 4b3add4ef07b0604796bccf0ccd4ca61, type: 3} backgroundVolume: 0.005 endScreenImage: {fileID: 7496745384883718930} @@ -1748,8 +1905,14 @@ MonoBehaviour: - {fileID: 5476066862457469173} timeLeft: 420 textTimeLeft: {fileID: 6763496041244279659} + timeScorePlayer1: 0 + timeScorePlayer2: 0 textTimeScorePlayer1: {fileID: 5781809136914593355} textTimeScorePlayer2: {fileID: 8976516828204580124} + animalsPlayer1: 0 + animalsPlayer2: 0 + textAnimalsPlayer1: {fileID: 8493724014549121709} + textAnimalsPlayer2: {fileID: 2458296915774370739} textControls: {fileID: 9072182254662397914} textTimeFinalScorePlayer1: {fileID: 6516621203687801484} textTimeFinalScorePlayer2: {fileID: 8980453957442146218} diff --git a/Assets/Resources/Bale.prefab b/Assets/Resources/Bale.prefab index 05270e3c..550027ac 100644 --- a/Assets/Resources/Bale.prefab +++ b/Assets/Resources/Bale.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 4234565710960262502} - component: {fileID: 6427714216175178508} m_Layer: 0 - m_Name: GameObject + m_Name: Bale m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -41,7 +41,7 @@ BoxCollider: m_GameObject: {fileID: 8301804158632200003} m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Chicken.prefab b/Assets/Resources/Chicken.prefab index 87d905c2..3b28d2c8 100644 --- a/Assets/Resources/Chicken.prefab +++ b/Assets/Resources/Chicken.prefab @@ -265,11 +265,11 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 + m_UseGravity: 0 + m_IsKinematic: 1 m_Interpolate: 0 - m_Constraints: 80 - m_CollisionDetection: 2 + m_Constraints: 112 + m_CollisionDetection: 3 --- !u!114 &3499706033699792430 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Cow.prefab b/Assets/Resources/Cow.prefab index 3719a90e..a3ead5fa 100644 --- a/Assets/Resources/Cow.prefab +++ b/Assets/Resources/Cow.prefab @@ -129,7 +129,7 @@ GameObject: - component: {fileID: 992849672745287195} - component: {fileID: 506117776026964859} - component: {fileID: 8942084000181389971} - m_Layer: 0 + m_Layer: 9 m_Name: Cow m_TagString: Animal m_Icon: {fileID: 0} @@ -223,11 +223,11 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 + m_UseGravity: 0 + m_IsKinematic: 1 m_Interpolate: 0 - m_Constraints: 80 - m_CollisionDetection: 2 + m_Constraints: 112 + m_CollisionDetection: 3 --- !u!114 &992849672745287195 MonoBehaviour: m_ObjectHideFlags: 0 @@ -546,10 +546,106 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 992849672745287196} m_Modifications: + - target: {fileID: 1009919352666094, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1054808001227600, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1067110466193556, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1094918245625220, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1107626410611266, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1124726782550596, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1134187151288644, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1138153193110046, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1160463197230100, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1196638522399410, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1269362389472358, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1296586569962892, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1371243733550292, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1371779103242924, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1372954504431302, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1559397375762804, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1596410480611636, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1752912407355974, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1786569282624570, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 1860942571928548, guid: 9cfa5981c1638154dace5f726d227597, type: 3} propertyPath: m_Name value: Cow objectReference: {fileID: 0} + - target: {fileID: 1860942571928548, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1894733446691080, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1903524848939314, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1920516238794950, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1975613050664894, guid: 9cfa5981c1638154dace5f726d227597, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4953572151094814, guid: 9cfa5981c1638154dace5f726d227597, type: 3} propertyPath: m_LocalPosition.x value: -0.000000021766 diff --git a/Assets/Resources/Fence.prefab b/Assets/Resources/Fence.prefab index 55f0055b..f6753057 100644 --- a/Assets/Resources/Fence.prefab +++ b/Assets/Resources/Fence.prefab @@ -200,16 +200,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: broken: 0 - health: 100 + health: 15 breakTimer: 0 vertical: 0 - penNumber: 1 + team: 0 totalTimeToBreak: 0 timeToBreak: 0 totalTimeToFix: 0 timeToFix: 0 fixing: 0 - team: 0 --- !u!114 &5145679156512276124 MonoBehaviour: m_ObjectHideFlags: 0 @@ -230,6 +229,9 @@ MonoBehaviour: breakMeter: {fileID: 0} beingBroken: 0 beingFixed: 0 + healthyFence: {fileID: 6647589654082303362} + tatteredFence: {fileID: 1102686928068876546} + brokenFence: {fileID: 4074297336035449223} --- !u!114 &1417587820185889036 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1804,6 +1806,12 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 1fc121be3f680634fbb8cab1fa2d47c8, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3b258f4b3ab0043aaa363f725bb3cc03, type: 3} +--- !u!1 &4074297336035449223 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 3b258f4b3ab0043aaa363f725bb3cc03, + type: 3} + m_PrefabInstance: {fileID: 5452489987288842382} + m_PrefabAsset: {fileID: 0} --- !u!4 &1067799581055544212 stripped Transform: m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 3b258f4b3ab0043aaa363f725bb3cc03, @@ -2004,3 +2012,9 @@ Transform: type: 3} m_PrefabInstance: {fileID: 8965658594524282891} m_PrefabAsset: {fileID: 0} +--- !u!1 &1102686928068876546 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 313fbd0045f944010919beae39e5fb1f, + type: 3} + m_PrefabInstance: {fileID: 8965658594524282891} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/Haystack.prefab b/Assets/Resources/Haystack.prefab index 7990f3c2..a12ce933 100644 --- a/Assets/Resources/Haystack.prefab +++ b/Assets/Resources/Haystack.prefab @@ -15,7 +15,7 @@ GameObject: - component: {fileID: 3107581247145983863} - component: {fileID: 313372228612340780} - component: {fileID: 4691467337472230591} - m_Layer: 0 + m_Layer: 9 m_Name: Haystack m_TagString: Haystack m_Icon: {fileID: 0} @@ -241,6 +241,11 @@ PrefabInstance: propertyPath: m_Name value: Haystack objectReference: {fileID: 0} + - target: {fileID: -927199367670048503, guid: 9e070b0c93f87b548ad0a80a277e2a3a, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9e070b0c93f87b548ad0a80a277e2a3a, type: 3} --- !u!4 &4723020042925523422 stripped diff --git a/Assets/Resources/Player.prefab b/Assets/Resources/Player.prefab index c073d1c9..43d1fe85 100644 --- a/Assets/Resources/Player.prefab +++ b/Assets/Resources/Player.prefab @@ -378,7 +378,7 @@ GameObject: - component: {fileID: 4713965591986013955} - component: {fileID: 507489474895904792} - component: {fileID: 3107387483958747817} - m_Layer: 0 + m_Layer: 9 m_Name: Player m_TagString: Player m_Icon: {fileID: 0} @@ -617,6 +617,16 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 932071178683565214, guid: c622e6f6e70a68c48b6c4f327ceede96, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6132969940363349253, guid: c622e6f6e70a68c48b6c4f327ceede96, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 6699625755391028671, guid: c622e6f6e70a68c48b6c4f327ceede96, type: 3} propertyPath: m_LocalPosition.x @@ -708,6 +718,26 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5873270045283981465} m_Modifications: + - target: {fileID: 941439428919532086, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1478512531571269022, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3394346836034196762, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3402714309536483382, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3465387774367642054, guid: 72d42fe0027b5bd46a0938414fbe4afd, type: 3} propertyPath: m_LocalPosition.x @@ -768,6 +798,26 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.43781 objectReference: {fileID: 0} + - target: {fileID: 6196074589436278532, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7179532791818797786, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7289384510869970802, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7291655808898028010, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 8263583993715659861, guid: 72d42fe0027b5bd46a0938414fbe4afd, type: 3} propertyPath: m_Name @@ -778,6 +828,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8263583993715659861, guid: 72d42fe0027b5bd46a0938414fbe4afd, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 72d42fe0027b5bd46a0938414fbe4afd, type: 3} --- !u!1 &9006572236086103788 stripped @@ -799,6 +854,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5873270045283981465} m_Modifications: + - target: {fileID: 261843091050758213, guid: fb707da6ca7451c48a3df39fe3e92054, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4234565710960262502, guid: fb707da6ca7451c48a3df39fe3e92054, type: 3} propertyPath: m_LocalPosition.x @@ -859,6 +919,21 @@ PrefabInstance: propertyPath: m_LocalScale.y value: 0.52025 objectReference: {fileID: 0} + - target: {fileID: 5825867976019162686, guid: fb707da6ca7451c48a3df39fe3e92054, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6709852600272538615, guid: fb707da6ca7451c48a3df39fe3e92054, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7940276754022547047, guid: fb707da6ca7451c48a3df39fe3e92054, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 8301804158632200003, guid: fb707da6ca7451c48a3df39fe3e92054, type: 3} propertyPath: m_Name @@ -869,6 +944,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 8301804158632200003, guid: fb707da6ca7451c48a3df39fe3e92054, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fb707da6ca7451c48a3df39fe3e92054, type: 3} --- !u!1 &5940095780067555521 stripped @@ -898,6 +978,102 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 100000, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100004, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100006, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100010, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100012, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100014, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100016, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100018, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100020, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100022, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100024, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100026, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100028, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100030, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100032, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100034, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100036, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100038, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100040, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100042, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100044, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100046, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: c0d8a19c260774d428c9ffead3796f08, type: 3} propertyPath: m_LocalPosition.x value: 0.599 @@ -977,6 +1153,46 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100004, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100006, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100010, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100012, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100014, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100016, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100018, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 129f3c383e2b5514f84a597c1ba7f5e6, type: 3} propertyPath: m_LocalPosition.x value: 0.476 @@ -1048,10 +1264,870 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5873270045283981465} m_Modifications: + - target: {fileID: 1001977687561646, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1009467529949444, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1015999190351886, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1018817683174844, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1024234249715458, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1027583526884858, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1032289243173790, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1037071918962918, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1044219732566722, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1054580464469252, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1054983458142414, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1077554848072092, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1078747353975548, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1081173333081398, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1097763791838780, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1110443913782122, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1112299292720438, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1113611242240528, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1117621943732272, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1147733156771150, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1149253049822104, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1163324425738106, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1163933315822734, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1165108238694868, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1166958403886218, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 1172653347243886, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} propertyPath: m_Name value: M07 objectReference: {fileID: 0} + - target: {fileID: 1172653347243886, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1180936692531272, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1187122336558690, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1188113235523888, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1189755328330186, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1195005340414156, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1196933888893622, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1210832883427654, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1216395314184956, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1219008495803502, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1220766181468910, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1222580187550614, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1228938996897164, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1228946758865544, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1233192461952820, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1239103104740764, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1239169912927930, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1239276154091120, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1247730476198080, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1251063184912728, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1251587475143982, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1257347700011258, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1257659479014948, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1271451225534386, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1272067863116520, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1278201469083014, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1279141448807032, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1284331546988168, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1285425259012644, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1288082500685102, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1290822674989550, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1297363080850296, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1299400791190004, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1299821934771412, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1301587838186396, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1307594268852000, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1308968102087500, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1321971487443528, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1331310460585014, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1334119907985550, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1335743949303916, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1337341097761594, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1338553872428416, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1348332588266214, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1350247740420882, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1357766251852166, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1367316647561484, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1372248728648974, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1375397858130656, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1389193334476806, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1396473696756018, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1399413853514032, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1414987424000230, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1415639114514712, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1416773903708652, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1416909116036994, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1418236791376474, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1422365159282180, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1425310057521228, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1427341173436580, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1428188404536436, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1432579154800102, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1434156754351676, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1434599139802072, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1444055074573974, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1450209169805832, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1452904807503842, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1456232468583770, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1461872315597168, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1463942591611752, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1470252970514620, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1471113520252422, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1476109776355332, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1477645815588080, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1478031797713858, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1481101886706026, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1483093624469170, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1484106870566172, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1487316378698150, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1488472507468744, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1491279701995158, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1492939770386718, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1497174245096050, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1508422091791978, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1509952382835772, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1518128974383212, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1536149783244988, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1545076492025514, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1590154594773694, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1591815959206272, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1594438029891382, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1597635964006472, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1600726727133406, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1601122399568320, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1604335474308500, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1607929887553708, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1608740801395896, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1610258276359864, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1614542977313590, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1621534397770046, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1622629613027292, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1625307716793620, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1627668165452026, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1633877451210156, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1639237331234084, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1640110641938162, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1642931745839806, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1656619147645044, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1656746758287668, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1660750602825250, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1677595177989940, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1681704746631928, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1688988182420844, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1709114106460240, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1710981578534950, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1712020249087300, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1714413103421032, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1716206998622220, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1717407200449640, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1719356513307848, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1725927218006288, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1730481330962772, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1738043326284674, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1744519353032352, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1753581857444670, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1761114451696762, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1784792062967248, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1797088558946204, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1797370581849232, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1798073241050732, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1800726261899298, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1801192979711040, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1802836921996432, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1808456026099266, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1808635840026386, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1811887772673060, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1812840084920596, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1816581606481820, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1817016094793408, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1822379703332368, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1824189500808930, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1824218713276284, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1831091304334828, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1834221318901152, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1841744178552128, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1846938883331156, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1847702737973540, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1847708580844834, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1849915371435606, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1850765485500930, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1851462034892306, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1857270706579528, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1857446518644314, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1858053261679484, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1860840037513132, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1862188424944456, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1863626960636188, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1866710272513056, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1871846494660952, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1877129869053938, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1881361139717584, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1882744205346152, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1896175096217562, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1900806616112054, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1903401726572832, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1904347059061490, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1904946453600222, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1908023611825542, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1909905159043098, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1911570248218548, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1913878190961824, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1914944273949114, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1920825037155952, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1928171894736472, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1933091026117254, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1936151228875028, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1936410236314242, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1941940709989470, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1942373296002042, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1942916918697514, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1947874252219334, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1957375276616590, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1967633564567384, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1971621534332000, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1973675785149106, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1975423663629644, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1975427192603058, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1979713000694918, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1986831737845546, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1996043074316202, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4178930629624208, guid: 4c8a1f87c4d472844902fd64df709748, type: 3} propertyPath: m_LocalPosition.x value: -0.000000028452 @@ -1132,6 +2208,102 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100002, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100004, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100006, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100010, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100012, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100014, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100016, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100018, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100020, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100022, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100024, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100026, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100028, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100030, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100032, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100034, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100036, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100038, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100040, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100042, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100044, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100046, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 400000, guid: 61a13ef08246a7b4981537dec30dca14, type: 3} propertyPath: m_LocalPosition.x value: 0.599 diff --git a/Assets/Resources/Sheep.prefab b/Assets/Resources/Sheep.prefab index 476ec5ff..2cd93ffe 100644 --- a/Assets/Resources/Sheep.prefab +++ b/Assets/Resources/Sheep.prefab @@ -304,7 +304,7 @@ GameObject: - component: {fileID: 5693858685420995296} - component: {fileID: 4027718266504466823} - component: {fileID: 243018187390000435} - m_Layer: 0 + m_Layer: 9 m_Name: Sheep m_TagString: Animal m_Icon: {fileID: 0} @@ -398,11 +398,11 @@ Rigidbody: m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 + m_UseGravity: 0 + m_IsKinematic: 1 m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 2 + m_Constraints: 112 + m_CollisionDetection: 3 --- !u!114 &5693858685420995296 MonoBehaviour: m_ObjectHideFlags: 0 @@ -546,10 +546,106 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7328939704864981512} m_Modifications: + - target: {fileID: 1007036112840444, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1042024536646942, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1043542472778356, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1140634227810702, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1201373845868040, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1275853961075266, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1325553822100930, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1432284871549628, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1490732334979718, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1540278659450052, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1571266829441314, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1684709711274216, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1685853707491800, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1771945424451082, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1785817965948160, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1792562582498704, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1802484047670878, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1837367723720010, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 1910410527260508, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} propertyPath: m_Name value: SheepB objectReference: {fileID: 0} + - target: {fileID: 1910410527260508, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1913951420985996, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1936032605476168, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1940326162736290, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1942425443599122, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1984682790272980, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4218057573943786, guid: 85919e30b1758094eb565a9294ca6d91, type: 3} propertyPath: m_LocalPosition.x value: -0.000000022921 diff --git a/Assets/Resources/Tractor.prefab b/Assets/Resources/Tractor.prefab index 6505807f..533a1967 100644 --- a/Assets/Resources/Tractor.prefab +++ b/Assets/Resources/Tractor.prefab @@ -304,7 +304,7 @@ GameObject: - component: {fileID: 6516778655448627573} - component: {fileID: 6228415393692850211} - component: {fileID: 4731665851218603753} - m_Layer: 0 + m_Layer: 9 m_Name: Tractor m_TagString: Tractor m_Icon: {fileID: 0} @@ -568,10 +568,70 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3810644166575021066} m_Modifications: + - target: {fileID: 1009773771996296, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1072525423362902, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 1080803338195786, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} propertyPath: m_Name value: car5_interior_4 objectReference: {fileID: 0} + - target: {fileID: 1080803338195786, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1128810734611860, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1150553508739554, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1277557304323990, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1288706901013448, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1310927704331512, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1392421288422830, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1436503689176172, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1463938004302164, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1541475252243484, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1556391424365100, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1742909815321100, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1907647495659824, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4438806387866552, guid: 8dbefd2d969efe24a8582a34131c05cd, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -653,6 +713,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 47018750466635252, guid: 62627f5e2ee3a7947bbd0138d9c227db, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 313372228612340780, guid: 62627f5e2ee3a7947bbd0138d9c227db, type: 3} propertyPath: m_Enabled @@ -733,6 +798,11 @@ PrefabInstance: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 8633629649994691533, guid: 62627f5e2ee3a7947bbd0138d9c227db, + type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 4691467337472230591, guid: 62627f5e2ee3a7947bbd0138d9c227db, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 62627f5e2ee3a7947bbd0138d9c227db, type: 3} diff --git a/Assets/Scenes/2PlayerVS.unity b/Assets/Scenes/2PlayerVS.unity index 0630fee5..0578da8a 100644 --- a/Assets/Scenes/2PlayerVS.unity +++ b/Assets/Scenes/2PlayerVS.unity @@ -212,7 +212,7 @@ GameObject: - component: {fileID: 82841774} - component: {fileID: 82841773} - component: {fileID: 82841772} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -300,20 +300,405 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 471883747142307480, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471883747142307480, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 471883747142307480, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 754606142864094779, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 754606142864094779, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 754606142864094779, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1694697377455170716, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1694697377455170716, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1694697377455170716, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1946731248618036431, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1946731248618036431, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1946731248618036431, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2458296915774370739, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2458296915774370739, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2458296915774370739, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2664256725401981257, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2664256725401981257, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2664256725401981257, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2756875936568352976, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, type: 3} propertyPath: m_AnchoredPosition.y - value: 416 + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 3317428978848277628, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0.005257939 + objectReference: {fileID: 0} + - target: {fileID: 3317428978848277628, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3317428978848277628, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0.735849 + objectReference: {fileID: 0} + - target: {fileID: 3604324138678263791, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3604324138678263791, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3604324138678263791, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3819694275704653407, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: mapSize.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3819694275704653407, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: mapSize.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3819694275704653407, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: gridSize.y + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 3819694275704653407, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: gridSize.x + value: 40 + objectReference: {fileID: 0} + - target: {fileID: 5476066862457469173, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5476066862457469173, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5476066862457469173, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5781809136914593355, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5781809136914593355, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5781809136914593355, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5812015465525987936, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5812015465525987936, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5812015465525987936, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 objectReference: {fileID: 0} - target: {fileID: 5853858758956291893, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, type: 3} propertyPath: m_AnchoredPosition.y - value: 416 + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6013627922115332868, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013627922115332868, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6013627922115332868, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6516621203687801484, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6516621203687801484, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6516621203687801484, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 objectReference: {fileID: 0} - target: {fileID: 6763496041244279658, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, type: 3} propertyPath: m_AnchoredPosition.y - value: 416 + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 6763496041244279659, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496041244279659, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496041244279659, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822138, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 963194227} + - target: {fileID: 6763496042353822138, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_RenderMode + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalScale.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalScale.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_LocalScale.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6763496042353822139, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820677995954035375, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820677995954035375, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6820677995954035375, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7496745384883718930, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7496745384883718930, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7496745384883718930, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7960253196572439848, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7960253196572439848, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7960253196572439848, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7965032561885874787, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7965032561885874787, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7965032561885874787, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8493724014549121709, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8493724014549121709, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8493724014549121709, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 objectReference: {fileID: 0} - target: {fileID: 8865213389816684388, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, type: 3} @@ -375,6 +760,51 @@ PrefabInstance: propertyPath: m_Name value: GlobalObject objectReference: {fileID: 0} + - target: {fileID: 8976516828204580124, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8976516828204580124, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8976516828204580124, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8980453957442146218, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8980453957442146218, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8980453957442146218, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9072182254662397914, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.r + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9072182254662397914, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.g + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9072182254662397914, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, type: 3} --- !u!1001 &161899167 @@ -477,7 +907,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 175 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -861,7 +1291,7 @@ PrefabInstance: - target: {fileID: 369498796468604165, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: m_LocalPosition.z - value: -11.27 + value: -11.5 objectReference: {fileID: 0} - target: {fileID: 369498796468604165, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -941,7 +1371,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 100 + value: 55 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -1071,7 +1501,7 @@ GameObject: - component: {fileID: 615392592} - component: {fileID: 615392591} - component: {fileID: 615392590} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -1146,7 +1576,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 615392589} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -20, y: -1.54, z: 0} + m_LocalPosition: {x: -20, y: -0.28999996, z: 0} m_LocalScale: {x: 41, y: 2, z: 1} m_Children: [] m_Father: {fileID: 1591523255} @@ -1164,7 +1594,7 @@ GameObject: - component: {fileID: 659001718} - component: {fileID: 659001717} - component: {fileID: 659001716} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -1239,7 +1669,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 659001715} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.54, z: 20} + m_LocalPosition: {x: 0, y: -0.28999996, z: 20} m_LocalScale: {x: 40, y: 2, z: 1} m_Children: [] m_Father: {fileID: 1591523255} @@ -1590,7 +2020,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 125 + value: 57 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -1751,7 +2181,7 @@ GameObject: - component: {fileID: 959588045} - component: {fileID: 959588044} - component: {fileID: 959588043} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -1909,7 +2339,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} m_LocalRotation: {x: -0.45805746, y: 0.0018635435, z: -0.0009613745, w: -0.8889202} - m_LocalPosition: {x: -1.6, y: 26.3, z: -23.2} + m_LocalPosition: {x: -0.3, y: 28.8, z: -25} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1927,7 +2357,7 @@ GameObject: - component: {fileID: 974311017} - component: {fileID: 974311016} - component: {fileID: 974311015} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -2002,7 +2432,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 974311014} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: 20, y: -1.54, z: 0} + m_LocalPosition: {x: 20, y: -0.28999996, z: 0} m_LocalScale: {x: 41, y: 2, z: 1} m_Children: [] m_Father: {fileID: 1591523255} @@ -2138,7 +2568,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 125 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -2170,7 +2600,7 @@ GameObject: - component: {fileID: 1091792644} - component: {fileID: 1091792643} - component: {fileID: 1091792642} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -2357,7 +2787,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 100 + value: 50 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -2383,7 +2813,7 @@ GameObject: - component: {fileID: 1206604320} - component: {fileID: 1206604319} - component: {fileID: 1206604318} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -3035,7 +3465,7 @@ GameObject: - component: {fileID: 1483205251} - component: {fileID: 1483205250} - component: {fileID: 1483205249} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -3125,7 +3555,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1591523255} - m_Layer: 0 + m_Layer: 8 m_Name: WallGroup m_TagString: Untagged m_Icon: {fileID: 0} @@ -3256,7 +3686,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 175 + value: 55 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -3400,7 +3830,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 150 + value: 57 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -3420,6 +3850,61 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1673543050} m_PrefabAsset: {fileID: 0} +--- !u!1 &1682530146 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8903905927642603057, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + m_PrefabInstance: {fileID: 98395500} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1682530147 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3819694275704653407, guid: 1c9ab7f1a47c11c44bd6d8ea7a42d07e, + type: 3} + m_PrefabInstance: {fileID: 98395500} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682530146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fbee02debcd415946bd0e5623fef3dec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1682530148 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682530146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} + m_Name: + m_EditorClassIdentifier: + ObservedComponentsFoldoutOpen: 1 + Group: 0 + prefixField: -1 + Synchronization: 3 + OwnershipTransfer: 0 + ObservedComponents: + - {fileID: 1682530149} + viewIdField: 22 + InstantiationId: 0 + isRuntimeInstantiated: 0 +--- !u!114 &1682530149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1682530146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 514870f18ff344c26b6fe1e6a3d12264, type: 3} + m_Name: + m_EditorClassIdentifier: + localScripts: + - {fileID: 1682530147} + localObjects: [] --- !u!1001 &1735855837 PrefabInstance: m_ObjectHideFlags: 0 @@ -3814,7 +4299,7 @@ PrefabInstance: - target: {fileID: 4352712857787830288, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} propertyPath: health - value: 150 + value: 60 objectReference: {fileID: 0} - target: {fileID: 5145679156512276124, guid: 5b1459a6a10f1dc42b894dc7a8b48654, type: 3} @@ -3924,7 +4409,7 @@ GameObject: - component: {fileID: 1882983094} - component: {fileID: 1882983093} - component: {fileID: 1882983092} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} @@ -3999,7 +4484,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1882983091} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -1.54, z: -20} + m_LocalPosition: {x: 0, y: -0.29, z: -20} m_LocalScale: {x: 40, y: 2, z: 1} m_Children: [] m_Father: {fileID: 1591523255} @@ -4017,7 +4502,7 @@ GameObject: - component: {fileID: 1968432706} - component: {fileID: 1968432705} - component: {fileID: 1968432704} - m_Layer: 0 + m_Layer: 8 m_Name: Wall m_TagString: Wall m_Icon: {fileID: 0} diff --git a/Assets/Scripts/AnimalAI/Animal.cs b/Assets/Scripts/AnimalAI/Animal.cs index 01ba72ce..2c41a065 100644 --- a/Assets/Scripts/AnimalAI/Animal.cs +++ b/Assets/Scripts/AnimalAI/Animal.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public enum AnimalType {General, Chicken, Cow, Sheep} +public enum AnimalType { General, Chicken, Cow, Sheep } public class Animal : MonoBehaviour { @@ -10,9 +10,10 @@ public class Animal : MonoBehaviour // Variables related to the feed meter that depletes with time public float feedMeter; - public int feedTickLength; // How mHuch time it takes to deplete meter by one. - // Altered per animal, can also be altered to affect difficulty. - int feedTimer; // Pairs with previous variable, updates with Update() + public float maxFeedMeter; + public float feedTickSeconds; // How much time it takes to deplete meter by one. + // Altered per animal, can also be altered to affect difficulty. + float feedTimer; // Pairs with previous variable, updates with Update() public float weight; // Varies per animal public float speed; // Speed at which the animal runs @@ -22,340 +23,276 @@ public class Animal : MonoBehaviour // If the animal is running free, penNumber // will be set to 0. - int checkFencesTickLength; - int checkFencesTimer; - - int idleTimer; - int idleMaxLength; + int idleTimer; + int idleMaxLength; public Vector2 targetPoint; public Vector3 targetDirection; public Vector2 currentPos; - int stuckTimer; - int stuckTimerTicks; - int stuckTimerTickLength; - int stuckMaxTicks; + float stuckTimer; + float stuckTimerSeconds; public Material normal; public Material highlighted; bool selected = false; - List fences; - public float epsilonDistanceOffset = 0.00001f; public bool isFollowingPlayer = false; public Player playerFollowing; - /******************** + /******************** * MISC. HELPER FUNCTIONS ********************/ - protected bool PositionEquality(Vector2 pos1, Vector2 pos2) - { - return Mathf.Abs(pos1.x - pos2.x) < 0.1f && Mathf.Abs(pos1.y - pos2.y) < 0.1f; - } + protected bool PositionEquality(Vector2 pos1, Vector2 pos2) + { + return Mathf.Abs(pos1.x - pos2.x) < 0.1f && Mathf.Abs(pos1.y - pos2.y) < 0.1f; + } protected Vector2 RotateVectorByAngle(Vector2 v, float angle) { return new Vector2(v.x * Mathf.Cos(angle) - v.y * Mathf.Sin(angle), v.x * Mathf.Sin(angle) + v.y * Mathf.Cos(angle)); } - // Start is called before the first frame update - protected void InitializeBaseVariables() - { - gameObject.GetComponent().material = normal; - globalObj = GameObject.Find("GlobalObject").GetComponent(); - - feedMeter = 50.0f; - - feedTickLength = 150; - checkFencesTickLength = 35; + // Start is called before the first frame update + protected void InitializeBaseVariables() + { + gameObject.GetComponent().material = normal; + globalObj = GameObject.Find("GlobalObject").GetComponent(); - feedTimer = 0; - checkFencesTimer = 0; + maxFeedMeter = 100.0f; + feedMeter = Random.Range(maxFeedMeter / 2, 3 * maxFeedMeter / 4); - stuckTimer = 0; - stuckTimerTicks = 0; - stuckTimerTickLength = 100; - stuckMaxTicks = 3; - targetPoint = Vector2.zero; - targetDirection = Vector3.zero; + feedTimer = 0; + feedTickSeconds = 2; - fences = new List(); + stuckTimer = 0; + stuckTimerSeconds = 5; - Fence[] fenceArray = GameObject.FindObjectsOfType(); - foreach (Fence f in fenceArray) - { - if (f.penNumber == penNumber) - { - fences.Add(f); - } - } - currentPos = Vector2.zero; - } + targetPoint = Vector2.zero; + targetDirection = Vector3.zero; + + currentPos = Vector2.zero; + } - // Update is called once per frame - void Update() - { - // Update feed Meter - feedTimer += 1; - if (feedTimer >= feedTickLength) - { - feedMeter -= 1.0f; + // Update is called once per frame + void Update() + { + // Update feed Meter + feedTimer += Time.deltaTime; + if (feedTimer >= feedTickSeconds) + { + feedMeter -= 1.0f; if (feedMeter < 0f) - { - feedMeter = 0f; - } - feedTimer = 0; - } + { + feedMeter = 0f; + } + feedTimer = 0; + } - //slowly darken the color the lower the feed meter gets + //slowly darken the color the lower the feed meter gets if (!selected) - { - Color curr = gameObject.GetComponent().material.color; - gameObject.GetComponent().material.SetColor("_Color", new Color((feedMeter/50f) * curr.r, (feedMeter / 50f) * curr.g, (feedMeter / 50f) * curr.b, 1.0f)); - } + { + Color curr = gameObject.GetComponent().material.color; + gameObject.GetComponent().material.SetColor("_Color", new Color((feedMeter / 50f) * curr.r, (feedMeter / 50f) * curr.g, (feedMeter / 50f) * curr.b, 1.0f)); + } - if (isFollowingPlayer && playerFollowing != null) - { - float positionY = transform.position.y; - transform.position = playerFollowing.transform.position - (1f + epsilonDistanceOffset) * - playerFollowing.transform.forward * 0.5f * (playerFollowing.transform.localScale.z + transform.localScale.z); - transform.position = new Vector3(transform.position.x, positionY, transform.position.z); - transform.rotation = playerFollowing.transform.rotation; - } - else - { - currentPos.x = gameObject.transform.position.x; - currentPos.y = gameObject.transform.position.z; - - if (PositionEquality(targetPoint, currentPos)) - { - targetDirection = Vector3.zero; - } + if (isFollowingPlayer && playerFollowing != null) + { + float positionY = transform.position.y; + transform.position = playerFollowing.transform.position - (1f + epsilonDistanceOffset) * + playerFollowing.transform.forward * 0.5f * (playerFollowing.transform.localScale.z + transform.localScale.z); + transform.position = new Vector3(transform.position.x, positionY, transform.position.z); + transform.rotation = playerFollowing.transform.rotation; + } + else + { + currentPos.x = gameObject.transform.position.x; + currentPos.y = gameObject.transform.position.z; - if (penNumber > 0) - { - checkFencesTimer += 1; - if (checkFencesTimer >= checkFencesTickLength) - { - checkFencesTimer = 0; - - int fenceIndex = CheckForEscape(); - if (fenceIndex > 0) - { - GetEscapeDirection(fenceIndex); - } - else if (targetDirection == Vector3.zero) - { - //GetIdleDirection();s - } - } - } - else - { - GetWanderDirection(); - } - gameObject.transform.position += targetDirection * speed * Time.deltaTime; - } - } + if (PositionEquality(targetPoint, currentPos)) + { + targetDirection = Vector3.zero; + } - void FixedUpdate() - { - //if (isFollowingPlayer) - //{ - // float positionY = 2; - // transform.position = playerFollowing.transform.position - (1f + epsilonDistanceOffset) * - // playerFollowing.transform.forward * 0.5f * (playerFollowing.transform.localScale.z + transform.localScale.z); - // Debug.Log(positionY); - // transform.position.Set(transform.position.x, positionY, transform.position.z); - // transform.rotation = playerFollowing.transform.rotation; - //} - //else - //{ - // currentPos.x = gameObject.transform.position.x; - // currentPos.y = gameObject.transform.position.z; - - // if (PositionEquality(targetPoint, currentPos)) - // { - // targetDirection = Vector3.zero; - // } - - // if (penNumber > 0) - // { - // checkFencesTimer += 1; - // if (checkFencesTimer >= checkFencesTickLength) - // { - // checkFencesTimer = 0; - - // int fenceIndex = CheckForEscape(); - // if (fenceIndex > 0) - // { - // GetEscapeDirection(fenceIndex); - // } - // else if (targetDirection == Vector3.zero) - // { - // //GetIdleDirection();s - // } - // } - // } - // else - // { - // GetWanderDirection(); - // } - // gameObject.transform.position += targetDirection * speed * Time.deltaTime; - //} - } - - public void SetFollowingPlayer(Player player) - { - isFollowingPlayer = true; - playerFollowing = player; - Debug.Log("Picking up chickies"); - } + if (penNumber > 0) + { + int fenceIndex = CheckForEscape(); + if (fenceIndex >= 0) + { + GetEscapeDirection(fenceIndex); + } + else if (targetDirection == Vector3.zero) + { + //GetIdleDirection(); + } + + } + else + { + GetInsidePenStatus(); + if (penNumber == 0) + { + GetWanderDirection(); + } + gameObject.transform.position += targetDirection * speed * Time.deltaTime; + } + } + } - public void SetStopFollowingPlayer() - { - Debug.Log("in stop following player..."); - Transform pTrans = playerFollowing.transform; - isFollowingPlayer = false; - playerFollowing = null; - Debug.Log("hello?? playerFollowing is " + (playerFollowing == null)); - transform.position = pTrans.position + (1f + epsilonDistanceOffset) * pTrans.forward * - 0.5f * (transform.localScale.z + pTrans.localScale.z); - Debug.Log("placing the chickies"); - } + void FixedUpdate() + { + } - // If the animal collides with something dynamic (a constantly changing - // position, like the player, tractor, and other animals), this should - // redirect it. + public void SetFollowingPlayer(Player player) + { + isFollowingPlayer = true; + playerFollowing = player; + globalObj.RemoveAnimal(penNumber); + penNumber = 0; + gameObject.GetComponent().callUpdatePenNumber(penNumber); + } - void OnCollisionEnter(Collision collision) - { - Collider collider = collision.collider; - if (collider.gameObject.layer == 9) + public void SetStopFollowingPlayer() + { + Debug.Log("in stop following player..."); + if (playerFollowing != null) { - targetDirection = Vector3.zero; + Transform pTrans = playerFollowing.transform; + isFollowingPlayer = false; + playerFollowing = null; + Debug.Log("hello?? playerFollowing is " + (playerFollowing == null)); + transform.position = pTrans.position + (1f + epsilonDistanceOffset) * pTrans.forward * + 0.5f * (transform.localScale.z + pTrans.localScale.z); + Debug.Log("placing the chickies"); } - + GetInsidePenStatus(); } + + // If the animal collides with something dynamic (a constantly changing + // position, like the player, tractor, and other animals), this should + // redirect it. + + void OnCollisionEnter(Collision collision) + { + Collider collider = collision.collider; + if (collider.gameObject.layer == 9) + { + targetDirection = Vector3.zero; + } + + } void OnCollisionStay(Collision collision) { Collider collider = collision.collider; if (collider.gameObject.layer == 8) { - stuckTimer += 1; - if (stuckTimer >= stuckTimerTickLength) + stuckTimer += Time.deltaTime; + if (stuckTimer >= stuckTimerSeconds) { - stuckTimerTicks += 1; - if (stuckTimerTicks >= stuckMaxTicks) - { - targetDirection = Vector3.zero; - } + targetDirection = Vector3.zero; } } } - void OnCollisionExit(Collision collision) - { - Collider collider = collision.collider; - if (collider.gameObject.layer == 8) - { - stuckTimer = 0; - stuckTimerTicks = 0; - } - } + void OnCollisionExit(Collision collision) + { + Collider collider = collision.collider; + if (collider.gameObject.layer == 8) + { + stuckTimer = 0; + } + } public void Highlighted() - { - gameObject.GetComponent().material = highlighted; - selected = true; - } + { + gameObject.GetComponent().material = highlighted; + selected = true; + } - public void Normal() - { - gameObject.GetComponent().material.SetColor("_Color", new Color((feedMeter / 50f) * normal.color.r, + public void Normal() + { + gameObject.GetComponent().material.SetColor("_Color", new Color((feedMeter / 50f) * normal.color.r, (feedMeter / 50f) * normal.color.g, (feedMeter / 50f) * normal.color.b, 1.0f)); - selected = false; - } + selected = false; + } protected bool GetTargetPoint(Vector2 direction) - { - int targetIndex = globalObj.grid_raycastFromPoint(currentPos, direction); - if (targetIndex >= 0) - { - targetPoint = globalObj.grid_getCenterOfCell(targetIndex); - targetDirection = new Vector3(targetPoint.x, 0.0f, targetPoint.y) - - new Vector3(currentPos.x, 0.0f, currentPos.y); - targetDirection = targetDirection.normalized; - return true; + { + int targetIndex = globalObj.grid_raycastFromPoint(currentPos, direction); + if (targetIndex >= 0) + { + targetPoint = globalObj.grid_getCenterOfCell(targetIndex); + targetDirection = new Vector3(targetPoint.x, 0.0f, targetPoint.y) + - new Vector3(currentPos.x, 0.0f, currentPos.y); + targetDirection = targetDirection.normalized; + return true; - } - else - { - return false; - } - } + } + else + { + return false; + } + } // Returns the index of the fence that is broken, // if any. If all fences are intact, return -1; protected int CheckForEscape() - { - for (int i = 0; i < fences.Count; i++) - { - if (fences[i].broken) - { - penNumber = 0; - return i; - } - } - - return -1; - } + { + Pen p = globalObj.GetPlayerPen(penNumber); + int brokenFence = p.GetBrokenFenceIndex(); + return brokenFence; + } protected void GetEscapeDirection(int index) - { - Fence f = fences[index]; + { + Fence f = globalObj.GetPlayerPen(penNumber).fences[index]; - // Calculate the range of angles the animal can move on, - // choose a random one - Vector2[] endpoints = f.GetEndpoints(); - Vector2 u = endpoints[0] - currentPos; - Vector2 v = endpoints[1] - currentPos; + // Calculate the range of angles the animal can move on, + // choose a random one + Vector2[] endpoints = f.GetEndpoints(); + Vector2 u = endpoints[0] - currentPos; + Vector2 v = endpoints[1] - currentPos; - float angleRange = Mathf.Acos(Vector2.Dot(u, v) / (u.magnitude * v.magnitude)); + float angleRange = Mathf.Acos(Vector2.Dot(u, v) / (u.magnitude * v.magnitude)); - float angle = Random.Range(-angleRange / 3, angleRange / 3); + float angle = Random.Range(-angleRange / 4, angleRange / 4); - Vector2 animalToFence = new Vector2(f.gameObject.transform.position.x, - f.gameObject.transform.position.z) - - currentPos; + Vector2 animalToFence = new Vector2(f.gameObject.transform.position.x, + f.gameObject.transform.position.z) + - currentPos; Vector2 targetDir = RotateVectorByAngle(animalToFence, angle); - if (!GetTargetPoint(targetDir)) - { - targetDirection = Vector3.zero; - } + if (!GetTargetPoint(targetDir)) + { + targetDirection = Vector3.zero; + } + else { + globalObj.RemoveAnimal(penNumber); + penNumber = 0; + gameObject.GetComponent().callUpdatePenNumber(penNumber); + } - } + } protected void GetIdleDirection() - { - float wanderX = Random.Range(-1.0f, 1.0f); - float wanderZ = Random.Range(-1.0f, 1.0f); - targetDirection = new Vector3(wanderX, 0.0f, wanderZ); + { + float wanderX = Random.Range(-1.0f, 1.0f); + float wanderZ = Random.Range(-1.0f, 1.0f); + targetDirection = new Vector3(wanderX, 0.0f, wanderZ); - } + } - protected virtual void GetWanderDirection() - { + + protected virtual void GetWanderDirection() + { if (targetDirection == Vector3.zero) { Vector2 currentPos = new Vector2(gameObject.transform.position.x, gameObject.transform.position.z); @@ -370,15 +307,37 @@ protected virtual void GetWanderDirection() targetDirection = Vector3.zero; } } + } + + + // Check if we're inside another player's pen; if so, + // neutralize the target direction and change pen number. + void GetInsidePenStatus() + { + if (!isFollowingPlayer) + { + for (int i = 1; i <= globalObj.numPlayers; i++) + { + Pen p = globalObj.GetPlayerPen(i); + if (p.FencesIntact() && p.InsidePenArea(gameObject)) + { + penNumber = i; + gameObject.GetComponent().callUpdatePenNumber(penNumber); + globalObj.AddAnimal(i); + targetDirection = Vector3.zero; + return; + } + } + } } public void FeedAnimal() { Debug.Log("FEEDING ANIMAL!!"); - gameObject.GetComponent().callFeedAnimal(25f); + gameObject.GetComponent().callFeedAnimal(50f); feedTimer = 0; } - + public virtual AnimalType GetAnimalType() { return AnimalType.General; diff --git a/Assets/Scripts/AnimalAI/Chicken.cs b/Assets/Scripts/AnimalAI/Chicken.cs index c4fddd8b..79e71baf 100644 --- a/Assets/Scripts/AnimalAI/Chicken.cs +++ b/Assets/Scripts/AnimalAI/Chicken.cs @@ -17,9 +17,9 @@ void Start() { InitializeBaseVariables(); - speed = 2.0f; + speed = 2.5f; weight = 1.0f; - detectionRadius = 2.0f; + detectionRadius = 0.5f; } diff --git a/Assets/Scripts/AnimalAI/Cow.cs b/Assets/Scripts/AnimalAI/Cow.cs index 9e0d40af..fc813e62 100644 --- a/Assets/Scripts/AnimalAI/Cow.cs +++ b/Assets/Scripts/AnimalAI/Cow.cs @@ -21,7 +21,7 @@ void Start() speed = 1.0f; weight = 4.0f; - detectionRadius = 8.0f; + detectionRadius = 2.0f; } // Update is called once per frame diff --git a/Assets/Scripts/Fence.cs b/Assets/Scripts/Fence.cs index 7eb5f7de..73967161 100644 --- a/Assets/Scripts/Fence.cs +++ b/Assets/Scripts/Fence.cs @@ -9,15 +9,16 @@ public class Fence : MonoBehaviour public bool broken; public float health; - public int breakTimer; - int breakTickLength; // Controls how fast health deterioriates over time + public float maxHealth; + public float breakTimer; + float breakTickSeconds; // Controls how fast health deterioriates over time public bool vertical; List occupiedCells = new List(); // Saves the indices of the cells // that this fence occupies, which // s calculated in Global's Start(). - public int penNumber; // Corresponds with player number, used for + public int team; // Corresponds with player number, used for // tracking pen fences. Ranges from 1 - 4. public float totalTimeToBreak; public float timeToBreak = 0f; @@ -26,16 +27,16 @@ public class Fence : MonoBehaviour public bool fixing; - public int team; // Start is called before the first frame update void Start() { fixing = false; broken = false; - //health = 100.0f; - breakTimer = 0; - breakTickLength = 300; + maxHealth = 80.0f; + health = Random.Range(maxHealth - maxHealth / 10, maxHealth); + breakTimer = 0; + breakTickSeconds = 1f; totalTimeToBreak = 0.8f; totalTimeToFix = 0.8f; Vector3 rotation = gameObject.transform.eulerAngles; @@ -48,14 +49,14 @@ void Start() // Update is called once per frame void Update() { - breakTimer += 1; - if (breakTimer >= breakTickLength && !broken) + breakTimer += Time.deltaTime; + if (breakTimer >= breakTickSeconds && !broken) { breakTimer = 0; health -= 1.0f; } - if (health <= 0.1f) + if (health <= 0.1f && !broken) { BreakFence(); } @@ -104,3 +105,82 @@ public Vector2[] GetEndpoints() return new Vector2[] { endpoint1, endpoint2 }; } } + +public class Pen { + public int teamNumber; + public List fences; + Vector2 minCorner; // bottom left + Vector2 maxCorner; // top right + + // not enough time to do this, but ideally would + // calculate automatically + public void CalculateCorners() { + Vector2 minValues = Vector2.zero; + Vector2 maxValues = Vector2.zero; + + if (fences.Count == 0) { + return; + } + + + Vector2[] firstFenceEndpts = fences[0].GetEndpoints(); + + minValues = firstFenceEndpts[0]; + maxValues = firstFenceEndpts[1]; + + bool verticalFound = fences[0].vertical; + + for (int i = 1; i < fences.Count; i++) { + if (fences[i].vertical && !verticalFound + || !fences[i].vertical && verticalFound) { + Vector2[] endpts = fences[i].GetEndpoints(); + + if (minValues.x > endpts[0].x) + { + minValues.x = endpts[0].x; + } + + if (maxValues.x < endpts[1].x) + { + maxValues.x = endpts[1].x; + } + + if (minValues.y > endpts[0].y) + { + minValues.y = endpts[0].y; + } + + if (maxValues.y < endpts[1].y) + { + maxValues.y = endpts[1].y; + } + } + } + + minCorner = minValues; + maxCorner = maxValues; + } + + + // Assumes that these corner values have been calculated. + public bool InsidePenArea(GameObject obj) { + Vector3 position3D = obj.transform.position; + Vector2 position2D = new Vector2(position3D.x, position3D.z); + return minCorner.x <= position2D.x && position2D.x <= maxCorner.x + && minCorner.y <= position2D.y && position2D.y <= maxCorner.y; + } + + public bool FencesIntact() { + return GetBrokenFenceIndex() < 0; + } + + // returns -1 if fence is intact; + public int GetBrokenFenceIndex() { + for (int i = 0; i < fences.Count; i++) + { + if (fences[i].broken) return i; + } + + return -1; + } +} diff --git a/Assets/Scripts/Global.cs b/Assets/Scripts/Global.cs index 1bfc2216..f6557314 100644 --- a/Assets/Scripts/Global.cs +++ b/Assets/Scripts/Global.cs @@ -2,42 +2,50 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using Photon.Pun; public class Global : MonoBehaviour { - public AudioClip backgroundAC; - public float backgroundVolume; - AudioSource backgroundAS; + public int numPlayers = 2; - public Image endScreenImage; - public Text[] endScreenFixedText; + public AudioClip backgroundAC; + public float backgroundVolume; + AudioSource backgroundAS; - public float timeLeft = 420f; //7 minute - public Text textTimeLeft; + public Image endScreenImage; + public Text[] endScreenFixedText; - float lastSecond = 420f; - int scoreTickTimer = 0; - int scoreTickLength = 4; // count points every four seconds. - int timeScorePlayer1 = 0; - int timeScorePlayer2 = 0; - public Text textTimeScorePlayer1; - public Text textTimeScorePlayer2; + public float timeLeft = 420f; //7 minute + public Text textTimeLeft; - public Text textControls; + float lastSecond = 420f; + int scoreTickTimer = 0; + int scoreTickLength = 4; // count points every four seconds. + public int timeScorePlayer1 = 0; + public int timeScorePlayer2 = 0; + public Text textTimeScorePlayer1; + public Text textTimeScorePlayer2; - public Text textTimeFinalScorePlayer1; - public Text textTimeFinalScorePlayer2; - public Text textBonusScorePlayer1; - public Text textBonusScorePlayer2; + public int animalsPlayer1; + public int animalsPlayer2; + public Text textAnimalsPlayer1; + public Text textAnimalsPlayer2; - public Text textTotalScorePlayer1; - public Text textTotalScorePlayer2; + public Text textControls; - public Text textWinner; + public Text textTimeFinalScorePlayer1; + public Text textTimeFinalScorePlayer2; + public Text textBonusScorePlayer1; + public Text textBonusScorePlayer2; - bool gameEnd = false; + public Text textTotalScorePlayer1; + public Text textTotalScorePlayer2; - /* Grid is represented by [row][column]. + public Text textWinner; + + bool gameEnd; + + /* Grid is represented by [row][column]. * The cell (0, 0) is represented at the bottom left corner of the map, * with the (width - 1, height -1) cell at the top right corner. * A cell mapGrid[i][j] can be accessed by doing mapGrid[gridSize.x * i + j] @@ -45,81 +53,83 @@ public class Global : MonoBehaviour * This also assumes that the given map size dimensions are perfectly proportional * to the grid's size, such that the cells are square. */ - public Vector2 mapSize; // world space length of environment - public Vector2Int gridSize; // the number of cells along each side of the grid mapped to the environment - public Vector2 mapCenter; // world space position of the map's center - Vector2 mapBottomLeftCorner; // world space position of the bottom left corner of cell (0, 0) - float cellLength; // world space length of the side of one cell - List grid; + public Vector2 mapSize; // world space length of environment + public Vector2Int gridSize; // the number of cells along each side of the grid mapped to the environment + public Vector2 mapCenter; // world space position of the map's center + Vector2 mapBottomLeftCorner; // world space position of the bottom left corner of cell (0, 0) + float cellLength; // world space length of the side of one cell + List grid; + + public List animals; - public List animals; + Pen[] pens; - /* **************** + /* **************** * GRID HELPER FUNCTIONS * ****************/ - // converts cell coordinates (x, y), i.e. (col number, row number) -> cell index # - public int grid_getCellIndexOfCoords(Vector2Int coords) - { - if (coords.x < 0 || coords.y < 0 || coords.x >= gridSize.x || coords.y >= gridSize.y) - { - return -1; - } - return gridSize.x * coords.y + coords.x; - } - - // converts cell index # -> cell coordinates (col, row) - public Vector2Int grid_getCoordsOfCellIndex(int cellIndex) - { - if (cellIndex < 0 || cellIndex >= gridSize.x * gridSize.y) - { - return new Vector2Int(-1, -1); - } - - return new Vector2Int(cellIndex % gridSize.x, cellIndex / gridSize.x); - } - - // Returns the coordinates of the cell at any world space position (within bounds) - public Vector2Int grid_getCellCoordsOfPos(Vector2 pos) - { - // Let local grid space be the space where the position (0, 0) is at - // the bottom left corner of the grid. Then, we use this to reposition - // the given point so we can find the correct cell, no matter where in - // WORLD space the grid / position is. - - Vector2 localPos = new Vector2(pos.x - mapBottomLeftCorner.x, pos.y - mapBottomLeftCorner.y); - Vector2Int cellCoordinates = new Vector2Int((int)(Mathf.Floor(localPos.x / this.cellLength)), - (int)(Mathf.Floor(localPos.y / this.cellLength))); - if (cellCoordinates.x < 0 || cellCoordinates.y < 0 || cellCoordinates.x >= gridSize.x - || cellCoordinates.y >= gridSize.y) - { - return new Vector2Int(-1, -1); - } - - return cellCoordinates; - } - - // Returns the cell # at any position (within bounds) - public int grid_getCellIndexOfPos(Vector2 pos) - { - Vector2Int cellCoordinates = grid_getCellCoordsOfPos(pos); - int cellNumber = grid_getCellIndexOfCoords(cellCoordinates); - if (cellNumber < 0 || cellNumber >= gridSize.x * gridSize.y) - { - return -1; - } - return cellNumber; - } - - // Assumes cellIndex is a valid index - public Vector2 grid_getCenterOfCell(int cellIndex) - { - Vector2Int cellCoords = grid_getCoordsOfCellIndex(cellIndex); - return new Vector2(((float)(cellCoords.x) + 0.5f) * cellLength + mapBottomLeftCorner.x, - ((float)(cellCoords.y) + 0.5f) * cellLength + mapBottomLeftCorner.y); - } - - /* Raycasts from the current cell to the cells covered by the + // converts cell coordinates (x, y), i.e. (col number, row number) -> cell index # + public int grid_getCellIndexOfCoords(Vector2Int coords) + { + if (coords.x < 0 || coords.y < 0 || coords.x >= gridSize.x || coords.y >= gridSize.y) + { + return -1; + } + return gridSize.x * coords.y + coords.x; + } + + // converts cell index # -> cell coordinates (col, row) + public Vector2Int grid_getCoordsOfCellIndex(int cellIndex) + { + if (cellIndex < 0 || cellIndex >= gridSize.x * gridSize.y) + { + return new Vector2Int(-1, -1); + } + + return new Vector2Int(cellIndex % gridSize.x, cellIndex / gridSize.x); + } + + // Returns the coordinates of the cell at any world space position (within bounds) + public Vector2Int grid_getCellCoordsOfPos(Vector2 pos) + { + // Let local grid space be the space where the position (0, 0) is at + // the bottom left corner of the grid. Then, we use this to reposition + // the given point so we can find the correct cell, no matter where in + // WORLD space the grid / position is. + + Vector2 localPos = new Vector2(pos.x - mapBottomLeftCorner.x, pos.y - mapBottomLeftCorner.y); + Vector2Int cellCoordinates = new Vector2Int((int)(Mathf.Floor(localPos.x / this.cellLength)), + (int)(Mathf.Floor(localPos.y / this.cellLength))); + if (cellCoordinates.x < 0 || cellCoordinates.y < 0 || cellCoordinates.x >= gridSize.x + || cellCoordinates.y >= gridSize.y) + { + return new Vector2Int(-1, -1); + } + + return cellCoordinates; + } + + // Returns the cell # at any position (within bounds) + public int grid_getCellIndexOfPos(Vector2 pos) + { + Vector2Int cellCoordinates = grid_getCellCoordsOfPos(pos); + int cellNumber = grid_getCellIndexOfCoords(cellCoordinates); + if (cellNumber < 0 || cellNumber >= gridSize.x * gridSize.y) + { + return -1; + } + return cellNumber; + } + + // Assumes cellIndex is a valid index + public Vector2 grid_getCenterOfCell(int cellIndex) + { + Vector2Int cellCoords = grid_getCoordsOfCellIndex(cellIndex); + return new Vector2(((float)(cellCoords.x) + 0.5f) * cellLength + mapBottomLeftCorner.x, + ((float)(cellCoords.y) + 0.5f) * cellLength + mapBottomLeftCorner.y); + } + + /* Raycasts from the current cell to the cells covered by the * direction, testing for cells set to false (blockages). The animal * will wander off as far as it can in a direction before wandering to * a new one. @@ -127,287 +137,331 @@ public Vector2 grid_getCenterOfCell(int cellIndex) * CURRENT IMPLEMENTATION: Naive */ - public int grid_raycastFromPoint(Vector2 origin, Vector2 direction) - { - Vector2 dir = direction.normalized; - float stepSize = cellLength; - float tMax = 2 * mapSize.x / 3; - - Vector2 farthestPoint = Vector2.zero; - int farthestIndex = -1; - - for (float t = 0.0f; t < tMax; t += stepSize) - { - Vector2 p = origin + t * dir; - int index = grid_getCellIndexOfPos(p); - if (index < 0) - { - break; - } - - if (grid[index]) - { - farthestPoint = p; - farthestIndex = index; - } - else break; - } - - if (farthestIndex < 0 || grid_getCellIndexOfPos(origin) == farthestIndex) - { - return -1; - } - - return farthestIndex; - } - - public void grid_setCellsTrue(int[] indices) - { - foreach (int i in indices) - { - if (i >= 0) - { - grid[i] = true; - } - } - } - - public void grid_setCellsFalse(int[] indices) - { - foreach (int i in indices) - { - if (i >= 0) - { - grid[i] = false; - } - } - } - - // Considers a long rectangular object with its orientation - // and calculates its world-space endpoints. - Vector2[] GetEndpointsRectangle(GameObject obj, bool vertical) - { - // Assumes that the fence is either vertically or horizontally aligned - // with the grid. - float length = obj.gameObject.transform.localScale.x; - - Vector2 center = new Vector2(obj.gameObject.transform.position.x, - obj.gameObject.transform.position.z); - - Vector2 endpoint1 = Vector2.zero; - Vector2 endpoint2 = Vector2.zero; - - if (vertical) - { - endpoint1 = center - new Vector2(0.0f, length / 2.0f); - endpoint2 = center + new Vector2(0.0f, length / 2.0f); - } - else - { - endpoint1 = center - new Vector2(length / 2.0f, 0.0f); - endpoint2 = center + new Vector2(length / 2.0f, 0.0f); - } - - return new Vector2[] { endpoint1, endpoint2 }; - } - - List GetIndicesRectangle(GameObject obj) - { - - Vector3 rotation = obj.gameObject.transform.eulerAngles; - bool vertical = Mathf.Approximately(rotation.y, 90.0f) || - Mathf.Approximately(rotation.y, 270.0f); - - Vector2[] endpt = GetEndpointsRectangle(obj.gameObject, vertical); - - Vector2Int endpCoords1 = grid_getCellCoordsOfPos(endpt[0]); - Vector2Int endpCoords2 = grid_getCellCoordsOfPos(endpt[1]); - - List indices = new List(); - - if (vertical) - { - for (int z = endpCoords1.y; z <= endpCoords2.y; z++) - { - indices.Add(grid_getCellIndexOfCoords(new Vector2Int(endpCoords1.x, z))); - } - } - else - { - for (int x = endpCoords1.x; x <= endpCoords2.x; x++) - { - indices.Add(grid_getCellIndexOfCoords(new Vector2Int(x, endpCoords1.y))); - } - } - - return indices; - } - - - // Considers a square object and calculates the world-space - // positions of its bottom left and top right corners. - Vector2[] GetCornersSquare(GameObject obj) - { - float xLength = obj.gameObject.transform.localScale.x; - float zLength = obj.gameObject.transform.localScale.z; - - Vector2 center = new Vector2(obj.gameObject.transform.position.x, - obj.gameObject.transform.position.z); - - Vector2 cornerBottomLeft = center - new Vector2(xLength / 2.0f, zLength / 2.0f); - Vector2 cornerTopRight = center + new Vector2(xLength / 2.0f, zLength / 2.0f); - - return new Vector2[] { cornerBottomLeft, cornerTopRight }; - } - - List GetIndicesSquare(GameObject obj) - { - Vector2[] corners = GetCornersSquare(obj); - - List indices = new List(); - - Vector2Int cornerCoords1 = grid_getCellCoordsOfPos(corners[0]); - Vector2Int cornerCoords2 = grid_getCellCoordsOfPos(corners[1]); - - for (int x = cornerCoords1.x; x <= cornerCoords2.x; x++) - { - for (int z = cornerCoords1.y; z <= cornerCoords2.y; z++) - { - indices.Add(grid_getCellIndexOfCoords(new Vector2Int(x, z))); - } - } - - return indices; - } - - void SetupSound() - { - backgroundAS = gameObject.AddComponent(); - backgroundAS.clip = backgroundAC; - backgroundAS.volume = backgroundVolume; - backgroundAS.loop = true; - backgroundAS.Play(); - } - // Start is called before the first frame update - void Start() - { - SetupSound(); - grid = new List(gridSize.x * gridSize.y); - for (int i = 0; i < gridSize.x * gridSize.y; i++) - { - grid.Add(true); - } - - cellLength = mapSize.x / (float)gridSize.x; - mapBottomLeftCorner = mapCenter - 0.5f * mapSize; - - // Find all static environment elements and map them on the grid - - MapFences(); - MapWalls(); - MapHaystacks(); - MapBuildings(); - - animals = new List(); - - Animal[] animalArray = GameObject.FindObjectsOfType(); - foreach (Animal a in animalArray) - { - animals.Add(a); - } - - ToggleGameText(); - } - - void MapFences() - { - Fence[] fences = GameObject.FindObjectsOfType(); - foreach (Fence f in fences) - { - List indices = GetIndicesRectangle(f.gameObject); - f.SetOccupiedCells(indices); - grid_setCellsFalse(indices.ToArray()); - } - } - - void MapWalls() - { - GameObject[] walls = GameObject.FindGameObjectsWithTag("Wall"); - foreach (GameObject w in walls) - { - List indices = GetIndicesRectangle(w); - grid_setCellsFalse(indices.ToArray()); - } - } - - void MapHaystacks() - { - Haystack[] haystacks = GameObject.FindObjectsOfType(); - foreach (Haystack h in haystacks) - { - List indices = GetIndicesSquare(h.gameObject); - grid_setCellsFalse(indices.ToArray()); - } - } - - void MapBuildings() - { - Barn[] barns = GameObject.FindObjectsOfType(); - foreach (Barn b in barns) - { - List indices = GetIndicesSquare(b.gameObject); - grid_setCellsFalse(indices.ToArray()); - } - - FuelStation[] stations = GameObject.FindObjectsOfType(); - foreach (FuelStation fs in stations) - { - List indices = GetIndicesSquare(fs.gameObject); - grid_setCellsFalse(indices.ToArray()); - } - } - - // Update is called once per frame - void Update() - { - UpdateTimer(); - UpdateScores(); - } - - // Return false if out of time - private void UpdateTimer() - { - timeLeft -= Time.deltaTime; - - if (timeLeft <= 0) - { - textTimeLeft.text = "00:00"; - if (!gameEnd) - { - EndGame(); - } - } - - float min = Mathf.Floor(timeLeft / 60); - float sec = Mathf.RoundToInt(timeLeft % 60); - - string minStr = (min < 10 ? "0" : "") + min.ToString(); - string secStr = (sec < 10 ? "0" : "") + Mathf.RoundToInt(sec).ToString(); - textTimeLeft.text = minStr + ":" + secStr; - } - - private void UpdateScores() - { - if (lastSecond - timeLeft >= 1.0f) - { - lastSecond = timeLeft; - scoreTickTimer += 1; - } - - if (scoreTickTimer == scoreTickLength) - { - - scoreTickTimer = 0; + public int grid_raycastFromPoint(Vector2 origin, Vector2 direction) + { + Vector2 dir = direction.normalized; + float stepSize = cellLength; + float tMax = 2 * mapSize.x / 3; + + Vector2 farthestPoint = Vector2.zero; + int farthestIndex = -1; + + for (float t = 0.0f; t < tMax; t += stepSize) + { + Vector2 p = origin + t * dir; + int index = grid_getCellIndexOfPos(p); + if (index < 0) + { + break; + } + + if (grid[index]) + { + farthestPoint = p; + farthestIndex = index; + } + else + { + Debug.Log(grid_getCoordsOfCellIndex(index)); + Debug.Log("ok thats fair"); + break; + } + } + + if (farthestIndex < 0 || grid_getCellIndexOfPos(origin) == farthestIndex) + { + return -1; + } + + return farthestIndex; + } + + public void grid_setCellsTrue(int[] indices) + { + foreach (int i in indices) + { + if (i >= 0) + { + grid[i] = true; + Debug.Log(grid_getCoordsOfCellIndex(i)); + } + } + } + + int[] indices = new int[] { 105, 145, 185, 225, 265, 305, 345 }; + + public void grid_setCellsFalse(int[] indices) + { + foreach (int i in indices) + { + if (i >= 0) + { + grid[i] = false; + } + } + } + + // Considers a long rectangular object with its orientation + // and calculates its world-space endpoints. + Vector2[] GetEndpointsRectangle(GameObject obj, bool vertical) + { + // Assumes that the fence is either vertically or horizontally aligned + // with the grid. + float length = obj.gameObject.transform.localScale.x; + + Vector2 center = new Vector2(obj.gameObject.transform.position.x, + obj.gameObject.transform.position.z); + + Vector2 endpoint1 = Vector2.zero; + Vector2 endpoint2 = Vector2.zero; + + if (vertical) + { + endpoint1 = center - new Vector2(0.0f, length / 2.0f); + endpoint2 = center + new Vector2(0.0f, length / 2.0f); + } + else + { + endpoint1 = center - new Vector2(length / 2.0f, 0.0f); + endpoint2 = center + new Vector2(length / 2.0f, 0.0f); + } + + return new Vector2[] { endpoint1, endpoint2 }; + } + + List GetIndicesRectangle(GameObject obj) + { + + Vector3 rotation = obj.gameObject.transform.eulerAngles; + bool vertical = Mathf.Approximately(rotation.y, 90.0f) || + Mathf.Approximately(rotation.y, 270.0f); + + Vector2[] endpt = GetEndpointsRectangle(obj.gameObject, vertical); + + Vector2Int endpCoords1 = grid_getCellCoordsOfPos(endpt[0]); + Vector2Int endpCoords2 = grid_getCellCoordsOfPos(endpt[1]); + + List indices = new List(); + + if (vertical) + { + for (int z = endpCoords1.y; z <= endpCoords2.y; z++) + { + indices.Add(grid_getCellIndexOfCoords(new Vector2Int(endpCoords1.x, z))); + } + } + else + { + for (int x = endpCoords1.x; x <= endpCoords2.x; x++) + { + indices.Add(grid_getCellIndexOfCoords(new Vector2Int(x, endpCoords1.y))); + } + } + + return indices; + } + + + // Considers a square object and calculates the world-space + // positions of its bottom left and top right corners. + Vector2[] GetCornersSquare(GameObject obj) + { + float xLength = obj.gameObject.transform.localScale.x; + float zLength = obj.gameObject.transform.localScale.z; + + Vector2 center = new Vector2(obj.gameObject.transform.position.x, + obj.gameObject.transform.position.z); + + Vector2 cornerBottomLeft = center - new Vector2(xLength / 2.0f, zLength / 2.0f); + Vector2 cornerTopRight = center + new Vector2(xLength / 2.0f, zLength / 2.0f); + + return new Vector2[] { cornerBottomLeft, cornerTopRight }; + } + + List GetIndicesSquare(GameObject obj) + { + Vector2[] corners = GetCornersSquare(obj); + + List indices = new List(); + + Vector2Int cornerCoords1 = grid_getCellCoordsOfPos(corners[0]); + Vector2Int cornerCoords2 = grid_getCellCoordsOfPos(corners[1]); + + for (int x = cornerCoords1.x; x <= cornerCoords2.x; x++) + { + for (int z = cornerCoords1.y; z <= cornerCoords2.y; z++) + { + indices.Add(grid_getCellIndexOfCoords(new Vector2Int(x, z))); + } + } + + return indices; + } + + void SetupSound() + { + backgroundAS = gameObject.AddComponent(); + backgroundAS.clip = backgroundAC; + backgroundAS.volume = backgroundVolume; + backgroundAS.loop = true; + backgroundAS.Play(); + } + + public Pen GetPlayerPen(int number) + { + return pens[number - 1]; + } + + // Start is called before the first frame update + void Start() + { + gameEnd = false; + SetupSound(); + + grid = new List(gridSize.x * gridSize.y); + for (int i = 0; i < gridSize.x * gridSize.y; i++) + { + grid.Add(true); + } + + cellLength = mapSize.x / (float)gridSize.x; + mapBottomLeftCorner = mapCenter - 0.5f * mapSize; + + pens = new Pen[] { new Pen(), new Pen() }; + + pens[0].teamNumber = 1; + pens[0].fences = new List(); + pens[1].teamNumber = 2; + pens[1].fences = new List(); + + // Find all static environment elements and map them on the grid + + MapFencesAndPens(); + MapWalls(); + MapBuildings(); + + animals = new List(); + animalsPlayer1 = 0; + animalsPlayer2 = 0; + Animal[] animalArray = GameObject.FindObjectsOfType(); + foreach (Animal a in animalArray) + { + animals.Add(a); + switch (a.penNumber) + { + case 1: + animalsPlayer1 += 1; + break; + case 2: + animalsPlayer2 += 1; + break; + } + } + + textAnimalsPlayer1.text = "Animals: " + animalsPlayer1; + textAnimalsPlayer2.text = "Animals: " + animalsPlayer2; + + ToggleGameText(); + } + + void MapFencesAndPens() + { + Fence[] fences = GameObject.FindObjectsOfType(); + foreach (Fence f in fences) + { + List indices = GetIndicesRectangle(f.gameObject); + f.SetOccupiedCells(indices); + grid_setCellsFalse(indices.ToArray()); + GetPlayerPen(f.team).fences.Add(f); + } + + foreach (Pen p in pens) + { + p.CalculateCorners(); + } + + } + + void MapWalls() + { + GameObject[] walls = GameObject.FindGameObjectsWithTag("Wall"); + foreach (GameObject w in walls) + { + List indices = GetIndicesRectangle(w); + grid_setCellsFalse(indices.ToArray()); + } + } + + void MapHaystacks() + { + Haystack[] haystacks = GameObject.FindObjectsOfType(); + foreach (Haystack h in haystacks) + { + List indices = GetIndicesSquare(h.gameObject); + grid_setCellsFalse(indices.ToArray()); + } + } + + void MapBuildings() + { + Barn[] barns = GameObject.FindObjectsOfType(); + foreach (Barn b in barns) + { + List indices = GetIndicesSquare(b.gameObject); + grid_setCellsFalse(indices.ToArray()); + } + + FuelStation[] stations = GameObject.FindObjectsOfType(); + foreach (FuelStation fs in stations) + { + List indices = GetIndicesSquare(fs.gameObject); + grid_setCellsFalse(indices.ToArray()); + } + } + + // Update is called once per frame + void Update() + { + //UpdateTimer(); + UpdateScores(); + } + + // Return false if out of time + private void UpdateTimer() + { + timeLeft -= Time.deltaTime; + + if (timeLeft <= 0) + { + textTimeLeft.text = "00:00"; + if (!gameEnd) + { + EndGame(); + } + } + + float min = Mathf.Floor(timeLeft / 60); + float sec = Mathf.RoundToInt(timeLeft % 60); + + string minStr = (min < 10 ? "0" : "") + min.ToString(); + string secStr = (sec < 10 ? "0" : "") + Mathf.RoundToInt(sec).ToString(); + textTimeLeft.text = minStr + ":" + secStr; + } + + private void UpdateScores() + { + if (lastSecond - timeLeft >= 1.0f) + { + lastSecond = timeLeft; + scoreTickTimer += 1; + } + + if (scoreTickTimer == scoreTickLength) + { + + scoreTickTimer = 0; + int hungryAnimalsP1 = 0; + int hungryAnimalsP2 = 0; for (int i = 0; i < animals.Count; i++) { @@ -437,7 +491,18 @@ private void UpdateScores() { points = 5; } - + else if (feedMeter <= 0.1f){ + switch (playerNumber) + { + case 1: + hungryAnimalsP1 += 1; + break; + case 2: + hungryAnimalsP2 += 1; + break; + } + } + // Determine where score goes switch (playerNumber) { @@ -449,130 +514,199 @@ private void UpdateScores() timeScorePlayer2 += points; textTimeScorePlayer2.text = "Player 2 Score: " + timeScorePlayer2; break; - } - } - } - } - - private void EndGame() - { - gameEnd = true; - ToggleEndText(); - CalculateScores(); - } - - private void CalculateScores() - { - int timeFinalScore1 = timeScorePlayer1; - int timeFinalScore2 = timeScorePlayer2; - textTimeFinalScorePlayer1.text = timeFinalScore1.ToString(); - textTimeFinalScorePlayer2.text = timeFinalScore2.ToString(); - - int bonusScorePlayer1 = 0; - int bonusScorePlayer2 = 0; - - // calculates bonus score - for (int i = 0; i < animals.Count; i++) - { - int playerNumber = animals[i].penNumber; - float feedMeter = animals[i].feedMeter; - - int points = 0; - - // Determine score - if (feedMeter >= 90f) - { - points = 60; + } } - else if (feedMeter >= 70f) - { - points = 40; - } - else if (feedMeter >= 50f) - { - points = 20; + + if (hungryAnimalsP1 == animalsPlayer1) { + timeScorePlayer1 -= 3; + textTimeScorePlayer1.text = "Player 1 Score: " + timeScorePlayer1; } - // Determine where score goes - switch (playerNumber) + if (hungryAnimalsP2 == animalsPlayer2) { - case 1: - bonusScorePlayer1 += points; - break; - case 2: - bonusScorePlayer2 += points; - break; + timeScorePlayer2 -= 3; + textTimeScorePlayer2.text = "Player 2 Score: " + timeScorePlayer2; } - } - - textBonusScorePlayer1.text = bonusScorePlayer1.ToString(); - textBonusScorePlayer2.text = bonusScorePlayer2.ToString(); - - int finalScorePlayer1 = timeFinalScore1 + bonusScorePlayer1; - int finalScorePlayer2 = timeFinalScore2 + bonusScorePlayer2; - - textTotalScorePlayer1.text = finalScorePlayer1.ToString(); - textTotalScorePlayer2.text = finalScorePlayer2.ToString(); - - if (finalScorePlayer1 > finalScorePlayer2) - { - textWinner.text = "Player 1 wins!"; - } - else if (finalScorePlayer2 > finalScorePlayer1) - { - textWinner.text = "Player 2 wins!"; - } - else - { - textWinner.text = "It's a tie!"; - } - - } - - private void ToggleGameText() - { - textTimeScorePlayer1.enabled = true; - textTimeScorePlayer2.enabled = true; - textTimeLeft.enabled = true; - textControls.enabled = true; - - foreach (Text t in endScreenFixedText) - { - t.enabled = false; - } - - textTimeFinalScorePlayer1.enabled = false; - textTimeFinalScorePlayer2.enabled = false; - textBonusScorePlayer1.enabled = false; - textBonusScorePlayer2.enabled = false; - textTotalScorePlayer1.enabled = false; - textTotalScorePlayer2.enabled = false; - textWinner.enabled = false; - - endScreenImage.enabled = false; - } - - private void ToggleEndText() - { - textTimeScorePlayer1.enabled = false; - textTimeScorePlayer2.enabled = false; - textTimeLeft.enabled = false; - textControls.enabled = false; - - foreach (Text t in endScreenFixedText) - { - t.enabled = true; - } - - textTimeFinalScorePlayer1.enabled = true; - textTimeFinalScorePlayer2.enabled = true; - textBonusScorePlayer1.enabled = true; - textBonusScorePlayer2.enabled = true; - textTotalScorePlayer1.enabled = true; - textTotalScorePlayer2.enabled = true; - textWinner.enabled = true; - - endScreenImage.enabled = true; - } -} + } + } + + private void EndGame() + { + gameEnd = true; + ToggleEndText(); + CalculateScores(); + } + + private void CalculateScores() + { + int timeFinalScore1 = timeScorePlayer1; + int timeFinalScore2 = timeScorePlayer2; + textTimeFinalScorePlayer1.text = timeFinalScore1.ToString(); + textTimeFinalScorePlayer2.text = timeFinalScore2.ToString(); + + int bonusScorePlayer1 = 0; + int bonusScorePlayer2 = 0; + + // calculates bonus score + for (int i = 0; i < animals.Count; i++) + { + int playerNumber = animals[i].penNumber; + float feedMeter = animals[i].feedMeter; + + int points = 0; + + // Determine score + if (feedMeter >= 90f) + { + points = 60; + } + else if (feedMeter >= 70f) + { + points = 40; + } + else if (feedMeter >= 50f) + { + points = 20; + } + + // Determine where score goes + switch (playerNumber) + { + case 1: + bonusScorePlayer1 += points; + break; + case 2: + bonusScorePlayer2 += points; + break; + } + } + + textBonusScorePlayer1.text = bonusScorePlayer1.ToString(); + textBonusScorePlayer2.text = bonusScorePlayer2.ToString(); + + int finalScorePlayer1 = timeFinalScore1 + bonusScorePlayer1; + int finalScorePlayer2 = timeFinalScore2 + bonusScorePlayer2; + + textTotalScorePlayer1.text = finalScorePlayer1.ToString(); + textTotalScorePlayer2.text = finalScorePlayer2.ToString(); + + if (finalScorePlayer1 > finalScorePlayer2) + { + textWinner.text = "Player 1 wins!"; + } + else if (finalScorePlayer2 > finalScorePlayer1) + { + textWinner.text = "Player 2 wins!"; + } + else + { + textWinner.text = "It's a tie!"; + } + + } + + private void ToggleGameText() + { + textTimeScorePlayer1.enabled = true; + textTimeScorePlayer2.enabled = true; + textAnimalsPlayer1.enabled = true; + textAnimalsPlayer2.enabled = true; + textTimeLeft.enabled = true; + textControls.enabled = true; + + foreach (Text t in endScreenFixedText) + { + t.enabled = false; + } + + textTimeFinalScorePlayer1.enabled = false; + textTimeFinalScorePlayer2.enabled = false; + textBonusScorePlayer1.enabled = false; + textBonusScorePlayer2.enabled = false; + textTotalScorePlayer1.enabled = false; + textTotalScorePlayer2.enabled = false; + textWinner.enabled = false; + + endScreenImage.enabled = false; + } + + private void ToggleEndText() + { + textTimeScorePlayer1.enabled = false; + textTimeScorePlayer2.enabled = false; + textAnimalsPlayer1.enabled = false; + textAnimalsPlayer2.enabled = false; + textTimeLeft.enabled = false; + textControls.enabled = false; + + foreach (Text t in endScreenFixedText) + { + t.enabled = true; + } + + textTimeFinalScorePlayer1.enabled = true; + textTimeFinalScorePlayer2.enabled = true; + textBonusScorePlayer1.enabled = true; + textBonusScorePlayer2.enabled = true; + textTotalScorePlayer1.enabled = true; + textTotalScorePlayer2.enabled = true; + textWinner.enabled = true; + + endScreenImage.enabled = true; + } + + public void RemoveAnimal(int player) + { + switch (player) + { + case 1: + animalsPlayer1 -= 1; + break; + case 2: + animalsPlayer2 -= 1; + break; + } + } + + public void AddAnimal(int player) + { + switch (player) + { + case 1: + animalsPlayer1 += 1; + break; + case 2: + animalsPlayer2 += 1; + break; + } + } + + public void updateText() + { + textTimeScorePlayer1.text = "Player 1 Score: " + timeScorePlayer1; + textTimeScorePlayer2.text = "Player 2 Score: " + timeScorePlayer2; + textAnimalsPlayer1.text = "Animals: " + animalsPlayer1; + textAnimalsPlayer2.text = "Animals: " + animalsPlayer2; + textAnimalsPlayer1.text = "Animals: " + animalsPlayer1; + textAnimalsPlayer2.text = "Animals: " + animalsPlayer2; + + timeLeft -= Time.deltaTime; + + if (timeLeft <= 0) + { + textTimeLeft.text = "00:00"; + if (!gameEnd) + { + EndGame(); + } + } + + float min = Mathf.Floor(timeLeft / 60); + float sec = Mathf.RoundToInt(timeLeft % 60); + + string minStr = (min < 10 ? "0" : "") + min.ToString(); + string secStr = (sec < 10 ? "0" : "") + Mathf.RoundToInt(sec).ToString(); + textTimeLeft.text = minStr + ":" + secStr; + } +} diff --git a/Assets/Scripts/PUN2_AnimalSync.cs b/Assets/Scripts/PUN2_AnimalSync.cs index bdaff075..7617a760 100644 --- a/Assets/Scripts/PUN2_AnimalSync.cs +++ b/Assets/Scripts/PUN2_AnimalSync.cs @@ -89,4 +89,16 @@ public void feedAnimal(int viewID, float amount) target.gameObject.GetComponent().feedMeter += amount; feedMeter += amount; } + + public void callUpdatePenNumber(int number) + { + photonView.RPC("updatePenNumber", RpcTarget.AllViaServer, photonView.ViewID, number); + } + + [PunRPC] + public void updatePenNumber(int viewID, int number) + { + PhotonView target = PhotonView.Find(viewID); + target.gameObject.GetComponent().penNumber = number; + } } diff --git a/Assets/Scripts/PUN2_FenceSync.cs b/Assets/Scripts/PUN2_FenceSync.cs index f74ede5b..5af9b68d 100644 --- a/Assets/Scripts/PUN2_FenceSync.cs +++ b/Assets/Scripts/PUN2_FenceSync.cs @@ -22,6 +22,10 @@ public class PUN2_FenceSync : MonoBehaviourPun, IPunObservable public bool beingFixed = false; + public GameObject healthyFence; + public GameObject tatteredFence; + public GameObject brokenFence; + // Start is called before the first frame update void Start() { @@ -75,6 +79,25 @@ void Update() { breakMeter.SetActive(false); } + + Fence fence = (Fence)localScripts[0]; + if (fence.health <= 0f) + { + healthyFence.SetActive(false); + tatteredFence.SetActive(false); + brokenFence.SetActive(true); + } + else if (fence.health < fence.maxHealth / 5) + { + healthyFence.SetActive(false); + tatteredFence.SetActive(true); + brokenFence.SetActive(false); + } else + { + healthyFence.SetActive(true); + tatteredFence.SetActive(false); + brokenFence.SetActive(false); + } } public void updateStats(float timeToBreak, bool beingBroken) @@ -123,7 +146,7 @@ void BreakFence(int viewID) broken = true; Fence f = target.gameObject.GetComponent(); f.broken = true; - f.health = 1; + f.health = 0; target.gameObject.GetComponent().beingBroken = false; } @@ -139,9 +162,9 @@ void FixFence(int viewID, bool wasBroken) PhotonView target = PhotonView.Find(viewID); broken = false; Fence f = target.gameObject.GetComponent(); - f.broken = false; - f.health = 100.0f; f.breakTimer = 0; + f.health = f.maxHealth; + f.broken = false; if (wasBroken) { diff --git a/Assets/Scripts/PUN2_GlobalSync.cs b/Assets/Scripts/PUN2_GlobalSync.cs new file mode 100644 index 00000000..0ab73fa2 --- /dev/null +++ b/Assets/Scripts/PUN2_GlobalSync.cs @@ -0,0 +1,51 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using Photon.Pun; + +public class PUN2_GlobalSync : MonoBehaviourPun, IPunObservable +{ + + //List of the scripts that should only be active for the local player (ex. PlayerController, MouseLook etc.) + public MonoBehaviour[] localScripts; + //List of the GameObjects that should only be active for the local player (ex. Camera, AudioListener etc.) + public GameObject[] localObjects; + + // Start is called before the first frame update + void Start() + { + } + + + //PHOTON FUNCTIONS + public void OnPhotonSerializeView(PhotonStream stream, PhotonMessageInfo info) + { + } + + // Update is called once per frame + void Update() + { + if (photonView.IsMine) + { + Global localscript = (Global)localScripts[0]; + photonView.RPC("updateGameState", RpcTarget.Others, photonView.ViewID, localscript.animalsPlayer1, + localscript.animalsPlayer2, localscript.timeScorePlayer1, localscript.timeScorePlayer2, localscript.timeLeft); + localscript.updateText(); + } + + } + + [PunRPC] + public void updateGameState(int viewID, int player1animal, int player2animal, int player1score, int player2score, float timeLeft) + { + PhotonView target = PhotonView.Find(viewID); + Global localscript = target.gameObject.GetComponent(); + localscript.animalsPlayer1 = player1animal; + localscript.animalsPlayer2 = player2animal; + localscript.timeScorePlayer1 = player1score; + localscript.timeScorePlayer2 = player2score; + localscript.timeLeft = timeLeft; + + localscript.updateText(); + } +} diff --git a/Assets/Scripts/PUN2_GlobalSync.cs.meta b/Assets/Scripts/PUN2_GlobalSync.cs.meta new file mode 100644 index 00000000..d7097cd7 --- /dev/null +++ b/Assets/Scripts/PUN2_GlobalSync.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 514870f18ff344c26b6fe1e6a3d12264 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index efcb80af..d4009d6b 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -585,4 +585,17 @@ private void OnTriggerExit(Collider other) other.gameObject.GetComponent().Normal(); } } + + private void OnCollisionEnter(Collision collision) + { + + if (collision.gameObject.tag == "Fence") + { + if (collision.gameObject.GetComponent().team == team) + { + Physics.IgnoreCollision(collision.collider, gameObject.GetComponent()); + } + } + + } } diff --git a/Assets/Sounds/soundBackground.mp3.sfk b/Assets/Sounds/soundBackground.mp3.sfk new file mode 100644 index 00000000..f1a9b127 Binary files /dev/null and b/Assets/Sounds/soundBackground.mp3.sfk differ diff --git a/Assets/Sounds/soundBackground.mp3.sfk.meta b/Assets/Sounds/soundBackground.mp3.sfk.meta new file mode 100644 index 00000000..bdbe0d3a --- /dev/null +++ b/Assets/Sounds/soundBackground.mp3.sfk.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 675c360496ac66840a12930ac64e1d34 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/haystacks/UnityPlayer.dll b/Build.zip similarity index 74% rename from haystacks/UnityPlayer.dll rename to Build.zip index eefe8f1f..3f2dfef9 100644 Binary files a/haystacks/UnityPlayer.dll and b/Build.zip differ diff --git a/HaystackHoarder.sln b/HaystackHoarder.sln index eeeb0242..fa7c237f 100644 --- a/HaystackHoarder.sln +++ b/HaystackHoarder.sln @@ -1,6 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotonUnityNetworking.Demos", "PhotonUnityNetworking.Demos.csproj", "{A8BD6E1D-B563-B841-0379-62403142911F}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotonUnityNetworking.Utilities", "PhotonUnityNetworking.Utilities.csproj", "{53B535DB-58F2-5DDF-29AA-5D633D41E4FA}" diff --git a/Library/APIUpdater/project-dependencies.graph b/Library/APIUpdater/project-dependencies.graph index f01a18ea..91af0c9f 100644 Binary files a/Library/APIUpdater/project-dependencies.graph and b/Library/APIUpdater/project-dependencies.graph differ diff --git a/Library/ArtifactDB b/Library/ArtifactDB index 3ded4646..b1826493 100755 Binary files a/Library/ArtifactDB and b/Library/ArtifactDB differ diff --git a/Library/ArtifactDB-lock b/Library/ArtifactDB-lock index cdfdc903..e842cb40 100755 Binary files a/Library/ArtifactDB-lock and b/Library/ArtifactDB-lock differ diff --git a/Library/CurrentLayout-default.dwlt b/Library/CurrentLayout-default.dwlt index ddcb07d2..5f5ecf98 100644 --- a/Library/CurrentLayout-default.dwlt +++ b/Library/CurrentLayout-default.dwlt @@ -14,17 +14,43 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 27 - y: 45 - width: 1253 - height: 755 + x: 21.333334 + y: 50 + width: 1251.3334 + height: 622.6667 m_ShowMode: 4 m_Title: - m_RootView: {fileID: 2} - m_MinSize: {x: 875, y: 371} + m_RootView: {fileID: 3} + m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 1 + m_Maximized: 0 --- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 960 + y: 0 + width: 292 + height: 573 + m_MinSize: {x: 277, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 12} + m_Panes: + - {fileID: 12} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -37,18 +63,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 3} - - {fileID: 5} - {fileID: 4} + - {fileID: 6} + - {fileID: 5} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1253 - height: 755 + width: 1252 + height: 623 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &3 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -65,12 +91,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1253 + width: 1252 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &4 +--- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -86,12 +112,12 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 735 - width: 1253 + y: 603 + width: 1252 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &5 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -104,19 +130,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 6} - - {fileID: 11} + - {fileID: 7} + - {fileID: 2} m_Position: serializedVersion: 2 x: 0 y: 30 - width: 1253 - height: 705 - m_MinSize: {x: 677, y: 321} - m_MaxSize: {x: 12002, y: 8021} + width: 1252 + height: 573 + m_MinSize: {x: 680, y: 342} + m_MaxSize: {x: 12005, y: 8042} vertical: 0 - controlID: 343 ---- !u!114 &6 + controlID: 56 +--- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -129,19 +155,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 7} - - {fileID: 10} + - {fileID: 8} + - {fileID: 11} m_Position: serializedVersion: 2 x: 0 y: 0 width: 960 - height: 705 - m_MinSize: {x: 402, y: 321} - m_MaxSize: {x: 8002, y: 8021} + height: 573 + m_MinSize: {x: 403, y: 342} + m_MaxSize: {x: 8003, y: 8042} vertical: 1 - controlID: 344 ---- !u!114 &7 + controlID: 34 +--- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -154,19 +180,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 width: 960 - height: 434 - m_MinSize: {x: 402, y: 221} - m_MaxSize: {x: 8002, y: 4021} + height: 302 + m_MinSize: {x: 403, y: 221} + m_MaxSize: {x: 8003, y: 4021} vertical: 0 - controlID: 345 ---- !u!114 &8 + controlID: 35 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -183,16 +209,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 201 - height: 434 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 13} + width: 266 + height: 302 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 15} m_Panes: - - {fileID: 13} + - {fileID: 15} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &9 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -202,25 +228,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 201 + x: 266 y: 0 - width: 759 - height: 434 + width: 694 + height: 302 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: + - {fileID: 16} - {fileID: 14} - - {fileID: 12} - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &10 + - {fileID: 17} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -236,19 +262,19 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 434 + y: 302 width: 960 height: 271 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 19} m_Panes: - - {fileID: 16} - - {fileID: 17} + - {fileID: 19} + - {fileID: 13} - {fileID: 18} m_Selected: 0 - m_LastSelected: 2 ---- !u!114 &11 + m_LastSelected: 1 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -257,24 +283,154 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: InspectorWindow + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: m_EditorClassIdentifier: - m_Children: [] - m_Position: - serializedVersion: 2 - x: 960 - y: 0 - width: 293 - height: 705 m_MinSize: {x: 275, y: 100} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 19} - m_Panes: - - {fileID: 19} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &12 + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -6905738622615590433, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 981.3334 + y: 80 + width: 290 + height: 552 + m_ViewDataDictionary: {fileID: 0} + m_OpenAddComponentMenu: 0 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_LockTracker: + m_IsLocked: 0 + m_PreviewResizer: + m_CachedPref: 191 + m_ControlHash: 1412526313 + m_PrefName: Preview_InspectorPreview + m_PreviewWindow: {fileID: 0} + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12373, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Audio Mixer + m_Image: {fileID: 5436946869657106676, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 21.333334 + y: 382 + width: 959 + height: 250 + m_ViewDataDictionary: {fileID: 0} + m_MixersTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: -194952 + m_ExpandedIDs: 12eb343c + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_LayoutStripsOnTop: + m_VerticalSplitter: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: 4100000023000000 + relativeSizes: + - 0.65 + - 0.35000002 + minSizes: 5500000069000000 + maxSizes: 0000000000000000 + lastTotalSize: 0 + splitSize: 6 + xOffset: 0 + m_HorizontalSplitter: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: 3c0000003c0000003c0000003c000000 + relativeSizes: + - 0.25 + - 0.25 + - 0.25 + - 0.25 + minSizes: 55000000550000005500000055000000 + maxSizes: 00000000000000000000000000000000 + lastTotalSize: 0 + splitSize: 6 + xOffset: 0 + m_LayoutStripsOnRight: + m_VerticalSplitter: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: 3c0000003c0000003c0000003c000000 + relativeSizes: + - 0.25 + - 0.25 + - 0.25 + - 0.25 + minSizes: 64000000550000005500000055000000 + maxSizes: 00000000000000000000000000000000 + lastTotalSize: 0 + splitSize: 6 + xOffset: 0 + m_HorizontalSplitter: + ID: 157 + splitterInitialOffset: 0 + currentActiveSplitter: -1 + realSizes: 200100009f020000 + relativeSizes: + - 0.3 + - 0.7 + minSizes: a0000000a0000000 + maxSizes: 0000000000000000 + lastTotalSize: 959 + splitSize: 6 + xOffset: 0 + m_SectionOrder: 00000000030000000100000002000000 + m_LayoutMode: 1 + m_SortGroupsAlphabetically: 0 + m_ShowReferencedBuses: 1 + m_ShowBusConnections: 0 + m_ShowBusConnectionsOfSelection: 0 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -290,15 +446,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Game - m_Image: {fileID: 257045534191678443, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -2087823869225018852, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 202 - y: 19 - width: 757 - height: 413 + x: 287.33334 + y: 80 + width: 692 + height: 281 m_ViewDataDictionary: {fileID: 0} m_SerializedViewsNames: [] m_SerializedViewsValues: [] @@ -306,7 +462,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 757, y: 392} + m_TargetSize: {x: 1024, y: 768} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -314,16 +470,16 @@ MonoBehaviour: m_VSyncEnabled: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 06000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -189.25 - m_HBaseRangeMax: 189.25 - m_VBaseRangeMin: -98 - m_VBaseRangeMax: 98 + m_HBaseRangeMin: -341.33334 + m_HBaseRangeMax: 341.33334 + m_VBaseRangeMin: -256 + m_VBaseRangeMax: 256 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -332,7 +488,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -341,29 +497,29 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 757 - height: 392 - m_Scale: {x: 2, y: 2} - m_Translation: {x: 378.5, y: 196} + width: 692 + height: 260 + m_Scale: {x: 0.5078125, y: 0.5078125} + m_Translation: {x: 346, y: 130} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -189.25 - y: -98 - width: 378.5 - height: 196 + x: -681.3538 + y: -256 + width: 1362.7076 + height: 512 m_MinimalGUI: 1 - m_defaultScale: 2 - m_LastWindowPixelSize: {x: 1514, y: 826} + m_defaultScale: 0.5078125 + m_LastWindowPixelSize: {x: 1038, y: 421.5} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 m_XRRenderMode: 0 m_RenderTexture: {fileID: 0} ---- !u!114 &13 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -379,22 +535,22 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Hierarchy - m_Image: {fileID: -9000905672528348964, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -590624980919486359, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 27 - y: 75 - width: 200 - height: 413 + x: 21.333334 + y: 80 + width: 265 + height: 281 m_ViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 5aa7feff72a7feff40a9feff08b1feff10b1feff16b1feff46bafeff5ebafeff30bcfefff4c3feff00c4feff0ac4feff + m_SelectedIDs: 264f0000 + m_LastClickedID: 20262 + m_ExpandedIDs: 9ce5fffff04e0000124f0000264f00005c4f0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -410,7 +566,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 8} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -418,7 +574,7 @@ MonoBehaviour: m_IsLocked: 0 m_CurrentSortingName: TransformSorting m_WindowGUID: 481969396aa117f4ba0f36aef7ff7719 ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -434,15 +590,15 @@ MonoBehaviour: m_MaxSize: {x: 4000, y: 4000} m_TitleContent: m_Text: Scene - m_Image: {fileID: -131512000283675692, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 2318424515335265636, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 228 + x: 295 y: 75 - width: 757 - height: 413 + width: 691 + height: 358 m_ViewDataDictionary: {fileID: 0} m_ShowContextualTools: 0 m_WindowGUID: 9ba59ac1c73ec1642831b072899efcbd @@ -454,9 +610,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -7.4668093, y: -1.6525673, z: -21.172195} + m_Target: {x: 0, y: 0, z: 0} speed: 2 - m_Value: {x: -7.4668093, y: -1.6525673, z: -21.172195} + m_Value: {x: 0.9167701, y: 11.187998, z: -9.025213} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -502,13 +658,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: 0.00445144, y: 0.9894021, z: -0.14195056, w: 0.030870901} + m_Target: {x: -0.02031457, y: -0.000011378208, z: -0.00032266058, w: -1.0003066} speed: 2 - m_Value: {x: 0.004451353, y: 0.98938274, z: -0.14194779, w: 0.030870298} + m_Value: {x: -0.3191231, y: 0.001304233, z: -0.0008114565, w: -0.94771206} m_Size: - m_Target: 33.130615 + m_Target: 5.7073956 speed: 2 - m_Value: 33.130615 + m_Value: 4.142072 m_Ortho: m_Target: 0 speed: 2 @@ -526,14 +682,15 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: 0.1059274, y: 0.56290865, z: -0.07299812, w: 0.8164699} + m_LastSceneViewRotation: {x: -0.02031457, y: -0.000011378208, z: -0.00032266058, + w: -1.0003066} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_SceneVisActive: 1 m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -549,160 +706,16 @@ MonoBehaviour: m_MaxSize: {x: 2048, y: 2048} m_TitleContent: m_Text: Asset Store - m_Image: {fileID: -4391848389275900105, guid: 0000000000000000d000000000000000, + m_Image: {fileID: 357073275683767465, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 228 - y: 75 - width: 757 - height: 413 + x: 231.2 + y: 73.6 + width: 747 + height: 439 m_ViewDataDictionary: {fileID: 0} ---- !u!114 &16 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Console - m_Image: {fileID: -3303252850963283158, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 27 - y: 509 - width: 959 - height: 250 - m_ViewDataDictionary: {fileID: 0} ---- !u!114 &17 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12373, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Audio Mixer - m_Image: {fileID: 923997255885558976, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 528 - width: 1002 - height: 255 - m_ViewDataDictionary: {fileID: 0} - m_MixersTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: -194952 - m_ExpandedIDs: 12eb343c - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_LayoutStripsOnTop: - m_VerticalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: 4100000023000000 - relativeSizes: - - 0.65 - - 0.35000002 - minSizes: 5500000069000000 - maxSizes: 0000000000000000 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_HorizontalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: 3c0000003c0000003c0000003c000000 - relativeSizes: - - 0.25 - - 0.25 - - 0.25 - - 0.25 - minSizes: 55000000550000005500000055000000 - maxSizes: 00000000000000000000000000000000 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_LayoutStripsOnRight: - m_VerticalSplitter: - ID: 0 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: 3c0000003c0000003c0000003c000000 - relativeSizes: - - 0.25 - - 0.25 - - 0.25 - - 0.25 - minSizes: 64000000550000005500000055000000 - maxSizes: 00000000000000000000000000000000 - lastTotalSize: 0 - splitSize: 6 - xOffset: 0 - m_HorizontalSplitter: - ID: 221 - splitterInitialOffset: 0 - currentActiveSplitter: -1 - realSizes: 2d010000bd020000 - relativeSizes: - - 0.3 - - 0.7 - minSizes: a0000000a0000000 - maxSizes: 0000000000000000 - lastTotalSize: 1002 - splitSize: 6 - xOffset: 0 - m_SectionOrder: 00000000030000000100000002000000 - m_LayoutMode: 1 - m_SortGroupsAlphabetically: 0 - m_ShowReferencedBuses: 1 - m_ShowBusConnections: 0 - m_ShowBusConnectionsOfSelection: 0 --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -719,13 +732,13 @@ MonoBehaviour: m_MaxSize: {x: 10000, y: 10000} m_TitleContent: m_Text: Project - m_Image: {fileID: -2032128904892744680, guid: 0000000000000000d000000000000000, + m_Image: {fileID: -7501376956915960154, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 27 - y: 509 + x: 21.333334 + y: 382 width: 959 height: 250 m_ViewDataDictionary: {fileID: 0} @@ -742,20 +755,20 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Photon + - Assets m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Photon + - Assets m_LastFoldersGridSize: -1 - m_LastProjectPath: /Volumes/Evie/Haystacks/final + m_LastProjectPath: C:\Users\Janine\Documents\CIS568\HaystackHoarder m_LockTracker: m_IsLocked: 1 m_FolderTreeState: - scrollPos: {x: 0, y: 91.99951} - m_SelectedIDs: 32d50000 - m_LastClickedID: 54578 - m_ExpandedIDs: 00000000b0d40000b2d40000b4d40000b6d40000b8d40000bad40000bcd4000000ca9a3b + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 20be0000 + m_LastClickedID: 48672 + m_ExpandedIDs: 00000000664e0000684e00006a4e00006c4e00006e4e0000704e0000724e0000744e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -771,7 +784,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -783,7 +796,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b0d40000b2d40000b4d40000b6d40000b8d40000bad40000bcd4000000ca9a3b + m_ExpandedIDs: 00000000664e0000684e00006a4e00006c4e00006e4e0000704e0000724e0000744e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -827,7 +840,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 10} + m_ClientGUIView: {fileID: 11} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -847,33 +860,21 @@ MonoBehaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 275, y: 100} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Inspector - m_Image: {fileID: 8356117983803934776, guid: 0000000000000000d000000000000000, + m_Text: Console + m_Image: {fileID: 111653112392082826, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 987 - y: 75 - width: 292 - height: 684 + x: 21.333334 + y: 382 + width: 959 + height: 250 m_ViewDataDictionary: {fileID: 0} - m_OpenAddComponentMenu: 0 - m_ObjectsLockedBeforeSerialization: [] - m_InstanceIDsLockedBeforeSerialization: - m_LockTracker: - m_IsLocked: 0 - m_PreviewResizer: - m_CachedPref: 191 - m_ControlHash: 1412526313 - m_PrefName: Preview_InspectorPreview - m_PreviewWindow: {fileID: 0} - m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 diff --git a/Library/EditorUserBuildSettings.asset b/Library/EditorUserBuildSettings.asset index 2e33e9bb..a3df30f1 100644 Binary files a/Library/EditorUserBuildSettings.asset and b/Library/EditorUserBuildSettings.asset differ diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index d134ba65..68169d94 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/LastSceneManagerSetup.txt b/Library/LastSceneManagerSetup.txt index 412ef99d..3e205a06 100644 --- a/Library/LastSceneManagerSetup.txt +++ b/Library/LastSceneManagerSetup.txt @@ -1,4 +1,36 @@ sceneSetups: +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 +- path: Assets/Scenes/GameLobby.unity + isLoaded: 0 + isActive: 0 + isSubScene: 0 - path: Assets/Scenes/GameLobby.unity isLoaded: 0 isActive: 0 diff --git a/Library/SceneVisibilityState.asset b/Library/SceneVisibilityState.asset index 1a7a5831..64c0917f 100644 Binary files a/Library/SceneVisibilityState.asset and b/Library/SceneVisibilityState.asset differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index b2de49fb..4d1ff150 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.pdb b/Library/ScriptAssemblies/Assembly-CSharp.pdb index 416a3415..279a6bb3 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.pdb and b/Library/ScriptAssemblies/Assembly-CSharp.pdb differ diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll index 7d83d45d..fab27e97 100644 Binary files a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll and b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb index 1d7af0e3..dc38f480 100644 Binary files a/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb and b/Library/ScriptAssemblies/Unity.CollabProxy.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Rider.Editor.dll b/Library/ScriptAssemblies/Unity.Rider.Editor.dll index 3bd1e00e..82f37c32 100644 Binary files a/Library/ScriptAssemblies/Unity.Rider.Editor.dll and b/Library/ScriptAssemblies/Unity.Rider.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Rider.Editor.pdb b/Library/ScriptAssemblies/Unity.Rider.Editor.pdb index 5352d6cd..442c72df 100644 Binary files a/Library/ScriptAssemblies/Unity.Rider.Editor.pdb and b/Library/ScriptAssemblies/Unity.Rider.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll index 565f2cda..b43b51d3 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb index d60fb975..6eb36d2b 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb and b/Library/ScriptAssemblies/Unity.TextMeshPro.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.dll b/Library/ScriptAssemblies/Unity.TextMeshPro.dll index 049c3045..3310da08 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.dll and b/Library/ScriptAssemblies/Unity.TextMeshPro.dll differ diff --git a/Library/ScriptAssemblies/Unity.TextMeshPro.pdb b/Library/ScriptAssemblies/Unity.TextMeshPro.pdb index e1e8f711..826353cf 100644 Binary files a/Library/ScriptAssemblies/Unity.TextMeshPro.pdb and b/Library/ScriptAssemblies/Unity.TextMeshPro.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll index d908bd95..ff6f1280 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.Editor.dll and b/Library/ScriptAssemblies/Unity.Timeline.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb b/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb index 15da3f91..520b4df0 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb and b/Library/ScriptAssemblies/Unity.Timeline.Editor.pdb differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.dll b/Library/ScriptAssemblies/Unity.Timeline.dll index 0608ace3..5cc85953 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.dll and b/Library/ScriptAssemblies/Unity.Timeline.dll differ diff --git a/Library/ScriptAssemblies/Unity.Timeline.pdb b/Library/ScriptAssemblies/Unity.Timeline.pdb index 9bc7c614..bad862dc 100644 Binary files a/Library/ScriptAssemblies/Unity.Timeline.pdb and b/Library/ScriptAssemblies/Unity.Timeline.pdb differ diff --git a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll index 63459825..3062e84e 100644 Binary files a/Library/ScriptAssemblies/Unity.VSCode.Editor.dll and b/Library/ScriptAssemblies/Unity.VSCode.Editor.dll differ diff --git a/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb b/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb index 6ae0104e..01b880e9 100644 Binary files a/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb and b/Library/ScriptAssemblies/Unity.VSCode.Editor.pdb differ diff --git a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll index 2276f623..e3bcf187 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.TestRunner.dll and b/Library/ScriptAssemblies/UnityEditor.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb b/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb index 381d6dd0..18e36338 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb and b/Library/ScriptAssemblies/UnityEditor.TestRunner.pdb differ diff --git a/Library/ScriptAssemblies/UnityEditor.UI.dll b/Library/ScriptAssemblies/UnityEditor.UI.dll index 02faf61d..036ef4da 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.UI.dll and b/Library/ScriptAssemblies/UnityEditor.UI.dll differ diff --git a/Library/ScriptAssemblies/UnityEditor.UI.pdb b/Library/ScriptAssemblies/UnityEditor.UI.pdb index 096c26f7..8b2c7e47 100644 Binary files a/Library/ScriptAssemblies/UnityEditor.UI.pdb and b/Library/ScriptAssemblies/UnityEditor.UI.pdb differ diff --git a/Library/ScriptAssemblies/UnityEngine.TestRunner.dll b/Library/ScriptAssemblies/UnityEngine.TestRunner.dll index 6bff72f4..1e36d431 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.TestRunner.dll and b/Library/ScriptAssemblies/UnityEngine.TestRunner.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb b/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb index a7de39c5..daeda120 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb and b/Library/ScriptAssemblies/UnityEngine.TestRunner.pdb differ diff --git a/Library/ScriptAssemblies/UnityEngine.UI.dll b/Library/ScriptAssemblies/UnityEngine.UI.dll index e1da8a6e..99981e6f 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.UI.dll and b/Library/ScriptAssemblies/UnityEngine.UI.dll differ diff --git a/Library/ScriptAssemblies/UnityEngine.UI.pdb b/Library/ScriptAssemblies/UnityEngine.UI.pdb index cb4d2043..5d22d315 100644 Binary files a/Library/ScriptAssemblies/UnityEngine.UI.pdb and b/Library/ScriptAssemblies/UnityEngine.UI.pdb differ diff --git a/Library/ShaderCache/EditorEncounteredVariants b/Library/ShaderCache/EditorEncounteredVariants index 579d91b9..bae8c547 100644 Binary files a/Library/ShaderCache/EditorEncounteredVariants and b/Library/ShaderCache/EditorEncounteredVariants differ diff --git a/Library/SourceAssetDB b/Library/SourceAssetDB index 00572bb9..8b9ba887 100755 Binary files a/Library/SourceAssetDB and b/Library/SourceAssetDB differ diff --git a/Library/SourceAssetDB-lock b/Library/SourceAssetDB-lock index 575611a6..54d12719 100755 Binary files a/Library/SourceAssetDB-lock and b/Library/SourceAssetDB-lock differ diff --git a/Library/expandedItems b/Library/expandedItems index 7896d2d0..161b2a87 100644 Binary files a/Library/expandedItems and b/Library/expandedItems differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Library/shadercompiler-UnityShaderCompiler.exe0.log index 4da4071b..e0f8bfe7 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,2 +1,2 @@ -Base path: 'C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/PlaybackEngines' +Base path: 'C:/Program Files/Unity/Editor/Data', plugins path 'C:/Program Files/Unity/Editor/Data/PlaybackEngines' Cmd: initializeCompiler diff --git a/Library/shadercompiler-UnityShaderCompiler.exe1.log b/Library/shadercompiler-UnityShaderCompiler.exe1.log index e69de29b..e0f8bfe7 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe1.log @@ -0,0 +1,2 @@ +Base path: 'C:/Program Files/Unity/Editor/Data', plugins path 'C:/Program Files/Unity/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler diff --git a/Library/shadercompiler-UnityShaderCompiler.exe2.log b/Library/shadercompiler-UnityShaderCompiler.exe2.log index e69de29b..e0f8bfe7 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe2.log @@ -0,0 +1,2 @@ +Base path: 'C:/Program Files/Unity/Editor/Data', plugins path 'C:/Program Files/Unity/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler diff --git a/Library/shadercompiler-UnityShaderCompiler.exe3.log b/Library/shadercompiler-UnityShaderCompiler.exe3.log index 4da4071b..e0f8bfe7 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe3.log @@ -1,2 +1,2 @@ -Base path: 'C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/PlaybackEngines' +Base path: 'C:/Program Files/Unity/Editor/Data', plugins path 'C:/Program Files/Unity/Editor/Data/PlaybackEngines' Cmd: initializeCompiler diff --git a/Library/shadercompiler-UnityShaderCompiler.exe4.log b/Library/shadercompiler-UnityShaderCompiler.exe4.log index e69de29b..e0f8bfe7 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe4.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe4.log @@ -0,0 +1,2 @@ +Base path: 'C:/Program Files/Unity/Editor/Data', plugins path 'C:/Program Files/Unity/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler diff --git a/Library/shadercompiler-UnityShaderCompiler.exe5.log b/Library/shadercompiler-UnityShaderCompiler.exe5.log index e69de29b..e0f8bfe7 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe5.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe5.log @@ -0,0 +1,2 @@ +Base path: 'C:/Program Files/Unity/Editor/Data', plugins path 'C:/Program Files/Unity/Editor/Data/PlaybackEngines' +Cmd: initializeCompiler diff --git a/Library/shadercompiler-UnityShaderCompiler.exe6.log b/Library/shadercompiler-UnityShaderCompiler.exe6.log index 4da4071b..e0f8bfe7 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe6.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe6.log @@ -1,2 +1,2 @@ -Base path: 'C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2019.3.9f1/Editor/Data/PlaybackEngines' +Base path: 'C:/Program Files/Unity/Editor/Data', plugins path 'C:/Program Files/Unity/Editor/Data/PlaybackEngines' Cmd: initializeCompiler diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 360e64c6..1f8bcbbe 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,6 +5,9 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/TitleScene.unity + guid: 4b8a53be991a96648916af6076cca2e8 - enabled: 1 path: Assets/Scenes/GameLobby.unity guid: 926fd6700a05b4ea9964ccfdb2312f7a diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 06619367..a7bcfc3d 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -39,7 +39,6 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} - - {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/haystacks/Haystack Hoarder.exe b/haystacks/Haystack Hoarder.exe deleted file mode 100644 index f7bfae99..00000000 Binary files a/haystacks/Haystack Hoarder.exe and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/Assembly-CSharp.dll b/haystacks/Haystack Hoarder_Data/Managed/Assembly-CSharp.dll deleted file mode 100644 index 3ccb6acd..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/Assembly-CSharp.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AndroidJNIModule.dll b/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AndroidJNIModule.dll deleted file mode 100644 index 865b2743..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AndroidJNIModule.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.CoreModule.dll b/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.CoreModule.dll deleted file mode 100644 index a5ac8921..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.CoreModule.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.GameCenterModule.dll b/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.GameCenterModule.dll deleted file mode 100644 index e1556dbe..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.GameCenterModule.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ScreenCaptureModule.dll b/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ScreenCaptureModule.dll deleted file mode 100644 index 9f9d2e9c..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ScreenCaptureModule.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TerrainModule.dll b/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TerrainModule.dll deleted file mode 100644 index f5bd051c..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TerrainModule.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UIElementsModule.dll b/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UIElementsModule.dll deleted file mode 100644 index af32dc4b..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UIElementsModule.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.dll b/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.dll deleted file mode 100644 index b8ee6565..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.dll and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/Resources/unity_builtin_extra b/haystacks/Haystack Hoarder_Data/Resources/unity_builtin_extra deleted file mode 100644 index a0bc9c03..00000000 Binary files a/haystacks/Haystack Hoarder_Data/Resources/unity_builtin_extra and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/globalgamemanagers b/haystacks/Haystack Hoarder_Data/globalgamemanagers deleted file mode 100644 index 9df4c0bb..00000000 Binary files a/haystacks/Haystack Hoarder_Data/globalgamemanagers and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/level2 b/haystacks/Haystack Hoarder_Data/level2 deleted file mode 100644 index 4254eb40..00000000 Binary files a/haystacks/Haystack Hoarder_Data/level2 and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/level3 b/haystacks/Haystack Hoarder_Data/level3 deleted file mode 100644 index f9932054..00000000 Binary files a/haystacks/Haystack Hoarder_Data/level3 and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/level3.resS b/haystacks/Haystack Hoarder_Data/level3.resS deleted file mode 100644 index 6399b46d..00000000 Binary files a/haystacks/Haystack Hoarder_Data/level3.resS and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/sharedassets0.assets b/haystacks/Haystack Hoarder_Data/sharedassets0.assets deleted file mode 100644 index a2ea984a..00000000 Binary files a/haystacks/Haystack Hoarder_Data/sharedassets0.assets and /dev/null differ diff --git a/haystacks/Haystack Hoarder_Data/sharedassets3.assets b/haystacks/Haystack Hoarder_Data/sharedassets3.assets deleted file mode 100644 index 18409086..00000000 Binary files a/haystacks/Haystack Hoarder_Data/sharedassets3.assets and /dev/null differ diff --git a/haystacks/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll b/haystacks/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll deleted file mode 100644 index 64f583d4..00000000 Binary files a/haystacks/MonoBleedingEdge/EmbedRuntime/MonoPosixHelper.dll and /dev/null differ diff --git a/haystacks/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll b/haystacks/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll deleted file mode 100644 index e7cbda87..00000000 Binary files a/haystacks/MonoBleedingEdge/EmbedRuntime/mono-2.0-bdwgc.dll and /dev/null differ diff --git a/haystacks/UnityCrashHandler64.exe b/haystacks/UnityCrashHandler64.exe deleted file mode 100644 index 2b27af31..00000000 Binary files a/haystacks/UnityCrashHandler64.exe and /dev/null differ diff --git a/haystacks/WinPixEventRuntime.dll b/haystacks/WinPixEventRuntime.dll deleted file mode 100644 index 177fb31e..00000000 Binary files a/haystacks/WinPixEventRuntime.dll and /dev/null differ diff --git a/mac_build.app/Contents/Frameworks/UnityPlayer.dylib b/mac_build.app/Contents/Frameworks/UnityPlayer.dylib new file mode 100755 index 00000000..b591a6f7 Binary files /dev/null and b/mac_build.app/Contents/Frameworks/UnityPlayer.dylib differ diff --git a/mac_build.app/Contents/Frameworks/libMonoPosixHelper.dylib b/mac_build.app/Contents/Frameworks/libMonoPosixHelper.dylib new file mode 100755 index 00000000..4fdbf0d0 Binary files /dev/null and b/mac_build.app/Contents/Frameworks/libMonoPosixHelper.dylib differ diff --git a/mac_build.app/Contents/Frameworks/libcrypto.dylib b/mac_build.app/Contents/Frameworks/libcrypto.dylib new file mode 100644 index 00000000..3f55eb17 Binary files /dev/null and b/mac_build.app/Contents/Frameworks/libcrypto.dylib differ diff --git a/mac_build.app/Contents/Frameworks/libmonobdwgc-2.0.dylib b/mac_build.app/Contents/Frameworks/libmonobdwgc-2.0.dylib new file mode 100755 index 00000000..a6b7bf78 Binary files /dev/null and b/mac_build.app/Contents/Frameworks/libmonobdwgc-2.0.dylib differ diff --git a/mac_build.app/Contents/Frameworks/libssl.dylib b/mac_build.app/Contents/Frameworks/libssl.dylib new file mode 100644 index 00000000..093ac84b Binary files /dev/null and b/mac_build.app/Contents/Frameworks/libssl.dylib differ diff --git a/mac_build.app/Contents/Info.plist b/mac_build.app/Contents/Info.plist new file mode 100644 index 00000000..bbe9c15d --- /dev/null +++ b/mac_build.app/Contents/Info.plist @@ -0,0 +1,45 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + Haystack Hoarder + CFBundleGetInfoString + Unity Player version 2019.3.9f1 (e6e740a1c473). (c) 2020 Unity Technologies ApS. All rights reserved. + CFBundleIconFile + PlayerIcon.icns + CFBundleIdentifier + com.DefaultCompany.HaystackHoarder + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + Haystack Hoarder + CFBundlePackageType + APPL + CFBundleShortVersionString + 0.1 + CFBundleSupportedPlatforms + + MacOSX + + CFBundleVersion + 0 + LSApplicationCategoryType + public.app-category.games + LSMinimumSystemVersion + 10.9.0 + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + NSMainNibFile + MainMenu + NSPrincipalClass + PlayerApplication + UnityBuildNumber + e6e740a1c473 + + diff --git a/mac_build.app/Contents/MacOS/Haystack Hoarder b/mac_build.app/Contents/MacOS/Haystack Hoarder new file mode 100755 index 00000000..06edcca3 Binary files /dev/null and b/mac_build.app/Contents/MacOS/Haystack Hoarder differ diff --git a/haystacks/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/Browsers/Compat.browser diff --git a/haystacks/MonoBleedingEdge/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx diff --git a/haystacks/MonoBleedingEdge/etc/mono/2.0/machine.config b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/machine.config similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/2.0/machine.config rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/machine.config diff --git a/haystacks/MonoBleedingEdge/etc/mono/2.0/settings.map b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/settings.map similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/2.0/settings.map rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/settings.map diff --git a/haystacks/MonoBleedingEdge/etc/mono/2.0/web.config b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/web.config similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/2.0/web.config rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/2.0/web.config diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/Browsers/Compat.browser diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.0/DefaultWsdlHelpGenerator.aspx b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/DefaultWsdlHelpGenerator.aspx similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.0/DefaultWsdlHelpGenerator.aspx rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/DefaultWsdlHelpGenerator.aspx diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.0/machine.config b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/machine.config similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.0/machine.config rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/machine.config diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.0/settings.map b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/settings.map similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.0/settings.map rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/settings.map diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.0/web.config b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/web.config similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.0/web.config rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.0/web.config diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/Browsers/Compat.browser diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.5/DefaultWsdlHelpGenerator.aspx b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/DefaultWsdlHelpGenerator.aspx similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.5/DefaultWsdlHelpGenerator.aspx rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/DefaultWsdlHelpGenerator.aspx diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.5/machine.config b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/machine.config similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.5/machine.config rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/machine.config diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.5/settings.map b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/settings.map similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.5/settings.map rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/settings.map diff --git a/haystacks/MonoBleedingEdge/etc/mono/4.5/web.config b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/web.config similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/4.5/web.config rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/4.5/web.config diff --git a/haystacks/MonoBleedingEdge/etc/mono/browscap.ini b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/browscap.ini similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/browscap.ini rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/browscap.ini diff --git a/haystacks/MonoBleedingEdge/etc/mono/config b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/config similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/config rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/config diff --git a/haystacks/MonoBleedingEdge/etc/mono/mconfig/config.xml b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/mconfig/config.xml similarity index 100% rename from haystacks/MonoBleedingEdge/etc/mono/mconfig/config.xml rename to mac_build.app/Contents/MonoBleedingEdge/etc/mono/mconfig/config.xml diff --git a/mac_build.app/Contents/MonoBleedingEdge/etc/mono/registry/last-btime b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/registry/last-btime new file mode 100644 index 00000000..3a2e3f49 --- /dev/null +++ b/mac_build.app/Contents/MonoBleedingEdge/etc/mono/registry/last-btime @@ -0,0 +1 @@ +-1 diff --git a/mac_build.app/Contents/Resources/Data/Managed/Assembly-CSharp.dll b/mac_build.app/Contents/Resources/Data/Managed/Assembly-CSharp.dll new file mode 100644 index 00000000..bb16b063 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/Assembly-CSharp.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/Mono.Security.dll b/mac_build.app/Contents/Resources/Data/Managed/Mono.Security.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/Mono.Security.dll rename to mac_build.app/Contents/Resources/Data/Managed/Mono.Security.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/Photon3Unity3D.dll b/mac_build.app/Contents/Resources/Data/Managed/Photon3Unity3D.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/Photon3Unity3D.dll rename to mac_build.app/Contents/Resources/Data/Managed/Photon3Unity3D.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/PhotonChat.dll b/mac_build.app/Contents/Resources/Data/Managed/PhotonChat.dll similarity index 98% rename from haystacks/Haystack Hoarder_Data/Managed/PhotonChat.dll rename to mac_build.app/Contents/Resources/Data/Managed/PhotonChat.dll index daabd4e2..6a7f9d39 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/PhotonChat.dll and b/mac_build.app/Contents/Resources/Data/Managed/PhotonChat.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/PhotonRealtime.dll b/mac_build.app/Contents/Resources/Data/Managed/PhotonRealtime.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/PhotonRealtime.dll rename to mac_build.app/Contents/Resources/Data/Managed/PhotonRealtime.dll index d93243a5..9fd11ca5 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/PhotonRealtime.dll and b/mac_build.app/Contents/Resources/Data/Managed/PhotonRealtime.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.Demos.dll b/mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.Demos.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.Demos.dll rename to mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.Demos.dll index 50f10d54..0264a93a 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.Demos.dll and b/mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.Demos.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.Utilities.dll b/mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.Utilities.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.Utilities.dll rename to mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.Utilities.dll index 84f198e0..e359578a 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.Utilities.dll and b/mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.Utilities.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.dll b/mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.dll rename to mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.dll index 64bd00c1..cffe8b8e 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/PhotonUnityNetworking.dll and b/mac_build.app/Contents/Resources/Data/Managed/PhotonUnityNetworking.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/PhotonWebSocket.dll b/mac_build.app/Contents/Resources/Data/Managed/PhotonWebSocket.dll similarity index 92% rename from haystacks/Haystack Hoarder_Data/Managed/PhotonWebSocket.dll rename to mac_build.app/Contents/Resources/Data/Managed/PhotonWebSocket.dll index 0b88fdcb..9b8d8d5e 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/PhotonWebSocket.dll and b/mac_build.app/Contents/Resources/Data/Managed/PhotonWebSocket.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.ComponentModel.Composition.dll b/mac_build.app/Contents/Resources/Data/Managed/System.ComponentModel.Composition.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.ComponentModel.Composition.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.ComponentModel.Composition.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Configuration.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Configuration.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Configuration.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Configuration.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Core.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Core.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Core.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Core.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Data.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Data.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Data.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Data.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Diagnostics.StackTrace.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Diagnostics.StackTrace.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Diagnostics.StackTrace.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Diagnostics.StackTrace.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Drawing.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Drawing.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Drawing.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Drawing.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.EnterpriseServices.dll b/mac_build.app/Contents/Resources/Data/Managed/System.EnterpriseServices.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.EnterpriseServices.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.EnterpriseServices.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Globalization.Extensions.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Globalization.Extensions.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Globalization.Extensions.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Globalization.Extensions.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.IO.Compression.FileSystem.dll b/mac_build.app/Contents/Resources/Data/Managed/System.IO.Compression.FileSystem.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.IO.Compression.FileSystem.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.IO.Compression.FileSystem.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.IO.Compression.dll b/mac_build.app/Contents/Resources/Data/Managed/System.IO.Compression.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.IO.Compression.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.IO.Compression.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Net.Http.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Net.Http.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Net.Http.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Net.Http.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Numerics.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Numerics.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Numerics.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Numerics.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Runtime.Serialization.Xml.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Runtime.Serialization.Xml.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Runtime.Serialization.Xml.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Runtime.Serialization.Xml.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Runtime.Serialization.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Runtime.Serialization.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Runtime.Serialization.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Runtime.Serialization.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.ServiceModel.Internals.dll b/mac_build.app/Contents/Resources/Data/Managed/System.ServiceModel.Internals.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.ServiceModel.Internals.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.ServiceModel.Internals.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Transactions.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Transactions.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Transactions.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Transactions.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Xml.Linq.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Xml.Linq.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Xml.Linq.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Xml.Linq.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Xml.XPath.XDocument.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Xml.XPath.XDocument.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Xml.XPath.XDocument.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Xml.XPath.XDocument.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.Xml.dll b/mac_build.app/Contents/Resources/Data/Managed/System.Xml.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.Xml.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.Xml.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/System.dll b/mac_build.app/Contents/Resources/Data/Managed/System.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/System.dll rename to mac_build.app/Contents/Resources/Data/Managed/System.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/Unity.TextMeshPro.dll b/mac_build.app/Contents/Resources/Data/Managed/Unity.TextMeshPro.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/Unity.TextMeshPro.dll rename to mac_build.app/Contents/Resources/Data/Managed/Unity.TextMeshPro.dll index 630477b0..4c3ed994 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/Unity.TextMeshPro.dll and b/mac_build.app/Contents/Resources/Data/Managed/Unity.TextMeshPro.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/Unity.Timeline.dll b/mac_build.app/Contents/Resources/Data/Managed/Unity.Timeline.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/Unity.Timeline.dll rename to mac_build.app/Contents/Resources/Data/Managed/Unity.Timeline.dll index 5d76f59f..bee34ed3 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/Unity.Timeline.dll and b/mac_build.app/Contents/Resources/Data/Managed/Unity.Timeline.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AIModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AIModule.dll similarity index 97% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AIModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AIModule.dll index 0c2d7f13..4c34e49c 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AIModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AIModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ARModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ARModule.dll similarity index 91% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ARModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ARModule.dll index 81a4b40c..ae048aef 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ARModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ARModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AccessibilityModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AccessibilityModule.dll similarity index 91% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AccessibilityModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AccessibilityModule.dll index d326d883..a383eea8 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AccessibilityModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AccessibilityModule.dll differ diff --git a/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AndroidJNIModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AndroidJNIModule.dll new file mode 100644 index 00000000..a0d5e31f Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AndroidJNIModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AnimationModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AnimationModule.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AnimationModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AnimationModule.dll index ed3cb62b..5add0ae8 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AnimationModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AnimationModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AssetBundleModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AssetBundleModule.dll similarity index 90% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AssetBundleModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AssetBundleModule.dll index ad5392f6..0a1f0905 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AssetBundleModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AssetBundleModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AudioModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AudioModule.dll similarity index 98% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AudioModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AudioModule.dll index eec2e675..a6cd7eac 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.AudioModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.AudioModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClothModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClothModule.dll similarity index 83% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClothModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClothModule.dll index 5e4dc3a7..9aa8eba4 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClothModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClothModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClusterInputModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClusterInputModule.dll similarity index 88% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClusterInputModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClusterInputModule.dll index 30981561..ca9095ba 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClusterInputModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClusterInputModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClusterRendererModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClusterRendererModule.dll similarity index 75% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClusterRendererModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClusterRendererModule.dll index 908bf618..55e3a95f 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ClusterRendererModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ClusterRendererModule.dll differ diff --git a/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.CoreModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.CoreModule.dll new file mode 100644 index 00000000..bb2b64bb Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.CoreModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.CrashReportingModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.CrashReportingModule.dll similarity index 88% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.CrashReportingModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.CrashReportingModule.dll index 42b8a485..a23cfb79 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.CrashReportingModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.CrashReportingModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.DSPGraphModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.DSPGraphModule.dll similarity index 94% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.DSPGraphModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.DSPGraphModule.dll index cbbe2955..d7acf646 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.DSPGraphModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.DSPGraphModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.DirectorModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.DirectorModule.dll similarity index 93% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.DirectorModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.DirectorModule.dll index 52e02fa4..fa96425e 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.DirectorModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.DirectorModule.dll differ diff --git a/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.GameCenterModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.GameCenterModule.dll new file mode 100644 index 00000000..f5ff4007 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.GameCenterModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.GridModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.GridModule.dll similarity index 56% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.GridModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.GridModule.dll index f4f91219..8b9001ad 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.GridModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.GridModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.HotReloadModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.HotReloadModule.dll similarity index 88% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.HotReloadModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.HotReloadModule.dll index ba7142ed..73a0f194 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.HotReloadModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.HotReloadModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.IMGUIModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.IMGUIModule.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.IMGUIModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.IMGUIModule.dll index b838d0c9..08968dde 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.IMGUIModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.IMGUIModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ImageConversionModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ImageConversionModule.dll similarity index 91% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ImageConversionModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ImageConversionModule.dll index e0077959..e7105e64 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ImageConversionModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ImageConversionModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.InputLegacyModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.InputLegacyModule.dll similarity index 95% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.InputLegacyModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.InputLegacyModule.dll index 2201bee2..a7edbc71 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.InputLegacyModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.InputLegacyModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.InputModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.InputModule.dll similarity index 91% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.InputModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.InputModule.dll index 838ea71c..ab7d7835 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.InputModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.InputModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.JSONSerializeModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.JSONSerializeModule.dll similarity index 91% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.JSONSerializeModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.JSONSerializeModule.dll index 16bc19e3..b61a0935 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.JSONSerializeModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.JSONSerializeModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.LocalizationModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.LocalizationModule.dll similarity index 89% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.LocalizationModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.LocalizationModule.dll index 794d2f5c..99369c73 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.LocalizationModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.LocalizationModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ParticleSystemModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ParticleSystemModule.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ParticleSystemModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ParticleSystemModule.dll index 193e70aa..22aca521 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ParticleSystemModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ParticleSystemModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.PerformanceReportingModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.PerformanceReportingModule.dll similarity index 89% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.PerformanceReportingModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.PerformanceReportingModule.dll index 70674be6..16d676f4 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.PerformanceReportingModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.PerformanceReportingModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.Physics2DModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.Physics2DModule.dll similarity index 98% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.Physics2DModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.Physics2DModule.dll index c77a60c3..bfb00ed2 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.Physics2DModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.Physics2DModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.PhysicsModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.PhysicsModule.dll similarity index 98% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.PhysicsModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.PhysicsModule.dll index 9312d240..22cc767e 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.PhysicsModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.PhysicsModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ProfilerModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ProfilerModule.dll similarity index 88% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ProfilerModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ProfilerModule.dll index f890a10e..17728a49 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.ProfilerModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ProfilerModule.dll differ diff --git a/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ScreenCaptureModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ScreenCaptureModule.dll new file mode 100644 index 00000000..2dd28743 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.ScreenCaptureModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SharedInternalsModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SharedInternalsModule.dll similarity index 72% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SharedInternalsModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SharedInternalsModule.dll index b1289d34..e0d673ff 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SharedInternalsModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SharedInternalsModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SpriteMaskModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SpriteMaskModule.dll similarity index 89% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SpriteMaskModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SpriteMaskModule.dll index b58a28af..ac901c67 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SpriteMaskModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SpriteMaskModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SpriteShapeModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SpriteShapeModule.dll similarity index 92% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SpriteShapeModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SpriteShapeModule.dll index df81efeb..ceafb34a 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SpriteShapeModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SpriteShapeModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.StreamingModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.StreamingModule.dll similarity index 89% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.StreamingModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.StreamingModule.dll index 49b6aa03..b056ccf3 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.StreamingModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.StreamingModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SubstanceModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SubstanceModule.dll similarity index 92% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SubstanceModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SubstanceModule.dll index f2423762..164e9def 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SubstanceModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SubstanceModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SubsystemsModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SubsystemsModule.dll similarity index 94% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SubsystemsModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SubsystemsModule.dll index 6c74944e..a3861239 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.SubsystemsModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.SubsystemsModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TLSModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TLSModule.dll similarity index 87% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TLSModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TLSModule.dll index e7afe31b..5953c3e9 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TLSModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TLSModule.dll differ diff --git a/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TerrainModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TerrainModule.dll new file mode 100644 index 00000000..4a120fa7 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TerrainModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TerrainPhysicsModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TerrainPhysicsModule.dll similarity index 90% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TerrainPhysicsModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TerrainPhysicsModule.dll index 7b3747d1..b97eaef6 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TerrainPhysicsModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TerrainPhysicsModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TextCoreModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TextCoreModule.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TextCoreModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TextCoreModule.dll index f30d3987..1cedb5a5 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TextCoreModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TextCoreModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TextRenderingModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TextRenderingModule.dll similarity index 96% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TextRenderingModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TextRenderingModule.dll index 61d4a096..5c54cb65 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TextRenderingModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TextRenderingModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TilemapModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TilemapModule.dll similarity index 96% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TilemapModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TilemapModule.dll index 6ce9bf43..58c730f0 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.TilemapModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.TilemapModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UI.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UI.dll similarity index 99% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UI.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UI.dll index 0d212828..6c1bb819 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UI.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UI.dll differ diff --git a/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UIElementsModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UIElementsModule.dll new file mode 100644 index 00000000..b83229e6 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UIElementsModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UIModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UIModule.dll similarity index 89% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UIModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UIModule.dll index c4f05b2f..89518858 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UIModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UIModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UNETModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UNETModule.dll similarity index 98% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UNETModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UNETModule.dll index 92960554..dab9cde3 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UNETModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UNETModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UmbraModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UmbraModule.dll similarity index 87% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UmbraModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UmbraModule.dll index 43572075..6dc2c696 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UmbraModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UmbraModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityAnalyticsModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityAnalyticsModule.dll similarity index 96% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityAnalyticsModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityAnalyticsModule.dll index f054f694..5f92fecc 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityAnalyticsModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityAnalyticsModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityConnectModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityConnectModule.dll similarity index 89% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityConnectModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityConnectModule.dll index 15733856..525fcabf 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityConnectModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityConnectModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityTestProtocolModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityTestProtocolModule.dll similarity index 88% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityTestProtocolModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityTestProtocolModule.dll index 1c02eca6..004b62a7 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityTestProtocolModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityTestProtocolModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll similarity index 77% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll index 555df4ea..03edd3bf 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestAssetBundleModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll similarity index 91% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll index c58db0d6..0831f3c4 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestAudioModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestModule.dll similarity index 97% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestModule.dll index 2aa4a74d..44a9accd 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll similarity index 89% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll index deb0c6f4..d2c32c38 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestTextureModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll similarity index 94% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll index 34b0fbdd..e7386f76 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.UnityWebRequestWWWModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VFXModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VFXModule.dll similarity index 94% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VFXModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VFXModule.dll index 4c429afa..b5ca3f45 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VFXModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VFXModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VRModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VRModule.dll similarity index 97% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VRModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VRModule.dll index 264f8f81..622fc0b0 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VRModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VRModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VehiclesModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VehiclesModule.dll similarity index 83% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VehiclesModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VehiclesModule.dll index 85d625c6..224866d6 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VehiclesModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VehiclesModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VideoModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VideoModule.dll similarity index 93% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VideoModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VideoModule.dll index 5628c453..abfaee4d 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.VideoModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.VideoModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.WindModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.WindModule.dll similarity index 88% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.WindModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.WindModule.dll index 36bf7a6a..b0168ae8 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.WindModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.WindModule.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.XRModule.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.XRModule.dll similarity index 96% rename from haystacks/Haystack Hoarder_Data/Managed/UnityEngine.XRModule.dll rename to mac_build.app/Contents/Resources/Data/Managed/UnityEngine.XRModule.dll index 1870e513..5f508106 100644 Binary files a/haystacks/Haystack Hoarder_Data/Managed/UnityEngine.XRModule.dll and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.XRModule.dll differ diff --git a/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.dll b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.dll new file mode 100644 index 00000000..b5b6f41b Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Managed/UnityEngine.dll differ diff --git a/haystacks/Haystack Hoarder_Data/Managed/mscorlib.dll b/mac_build.app/Contents/Resources/Data/Managed/mscorlib.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/mscorlib.dll rename to mac_build.app/Contents/Resources/Data/Managed/mscorlib.dll diff --git a/haystacks/Haystack Hoarder_Data/Managed/netstandard.dll b/mac_build.app/Contents/Resources/Data/Managed/netstandard.dll similarity index 100% rename from haystacks/Haystack Hoarder_Data/Managed/netstandard.dll rename to mac_build.app/Contents/Resources/Data/Managed/netstandard.dll diff --git a/mac_build.app/Contents/Resources/Data/Resources/unity_builtin_extra b/mac_build.app/Contents/Resources/Data/Resources/unity_builtin_extra new file mode 100644 index 00000000..e75f575e Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/Resources/unity_builtin_extra differ diff --git a/haystacks/Haystack Hoarder_Data/app.info b/mac_build.app/Contents/Resources/Data/app.info similarity index 100% rename from haystacks/Haystack Hoarder_Data/app.info rename to mac_build.app/Contents/Resources/Data/app.info diff --git a/haystacks/Haystack Hoarder_Data/boot.config b/mac_build.app/Contents/Resources/Data/boot.config similarity index 75% rename from haystacks/Haystack Hoarder_Data/boot.config rename to mac_build.app/Contents/Resources/Data/boot.config index ef2cb11f..390ba450 100644 --- a/haystacks/Haystack Hoarder_Data/boot.config +++ b/mac_build.app/Contents/Resources/Data/boot.config @@ -1,8 +1,9 @@ player-connection-mode=Listen -player-connection-guid=1979786712 +player-connection-guid=3061327276 player-connection-debug=0 player-connection-project-name=Haystack Hoarder player-connection-ip=192.168.1.110 +player-connection-ip=10.16.0.15 wait-for-native-debugger=0 vr-enabled=0 hdr-display-enabled=0 diff --git a/mac_build.app/Contents/Resources/Data/globalgamemanagers b/mac_build.app/Contents/Resources/Data/globalgamemanagers new file mode 100644 index 00000000..2296fb02 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/globalgamemanagers differ diff --git a/haystacks/Haystack Hoarder_Data/globalgamemanagers.assets b/mac_build.app/Contents/Resources/Data/globalgamemanagers.assets similarity index 83% rename from haystacks/Haystack Hoarder_Data/globalgamemanagers.assets rename to mac_build.app/Contents/Resources/Data/globalgamemanagers.assets index bc490490..dd9fad2d 100644 Binary files a/haystacks/Haystack Hoarder_Data/globalgamemanagers.assets and b/mac_build.app/Contents/Resources/Data/globalgamemanagers.assets differ diff --git a/mac_build.app/Contents/Resources/Data/level0 b/mac_build.app/Contents/Resources/Data/level0 new file mode 100644 index 00000000..6bbd595a Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/level0 differ diff --git a/haystacks/Haystack Hoarder_Data/level0 b/mac_build.app/Contents/Resources/Data/level1 similarity index 96% rename from haystacks/Haystack Hoarder_Data/level0 rename to mac_build.app/Contents/Resources/Data/level1 index bec5522f..236f6282 100644 Binary files a/haystacks/Haystack Hoarder_Data/level0 and b/mac_build.app/Contents/Resources/Data/level1 differ diff --git a/haystacks/Haystack Hoarder_Data/level1 b/mac_build.app/Contents/Resources/Data/level2 similarity index 65% rename from haystacks/Haystack Hoarder_Data/level1 rename to mac_build.app/Contents/Resources/Data/level2 index 3f1217ee..75cf4687 100644 Binary files a/haystacks/Haystack Hoarder_Data/level1 and b/mac_build.app/Contents/Resources/Data/level2 differ diff --git a/mac_build.app/Contents/Resources/Data/level3 b/mac_build.app/Contents/Resources/Data/level3 new file mode 100644 index 00000000..ce4f7d28 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/level3 differ diff --git a/mac_build.app/Contents/Resources/Data/level4 b/mac_build.app/Contents/Resources/Data/level4 new file mode 100644 index 00000000..6700964d Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/level4 differ diff --git a/mac_build.app/Contents/Resources/Data/level4.resS b/mac_build.app/Contents/Resources/Data/level4.resS new file mode 100644 index 00000000..1db1ab12 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/level4.resS differ diff --git a/haystacks/Haystack Hoarder_Data/resources.assets b/mac_build.app/Contents/Resources/Data/resources.assets similarity index 76% rename from haystacks/Haystack Hoarder_Data/resources.assets rename to mac_build.app/Contents/Resources/Data/resources.assets index aac8fce3..926807de 100644 Binary files a/haystacks/Haystack Hoarder_Data/resources.assets and b/mac_build.app/Contents/Resources/Data/resources.assets differ diff --git a/haystacks/Haystack Hoarder_Data/resources.assets.resS b/mac_build.app/Contents/Resources/Data/resources.assets.resS similarity index 99% rename from haystacks/Haystack Hoarder_Data/resources.assets.resS rename to mac_build.app/Contents/Resources/Data/resources.assets.resS index 6c889024..ff212e45 100644 Binary files a/haystacks/Haystack Hoarder_Data/resources.assets.resS and b/mac_build.app/Contents/Resources/Data/resources.assets.resS differ diff --git a/haystacks/Haystack Hoarder_Data/resources.resource b/mac_build.app/Contents/Resources/Data/resources.resource similarity index 100% rename from haystacks/Haystack Hoarder_Data/resources.resource rename to mac_build.app/Contents/Resources/Data/resources.resource diff --git a/mac_build.app/Contents/Resources/Data/sharedassets0.assets b/mac_build.app/Contents/Resources/Data/sharedassets0.assets new file mode 100644 index 00000000..1e2f2196 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/sharedassets0.assets differ diff --git a/mac_build.app/Contents/Resources/Data/sharedassets0.assets.resS b/mac_build.app/Contents/Resources/Data/sharedassets0.assets.resS new file mode 100644 index 00000000..9e66eb7c Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/sharedassets0.assets.resS differ diff --git a/haystacks/Haystack Hoarder_Data/sharedassets1.assets b/mac_build.app/Contents/Resources/Data/sharedassets1.assets similarity index 89% rename from haystacks/Haystack Hoarder_Data/sharedassets1.assets rename to mac_build.app/Contents/Resources/Data/sharedassets1.assets index 6153d678..cd752046 100644 Binary files a/haystacks/Haystack Hoarder_Data/sharedassets1.assets and b/mac_build.app/Contents/Resources/Data/sharedassets1.assets differ diff --git a/mac_build.app/Contents/Resources/Data/sharedassets2.assets b/mac_build.app/Contents/Resources/Data/sharedassets2.assets new file mode 100644 index 00000000..2a7ebfd9 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/sharedassets2.assets differ diff --git a/haystacks/Haystack Hoarder_Data/sharedassets2.assets b/mac_build.app/Contents/Resources/Data/sharedassets3.assets similarity index 71% rename from haystacks/Haystack Hoarder_Data/sharedassets2.assets rename to mac_build.app/Contents/Resources/Data/sharedassets3.assets index bd6c08d5..8e683b6c 100644 Binary files a/haystacks/Haystack Hoarder_Data/sharedassets2.assets and b/mac_build.app/Contents/Resources/Data/sharedassets3.assets differ diff --git a/haystacks/Haystack Hoarder_Data/sharedassets2.assets.resS b/mac_build.app/Contents/Resources/Data/sharedassets3.assets.resS similarity index 100% rename from haystacks/Haystack Hoarder_Data/sharedassets2.assets.resS rename to mac_build.app/Contents/Resources/Data/sharedassets3.assets.resS diff --git a/mac_build.app/Contents/Resources/Data/sharedassets4.assets b/mac_build.app/Contents/Resources/Data/sharedassets4.assets new file mode 100644 index 00000000..488cfa82 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/sharedassets4.assets differ diff --git a/mac_build.app/Contents/Resources/Data/sharedassets4.assets.resS b/mac_build.app/Contents/Resources/Data/sharedassets4.assets.resS new file mode 100644 index 00000000..55bc9616 Binary files /dev/null and b/mac_build.app/Contents/Resources/Data/sharedassets4.assets.resS differ diff --git a/haystacks/Haystack Hoarder_Data/sharedassets3.resource b/mac_build.app/Contents/Resources/Data/sharedassets4.resource similarity index 100% rename from haystacks/Haystack Hoarder_Data/sharedassets3.resource rename to mac_build.app/Contents/Resources/Data/sharedassets4.resource diff --git a/mac_build.app/Contents/Resources/DefaultPreferences.plist b/mac_build.app/Contents/Resources/DefaultPreferences.plist new file mode 100644 index 00000000..55ad116c --- /dev/null +++ b/mac_build.app/Contents/Resources/DefaultPreferences.plist @@ -0,0 +1,10 @@ + + + + +NSQuitAlwaysKeepsWindows + +Screenmanager Is Fullscreen mode +True + + diff --git a/mac_build.app/Contents/Resources/MainMenu.nib b/mac_build.app/Contents/Resources/MainMenu.nib new file mode 100644 index 00000000..8fe6132f Binary files /dev/null and b/mac_build.app/Contents/Resources/MainMenu.nib differ diff --git a/haystacks/Haystack Hoarder_Data/Resources/unity default resources b/mac_build.app/Contents/Resources/unity default resources similarity index 84% rename from haystacks/Haystack Hoarder_Data/Resources/unity default resources rename to mac_build.app/Contents/Resources/unity default resources index b8875008..87b7fdb1 100644 Binary files a/haystacks/Haystack Hoarder_Data/Resources/unity default resources and b/mac_build.app/Contents/Resources/unity default resources differ