diff --git a/Gutterball 3/Assembly-CSharp-Editor.csproj b/Gutterball 3/Assembly-CSharp-Editor.csproj index e725562c..0d53bd5b 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_4;UNITY_2018_4;UNITY_2018;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 + 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_4;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 prompt 4 0169 diff --git a/Gutterball 3/Assembly-CSharp.csproj b/Gutterball 3/Assembly-CSharp.csproj index fc6941ca..bc73c3ca 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_4;UNITY_2018_4;UNITY_2018;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 + 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_4;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 prompt 4 0169 @@ -208,6 +208,9 @@ C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + + C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpatialTrackingModule.dll + C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll diff --git a/Gutterball 3/Assets/Scenes/Main.unity b/Gutterball 3/Assets/Scenes/Main.unity index 1af0d5cd..4878ea9e 100644 --- a/Gutterball 3/Assets/Scenes/Main.unity +++ b/Gutterball 3/Assets/Scenes/Main.unity @@ -251080,6 +251080,7 @@ MonoBehaviour: - https://cdn.ghstatic.com/images/deluxe/300x150/200068.jpg - https://cdn.ghstatic.com/images/deluxe/300x150/200066.jpg - https://cdn.ghstatic.com/images/deluxe/300x150/200251.jpg + - https://cdn.ghstatic.com/images/deluxe/300x150/200210.jpg - https://cdn.ghstatic.com/images/deluxe/300x150/200211.jpg chooseBallIndex: 0 turnBalls1: 0 diff --git a/Gutterball 3/Assets/Scenes/Splash.unity b/Gutterball 3/Assets/Scenes/Splash.unity index f55549bf..c07c0e8e 100644 --- a/Gutterball 3/Assets/Scenes/Splash.unity +++ b/Gutterball 3/Assets/Scenes/Splash.unity @@ -5016,6 +5016,7 @@ MonoBehaviour: - https://cdn.ghstatic.com/images/deluxe/300x150/200068.jpg - https://cdn.ghstatic.com/images/deluxe/300x150/200066.jpg - https://cdn.ghstatic.com/images/deluxe/300x150/200251.jpg + - https://cdn.ghstatic.com/images/deluxe/300x150/200210.jpg - https://cdn.ghstatic.com/images/deluxe/300x150/200211.jpg chooseBallIndex: 0 turnBalls1: 0 diff --git a/Gutterball 3/Assets/Sprites/05_Lotus.png b/Gutterball 3/Assets/Sprites/05_Lotus.png index a996e658..2b15a67a 100644 Binary files a/Gutterball 3/Assets/Sprites/05_Lotus.png and b/Gutterball 3/Assets/Sprites/05_Lotus.png differ diff --git a/Gutterball 3/Library/AssetImportState b/Gutterball 3/Library/AssetImportState index 6b75fc6c..71a7592c 100644 --- a/Gutterball 3/Library/AssetImportState +++ b/Gutterball 3/Library/AssetImportState @@ -1 +1 @@ -5;0;4;0;0 \ No newline at end of file +2;0;196608;0;0 \ No newline at end of file diff --git a/Gutterball 3/Library/CurrentLayout.dwlt b/Gutterball 3/Library/CurrentLayout.dwlt index 9c1ee73d..d68c4f4f 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: 548} + m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -111,10 +111,10 @@ MonoBehaviour: y: 30 width: 1366 height: 635 - m_MinSize: {x: 683, y: 498} + m_MinSize: {x: 681, y: 498} m_MaxSize: {x: 14004, y: 14048} vertical: 0 - controlID: 47 + controlID: 3812 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -136,10 +136,10 @@ MonoBehaviour: y: 0 width: 1088 height: 635 - m_MinSize: {x: 406, y: 498} + m_MinSize: {x: 404, y: 498} m_MaxSize: {x: 10002, y: 14048} vertical: 1 - controlID: 48 + controlID: 3735 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -161,10 +161,10 @@ MonoBehaviour: y: 0 width: 1088 height: 359 - m_MinSize: {x: 406, y: 224} - m_MaxSize: {x: 8006, y: 4024} + m_MinSize: {x: 404, y: 224} + m_MaxSize: {x: 8004, y: 4024} vertical: 0 - controlID: 49 + controlID: 3736 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -184,8 +184,8 @@ MonoBehaviour: y: 0 width: 203 height: 359 - m_MinSize: {x: 202, y: 224} - m_MaxSize: {x: 4002, y: 4024} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -382,10 +382,10 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 494} - m_SelectedIDs: 9a430000 + scrollPos: {x: 0, y: 0} + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 38f3fffff2f4ffff10f5ffff6af6ffff76f6ffffbcf7ffffdaf7ffff34f9ffff42f9ffffc4fbffff + m_ExpandedIDs: acc0ffffcac0ffff24c2ffff30c2ffffb2c3ffffd0c3ffff2ec5ffff3cc5ffff3cc6ffff1ec8ffff72f3ffff48f9ffff8ef9ffffd6fbffffc6930100eedf010048e1010066e901005cf501003afa0100fafa01004afc01001e020200f4070200362a02008c320200523f0200344002008e420200a0420200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -628,9 +628,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 293} - m_SelectedIDs: f4310000 - m_LastClickedID: 12788 - m_ExpandedIDs: 00000000b2260000d43900002e3e000000ca9a3b + m_SelectedIDs: de310000 + m_LastClickedID: 12766 + m_ExpandedIDs: 000000009c260000be390000183e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -658,7 +658,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000b2260000d43900002e3e0000 + m_ExpandedIDs: 000000009c260000be390000183e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -767,7 +767,7 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 2290986 + m_LastSelectedObjectID: 147438 --- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 diff --git a/Gutterball 3/Library/CurrentMaximizeLayout.dwlt b/Gutterball 3/Library/CurrentMaximizeLayout.dwlt index 9a708e5a..2e6ce2df 100644 --- a/Gutterball 3/Library/CurrentMaximizeLayout.dwlt +++ b/Gutterball 3/Library/CurrentMaximizeLayout.dwlt @@ -21,10 +21,10 @@ MonoBehaviour: y: 30 width: 1366 height: 635 - m_MinSize: {x: 683, y: 498} + m_MinSize: {x: 681, y: 498} m_MaxSize: {x: 14004, y: 14048} vertical: 0 - controlID: 25096 + controlID: 2798 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -126,10 +126,10 @@ MonoBehaviour: y: 0 width: 1088 height: 635 - m_MinSize: {x: 406, y: 498} + m_MinSize: {x: 404, y: 498} m_MaxSize: {x: 10002, y: 14048} vertical: 1 - controlID: 25097 + controlID: 2799 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -151,10 +151,10 @@ MonoBehaviour: y: 0 width: 1088 height: 359 - m_MinSize: {x: 406, y: 224} - m_MaxSize: {x: 8006, y: 4024} + m_MinSize: {x: 404, y: 224} + m_MaxSize: {x: 8004, y: 4024} vertical: 0 - controlID: 25098 + controlID: 2800 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -209,10 +209,10 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_SceneHierarchy: m_TreeViewState: - scrollPos: {x: 0, y: 1448} - m_SelectedIDs: 2af52200 - m_LastClickedID: 2290986 - m_ExpandedIDs: 22eafbff8aecfbffa016fcff6a17fcffe018fcffaa19fcff781afcff421bfcff283cfcff423dfcffa03dfcff6062fcff6288fcff4089fcffce91fcffeaa0fcff96a1fcff5aa5fcffb4a5fcff28aafcffeae1fcffd6eefcff44f2fcffbc7afeffd6f6ffffd6fbffff74421400f24514008a721400562a1800c63118000c3f1800d04518000e471800f2511800788b18005c9b18001c271900b63c190066421900c84319000e44190022461900f04a1900a64b190052501900fa5719004e5f1900fa6219007c6619005e6819008a6b1900d08b1a0032941a003c941a00e6941a000c971a0036a21a003ca81a0012ab1a002cab1a0008b51a0058b51a0012bd1a00e4be1a003cd81a009ee01a00a8e01a0052e11a0078e31a00a2ee1a00a8f41a007ef71a0098f71a0074011b00c4011b007e091b00500b1b00568b1c00828b1c0086901c00d8901c0056911c00a0911c00b2931c00a2a51c00bea91c008eaa1c00d6ac1c0004ae1c0072ae1c0098b11c00f2b61c0050b91c003ac11c001cc51c005cc51c0052cb1c00026a20002e6a2000e26e2000326f2000846f2000b66f20004c7020005e722000d47b20009e7e2000fc7f2000908320004e842000028720003a892000828b2000b08c20001e8d2000449020009e952000fc972000c8a3200008a4200068a72000e8a720007ea9200090a92000fea92000f4b020006cb6220064b92200aabe2200b6be220070bf220024c1220050c22200d0c32200e4c4220028c5220004c6220048cd2200d2cd22006ad122008ed7220066d9220040e1220080e22200e6e9220014ea220040ea220052ea220040ec22006af6220008f72200b0f72200e8f7220058f9220074f92200a6fe2200d8ff2200 + scrollPos: {x: 0, y: 1140} + m_SelectedIDs: ee3f0200 + m_LastClickedID: 147438 + m_ExpandedIDs: 72f3ffff48f9ffff8ef9ffffd6fbffffc6930100eedf010048e1010066e901005cf501003afa0100fafa01004afc01001e020200f4070200362a02008c320200523f0200344002008e420200a0420200 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -264,7 +264,7 @@ MonoBehaviour: - {fileID: 9} - {fileID: 10} m_Selected: 1 - m_LastSelected: 3 + m_LastSelected: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -297,9 +297,9 @@ MonoBehaviour: m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 474.30292, y: -12.942143, z: -1754.6925} + m_Target: {x: -0.0000019073486, y: 64, z: 128} speed: 2 - m_Value: {x: 474.30292, y: -12.942143, z: -1754.6925} + m_Value: {x: -0.0000019073486, y: 64, z: 128} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -327,13 +327,13 @@ MonoBehaviour: speed: 2 m_Value: 0 m_Rotation: - m_Target: {x: 0.015062163, y: 0.8252113, z: 0.02203037, w: -0.5641934} + m_Target: {x: 0, y: -1, z: 0, w: 0} speed: 2 - m_Value: {x: 0.015062163, y: 0.8252112, z: 0.022030368, w: -0.56419337} + m_Value: {x: -0, y: 1, z: -0, w: -0} m_Size: - m_Target: 25.192444 + m_Target: 91.452286 speed: 2 - m_Value: 25.192444 + m_Value: 91.452286 m_Ortho: m_Target: 0 speed: 2 @@ -501,20 +501,20 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Resources/TVScreen + - Assets/Scenes m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Resources/TVScreen + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: C:\Users\Asus\Documents\GitHub\gutterball-3\Gutterball 3 m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 365} - m_SelectedIDs: 36440000 - m_LastClickedID: 17462 - m_ExpandedIDs: 000000009a260000de2f000000ca9a3b + scrollPos: {x: 0, y: 293} + m_SelectedIDs: de310000 + m_LastClickedID: 12766 + m_ExpandedIDs: 000000009c260000be390000183e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -542,7 +542,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000009a260000de2f000000ca9a3b + m_ExpandedIDs: 000000009c260000be390000183e000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -567,9 +567,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 2af52200 - m_LastClickedInstanceID: 2290986 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: ee3f0200 + m_LastClickedInstanceID: 147438 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c62300001e3200002c3500009c36000042350000e82800005c32000000000000123c0000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -594,7 +594,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 174} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_DirectoriesAreaWidth: 115 --- !u!114 &13 @@ -651,7 +651,7 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 2278656 + m_LastSelectedObjectID: 147780 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 diff --git a/Gutterball 3/Library/EditorUserBuildSettings.asset b/Gutterball 3/Library/EditorUserBuildSettings.asset index f86fc6dc..ca6127d5 100644 Binary files a/Gutterball 3/Library/EditorUserBuildSettings.asset and b/Gutterball 3/Library/EditorUserBuildSettings.asset differ diff --git a/Gutterball 3/Library/LastBuild.buildreport b/Gutterball 3/Library/LastBuild.buildreport index 653f5ff0..e6512b0f 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 ff9817ec..e063460f 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/level0 b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level0 index df5b1c90..cff98b4a 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level0 and b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level0 differ diff --git a/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level1 b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/level1 index 0946343e..0d948175 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/OSXUniversal/Data/sharedassets0.assets.resS b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/sharedassets0.assets.resS index f8a7f2a0..5ede31de 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/sharedassets0.assets.resS and b/Gutterball 3/Library/PlayerDataCache/OSXUniversal/Data/sharedassets0.assets.resS differ diff --git a/Gutterball 3/Library/PlayerDataCache/Win/Data/globalgamemanagers b/Gutterball 3/Library/PlayerDataCache/Win/Data/globalgamemanagers index f411a419..fea09a8f 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/level0 b/Gutterball 3/Library/PlayerDataCache/Win/Data/level0 index e2141a40..cce17a5f 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/Win/Data/level0 and b/Gutterball 3/Library/PlayerDataCache/Win/Data/level0 differ diff --git a/Gutterball 3/Library/PlayerDataCache/Win/Data/level1 b/Gutterball 3/Library/PlayerDataCache/Win/Data/level1 index 07d41c1c..902fd9d1 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/PlayerDataCache/Win/Data/sharedassets0.assets.resS b/Gutterball 3/Library/PlayerDataCache/Win/Data/sharedassets0.assets.resS index f8a7f2a0..5ede31de 100644 Binary files a/Gutterball 3/Library/PlayerDataCache/Win/Data/sharedassets0.assets.resS and b/Gutterball 3/Library/PlayerDataCache/Win/Data/sharedassets0.assets.resS differ diff --git a/Gutterball 3/Library/ProjectSettings.asset b/Gutterball 3/Library/ProjectSettings.asset index 47306448..eae3b8d6 100644 --- a/Gutterball 3/Library/ProjectSettings.asset +++ b/Gutterball 3/Library/ProjectSettings.asset @@ -118,7 +118,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.5 + bundleVersion: 1.51 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/Gutterball 3/Library/ScriptAssemblies/BuiltinAssemblies.stamp b/Gutterball 3/Library/ScriptAssemblies/BuiltinAssemblies.stamp deleted file mode 100644 index 59c1f3b0..00000000 --- a/Gutterball 3/Library/ScriptAssemblies/BuiltinAssemblies.stamp +++ /dev/null @@ -1 +0,0 @@ -08d7040532369500.08d704053367c200 \ No newline at end of file diff --git a/Gutterball 3/Library/assetDatabase3 b/Gutterball 3/Library/assetDatabase3 index 531f720f..8047310f 100644 Binary files a/Gutterball 3/Library/assetDatabase3 and b/Gutterball 3/Library/assetDatabase3 differ diff --git a/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01 b/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01 index 7ae20c4e..4813fbe3 100644 Binary files a/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01 and b/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01 differ diff --git a/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01.info b/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01.info index ab2056f8..bf853baa 100644 Binary files a/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01.info and b/Gutterball 3/Library/metadata/2b/2b13d1ef48c676d4ebe32e412ea58e01.info differ diff --git a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log index 4d0995ae..0a1994c9 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -4,4 +4,3 @@ 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 768e4dee..4472314c 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log @@ -1,5 +1,3 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data Cmd: initializeCompiler 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 768e4dee..4472314c 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log @@ -1,5 +1,3 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data Cmd: initializeCompiler 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 768e4dee..4472314c 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log @@ -1,5 +1,3 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.4f1/Editor/Data Cmd: initializeCompiler Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler diff --git a/Gutterball 3/ProjectSettings/ProjectSettings.asset b/Gutterball 3/ProjectSettings/ProjectSettings.asset index 47306448..eae3b8d6 100644 --- a/Gutterball 3/ProjectSettings/ProjectSettings.asset +++ b/Gutterball 3/ProjectSettings/ProjectSettings.asset @@ -118,7 +118,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.5 + bundleVersion: 1.51 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0