diff --git a/.gitignore b/.gitignore index 6439a2a991ff4da127021e1b0753ab9919f0a7f7..5df7309f7d93a26b7de9d593113e153533c1d25e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ Logs Temp Bin Assets/StreamingAssets/res -Assets/output_log.txt \ No newline at end of file +gamelog \ No newline at end of file diff --git a/Assembly-CSharp-Editor.csproj b/Assembly-CSharp-Editor.csproj index f8b4889ceff2ef32b28c19e09fba3d375485bf9c..77688b4e3d2d2455a3c10674580df2cc466528d7 100644 --- a/Assembly-CSharp-Editor.csproj +++ b/Assembly-CSharp-Editor.csproj @@ -22,7 +22,11 @@ full false Temp\bin\Debug\ +<<<<<<< HEAD DEBUG;TRACE;UNITY_2021_1_9;UNITY_2021_1;UNITY_2021;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;UNITY_2021_1_OR_NEWER;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_QUICK_SEARCH_MODULE;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_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_NATIVE_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;ENABLE_RUNTIME_PERMISSIONS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_VIDEO;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_ETC_COMPRESSION;PLATFORM_EXTENDS_VULKAN_DEVICE;PLATFORM_HAS_MULTIPLE_SWAPCHAINS;UNITY_ANDROID_SUPPORTS_SHADOWFILES;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;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_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;NET_STANDARD_2_0 +======= + DEBUG;TRACE;UNITY_2021_1_7;UNITY_2021_1;UNITY_2021;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;UNITY_2021_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_QUICK_SEARCH_MODULE;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_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER;NET_STANDARD_2_0 +>>>>>>> 9009eba55cf8ad1ad47d40655f64266045b52305 prompt 4 0169 @@ -72,244 +76,247 @@ - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityCurlModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityCurlModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.CoreModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.CoreModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.DeviceSimulatorModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.DeviceSimulatorModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.GraphViewModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.GraphViewModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.PackageManagerUIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.PackageManagerUIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.QuickSearchModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.QuickSearchModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.SceneTemplateModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.SceneTemplateModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIBuilderModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIBuilderModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsSamplesModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsSamplesModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIServiceModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIServiceModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEditor.Graphs.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEditor.Graphs.dll + + + D:/software/Unity/2021.1.7f1c1/Editor/Data/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/PlaybackEngines/WindowsStandaloneSupport/UnityEditor.WindowsStandalone.Extensions.dll E:/GitHub/UnityXFramework/Assets/Plugins/HOTween/Editor/HOTweenV1_Editor.dll @@ -348,352 +355,352 @@ E:/GitHub/UnityXFramework/Library/PackageCache/com.unity.ext.nunit@1.0.6/net35/unity-custom/nunit.framework.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/mscorlib.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Core.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Core.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Runtime.Serialization.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Runtime.Serialization.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.Linq.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Xml.Linq.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.Vectors.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Numerics.Vectors.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Net.Http.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Net.Http.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.IO.Compression.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.IO.Compression.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Microsoft.CSharp.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Microsoft.CSharp.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Data.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/System.Data.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/Microsoft.Win32.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/Microsoft.Win32.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/netstandard.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/netstandard.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.AppContext.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.AppContext.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Concurrent.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Concurrent.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.NonGeneric.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.NonGeneric.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Specialized.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Collections.Specialized.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Annotations.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Annotations.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.EventBasedAsync.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.EventBasedAsync.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.TypeConverter.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ComponentModel.TypeConverter.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Console.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Console.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Data.Common.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Data.Common.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Contracts.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Contracts.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Debug.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Debug.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.FileVersionInfo.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.FileVersionInfo.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Process.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Process.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.StackTrace.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.StackTrace.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TextWriterTraceListener.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TextWriterTraceListener.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Tools.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.Tools.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TraceSource.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Diagnostics.TraceSource.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Drawing.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Drawing.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Dynamic.Runtime.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Dynamic.Runtime.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Calendars.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Calendars.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Globalization.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Compression.ZipFile.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Compression.ZipFile.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.DriveInfo.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.DriveInfo.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Watcher.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.FileSystem.Watcher.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.IsolatedStorage.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.IsolatedStorage.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.MemoryMappedFiles.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.MemoryMappedFiles.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Pipes.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.Pipes.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.UnmanagedMemoryStream.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.IO.UnmanagedMemoryStream.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Expressions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Expressions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Parallel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Parallel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Queryable.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Linq.Queryable.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Http.Rtc.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Http.Rtc.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NameResolution.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NameResolution.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NetworkInformation.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.NetworkInformation.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Ping.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Ping.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Requests.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Requests.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Security.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Security.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Sockets.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.Sockets.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebHeaderCollection.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebHeaderCollection.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.Client.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.Client.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Net.WebSockets.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ObjectModel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ObjectModel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.ILGeneration.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.ILGeneration.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.Lightweight.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Emit.Lightweight.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Reflection.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Reader.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Reader.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.ResourceManager.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.ResourceManager.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Writer.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Resources.Writer.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.CompilerServices.VisualC.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.CompilerServices.VisualC.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Handles.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Handles.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Numerics.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Numerics.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Formatters.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Formatters.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Json.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Json.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Xml.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Runtime.Serialization.Xml.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Claims.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Claims.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Algorithms.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Algorithms.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Csp.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Csp.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Encoding.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Encoding.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.X509Certificates.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Cryptography.X509Certificates.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Principal.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.Principal.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.SecureString.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Security.SecureString.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Duplex.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Duplex.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Http.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Http.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.NetTcp.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.NetTcp.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Security.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ServiceModel.Security.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.Encoding.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.RegularExpressions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Text.RegularExpressions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Overlapped.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Overlapped.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.Parallel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Tasks.Parallel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Thread.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Thread.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.ThreadPool.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.ThreadPool.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Timer.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Threading.Timer.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ValueTuple.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.ValueTuple.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.ReaderWriter.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.ReaderWriter.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XDocument.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XDocument.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlDocument.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlDocument.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlSerializer.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XmlSerializer.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/MonoBleedingEdge/lib/mono/4.7.1-api/Facades/System.Xml.XPath.XDocument.dll E:/GitHub/UnityXFramework/Library/ScriptAssemblies/UnityEngine.TestRunner.dll @@ -752,6 +759,9 @@ E:/GitHub/UnityXFramework/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll + + E:/GitHub/UnityXFramework/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 113f280a720e8ed842fa8e073fa28f5e6966e4bd..a58fab7a631214b2eaa0afdd09744da1b938e911 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -22,7 +22,11 @@ full false Temp\bin\Debug\ +<<<<<<< HEAD DEBUG;TRACE;UNITY_2021_1_9;UNITY_2021_1;UNITY_2021;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;UNITY_2021_1_OR_NEWER;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_QUICK_SEARCH_MODULE;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_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_NATIVE_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;ENABLE_RUNTIME_PERMISSIONS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;INCLUDE_DYNAMIC_GI;ENABLE_MONO_BDWGC;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_VIDEO;PLATFORM_ANDROID;UNITY_ANDROID;UNITY_ANDROID_API;ENABLE_EGL;ENABLE_NETWORK;ENABLE_RUNTIME_GI;ENABLE_CRUNCH_TEXTURE_COMPRESSION;UNITY_CAN_SHOW_SPLASH_SCREEN;UNITY_HAS_GOOGLEVR;UNITY_HAS_TANGO;ENABLE_SPATIALTRACKING;ENABLE_ETC_COMPRESSION;PLATFORM_EXTENDS_VULKAN_DEVICE;PLATFORM_HAS_MULTIPLE_SWAPCHAINS;UNITY_ANDROID_SUPPORTS_SHADOWFILES;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;ENABLE_MONO;NET_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER +======= + DEBUG;TRACE;UNITY_2021_1_7;UNITY_2021_1;UNITY_2021;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;UNITY_2021_1_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_QUICK_SEARCH_MODULE;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_STANDARD_2_0;ENABLE_PROFILER;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER +>>>>>>> 9009eba55cf8ad1ad47d40655f64266045b52305 prompt 4 0169 @@ -138,7 +142,6 @@ - @@ -305,228 +308,242 @@ - - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ARModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AccessibilityModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AndroidJNIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AnimationModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AssetBundleModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.AudioModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClothModule.dll +<<<<<<< HEAD +======= + + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll + + + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll + +>>>>>>> 9009eba55cf8ad1ad47d40655f64266045b52305 - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CoreModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.CrashReportingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DSPGraphModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.DirectorModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GameCenterModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.GridModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.HotReloadModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.IMGUIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ImageConversionModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.InputLegacyModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.LocalizationModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ParticleSystemModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PerformanceReportingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.PhysicsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.Physics2DModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ProfilerModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.ScreenCaptureModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SharedInternalsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteMaskModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SpriteShapeModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.StreamingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubstanceModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.SubsystemsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TLSModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TerrainPhysicsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextCoreModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TextRenderingModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.TilemapModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UIElementsNativeModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UNETModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UmbraModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityAnalyticsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityConnectModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityCurlModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityCurlModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityTestProtocolModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAssetBundleModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestAudioModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestTextureModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.UnityWebRequestWWWModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VFXModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VRModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VehiclesModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VideoModule.dll +<<<<<<< HEAD +======= + + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll + +>>>>>>> 9009eba55cf8ad1ad47d40655f64266045b52305 - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.WindModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEngine.XRModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.CoreModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.CoreModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.DeviceSimulatorModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.DeviceSimulatorModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.GraphViewModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.GraphViewModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.PackageManagerUIModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.PackageManagerUIModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.QuickSearchModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.QuickSearchModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.SceneTemplateModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.SceneTemplateModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIBuilderModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIBuilderModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsSamplesModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIElementsSamplesModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIServiceModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UIServiceModule.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/Managed/UnityEngine/UnityEditor.UnityConnectModule.dll E:/GitHub/UnityXFramework/Assets/Plugins/Ionic.Zip.Unity.dll @@ -544,349 +561,349 @@ E:/GitHub/UnityXFramework/Assets/Plugins/HOTween/HOTween.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/ref/2.0.0/netstandard.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/Microsoft.Win32.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/Microsoft.Win32.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.AppContext.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.AppContext.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Concurrent.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Concurrent.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.NonGeneric.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.NonGeneric.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Specialized.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Collections.Specialized.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.EventBasedAsync.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.EventBasedAsync.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.TypeConverter.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ComponentModel.TypeConverter.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Console.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Console.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Data.Common.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Data.Common.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Contracts.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Contracts.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Debug.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Debug.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.FileVersionInfo.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.FileVersionInfo.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Process.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Process.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.StackTrace.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.StackTrace.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TextWriterTraceListener.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TextWriterTraceListener.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tools.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tools.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TraceSource.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.TraceSource.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tracing.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Diagnostics.Tracing.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Drawing.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Drawing.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Dynamic.Runtime.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Dynamic.Runtime.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Calendars.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Calendars.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Globalization.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.ZipFile.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Compression.ZipFile.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.DriveInfo.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.DriveInfo.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Watcher.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.FileSystem.Watcher.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.IsolatedStorage.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.IsolatedStorage.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.MemoryMappedFiles.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.MemoryMappedFiles.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Pipes.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.Pipes.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.UnmanagedMemoryStream.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.IO.UnmanagedMemoryStream.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Expressions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Expressions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Parallel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Parallel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Queryable.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Linq.Queryable.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Http.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Http.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NameResolution.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NameResolution.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NetworkInformation.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.NetworkInformation.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Ping.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Ping.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Requests.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Requests.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Security.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Security.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Sockets.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.Sockets.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebHeaderCollection.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebHeaderCollection.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.Client.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.Client.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Net.WebSockets.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ObjectModel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ObjectModel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Reflection.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Reader.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Reader.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.ResourceManager.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.ResourceManager.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Writer.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Resources.Writer.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.CompilerServices.VisualC.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.CompilerServices.VisualC.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Handles.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Handles.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Numerics.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Numerics.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Formatters.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Formatters.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Json.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Json.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Xml.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Runtime.Serialization.Xml.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Claims.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Claims.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Algorithms.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Algorithms.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Csp.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Csp.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Encoding.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Encoding.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Primitives.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.Primitives.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.X509Certificates.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Cryptography.X509Certificates.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Principal.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.Principal.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.SecureString.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Security.SecureString.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.Extensions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.Encoding.Extensions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.RegularExpressions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Text.RegularExpressions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Overlapped.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Overlapped.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.Parallel.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Tasks.Parallel.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Thread.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Thread.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.ThreadPool.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.ThreadPool.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Timer.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Threading.Timer.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ValueTuple.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.ValueTuple.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.ReaderWriter.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.ReaderWriter.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XDocument.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XDocument.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlDocument.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlDocument.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlSerializer.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XmlSerializer.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.XDocument.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netstandard/System.Xml.XPath.XDocument.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/Extensions/2.0.0/System.Numerics.Vectors.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/Extensions/2.0.0/System.Numerics.Vectors.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/mscorlib.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/mscorlib.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ComponentModel.Composition.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ComponentModel.Composition.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Core.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Core.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Data.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Data.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Drawing.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Drawing.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.IO.Compression.FileSystem.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.IO.Compression.FileSystem.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Net.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Net.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Numerics.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Numerics.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Runtime.Serialization.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Runtime.Serialization.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ServiceModel.Web.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.ServiceModel.Web.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Transactions.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Transactions.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Web.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Web.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Windows.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Windows.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Linq.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Linq.dll - F:/Unity2019/Editor/2021.1.9f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll + D:/software/Unity/2021.1.7f1c1/Editor/Data/NetStandard/compat/2.0.0/shims/netfx/System.Xml.Serialization.dll E:/GitHub/UnityXFramework/Library/ScriptAssemblies/Unity.VisualScripting.Flow.Editor.dll @@ -939,6 +956,9 @@ E:/GitHub/UnityXFramework/Library/ScriptAssemblies/Unity.VisualScripting.Core.dll + + E:/GitHub/UnityXFramework/Library/ScriptAssemblies/Unity.2D.Sprite.Editor.dll + diff --git a/Assets/Editor/PrefabBinder/PrefabBinderEditor.cs b/Assets/Editor/PrefabBinder/PrefabBinderEditor.cs index cd8621d84dfba949a389baea5a5075dfb4bc11a2..d8e7a67fe135e1a0b9ab5aebb789873dc46d7744 100644 --- a/Assets/Editor/PrefabBinder/PrefabBinderEditor.cs +++ b/Assets/Editor/PrefabBinder/PrefabBinderEditor.cs @@ -89,21 +89,27 @@ public class PrefabBinderEditor : EditorWindow void OnGUI() { - BeginBox(new Rect(0, 0, 3 * Screen.width / 7f, Screen.height)); + float offset = 0; + float width = 3 * Screen.width / 10f; + BeginBox(new Rect(offset, 0, width, Screen.height)); DrawSearchBtn(); DrawSearchItemList(); EndBox(); + offset += width; - BeginBox(new Rect(3 * Screen.width / 7f + 2, 0, 2 * Screen.width / 7f, Screen.height)); + width = 2 * Screen.width / 10f; + BeginBox(new Rect(offset, 0, width, Screen.height)); DrawLockBtn(); GUILayout.Space(2); DrawComponentList(); EndBox(); + offset += width; - BeginBox(new Rect(5 * Screen.width / 7f + 4, 0, 2 * Screen.width / 7f - 4, Screen.height)); + width = 3 * Screen.width / 10f; + BeginBox(new Rect(offset, 0, width, Screen.height)); DrawPrefabBinderField(); GUILayout.Space(2); - DrawItemField(); + DrawItemField(width); EndBox(); } @@ -178,17 +184,17 @@ public class PrefabBinderEditor : EditorWindow EditorGUILayout.EndScrollView(); } - private void DrawItemField() + private void DrawItemField(float width) { EditorGUILayout.BeginVertical(); GUILayout.Label(string.IsNullOrEmpty(m_componentStr) ? "null" : m_componentStr); m_itemName = EditorGUILayout.TextField(m_itemName); - if (GUILayout.Button(new GUIContent("Add Item", "添加item"), GUILayout.Height(80))) + if (GUILayout.Button("Add Item", GUILayout.Width(width), GUILayout.Height(80))) { ComponentOperation(m_slot, ItemOption.AddItem); } - if (GUILayout.Button(new GUIContent("Delete Item", "删除指定的item"))) + if (GUILayout.Button("Delete Item", GUILayout.Width(width))) { if (m_prefabBinderObj != null) { @@ -198,7 +204,7 @@ public class PrefabBinderEditor : EditorWindow ComponentOperation(m_slot, ItemOption.RemoveItem); } } - if (GUILayout.Button(new GUIContent("Refresh", "刷新"))) + if (GUILayout.Button("Refresh", GUILayout.Width(width))) { OnRefreshBtnClicked(); } diff --git a/Assets/Editor/ResConfig/ResConfigEditor.cs b/Assets/Editor/ResConfig/ResConfigEditor.cs index 7c252f0f3c0aa9ed9f7f17d38501e2086a3aa2b8..c34b47ef49669822fc9b2dd69b110a7604953301 100644 --- a/Assets/Editor/ResConfig/ResConfigEditor.cs +++ b/Assets/Editor/ResConfig/ResConfigEditor.cs @@ -31,7 +31,7 @@ public class ResConfigEditor : EditorWindow static void Init() { ResConfigEditor window = (ResConfigEditor)EditorWindow.GetWindow(typeof(ResConfigEditor)); - window.minSize = new Vector2(500f, 600f); + //window.minSize = new Vector2(500f, 600f); window.Show(); s_manager = new ResConfigManager(); } diff --git a/Assets/GameRes/Config/resources.bytes b/Assets/GameRes/Config/resources.bytes index dea6b758985cecd594c18c68304a36be26f7b46d..50659412332a2aecfa5fffadefdae0c4407ac0bb 100644 --- a/Assets/GameRes/Config/resources.bytes +++ b/Assets/GameRes/Config/resources.bytes @@ -1,16 +1,16 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/LuaFramework/Lua/Utility/EventNameDef.lua b/Assets/LuaFramework/Lua/Common/EventNameDef.lua similarity index 100% rename from Assets/LuaFramework/Lua/Utility/EventNameDef.lua rename to Assets/LuaFramework/Lua/Common/EventNameDef.lua diff --git a/Assets/LuaFramework/Lua/Utility/EventNameDef.lua.meta b/Assets/LuaFramework/Lua/Common/EventNameDef.lua.meta similarity index 100% rename from Assets/LuaFramework/Lua/Utility/EventNameDef.lua.meta rename to Assets/LuaFramework/Lua/Common/EventNameDef.lua.meta diff --git a/Assets/LuaFramework/Lua/Utility/LuaUtil.lua b/Assets/LuaFramework/Lua/Common/LuaUtil.lua similarity index 100% rename from Assets/LuaFramework/Lua/Utility/LuaUtil.lua rename to Assets/LuaFramework/Lua/Common/LuaUtil.lua diff --git a/Assets/LuaFramework/Lua/Utility/LuaUtil.lua.meta b/Assets/LuaFramework/Lua/Common/LuaUtil.lua.meta similarity index 100% rename from Assets/LuaFramework/Lua/Utility/LuaUtil.lua.meta rename to Assets/LuaFramework/Lua/Common/LuaUtil.lua.meta diff --git a/Assets/LuaFramework/Lua/Lib.meta b/Assets/LuaFramework/Lua/Lib.meta deleted file mode 100644 index d74b4b00c78f23d6deee6bd517fc2ffabcb7b67a..0000000000000000000000000000000000000000 --- a/Assets/LuaFramework/Lua/Lib.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 95f00163ba722334cb5544b9c44e18d2 -folderAsset: yes -timeCreated: 1476450638 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/LuaFramework/Lua/Lib/LuaEventDispatcher.lua b/Assets/LuaFramework/Lua/Lib/LuaEventDispatcher.lua deleted file mode 100644 index f59b791ae2a6c62ec62ecc5b2ca3779d83d4a01d..0000000000000000000000000000000000000000 --- a/Assets/LuaFramework/Lua/Lib/LuaEventDispatcher.lua +++ /dev/null @@ -1,56 +0,0 @@ ---region *.lua ---Date ---此文件由[BabeLua]插件自动生成 ---纯lua的事件处理器 ---TODO: ---纯lua的事件处理 与 调用Unity里面封装的EventDispatcher效率相差多少? 有待测试 ---如果只需要在lua里面用 纯lua 的效率肯定是高 - -LuaEventDispatcher = LuaEventDispatcher or {} - ---key:事件名称,value:事件处理方法表handles -LuaEventDispatcher.listeners = {} -local listeners = LuaEventDispatcher.listeners - - - ---注册事件处理 -function LuaEventDispatcher.RegistEvent(eventName, handle) - - local handles = listeners[eventName] - if handles == nil then - handles = {} - listeners[eventName] = handles - end - - table.insert(handles, handle) - -end - ---注销事件处理 -function LuaEventDispatcher.UnRegistEvent(eventName, handle) - - local handles = listeners[eventName] - if handles ~= nil then - for k, v in pairs(handles) do - if v == handle then - handles[k] = nil - return k - end - end - end - -end - ---触发事件 -function LuaEventDispatcher.FireEvent(eventName, ...) - local handles = listeners[eventName] - if handles ~= nil then - for k, v in pairs(handles) do - v(...) - end - end -end - ---endregion - diff --git a/Assets/LuaFramework/Lua/Lib/LuaEventDispatcher.lua.meta b/Assets/LuaFramework/Lua/Lib/LuaEventDispatcher.lua.meta deleted file mode 100644 index f24d07c260224ac49be1e9523fd5d94c1e350cef..0000000000000000000000000000000000000000 --- a/Assets/LuaFramework/Lua/Lib/LuaEventDispatcher.lua.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bd4ae9b5d48ae6f4989614ec2dc811f3 -timeCreated: 1476450638 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/LuaFramework/Lua/LuaFileList.lua b/Assets/LuaFramework/Lua/LuaFileList.lua index 04c288a2b1a5aee9a119c23e394d21bc6af7f1f3..1ab0dffc8d27ad605853a6013c781079b1fbe68b 100644 --- a/Assets/LuaFramework/Lua/LuaFileList.lua +++ b/Assets/LuaFramework/Lua/LuaFileList.lua @@ -1,10 +1,11 @@ -Utility/LuaUtil.lua +Common/LuaUtil.lua Common/define.lua Common/functions.lua Common/protocal.lua Common/const.lua Common/UITool.lua +Common/EventNameDef.lua -- 入口脚本 Logic/Main.lua diff --git a/Assets/LuaFramework/Lua/Utility.meta b/Assets/LuaFramework/Lua/Utility.meta deleted file mode 100644 index 89ad8a7ba767949ec0c553f5afc952c948c23d35..0000000000000000000000000000000000000000 --- a/Assets/LuaFramework/Lua/Utility.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 22a026ab84777d94bbf98b62277fabf8 -folderAsset: yes -timeCreated: 1476447806 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua b/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua index 9e13f96fe68d306757eda0b57fdf77485f2f2b5f..fef8904f2c2bb2a1cdb419da9c0452936bd94c80 100644 --- a/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua +++ b/Assets/LuaFramework/Lua/View/Login/LoginPanel.lua @@ -79,8 +79,6 @@ function LoginPanel:SetUi(binder) LanguageMgr:ChangeLanguageType(v) end) language.value = LanguageMgr.languageIndex - - end function LoginPanel:OnHide() diff --git a/Assets/RawAssets/GuideMask/Material/GuideMask.mat b/Assets/RawAssets/GuideMask/Material/GuideMask.mat index 9026e552287239e57be6ba6a353cc7b8f24f8be1..62724e54045280ab3cc016bddaccc04c625d40b7 100644 --- a/Assets/RawAssets/GuideMask/Material/GuideMask.mat +++ b/Assets/RawAssets/GuideMask/Material/GuideMask.mat @@ -69,7 +69,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Silder: 83.82081 + - _Silder: 85.56396 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 @@ -82,7 +82,7 @@ Material: - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Center: {r: 508.19995, g: 277.80994, b: 0, a: 0} + - _Center: {r: 0, g: -221.89998, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scripts/Framework/Audio/AudioMgr.cs b/Assets/Scripts/Framework/Audio/AudioMgr.cs index 04408394d66c198c49e230cc9ffaf7f78e6b96dd..b630e38e48b5c5f93d96984923e78a5673537859 100644 --- a/Assets/Scripts/Framework/Audio/AudioMgr.cs +++ b/Assets/Scripts/Framework/Audio/AudioMgr.cs @@ -21,6 +21,10 @@ public class AudioMgr UpdateMusicVolume(m_musicVolumeFactor); } + /// + /// 播放音效 + /// + /// 声音名字,需要带后缀 public void PlaySound(string audioName) { var clip = m_cache.GetAudioClip(audioName); @@ -28,6 +32,12 @@ public class AudioMgr m_channalMgr.PlaySound(clip); } + /// + /// 播放音效 + /// + /// 声音名字,需要带后缀 + /// 是否循环 + /// 是否渐入 public void PlaySoundEx(string audioName, bool loop, bool fadeIn) { var clip = m_cache.GetAudioClip(audioName); @@ -35,6 +45,13 @@ public class AudioMgr m_channalMgr.PlaySound(clip, loop, fadeIn); } + /// + /// 播放音乐,比如背景音乐 + /// + /// 声音名字,需要带后缀 + /// 是否循环 + /// 是否渐入 + /// 是否停止其他背景音乐 public void PlayMusic(string audioName, bool loop, bool fadeIn, bool pauseOther) { var cfgItem = m_cfg.GetAudioCfg(audioName); @@ -73,6 +90,10 @@ public class AudioMgr return m_cfg.GetAudioCfg(audioName); } + /// + /// 调节音效音量 + /// + /// 0到1 public void UpdateSoundVolume(float factor) { m_soundVolumeFactor = factor; @@ -81,6 +102,10 @@ public class AudioMgr } + /// + /// 调节音乐音量 + /// + /// 0到1 public void UpdateMusicVolume(float factor) { m_musicVolumeFactor = factor; diff --git a/Assets/Scripts/Framework/Debug/LogCat.cs b/Assets/Scripts/Framework/Debug/LogCat.cs index 2c504c0a2c5effabb7e0f53f4af227bf4d3a93cd..20c705867cd3d26d71a1656698f3ae36691bb401 100644 --- a/Assets/Scripts/Framework/Debug/LogCat.cs +++ b/Assets/Scripts/Framework/Debug/LogCat.cs @@ -22,10 +22,10 @@ public class LogCat : MonoBehaviour void Update() { -#if UNITY_EDITOR +#if UNITY_EDITOR || UNITY_STANDALONE if (Input.GetKeyDown(KeyCode.F4)) #else - if (Input.GetMouseButtonDown(0) && Input.touchCount >= 3) + if (Input.GetMouseButtonDown(0) && Input.touchCount == 4) #endif { m_showLog = !m_showLog; diff --git a/Assets/Scripts/Framework/Debug/Logger.cs b/Assets/Scripts/Framework/Debug/Logger.cs deleted file mode 100644 index 9eb8b2559d353d7a56e5e18c062db4e0b546dd65..0000000000000000000000000000000000000000 --- a/Assets/Scripts/Framework/Debug/Logger.cs +++ /dev/null @@ -1,167 +0,0 @@ -using System.IO; -using UnityEngine; -using System.Text; - -/// -/// 日志输出 -/// -public class Logger -{ - public void Init() - { - m_needUpload = false; -#if UNITY_ANDROID || UNITY_IOS - //var fullSavePath = "mnt/sdcard/output_log.txt"; - var fullSavePath = string.Format("{0}/{1}", Application.persistentDataPath, "output_log.txt"); -#elif UNITY_STANDALONE_WIN - var fullSavePath = string.Format("{0}/{1}", Application.dataPath, "output_log.txt"); -#endif - InitLogger(fullSavePath); - } - void InitLogger(string fullSavePath) - { - m_fullSavePath = fullSavePath; - if (File.Exists(fullSavePath)) - { - FileInfo file = new FileInfo(fullSavePath); - if (file.Length > MaxFileSize_1) - { - File.Delete(fullSavePath); - } - } - - if (!Directory.Exists(fullSavePath.Replace("/output_log.txt", ""))) - { - fullSavePath = string.Format("{0}/{1}", Application.persistentDataPath, "output_log.txt"); - - if (File.Exists(fullSavePath)) - { - FileInfo file = new FileInfo(fullSavePath); - if (file.Length > MaxFileSize) - { - File.Delete(m_fullSavePath); - } - } - } - - if (Directory.Exists(fullSavePath.Replace("/output_log.txt", ""))) - { - try - { - if (!File.Exists(fullSavePath)) - { - FileStream fs = File.Create(fullSavePath); - fs.Close(); - } - - Application.logMessageReceivedThreaded += logCallBack; - GameLogger.Log("Logger Start"); - } - catch (System.Exception ex) - { - GameLogger.Log("error can not open." + ex.StackTrace.ToString() + ex.Message); - } - } - else - { - GameLogger.Log("error not found the log output path."); - } - } - - public void Flush() - { - if (m_logBuilder.Length > 0) - { - if (enable && File.Exists(m_fullSavePath)) - { - using (StreamWriter sw = File.AppendText(m_fullSavePath)) - { - sw.WriteLine(m_logBuilder.ToString()); - m_logBuilder.Remove(0, m_logBuilder.Length); - } - } - } - } - - private void logCallBack(string condition, string stackTrace, LogType type) - { - lock (m_locker) - { - if ((type == LogType.Error || type == LogType.Exception)) - { - m_needUpload = true; - } - - string log = string.Format("{0} {1}\n", System.DateTime.Now.ToString("MM-dd HH:mm:ss"), condition); - m_logBuilder.Append(log); - m_logBuilder.Append(stackTrace); - m_logBuilder.Append("\n"); - Flush(); - } - } - - /// - ///复制一份log,用来查找bug - /// - public void CopyOutPutLog() - { - try - { - //Debug.LogError("CopyOutPutLog"); - if (File.Exists(m_fullSavePath)) - { - string file = File.ReadAllText(m_fullSavePath); - if (file.Length > 0) - { - string copyFile = m_fullSavePath;//m_fullSavePath.Replace("/output_log.txt", "") - - copyFile = copyFile.Replace("/output_log.txt", "/output_log_1.txt"); - if (File.Exists(copyFile)) - { - FileInfo targetFile = new FileInfo(copyFile); - if (targetFile.Length > MaxFileSize_1) - { - File.Delete(copyFile); - } - } - File.AppendAllText(copyFile, file); - } - } - } - catch (System.Exception e) - { - GameLogger.LogError(e); - } - } - - private Logger() - { - m_logBuilder = new StringBuilder(); - m_needUpload = false; - enable = true; - m_locker = new System.Object(); - } - - public static Logger instance - { - get - { - if (s_instance == null) s_instance = new Logger(); - return s_instance; - } - } - - public bool needUpload - { - get { return m_needUpload; } - } - - public bool enable; - private bool m_needUpload; - private string m_fullSavePath = string.Empty; - private StringBuilder m_logBuilder; - private System.Object m_locker; - private static Logger s_instance; - private const long MaxFileSize = 0; - private const long MaxFileSize_1 = 5 * 1024 * 1024; -} diff --git a/Assets/Scripts/Framework/Debug/Logger.cs.meta b/Assets/Scripts/Framework/Debug/Logger.cs.meta deleted file mode 100644 index d68880ac4b0f017f8f234f56eeba8c82670c7a09..0000000000000000000000000000000000000000 --- a/Assets/Scripts/Framework/Debug/Logger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4f56ae0b96d16f04ea1c8502c64e197e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Framework/Event/EventDispatcher.cs b/Assets/Scripts/Framework/Event/EventDispatcher.cs index 6831835a8c75f0ff3c33af1e85debb7c1cd4cc0b..6ab19e8d1577927e2049099a072e5ace6e5805d5 100644 --- a/Assets/Scripts/Framework/Event/EventDispatcher.cs +++ b/Assets/Scripts/Framework/Event/EventDispatcher.cs @@ -10,39 +10,54 @@ public delegate void MyEventHandler(params object[] objs); public class EventDispatcher { - public void Regist(string type, MyEventHandler handler) + /// + /// 注册事件 + /// + /// 事件名 + /// 响应函数 + public void Regist(string evt, MyEventHandler handler) { if (handler == null) return; - if (listeners.ContainsKey(type)) + if (listeners.ContainsKey(evt)) { //这里涉及到Dispath过程中反注册问题,必须使用listeners[type]+=.. - listeners[type] += handler; + listeners[evt] += handler; } else { - listeners.Add(type, handler); + listeners.Add(evt, handler); } } - public void UnRegist(string type, MyEventHandler handler) + /// + /// 注销事件 + /// + /// 事件名 + /// 响应函数 + public void UnRegist(string evt, MyEventHandler handler) { if (handler == null) return; - if (listeners.ContainsKey(type)) + if (listeners.ContainsKey(evt)) { //这里涉及到Dispath过程中反注册问题,必须使用listeners[type]-=.. - listeners[type] -= handler; - if (listeners[type] == null) + listeners[evt] -= handler; + if (listeners[evt] == null) { //已经没有监听者了,移除. - listeners.Remove(type); + listeners.Remove(evt); } } } + /// + /// 抛出事件 + /// + /// 事件名 + /// 参数 public void DispatchEvent(string evt, params object[] objs) { try diff --git a/Assets/Scripts/Framework/Event/EventNameDef.cs b/Assets/Scripts/Framework/Event/EventNameDef.cs index 0537dfaf2b1bcaee676ab77f77598365cf1fba08..ee4c5e7dc4b435a1ff32356ff246263e8a2c2c5d 100644 --- a/Assets/Scripts/Framework/Event/EventNameDef.cs +++ b/Assets/Scripts/Framework/Event/EventNameDef.cs @@ -2,7 +2,7 @@ public class EventNameDef { /// - /// 语言切换 + /// 语言切换事件 /// public const string LANGUAGE_TYPE_CHANGED = "LANGUAGE_TYPE_CHANGED"; } diff --git a/Assets/Scripts/Framework/I18N/LanguageMgr.cs b/Assets/Scripts/Framework/I18N/LanguageMgr.cs index d2db3df637533c469dbd0874a33f21fc0f77bd07..7d5a3a2bf9cd7e2805622fc244067c60667e8df1 100644 --- a/Assets/Scripts/Framework/I18N/LanguageMgr.cs +++ b/Assets/Scripts/Framework/I18N/LanguageMgr.cs @@ -15,7 +15,7 @@ public class LanguageMgr /// /// 切换语言 /// - /// + /// 语言索引,参见LanguageType枚举 public void ChangeLanguageType(int index) { language = (LanguageType)index; diff --git a/Assets/Scripts/Framework/Panel/BasePanel.cs b/Assets/Scripts/Framework/Panel/BasePanel.cs index 3b03b18f4652d6ea9753d4c44ca2df1e837a4e6d..22d97fb9540ba3c4606d3465baa585db76653fb5 100644 --- a/Assets/Scripts/Framework/Panel/BasePanel.cs +++ b/Assets/Scripts/Framework/Panel/BasePanel.cs @@ -4,7 +4,7 @@ using LuaInterface; /// /// Panel基础脚本 /// -public class BasePanel : MonoBehaviour +public class BasePanel : MonoBehaviour { /// /// Lua写的Panel脚本由BasePanel来调度,通过luaObj来绑定调度的方法 diff --git a/Assets/Scripts/Framework/Panel/PanelMgr.cs b/Assets/Scripts/Framework/Panel/PanelMgr.cs index e5bb6cb58322de3ee8ab00e0e540ae3838c9e635..d12817310bbf8c286e751a5ceac165d977b5f9c3 100644 --- a/Assets/Scripts/Framework/Panel/PanelMgr.cs +++ b/Assets/Scripts/Framework/Panel/PanelMgr.cs @@ -22,6 +22,13 @@ public class PanelMgr return panel; } + /// + /// 显示界面(供lua层调用) + /// + /// 界面ID + /// lua界面脚本对象,是一个lua table + /// 父节点 + /// public BasePanel ShowPanel(int panelId, LuaInterface.LuaTable luaObj, Transform parent) { var panel = GetPanelById(panelId); @@ -42,7 +49,13 @@ public class PanelMgr return panel; } - + /// + /// 显示界面(供C#层调用) + /// + /// 界面ID + /// 父节点 + /// 界面类 + /// public T ShowPanel(int panelId, Transform parent) where T : BasePanel { var panel = GetPanelById(panelId); @@ -62,6 +75,10 @@ public class PanelMgr return (T)panel; } + /// + /// 关闭界面 + /// + /// 界面ID public void HidePanel(int panelId) { var panel = GetPanelById(panelId); diff --git a/Assets/Scripts/Framework/Particle/ParticleManager.cs b/Assets/Scripts/Framework/Particle/ParticleManager.cs index c6354d2aee73e57f57ab084bfa412b31710faef4..a4a8e7687621cc8250133a894eb0538162ea4325 100644 --- a/Assets/Scripts/Framework/Particle/ParticleManager.cs +++ b/Assets/Scripts/Framework/Particle/ParticleManager.cs @@ -5,6 +5,13 @@ /// public class ParticleManager { + /// + /// 播放粒子特效 + /// + /// 资源ID + /// 持续事件 + /// 是否缓存到对象池中 + /// public GameObject PlayParticle(int resId, float duration, bool cache) { // 取缓存 diff --git a/Assets/Scripts/Framework/Sprite/SpriteManager.cs b/Assets/Scripts/Framework/Sprite/SpriteManager.cs index ce89e96fdbe520a575cb9949dfd6c9aa79dc7aff..db07c88a462dd0c8793ad7552792db0d9303639e 100644 --- a/Assets/Scripts/Framework/Sprite/SpriteManager.cs +++ b/Assets/Scripts/Framework/Sprite/SpriteManager.cs @@ -26,6 +26,11 @@ public class SpriteManager return atlas.GetSprite(spriteName); } + /// + /// 给Image设置精灵图 + /// + /// Image对象 + /// 精灵图名称 public void SetSprite(Image image, string spriteName) { image.sprite = GetSprite(spriteName); diff --git a/Assets/Scripts/Framework/UGUIExpand/GuideMask/GuideMaskBhv.cs b/Assets/Scripts/Framework/UGUIExpand/GuideMask/GuideMaskBhv.cs index f3a7677b932ff35e72340c5e66cddc53c2f6d513..2b8e5338533666a18c76fc1126b30683aa7ce6f3 100644 --- a/Assets/Scripts/Framework/UGUIExpand/GuideMask/GuideMaskBhv.cs +++ b/Assets/Scripts/Framework/UGUIExpand/GuideMask/GuideMaskBhv.cs @@ -16,12 +16,16 @@ public class GuideMaskBhv : MonoBehaviour Vector3[] corners = new Vector3[4]; float yVelocity = 0f; + /// + /// 执行引导 + /// + /// 模板对象 public void DoGuide(GameObject target) { if(null != target) this.target = target; // 设置事件透传对象 - gameObject.GetComponent().target = this.target.gameObject; + gameObject.GetComponent().target = this.target; var canvas = GlobalObjs.s_canvas; target.GetComponent().GetWorldCorners(corners); diff --git a/Assets/Scripts/StartUp.cs b/Assets/Scripts/StartUp.cs index 69a78a71d0db744236401bb4c45c72bd18737875..9b6692b3b5eaf8d67608619fdf6784c1400e4ed8 100644 --- a/Assets/Scripts/StartUp.cs +++ b/Assets/Scripts/StartUp.cs @@ -11,7 +11,7 @@ public class StartUp : MonoBehaviour // 热更新之前初始化一些模块 InitBeforeHotUpdate(); // 热更新 - HotUpdatePanel.Create(() => + HotUpdatePanel.Show(() => { // 热更新后初始化一些模块 InitAfterHotUpdate(); @@ -47,7 +47,7 @@ public class StartUp : MonoBehaviour Application.runInBackground = true; // 日志 - Logger.instance.Init(); + GameLogger.Init(); LogCat.Init(); // 网络消息注册 m_networkMsgEventRegister.RegistNetworkMsgEvent(); diff --git a/Assets/Scripts/View/HotUpdate/HotUpdatePanel.cs b/Assets/Scripts/View/HotUpdate/HotUpdatePanel.cs index 47d997e4cdaeb7efde4aedfcd9cb5a60e00c93a0..ccfbc8f70b0f7a5d93cfdc1876218a25c3690645 100644 --- a/Assets/Scripts/View/HotUpdate/HotUpdatePanel.cs +++ b/Assets/Scripts/View/HotUpdate/HotUpdatePanel.cs @@ -57,7 +57,7 @@ public class HotUpdatePanel : BasePanel /// private Action m_cb; - public static void Create(Action cb) + public static void Show(Action cb) { #if ENABLE_HOT_UPDATE var panel = PanelMgr.instance.ShowPanel(1, GlobalObjs.s_topPanel); @@ -201,7 +201,7 @@ public class HotUpdatePanel : BasePanel private void Finish() { - Destroy(gameObject); + PanelMgr.instance.HidePanel(1); m_cb?.Invoke(); } diff --git a/Packages/manifest.json b/Packages/manifest.json index a7738be0972b03643b37fe1a566190db735ab0a5..dbdd6a6c79378b1f41adc6e2dea122532f3e13dd 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,5 +1,6 @@ { "dependencies": { + "com.unity.2d.sprite": "1.0.0", "com.unity.collab-proxy": "1.5.7", "com.unity.ide.rider": "3.0.6", "com.unity.ide.visualstudio": "2.0.8", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1cdcb14d91dc31bed50ebdbb94c3cc38a8895446..64bbf318773d49cdb11cabae2c861d605f686047 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,11 @@ { "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.collab-proxy": { "version": "1.5.7", "depth": 0, diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 3b2c5e4b8cc7e485ec9549dbf026059cff29ebb2..881070604054c3662da6aec20550a8410ea7e130 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.9f1c1 -m_EditorVersionWithRevision: 2021.1.9f1c1 (a9c352b271d7) +m_EditorVersion: 2021.1.7f1c1 +m_EditorVersionWithRevision: 2021.1.7f1c1 (4e944ebb9621) diff --git a/README.md b/README.md index b1a4c962df1cc87003a90a48e1acc2165b81032c..88fc11071d2396ed85976474e4b3fc237404d3c1 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ 配套的服务端使用skynet框架 ### 使用说明 -待写 +参见我的这边博客:https://linxinfa.blog.csdn.net/article/details/121244430 diff --git a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache index a838af167dd4eaf3bad27c7121a6ebdd49ac28d6..5abcef0d705023f2277918206726e5c073caa3b7 100644 Binary files a/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp.csprojAssemblyReference.cache differ