diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index cb25fbd..a835b51 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -1763,7 +1763,10 @@ - + + + + diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml index 2cbed77..c2eb68f 100644 --- a/Data/Xml/Study.xml +++ b/Data/Xml/Study.xml @@ -2217,7 +2217,10 @@ - + + + + diff --git a/VirtualFramwork_Data/Managed/Assembly-CSharp.dll b/VirtualFramwork_Data/Managed/Assembly-CSharp.dll index 84403c1..54f112e 100644 Binary files a/VirtualFramwork_Data/Managed/Assembly-CSharp.dll and b/VirtualFramwork_Data/Managed/Assembly-CSharp.dll differ diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows index dd76349..2623d6e 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 65cdf5a..788631e 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/Windows.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 3069300003 +CRC: 963493089 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 f26c045..dd34596 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 ccc0960..c6ea56d 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: 1369274010 +CRC: 2426776791 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c1967c37c12edc8b209608cce5a68288 + Hash: 711ed3ce21cf004a1998f1f5f6052d45 TypeTreeHash: serializedVersion: 2 Hash: 883544743a38c9822709974f4036d31b IncrementalBuildHash: serializedVersion: 2 - Hash: c1967c37c12edc8b209608cce5a68288 + Hash: 711ed3ce21cf004a1998f1f5f6052d45 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 ff9b985..86a1b21 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 83f023a..bfa37f9 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: 3203736918 +CRC: 1929071957 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 5ee23263f676fbf50001350bcb205e7b + Hash: d7cbffcaca308134fefd2c1d2327afcc TypeTreeHash: serializedVersion: 2 Hash: 883544743a38c9822709974f4036d31b IncrementalBuildHash: serializedVersion: 2 - Hash: 5ee23263f676fbf50001350bcb205e7b + Hash: d7cbffcaca308134fefd2c1d2327afcc HashAppended: 0 ClassTypes: - Class: 21 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/ui3dobjselect_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/ui3dobjselect_prefab.manifest index d82be64..ce8f57b 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/ui3dobjselect_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/ui3dobjselect_prefab.manifest @@ -3,13 +3,13 @@ CRC: 1311251791 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 19be30c47e29b2961e036dd60205f688 + Hash: 3765b140d446e3f98a40626a3ff44efd TypeTreeHash: serializedVersion: 2 Hash: 95a426a5695320393d3e30dde6e1e23d IncrementalBuildHash: serializedVersion: 2 - Hash: 19be30c47e29b2961e036dd60205f688 + Hash: 3765b140d446e3f98a40626a3ff44efd HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uibody3dmenutree_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uibody3dmenutree_prefab.manifest index 04cc91d..cff8d74 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uibody3dmenutree_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uibody3dmenutree_prefab.manifest @@ -3,13 +3,13 @@ CRC: 291125939 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 4aef6edd23f579f4f9c5586e0c221f82 + Hash: 6095b67acf1f4a8ef1bc4e9afb0969ca TypeTreeHash: serializedVersion: 2 Hash: 6a5e64837add6a1b3a6fb29db05d8dc2 IncrementalBuildHash: serializedVersion: 2 - Hash: 4aef6edd23f579f4f9c5586e0c221f82 + Hash: 6095b67acf1f4a8ef1bc4e9afb0969ca HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uidraw_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uidraw_prefab.manifest index e6f06c0..f1d7db6 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uidraw_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uidraw_prefab.manifest @@ -3,13 +3,13 @@ CRC: 1733190452 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 8840b6dc8c40d7a1fa14f12e8bbffb3b + Hash: 414806bf137d36812c48f573aca82aac TypeTreeHash: serializedVersion: 2 Hash: 78c6d789be851942465d8206fd428ec8 IncrementalBuildHash: serializedVersion: 2 - Hash: 8840b6dc8c40d7a1fa14f12e8bbffb3b + Hash: 414806bf137d36812c48f573aca82aac HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uiinput_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uiinput_prefab.manifest index 8ffc29c..9acb9b3 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uiinput_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uiinput_prefab.manifest @@ -3,13 +3,13 @@ CRC: 1148709019 Hashes: AssetFileHash: serializedVersion: 2 - Hash: ad2740467f7e2d1749dd5a3a0c2bc4fd + Hash: c10983fd0b8930cc5053ce5ae332f663 TypeTreeHash: serializedVersion: 2 Hash: 4ae47539c9199c6b661210e9ce87889d IncrementalBuildHash: serializedVersion: 2 - Hash: ad2740467f7e2d1749dd5a3a0c2bc4fd + Hash: c10983fd0b8930cc5053ce5ae332f663 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uimoduleselect_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uimoduleselect_prefab.manifest index 3dd05e5..217a99b 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uimoduleselect_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uimoduleselect_prefab.manifest @@ -3,13 +3,13 @@ CRC: 1987039693 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c5f96cd5ca6d18e0a46579c010fbd529 + Hash: db8a633a47b69529429d36567758eb43 TypeTreeHash: serializedVersion: 2 Hash: fcfbe4550a19edf15aebea3d65d713f7 IncrementalBuildHash: serializedVersion: 2 - Hash: c5f96cd5ca6d18e0a46579c010fbd529 + Hash: db8a633a47b69529429d36567758eb43 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uirighttop_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uirighttop_prefab.manifest index 688078a..3f29c1e 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uirighttop_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uirighttop_prefab.manifest @@ -3,13 +3,13 @@ CRC: 454844173 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 8272a524d76ae3fb75dcde1d99440342 + Hash: 1cdb0a77c7724df1dc4b0a5c0a6c1e08 TypeTreeHash: serializedVersion: 2 Hash: bbddb4d6ab2dc838c6e64e7b1e0739b3 IncrementalBuildHash: serializedVersion: 2 - Hash: 8272a524d76ae3fb75dcde1d99440342 + Hash: 1cdb0a77c7724df1dc4b0a5c0a6c1e08 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab index e1c7918..4421392 100644 Binary files a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab and b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab differ diff --git a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest index aab6130..524cdf8 100644 --- a/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest +++ b/VirtualFramwork_Data/StreamingAssets/AssetBundles/Windows/uitipwindow_prefab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 1525535282 +CRC: 1767274827 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 04cb5fc174ad0f169bb71107e4fbe500 + Hash: 2cbcacc708976d5c3946022e0afb0be0 TypeTreeHash: serializedVersion: 2 Hash: 42a227471bf9c0cf5089e7a92cdd9c8d IncrementalBuildHash: serializedVersion: 2 - Hash: 04cb5fc174ad0f169bb71107e4fbe500 + Hash: 2cbcacc708976d5c3946022e0afb0be0 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/VirtualFramwork_Data/boot.config b/VirtualFramwork_Data/boot.config index 88f5bb4..c25f226 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=ea4d0d0b72b14f2c8311ab5c6ca7c10b +build-guid=51155511374e4671841b3b4a03177261 diff --git a/VirtualFramwork_Data/sharedassets0.assets b/VirtualFramwork_Data/sharedassets0.assets index 72259ad..b2d15cd 100644 Binary files a/VirtualFramwork_Data/sharedassets0.assets and b/VirtualFramwork_Data/sharedassets0.assets differ