diff --git a/.gitignore b/.gitignore index 22e7db6..6711917 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,9 @@ # Gradle cache directory .gradle/ - +# 资源包 +AssetBundles/ +Assets/StreamingAssets/ # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ .consulo/ diff --git a/AssetBundles/Android/Android b/AssetBundles/Android/Android deleted file mode 100644 index 4b20037..0000000 Binary files a/AssetBundles/Android/Android and /dev/null differ diff --git a/AssetBundles/Android/Android.manifest b/AssetBundles/Android/Android.manifest deleted file mode 100644 index a5d3d53..0000000 --- a/AssetBundles/Android/Android.manifest +++ /dev/null @@ -1,51 +0,0 @@ -ManifestFileVersion: 0 -CRC: 461845205 -AssetBundleManifest: - AssetBundleInfos: - Info_0: - Name: ui_homepage.ab - Dependencies: - Dependency_0: common.ab - Dependency_1: ui_common.ab - Info_1: - Name: common.ab - Dependencies: - Dependency_0: ui_common.ab - Info_2: - Name: language.ab - Dependencies: {} - Info_3: - Name: ui_common.ab - Dependencies: {} - Info_4: - Name: ui_loginpage.ab - Dependencies: - Dependency_0: ui_common.ab - Info_5: - Name: ui_safetylearningpage.ab - Dependencies: - Dependency_0: ui_common.ab - Info_6: - Name: ui_connectdevicepage.ab - Dependencies: - Dependency_0: common.ab - Dependency_1: ui_common.ab - Info_7: - Name: ui_deviceinfopage.ab - Dependencies: - Dependency_0: ui_homepage.ab - Dependency_1: ui_common.ab - Info_8: - Name: ui_selfpage.ab - Dependencies: - Dependency_0: ui_homepage.ab - Dependency_1: ui_common.ab - Dependency_2: ui_loginpage.ab - Info_9: - Name: ui_videopage.ab - Dependencies: - Dependency_0: ui_common.ab - Info_10: - Name: ui_rankpage.ab - Dependencies: - Dependency_0: ui_common.ab diff --git a/AssetBundles/Android/common.ab b/AssetBundles/Android/common.ab deleted file mode 100644 index d97ccf3..0000000 Binary files a/AssetBundles/Android/common.ab and /dev/null differ diff --git a/AssetBundles/Android/common.ab.manifest b/AssetBundles/Android/common.ab.manifest deleted file mode 100644 index 1fd7998..0000000 --- a/AssetBundles/Android/common.ab.manifest +++ /dev/null @@ -1,30 +0,0 @@ -ManifestFileVersion: 0 -CRC: 2577400749 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 1a12fbb511ae2f5da7c9b7b1acd48dce - TypeTreeHash: - serializedVersion: 2 - Hash: 9c52ac4cef87f173de8a52cd247f463a - IncrementalBuildHash: - serializedVersion: 2 - Hash: 1a12fbb511ae2f5da7c9b7b1acd48dce -HashAppended: 0 -ClassTypes: -- Class: 48 - Script: {instanceID: 0} -- Class: 74 - Script: {instanceID: 0} -- Class: 115 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/Res/common/loadingNew.anim -- Assets/Res/common/updateLoading.anim -- Assets/Res/common/SimpleGrabPassBlur.shader -- Assets/Res/common/loading.anim -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/AssetBundles/Android/language.ab b/AssetBundles/Android/language.ab deleted file mode 100644 index 21c1dad..0000000 Binary files a/AssetBundles/Android/language.ab and /dev/null differ diff --git a/AssetBundles/Android/language.ab.manifest b/AssetBundles/Android/language.ab.manifest deleted file mode 100644 index 535828f..0000000 --- a/AssetBundles/Android/language.ab.manifest +++ /dev/null @@ -1,20 +0,0 @@ -ManifestFileVersion: 0 -CRC: 2940790012 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 94acdd3b9bcafc1af575cebe764f8395 - TypeTreeHash: - serializedVersion: 2 - Hash: 5ad585dd02dfb5016c0dad519eab8f49 - IncrementalBuildHash: - serializedVersion: 2 - Hash: 94acdd3b9bcafc1af575cebe764f8395 -HashAppended: 0 -ClassTypes: -- Class: 49 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] -Assets: -- Assets/Res/language/language.json -Dependencies: [] diff --git a/AssetBundles/Android/ui_common.ab b/AssetBundles/Android/ui_common.ab deleted file mode 100644 index 75fca2b..0000000 Binary files a/AssetBundles/Android/ui_common.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_common.ab.manifest b/AssetBundles/Android/ui_common.ab.manifest deleted file mode 100644 index e49df0b..0000000 --- a/AssetBundles/Android/ui_common.ab.manifest +++ /dev/null @@ -1,192 +0,0 @@ -ManifestFileVersion: 0 -CRC: 1227180749 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 491cf663f9e09f9b0c0395818a7c8600 - TypeTreeHash: - serializedVersion: 2 - Hash: 46399b71a907d170acd3559667951385 - IncrementalBuildHash: - serializedVersion: 2 - Hash: 491cf663f9e09f9b0c0395818a7c8600 -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 767fbd85f067c1a4da213c13282cc05e, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: ce7f9a66c3b832343bd86c4b491d90c8, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/EndEditEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/OnChangeEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/SubmitEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -Assets: -- "Assets/Res/ui/common/\u5BC6\u7801 (1) 1.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00052.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00012.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00020.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00036.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00025.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00034.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00059.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00063.png" -- "Assets/Res/ui/common/\u90AE\u7BB1-F 1.png" -- "Assets/Res/ui/common/\u6307\u7EB9.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00033.png" -- "Assets/Res/ui/common/\u89C6\u9891.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00062.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00005.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00006.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00031.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00060.png" -- "Assets/Res/ui/common/\u64AD\u653E\u5668\u80CC\u666F.png" -- "Assets/Res/ui/common/Loading/\u5C0F.png" -- "Assets/Res/ui/common/\u5BC6\u7801 - \u5C55\u793A.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00050.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00023.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00030.png" -- "Assets/Res/ui/common/\u5706\u70B9.png" -- "Assets/Res/ui/common/\u7F3A\u7701\u56FE.png" -- "Assets/Res/ui/common/\u5F00\u5173-0.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00022.png" -- "Assets/Res/ui/common/\u626B\u63CF.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00015.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6\u6761.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00021.png" -- Assets/Res/ui/common/Rectangle 132 (2).png -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00024.png" -- "Assets/Res/ui/common/\u7528\u6237.png" -- Assets/Res/ui/common/Rectangle 68.png -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00026.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u5168\u5C4F\u6846.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00018.png" -- "Assets/Res/ui/common/\u63D0\u9192\u7EA2\u70B9.png" -- "Assets/Res/ui/common/\u8FD4\u56DE.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6\u5706\u70B9.png" -- "Assets/Res/ui/common/\u5220\u9664\u63D0\u793A.prefab" -- "Assets/Res/ui/common/Right (\u53F3) (1).png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00053.png" -- "Assets/Res/ui/common/Right (\u53F3) (2).png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00010.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00028.png" -- "Assets/Res/ui/common/\u58F0\u97F3.png" -- "Assets/Res/ui/common/\u8BBE\u5907\u540D\u6B21.png" -- Assets/Res/ui/common/Rectangle 132 (3).png -- Assets/Res/ui/common/ok.prefab -- "Assets/Res/ui/common/\u957F\u6309\u94AE.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00039.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00002.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00042.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00051.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00055.png" -- "Assets/Res/ui/common/\u63D0\u793A\u6846.png" -- Assets/Res/ui/common/Ellipse 32.png -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00041.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00054.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00011.png" -- Assets/Res/ui/common/Rectangle 132 (1).png -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00049.png" -- "Assets/Res/ui/common/Check-small (\u6821\u9A8C-\u5C0F).png" -- "Assets/Res/ui/common/\u5F00\u5173-1.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00007.png" -- "Assets/Res/ui/common/\u9009\u53D6\u5934\u50CF.prefab" -- Assets/Res/ui/common/Loading.png -- "Assets/Res/ui/common/\u65E0\u5B9A\u65F6\u4EFB\u52A1.prefab" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00014.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u5168\u5C4F\u56FE\u6807.png" -- Assets/Res/ui/common/Rectangle 148 (1).png -- Assets/Res/ui/common/Rectangle 132.png -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00000.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00029.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00016.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00038.png" -- "Assets/Res/ui/common/\u786E\u8BA4.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00027.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00043.png" -- "Assets/Res/ui/common/\u5B9A\u65F6.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00001.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00045.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00040.png" -- "Assets/Res/ui/common/\u5C0F\u6309\u94AE.png" -- Assets/Res/ui/common/Rectangle 135.png -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00056.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00048.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00035.png" -- "Assets/Res/ui/common/\u64AD\u653E.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00013.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00058.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00044.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00003.png" -- "Assets/Res/ui/common/Loading/\u5927.png" -- "Assets/Res/ui/common/\u9009\u62E9\u6846.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00037.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00008.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00017.png" -- "Assets/Res/ui/common/\u5F39\u7A97\u6309\u94AE.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00004.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00019.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00047.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00057.png" -- "Assets/Res/ui/common/Close (\u5173\u95ED).png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00009.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00046.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00032.png" -- "Assets/Res/ui/common/\u9009\u4E2D.png" -- "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00061.png" -- "Assets/Res/ui/common/\u9A8C\u8BC1\u7801\u7EC4\u4EF6.prefab" -Dependencies: [] diff --git a/AssetBundles/Android/ui_connectdevicepage.ab b/AssetBundles/Android/ui_connectdevicepage.ab deleted file mode 100644 index 3d93c0a..0000000 Binary files a/AssetBundles/Android/ui_connectdevicepage.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_connectdevicepage.ab.manifest b/AssetBundles/Android/ui_connectdevicepage.ab.manifest deleted file mode 100644 index 6892ca5..0000000 --- a/AssetBundles/Android/ui_connectdevicepage.ab.manifest +++ /dev/null @@ -1,106 +0,0 @@ -ManifestFileVersion: 0 -CRC: 3315253899 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 0fc3f28afeb126e8cd131e8a52707a5a - TypeTreeHash: - serializedVersion: 2 - Hash: e05a771caeff7fda6539c249b3a15e2a - IncrementalBuildHash: - serializedVersion: 2 - Hash: 0fc3f28afeb126e8cd131e8a52707a5a -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 74 - Script: {instanceID: 0} -- Class: 111 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: cc4db0165ab541a44978ccde28b3bc29, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 2f6d707cba0376a43bc6d9f0a27ea376, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: Assembly-CSharp - ClassName: Kill.UI.Pages.ScanQRcode/ScanType -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.ArgumentCache -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentListenerMode -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/EndEditEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/OnChangeEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/SubmitEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ScrollRect/ScrollRectEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -Assets: -- Assets/Res/ui/connectdevicepage/Frame 19.png -- Assets/Res/ui/connectdevicepage/icon.png -- Assets/Res/ui/connectdevicepage/Frame 20.png -- "Assets/Res/ui/connectdevicepage/\u786E\u8BA4.png" -- Assets/Res/ui/connectdevicepage/connectDevicePage.prefab -- Assets/Res/ui/connectdevicepage/Rectangle 136.png -- Assets/Res/ui/connectdevicepage/Vector.png -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/common.ab -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/AssetBundles/Android/ui_deviceinfopage.ab b/AssetBundles/Android/ui_deviceinfopage.ab deleted file mode 100644 index 438728a..0000000 Binary files a/AssetBundles/Android/ui_deviceinfopage.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_deviceinfopage.ab.manifest b/AssetBundles/Android/ui_deviceinfopage.ab.manifest deleted file mode 100644 index 2fc8235..0000000 --- a/AssetBundles/Android/ui_deviceinfopage.ab.manifest +++ /dev/null @@ -1,145 +0,0 @@ -ManifestFileVersion: 0 -CRC: 1145510873 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 6c1878930a73a9f2522ea4b13b03a3dc - TypeTreeHash: - serializedVersion: 2 - Hash: fba85493ad4dcb59f971af235d74359c - IncrementalBuildHash: - serializedVersion: 2 - Hash: 6c1878930a73a9f2522ea4b13b03a3dc -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3ee5f5605b32d3d48909a6372c1bcb1e, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: a686f7ff9b44930499d8f9169c1f56c7, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 82158f49fdaec6d4f85c5c221df7dab8, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: a9c90fc8a76fb974e8699f9ae7f10ef9, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: ce7f9a66c3b832343bd86c4b491d90c8, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: b39a1ed75313ef54b9dd4fe9ac2a8c07, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 36dab9050231ae24b83d68c84ac3bac9, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 2f6d707cba0376a43bc6d9f0a27ea376, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 8b04ecc8da65db14e83ba32040956daa, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 2ecab8ee10e21774988a1594e6f60a72, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4471bb7960aa06943925760593a2eea8, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 95df77c8983e1ff4783df2c6ff3b87d1, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 45d6f42a72dfae54fb422362302b43da, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d5819d73a5471d94e8061bcb00026d22, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: aaf26b3a926da3048b08fbaf8eb9a7d4, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: f2e426bd60f5b5f41aa91797b6427838, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: Assembly-CSharp - ClassName: Kill.UI.Pages.ScanQRcode/ScanType -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.ArgumentCache -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentListenerMode -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/EndEditEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/OnChangeEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/SubmitEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ScrollRect/ScrollRectEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Slider/SliderEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -Assets: -- Assets/Res/ui/deviceinfopage/Frame 23.png -- "Assets/Res/ui/deviceinfopage/\u56FA\u4EF6\u66F4\u65B0.prefab" -- "Assets/Res/ui/deviceinfopage/\u6697.png" -- Assets/Res/ui/deviceinfopage/deviceInfoPage.prefab -- "Assets/Res/ui/deviceinfopage/\u9009\u62E9wifi.prefab" -- "Assets/Res/ui/deviceinfopage/\u8BBE\u5907\u7528\u6237\u7BA1\u7406.prefab" -- Assets/Res/ui/deviceinfopage/Ellipse 44.png -- Assets/Res/ui/deviceinfopage/Ellipse 46.png -- "Assets/Res/ui/deviceinfopage/\u89C6\u9891\u548C\u97F3\u6548.prefab" -- "Assets/Res/ui/deviceinfopage/\u7528\u6237.png" -- "Assets/Res/ui/deviceinfopage/\u5220\u9664.png" -- Assets/Res/ui/deviceinfopage/RGB.prefab -- "Assets/Res/ui/deviceinfopage/\u91CD\u547D\u540D.prefab" -- Assets/Res/ui/deviceinfopage/LCD.prefab -- Assets/Res/ui/deviceinfopage/Ellipse 45.png -- "Assets/Res/ui/deviceinfopage/\u4EAE.png" -- "Assets/Res/ui/deviceinfopage/\u8BBE\u5907\u5206\u4EAB\u9875\u9762.prefab" -- Assets/Res/ui/deviceinfopage/about.prefab -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab -- D:/unity_project/Kill/AssetBundles/Android/ui_homepage.ab diff --git a/AssetBundles/Android/ui_homepage.ab b/AssetBundles/Android/ui_homepage.ab deleted file mode 100644 index 7e457a0..0000000 Binary files a/AssetBundles/Android/ui_homepage.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_homepage.ab.manifest b/AssetBundles/Android/ui_homepage.ab.manifest deleted file mode 100644 index 1b945b5..0000000 --- a/AssetBundles/Android/ui_homepage.ab.manifest +++ /dev/null @@ -1,240 +0,0 @@ -ManifestFileVersion: 0 -CRC: 3370057080 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 5fdd1d411d968edb60d17d2fd4fb8d0c - TypeTreeHash: - serializedVersion: 2 - Hash: 2714bb65ae021d2197ad838d3ddce545 - IncrementalBuildHash: - serializedVersion: 2 - Hash: 5fdd1d411d968edb60d17d2fd4fb8d0c -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 74 - Script: {instanceID: 0} -- Class: 111 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 177e7cc3f2f22a94bae08f359393a980, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3ee5f5605b32d3d48909a6372c1bcb1e, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31624e2354672aa4ea1b0ae7197581d4, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: ce7f9a66c3b832343bd86c4b491d90c8, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 9061c8441b3e3814cbb024247f97bbd1, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 77c3d6806925a824493d7f0a3926347a, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5fb0a21d94cea1043b96299ba5d273c1, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 0e2349932c43c9a4eaca863d6322ba60, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1aafbec226338db4cbbe8408276adecd, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 7275eb3e38b8e5a4dac6e016f2b8d267, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 11e48a3e220d1524bba3a614d2c4e186, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1fbd473375b700e49926e9ad557ddff7, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 8f78272388bdfe147a44e09ec82ec7c2, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: c01492eac4baa234a9e337acce941cb2, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: bc19115711e253d478871dc0ef662e8d, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fa0325900b931f34a9edb00ad0f5035c, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 778e2336fc596ad498f7194e1ee71cd2, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: c69947167d6d6a940b7f42f1739099a3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: bbdc740986ce97d45af46ca80a885f82, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 95df77c8983e1ff4783df2c6ff3b87d1, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 6037d1a76b7ba5f4b894924da9eb1eb5, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 643ec23d0a2bacb4484543b21f3a53f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d7eea99af3ca00a43a59000af6f588b7, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 66b301239f8c6d1498c2b72d093cb8e5, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 95e946ed40c32a843989219abfe78af2, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 26f31737f9f395d49beb9c78b9826ad6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: aeaa25dbb0d207149b8061348dfdb548, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 7fdaf0aeaf14a6d4c9beb4770e903acf, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1f724c3dd66a463409bbf1682a409cab, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5037b62848488364682be1926b852da3, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: Assembly-CSharp - ClassName: Kill.Managers.DeviceInfo -- AssemblyName: Assembly-CSharp - ClassName: Kill.Managers.MessageTypeData -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.ArgumentCache -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentListenerMode -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.UnityEvent -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/EndEditEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/OnChangeEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/SubmitEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ScrollRect/ScrollRectEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -Assets: -- "Assets/Res/ui/homepage/\u91CD\u590D\u9009\u62E9\u9009\u4E2D.png" -- "Assets/Res/ui/homepage/\u6D88\u606F\u8BE6\u60C5.prefab" -- "Assets/Res/ui/homepage/\u65E0\u8BBE\u5907.png" -- "Assets/Res/ui/homepage/\u9009\u4E2D\u6846.png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/3.png" -- "Assets/Res/ui/homepage/Message-one (\u6D88\u606F).png" -- Assets/Res/ui/homepage/wifi.png -- "Assets/Res/ui/homepage/\u6392\u884C\u699C.png" -- "Assets/Res/ui/homepage/\u91CD\u590D\u9009\u62E9.png" -- "Assets/Res/ui/homepage/\u8BBE\u5907\u72B6\u6001 (1).png" -- "Assets/Res/ui/homepage/\u8865\u5149\u706F\u8BBE\u7F6E.prefab" -- "Assets/Res/ui/homepage/\u76FE\u724C 1.png" -- "Assets/Res/ui/homepage/fov\u9009\u62E9.png" -- "Assets/Res/ui/homepage/\u6CE2\u7EB9.anim" -- "Assets/Res/ui/homepage/\u5F85\u673A\u5C0F.png" -- "Assets/Res/ui/homepage/\u5355\u4F4D\u9009\u62E9.png" -- "Assets/Res/ui/homepage/\u626B\u63CF\u7279\u6548/Line 152.png" -- "Assets/Res/ui/homepage/\u626B\u63CF\u7279\u6548/Ellipse 61.png" -- "Assets/Res/ui/homepage/\u72B6\u6001\u5E95.png" -- "Assets/Res/ui/homepage/\u641C\u7D22.png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/\u70ED\u529B\u56FE\u70B9.png" -- Assets/Res/ui/homepage/Ellipse 41.png -- "Assets/Res/ui/homepage/\u5B9A\u65F6 (3).png" -- "Assets/Res/ui/homepage/\u8B66\u544A.png" -- "Assets/Res/ui/homepage/\u7BAD\u5934.png" -- "Assets/Res/ui/homepage/\u84DD\u7259.png" -- "Assets/Res/ui/homepage/\u6D88\u6740\u5C0F.png" -- "Assets/Res/ui/homepage/\u706F.png" -- "Assets/Res/ui/homepage/\u641C\u7D22.anim" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/\u70B9.prefab" -- Assets/Res/ui/homepage/fov45.png -- "Assets/Res/ui/homepage/\u5F02\u5E38 2.png" -- "Assets/Res/ui/homepage/\u5B9A\u65F6 (2).png" -- "Assets/Res/ui/homepage/\u5F85\u673Aon.png" -- Assets/Res/ui/homepage/fov60.png -- "Assets/Res/ui/homepage/\u5173\u95ED.png" -- "Assets/Res/ui/homepage/\u76FE\u724C 1 (1).png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/0.png" -- "Assets/Res/ui/homepage/\u5B9A\u65F6\u4EFB\u52A1.prefab" -- "Assets/Res/ui/homepage/\u5F85\u673A.png" -- Assets/Res/ui/homepage/homePage.prefab -- "Assets/Res/ui/homepage/\u8DDD\u79BB\u8BBE\u7F6E.prefab" -- "Assets/Res/ui/homepage/\u8BBE\u7F6E.png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/\u70ED\u529B\u96F7\u8FBE.png" -- "Assets/Res/ui/homepage/\u6D88\u6740.png" -- Assets/Res/ui/homepage/fov75.png -- "Assets/Res/ui/homepage/\u6CE2\u7EB9.png" -- "Assets/Res/ui/homepage/\u6D88\u6740on.png" -- "Assets/Res/ui/homepage/\u6D88\u606F\u5217\u8868.prefab" -- Assets/Res/ui/homepage/Filter Background.png -- Assets/Res/ui/homepage/NumPicker.prefab -- "Assets/Res/ui/homepage/\u626B\u63CF\u5C0F.png" -- "Assets/Res/ui/homepage/\u706F (1).png" -- "Assets/Res/ui/homepage/fov\u8BBE\u7F6E.prefab" -- "Assets/Res/ui/homepage/\u626B\u63CFon.png" -- "Assets/Res/ui/homepage/\u90AE\u4EF6\u901A\u77E5\u80CC\u666F.png" -- "Assets/Res/ui/homepage/\u5173\u95ED (1).png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/1.png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/\u70ED\u529B\u56FE.png" -- Assets/Res/ui/homepage/fov90.png -- "Assets/Res/ui/homepage/\u626B\u63CF\u7279\u6548/Ellipse 58.png" -- "Assets/Res/ui/homepage/\u8BBE\u5907icon.png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/2.png" -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/Data Point Large.png" -- Assets/Res/ui/homepage/Frame 22.png -- "Assets/Res/ui/homepage/\u6DFB\u52A0.png" -- "Assets/Res/ui/homepage/\u9AD8\u65AF\u6A21\u7CCA.mat" -- Assets/Res/ui/homepage/fovicon.png -- "Assets/Res/ui/homepage/\u9519\u8BEF\u63D0\u793A.prefab" -- "Assets/Res/ui/homepage/\u4EA7\u54C1\u56FE.png" -- "Assets/Res/ui/homepage/\u5220\u9664.png" -- Assets/Res/ui/homepage/fov30.png -- "Assets/Res/ui/homepage/\u7EDF\u8BA1\u56FE/\u9884\u8BBE.prefab" -- "Assets/Res/ui/homepage/\u8BBE\u5907\u9009\u62E9.png" -- "Assets/Res/ui/homepage/\u626B\u63CF.png" -- "Assets/Res/ui/homepage/\u4E00\u6761\u6D88\u606F.prefab" -- "Assets/Res/ui/homepage/\u4E2A\u4EBA\u4E2D\u5FC3.png" -- "Assets/Res/ui/homepage/\u5355\u4F4D\u9009\u4E2D.png" -- "Assets/Res/ui/homepage/fov\u80CC\u666F.png" -- "Assets/Res/ui/homepage/\u5B89\u5168\u8BBE\u7F6E.prefab" -- "Assets/Res/ui/homepage/\u7F51\u683C 2.png" -- "Assets/Res/ui/homepage/\u8BBE\u5907\u72B6\u6001.png" -- "Assets/Res/ui/homepage/\u6D88\u606F.png" -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/common.ab -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/AssetBundles/Android/ui_loginpage.ab b/AssetBundles/Android/ui_loginpage.ab deleted file mode 100644 index 2361698..0000000 Binary files a/AssetBundles/Android/ui_loginpage.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_loginpage.ab.manifest b/AssetBundles/Android/ui_loginpage.ab.manifest deleted file mode 100644 index d06b850..0000000 --- a/AssetBundles/Android/ui_loginpage.ab.manifest +++ /dev/null @@ -1,117 +0,0 @@ -ManifestFileVersion: 0 -CRC: 483583531 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 03ec133edb09eb653970cf15442915af - TypeTreeHash: - serializedVersion: 2 - Hash: e2c9d8528f45ab139731bcf44d40d204 - IncrementalBuildHash: - serializedVersion: 2 - Hash: 03ec133edb09eb653970cf15442915af -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 66b4788611511364caffb330a102c1fd, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 66ca3eea6be8e124ab3ecb335e487a27, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 271b50f7241504b49a6a7493d13721e7, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: f53257c6334f5224a8c3d192d5653d1c, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 9085046f02f69544eb97fd06b6048fe2, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 9e2111ede4b903640883d88b5884a20c, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: be47e61de18c05d4885140f82344ae3e, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1a5913bec98c8024087f4dbe7b40ab1c, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 8e45fe264b4931a4f89494083002f5aa, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 33c65dd689170984eaf1940dd4a6b5cd, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.ArgumentCache -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentListenerMode -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/EndEditEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/OnChangeEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/SubmitEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ScrollRect/ScrollRectEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Toggle/ToggleEvent -Assets: -- Assets/Res/ui/loginpage/Frame 2 (1).png -- "Assets/Res/ui/loginpage/\u9690\u79C1\u534F\u8BAE\u82F1\u6587.png" -- Assets/Res/ui/loginpage/Group 144.png -- Assets/Res/ui/loginpage/Group 143.png -- "Assets/Res/ui/loginpage/\u9690\u79C1\u534F\u8BAE\u6846.png" -- "Assets/Res/ui/loginpage/\u9690\u79C1\u534F\u8BAE\u4E2D\u6587.png" -- Assets/Res/ui/loginpage/loginPage.prefab -- Assets/Res/ui/loginpage/bg.png -- Assets/Res/ui/loginpage/Rectangle 67.png -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/AssetBundles/Android/ui_safetylearningpage.ab b/AssetBundles/Android/ui_safetylearningpage.ab deleted file mode 100644 index 9b80582..0000000 Binary files a/AssetBundles/Android/ui_safetylearningpage.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_safetylearningpage.ab.manifest b/AssetBundles/Android/ui_safetylearningpage.ab.manifest deleted file mode 100644 index 2c6dd11..0000000 --- a/AssetBundles/Android/ui_safetylearningpage.ab.manifest +++ /dev/null @@ -1,121 +0,0 @@ -ManifestFileVersion: 0 -CRC: 3825246394 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: a2d0cadc123f9ee4845b9966348d0217 - TypeTreeHash: - serializedVersion: 2 - Hash: 2f5c13cd76d0a24611f31d3dd68755dc - IncrementalBuildHash: - serializedVersion: 2 - Hash: a2d0cadc123f9ee4845b9966348d0217 -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 15f5bd88ea349c4488f6e34e51cecd59, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 271b50f7241504b49a6a7493d13721e7, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 6153f65e187d768439e5be590953dfb1, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 7b6c36ccd2295994fa13a1cc24de7db4, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89cec4ea05849a04981cec13b33447ea, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: e982ad7d1eca06640864d29509a997f8, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fa3a4570827eff04fb79b0bdd622e953, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 50d2a45eec2b4a34e9aa449adf569f10, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -- Class: 328 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.ArgumentCache -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentListenerMode -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.EventSystems.EventTrigger/Entry -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.EventSystems.EventTrigger/TriggerEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ScrollRect/ScrollRectEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Slider/SliderEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -Assets: -- "Assets/Res/ui/safetylearningpage/\u666E\u901A\u80CC\u666F.png" -- Assets/Res/ui/safetylearningpage/Group 152.png -- "Assets/Res/ui/safetylearningpage/\u9519\u8BEFicon.png" -- "Assets/Res/ui/safetylearningpage/\u9009\u4E2D.png" -- "Assets/Res/ui/safetylearningpage/\u6B63\u786E\u80CC\u666F.png" -- "Assets/Res/ui/safetylearningpage/\u89E3\u6790.prefab" -- Assets/Res/ui/safetylearningpage/Rectangle 165.png -- "Assets/Res/ui/safetylearningpage/\u95EE\u9898.prefab" -- Assets/Res/ui/safetylearningpage/Group 146.png -- "Assets/Res/ui/safetylearningpage/\u9898\u76EE.prefab" -- "Assets/Res/ui/safetylearningpage/\u9519\u8BEF\u80CC\u666F.png" -- "Assets/Res/ui/safetylearningpage/\u6B63\u786Eicon.png" -- Assets/Res/ui/safetylearningpage/safetylearningPage.prefab -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/AssetBundles/Android/ui_selfpage.ab b/AssetBundles/Android/ui_selfpage.ab deleted file mode 100644 index 89be0a3..0000000 Binary files a/AssetBundles/Android/ui_selfpage.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_selfpage.ab.manifest b/AssetBundles/Android/ui_selfpage.ab.manifest deleted file mode 100644 index 73e1ea2..0000000 --- a/AssetBundles/Android/ui_selfpage.ab.manifest +++ /dev/null @@ -1,213 +0,0 @@ -ManifestFileVersion: 0 -CRC: 1501058622 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 13ff9b5f3b1ca3687343a1221a27c8b8 - TypeTreeHash: - serializedVersion: 2 - Hash: e49238147a58ad388d38756302be0518 - IncrementalBuildHash: - serializedVersion: 2 - Hash: 13ff9b5f3b1ca3687343a1221a27c8b8 -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 053246239009e27459f3ce65dec76054, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 15f5bd88ea349c4488f6e34e51cecd59, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 177e7cc3f2f22a94bae08f359393a980, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 86fb6d9da09c7e84585340890874f0d0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 767fbd85f067c1a4da213c13282cc05e, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 8f23233cc6bed2c41916a1c82aadc544, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d7d76382d6aa7f140907c2df1a633c74, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d199490a83bb2b844b9695cbf13b01ef, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: ce7f9a66c3b832343bd86c4b491d90c8, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 55ba0850de6006c429e2e29c61f7e1e2, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 36dab9050231ae24b83d68c84ac3bac9, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 935540b412e930c49b4d7fd9b4bdc20f, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: f08d52bce92e2024ca3604acf054298e, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: be47e61de18c05d4885140f82344ae3e, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 46eee847e248c754589885bff9c919fd, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 23b35b42458f6574b8d61d3716b80bf5, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 78426358ddea6214d9feb4df5c520f4f, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 9ca3cfc110228854ab7a024160b5e37c, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: cef315476b735804d9ba29896dabdc83, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: e1a9a7a44f6e86045bd599a7934f5c1b, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -- Class: 328 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.ArgumentCache -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentListenerMode -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.UnityEvent -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.EventSystems.EventTrigger/Entry -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.EventSystems.EventTrigger/TriggerEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/EndEditEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/OnChangeEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.InputField/SubmitEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ScrollRect/ScrollRectEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Slider/SliderEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -Assets: -- "Assets/Res/ui/selfpage/\u72B6\u6001\u548C\u7EF4\u62A4/zt_en.png" -- Assets/Res/ui/selfpage/faq/en-18.prefab -- "Assets/Res/ui/selfpage/\u4E8C\u7EF4\u7801\u9875\u9762.prefab" -- Assets/Res/ui/selfpage/faq/en-11 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-3 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-19.prefab -- "Assets/Res/ui/selfpage/\u72B6\u6001\u548C\u7EF4\u62A4\u9875\u9762.prefab" -- Assets/Res/ui/selfpage/Rectangle 139.png -- "Assets/Res/ui/selfpage/\u7528\u6237\u540D\u91CD\u547D\u540D Variant.prefab" -- Assets/Res/ui/selfpage/faq/cn-17 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-13 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-9 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-4 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-18 Variant.prefab -- "Assets/Res/ui/selfpage/\u8BBE\u7F6E\u5BC6\u7801.prefab" -- Assets/Res/ui/selfpage/faq/cn-1 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-22 Variant.prefab -- "Assets/Res/ui/selfpage/\u53CD\u9988\u9875\u9762.prefab" -- Assets/Res/ui/selfpage/selfpage.prefab -- Assets/Res/ui/selfpage/faq/en-20.prefab -- Assets/Res/ui/selfpage/faq/en-23.prefab -- Assets/Res/ui/selfpage/faq/en-10 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-1.prefab -- Assets/Res/ui/selfpage/faq/en-5 Variant.prefab -- "Assets/Res/ui/selfpage/\u8BBE\u5907\u6559\u5B66-\u82F1\u6587 Variant.prefab" -- "Assets/Res/ui/selfpage/\u4E8C\u7EF4\u7801 2.png" -- Assets/Res/ui/selfpage/faq/cn-15 Variant.prefab -- "Assets/Res/ui/selfpage/Close-small (\u5173\u95ED-\u5C0F).png" -- Assets/Res/ui/selfpage/faq/en-14.prefab -- "Assets/Res/ui/selfpage/\u8BED\u8A00\u8BBE\u7F6E\u9875\u9762.prefab" -- Assets/Res/ui/selfpage/faq/cn-6 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-22.prefab -- "Assets/Res/ui/selfpage/\u5B89\u5168\u8981\u70B9/aq_ch.png" -- "Assets/Res/ui/selfpage/\u9A8C\u8BC1\u7801.prefab" -- "Assets/Res/ui/selfpage/FAQ\u9875\u9762.prefab" -- "Assets/Res/ui/selfpage/\u9009\u4E2D\u6846.png" -- Assets/Res/ui/selfpage/faq/cn-4 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-11 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-2 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-14 Variant.prefab -- "Assets/Res/ui/selfpage/\u4E8C\u7EF4\u7801\u6846.png" -- Assets/Res/ui/selfpage/faq/cn-5 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-9 Variant.prefab -- "Assets/Res/ui/selfpage/\u72B6\u6001\u548C\u7EF4\u62A4/zt_ch.png" -- Assets/Res/ui/selfpage/faq/cn-16 Variant.prefab -- "Assets/Res/ui/selfpage/\u5173\u95ED.png" -- Assets/Res/ui/selfpage/faq/cn-7 Variant.prefab -- "Assets/Res/ui/selfpage/\u5B89\u5168\u8981\u70B9\u9875\u9762.prefab" -- Assets/Res/ui/selfpage/faq/cn-20 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-6 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-16.prefab -- Assets/Res/ui/selfpage/Add-one.png -- Assets/Res/ui/selfpage/Group 111.png -- "Assets/Res/ui/selfpage/\u8BBE\u5907\u6559\u5B66-\u4E2D\u6587.prefab" -- Assets/Res/ui/selfpage/faq/cn-2 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-3 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-7 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-17.prefab -- Assets/Res/ui/selfpage/faq/cn-12 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-13.prefab -- Assets/Res/ui/selfpage/faq/cn-21 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-8 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-19 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-15.prefab -- "Assets/Res/ui/selfpage/\u5B89\u5168\u8981\u70B9/aq_en.png" -- Assets/Res/ui/selfpage/faq/cn-10 Variant.prefab -- Assets/Res/ui/selfpage/faq/cn-23 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-21.prefab -- Assets/Res/ui/selfpage/faq/cn-8 Variant.prefab -- Assets/Res/ui/selfpage/faq/en-12.prefab -- "Assets/Res/ui/selfpage/\u4E2A\u4EBA\u4FE1\u606F\u9875.prefab" -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab -- D:/unity_project/Kill/AssetBundles/Android/ui_homepage.ab -- D:/unity_project/Kill/AssetBundles/Android/ui_loginpage.ab diff --git a/AssetBundles/Android/ui_videopage.ab b/AssetBundles/Android/ui_videopage.ab deleted file mode 100644 index bc58a16..0000000 Binary files a/AssetBundles/Android/ui_videopage.ab and /dev/null differ diff --git a/AssetBundles/Android/ui_videopage.ab.manifest b/AssetBundles/Android/ui_videopage.ab.manifest deleted file mode 100644 index 189252e..0000000 --- a/AssetBundles/Android/ui_videopage.ab.manifest +++ /dev/null @@ -1,106 +0,0 @@ -ManifestFileVersion: 0 -CRC: 2921602434 -Hashes: - AssetFileHash: - serializedVersion: 2 - Hash: 6658d0084c09d1ac889acdd9e6f364f1 - TypeTreeHash: - serializedVersion: 2 - Hash: 29168d815cc6a891e4b88984c0b214f0 - IncrementalBuildHash: - serializedVersion: 2 - Hash: 6658d0084c09d1ac889acdd9e6f364f1 -HashAppended: 0 -ClassTypes: -- Class: 1 - Script: {instanceID: 0} -- Class: 21 - Script: {instanceID: 0} -- Class: 28 - Script: {instanceID: 0} -- Class: 48 - Script: {instanceID: 0} -- Class: 114 - Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 15f5bd88ea349c4488f6e34e51cecd59, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 177e7cc3f2f22a94bae08f359393a980, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 2dc5e88937f96ee489bdb2d2bf6c41e9, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 20cf8ecabc92f2c4bb007f3dbcdbbcf2, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} -- Class: 114 - Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} -- Class: 115 - Script: {instanceID: 0} -- Class: 128 - Script: {instanceID: 0} -- Class: 213 - Script: {instanceID: 0} -- Class: 222 - Script: {instanceID: 0} -- Class: 224 - Script: {instanceID: 0} -- Class: 328 - Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.ArgumentCache -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentCallGroup -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.PersistentListenerMode -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.Events.UnityEvent -- AssemblyName: UnityEngine.CoreModule - ClassName: UnityEngine.RectOffset -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.EventSystems.EventTrigger/Entry -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.EventSystems.EventTrigger/TriggerEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.AnimationTriggers -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Button/ButtonClickedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ColorBlock -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.FontData -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Navigation -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.ScrollRect/ScrollRectEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.Slider/SliderEvent -- AssemblyName: UnityEngine.UI - ClassName: UnityEngine.UI.SpriteState -Assets: -- Assets/Res/ui/videopage/videoPage.prefab -- "Assets/Res/ui/videopage/\u4E0B\u8F7D.png" -- "Assets/Res/ui/videopage/\u4E00\u6761\u89C6\u9891.prefab" -- "Assets/Res/ui/videopage/\u9009\u4E2D.png" -Dependencies: -- D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/Assets/DeviceConfig.java b/Assets/DeviceConfig.java deleted file mode 100644 index cc5f36a..0000000 --- a/Assets/DeviceConfig.java +++ /dev/null @@ -1,197 +0,0 @@ -package cn.breadtech.photon.device.entity; - -import cn.breadtech.core.domain.BaseEntity; -import cn.breadtech.photon.device.enums.*; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import javax.persistence.*; - -/** - * 设备配置实体 - */ -@EqualsAndHashCode(callSuper = true) -@Data -@Entity -@Table(name = "t_device_config") -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class DeviceConfig extends BaseEntity { - - @Column(name = "device_sn", unique = true, nullable = false) - private String deviceSn; - - @Column(name = "language") - private Integer language; - - // ===== 旧 JSON TEXT 列（废弃，不再读写） ===== - - @Deprecated - @Column(name = "lcd_config", columnDefinition = "TEXT") - private String lcdConfig; - - @Deprecated - @Column(name = "fov_config", columnDefinition = "TEXT") - private String fovConfig; - - @Deprecated - @Column(name = "scan_distance_config", columnDefinition = "TEXT") - private String scanDistanceConfig; - - @Deprecated - @Column(name = "fill_light_config", columnDefinition = "TEXT") - private String fillLightConfig; - - @Deprecated - @Column(name = "security_config", columnDefinition = "TEXT") - private String securityConfig; - - @Deprecated - @Column(name = "sound_config", columnDefinition = "TEXT") - private String soundConfig; - - @Deprecated - @Column(name = "recording_config", columnDefinition = "TEXT") - private String recordingConfig; - - @Deprecated - @Column(name = "rgb_light_config", columnDefinition = "TEXT") - private String rgbLightConfig; - - // ===== 新增强类型配置列 ===== - - /** 锁定状态 */ - @Column(name = "is_locked") - private Boolean isLocked; - - /** FOV角度（单位0.1度，范围1-900） */ - @Column(name = "fov_angle") - private Integer fovAngle; - - /** 检测距离（单位0.1米） */ - @Column(name = "detection_distance") - private Integer detectionDistance; - - /** 瞄准距离（单位0.1米） */ - @Column(name = "aim_distance") - private Integer aimDistance; - - /** 工作模式 */ - @Enumerated(EnumType.STRING) - @Column(name = "work_mode", length = 20) - private WorkMode workMode; - - /** 补光灯开关 */ - @Column(name = "fill_light_enable") - private Boolean fillLightEnable; - - /** 补光类型 */ - @Enumerated(EnumType.STRING) - @Column(name = "fill_light_type", length = 20) - private FillLightType fillLightType; - - /** 光照强度 */ - @Enumerated(EnumType.STRING) - @Column(name = "fill_light_intensity", length = 20) - private LightIntensity fillLightIntensity; - - /** 可见光激光器开关 */ - @Column(name = "laser_visible_enable") - private Boolean laserVisibleEnable; - - /** 视觉检测开关 */ - @Column(name = "visual_detect_enable") - private Boolean visualDetectEnable; - - /** 视觉检测灵敏度 */ - @Enumerated(EnumType.STRING) - @Column(name = "visual_sensitivity", length = 20) - private SensitivityLevel visualSensitivity; - - /** 毫米波雷达开关 */ - @Column(name = "radar_enable") - private Boolean radarEnable; - - /** 雷达灵敏度 */ - @Enumerated(EnumType.STRING) - @Column(name = "radar_sensitivity", length = 20) - private SensitivityLevel radarSensitivity; - - /** 安全距离（单位0.1米，范围1-100） */ - @Column(name = "radar_safe_distance") - private Integer radarSafeDistance; - - /** RGB指示灯开关 */ - @Column(name = "rgb_enable") - private Boolean rgbEnable; - - /** RGB红色分量（0-255） */ - @Column(name = "rgb_red") - private Byte rgbRed; - - /** RGB绿色分量（0-255） */ - @Column(name = "rgb_green") - private Byte rgbGreen; - - /** RGB蓝色分量（0-255） */ - @Column(name = "rgb_blue") - private Byte rgbBlue; - - /** RGB效果模式 */ - @Enumerated(EnumType.STRING) - @Column(name = "rgb_effect", length = 20) - private RGBEffectMode rgbEffect; - - /** LCD自适应亮度开关 */ - @Column(name = "lcd_auto_brightness") - private Boolean lcdAutoBrightness; - - /** LCD亮度（10-100%） */ - @Column(name = "lcd_brightness") - private Byte lcdBrightness; - - /** LCD休眠开关 */ - @Column(name = "lcd_sleep_enable") - private Boolean lcdSleepEnable; - - /** LCD休眠时间编码（1/5/10/30分钟） */ - @Column(name = "lcd_sleep_time") - private Byte lcdSleepTime; - - /** WIFI开关 */ - @Column(name = "wifi_enable") - private Boolean wifiEnable; - - /** WIFI SSID */ - @Column(name = "wifi_ssid") - private String wifiSsid; - - /** WIFI密码 */ - @Column(name = "wifi_password") - private String wifiPassword; - - /** 视频录制开关 */ - @Column(name = "video_record_enable") - private Boolean videoRecordEnable; - - /** 录制时长（3/5/10秒） */ - @Column(name = "record_duration") - private Byte recordDuration; - - /** 音效开关 */ - @Column(name = "sound_enable") - private Boolean soundEnable; - - /** 音效类型 */ - @Enumerated(EnumType.STRING) - @Column(name = "sound_type", length = 20) - private SoundEffectType soundType; - - /** 音量（0-15） */ - @Column(name = "volume") - private Byte volume; -} diff --git a/Assets/DeviceConfig.java.meta b/Assets/DeviceConfig.java.meta deleted file mode 100644 index 5732e24..0000000 --- a/Assets/DeviceConfig.java.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 33f13959235eb504fbafc8329d8a20af -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 1 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Res/common/loading.prefab b/Assets/Res/common/loading.prefab new file mode 100644 index 0000000..86afd8d --- /dev/null +++ b/Assets/Res/common/loading.prefab @@ -0,0 +1,246 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6233315682063201516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2301767613944794884} + - component: {fileID: 5156601886831327953} + - component: {fileID: 8320806757338711405} + m_Layer: 5 + m_Name: "\u5C0F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2301767613944794884 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233315682063201516} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7947633290016123137} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 256.05392} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5156601886831327953 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233315682063201516} + m_CullTransparentMesh: 1 +--- !u!114 &8320806757338711405 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233315682063201516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 32f1fca6076829741a2c2519b629318d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7609355920085510758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7947633290016123137} + - component: {fileID: 6315002251137990878} + - component: {fileID: 9076189217148687967} + - component: {fileID: 1596389525033777274} + m_Layer: 5 + m_Name: loading + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &7947633290016123137 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7609355920085510758} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 119088121388939109} + - {fileID: 2301767613944794884} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6315002251137990878 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7609355920085510758} + m_CullTransparentMesh: 1 +--- !u!114 &9076189217148687967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7609355920085510758} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.6} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!111 &1596389525033777274 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7609355920085510758} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 7400000, guid: 55c0693da35daa84bb369a4fcf36a94f, type: 2} + m_Animations: + - {fileID: 7400000, guid: 55c0693da35daa84bb369a4fcf36a94f, type: 2} + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 +--- !u!1 &8627449038258846134 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 119088121388939109} + - component: {fileID: 6131951634326649625} + - component: {fileID: 7405177732344683083} + m_Layer: 5 + m_Name: "\u5927" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &119088121388939109 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8627449038258846134} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7947633290016123137} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -256.7028} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6131951634326649625 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8627449038258846134} + m_CullTransparentMesh: 1 +--- !u!114 &7405177732344683083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8627449038258846134} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 930e7def67278dc4dadd3eb93e6d17f4, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Res/common/loading.prefab.meta b/Assets/Res/common/loading.prefab.meta new file mode 100644 index 0000000..1bf30ba --- /dev/null +++ b/Assets/Res/common/loading.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f835c9139c45b254face164dfd1b0ca9 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Res/language/language.json b/Assets/Res/language/language.json index 2720df4..1b83d29 100644 --- a/Assets/Res/language/language.json +++ b/Assets/Res/language/language.json @@ -81,13 +81,13 @@ }, { "key": "100017", - "zh": "Incorrect verification code. Please try again", - "en": "验证码不正确，请重新输入" + "zh": "验证码不正确，请重新输入", + "en": "Incorrect verification code. Please try again" }, { "key": "100018", - "zh": "Verification code expired. Please resend", - "en": "验证码已过期，请重新获取" + "zh": "验证码已过期，请重新获取 ", + "en": "Verification code expired. Please resend" }, { "key": "100019", diff --git a/Assets/Res/ui/homepage/homePage.prefab b/Assets/Res/ui/homepage/homePage.prefab index e501d59..8824b8b 100644 --- a/Assets/Res/ui/homepage/homePage.prefab +++ b/Assets/Res/ui/homepage/homePage.prefab @@ -6266,7 +6266,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 385, y: -134} + m_AnchoredPosition: {x: 385, y: -60} m_SizeDelta: {x: 690, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6920292222378307397 @@ -7300,8 +7300,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 40, y: 0.000030517578} - m_SizeDelta: {x: 103, y: 71} + m_AnchoredPosition: {x: 40, y: -5} + m_SizeDelta: {x: 101, y: 83} m_Pivot: {x: 0, y: 0.5} --- !u!222 &2666861506861195616 CanvasRenderer: diff --git a/Assets/Res/ui/homepage/设备icon.png b/Assets/Res/ui/homepage/设备icon.png index 14f8987..c5172d0 100644 Binary files a/Assets/Res/ui/homepage/设备icon.png and b/Assets/Res/ui/homepage/设备icon.png differ diff --git a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab index a21dd97..7af10eb 100644 --- a/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab +++ b/Assets/Res/ui/safetylearningpage/safetylearningPage.prefab @@ -1803,6 +1803,7 @@ RectTransform: m_Children: - {fileID: 2273952858735001378} - {fileID: 8983024546806734054} + - {fileID: 5351304866871563596} m_Father: {fileID: 6417805335571029577} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -1904,6 +1905,7 @@ MonoBehaviour: totalTimeText: {fileID: 2412586677529980043} nowTime: {fileID: 5558668283180787810} slider: {fileID: 1005040828851007386} + loading: {fileID: 5589479330955548203} --- !u!1 &1974404162128018310 GameObject: m_ObjectHideFlags: 0 @@ -2724,7 +2726,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 132.5, y: -27} - m_SizeDelta: {x: 137.79395, y: 22.145454} + m_SizeDelta: {x: 140, y: 22} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4217088321203893506 CanvasRenderer: @@ -3835,7 +3837,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26.603027, y: -27} + m_AnchoredPosition: {x: 25.5, y: -27} m_SizeDelta: {x: 27, y: 27} m_Pivot: {x: 0, y: 0.5} --- !u!222 &9182794380181841639 @@ -5849,3 +5851,138 @@ MonoBehaviour: type: 3} sonObjs: [] questionQueue: [] +--- !u!1001 &2596339697786043469 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2695878419222109905} + m_Modifications: + - target: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Name + value: loading + objectReference: {fileID: 0} + - target: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f835c9139c45b254face164dfd1b0ca9, type: 3} +--- !u!224 &5351304866871563596 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 2596339697786043469} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5589479330955548203 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 2596339697786043469} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res/ui/safetylearningpage/解析.prefab b/Assets/Res/ui/safetylearningpage/解析.prefab index c69f163..21edb2f 100644 --- a/Assets/Res/ui/safetylearningpage/解析.prefab +++ b/Assets/Res/ui/safetylearningpage/解析.prefab @@ -71,8 +71,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.0788, y: -112.22424} - m_SizeDelta: {x: 682.1576, y: 0} + m_AnchoredPosition: {x: 345, y: -111.5} + m_SizeDelta: {x: 630, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7802423423956234967 CanvasRenderer: @@ -741,8 +741,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 371.0788, y: -398.72424} - m_SizeDelta: {x: 742.1576, y: 0} + m_AnchoredPosition: {x: 345, y: -398} + m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &595920894913470423 CanvasRenderer: @@ -980,6 +980,7 @@ RectTransform: m_Children: - {fileID: 5462435735231203694} - {fileID: 8551965603479146318} + - {fileID: 2057292114001815} m_Father: {fileID: 967640783945977314} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1081,6 +1082,7 @@ MonoBehaviour: totalTimeText: {fileID: 9059311134471446788} nowTime: {fileID: 5440660747257514985} slider: {fileID: 987711706239031841} + loading: {fileID: 564420698398522608} --- !u!1 &5917418288420738725 GameObject: m_ObjectHideFlags: 0 @@ -2138,3 +2140,133 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1001 &7947979534800623254 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 7865365684044416939} + m_Modifications: + - target: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Name + value: loading + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f835c9139c45b254face164dfd1b0ca9, type: 3} +--- !u!224 &2057292114001815 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 7947979534800623254} + m_PrefabAsset: {fileID: 0} +--- !u!1 &564420698398522608 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 7947979534800623254} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res/ui/selfpage/FAQ页面.prefab b/Assets/Res/ui/selfpage/FAQ页面.prefab index 3ab14c2..59fad02 100644 --- a/Assets/Res/ui/selfpage/FAQ页面.prefab +++ b/Assets/Res/ui/selfpage/FAQ页面.prefab @@ -196,7 +196,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -64} - m_SizeDelta: {x: 630, y: 302} + m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5479319897932039224 CanvasRenderer: @@ -423,7 +423,7 @@ GameObject: - component: {fileID: 8619545248652990503} - component: {fileID: 8993937029787455807} m_Layer: 5 - m_Name: "\u95EE\u9898" + m_Name: 9 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -445,10 +445,10 @@ RectTransform: - {fileID: 1415745714619620762} m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -50} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3823213513666287328 CanvasRenderer: @@ -563,7 +563,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8908028546209004426 RectTransform: m_ObjectHideFlags: 0 @@ -591,7 +591,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -60, y: 2734} + m_SizeDelta: {x: -60, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8256266072771607415 CanvasRenderer: @@ -684,7 +684,7 @@ GameObject: - component: {fileID: 4347899210626397187} - component: {fileID: 4494197951877466265} m_Layer: 5 - m_Name: "\u95EE\u9898 (2)" + m_Name: 6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -706,10 +706,10 @@ RectTransform: - {fileID: 4003773246967883969} m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -252} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3668634808428644475 CanvasRenderer: @@ -897,7 +897,7 @@ GameObject: - component: {fileID: 2861309714458804011} - component: {fileID: 2089095129601360946} m_Layer: 5 - m_Name: "\u95EE\u9898 (4)" + m_Name: 8 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -919,10 +919,10 @@ RectTransform: - {fileID: 3589792985797373710} m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -454} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3861125049382149330 CanvasRenderer: @@ -2290,10 +2290,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8908028546209004426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 345, y: -410} - m_SizeDelta: {x: 630, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7274746608644199994 CanvasRenderer: @@ -2369,10 +2369,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6490864453925438635} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -201.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7690636754839133292 CanvasRenderer: @@ -2444,10 +2444,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -100.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4707395502586217041 CanvasRenderer: @@ -2748,10 +2748,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -504.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6239739253095446203 CanvasRenderer: @@ -3279,10 +3279,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -605.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3055205771761229994 CanvasRenderer: @@ -4147,10 +4147,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -302.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1281991039138041209 CanvasRenderer: @@ -4382,8 +4382,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 34} - m_SizeDelta: {x: 0, y: -432.00003} + m_AnchoredPosition: {x: 0, y: 24.999939} + m_SizeDelta: {x: 0, y: -449.99988} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8788887540238575420 CanvasRenderer: @@ -4652,10 +4652,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8908028546209004426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 345, y: -1984} - m_SizeDelta: {x: 630, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7647973359819307091 CanvasRenderer: @@ -4846,7 +4846,7 @@ GameObject: - component: {fileID: 5870578659390487840} - component: {fileID: 1336261514855829203} m_Layer: 5 - m_Name: "\u95EE\u9898 (2)" + m_Name: 19 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4868,10 +4868,10 @@ RectTransform: - {fileID: 5660943230385267127} m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -252} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5108996292591621840 CanvasRenderer: @@ -5138,7 +5138,7 @@ GameObject: - component: {fileID: 8612322137692151608} - component: {fileID: 7252724929066250834} m_Layer: 5 - m_Name: "\u95EE\u9898 (2)" + m_Name: 16 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5160,10 +5160,10 @@ RectTransform: - {fileID: 7205885418339574238} m_Father: {fileID: 1073454576004898406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -252} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3061420493122748786 CanvasRenderer: @@ -5416,7 +5416,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.6 - m_Text: "\u5982\u4F55\u8BBE\u7F6E\u626B\u63CF\u89D2\u5EA6\u548C\u68C0\u6D4B\u8DDD\u79BB\uFF1F" + m_Text: "\u5982\u4F55\u9009\u62E9\u5DE5\u4F5C\u6A21\u5F0F\uFF1F" --- !u!1 &2440955490003412919 GameObject: m_ObjectHideFlags: 0 @@ -5824,10 +5824,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8908028546209004426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 345, y: -1002} - m_SizeDelta: {x: 630, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3223360406911153965 CanvasRenderer: @@ -5959,7 +5959,7 @@ GameObject: - component: {fileID: 7103319962170795216} - component: {fileID: 2900467378823678822} m_Layer: 5 - m_Name: "\u95EE\u9898 (3)" + m_Name: 20 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5981,10 +5981,10 @@ RectTransform: - {fileID: 8119831037519863035} m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -353} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5325451774242893864 CanvasRenderer: @@ -6266,10 +6266,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -302.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2964278748873651484 CanvasRenderer: @@ -6475,10 +6475,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -302.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &687483056242527745 CanvasRenderer: @@ -6937,10 +6937,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -201.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6953197928825731591 CanvasRenderer: @@ -7012,10 +7012,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8908028546209004426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 345, y: -20} - m_SizeDelta: {x: 630, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7346151320703363901 CanvasRenderer: @@ -7243,7 +7243,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -2028} - m_SizeDelta: {x: 630, y: 706} + m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8847124342516691148 CanvasRenderer: @@ -7336,7 +7336,7 @@ GameObject: - component: {fileID: 1661507255566106932} - component: {fileID: 8631738381103599889} m_Layer: 5 - m_Name: "\u95EE\u9898" + m_Name: 17 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -7358,10 +7358,10 @@ RectTransform: - {fileID: 7709256980879808766} m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -50} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7954716844660479191 CanvasRenderer: @@ -7643,10 +7643,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -403.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3655889392303721025 CanvasRenderer: @@ -7914,7 +7914,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.6 - m_Text: "\u5982\u4F55\u9009\u62E9\u5DE5\u4F5C\u6A21\u5F0F\uFF1F" + m_Text: "\u5982\u4F55\u8BBE\u7F6E\u626B\u63CF\u89D2\u5EA6\u548C\u68C0\u6D4B\u8DDD\u79BB\uFF1F" --- !u!1 &3634323196801284639 GameObject: m_ObjectHideFlags: 0 @@ -8176,10 +8176,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -100.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5735861559695183174 CanvasRenderer: @@ -8311,7 +8311,7 @@ GameObject: - component: {fileID: 6269253526195656745} - component: {fileID: 5610870531876520840} m_Layer: 5 - m_Name: "\u95EE\u9898" + m_Name: 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -8333,10 +8333,10 @@ RectTransform: - {fileID: 689030441227131130} m_Father: {fileID: 6490864453925438635} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -50} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &671023841347728173 CanvasRenderer: @@ -8762,7 +8762,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -1046} - m_SizeDelta: {x: 630, y: 504} + m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &432428869247091981 CanvasRenderer: @@ -9138,7 +9138,7 @@ GameObject: - component: {fileID: 704738239395983019} - component: {fileID: 3975928535043287575} m_Layer: 5 - m_Name: "\u95EE\u9898 (4)" + m_Name: 21 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9160,10 +9160,10 @@ RectTransform: - {fileID: 822307732942693904} m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -454} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6066387823920765961 CanvasRenderer: @@ -9769,7 +9769,7 @@ GameObject: - component: {fileID: 7421477363032862025} - component: {fileID: 5747282739998700411} m_Layer: 5 - m_Name: "\u95EE\u9898" + m_Name: 4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -9791,10 +9791,10 @@ RectTransform: - {fileID: 683800888128731103} m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -50} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1419227363465134626 CanvasRenderer: @@ -10037,7 +10037,7 @@ GameObject: - component: {fileID: 2416499028819188493} - component: {fileID: 6442807485937308543} m_Layer: 5 - m_Name: "\u95EE\u9898 (1)" + m_Name: 2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -10059,10 +10059,10 @@ RectTransform: - {fileID: 905701782117293594} m_Father: {fileID: 6490864453925438635} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -151} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6379547471243722234 CanvasRenderer: @@ -10340,10 +10340,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 6490864453925438635} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -100.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3167086113839385967 CanvasRenderer: @@ -10719,10 +10719,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -201.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2271188750930282100 CanvasRenderer: @@ -10999,10 +10999,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8908028546209004426} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 345, y: -1594} - m_SizeDelta: {x: 630, y: 40} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6377254526705511636 CanvasRenderer: @@ -11268,7 +11268,7 @@ GameObject: - component: {fileID: 6371371971776222489} - component: {fileID: 6013811126908238421} m_Layer: 5 - m_Name: "\u95EE\u9898 (1)" + m_Name: 15 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -11290,10 +11290,10 @@ RectTransform: - {fileID: 8960196254104533045} m_Father: {fileID: 1073454576004898406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -151} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8075184067456551674 CanvasRenderer: @@ -12060,10 +12060,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -201.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2266620524819761451 CanvasRenderer: @@ -12419,10 +12419,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1073454576004898406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -201.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7790157609521870688 CanvasRenderer: @@ -12859,7 +12859,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -454} - m_SizeDelta: {x: 630, y: 504} + m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &5256827201791243693 CanvasRenderer: @@ -13106,7 +13106,7 @@ GameObject: - component: {fileID: 3412927587844806081} - component: {fileID: 7545609784397023117} m_Layer: 5 - m_Name: "\u95EE\u9898 (2)" + m_Name: 11 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13128,10 +13128,10 @@ RectTransform: - {fileID: 5887720800324602624} m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -252} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &589053567941042058 CanvasRenderer: @@ -13427,7 +13427,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 345, y: -1638} - m_SizeDelta: {x: 630, y: 302} + m_SizeDelta: {x: 690, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8972704750586204075 CanvasRenderer: @@ -13585,7 +13585,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.6 - m_Text: "\u5982\u4F55\u67E5\u770B\u8BBE\u5907\u4FE1\u606F\uFF08\u5E8F\u5217\u53F7\u3001\u56FA\u4EF6\u7248\u672C\u7B49\uFF09\uFF1F" + m_Text: "\u5982\u4F55\u67E5\u770B\u8BBE\u5907\u4FE1\u606F(\u5E8F\u5217\u53F7\u3001\u56FA\u4EF6\u7248\u672C\u7B49)?" --- !u!1 &6653562068422128119 GameObject: m_ObjectHideFlags: 0 @@ -13599,7 +13599,7 @@ GameObject: - component: {fileID: 5865882309406761477} - component: {fileID: 4542671258161949743} m_Layer: 5 - m_Name: "\u95EE\u9898 (4)" + m_Name: 13 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13621,10 +13621,10 @@ RectTransform: - {fileID: 3755372327442570279} m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -454} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4059630263526860035 CanvasRenderer: @@ -13812,7 +13812,7 @@ GameObject: - component: {fileID: 5297497197662397760} - component: {fileID: 4710831194639791469} m_Layer: 5 - m_Name: "\u95EE\u9898" + m_Name: 14 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -13834,10 +13834,10 @@ RectTransform: - {fileID: 156079920788684854} m_Father: {fileID: 1073454576004898406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -50} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6195751429666714694 CanvasRenderer: @@ -14021,7 +14021,7 @@ GameObject: - component: {fileID: 3476830439367863895} - component: {fileID: 2481962596530109838} m_Layer: 5 - m_Name: "\u95EE\u9898 (5)" + m_Name: 22 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -14043,10 +14043,10 @@ RectTransform: - {fileID: 4741751123613414589} m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -555} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3886816544144500217 CanvasRenderer: @@ -14174,10 +14174,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -100.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7460449007112860235 CanvasRenderer: @@ -14384,7 +14384,7 @@ GameObject: - component: {fileID: 6885595876153644174} - component: {fileID: 190788970783957242} m_Layer: 5 - m_Name: "\u95EE\u9898 (6)" + m_Name: 23 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -14406,10 +14406,10 @@ RectTransform: - {fileID: 710004557324163329} m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -656} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7995193751712605019 CanvasRenderer: @@ -15136,7 +15136,7 @@ GameObject: - component: {fileID: 1306175054113549784} - component: {fileID: 6735194680680032314} m_Layer: 5 - m_Name: "\u95EE\u9898 (1)" + m_Name: 5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15158,10 +15158,10 @@ RectTransform: - {fileID: 236354255613047554} m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -151} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5580054155761382143 CanvasRenderer: @@ -15749,10 +15749,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -403.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6070614998892597479 CanvasRenderer: @@ -15805,7 +15805,7 @@ GameObject: - component: {fileID: 5888626641575383587} - component: {fileID: 4434646156320327689} m_Layer: 5 - m_Name: "\u95EE\u9898 (1)" + m_Name: 18 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -15827,10 +15827,10 @@ RectTransform: - {fileID: 5624816925082696244} m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -151} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6717760797678029834 CanvasRenderer: @@ -16405,7 +16405,7 @@ GameObject: - component: {fileID: 5419267416689140656} - component: {fileID: 2795299759997210026} m_Layer: 5 - m_Name: "\u95EE\u9898 (1)" + m_Name: 10 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -16427,10 +16427,10 @@ RectTransform: - {fileID: 8246502276069440825} m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -151} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &575450408027305583 CanvasRenderer: @@ -16637,10 +16637,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 5921995799175958670} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -403.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8709339652620992493 CanvasRenderer: @@ -17756,7 +17756,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.6 - m_Text: "\u8BBE\u5907\u9891\u7E41\u89E6\u53D1\u5B89\u5168\u62A5\u8B66,\u600E\u4E48\u529E\uFF1F" + m_Text: "\u8BBE\u5907\u9891\u7E41\u89E6\u53D1\u5B89\u5168\u62A5\u8B66\uFF0C\u600E\u4E48\u529E\uFF1F" --- !u!1 &8780710206239195916 GameObject: m_ObjectHideFlags: 0 @@ -17920,7 +17920,7 @@ GameObject: - component: {fileID: 6570569370478237881} - component: {fileID: 4056288187476478618} m_Layer: 5 - m_Name: "\u95EE\u9898 (3)" + m_Name: 12 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -17942,10 +17942,10 @@ RectTransform: - {fileID: 4294033238157710058} m_Father: {fileID: 7634380185607548089} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -353} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &909992626646238362 CanvasRenderer: @@ -18054,7 +18054,7 @@ GameObject: - component: {fileID: 2804373051588457197} - component: {fileID: 4011465260946983774} m_Layer: 5 - m_Name: "\u95EE\u9898 (2)" + m_Name: 3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -18076,10 +18076,10 @@ RectTransform: - {fileID: 5127497329080230169} m_Father: {fileID: 6490864453925438635} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -252} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3222258095482530921 CanvasRenderer: @@ -18365,10 +18365,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1073454576004898406} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -100.5} - m_SizeDelta: {x: 576, y: 1} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6376671510665428228 CanvasRenderer: @@ -18804,7 +18804,7 @@ GameObject: - component: {fileID: 1829526271688871532} - component: {fileID: 1800392389520174572} m_Layer: 5 - m_Name: "\u95EE\u9898 (3)" + m_Name: 7 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -18826,10 +18826,10 @@ RectTransform: - {fileID: 2368650515645032708} m_Father: {fileID: 1277180356742477528} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 320, y: -353} - m_SizeDelta: {x: 576, y: 100} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5568649654034783971 CanvasRenderer: diff --git a/Assets/Res/ui/selfpage/faq/cn-1 Variant.prefab b/Assets/Res/ui/selfpage/faq/cn-1 Variant.prefab index 787357e..f2c3b89 100644 --- a/Assets/Res/ui/selfpage/faq/cn-1 Variant.prefab +++ b/Assets/Res/ui/selfpage/faq/cn-1 Variant.prefab @@ -11,22 +11,22 @@ PrefabInstance: - target: {fileID: 1667511709534735998, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} propertyPath: m_Text - value: "\u8BF7\u6309\u4EE5\u4E0B\u6B65\u9AA4\u6392\u67E5\uFF1A\r\n1.\u68C0\u67E5\u8BBE\u5907\u662F\u5426\u5DF2\u5F00\u673A\r\n2.\u68C0\u67E5\u8BBE\u5907BLE\u529F\u80FD\u662F\u5426\u6B63\u5E38\uFF08BLE\u529F\u80FD\u59CB\u7EC8\u5F00\u542F\uFF09\r\n3.\u68C0\u67E5\u624B\u673A\u84DD\u7259\u662F\u5426\u5DF2\u5F00\u542F\r\n4.\u68C0\u67E5APP\u6743\u9650\u662F\u5426\u5DF2\u6388\u4E88\uFF08\u4F4D\u7F6E\u6743\u9650\u3001\u84DD\u7259\u6743\u9650\uFF09\r\n5.\u5C1D\u8BD5\u91CD\u542FAPP\u6216\u91CD\u542F\u624B\u673A\r\n6.\u5C1D\u8BD5\u91CD\u542F\u8BBE\u5907\r\n7.\u68C0\u67E5\u8BBE\u5907\u662F\u5426\u5728\u5176\u4ED6APP\u4E2D\u5DF2\u8FDE\u63A5\r\n\u5982\u679C\u95EE\u9898\u4ECD\u7136\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u6280\u672F\u652F\u6301\u3002" + value: "\u8BF7\u6309\u4EE5\u4E0B\u6B65\u9AA4\u6392\u67E5\uFF1A\r\n1.\u68C0\u67E5\u8BBE\u5907\u662F\u5426\u5DF2\u5F00\u673A\r\n2.\u68C0\u67E5\u8BBE\u5907BLE\u529F\u80FD\u662F\u5426\u6B63\u5E38\uFF08BLE\u529F\u80FD\u59CB\u7EC8\u5F00\u542F\uFF09\r\n3.\u68C0\u67E5\u624B\u673A\u84DD\u7259\u662F\u5426\u5DF2\u5F00\u542F\r\n4.\u68C0\u67E5APP\u6743\u9650\u662F\u5426\u5DF2\u6388\u4E88\uFF08\u4F4D\u7F6E\u6743\u9650\u3001\u84DD\u7259\u6743\u9650\uFF09\r\n5.\u5C1D\u8BD5\u91CD\u542FAPP\u6216\u91CD\u542F\u624B\u673A\r\n6.\u5C1D\u8BD5\u91CD\u542F\u8BBE\u5907\r\n7.\u68C0\u67E5\u8BBE\u5907\u662F\u5426\u5728\u5176\u4ED6APP\u4E2D\u5DF2\u8FDE\u63A5\r\n\u5982\u679C\u95EE\u9898\u4ECD\u7136\u5B58\u5728\uFF0C\u8BF7\u8054\u7CFB\u6280\u672F\u652F\u6301\u3002\n\n" objectReference: {fileID: 0} - target: {fileID: 3147923578205937914, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3147923578205937914, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3147923578205937914, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} propertyPath: m_SizeDelta.x - value: 690 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3147923578205937914, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} @@ -36,12 +36,12 @@ PrefabInstance: - target: {fileID: 3147923578205937914, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} propertyPath: m_AnchoredPosition.x - value: 375 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3147923578205937914, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} propertyPath: m_AnchoredPosition.y - value: -322.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4513099907114694353, guid: ff451a7917277884e9a242b0fdb5af18, type: 3} diff --git a/Assets/Res/ui/selfpage/faq/en-1.prefab b/Assets/Res/ui/selfpage/faq/en-1.prefab index cdd6bfc..3ebd751 100644 --- a/Assets/Res/ui/selfpage/faq/en-1.prefab +++ b/Assets/Res/ui/selfpage/faq/en-1.prefab @@ -11,7 +11,6 @@ GameObject: - component: {fileID: 3147923578205937914} - component: {fileID: 8506375568407917515} - component: {fileID: 1667511709534735998} - - component: {fileID: 3655882110566104415} m_Layer: 5 m_Name: "\u7B54\u6848" m_TagString: Untagged @@ -33,10 +32,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8708163457055322671} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 375, y: -526.5} - m_SizeDelta: {x: 690, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8506375568407917515 CanvasRenderer: @@ -105,20 +104,6 @@ MonoBehaviour: If the problem persists, please contact technical support.' ---- !u!114 &3655882110566104415 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 978143141870645994} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 2 --- !u!1 &2807676949364304595 GameObject: m_ObjectHideFlags: 0 @@ -248,7 +233,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 1} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6242798440474698901 CanvasRenderer: @@ -838,13 +823,13 @@ MonoBehaviour: m_Left: 30 m_Right: 30 m_Top: 20 - m_Bottom: 0 + m_Bottom: 20 m_ChildAlignment: 0 m_Spacing: 24 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 1 - m_ChildControlHeight: 0 + m_ChildControlHeight: 1 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 diff --git a/Assets/Res/ui/selfpage/selfpage.prefab b/Assets/Res/ui/selfpage/selfpage.prefab index b1b2f85..36d5a17 100644 --- a/Assets/Res/ui/selfpage/selfpage.prefab +++ b/Assets/Res/ui/selfpage/selfpage.prefab @@ -1792,7 +1792,6 @@ GameObject: - component: {fileID: 8950144054270730730} - component: {fileID: 1939892814802637704} - component: {fileID: 6694220860965633515} - - component: {fileID: 9077851339017804035} m_Layer: 5 m_Name: "\u5934\u50CF" m_TagString: Untagged @@ -1871,50 +1870,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 1 ---- !u!114 &9077851339017804035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6520566164833522125} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1939892814802637704} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &6596522295582540913 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Res/ui/selfpage/二维码页面.prefab b/Assets/Res/ui/selfpage/二维码页面.prefab index 0ded83d..5f358ee 100644 --- a/Assets/Res/ui/selfpage/二维码页面.prefab +++ b/Assets/Res/ui/selfpage/二维码页面.prefab @@ -343,6 +343,7 @@ MonoBehaviour: userIdText: {fileID: 8041723923164507808} backButton: {fileID: 2693321917153691479} qrCodeGenerator: {fileID: 9078284290416333226} + avatarImage: {fileID: 4324070612691916755} --- !u!114 &9078284290416333226 MonoBehaviour: m_ObjectHideFlags: 0 @@ -377,7 +378,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1377726068398500317 RectTransform: m_ObjectHideFlags: 0 @@ -412,7 +413,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5522365137282159283} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -425,7 +426,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 2736dafec7d1ffd49b8312e35504a511, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Res/ui/selfpage/安全要点/aq_ch.png b/Assets/Res/ui/selfpage/安全要点/aq_ch.png index 32fd6fe..40f109c 100644 Binary files a/Assets/Res/ui/selfpage/安全要点/aq_ch.png and b/Assets/Res/ui/selfpage/安全要点/aq_ch.png differ diff --git a/Assets/Res/ui/selfpage/设备教学-中文.prefab b/Assets/Res/ui/selfpage/设备教学-中文.prefab index 6db127c..0ac66f5 100644 --- a/Assets/Res/ui/selfpage/设备教学-中文.prefab +++ b/Assets/Res/ui/selfpage/设备教学-中文.prefab @@ -3124,6 +3124,7 @@ RectTransform: - {fileID: 8765208610560858515} - {fileID: 4145188227708711294} - {fileID: 2695220720415235241} + - {fileID: 5273786285865126063} m_Father: {fileID: 5456906986146616877} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -3225,6 +3226,7 @@ MonoBehaviour: totalTimeText: {fileID: 4974008130370140194} nowTime: {fileID: 6102080119030142365} slider: {fileID: 2276751951196572964} + loading: {fileID: 5684165146539051976} --- !u!1 &9218367327372329729 GameObject: m_ObjectHideFlags: 0 @@ -3304,3 +3306,133 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7528\u6237\u6CE8\u518C\u767B\u5F55" +--- !u!1001 &2845125910928794030 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4619554961765755212} + m_Modifications: + - target: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Name + value: loading + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f835c9139c45b254face164dfd1b0ca9, type: 3} +--- !u!224 &5273786285865126063 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 2845125910928794030} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5684165146539051976 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 2845125910928794030} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res/ui/videopage/videoPage.prefab b/Assets/Res/ui/videopage/videoPage.prefab index c0565b4..15656b7 100644 --- a/Assets/Res/ui/videopage/videoPage.prefab +++ b/Assets/Res/ui/videopage/videoPage.prefab @@ -121,7 +121,7 @@ RectTransform: m_GameObject: {fileID: 623236512946559411} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0003841, y: 1.0003841, z: 1.0003841} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6002609856637895191} @@ -1484,7 +1484,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 29.5, y: -25} - m_SizeDelta: {x: 7, y: 43} + m_SizeDelta: {x: 7, y: 27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7651326578310032666 CanvasRenderer: @@ -1563,7 +1563,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 62.5, y: -25} - m_SizeDelta: {x: 59, y: 50} + m_SizeDelta: {x: 59, y: 27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5439455909549482936 CanvasRenderer: @@ -1642,7 +1642,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 13, y: -25} - m_SizeDelta: {x: 26, y: 50} + m_SizeDelta: {x: 26, y: 27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9138258466124955313 CanvasRenderer: @@ -2089,6 +2089,7 @@ RectTransform: - {fileID: 3557874817526632307} - {fileID: 5353770316649156691} - {fileID: 3611844215657059240} + - {fileID: 872567193665944104} m_Father: {fileID: 2622335253942487164} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} @@ -2190,6 +2191,7 @@ MonoBehaviour: totalTimeText: {fileID: 6958991286985597639} nowTime: {fileID: 918820524840098144} slider: {fileID: 4404250851968639036} + loading: {fileID: 849365618100713807} --- !u!1 &5792746782571273002 GameObject: m_ObjectHideFlags: 0 @@ -3574,3 +3576,138 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5864631383284452065} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7084251700124767017 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6002609856637895191} + m_Modifications: + - target: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Name + value: loading + objectReference: {fileID: 0} + - target: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f835c9139c45b254face164dfd1b0ca9, type: 3} +--- !u!1 &849365618100713807 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7609355920085510758, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 7084251700124767017} + m_PrefabAsset: {fileID: 0} +--- !u!224 &872567193665944104 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7947633290016123137, guid: f835c9139c45b254face164dfd1b0ca9, + type: 3} + m_PrefabInstance: {fileID: 7084251700124767017} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/Managers/LoadRes.cs b/Assets/Scripts/Managers/LoadRes.cs index 72ff95d..3b96904 100644 --- a/Assets/Scripts/Managers/LoadRes.cs +++ b/Assets/Scripts/Managers/LoadRes.cs @@ -36,6 +36,15 @@ namespace Kill.Managers if (resPosition == ResPosition.资源包) { + if(loadedBundles!=null&&loadedBundles.Count>0) + { + foreach(var b in loadedBundles) + { + b.Value.Unload(true); + } + loadedBundles.Clear(); + + } loadedBundles = new Dictionary(); if (commonList != null) { diff --git a/Assets/Scripts/Network/NetworkCtrl.cs b/Assets/Scripts/Network/NetworkCtrl.cs index 508c15a..dee060c 100644 --- a/Assets/Scripts/Network/NetworkCtrl.cs +++ b/Assets/Scripts/Network/NetworkCtrl.cs @@ -94,6 +94,8 @@ namespace Kill.Network public async Task Init() { Debug.Log("初始化网络控制"); + await LoadRes.Instance.Init(); + LoadingUI.Show(); // 初始化网络管理器 await InitializeNetworkManagers(); await NetworkStateManager.Instance.Init(); @@ -116,6 +118,7 @@ namespace Kill.Network await LoadRes.Instance.Init(); await DataManager.Instance.Init(); await UI.UIManager.Instance.Init(); + LoadingUI.Hide(); } /// diff --git a/Assets/Scripts/Network/ResponseCode.cs b/Assets/Scripts/Network/ResponseCode.cs index d2d2ca9..1ab2ed1 100644 --- a/Assets/Scripts/Network/ResponseCode.cs +++ b/Assets/Scripts/Network/ResponseCode.cs @@ -241,7 +241,7 @@ namespace Kill.Network private static void ShowErrorTip(string code) { // 使用 ToastUI 显示横幅提示 - ToastUI.ShowText(code); + ToastUI.Show(code); } /// diff --git a/Assets/Scripts/UI/Components/UpdateLoadingUI.cs b/Assets/Scripts/UI/Components/UpdateLoadingUI.cs index a2f296d..0d48a56 100644 --- a/Assets/Scripts/UI/Components/UpdateLoadingUI.cs +++ b/Assets/Scripts/UI/Components/UpdateLoadingUI.cs @@ -41,7 +41,7 @@ namespace Kill.UI.Components public void Show() { if (Instance == null) return; - + precent.text=0+"%"; Instance.loadingPanel.SetActive(true); if (Instance.loadingAni != null) loadingAni.Play(); @@ -66,7 +66,7 @@ namespace Kill.UI.Components public void GetDownloadProcess(DownloadProgress progress) { Debug.Log($"下载进度: {progress.ProgressPercentage}%"); - precent.text=progress.ProgressPercentage+"%"; + precent.text=(int)progress.ProgressPercentage+"%"; } public void SetPrecent(float p) diff --git a/Assets/Scripts/UI/Components/VideoCtrl.cs b/Assets/Scripts/UI/Components/VideoCtrl.cs index 6b41f53..abfc2a1 100644 --- a/Assets/Scripts/UI/Components/VideoCtrl.cs +++ b/Assets/Scripts/UI/Components/VideoCtrl.cs @@ -29,7 +29,7 @@ namespace Kill.UI.Components bool ispause = true; Action playOver; string url; - + public GameObject loading; private void FixedUpdate() { if (isplaying) @@ -41,6 +41,8 @@ namespace Kill.UI.Components } public void Init(string url, Action playOver) { + if(loading) + loading.SetActive(true); nowTime.text=SecondToHour(0); this.playOver = playOver; this.url = url; @@ -150,7 +152,8 @@ namespace Kill.UI.Components if (playButton != null) playButton.SetActive(true); nowTime.text=SecondToHour(0); - + if(loading) + loading.SetActive(false); } public void ShowAnimation(int dir) { @@ -236,7 +239,6 @@ namespace Kill.UI.Components playOver?.Invoke(); Init(url, playOver); } - public void SetFullScreen(bool isFullScreen) { this.isFullScreen = isFullScreen; diff --git a/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs b/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs index 6aff1df..47db3ee 100644 --- a/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs +++ b/Assets/Scripts/UI/Pages/SelfPage/SelfQrcodePage.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using Kill.Managers; +using Kill.Network; using Kill.UI.Components; using UnityEngine; using UnityEngine.UI; @@ -13,7 +14,8 @@ namespace Kill.UI.Pages public Text userIdText; public Button backButton; public QRCodeGenerator qrCodeGenerator; - public void Init(UserInfo userInfo) + public Image avatarImage; + public async void Init(UserInfo userInfo) { UIManager.Instance.RegisterBackAction(OnBack); backButton.onClick.RemoveAllListeners(); @@ -22,6 +24,17 @@ namespace Kill.UI.Pages emailText.text = userInfo.email; userIdText.text = $"User ID: {userInfo.id}"; qrCodeGenerator.Generate(userInfo.id); + if (string.IsNullOrEmpty(userInfo.avatar)) + { + avatarImage.gameObject.SetActive(false); + avatarImage.transform.parent.GetComponent().showMaskGraphic=true; + } + else + { + await NetworkCtrl.Instance.LoadImageToUIImageAsync(userInfo.avatar, avatarImage); + avatarImage.gameObject.SetActive(true); + avatarImage.transform.parent.GetComponent().showMaskGraphic=false; + } } public void OnBack() { diff --git a/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs b/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs index e229538..e8f2ba0 100644 --- a/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs +++ b/Assets/Scripts/UI/Pages/VideoPage/VideoPageCtrl.cs @@ -257,11 +257,11 @@ namespace Kill.UI.Pages } public async Task DownLoadVideo(string url) { - LoadingUI.Show(); + UpdateLoadingUI.Instance.Show(); string name = url.Substring(url.LastIndexOf('/') + 1); string savePath = Application.persistentDataPath + "/"+name; - var success = await NetworkCtrl.Instance.DownloadFile(url, savePath, GetDownloadProcess); - LoadingUI.Hide(); + var success = await NetworkCtrl.Instance.DownloadFile(url, savePath, UpdateLoadingUI.Instance.GetDownloadProcess); + UpdateLoadingUI.Instance.Hide(); if (success.IsSuccess && File.Exists(savePath)) { diff --git a/Assets/Scripts/UI/UIManager.cs b/Assets/Scripts/UI/UIManager.cs index 3b48556..6a9b7ca 100644 --- a/Assets/Scripts/UI/UIManager.cs +++ b/Assets/Scripts/UI/UIManager.cs @@ -72,14 +72,14 @@ namespace Kill.UI { if(backAction!=null) { - lastBackAction=action; + lastBackAction=backAction; } RegisterBackAction(action); } public void RecoverBackAction() { - if(backAction!=null) + if(lastBackAction!=null) { RegisterBackAction(lastBackAction); } diff --git a/Assets/StreamingAssets/Android b/Assets/StreamingAssets/Android index 4b20037..896f855 100644 Binary files a/Assets/StreamingAssets/Android and b/Assets/StreamingAssets/Android differ diff --git a/Assets/StreamingAssets/Android.manifest b/Assets/StreamingAssets/Android.manifest index a5d3d53..11db0b2 100644 --- a/Assets/StreamingAssets/Android.manifest +++ b/Assets/StreamingAssets/Android.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 461845205 +CRC: 3372737529 AssetBundleManifest: AssetBundleInfos: Info_0: @@ -24,7 +24,8 @@ AssetBundleManifest: Info_5: Name: ui_safetylearningpage.ab Dependencies: - Dependency_0: ui_common.ab + Dependency_0: common.ab + Dependency_1: ui_common.ab Info_6: Name: ui_connectdevicepage.ab Dependencies: @@ -38,13 +39,14 @@ AssetBundleManifest: Info_8: Name: ui_selfpage.ab Dependencies: - Dependency_0: ui_homepage.ab + Dependency_0: common.ab Dependency_1: ui_common.ab Dependency_2: ui_loginpage.ab Info_9: Name: ui_videopage.ab Dependencies: - Dependency_0: ui_common.ab + Dependency_0: common.ab + Dependency_1: ui_common.ab Info_10: Name: ui_rankpage.ab Dependencies: diff --git a/Assets/StreamingAssets/common.ab b/Assets/StreamingAssets/common.ab index d97ccf3..a656298 100644 Binary files a/Assets/StreamingAssets/common.ab and b/Assets/StreamingAssets/common.ab differ diff --git a/Assets/StreamingAssets/common.ab.manifest b/Assets/StreamingAssets/common.ab.manifest index 1fd7998..e1b462c 100644 --- a/Assets/StreamingAssets/common.ab.manifest +++ b/Assets/StreamingAssets/common.ab.manifest @@ -1,29 +1,44 @@ ManifestFileVersion: 0 -CRC: 2577400749 +CRC: 2640084189 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 1a12fbb511ae2f5da7c9b7b1acd48dce + Hash: aabf79e02cd5fbe37ed2d19b40102959 TypeTreeHash: serializedVersion: 2 - Hash: 9c52ac4cef87f173de8a52cd247f463a + Hash: 95bec0ebc8de91408424eea7f0fcf15c IncrementalBuildHash: serializedVersion: 2 - Hash: 1a12fbb511ae2f5da7c9b7b1acd48dce + Hash: aabf79e02cd5fbe37ed2d19b40102959 HashAppended: 0 ClassTypes: +- Class: 1 + Script: {instanceID: 0} - Class: 48 Script: {instanceID: 0} - Class: 74 Script: {instanceID: 0} +- Class: 111 + Script: {instanceID: 0} +- Class: 114 + Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 213 Script: {instanceID: 0} -SerializeReferenceClassIdentifiers: [] +- Class: 222 + Script: {instanceID: 0} +- Class: 224 + Script: {instanceID: 0} +SerializeReferenceClassIdentifiers: +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.Events.PersistentCallGroup +- AssemblyName: UnityEngine.UI + ClassName: UnityEngine.UI.MaskableGraphic/CullStateChangedEvent Assets: - Assets/Res/common/loadingNew.anim - Assets/Res/common/updateLoading.anim +- Assets/Res/common/loading.prefab - Assets/Res/common/SimpleGrabPassBlur.shader - Assets/Res/common/loading.anim Dependencies: diff --git a/Assets/StreamingAssets/language.ab b/Assets/StreamingAssets/language.ab index 21c1dad..2be2bb1 100644 Binary files a/Assets/StreamingAssets/language.ab and b/Assets/StreamingAssets/language.ab differ diff --git a/Assets/StreamingAssets/language.ab.manifest b/Assets/StreamingAssets/language.ab.manifest index 535828f..5fe9460 100644 --- a/Assets/StreamingAssets/language.ab.manifest +++ b/Assets/StreamingAssets/language.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 2940790012 +CRC: 1324956840 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 94acdd3b9bcafc1af575cebe764f8395 + Hash: 4f32e6a692eecc48e4943ec37fed6b5f TypeTreeHash: serializedVersion: 2 Hash: 5ad585dd02dfb5016c0dad519eab8f49 IncrementalBuildHash: serializedVersion: 2 - Hash: 94acdd3b9bcafc1af575cebe764f8395 + Hash: 4f32e6a692eecc48e4943ec37fed6b5f HashAppended: 0 ClassTypes: - Class: 49 diff --git a/Assets/StreamingAssets/list.json b/Assets/StreamingAssets/list.json index 5f12ca0..ba6fb6d 100644 --- a/Assets/StreamingAssets/list.json +++ b/Assets/StreamingAssets/list.json @@ -8,33 +8,33 @@ }, { "name": "language.ab", - "size": 8056, - "md5": "4bf1d407b3fbfbf7df19151d0af58ba3" + "size": 8166, + "md5": "30e44712223f7a5ea0f7cd9eff3c32c3" }, { "name": "ui_common.ab", - "size": 1315553, - "md5": "8581e1bf717fb3b89c15c26328e60aea" + "size": 1316524, + "md5": "5cb1a272de0b4a102c7855b11f1dbba7" }, { "name": "ui_connectdevicepage.ab", - "size": 52466, - "md5": "7ff11eb293f49c7540bef00b492c24c5" + "size": 51842, + "md5": "ac7a56b823dbe223e45928804a604b94" }, { "name": "ui_deviceinfopage.ab", - "size": 64804, - "md5": "6460e574b21701876a3aa177095a7dac" + "size": 66192, + "md5": "1a1e67c75967f65c10ac9a5512571d02" }, { "name": "ui_homepage.ab", - "size": 2121776, - "md5": "e9c8662c7e5c60f15acd4b448f0c2545" + "size": 2095211, + "md5": "ed205700a4fec0f21d458a7c2c40f71e" }, { "name": "ui_loginpage.ab", - "size": 3421816, - "md5": "5012d373135f33a02ab2ea9afd5556f5" + "size": 2759426, + "md5": "1f2ed5442eb59666ade5253b36d3920e" }, { "name": "ui_rankpage.ab", @@ -48,8 +48,8 @@ }, { "name": "ui_selfpage.ab", - "size": 1960436, - "md5": "7f6cf7c6bfe22826547b24674bd926f0" + "size": 1180503, + "md5": "b936aa4ad0873cf894cd1337e57bc4a6" }, { "name": "ui_videopage.ab", @@ -64,32 +64,32 @@ { "name": "language.ab.manifest", "size": 474, - "md5": "c1efde7a82a5b7905e1c98bbe10eba83" + "md5": "9221b0ce6778b6801b35198e7ba767fe" }, { "name": "ui_common.ab.manifest", - "size": 10078, - "md5": "e7365d9a7bb6750be45be69802a5071a" + "size": 10508, + "md5": "12626a35dc19d1d1dae15245e4ea5fd6" }, { "name": "ui_connectdevicepage.ab.manifest", "size": 3756, - "md5": "d6f0f54ecf8e278b09110f0bf7ff2ec5" + "md5": "d49ec340230ce9687fb72a2c21a1089a" }, { "name": "ui_deviceinfopage.ab.manifest", "size": 5738, - "md5": "41f65c97896884979d623595eefb6d6c" + "md5": "50bb5495d7b6cc27c83ed0d4c9b5bfb3" }, { "name": "ui_homepage.ab.manifest", - "size": 10216, - "md5": "2434fe3c9c75b8d47bfb7641d863301c" + "size": 10215, + "md5": "ddd0777086889a14393afccc32abf1ad" }, { "name": "ui_loginpage.ab.manifest", - "size": 4355, - "md5": "bb6665a3b01d396723d7d37107e28b58" + "size": 4354, + "md5": "054604cadd52c23278c1c1753914966e" }, { "name": "ui_rankpage.ab.manifest", @@ -104,7 +104,7 @@ { "name": "ui_selfpage.ab.manifest", "size": 9097, - "md5": "b8792dc4318a3d17c9582adf07d60984" + "md5": "5382f3a3d0ae4e24fadc2187869bceff" }, { "name": "ui_videopage.ab.manifest", diff --git a/Assets/StreamingAssets/ui_common.ab b/Assets/StreamingAssets/ui_common.ab index 75fca2b..c6a3208 100644 Binary files a/Assets/StreamingAssets/ui_common.ab and b/Assets/StreamingAssets/ui_common.ab differ diff --git a/Assets/StreamingAssets/ui_common.ab.manifest b/Assets/StreamingAssets/ui_common.ab.manifest index e49df0b..dbe81a0 100644 --- a/Assets/StreamingAssets/ui_common.ab.manifest +++ b/Assets/StreamingAssets/ui_common.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 1227180749 +CRC: 4191728507 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 491cf663f9e09f9b0c0395818a7c8600 + Hash: 5b5997a638456b5a4290032b13a04d2e TypeTreeHash: serializedVersion: 2 - Hash: 46399b71a907d170acd3559667951385 + Hash: dbcefea33ef3d2216831f9518ed5c832 IncrementalBuildHash: serializedVersion: 2 - Hash: 491cf663f9e09f9b0c0395818a7c8600 + Hash: 5b5997a638456b5a4290032b13a04d2e HashAppended: 0 ClassTypes: - Class: 1 @@ -28,6 +28,8 @@ ClassTypes: Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - Class: 114 Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - Class: 114 @@ -38,6 +40,8 @@ ClassTypes: Script: {fileID: 11500000, guid: ce7f9a66c3b832343bd86c4b491d90c8, type: 3} - Class: 114 Script: {fileID: 11500000, guid: 89f1d49b50a31514787b4e268b1c73bb, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - Class: 114 Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - Class: 115 @@ -51,8 +55,12 @@ ClassTypes: - Class: 224 Script: {instanceID: 0} SerializeReferenceClassIdentifiers: +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.Events.ArgumentCache - AssemblyName: UnityEngine.CoreModule ClassName: UnityEngine.Events.PersistentCallGroup +- AssemblyName: UnityEngine.CoreModule + ClassName: UnityEngine.Events.PersistentListenerMode - AssemblyName: UnityEngine.CoreModule ClassName: UnityEngine.RectOffset - AssemblyName: UnityEngine.UI @@ -118,7 +126,7 @@ Assets: - "Assets/Res/ui/common/\u63D0\u9192\u7EA2\u70B9.png" - "Assets/Res/ui/common/\u8FD4\u56DE.png" - "Assets/Res/ui/common/\u8FDB\u5EA6\u5706\u70B9.png" -- "Assets/Res/ui/common/\u5220\u9664\u63D0\u793A.prefab" +- "Assets/Res/ui/common/\u53CC\u6309\u94AE\u63D0\u793A.prefab" - "Assets/Res/ui/common/Right (\u53F3) (1).png" - "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00053.png" - "Assets/Res/ui/common/Right (\u53F3) (2).png" @@ -160,6 +168,7 @@ Assets: - "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00043.png" - "Assets/Res/ui/common/\u5B9A\u65F6.png" - "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00001.png" +- "Assets/Res/ui/common/\u5355\u6309\u94AE\u63D0\u793A.prefab" - "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00045.png" - "Assets/Res/ui/common/\u8FDB\u5EA6Loading/\u66F4\u65B0\u8FDB\u5EA6_00040.png" - "Assets/Res/ui/common/\u5C0F\u6309\u94AE.png" diff --git a/Assets/StreamingAssets/ui_connectdevicepage.ab b/Assets/StreamingAssets/ui_connectdevicepage.ab index 3d93c0a..63b0195 100644 Binary files a/Assets/StreamingAssets/ui_connectdevicepage.ab and b/Assets/StreamingAssets/ui_connectdevicepage.ab differ diff --git a/Assets/StreamingAssets/ui_connectdevicepage.ab.manifest b/Assets/StreamingAssets/ui_connectdevicepage.ab.manifest index 6892ca5..d9a0f71 100644 --- a/Assets/StreamingAssets/ui_connectdevicepage.ab.manifest +++ b/Assets/StreamingAssets/ui_connectdevicepage.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 3315253899 +CRC: 1671773530 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 0fc3f28afeb126e8cd131e8a52707a5a + Hash: 4c0a013a4df7181eaf2daa94d848f415 TypeTreeHash: serializedVersion: 2 - Hash: e05a771caeff7fda6539c249b3a15e2a + Hash: 978ed2e6fa4698960a868bb6aae3ee09 IncrementalBuildHash: serializedVersion: 2 - Hash: 0fc3f28afeb126e8cd131e8a52707a5a + Hash: 4c0a013a4df7181eaf2daa94d848f415 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ui_deviceinfopage.ab b/Assets/StreamingAssets/ui_deviceinfopage.ab index 438728a..ccfe05d 100644 Binary files a/Assets/StreamingAssets/ui_deviceinfopage.ab and b/Assets/StreamingAssets/ui_deviceinfopage.ab differ diff --git a/Assets/StreamingAssets/ui_deviceinfopage.ab.manifest b/Assets/StreamingAssets/ui_deviceinfopage.ab.manifest index 2fc8235..629798a 100644 --- a/Assets/StreamingAssets/ui_deviceinfopage.ab.manifest +++ b/Assets/StreamingAssets/ui_deviceinfopage.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 1145510873 +CRC: 3247604558 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 6c1878930a73a9f2522ea4b13b03a3dc + Hash: f8317304c05eff8a942330c18d60028a TypeTreeHash: serializedVersion: 2 - Hash: fba85493ad4dcb59f971af235d74359c + Hash: 3f9c27a4d82d417771ad76546125a3c5 IncrementalBuildHash: serializedVersion: 2 - Hash: 6c1878930a73a9f2522ea4b13b03a3dc + Hash: f8317304c05eff8a942330c18d60028a HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ui_homepage.ab b/Assets/StreamingAssets/ui_homepage.ab index 7e457a0..5fe466e 100644 Binary files a/Assets/StreamingAssets/ui_homepage.ab and b/Assets/StreamingAssets/ui_homepage.ab differ diff --git a/Assets/StreamingAssets/ui_homepage.ab.manifest b/Assets/StreamingAssets/ui_homepage.ab.manifest index 1b945b5..2a37fd3 100644 --- a/Assets/StreamingAssets/ui_homepage.ab.manifest +++ b/Assets/StreamingAssets/ui_homepage.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 3370057080 +CRC: 3548110111 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 5fdd1d411d968edb60d17d2fd4fb8d0c + Hash: 7f38f16b54ae36c02d2a63eb46194b76 TypeTreeHash: serializedVersion: 2 Hash: 2714bb65ae021d2197ad838d3ddce545 IncrementalBuildHash: serializedVersion: 2 - Hash: 5fdd1d411d968edb60d17d2fd4fb8d0c + Hash: 7f38f16b54ae36c02d2a63eb46194b76 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ui_loginpage.ab b/Assets/StreamingAssets/ui_loginpage.ab index 2361698..9f14f46 100644 Binary files a/Assets/StreamingAssets/ui_loginpage.ab and b/Assets/StreamingAssets/ui_loginpage.ab differ diff --git a/Assets/StreamingAssets/ui_loginpage.ab.manifest b/Assets/StreamingAssets/ui_loginpage.ab.manifest index d06b850..934519b 100644 --- a/Assets/StreamingAssets/ui_loginpage.ab.manifest +++ b/Assets/StreamingAssets/ui_loginpage.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 483583531 +CRC: 90950853 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 03ec133edb09eb653970cf15442915af + Hash: 460f5b8e3d6aaec14078fd25a1e0a31e TypeTreeHash: serializedVersion: 2 Hash: e2c9d8528f45ab139731bcf44d40d204 IncrementalBuildHash: serializedVersion: 2 - Hash: 03ec133edb09eb653970cf15442915af + Hash: 460f5b8e3d6aaec14078fd25a1e0a31e HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ui_safetylearningpage.ab b/Assets/StreamingAssets/ui_safetylearningpage.ab index 9b80582..22aab6f 100644 Binary files a/Assets/StreamingAssets/ui_safetylearningpage.ab and b/Assets/StreamingAssets/ui_safetylearningpage.ab differ diff --git a/Assets/StreamingAssets/ui_safetylearningpage.ab.manifest b/Assets/StreamingAssets/ui_safetylearningpage.ab.manifest index 2c6dd11..f74b42f 100644 --- a/Assets/StreamingAssets/ui_safetylearningpage.ab.manifest +++ b/Assets/StreamingAssets/ui_safetylearningpage.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 3825246394 +CRC: 415693120 Hashes: AssetFileHash: serializedVersion: 2 - Hash: a2d0cadc123f9ee4845b9966348d0217 + Hash: 2954a19c1bf17562d4105e9613f34e24 TypeTreeHash: serializedVersion: 2 - Hash: 2f5c13cd76d0a24611f31d3dd68755dc + Hash: 5bbbd9e192a2aef2b20142d807669f26 IncrementalBuildHash: serializedVersion: 2 - Hash: a2d0cadc123f9ee4845b9966348d0217 + Hash: 2954a19c1bf17562d4105e9613f34e24 HashAppended: 0 ClassTypes: - Class: 1 @@ -20,6 +20,10 @@ ClassTypes: Script: {instanceID: 0} - Class: 48 Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 111 + Script: {instanceID: 0} - Class: 114 Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - Class: 114 @@ -118,4 +122,5 @@ Assets: - "Assets/Res/ui/safetylearningpage/\u6B63\u786Eicon.png" - Assets/Res/ui/safetylearningpage/safetylearningPage.prefab Dependencies: +- D:/unity_project/Kill/AssetBundles/Android/common.ab - D:/unity_project/Kill/AssetBundles/Android/ui_common.ab diff --git a/Assets/StreamingAssets/ui_selfpage.ab b/Assets/StreamingAssets/ui_selfpage.ab index 89be0a3..3ccf29c 100644 Binary files a/Assets/StreamingAssets/ui_selfpage.ab and b/Assets/StreamingAssets/ui_selfpage.ab differ diff --git a/Assets/StreamingAssets/ui_selfpage.ab.manifest b/Assets/StreamingAssets/ui_selfpage.ab.manifest index 73e1ea2..f61228c 100644 --- a/Assets/StreamingAssets/ui_selfpage.ab.manifest +++ b/Assets/StreamingAssets/ui_selfpage.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 1501058622 +CRC: 1273719451 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 13ff9b5f3b1ca3687343a1221a27c8b8 + Hash: adc0f14233ffdad5860404a32b2e6129 TypeTreeHash: serializedVersion: 2 - Hash: e49238147a58ad388d38756302be0518 + Hash: b346861ba1c08a2ddc2fa9853538f766 IncrementalBuildHash: serializedVersion: 2 - Hash: 13ff9b5f3b1ca3687343a1221a27c8b8 + Hash: adc0f14233ffdad5860404a32b2e6129 HashAppended: 0 ClassTypes: - Class: 1 @@ -20,6 +20,10 @@ ClassTypes: Script: {instanceID: 0} - Class: 48 Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 111 + Script: {instanceID: 0} - Class: 114 Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - Class: 114 @@ -208,6 +212,6 @@ Assets: - Assets/Res/ui/selfpage/faq/en-12.prefab - "Assets/Res/ui/selfpage/\u4E2A\u4EBA\u4FE1\u606F\u9875.prefab" Dependencies: +- D:/unity_project/Kill/AssetBundles/Android/common.ab - D:/unity_project/Kill/AssetBundles/Android/ui_common.ab -- D:/unity_project/Kill/AssetBundles/Android/ui_homepage.ab - D:/unity_project/Kill/AssetBundles/Android/ui_loginpage.ab diff --git a/Assets/StreamingAssets/ui_videopage.ab b/Assets/StreamingAssets/ui_videopage.ab index bc58a16..5a584c7 100644 Binary files a/Assets/StreamingAssets/ui_videopage.ab and b/Assets/StreamingAssets/ui_videopage.ab differ diff --git a/Assets/StreamingAssets/ui_videopage.ab.manifest b/Assets/StreamingAssets/ui_videopage.ab.manifest index 189252e..61ac710 100644 --- a/Assets/StreamingAssets/ui_videopage.ab.manifest +++ b/Assets/StreamingAssets/ui_videopage.ab.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 2921602434 +CRC: 3427234946 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 6658d0084c09d1ac889acdd9e6f364f1 + Hash: bd891534b90916405c76541e773c259d TypeTreeHash: serializedVersion: 2 - Hash: 29168d815cc6a891e4b88984c0b214f0 + Hash: 44287f874e12135cfd1a20fcfc7f79c1 IncrementalBuildHash: serializedVersion: 2 - Hash: 6658d0084c09d1ac889acdd9e6f364f1 + Hash: bd891534b90916405c76541e773c259d HashAppended: 0 ClassTypes: - Class: 1 @@ -20,6 +20,10 @@ ClassTypes: Script: {instanceID: 0} - Class: 48 Script: {instanceID: 0} +- Class: 74 + Script: {instanceID: 0} +- Class: 111 + Script: {instanceID: 0} - Class: 114 Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} - Class: 114 @@ -103,4 +107,5 @@ Assets: - "Assets/Res/ui/videopage/\u4E00\u6761\u89C6\u9891.prefab" - "Assets/Res/ui/videopage/\u9009\u4E2D.png" Dependencies: +- D:/unity_project/Kill/AssetBundles/Android/common.ab - D:/unity_project/Kill/AssetBundles/Android/ui_common.ab