diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 9b05b6c..4dea70e 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -476,13 +476,7 @@ haocai/gl.png - - 一次性手术衣 - - Environment/隐藏物体/SM_BuLiaoLei/shoufuyi - 一次性手术衣 - haocai/gl.png - + 一次性外科灭菌手套 diff --git a/VirtualFramwork_Data/Managed/Assembly-CSharp-firstpass.dll b/VirtualFramwork_Data/Managed/Assembly-CSharp-firstpass.dll index 216795f..ada6091 100644 Binary files a/VirtualFramwork_Data/Managed/Assembly-CSharp-firstpass.dll and b/VirtualFramwork_Data/Managed/Assembly-CSharp-firstpass.dll differ diff --git a/VirtualFramwork_Data/Managed/Assembly-CSharp.dll b/VirtualFramwork_Data/Managed/Assembly-CSharp.dll index 0b792c9..ee03ea2 100644 Binary files a/VirtualFramwork_Data/Managed/Assembly-CSharp.dll and b/VirtualFramwork_Data/Managed/Assembly-CSharp.dll differ diff --git a/VirtualFramwork_Data/Managed/AudioKit.dll b/VirtualFramwork_Data/Managed/AudioKit.dll index 13ab2bf..513dfaf 100644 Binary files a/VirtualFramwork_Data/Managed/AudioKit.dll and b/VirtualFramwork_Data/Managed/AudioKit.dll differ diff --git a/VirtualFramwork_Data/Managed/IngameDebugConsole.Runtime.dll b/VirtualFramwork_Data/Managed/IngameDebugConsole.Runtime.dll index 2a0e50e..db5649d 100644 Binary files a/VirtualFramwork_Data/Managed/IngameDebugConsole.Runtime.dll and b/VirtualFramwork_Data/Managed/IngameDebugConsole.Runtime.dll differ diff --git a/VirtualFramwork_Data/Managed/QFramework.CoreKit.dll b/VirtualFramwork_Data/Managed/QFramework.CoreKit.dll index eaa942c..752f28b 100644 Binary files a/VirtualFramwork_Data/Managed/QFramework.CoreKit.dll and b/VirtualFramwork_Data/Managed/QFramework.CoreKit.dll differ diff --git a/VirtualFramwork_Data/Managed/QFramework.dll b/VirtualFramwork_Data/Managed/QFramework.dll index 62b623d..6fe538a 100644 Binary files a/VirtualFramwork_Data/Managed/QFramework.dll and b/VirtualFramwork_Data/Managed/QFramework.dll differ diff --git a/VirtualFramwork_Data/Managed/ResKit.dll b/VirtualFramwork_Data/Managed/ResKit.dll index 12576bc..add55d3 100644 Binary files a/VirtualFramwork_Data/Managed/ResKit.dll and b/VirtualFramwork_Data/Managed/ResKit.dll differ diff --git a/VirtualFramwork_Data/Managed/SupportOldQF.dll b/VirtualFramwork_Data/Managed/SupportOldQF.dll index b3b9a51..7e7e1ac 100644 Binary files a/VirtualFramwork_Data/Managed/SupportOldQF.dll and b/VirtualFramwork_Data/Managed/SupportOldQF.dll differ diff --git a/VirtualFramwork_Data/Managed/UIKit.dll b/VirtualFramwork_Data/Managed/UIKit.dll index dce4670..97116df 100644 Binary files a/VirtualFramwork_Data/Managed/UIKit.dll and b/VirtualFramwork_Data/Managed/UIKit.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.Burst.dll b/VirtualFramwork_Data/Managed/Unity.Burst.dll index 4e36907..90cab85 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.Burst.dll and b/VirtualFramwork_Data/Managed/Unity.Burst.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.Mathematics.dll b/VirtualFramwork_Data/Managed/Unity.Mathematics.dll index 32e4f9f..89df700 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.Mathematics.dll and b/VirtualFramwork_Data/Managed/Unity.Mathematics.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.RenderPipeline.Universal.ShaderLibrary.dll b/VirtualFramwork_Data/Managed/Unity.RenderPipeline.Universal.ShaderLibrary.dll index e545e3e..4d5573d 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.RenderPipeline.Universal.ShaderLibrary.dll and b/VirtualFramwork_Data/Managed/Unity.RenderPipeline.Universal.ShaderLibrary.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.Runtime.dll b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.Runtime.dll index d2780ba..2b45732 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.Runtime.dll and b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.Runtime.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.ShaderLibrary.dll b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.ShaderLibrary.dll index fea22c5..01f638e 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.ShaderLibrary.dll and b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Core.ShaderLibrary.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll index a2e863f..b32f088 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll and b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Config.Runtime.dll b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Config.Runtime.dll index 1bbb616..d94c5f1 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Config.Runtime.dll and b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Config.Runtime.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Runtime.dll b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Runtime.dll index 5abc7ef..6463db9 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Runtime.dll and b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Runtime.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Shaders.dll b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Shaders.dll index 6677c3b..4f7d085 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Shaders.dll and b/VirtualFramwork_Data/Managed/Unity.RenderPipelines.Universal.Shaders.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.TextMeshPro.dll b/VirtualFramwork_Data/Managed/Unity.TextMeshPro.dll index d669a12..450a4f2 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.TextMeshPro.dll and b/VirtualFramwork_Data/Managed/Unity.TextMeshPro.dll differ diff --git a/VirtualFramwork_Data/Managed/Unity.Timeline.dll b/VirtualFramwork_Data/Managed/Unity.Timeline.dll index 168a7d1..b491665 100644 Binary files a/VirtualFramwork_Data/Managed/Unity.Timeline.dll and b/VirtualFramwork_Data/Managed/Unity.Timeline.dll differ diff --git a/VirtualFramwork_Data/Managed/UnityEngine.SpatialTracking.dll b/VirtualFramwork_Data/Managed/UnityEngine.SpatialTracking.dll index 02fe12c..5b29ee1 100644 Binary files a/VirtualFramwork_Data/Managed/UnityEngine.SpatialTracking.dll and b/VirtualFramwork_Data/Managed/UnityEngine.SpatialTracking.dll differ diff --git a/VirtualFramwork_Data/Managed/UnityEngine.UI.dll b/VirtualFramwork_Data/Managed/UnityEngine.UI.dll index 226bb52..cc41d2c 100644 Binary files a/VirtualFramwork_Data/Managed/UnityEngine.UI.dll and b/VirtualFramwork_Data/Managed/UnityEngine.UI.dll differ diff --git a/VirtualFramwork_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll b/VirtualFramwork_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll index 891b1a0..707c7dd 100644 Binary files a/VirtualFramwork_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll and b/VirtualFramwork_Data/Managed/UnityEngine.XR.LegacyInputHelpers.dll differ diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows index ecc30fc..65a4ba3 100644 Binary files a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows and b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows differ diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows.manifest index daf4097..708e688 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 191443901 +CRC: 3194110368 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset index 8db5cc2..f26c045 100644 Binary files a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset and b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset differ diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset.manifest index 310040b..189da68 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfang medium sdf_asset.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 1949029002 +CRC: 1369274010 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 2c270ff35c03c11162072cf03515a549 + Hash: bf23a5d347c8a9c68f817e299cc0e746 TypeTreeHash: serializedVersion: 2 Hash: 883544743a38c9822709974f4036d31b IncrementalBuildHash: serializedVersion: 2 - Hash: 2c270ff35c03c11162072cf03515a549 + Hash: bf23a5d347c8a9c68f817e299cc0e746 HashAppended: 0 ClassTypes: - Class: 21 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset index 91e1da2..ff9b985 100644 Binary files a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset and b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset differ diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset.manifest index 07e60cd..94e4231 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/pingfangsc-medium sdf_asset.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 3861140709 +CRC: 3203736918 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 59101049f6dbcf2680d45a7a76d5d028 + Hash: 47546d68d39ada5c41a23c4c05b34af9 TypeTreeHash: serializedVersion: 2 Hash: 883544743a38c9822709974f4036d31b IncrementalBuildHash: serializedVersion: 2 - Hash: 59101049f6dbcf2680d45a7a76d5d028 + Hash: 47546d68d39ada5c41a23c4c05b34af9 HashAppended: 0 ClassTypes: - Class: 21 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest index 524cdf8..2723a57 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest @@ -3,13 +3,13 @@ CRC: 1767274827 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 2cbcacc708976d5c3946022e0afb0be0 + Hash: 5843af0827ee41324cc72cf65f3a06f8 TypeTreeHash: serializedVersion: 2 Hash: 42a227471bf9c0cf5089e7a92cdd9c8d IncrementalBuildHash: serializedVersion: 2 - Hash: 2cbcacc708976d5c3946022e0afb0be0 + Hash: 5843af0827ee41324cc72cf65f3a06f8 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/boot.config b/VirtualFramwork_Data/boot.config index 1aa097e..50d9bf7 100644 --- a/VirtualFramwork_Data/boot.config +++ b/VirtualFramwork_Data/boot.config @@ -4,4 +4,4 @@ wait-for-native-debugger=0 hdr-display-enabled=0 gc-max-time-slice=3 force-d3d11-bitblt-model= -build-guid=cd7a1aff7d864faca803e65055084e6e +build-guid=9c447a54a5cd46b598fd79eadd1da781 diff --git a/VirtualFramwork_Data/level1 b/VirtualFramwork_Data/level1 index ff2b02d..b1d3dbe 100644 Binary files a/VirtualFramwork_Data/level1 and b/VirtualFramwork_Data/level1 differ diff --git a/VirtualFramwork_Data/resources.assets b/VirtualFramwork_Data/resources.assets index fb76bb2..adb5360 100644 Binary files a/VirtualFramwork_Data/resources.assets and b/VirtualFramwork_Data/resources.assets differ diff --git a/VirtualFramwork_Data/sharedassets0.assets b/VirtualFramwork_Data/sharedassets0.assets index a82f4fb..8ca6326 100644 Binary files a/VirtualFramwork_Data/sharedassets0.assets and b/VirtualFramwork_Data/sharedassets0.assets differ