From 1be911e6072aff3850896f3770725ad02840be15 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Tue, 5 Sep 2023 22:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A2=B0=E6=92=9E=E6=9C=BA?=
=?UTF-8?q?=E6=9F=9C=E6=8F=90=E7=A4=BA=E8=AE=BE=E5=A4=87=E5=8D=A0=E7=94=A8?=
=?UTF-8?q?U=E4=BD=8D=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
GQ_TongXin/Assembly-CSharp-firstpass.csproj | 449 ++++++++++--------
GQ_TongXin/Assets/Adam/Scenes/Adam.unity | 7 +-
.../Assets/Adam/Scripts/DragController.cs | 32 +-
GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs | 26 +
GQ_TongXin/Packages/packages-lock.json | 6 +-
GQ_TongXin/ProjectSettings/ProjectVersion.txt | 4 +-
6 files changed, 309 insertions(+), 215 deletions(-)
diff --git a/GQ_TongXin/Assembly-CSharp-firstpass.csproj b/GQ_TongXin/Assembly-CSharp-firstpass.csproj
index a54192894..5d9bc9a66 100644
--- a/GQ_TongXin/Assembly-CSharp-firstpass.csproj
+++ b/GQ_TongXin/Assembly-CSharp-firstpass.csproj
@@ -22,7 +22,7 @@
full
false
Temp\Bin\Debug\
- UNITY_2021_3_2;UNITY_2021_3;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_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_SEARCH_TABLE;USE_SEARCH_MODULE;USE_PROPERTY_DATABASE;USE_SEARCH_EXTENSION_API;SCENE_TEMPLATE_MODULE;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_UNET;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;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_MANAGED_UNITYTLS;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;PLATFORM_WEBGL;TEXTCORE_1_0_OR_NEWER;UNITY_WEBGL;UNITY_WEBGL_API;UNITY_DISABLE_WEB_VERIFICATION;UNITY_GFX_USE_PLATFORM_VSYNC;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_SPATIALTRACKING;ENABLE_MONO;NET_STANDARD_2_0;NET_STANDARD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_IG;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
+ UNITY_2021_3_10;UNITY_2021_3;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_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;USE_SEARCH_ENGINE_API;USE_SEARCH_TABLE;USE_SEARCH_MODULE;USE_PROPERTY_DATABASE;USE_SEARCH_EXTENSION_API;SCENE_TEMPLATE_MODULE;ENABLE_AR;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_UNET;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_COLLAB;ENABLE_CLOUD_SERVICES_COLLAB_SOFTLOCKS;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_VIDEO;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;PLATFORM_STANDALONE;TEXTCORE_1_0_OR_NEWER;PLATFORM_STANDALONE_WIN;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_NVIDIA;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;NET_STANDARD;NET_STANDARD_2_1;NETSTANDARD;NETSTANDARD2_1;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_IG;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
prompt
4
0169
@@ -49,11 +49,11 @@
Package
2.0.16
GamePlugins:3
- WebGL:20
- 2021.3.2f1c1
+ StandaloneWindows64:19
+ 2021.3.10f1c2
-
+
@@ -62,245 +62,272 @@
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AIModule.dll
+
+
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ARModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AccessibilityModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AndroidJNIModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AnimationModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AssetBundleModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.AudioModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClothModule.dll
+
+
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterInputModule.dll
+
+
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ClusterRendererModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CoreModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.CrashReportingModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.DSPGraphModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.DirectorModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GIModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GameCenterModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.GridModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.HotReloadModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.IMGUIModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ImageConversionModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.InputModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.InputLegacyModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.JSONSerializeModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.LocalizationModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ParticleSystemModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.PerformanceReportingModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.PhysicsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.Physics2DModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ProfilerModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.ScreenCaptureModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SharedInternalsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteMaskModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SpriteShapeModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.StreamingModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SubstanceModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.SubsystemsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TLSModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TerrainPhysicsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreFontEngineModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreFontEngineModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreTextEngineModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TextCoreTextEngineModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TextRenderingModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.TilemapModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsNativeModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UIElementsNativeModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UNETModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UNETModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UmbraModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityAnalyticsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityConnectModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityCurlModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityTestProtocolModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAssetBundleModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestAudioModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestTextureModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.UnityWebRequestWWWModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VFXModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VRModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VehiclesModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VideoModule.dll
-
- D:\unity\2021.3.2f1c1\Editor\Data\PlaybackEngines\WebGLSupport\Managed\UnityEngine.WebGLModule.dll
+
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.VirtualTexturingModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.WindModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEngine.XRModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.CoreModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.DeviceSimulatorModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.DeviceSimulatorModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.DiagnosticsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.DiagnosticsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.GraphViewModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.PackageManagerUIModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.PackageManagerUIModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.QuickSearchModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.QuickSearchModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.SceneTemplateModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreFontEngineModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreFontEngineModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreTextEngineModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.TextCoreTextEngineModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UIBuilderModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIBuilderModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIElementsSamplesModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UIServiceModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UIServiceModule.dll
- D:\unity\2021.3.2f1c1\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\Managed\UnityEngine\UnityEditor.UnityConnectModule.dll
+
+
+ Assets\Adam\Plugins\Mono.Data.Sqlite.dll
Assets\Demigiant\DemiLib\Core\DemiLib.dll
+
+ Assets\Adam\Plugins\Excel.dll
+
+
+ Assets\Adam\Plugins\I18N.dll
+
+
+ Assets\Adam\Plugins\Interop.SpeechLib.dll
+
Assets\Packages\AutoMapper.12.0.1\lib\netstandard2.1\AutoMapper.dll
+
+ Assets\Adam\Plugins\ICSharpCode.SharpZipLib.dll
+
+
+ Assets\Adam\Plugins\I18N.West.dll
+
Assets\Demigiant\DOTween\DOTween.dll
@@ -313,374 +340,386 @@
Library\PackageCache\com.unity.nuget.newtonsoft-json@3.0.2\Runtime\Newtonsoft.Json.dll
+
+ Assets\Adam\Plugins\I18N.CJK.dll
+
Assets\Demigiant\DOTweenPro\DOTweenPro.dll
+
+ Assets\Packages\System.Security.Cryptography.ProtectedData.4.5.0\lib\netstandard2.0\System.Security.Cryptography.ProtectedData.dll
+
+
+ E:\Unity\2021.3.10f1c2\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Types.dll
+
+
+ E:\Unity\2021.3.10f1c2\Editor\Data\PlaybackEngines\AndroidPlayer\Unity.Android.Gradle.dll
+
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\ref\2.1.0\netstandard.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\Microsoft.Win32.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\Microsoft.Win32.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.AppContext.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.AppContext.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Buffers.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Buffers.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Concurrent.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Concurrent.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.NonGeneric.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.NonGeneric.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Specialized.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Collections.Specialized.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.EventBasedAsync.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.EventBasedAsync.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.TypeConverter.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ComponentModel.TypeConverter.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Console.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Console.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Data.Common.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Data.Common.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Contracts.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Contracts.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Debug.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Debug.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.FileVersionInfo.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.FileVersionInfo.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Process.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Process.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.StackTrace.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.StackTrace.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TextWriterTraceListener.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TextWriterTraceListener.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tools.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tools.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TraceSource.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.TraceSource.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tracing.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Diagnostics.Tracing.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Drawing.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Drawing.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Dynamic.Runtime.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Dynamic.Runtime.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Calendars.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Calendars.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Extensions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Globalization.Extensions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.ZipFile.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Compression.ZipFile.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.DriveInfo.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.DriveInfo.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Watcher.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.FileSystem.Watcher.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.IsolatedStorage.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.IsolatedStorage.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.MemoryMappedFiles.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.MemoryMappedFiles.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Pipes.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.Pipes.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.UnmanagedMemoryStream.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.IO.UnmanagedMemoryStream.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Expressions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Expressions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Parallel.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Parallel.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Queryable.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Linq.Queryable.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Memory.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Memory.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Http.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Http.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NameResolution.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NameResolution.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NetworkInformation.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.NetworkInformation.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Ping.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Ping.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Requests.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Requests.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Security.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Security.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Sockets.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.Sockets.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebHeaderCollection.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebHeaderCollection.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.Client.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.Client.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Net.WebSockets.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Numerics.Vectors.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Numerics.Vectors.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ObjectModel.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ObjectModel.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.DispatchProxy.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.DispatchProxy.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.ILGeneration.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.ILGeneration.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.Lightweight.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Emit.Lightweight.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Extensions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Extensions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Reflection.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Reader.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Reader.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.ResourceManager.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.ResourceManager.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Writer.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Resources.Writer.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.CompilerServices.VisualC.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.CompilerServices.VisualC.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Extensions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Extensions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Handles.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Handles.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.RuntimeInformation.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.InteropServices.RuntimeInformation.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Numerics.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Numerics.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Formatters.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Formatters.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Json.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Json.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Xml.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Runtime.Serialization.Xml.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Claims.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Claims.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Algorithms.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Algorithms.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Csp.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Csp.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Encoding.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Encoding.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Primitives.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.Primitives.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.X509Certificates.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Cryptography.X509Certificates.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Principal.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.Principal.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.SecureString.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Security.SecureString.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.Extensions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.Encoding.Extensions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.RegularExpressions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Text.RegularExpressions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Overlapped.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Overlapped.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Extensions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Extensions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Parallel.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Tasks.Parallel.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Thread.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Thread.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.ThreadPool.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.ThreadPool.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Timer.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Threading.Timer.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ValueTuple.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.ValueTuple.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.ReaderWriter.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.ReaderWriter.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XDocument.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XDocument.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlDocument.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlDocument.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlSerializer.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XmlSerializer.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.XDocument.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netstandard\System.Xml.XPath.XDocument.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\Extensions\2.0.0\System.Runtime.InteropServices.WindowsRuntime.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\Extensions\2.0.0\System.Runtime.InteropServices.WindowsRuntime.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\mscorlib.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\mscorlib.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ComponentModel.Composition.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ComponentModel.Composition.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Core.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Core.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Data.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Data.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Drawing.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Drawing.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.IO.Compression.FileSystem.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.IO.Compression.FileSystem.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Net.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Net.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Numerics.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Numerics.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Runtime.Serialization.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Runtime.Serialization.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ServiceModel.Web.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.ServiceModel.Web.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Transactions.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Transactions.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Web.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Web.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Windows.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Windows.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Linq.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Linq.dll
- D:\unity\2021.3.2f1c1\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll
+ E:\Unity\2021.3.10f1c2\Editor\Data\NetStandard\compat\2.1.0\shims\netfx\System.Xml.Serialization.dll
Library\ScriptAssemblies\Unity.VisualScripting.Flow.Editor.dll
diff --git a/GQ_TongXin/Assets/Adam/Scenes/Adam.unity b/GQ_TongXin/Assets/Adam/Scenes/Adam.unity
index bbd094c68..0a3db7da3 100644
--- a/GQ_TongXin/Assets/Adam/Scenes/Adam.unity
+++ b/GQ_TongXin/Assets/Adam/Scenes/Adam.unity
@@ -7859,6 +7859,7 @@ MonoBehaviour:
dragControllerContent: {fileID: 155917792}
uposManger: {fileID: 606617863}
stagingPanel: {fileID: 803679558}
+ stagingParent: {fileID: 0}
--- !u!4 &2593110455101622696
Transform:
m_ObjectHideFlags: 0
@@ -8619,7 +8620,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!23 &3693985734185527738
MeshRenderer:
m_ObjectHideFlags: 0
@@ -9748,7 +9749,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!65 &5305214248416820320
BoxCollider:
m_ObjectHideFlags: 0
@@ -11039,7 +11040,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!1 &8250898760909756256
GameObject:
m_ObjectHideFlags: 0
diff --git a/GQ_TongXin/Assets/Adam/Scripts/DragController.cs b/GQ_TongXin/Assets/Adam/Scripts/DragController.cs
index 60925b734..0982d2aae 100644
--- a/GQ_TongXin/Assets/Adam/Scripts/DragController.cs
+++ b/GQ_TongXin/Assets/Adam/Scripts/DragController.cs
@@ -18,7 +18,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
public DragTest1 oriObjectPrefab;
private DragTest1 targetObject;
- private UPosItem currentUPosItem;
+ public UPosItem currentUPosItem;
public Func DragCondition;
public Action DragAction;
@@ -143,7 +143,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
}
///
- /// 自动生成设备
+ /// 生成设备
///
///
/// 机位号码,从0开始
@@ -173,6 +173,23 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
return false;
}
}
+ ///
+ /// 触碰高亮U位
+ ///
+ ///
+ public void SetUPosHighLight(bool isOnUPos)
+ {
+ if (isOnUPos)
+ {
+
+ int index = uPosManger.CountUPos(targetObject.volume, currentUPosItem.ID);
+ uPosManger.SetUPosInstruct(index, targetObject.volume, isOnUPos);
+ }
+ else
+ {
+ uPosManger.SetUPosInstruct(0, 0, isOnUPos);
+ }
+ }
@@ -189,17 +206,28 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
currentUPosItem = hitInfo.collider.GetComponent();
if (!EventSystem.current.IsPointerOverGameObject())
{
+ SetUPosHighLight(true);
if (!currentUPosItem.isOccupied)
{
target.transform.position = hitInfo.point;
}
}
+ else
+ {
+ Debug.Log("EventSystem");
+ }
}
else
{
+ Debug.Log("hitInfo");
}
}
+ else
+ {
+ Debug.Log("Physics");
+ SetUPosHighLight(false);
+ }
}
}
diff --git a/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs b/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs
index 70c4d25df..d8d1b5e28 100644
--- a/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs
+++ b/GQ_TongXin/Assets/Adam/Scripts/UPosManger.cs
@@ -89,4 +89,30 @@ public class UPosManger : MonoBehaviour
}
}
}
+
+
+ ///
+ /// 拖拽触碰容器提示
+ ///
+ ///
+ ///
+ ///
+ public void SetUPosInstruct(int startIndex, int count, bool isOnUPos)
+ {
+ for (int i = 0; i < uPosItems.Length; i++)
+ {
+ if (!uPosItems[i].isOccupied)
+ uPosItems[i].SetInstructColor(Color.green);
+ }
+
+ if (isOnUPos)
+ {
+ for (int i = startIndex; i < startIndex + count; i++)
+ {
+ uPosItems[i].SetInstructColor(Color.yellow);
+ }
+ }
+
+ }
+
}
diff --git a/GQ_TongXin/Packages/packages-lock.json b/GQ_TongXin/Packages/packages-lock.json
index 0b07a465d..0858bf9be 100644
--- a/GQ_TongXin/Packages/packages-lock.json
+++ b/GQ_TongXin/Packages/packages-lock.json
@@ -28,8 +28,8 @@
"depth": 0,
"source": "builtin",
"dependencies": {
- "com.unity.ide.visualstudio": "2.0.14",
- "com.unity.ide.rider": "3.0.13",
+ "com.unity.ide.visualstudio": "2.0.16",
+ "com.unity.ide.rider": "3.0.15",
"com.unity.ide.vscode": "1.2.5",
"com.unity.editorcoroutines": "1.0.0",
"com.unity.performance.profile-analyzer": "1.1.1",
@@ -77,7 +77,7 @@
"url": "https://packages.unity.cn"
},
"com.unity.services.core": {
- "version": "1.3.1",
+ "version": "1.4.2",
"depth": 1,
"source": "registry",
"dependencies": {
diff --git a/GQ_TongXin/ProjectSettings/ProjectVersion.txt b/GQ_TongXin/ProjectSettings/ProjectVersion.txt
index f9b5ef894..bc2ff9437 100644
--- a/GQ_TongXin/ProjectSettings/ProjectVersion.txt
+++ b/GQ_TongXin/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.2f1c1
-m_EditorVersionWithRevision: 2021.3.2f1c1 (7ac240095d88)
+m_EditorVersion: 2021.3.10f1c2
+m_EditorVersionWithRevision: 2021.3.10f1c2 (5a059dbcdda5)