diff --git a/Gutterball 3/.vs/Gutterball 3/FileContentIndex/2912d80b-0110-447f-b9c9-80007398450f.vsidx b/Gutterball 3/.vs/Gutterball 3/FileContentIndex/2912d80b-0110-447f-b9c9-80007398450f.vsidx deleted file mode 100644 index ffe8820c..00000000 Binary files a/Gutterball 3/.vs/Gutterball 3/FileContentIndex/2912d80b-0110-447f-b9c9-80007398450f.vsidx and /dev/null differ diff --git a/Gutterball 3/.vs/Gutterball 3/FileContentIndex/f5886ed0-a41a-4ffd-8890-909593e5b637.vsidx b/Gutterball 3/.vs/Gutterball 3/FileContentIndex/f5886ed0-a41a-4ffd-8890-909593e5b637.vsidx new file mode 100644 index 00000000..c0fe00a0 Binary files /dev/null and b/Gutterball 3/.vs/Gutterball 3/FileContentIndex/f5886ed0-a41a-4ffd-8890-909593e5b637.vsidx differ diff --git a/Gutterball 3/.vs/Gutterball 3/v17/.suo b/Gutterball 3/.vs/Gutterball 3/v17/.suo index c81a6eb1..02ad703d 100644 Binary files a/Gutterball 3/.vs/Gutterball 3/v17/.suo and b/Gutterball 3/.vs/Gutterball 3/v17/.suo differ diff --git a/Gutterball 3/.vs/Gutterball 3/v17/DocumentLayout.json b/Gutterball 3/.vs/Gutterball 3/v17/DocumentLayout.json index 6cca1d32..15732bf0 100644 --- a/Gutterball 3/.vs/Gutterball 3/v17/DocumentLayout.json +++ b/Gutterball 3/.vs/Gutterball 3/v17/DocumentLayout.json @@ -1,37 +1,12 @@ { "Version": 1, "WorkspaceRootPath": "C:\\Users\\Asus\\Documents\\GitHub\\gutterball-3\\Gutterball 3\\", - "Documents": [ - { - "AbsoluteMoniker": "D:0:0:{2DA15658-79C1-254D-7639-1FB8498A1542}|Assembly-CSharp.csproj|c:\\users\\asus\\documents\\github\\gutterball-3\\gutterball 3\\assets\\scripts\\camerafollow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{2DA15658-79C1-254D-7639-1FB8498A1542}|Assembly-CSharp.csproj|solutionrelative:assets\\scripts\\camerafollow.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - } - ], + "Documents": [], "DocumentGroupContainers": [ { "Orientation": 0, "VerticalTabListWidth": 256, - "DocumentGroups": [ - { - "DockedWidth": 200, - "SelectedChildIndex": 0, - "Children": [ - { - "$type": "Document", - "DocumentIndex": 0, - "Title": "CameraFollow.cs", - "DocumentMoniker": "C:\\Users\\Asus\\Documents\\GitHub\\gutterball-3\\Gutterball 3\\Assets\\Scripts\\CameraFollow.cs", - "RelativeDocumentMoniker": "Assets\\Scripts\\CameraFollow.cs", - "ToolTip": "C:\\Users\\Asus\\Documents\\GitHub\\gutterball-3\\Gutterball 3\\Assets\\Scripts\\CameraFollow.cs", - "RelativeToolTip": "Assets\\Scripts\\CameraFollow.cs", - "ViewState": "AgIAAGMAAAAAAAAAAAAmwGsAAAAJAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-01-29T04:40:29.259Z", - "EditorCaption": "" - } - ] - } - ] + "DocumentGroups": [] } ] } \ No newline at end of file diff --git a/Gutterball 3/Assembly-CSharp-Editor.csproj b/Gutterball 3/Assembly-CSharp-Editor.csproj index fab16f2b..b026fcaa 100644 --- a/Gutterball 3/Assembly-CSharp-Editor.csproj +++ b/Gutterball 3/Assembly-CSharp-Editor.csproj @@ -22,7 +22,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;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_2018_4_3;UNITY_2018_4;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_OSX;PLATFORM_STANDALONE;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_SPATIALTRACKING;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0;NET_LEGACY;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;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_2018_4_3;UNITY_2018_4;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0;NET_LEGACY;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE prompt 4 0169 diff --git a/Gutterball 3/Assembly-CSharp.csproj b/Gutterball 3/Assembly-CSharp.csproj index edeb1144..ff92ce15 100644 --- a/Gutterball 3/Assembly-CSharp.csproj +++ b/Gutterball 3/Assembly-CSharp.csproj @@ -22,7 +22,7 @@ full false Temp\bin\Debug\ - DEBUG;TRACE;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_2018_4_3;UNITY_2018_4;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_OSX;PLATFORM_STANDALONE;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_SPATIALTRACKING;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;NET_LEGACY;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE + DEBUG;TRACE;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_2018_4_3;UNITY_2018_4;UNITY_2018;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_SPRITES;ENABLE_GRID;ENABLE_TILEMAP;ENABLE_TERRAIN;ENABLE_TEXTURE_STREAMING;ENABLE_DIRECTOR;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_HUB;ENABLE_CLOUD_PROJECT_ID;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_TIMELINE;ENABLE_EDITOR_METRICS;ENABLE_EDITOR_METRICS_CACHING;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;ENABLE_MONO_BDWGC;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;INCLUDE_PUBNUB;ENABLE_VIDEO;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_LOCALIZATION;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_UNITYWEBREQUEST;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_EVENT_QUEUE;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_VR;ENABLE_AR;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_2_0_SUBSET;NET_LEGACY;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;UNITY_PRO_LICENSE prompt 4 0169 @@ -207,9 +207,6 @@ C:/Program Files/Unity/Hub/Editor/2018.4.3f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - - C:/Program Files/Unity/Hub/Editor/2018.4.3f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpatialTrackingModule.dll - C:/Program Files/Unity/Hub/Editor/2018.4.3f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll diff --git a/Gutterball 3/Assets/Scenes/Main.unity b/Gutterball 3/Assets/Scenes/Main.unity index 5b1a7a0d..6612a7c1 100644 --- a/Gutterball 3/Assets/Scenes/Main.unity +++ b/Gutterball 3/Assets/Scenes/Main.unity @@ -16443,7 +16443,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 697073510} - {fileID: 763974237} @@ -47051,7 +47050,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 585328361} - {fileID: 1723093799} @@ -52598,7 +52596,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 2142227432} - {fileID: 1913239225} @@ -53939,7 +53936,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1846738112} - {fileID: 2098404263} @@ -65685,7 +65681,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 296107525} - {fileID: 943363113} @@ -68538,7 +68533,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 523487794} - {fileID: 478509798} @@ -68933,7 +68927,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 437522092} - {fileID: 1345416429} @@ -80981,7 +80974,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 437522092} - {fileID: 1345416429} @@ -81765,7 +81757,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1846738112} - {fileID: 2098404263} @@ -81958,7 +81949,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 216444502} - {fileID: 943363113} @@ -98602,7 +98592,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 152972296} - {fileID: 585328361} @@ -100018,7 +100007,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 466046481} - {fileID: 673053385} @@ -116889,7 +116877,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1345416429} - {fileID: 1615101314} @@ -126324,7 +126311,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 673053385} - {fileID: 1833136865} @@ -128996,7 +128982,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 234508494} - {fileID: 523487794} @@ -130310,7 +130295,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 296107525} - {fileID: 216444502} @@ -134376,7 +134360,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 296107525} - {fileID: 216444502} @@ -135625,7 +135608,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 234508494} - {fileID: 478509798} @@ -139584,7 +139566,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 437522092} - {fileID: 1345416429} @@ -160743,7 +160724,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 152972296} - {fileID: 1723093799} @@ -179683,7 +179663,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 466046481} - {fileID: 1833136865} @@ -187533,7 +187512,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 763974237} - {fileID: 41222158} @@ -189257,7 +189235,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 697073510} - {fileID: 763974237} @@ -198464,7 +198441,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 697073510} - {fileID: 41222158} @@ -203958,7 +203934,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1846738112} - {fileID: 2098404263} @@ -210020,7 +209995,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 152972296} - {fileID: 585328361} @@ -217138,7 +217112,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 296107525} - {fileID: 216444502} @@ -223856,7 +223829,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1846738112} - {fileID: 2098404263} @@ -249175,7 +249147,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 296107525} - {fileID: 216444502} @@ -254569,7 +254540,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 296107525} - {fileID: 216444502} @@ -272332,7 +272302,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 466046481} - {fileID: 673053385} @@ -295142,7 +295111,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 697073510} - {fileID: 763974237} @@ -323409,7 +323377,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 190904766} - {fileID: 2142227432} @@ -336107,7 +336074,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 437522092} - {fileID: 1615101314} @@ -344458,7 +344424,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1846738112} - {fileID: 2098404263} @@ -397114,7 +397079,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 437522092} - {fileID: 1345416429} @@ -417579,7 +417543,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 152972296} - {fileID: 585328361} @@ -419011,7 +418974,7 @@ MonoBehaviour: objectMoves: - monkey: {fileID: 0} fireworksPosition: {x: 0, y: 0, z: 0} - move: {x: 0, y: 1.25, z: 6.25} + move: {x: 0, y: 1, z: 5} jump: 0 waitTime: 30 animIndex: 0 @@ -419251,7 +419214,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 437522092} - {fileID: 1345416429} @@ -440164,7 +440126,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 466046481} - {fileID: 673053385} @@ -440619,7 +440580,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 152972296} - {fileID: 585328361} @@ -442223,7 +442183,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 2098404263} - {fileID: 1393703359} @@ -451063,7 +451022,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 152972296} - {fileID: 585328361} @@ -451770,7 +451728,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 190904766} - {fileID: 2142227432} @@ -472830,7 +472787,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 296107525} - {fileID: 216444502} @@ -478876,7 +478832,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 466046481} - {fileID: 673053385} @@ -480417,7 +480372,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 152972296} - {fileID: 585328361} @@ -481716,7 +481670,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1846738112} - {fileID: 2098404263} @@ -490398,7 +490351,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 1846738112} - {fileID: 1393703359} @@ -490948,7 +490900,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 466046481} - {fileID: 673053385} @@ -491561,7 +491512,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 466046481} - {fileID: 673053385} @@ -502092,7 +502042,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ab9cdf397a3bded42970ef67bc0703c7, type: 3} m_Name: m_EditorClassIdentifier: - cameraFollow: {fileID: 1618555983} endPoint: - {fileID: 190904766} - {fileID: 1913239225} diff --git a/Gutterball 3/Assets/Scripts/Game.cs b/Gutterball 3/Assets/Scripts/Game.cs index 7a120e0c..a938610b 100644 --- a/Gutterball 3/Assets/Scripts/Game.cs +++ b/Gutterball 3/Assets/Scripts/Game.cs @@ -1460,7 +1460,7 @@ public class Game : MonoBehaviour replays[i].SetTransform(0); } cameraFollow.Replay(replayIndex); - yield return new WaitForSeconds(replayTime * 1.5f); + yield return new WaitForSeconds(replayTime * 1.25f); replayText.SetActive(false); for (int i = 0; i < replays.Length; i++) { diff --git a/Gutterball 3/Library/AssetImportState b/Gutterball 3/Library/AssetImportState index 71a7592c..715f58c1 100644 --- a/Gutterball 3/Library/AssetImportState +++ b/Gutterball 3/Library/AssetImportState @@ -1 +1 @@ -2;0;196608;0;0 \ No newline at end of file +19;0;4;0;0 \ No newline at end of file diff --git a/Gutterball 3/Library/CurrentLayout.dwlt b/Gutterball 3/Library/CurrentLayout.dwlt index 7a477cdc..4dcf0a7a 100644 --- a/Gutterball 3/Library/CurrentLayout.dwlt +++ b/Gutterball 3/Library/CurrentLayout.dwlt @@ -21,7 +21,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 2} - m_MinSize: {x: 950, y: 300} + m_MinSize: {x: 950, y: 548} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -45,7 +45,7 @@ MonoBehaviour: y: 0 width: 1366 height: 685 - m_MinSize: {x: 950, y: 300} + m_MinSize: {x: 950, y: 548} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &3 MonoBehaviour: @@ -111,10 +111,10 @@ MonoBehaviour: y: 30 width: 1366 height: 635 - m_MinSize: {x: 681, y: 498} + m_MinSize: {x: 683, y: 498} m_MaxSize: {x: 14004, y: 14048} vertical: 0 - controlID: 308 + controlID: 1450 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -134,12 +134,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1086 + width: 1089 height: 635 - m_MinSize: {x: 404, y: 498} + m_MinSize: {x: 406, y: 498} m_MaxSize: {x: 10002, y: 14048} vertical: 1 - controlID: 309 + controlID: 1451 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -159,12 +159,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1086 - height: 357 - m_MinSize: {x: 404, y: 224} - m_MaxSize: {x: 8004, y: 4024} + width: 1089 + height: 354 + m_MinSize: {x: 406, y: 224} + m_MaxSize: {x: 8006, y: 4024} vertical: 0 - controlID: 310 + controlID: 1510 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -183,7 +183,7 @@ MonoBehaviour: x: 0 y: 0 width: 202 - height: 357 + height: 354 m_MinSize: {x: 202, y: 224} m_MaxSize: {x: 4002, y: 4024} m_ActualView: {fileID: 13} @@ -208,8 +208,8 @@ MonoBehaviour: serializedVersion: 2 x: 202 y: 0 - width: 884 - height: 357 + width: 887 + height: 354 m_MinSize: {x: 204, y: 224} m_MaxSize: {x: 4004, y: 4024} m_ActualView: {fileID: 14} @@ -235,9 +235,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 357 - width: 1086 - height: 278 + y: 354 + width: 1089 + height: 281 m_MinSize: {x: 232, y: 274} m_MaxSize: {x: 10002, y: 10024} m_ActualView: {fileID: 16} @@ -261,9 +261,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1086 + x: 1089 y: 0 - width: 280 + width: 277 height: 635 m_MinSize: {x: 277, y: 74} m_MaxSize: {x: 4002, y: 4024} @@ -295,8 +295,8 @@ MonoBehaviour: serializedVersion: 2 x: 202 y: 73 - width: 880 - height: 337 + width: 883 + height: 334 m_PersistentViewDataDictionary: {fileID: 0} m_MaximizeOnPlay: 0 m_Gizmos: 0 @@ -329,25 +329,25 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 880 - height: 320 - m_Scale: {x: 0.41666666, y: 0.41666666} - m_Translation: {x: 440, y: 160} + width: 883 + height: 317 + m_Scale: {x: 0.4127604, y: 0.4127604} + m_Translation: {x: 441.5, y: 158.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1056 + x: -1069.6278 y: -384 - width: 2112 + width: 2139.2556 height: 768 m_MinimalGUI: 1 - m_defaultScale: 0.41666666 + m_defaultScale: 0.4127604 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 880, y: 337} + m_LastWindowPixelSize: {x: 883, y: 334} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000100000100 @@ -376,14 +376,14 @@ MonoBehaviour: x: 0 y: 73 width: 200 - height: 337 + height: 334 m_PersistentViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 7e430000 m_LastClickedID: 0 - m_ExpandedIDs: 4cb4ffff6ab4ffffc2b5ffffceb5ffff42b7ffff60b7ffffbcb8ffffccb8ffffa8f9ffffd6fbffff + m_ExpandedIDs: fe83ffff7a84ffff9884ffff6a86ffff7486fffffe86ffff1c87fffff288ffff0089ffffce89ffffba9dffff42dfffff12f9ffffbcfbffff909e0000d6ba0000042806004e440600 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -430,8 +430,8 @@ MonoBehaviour: serializedVersion: 2 x: 202 y: 73 - width: 880 - height: 337 + width: 883 + height: 334 m_PersistentViewDataDictionary: {fileID: 0} m_WindowGUID: 7ab201495f983b84296371fb6596664d m_SceneLighting: 1 @@ -535,9 +535,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 430 - width: 1084 - height: 258 + y: 427 + width: 1087 + height: 261 m_PersistentViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -561,10 +561,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 243} - m_SelectedIDs: d6310000 - m_LastClickedID: 12758 - m_ExpandedIDs: 000000009a26000000ca9a3b + scrollPos: {x: 0, y: 183} + m_SelectedIDs: e2310000 + m_LastClickedID: 12770 + m_ExpandedIDs: 00000000a626000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -592,7 +592,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a26000000ca9a3b + m_ExpandedIDs: 00000000a626000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -619,7 +619,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000054380000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -694,9 +694,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1086 + x: 1089 y: 73 - width: 278 + width: 275 height: 615 m_PersistentViewDataDictionary: {fileID: 0} m_ObjectsLockedBeforeSerialization: [] diff --git a/Gutterball 3/Library/CurrentMaximizeLayout.dwlt b/Gutterball 3/Library/CurrentMaximizeLayout.dwlt index 0558ec52..bce443e3 100644 --- a/Gutterball 3/Library/CurrentMaximizeLayout.dwlt +++ b/Gutterball 3/Library/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 681, y: 498} m_MaxSize: {x: 14004, y: 14048} vertical: 0 - controlID: 119 + controlID: 1053 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -129,7 +129,7 @@ MonoBehaviour: m_MinSize: {x: 404, y: 498} m_MaxSize: {x: 10002, y: 14048} vertical: 1 - controlID: 120 + controlID: 1054 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -154,7 +154,7 @@ MonoBehaviour: m_MinSize: {x: 404, y: 224} m_MaxSize: {x: 8004, y: 4024} vertical: 0 - controlID: 121 + controlID: 1055 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -209,10 +209,10 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: 72430000 - m_LastClickedID: 0 - m_ExpandedIDs: a8f9ffffd6fbffff + scrollPos: {x: 0, y: 1876} + m_SelectedIDs: 78360600 + m_LastClickedID: 407160 + m_ExpandedIDs: ba9dffff42dfffff12f9ffffbcfbffff909e0000d6ba0000042806004e440600 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -328,7 +328,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: -1, z: 0, w: 0} speed: 2 - m_Value: {x: 0, y: -1, z: 0, w: 0} + m_Value: {x: -0, y: 1, z: -0, w: -0} m_Size: m_Target: 91.452286 speed: 2 @@ -445,10 +445,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 243} - m_SelectedIDs: d6310000 - m_LastClickedID: 12758 - m_ExpandedIDs: 000000009a26000000ca9a3b + scrollPos: {x: 0, y: 183} + m_SelectedIDs: e2310000 + m_LastClickedID: 12770 + m_ExpandedIDs: 00000000a626000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -476,7 +476,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a260000 + m_ExpandedIDs: 00000000a626000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -501,9 +501,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 72430000 - m_LastClickedInstanceID: 17266 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: 78360600 + m_LastClickedInstanceID: 407160 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c623000054380000 m_RenameOverlay: m_UserAcceptedRename: 0 diff --git a/Gutterball 3/Library/EditorUserBuildSettings.asset b/Gutterball 3/Library/EditorUserBuildSettings.asset index fe40869f..b75e94c4 100644 Binary files a/Gutterball 3/Library/EditorUserBuildSettings.asset and b/Gutterball 3/Library/EditorUserBuildSettings.asset differ diff --git a/Gutterball 3/Library/InspectorExpandedItems.asset b/Gutterball 3/Library/InspectorExpandedItems.asset index 37c60942..39fc0369 100644 Binary files a/Gutterball 3/Library/InspectorExpandedItems.asset and b/Gutterball 3/Library/InspectorExpandedItems.asset differ diff --git a/Gutterball 3/Library/LastBuild.buildreport b/Gutterball 3/Library/LastBuild.buildreport index a47e333a..737c6680 100644 Binary files a/Gutterball 3/Library/LastBuild.buildreport and b/Gutterball 3/Library/LastBuild.buildreport differ diff --git a/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/globalgamemanagers b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/globalgamemanagers index 3213f9b4..772a1234 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/globalgamemanagers and b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/globalgamemanagers differ diff --git a/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level1 b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level1 index 4f6e0a16..d0733246 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level1 and b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level1 differ diff --git a/Gutterball 3/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Gutterball 3/Library/PlayerDataCache/Win/Data/globalgamemanagers index c16bbe9e..154b9359 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/Win/Data/globalgamemanagers and b/Gutterball 3/Library/PlayerDataCache/Win/Data/globalgamemanagers differ diff --git a/Gutterball 3/Library/PlayerDataCache/Win/Data/level1 b/Gutterball 3/Library/PlayerDataCache/Win/Data/level1 index 9ea213e6..5ccafe48 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/Win/Data/level1 and b/Gutterball 3/Library/PlayerDataCache/Win/Data/level1 differ diff --git a/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index b628a002..92a5fa34 100644 Binary files a/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Gutterball 3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/Gutterball 3/Library/ScriptAssemblies/BuiltinAssemblies.stamp b/Gutterball 3/Library/ScriptAssemblies/BuiltinAssemblies.stamp new file mode 100644 index 00000000..1df0ee74 --- /dev/null +++ b/Gutterball 3/Library/ScriptAssemblies/BuiltinAssemblies.stamp @@ -0,0 +1 @@ +08d6f838b18a6d00.08d6f838b3ecc700 \ No newline at end of file diff --git a/Gutterball 3/Library/ShaderCache.db b/Gutterball 3/Library/ShaderCache.db index 9c6b2786..38ba0ea3 100644 Binary files a/Gutterball 3/Library/ShaderCache.db and b/Gutterball 3/Library/ShaderCache.db differ diff --git a/Gutterball 3/Library/assetDatabase3 b/Gutterball 3/Library/assetDatabase3 index 277a80ff..dc723135 100644 Binary files a/Gutterball 3/Library/assetDatabase3 and b/Gutterball 3/Library/assetDatabase3 differ diff --git a/Gutterball 3/Library/metadata/34/34f957bc4f4931b4ba638c1b24eaec90.info b/Gutterball 3/Library/metadata/34/34f957bc4f4931b4ba638c1b24eaec90.info index 3ba5b5dc..9b05cfb2 100644 Binary files a/Gutterball 3/Library/metadata/34/34f957bc4f4931b4ba638c1b24eaec90.info and b/Gutterball 3/Library/metadata/34/34f957bc4f4931b4ba638c1b24eaec90.info differ diff --git a/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 b/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 index 084623d6..03f92e97 100644 Binary files a/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 and b/Gutterball 3/Library/metadata/c5/c566abd4b5ef9e144ad0a426caa8a843 differ diff --git a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log index 1aaf4ab0..aadc9511 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -6,5 +6,3 @@ Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler diff --git a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log index b6d0814f..d8d62c6c 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log @@ -1,3 +1,4 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.3f1/Editor/Data Cmd: initializeCompiler Cmd: initializeCompiler +Cmd: initializeCompiler diff --git a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log index b6d0814f..d8d62c6c 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log @@ -1,3 +1,4 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.3f1/Editor/Data Cmd: initializeCompiler Cmd: initializeCompiler +Cmd: initializeCompiler diff --git a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log index b6d0814f..d8d62c6c 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log @@ -1,3 +1,4 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.3f1/Editor/Data Cmd: initializeCompiler Cmd: initializeCompiler +Cmd: initializeCompiler diff --git a/Mac.zip b/Mac.zip index b58df9bd..d5ae6e97 100644 Binary files a/Mac.zip and b/Mac.zip differ diff --git a/PC.zip b/PC.zip index e77c7d05..ca0aa257 100644 Binary files a/PC.zip and b/PC.zip differ