diff --git a/Gutterball 3/Assembly-CSharp-Editor.csproj b/Gutterball 3/Assembly-CSharp-Editor.csproj index b026fcaa..cbe0ce25 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_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_3;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 prompt 4 0169 diff --git a/Gutterball 3/Assembly-CSharp.csproj b/Gutterball 3/Assembly-CSharp.csproj index ff92ce15..8fcc8279 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_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_3;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 prompt 4 0169 diff --git a/Gutterball 3/Library/AssetImportState b/Gutterball 3/Library/AssetImportState index 715f58c1..6b75fc6c 100644 --- a/Gutterball 3/Library/AssetImportState +++ b/Gutterball 3/Library/AssetImportState @@ -1 +1 @@ -19;0;4;0;0 \ No newline at end of file +5;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 cf15001d..081f9094 100644 --- a/Gutterball 3/Library/CurrentLayout.dwlt +++ b/Gutterball 3/Library/CurrentLayout.dwlt @@ -114,7 +114,7 @@ MonoBehaviour: m_MinSize: {x: 683, y: 498} m_MaxSize: {x: 14004, y: 14048} vertical: 0 - controlID: 70 + controlID: 90 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,7 +139,7 @@ MonoBehaviour: m_MinSize: {x: 406, y: 498} m_MaxSize: {x: 10002, y: 14048} vertical: 1 - controlID: 71 + controlID: 103 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,7 +164,7 @@ MonoBehaviour: m_MinSize: {x: 406, y: 224} m_MaxSize: {x: 8006, y: 4024} vertical: 0 - controlID: 72 + controlID: 104 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -210,8 +210,8 @@ MonoBehaviour: y: 0 width: 887 height: 354 - m_MinSize: {x: 204, y: 224} - m_MaxSize: {x: 4004, y: 4024} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -381,9 +381,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 00580000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 709cfeff289efeffae9efeffcc9efeff9ea0feffa8a0feff30a1feff4ea1feff24a3feff32a3feff2ea4feff96dffeffc0e1fefff2c300008ef00000a6330100ee3401009c350100b8450100 + m_ExpandedIDs: 7af2ffff98f2fffff0f3fffffcf3ffffb2f5ffffd0f5ffff28f7ffff34f7ffff60f9ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -471,7 +471,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0, y: 1, z: 0, w: 0} speed: 2 - m_Value: {x: 0, y: 0.99999994, z: 0, w: 0} + m_Value: {x: 0, y: 1, z: 0, w: 0} m_Size: m_Target: 91.452286 speed: 2 @@ -562,9 +562,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 240} - m_SelectedIDs: d84d0000 - m_LastClickedID: 19928 - m_ExpandedIDs: 000000004848000000ca9a3b + m_SelectedIDs: a6360000 + m_LastClickedID: 13990 + m_ExpandedIDs: 000000008a2b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -592,7 +592,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000048480000 + m_ExpandedIDs: 000000008a2b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -619,7 +619,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 + 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 b75e94c4..f08b7fad 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 bc0e9044..7838af18 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 db269859..787c62f5 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/Win/Data/globalgamemanagers b/Gutterball 3/Library/PlayerDataCache/Win/Data/globalgamemanagers index 493728f2..bd248e49 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/ProjectSettings.asset b/Gutterball 3/Library/ProjectSettings.asset index e57f0d38..5d5802c4 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.43 + bundleVersion: 1.42 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/Gutterball 3/Library/StateCache/SceneView/7ab201-mainStage.json b/Gutterball 3/Library/StateCache/SceneView/7ab201-mainStage.json index d50274a5..d0012d32 100644 --- a/Gutterball 3/Library/StateCache/SceneView/7ab201-mainStage.json +++ b/Gutterball 3/Library/StateCache/SceneView/7ab201-mainStage.json @@ -1 +1 @@ -{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-0.0000019073486328125,"y":64.0,"z":128.0},"rotation":{"x":0.0,"y":0.9999999403953552,"z":0.0,"w":0.0},"size":91.45228576660156,"orthographic":false} \ No newline at end of file +{"cameraMode":{"drawMode":0,"name":"Shaded","section":"Shading Mode"},"sceneLighting":true,"audioPlay":false,"sceneViewState":{"showFog":true,"showMaterialUpdate":false,"showSkybox":true,"showFlares":true,"showImageEffects":true,"showParticleSystems":true},"in2DMode":false,"pivot":{"x":-0.0000019073486328125,"y":64.0,"z":128.0},"rotation":{"x":0.0,"y":1.0,"z":0.0,"w":0.0},"size":91.45228576660156,"orthographic":false} \ No newline at end of file diff --git a/Gutterball 3/Library/assetDatabase3 b/Gutterball 3/Library/assetDatabase3 index 6494c704..77230bf6 100644 Binary files a/Gutterball 3/Library/assetDatabase3 and b/Gutterball 3/Library/assetDatabase3 differ diff --git a/Gutterball 3/Library/metadata/4c/4c433abcdb28444ebb7bd395ba5c76fc b/Gutterball 3/Library/metadata/4c/4c433abcdb28444ebb7bd395ba5c76fc index a600ede2..8ab10255 100644 Binary files a/Gutterball 3/Library/metadata/4c/4c433abcdb28444ebb7bd395ba5c76fc and b/Gutterball 3/Library/metadata/4c/4c433abcdb28444ebb7bd395ba5c76fc differ diff --git a/Gutterball 3/Library/metadata/4d/4dfd3f5da88944ec6ac5977d676c30c6 b/Gutterball 3/Library/metadata/4d/4dfd3f5da88944ec6ac5977d676c30c6 index 6d32b1ed..d512bcbc 100644 Binary files a/Gutterball 3/Library/metadata/4d/4dfd3f5da88944ec6ac5977d676c30c6 and b/Gutterball 3/Library/metadata/4d/4dfd3f5da88944ec6ac5977d676c30c6 differ diff --git a/Gutterball 3/Library/metadata/59/599a5fd92bab81a4ab02e52d0b1b1c60 b/Gutterball 3/Library/metadata/59/599a5fd92bab81a4ab02e52d0b1b1c60 index 1d51c74b..3f9c1cfe 100644 Binary files a/Gutterball 3/Library/metadata/59/599a5fd92bab81a4ab02e52d0b1b1c60 and b/Gutterball 3/Library/metadata/59/599a5fd92bab81a4ab02e52d0b1b1c60 differ diff --git a/Gutterball 3/Library/metadata/ac/acc34040a66fe4170bc8885268860cfe b/Gutterball 3/Library/metadata/ac/acc34040a66fe4170bc8885268860cfe index 69fcd259..4d56cdc4 100644 Binary files a/Gutterball 3/Library/metadata/ac/acc34040a66fe4170bc8885268860cfe and b/Gutterball 3/Library/metadata/ac/acc34040a66fe4170bc8885268860cfe differ diff --git a/Gutterball 3/Library/metadata/f8/f8eca3a711f4842eba0c52ea9885ef7f b/Gutterball 3/Library/metadata/f8/f8eca3a711f4842eba0c52ea9885ef7f index 935b2bce..2948cc44 100644 Binary files a/Gutterball 3/Library/metadata/f8/f8eca3a711f4842eba0c52ea9885ef7f and b/Gutterball 3/Library/metadata/f8/f8eca3a711f4842eba0c52ea9885ef7f differ diff --git a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log index da34c341..8ab2ca89 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,30 +1,5 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.3f1/Editor/Data Cmd: initializeCompiler -Cmd: compileSnippet - api=4 type=0 insize=1278 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1278 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=0 insize=1564 outsize=1894 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1564 outsize=6814 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=0 insize=1426 outsize=1690 kw=UNITY_PASS_FORWARDADD DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1426 outsize=3378 kw=UNITY_PASS_FORWARDADD DIRECTIONAL pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=0 insize=1278 outsize=1534 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH _ALPHAPREMULTIPLY_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1278 outsize=714 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH _ALPHAPREMULTIPLY_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=0 insize=1564 outsize=1894 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH _ALPHAPREMULTIPLY_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1564 outsize=6858 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH _ALPHAPREMULTIPLY_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=0 insize=1426 outsize=1690 kw=UNITY_PASS_FORWARDADD DIRECTIONAL _ALPHAPREMULTIPLY_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1426 outsize=3454 kw=UNITY_PASS_FORWARDADD DIRECTIONAL _ALPHAPREMULTIPLY_ON pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR ok=1 -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 d8d62c6c..e67d72ee 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe1.log @@ -2,3 +2,4 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.3f1/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 d8d62c6c..e67d72ee 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe2.log @@ -2,3 +2,4 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.3f1/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 d8d62c6c..e67d72ee 100644 --- a/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log +++ b/Gutterball 3/Library/shadercompiler-UnityShaderCompiler.exe3.log @@ -2,3 +2,4 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.4.3f1/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 e57f0d38..5d5802c4 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.43 + bundleVersion: 1.42 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 diff --git a/Mac.zip b/Mac.zip index 7ab5a360..f3ecb29d 100644 Binary files a/Mac.zip and b/Mac.zip differ diff --git a/PC.zip b/PC.zip index e1be8caa..94d48b61 100644 Binary files a/PC.zip and b/PC.zip differ