diff --git a/AK.Wwise.Unity.API.WwiseTypes.csproj b/AK.Wwise.Unity.API.WwiseTypes.csproj index 358417c02..3327bf584 100644 --- a/AK.Wwise.Unity.API.WwiseTypes.csproj +++ b/AK.Wwise.Unity.API.WwiseTypes.csproj @@ -27,7 +27,7 @@ full false Temp\Bin\Debug\ - DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD + DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;UNITY_ADDRESSABLES;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD prompt 4 @@ -686,6 +686,9 @@ E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll + + E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Addressables.dll + E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/AK.Wwise.Unity.API.csproj b/AK.Wwise.Unity.API.csproj index b5050d234..253d4bd18 100644 --- a/AK.Wwise.Unity.API.csproj +++ b/AK.Wwise.Unity.API.csproj @@ -27,7 +27,7 @@ full false Temp\Bin\Debug\ - DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD + DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;UNITY_ADDRESSABLES;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD prompt 4 diff --git a/AK.Wwise.Unity.MonoBehaviour.Editor.csproj b/AK.Wwise.Unity.MonoBehaviour.Editor.csproj index a40532910..a9271306b 100644 --- a/AK.Wwise.Unity.MonoBehaviour.Editor.csproj +++ b/AK.Wwise.Unity.MonoBehaviour.Editor.csproj @@ -27,7 +27,7 @@ full false Temp\Bin\Debug\ - DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD + DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;UNITY_ADDRESSABLES;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD prompt 4 diff --git a/AK.Wwise.Unity.MonoBehaviour.csproj b/AK.Wwise.Unity.MonoBehaviour.csproj index 027d1b7f3..00a710f81 100644 --- a/AK.Wwise.Unity.MonoBehaviour.csproj +++ b/AK.Wwise.Unity.MonoBehaviour.csproj @@ -27,7 +27,7 @@ full false Temp\Bin\Debug\ - DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD + DEBUG;TRACE;UNITY_2020_3_2;UNITY_2020_3;UNITY_2020;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_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;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;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;NET_4_6;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_INPUT_SYSTEM;UNITY_POST_PROCESSING_STACK_V2;TEST_MSAGL;REPORTING;PERSISTENCE;SUBSTANCE_PLUGIN_ENABLED;UNITY_ADDRESSABLES;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;DEVELOPMENT_BUILD prompt 4 @@ -708,6 +708,12 @@ E:/Applications/Unity Editors/2020.3.2f1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll + + E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.Addressables.dll + + + E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/Unity.ResourceManager.dll + E:/Projects/Aetheria-Economy/Library/ScriptAssemblies/UnityEditor.UI.dll diff --git a/Asset Sources/Mouse.png b/Asset Sources/Mouse.png deleted file mode 100644 index c71018e8f..000000000 --- a/Asset Sources/Mouse.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcb71c61aaec4f933bcedd1c6cdc28a091d10150a208951f481875b287b439ae -size 30936 diff --git a/Asset Sources/Mouse_0000_Forward-copy.png b/Asset Sources/Mouse_0000_Forward-copy.png deleted file mode 100644 index a9fbd2f17..000000000 --- a/Asset Sources/Mouse_0000_Forward-copy.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4528458e8269bb63b39a3c71dd18a6e89289e80fd9b3963c96037fe9860448b9 -size 3764 diff --git a/Asset Sources/Mouse_0000_Layer-5.png b/Asset Sources/Mouse_0000_Layer-5.png deleted file mode 100644 index 4af86806b..000000000 --- a/Asset Sources/Mouse_0000_Layer-5.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:266c49341ee0f8ca416498900b0fab360af077a1590d62f83f72c51609ec96eb -size 4516 diff --git a/Asset Sources/Mouse_0001_Forward.png b/Asset Sources/Mouse_0001_Forward.png deleted file mode 100644 index 1db9b6653..000000000 --- a/Asset Sources/Mouse_0001_Forward.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d5af6be54c37586e83d0cedead0e25624654ba8462b2fc3f150e2ff86a9e05f -size 3710 diff --git a/Asset Sources/Mouse_0001_Layer-4.png b/Asset Sources/Mouse_0001_Layer-4.png deleted file mode 100644 index 9c61889ed..000000000 --- a/Asset Sources/Mouse_0001_Layer-4.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7d0bef19a451cfe53b34e145d5ba2ac260baaca7ec1ba15f19c6d19dd15abd5 -size 6127 diff --git a/Asset Sources/Mouse_0002_Layer-3.png b/Asset Sources/Mouse_0002_Layer-3.png deleted file mode 100644 index 613f73c3e..000000000 --- a/Asset Sources/Mouse_0002_Layer-3.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e8cefcecf39d3df12cfd1ee1cbef38f22519d50be2c1709636254840026c0c7 -size 6229 diff --git a/Asset Sources/Mouse_0002_Middle-copy.png b/Asset Sources/Mouse_0002_Middle-copy.png deleted file mode 100644 index 43e073f90..000000000 --- a/Asset Sources/Mouse_0002_Middle-copy.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5e287fc218e5c1034eb5ba7955bc2ed7bedd324549f1e7d7259b343b22e67445 -size 4429 diff --git a/Asset Sources/Mouse_0003_Layer-8.png b/Asset Sources/Mouse_0003_Layer-8.png deleted file mode 100644 index a76a11a39..000000000 --- a/Asset Sources/Mouse_0003_Layer-8.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:171e5eb85c4198489d3f82ed32c48be38db7b203b6fd6a31955d32d09c6dd5ac -size 3913 diff --git a/Asset Sources/Mouse_0003_Middle.png b/Asset Sources/Mouse_0003_Middle.png deleted file mode 100644 index 42804a6ed..000000000 --- a/Asset Sources/Mouse_0003_Middle.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:112605667ec859131219790eb10a732ad2f4e0188b7ad89ca74fa943a4f0a1c0 -size 4242 diff --git a/Asset Sources/Mouse_0004_Layer-9.png b/Asset Sources/Mouse_0004_Layer-9.png deleted file mode 100644 index 48053c0ff..000000000 --- a/Asset Sources/Mouse_0004_Layer-9.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:892b17d93c31a81c25a0aa2cac7ce782ba766a351891448e4d065db406301e65 -size 3918 diff --git a/Asset Sources/Mouse_0004_Right-copy.png b/Asset Sources/Mouse_0004_Right-copy.png deleted file mode 100644 index 457d269ac..000000000 --- a/Asset Sources/Mouse_0004_Right-copy.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ee786ccb49ca207821d67da20a2efc5e7fc9cc303c5c58b54c7632e19e31b8d -size 6158 diff --git a/Asset Sources/Mouse_0005_Layer-10-copy.png b/Asset Sources/Mouse_0005_Layer-10-copy.png deleted file mode 100644 index dbb759be5..000000000 --- a/Asset Sources/Mouse_0005_Layer-10-copy.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6d470249f79ef41f068446ec66beebf9c8a28077a2ee4c4f487167b2c4faa367 -size 14663 diff --git a/Asset Sources/Mouse_0005_Right.png b/Asset Sources/Mouse_0005_Right.png deleted file mode 100644 index 6042acbf0..000000000 --- a/Asset Sources/Mouse_0005_Right.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c87fa62d61f6ba9c4ad978f4e8c3bcc97825e3023ba2f5a6b5f16b061057b80c -size 5279 diff --git a/Asset Sources/Mouse_0006_Layer-10.png b/Asset Sources/Mouse_0006_Layer-10.png deleted file mode 100644 index 932852250..000000000 --- a/Asset Sources/Mouse_0006_Layer-10.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79d9d5a21e49f529203c42ac4ef91552d24bfd26353bb6313f8643160b92dcce -size 14715 diff --git a/Asset Sources/Mouse_0006_Left-copy.png b/Asset Sources/Mouse_0006_Left-copy.png deleted file mode 100644 index 59a13437a..000000000 --- a/Asset Sources/Mouse_0006_Left-copy.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f6efc0d9049aa085afb7711cd8aebd3a000067769de3336ef5d404b75cafc502 -size 6206 diff --git a/Asset Sources/Mouse_0007_Left.png b/Asset Sources/Mouse_0007_Left.png deleted file mode 100644 index dfe82c2b9..000000000 --- a/Asset Sources/Mouse_0007_Left.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:813f030da5695b6996098dad4a90e7fbf9169278ea6b1aa4bf7e8e0c216ffe7a -size 5323 diff --git a/Assets/InputDisplayLayout.cs b/Assets/InputDisplayLayout.cs index 3a3eb22f2..7c01d6758 100644 --- a/Assets/InputDisplayLayout.cs +++ b/Assets/InputDisplayLayout.cs @@ -53,6 +53,7 @@ public class InputDisplayLayout : MonoBehaviour public ActionMapping ActionMapping; public Rect ButtonRect; public UILineRenderer LabelLine; + public bool IsActionBarButton; } private class ActionMapping @@ -71,13 +72,30 @@ public class InputDisplayLayout : MonoBehaviour void Start() { _canvas = transform.root.GetComponent(); - var path = Path.Combine(ActionGameManager.GameDataDirectory.CreateSubdirectory("KeyboardLayouts").FullName, $"{LayoutFile.name}.msgpack"); + var path = Path.Combine(ActionGameManager.GameDataDirectory.CreateSubdirectory("KeyboardLayouts").FullName, $"{LayoutFile.name}.json"); // _inputLayout = ParseJson(LayoutFile.text); - RegisterResolver.Register(); - _inputLayout = MessagePackSerializer.Deserialize(File.ReadAllBytes(path)); + //RegisterResolver.Register(); + //_inputLayout = MessagePackSerializer.Deserialize(File.ReadAllBytes(path)); + _inputLayout = JsonConvert.DeserializeObject(File.ReadAllText(path)); DisplayLayout(_inputLayout); + + _buttonMappings.Add(MapMouseButton(MouseLeft, "/leftButton")); + _buttonMappings.Add(MapMouseButton(MouseRight, "/rightButton")); + _buttonMappings.Add(MapMouseButton(MouseMiddle, "/middleButton")); + _buttonMappings.Add(MapMouseButton(MouseForward, "/forwardButton")); + _buttonMappings.Add(MapMouseButton(MouseBack, "/backButton")); foreach (var buttonMapping in _buttonMappings) _bindButtons[buttonMapping.Button.InputSystemPath] = buttonMapping; + + foreach(var actionBarInput in ActionGameManager.PlayerSettings.InputSettings.ActionBarInputs) + { + if (!_bindButtons.ContainsKey(actionBarInput)) Debug.LogError($"Unable to find input button for \"{actionBarInput}\""); + else + { + _bindButtons[actionBarInput].IsActionBarButton = true; + AssignColor(_bindButtons[actionBarInput]); + } + } // foreach (var key in _inputLayout.GetBindableKeys()) // { @@ -121,6 +139,17 @@ public class InputDisplayLayout : MonoBehaviour //StartCoroutine(AssociateInputKeys(_inputLayout)); } + private ButtonMapping MapMouseButton(InputDisplayButton button, string path) + { + var mapping = new ButtonMapping + { + Button = new InputLayoutMouseButton {Path = path}, + DisplayButton = button + }; + AssignUnboundColor(mapping.DisplayButton); + return mapping; + } + private void ProcessActions(InputActionAsset input) { var nonUIActions = input.Where(a => a.actionMap.name != "UI").ToArray(); @@ -150,7 +179,17 @@ public class InputDisplayLayout : MonoBehaviour private void AssignColor(ButtonMapping buttonMapping) { - if(buttonMapping.ActionMapping!=null) + if (buttonMapping.IsActionBarButton) + { + var outlineColor = Color.white; + var fillColor = Color.white * FillBrightness; + fillColor.a = FillAlpha; + buttonMapping.DisplayButton.Fill.color = fillColor; + buttonMapping.DisplayButton.Outline.gameObject.SetActive(true); + buttonMapping.DisplayButton.Outline.color = outlineColor; + if (buttonMapping.DisplayButton is InputDisplayKey key) key.MainLabel.color = key.AltLabel.color = outlineColor; + } + else if(buttonMapping.ActionMapping!=null) { var outlineColor = Color.HSVToRGB(buttonMapping.ActionMapping.Hue, Saturation, 1); var fillColor = Color.HSVToRGB(buttonMapping.ActionMapping.Hue, 1, FillBrightness); @@ -250,7 +289,7 @@ public class InputDisplayLayout : MonoBehaviour } private Rect[] Overlap(Rect rect) => _buttonMappings - .Where(b=>b.ActionMapping!=null) + .Where(b=>b.IsActionBarButton || b.ActionMapping!=null) .Select(b=>b.ButtonRect) .Concat(_actionMappings .Where(a=>a.LabelRect.width > .1f) diff --git a/Assets/Resources/Sprites/Input.meta b/Assets/Resources/Sprites/Input.meta new file mode 100644 index 000000000..a73836842 --- /dev/null +++ b/Assets/Resources/Sprites/Input.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 81596aabf7563d043ad5247cd9b7276c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Icons/mouseL.png b/Assets/Resources/Sprites/Input/leftButton.png similarity index 100% rename from Assets/Resources/Sprites/Icons/mouseL.png rename to Assets/Resources/Sprites/Input/leftButton.png diff --git a/Assets/Resources/Sprites/Icons/mouseL.png.meta b/Assets/Resources/Sprites/Input/leftButton.png.meta similarity index 100% rename from Assets/Resources/Sprites/Icons/mouseL.png.meta rename to Assets/Resources/Sprites/Input/leftButton.png.meta diff --git a/Assets/Resources/Sprites/Icons/shift.png b/Assets/Resources/Sprites/Input/leftShift.png similarity index 100% rename from Assets/Resources/Sprites/Icons/shift.png rename to Assets/Resources/Sprites/Input/leftShift.png diff --git a/Assets/Resources/Sprites/Icons/shift.png.meta b/Assets/Resources/Sprites/Input/leftShift.png.meta similarity index 100% rename from Assets/Resources/Sprites/Icons/shift.png.meta rename to Assets/Resources/Sprites/Input/leftShift.png.meta diff --git a/Assets/Resources/Sprites/Icons/mouseMiddle.png b/Assets/Resources/Sprites/Input/middleButton.png similarity index 100% rename from Assets/Resources/Sprites/Icons/mouseMiddle.png rename to Assets/Resources/Sprites/Input/middleButton.png diff --git a/Assets/Resources/Sprites/Icons/mouseMiddle.png.meta b/Assets/Resources/Sprites/Input/middleButton.png.meta similarity index 100% rename from Assets/Resources/Sprites/Icons/mouseMiddle.png.meta rename to Assets/Resources/Sprites/Input/middleButton.png.meta diff --git a/Assets/Resources/Sprites/Icons/mouseR.png b/Assets/Resources/Sprites/Input/rightButton.png similarity index 100% rename from Assets/Resources/Sprites/Icons/mouseR.png rename to Assets/Resources/Sprites/Input/rightButton.png diff --git a/Assets/Resources/Sprites/Icons/mouseR.png.meta b/Assets/Resources/Sprites/Input/rightButton.png.meta similarity index 100% rename from Assets/Resources/Sprites/Icons/mouseR.png.meta rename to Assets/Resources/Sprites/Input/rightButton.png.meta diff --git a/Assets/Samples.meta b/Assets/Samples.meta new file mode 100644 index 000000000..dfd7f9f1d --- /dev/null +++ b/Assets/Samples.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d212fb3caec18e64b9b7b59d61fe2506 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Localization.meta b/Assets/Samples/Localization.meta new file mode 100644 index 000000000..cf7cce1ac --- /dev/null +++ b/Assets/Samples/Localization.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a58b667f710c354ca97fb0a0e34d8a9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Localization/0.11.1-preview.meta b/Assets/Samples/Localization/0.11.1-preview.meta new file mode 100644 index 000000000..6b1a45f41 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 26575954ddf44b7468a03a25d56928d7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets.meta b/Assets/Samples/Localization/0.11.1-preview/Google Sheets.meta new file mode 100644 index 000000000..79e190fa2 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cbb240fb1c454114c826594aa01fe588 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/.sample.json b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/.sample.json new file mode 100644 index 000000000..b5c3ed862 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/.sample.json @@ -0,0 +1,5 @@ +{ + "displayName": "Google Sheets", + "description": "These samples show how String Table Collections can be pushed and pulled from one or more Google Sheets with custom data.", + "createSeparatePackage": false +} diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor.meta b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor.meta new file mode 100644 index 000000000..329e406e7 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9da122dbee2c7b74fa1443e2bf835bd2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/CustomColumnDataExample.cs b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/CustomColumnDataExample.cs new file mode 100644 index 000000000..4bd223374 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/CustomColumnDataExample.cs @@ -0,0 +1,53 @@ +using System; +using UnityEditor.Localization.Plugins.Google.Columns; +using UnityEngine.Localization; +using UnityEngine.Localization.Metadata; +using UnityEngine.Localization.Tables; + +namespace UnityEditor.Localization.Samples.Google +{ + [Serializable] + [DisplayName("Custom Data")] + [Metadata(AllowedTypes = MetadataType.StringTableEntry)] + public class MyCustomDataMetadata : IMetadata + { + public string someValue; + public string someNoteValue; + } + + /// + /// LocaleMetadataColumn is a version of SheetColumn just for handling Metadata. + /// This can now be added to the Column Mappings for any Push or Pull request. + /// + public class MyCustomColumn : LocaleMetadataColumn + { + public override PushFields PushFields => PushFields.ValueAndNote; // For our example we use both value and note. + + public override void PullMetadata(StringTableEntry entry, MyCustomDataMetadata metadata, string cellValue, string cellNote) + { + // Metadata will be null if the entry does not already contain any. + if (metadata == null) + { + metadata = new MyCustomDataMetadata(); + entry.AddMetadata(metadata); + } + + metadata.someValue = cellValue; + metadata.someNoteValue = cellNote; + } + + public override void PushHeader(StringTableCollection collection, out string header, out string headerNote) + { + // The title of the Google Sheet column + header = "My Custom Data"; + headerNote = null; + } + + public override void PushMetadata(MyCustomDataMetadata metadata, out string value, out string note) + { + // Metadata will never be null as this is only called if the entry contains a metadata entry. + value = metadata.someValue; + note = metadata.someNoteValue; + } + } +} diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/CustomColumnDataExample.cs.meta b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/CustomColumnDataExample.cs.meta new file mode 100644 index 000000000..d79e543f8 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/CustomColumnDataExample.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d0765d08e4fd3554ebe929de5f151003 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/GoogleSheetsExamples.cs b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/GoogleSheetsExamples.cs new file mode 100644 index 000000000..25d1cde41 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/GoogleSheetsExamples.cs @@ -0,0 +1,245 @@ +using System.Linq; +using UnityEditor.Localization.Plugins.Google; +using UnityEditor.Localization.Plugins.Google.Columns; +using UnityEditor.Localization.Reporting; +using UnityEngine; + +namespace UnityEditor.Localization.Samples.Google +{ + /// + /// These examples show various ways to sync a String Table Collection with Google Sheets. + /// These examples are illustrative and will not work as they are without correct Google Sheets credentials and String Table data. + /// + public class GoogleSheetsExamples + { + static SheetsServiceProvider GetServiceProvider() + { + // The Sheets service provider performs the authentication and keeps track of the + // authentication tokens so that we do not need to authenticate each time. + // It is recommended to have a SheetsServiceProvider asset pre-configured for + // use however in this example we will create a new one. + var sheetServiceProvider = ScriptableObject.CreateInstance(); + + // OAuth is required when making changes. See the docs for info setting up OAuth credentials. + sheetServiceProvider.SetOAuthCrendtials("some-client-id", "some-client-secret"); + return sheetServiceProvider; + } + + /// + /// It is possible for a String Table Collection to exist over several Google Sheets, for example one per Locale. + /// This example shows how you could push 1 of those Locales + /// + [MenuItem("Localization Samples/Google Sheets/Push English")] + public static void PushEnglish() + { + // Setup the connection to Google + var sheetServiceProvider = GetServiceProvider(); + var googleSheets = new GoogleSheets(sheetServiceProvider); + googleSheets.SpreadSheetId = "My spread sheet id"; // We need to provide the Spreadsheet id. This can be found in the url. See docs for further info. + + // Prepare the data we want to push. + // You should provide your String Table Collection name here + var tableCollection = LocalizationEditorSettings.GetStringTableCollection("My Strings"); + + // We need configure what each column will contain in the sheet + var columnMappings = new SheetColumn[] + { + // Column A will contain the Key + new KeyColumn { Column = "A" }, + + // Column B will contain any shared comments. These are Comment Metadata in the Shared category. + new KeyCommentColumn { Column = "B" }, + + // Column C will contain the English Locale and any comments that are just for this Locale. + new LocaleColumn { Column = "C", LocaleIdentifier = "en", IncludeComments = true }, + }; + + int mySheetId = 123456; // This it the id of the sheet in the Google Spreadsheet. it will be in the url after `gid=`. + + // Now send the update. + googleSheets.PushStringTableCollection(mySheetId, tableCollection, columnMappings); + } + + /// + /// It is possible for a String Table Collection to exist over several Google Sheets, for example one per Locale. + /// This example shows how you could pull 1 of those Locales into a String Table Collection. + /// + [MenuItem("Localization Samples/Google Sheets/Pull English")] + public static void PullEnglish() + { + // Setup the connection to Google + var sheetServiceProvider = GetServiceProvider(); + var googleSheets = new GoogleSheets(sheetServiceProvider); + googleSheets.SpreadSheetId = "My spread sheet id"; // We need to provide the Spreadsheet id. This can be found in the url. See docs for further info. + + // You should provide your String Table Collection name here + var tableCollection = LocalizationEditorSettings.GetStringTableCollection("My Strings"); + + // We need configure what each column contains in the sheet + var columnMappings = new SheetColumn[] + { + // Column A contains the Key + new KeyColumn { Column = "A" }, + + // Column B contains any shared comments. These are Comment Metadata in the Shared category. + new KeyCommentColumn { Column = "B" }, + + // Column C contains the English Locale and any comments that are just for this Locale. + new LocaleColumn { Column = "C", LocaleIdentifier = "en", IncludeComments = true }, + }; + + int mySheetId = 123456; // This it the id of the sheet in the Google Spreadsheet. it will be in the url after `gid=`. + googleSheets.PullIntoStringTableCollection(mySheetId, tableCollection, columnMappings); + } + + /// + /// This example shows how you can Push all the Locales in your project by using the ColumnMapper to generate the ColumnMapping data for you. + /// + [MenuItem("Localization Samples/Google Sheets/Push Project Locales")] + public static void PushProjectLocales() + { + // Setup the connection to Google + var sheetServiceProvider = GetServiceProvider(); + var googleSheets = new GoogleSheets(sheetServiceProvider); + googleSheets.SpreadSheetId = "My spread sheet id"; // We need to provide the Spreadsheet id. This can be found in the url. See docs for further info. + + // Prepare the data we want to push. + // You should provide your String Table Collection name here + var tableCollection = LocalizationEditorSettings.GetStringTableCollection("My Strings"); + + // CreateDefaultMapping will create a KeyColumn and a LocaleColumn for each Locale in the project. + var columnMappings = ColumnMapping.CreateDefaultMapping(); + int mySheetId = 123456; // This it the id of the sheet in the Google Spreadsheet. it will be in the url after `gid=`. + + // Now send the update. We can pass in an optional ProgressBarReporter so that we can see updates in the Editor. + googleSheets.PushStringTableCollection(mySheetId, tableCollection, columnMappings, new ProgressBarReporter()); + } + + /// + /// This example shows how you can Pull all the Locales in your project by using the ColumnMapper to generate the ColumnMapping data for you. + /// + [MenuItem("Localization Samples/Google Sheets/Pull Project Locales")] + public static void PullProjectLocales() + { + // Setup the connection to Google + var sheetServiceProvider = GetServiceProvider(); + var googleSheets = new GoogleSheets(sheetServiceProvider); + googleSheets.SpreadSheetId = "My spread sheet id"; // We need to provide the Spreadsheet id. This can be found in the url. See docs for further info. + + // You should provide your String Table Collection name here + var tableCollection = LocalizationEditorSettings.GetStringTableCollection("My Strings"); + + // CreateDefaultMapping will create a KeyColumn and a LocaleColumn for each Locale in the project. + // This assumes that the table was created and pushed to using the same column mappings. + var columnMappings = ColumnMapping.CreateDefaultMapping(); + int mySheetId = 123456; // This it the id of the sheet in the Google Spreadsheet. it will be in the url after `gid=`. + + // Now pull. + // removeMissingEntries will remove any Keys that we have in the String Table Collection that do not exist in the Pull update. + // reporter is an optional reporter that can be used to povide feedback in the editor during the Pull. + googleSheets.PullIntoStringTableCollection(mySheetId, tableCollection, columnMappings, removeMissingEntries: true, reporter: new ProgressBarReporter()); + } + + static void PushExtension(GoogleSheetsExtension googleExtension) + { + // Setup the connection to Google + var googleSheets = new GoogleSheets(googleExtension.SheetsServiceProvider); + googleSheets.SpreadSheetId = googleExtension.SpreadsheetId; + + // Now send the update. We can pass in an optional ProgressBarReporter so that we can updates in the Editor. + googleSheets.PushStringTableCollection(googleExtension.SheetId, googleExtension.TargetCollection as StringTableCollection, googleExtension.Columns, new ProgressBarReporter()); + } + + static void PullExtension(GoogleSheetsExtension googleExtension) + { + // Setup the connection to Google + var googleSheets = new GoogleSheets(googleExtension.SheetsServiceProvider); + googleSheets.SpreadSheetId = googleExtension.SpreadsheetId; + + // Now update the collection. We can pass in an optional ProgressBarReporter so that we can updates in the Editor. + googleSheets.PullIntoStringTableCollection(googleExtension.SheetId, googleExtension.TargetCollection as StringTableCollection, googleExtension.Columns, reporter: new ProgressBarReporter()); + } + + /// + /// In this example we use the data that was configured in the Google Sheets extension to perform a Push. + /// + [MenuItem("Localization Samples/Google Sheets/Push With Google Extension")] + public static void PushWithExtension() + { + // You should provide your String Table Collection name here + var tableCollection = LocalizationEditorSettings.GetStringTableCollection("My Strings"); + var googleExtension = tableCollection.Extensions.FirstOrDefault(e => e is GoogleSheetsExtension) as GoogleSheetsExtension; + if (googleExtension == null) + { + Debug.LogError($"String Table Collection {tableCollection.TableCollectionName} Does not contain a Google Sheets Extension."); + return; + } + + PushExtension(googleExtension); + } + + /// + /// In this example we use the data that was configured in the Google Sheets extension to perform a Pull. + /// + [MenuItem("Localization Samples/Google Sheets/Pull With Google Extension")] + public static void PullWithExtension() + { + // You should provide your String Table Collection name here + var tableCollection = LocalizationEditorSettings.GetStringTableCollection("My Strings"); + var googleExtension = tableCollection.Extensions.FirstOrDefault(e => e is GoogleSheetsExtension) as GoogleSheetsExtension; + if (googleExtension == null) + { + Debug.LogError($"String Table Collection {tableCollection.TableCollectionName} Does not contain a Google Sheets Extension."); + return; + } + + PullExtension(googleExtension); + } + + /// + /// This example shows how we can push every String Table Collection that contains a Google Sheets extension. + /// + [MenuItem("Localization Samples/Google Sheets/Push All Google Sheets Extensions")] + public static void PushAllExtensions() + { + // Get every String Table Collection + var stringTableCollections = LocalizationEditorSettings.GetStringTableCollections(); + + foreach (var collection in stringTableCollections) + { + // Its possible a String Table Collection may have more than one GoogleSheetsExtension. + // For example if each Locale we pushed/pulled from a different sheet. + foreach (var extension in collection.Extensions) + { + if (extension is GoogleSheetsExtension googleExtension) + { + PushExtension(googleExtension); + } + } + } + } + + /// + /// This example shows how we can push every String Table Collection that contains a Google Sheets extension. + /// + [MenuItem("Localization Samples/Google Sheets/Pull All Google Sheets Extensions")] + public static void PullAllExtensions() + { + // Get every String Table Collection + var stringTableCollections = LocalizationEditorSettings.GetStringTableCollections(); + + foreach (var collection in stringTableCollections) + { + // Its possible a String Table Collection may have more than one GoogleSheetsExtension. + // For example if each Locale we pushed/pulled from a different sheet. + foreach (var extension in collection.Extensions) + { + if (extension is GoogleSheetsExtension googleExtension) + { + PullExtension(googleExtension); + } + } + } + } + } +} diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/GoogleSheetsExamples.cs.meta b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/GoogleSheetsExamples.cs.meta new file mode 100644 index 000000000..a28b83548 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/GoogleSheetsExamples.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8e27e36d32022f242a3738ca5165e2c7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/SmartStringColumn.cs b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/SmartStringColumn.cs new file mode 100644 index 000000000..55312567e --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/SmartStringColumn.cs @@ -0,0 +1,33 @@ +using UnityEditor.Localization.Plugins.Google.Columns; +using UnityEngine.Localization; +using UnityEngine.Localization.Metadata; +using UnityEngine.Localization.Tables; + +namespace UnityEditor.Localization.Samples.Google +{ + /// + /// This is an example of how the Smart String property can be synchronized. + /// Any value in the column will cause the value to be marked as smart and leaving the field empty will indicate it should not be smart. + /// + public class SmartStringColumn : LocaleMetadataColumn + { + public override PushFields PushFields => PushFields.Value; + + public override void PullMetadata(StringTableEntry entry, SmartFormatTag metadata, string cellValue, string cellNote) + { + entry.IsSmart = !string.IsNullOrEmpty(cellValue); + } + + public override void PushHeader(StringTableCollection collection, out string header, out string headerNote) + { + header = $"{LocaleIdentifier.ToString()} - Is Smart String"; + headerNote = null; + } + + public override void PushMetadata(SmartFormatTag metadata, out string value, out string note) + { + value = "x"; // We mark here with an x but it could be anything. + note = null; + } + } +} diff --git a/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/SmartStringColumn.cs.meta b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/SmartStringColumn.cs.meta new file mode 100644 index 000000000..b1f05cef0 --- /dev/null +++ b/Assets/Samples/Localization/0.11.1-preview/Google Sheets/Editor/SmartStringColumn.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1426cca1300da3b49896c46599354d6d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Gameplay/ActionGameManager.cs b/Assets/Scripts/Gameplay/ActionGameManager.cs index 80f68636a..8f1002784 100644 --- a/Assets/Scripts/Gameplay/ActionGameManager.cs +++ b/Assets/Scripts/Gameplay/ActionGameManager.cs @@ -96,7 +96,7 @@ public class ActionGameManager : MonoBehaviour { get => _playerSettings ??= File.Exists(_playerSettingsFilePath) ? MessagePackSerializer.Deserialize(File.ReadAllBytes(_playerSettingsFilePath)) - : new PlayerSettings {Name = Environment.UserName}; + : GetDefaultPlayerSettings(); } private static string _playerSettingsFilePath => Path.Combine(GameDataDirectory.FullName, "PlayerSettings.msgpack"); public static void SavePlayerSettings() @@ -104,6 +104,18 @@ public class ActionGameManager : MonoBehaviour File.WriteAllBytes(_playerSettingsFilePath, MessagePackSerializer.Serialize(_playerSettings)); } + private static PlayerSettings GetDefaultPlayerSettings() + { + var settings = new PlayerSettings(); + settings.Name = Environment.UserName; + settings.InputSettings.ActionBarInputs.Add("/leftShift"); + settings.InputSettings.ActionBarInputs.Add("/leftButton"); + settings.InputSettings.ActionBarInputs.Add("/rightButton"); + settings.InputSettings.ActionBarInputs.Add("/middleButton"); + for (int i = 1; i < 6; i++) settings.InputSettings.ActionBarInputs.Add($"/{i}"); + return settings; + } + public static Sector CurrentSector; public static bool IsTutorial; @@ -122,12 +134,6 @@ public class ActionGameManager : MonoBehaviour public PostProcessVolume SevereHeatstrokePP; public PostProcessVolume SevereHypothermiaPP; - [Header("Input Icons")] - public Sprite ShiftIcon; - public Sprite MouseLeftIcon; - public Sprite MouseRightIcon; - public Sprite MouseMiddleIcon; - [Header("Scene Links")] public Transform ActionBar; public ActionBarSlot ActionBarSlot; @@ -420,6 +426,19 @@ public class ActionGameManager : MonoBehaviour action.started += context => slot.Binding?.Activate(); action.canceled += context => slot.Binding?.Deactivate(); + var shortName = controlPath.Substring(controlPath.LastIndexOf('/') + 1); + var sprite = Resources.Load($"Sprites/Input/{shortName}"); + if (sprite != null) + { + slot.InputIcon.sprite = sprite; + slot.InputLabel.gameObject.SetActive(false); + } + else + { + slot.InputLabel.text = shortName; + slot.InputIcon.gameObject.SetActive(false); + } + slot.PointerEnterTrigger.OnPointerEnterAsObservable().Subscribe(_ => { //Debug.Log($"Pointer entered action bar slot {controlPath}"); @@ -453,29 +472,8 @@ public class ActionGameManager : MonoBehaviour return slot; } - var shift = createBinding("/leftShift"); - shift.InputIcon.sprite = ShiftIcon; - shift.InputLabel.gameObject.SetActive(false); - - var left = createBinding("/leftButton"); - left.InputIcon.sprite = MouseLeftIcon; - left.InputLabel.gameObject.SetActive(false); - - var right = createBinding("/rightButton"); - right.InputIcon.sprite = MouseRightIcon; - right.InputLabel.gameObject.SetActive(false); - - var middle = createBinding("/middleButton"); - middle.InputIcon.sprite = MouseMiddleIcon; - middle.InputLabel.gameObject.SetActive(false); + foreach (var actionBarInput in PlayerSettings.InputSettings.ActionBarInputs) createBinding(actionBarInput); - for (int i = 1; i < 6; i++) - { - var num = createBinding($"/{i}"); - num.InputIcon.gameObject.SetActive(false); - num.InputLabel.text = i.ToString(); - } - #endregion #endregion diff --git a/Assets/Scripts/ServerShared/PlayerSettings.cs b/Assets/Scripts/ServerShared/PlayerSettings.cs index 7360373e1..ad17484f4 100644 --- a/Assets/Scripts/ServerShared/PlayerSettings.cs +++ b/Assets/Scripts/ServerShared/PlayerSettings.cs @@ -10,8 +10,8 @@ public class PlayerSettings [Key(1)] public SavedGame SavedRun; [Key(2)] public bool TutorialPassed; [Key(3)] public Dictionary HashedStoryFiles = new Dictionary(); - [Key(4)] public PlayerGameplaySettings GameplaySettings; - [Key(5)] public PlayerInputSettings InputSettings; + [Key(4)] public PlayerGameplaySettings GameplaySettings = new PlayerGameplaySettings(); + [Key(5)] public PlayerInputSettings InputSettings = new PlayerInputSettings(); public string FormatTemperature(float t) { @@ -19,7 +19,7 @@ public class PlayerSettings { TemperatureUnit.Kelvin => $"{Format(t)}°K", TemperatureUnit.Celsius => $"{Format(t - 273.15f)}°C", - TemperatureUnit.Fahrenheit => $"{Format((t - 273.15f) * (9f / 5) + 32)}°F", + TemperatureUnit.Fahrenheit => $"{Format(t * (9f / 5) - 459.67f)}°F", _ => throw new ArgumentOutOfRangeException() }; } @@ -58,5 +58,6 @@ public class PlayerGameplaySettings public class PlayerInputSettings { [Key(0)] public Dictionary InputActionMap = new Dictionary(); - [Key(1)] public bool FiveButtonMouse; + [Key(1)] public List ActionBarInputs = new List(); + [Key(2)] public bool FiveButtonMouse; } \ No newline at end of file diff --git a/GameData/KeyboardLayouts/ansi104.json b/GameData/KeyboardLayouts/ansi104.json new file mode 100644 index 000000000..1916e0642 --- /dev/null +++ b/GameData/KeyboardLayouts/ansi104.json @@ -0,0 +1 @@ +{"rows":[{"columns":[{"mainLabel":"Esc","altLabel":"","path":"escape","width":1.0,"$type":"InputLayoutBindableKey"},{"width":1.0,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"F1","altLabel":"","path":"f1","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F2","altLabel":"","path":"f2","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F3","altLabel":"","path":"f3","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F4","altLabel":"","path":"f4","width":1.0,"$type":"InputLayoutBindableKey"},{"width":0.5,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"F5","altLabel":"","path":"f5","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F6","altLabel":"","path":"f6","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F7","altLabel":"","path":"f7","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F8","altLabel":"","path":"f8","width":1.0,"$type":"InputLayoutBindableKey"},{"width":0.5,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"F9","altLabel":"","path":"f9","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F10","altLabel":"","path":"f10","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F11","altLabel":"","path":"f11","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F12","altLabel":"","path":"f12","width":1.0,"$type":"InputLayoutBindableKey"},{"width":0.25,"$type":"InputLayoutColumnSpacer"},{"width":1.0,"$type":"InputLayoutKey"},{"width":1.0,"$type":"InputLayoutKey"},{"width":1.0,"$type":"InputLayoutKey"}],"$type":"InputLayoutKeyRow"},{"height":0.5,"$type":"InputLayoutRowSpacer"},{"columns":[{"mainLabel":"`","altLabel":"~","path":"backquote","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"1","altLabel":"!","path":"1","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"2","altLabel":"@","path":"2","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"3","altLabel":"#","path":"3","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"4","altLabel":"$","path":"4","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"5","altLabel":"%","path":"5","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"6","altLabel":"^","path":"6","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"7","altLabel":"&","path":"7","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"8","altLabel":"*","path":"8","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"9","altLabel":"(","path":"9","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"0","altLabel":")","path":"0","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"-","altLabel":"_","path":"minus","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"=","altLabel":"+","path":"equals","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"Backspace","altLabel":"","path":"backspace","width":2.0,"$type":"InputLayoutBindableKey"},{"width":0.25,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"Insert","altLabel":"","path":"insert","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"Home","altLabel":"","path":"home","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"PgUp","altLabel":"","path":"pageUp","width":1.0,"$type":"InputLayoutBindableKey"},{"width":0.25,"$type":"InputLayoutColumnSpacer"},{"width":1.0,"$type":"InputLayoutKey"},{"mainLabel":"/","altLabel":"","path":"numpadDivide","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"*","altLabel":"","path":"numpadMultiply","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"-","altLabel":"","path":"numpadMinus","width":1.0,"$type":"InputLayoutBindableKey"}],"$type":"InputLayoutKeyRow"},{"columns":[{"mainLabel":"Tab","altLabel":"","path":"tab","width":1.5,"$type":"InputLayoutBindableKey"},{"mainLabel":"Q","altLabel":"","path":"q","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"W","altLabel":"","path":"w","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"E","altLabel":"","path":"e","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"R","altLabel":"","path":"r","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"T","altLabel":"","path":"t","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"Y","altLabel":"","path":"y","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"U","altLabel":"","path":"u","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"I","altLabel":"","path":"i","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"O","altLabel":"","path":"o","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"P","altLabel":"","path":"p","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"[","altLabel":"{","path":"leftBracket","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"]","altLabel":"}","path":"rightBracket","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"\\","altLabel":"|","path":"backslash","width":1.5,"$type":"InputLayoutBindableKey"},{"width":0.25,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"Delete","altLabel":"","path":"delete","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"End","altLabel":"","path":"end","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"PgDn","altLabel":"","path":"pageDown","width":1.0,"$type":"InputLayoutBindableKey"},{"width":0.25,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"7","altLabel":"Home","path":"numpad7","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"8","altLabel":"↑","path":"numpad8","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"9","altLabel":"PgUp","path":"numpad9","width":1.0,"$type":"InputLayoutBindableKey"},{"height":2,"mainLabel":"+","altLabel":"","path":"numpadPlus","width":1.0,"$type":"InputLayoutMultiRowKey"}],"$type":"InputLayoutKeyRow"},{"columns":[{"mainLabel":"Caps Lock","altLabel":"","path":"capsLock","width":1.75,"$type":"InputLayoutBindableKey"},{"mainLabel":"A","altLabel":"","path":"a","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"S","altLabel":"","path":"s","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"D","altLabel":"","path":"d","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"F","altLabel":"","path":"f","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"G","altLabel":"","path":"g","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"H","altLabel":"","path":"h","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"J","altLabel":"","path":"j","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"K","altLabel":"","path":"k","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"L","altLabel":"","path":"l","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":";","altLabel":":","path":"semicolon","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"'","altLabel":"\"","path":"quote","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"Enter","altLabel":"","path":"enter","width":2.25,"$type":"InputLayoutBindableKey"},{"width":3.5,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"4","altLabel":"←","path":"numpad4","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"5","altLabel":"","path":"numpad5","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"6","altLabel":"→","path":"numpad6","width":1.0,"$type":"InputLayoutBindableKey"}],"$type":"InputLayoutKeyRow"},{"columns":[{"mainLabel":"Shift","altLabel":"","path":"leftShift","width":2.25,"$type":"InputLayoutBindableKey"},{"mainLabel":"Z","altLabel":"","path":"z","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"X","altLabel":"","path":"x","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"C","altLabel":"","path":"c","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"V","altLabel":"","path":"v","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"B","altLabel":"","path":"b","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"N","altLabel":"","path":"n","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"M","altLabel":"","path":"m","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":",","altLabel":"<","path":"comma","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":".","altLabel":">","path":"period","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"/","altLabel":"?","path":"slash","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"Shift","altLabel":"","path":"rightShift","width":2.75,"$type":"InputLayoutBindableKey"},{"width":1.25,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"↑","altLabel":"","path":"upArrow","width":1.0,"$type":"InputLayoutBindableKey"},{"width":1.25,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"1","altLabel":"End","path":"numpad1","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"2","altLabel":"↓","path":"numpad2","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"3","altLabel":"PgDn","path":"numpad3","width":1.0,"$type":"InputLayoutBindableKey"},{"height":2,"mainLabel":"Enter","altLabel":"","path":"numpadEnter","width":1.0,"$type":"InputLayoutMultiRowKey"}],"$type":"InputLayoutKeyRow"},{"columns":[{"mainLabel":"Ctrl","altLabel":"","path":"ctrl","width":1.25,"$type":"InputLayoutBindableKey"},{"width":1.25,"$type":"InputLayoutKey"},{"mainLabel":"Alt","altLabel":"","path":"alt","width":1.25,"$type":"InputLayoutBindableKey"},{"mainLabel":"Spacebar","altLabel":"","path":"space","width":6.25,"$type":"InputLayoutBindableKey"},{"mainLabel":"Alt","altLabel":"","path":"alt","width":1.25,"$type":"InputLayoutBindableKey"},{"width":1.25,"$type":"InputLayoutKey"},{"width":1.25,"$type":"InputLayoutKey"},{"mainLabel":"Ctrl","altLabel":"","path":"ctrl","width":1.25,"$type":"InputLayoutBindableKey"},{"width":0.25,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"←","altLabel":"","path":"leftArrow","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"↓","altLabel":"","path":"downArrow","width":1.0,"$type":"InputLayoutBindableKey"},{"mainLabel":"→","altLabel":"","path":"rightArrow","width":1.0,"$type":"InputLayoutBindableKey"},{"width":0.25,"$type":"InputLayoutColumnSpacer"},{"mainLabel":"0","altLabel":"Ins","path":"numpad0","width":2.0,"$type":"InputLayoutBindableKey"},{"mainLabel":".","altLabel":"Del","path":"numpadPeriod","width":1.0,"$type":"InputLayoutBindableKey"}],"$type":"InputLayoutKeyRow"}]} \ No newline at end of file diff --git a/GameData/PlayerSettings.msgpack b/GameData/PlayerSettings.msgpack deleted file mode 100644 index 8aff98064..000000000 --- a/GameData/PlayerSettings.msgpack +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:693fcdc5402ca2c969464019fbed6af0fbea204c3f17a117dadcbb711b90abc3 -size 13 diff --git a/Packages/manifest.json b/Packages/manifest.json index eec331b21..f7222e5cd 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,6 +8,7 @@ "com.unity.ide.visualstudio": "2.0.7", "com.unity.ide.vscode": "1.2.3", "com.unity.inputsystem": "1.0.2", + "com.unity.localization": "0.11.1-preview", "com.unity.mathematics": "1.2.1", "com.unity.postprocessing": "2.3.0", "com.unity.test-framework": "1.1.24", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1a2426ad9..18dee682a 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -12,6 +12,20 @@ "source": "builtin", "dependencies": {} }, + "com.unity.addressables": { + "version": "1.17.15", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.scriptablebuildpipeline": "1.17.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.burst": { "version": "1.4.3", "depth": 0, @@ -67,6 +81,15 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.localization": { + "version": "0.11.1-preview", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.addressables": "1.17.15" + }, + "url": "https://packages.unity.com" + }, "com.unity.mathematics": { "version": "1.2.1", "depth": 0, @@ -81,6 +104,13 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.scriptablebuildpipeline": { + "version": "1.17.0", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.test-framework": { "version": "1.1.24", "depth": 0,