From 6d468180124b2002a8ae581e80e58ae39fd2b75d Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Wed, 14 May 2025 22:40:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=87=E6=80=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AssetGroups/Default Local Group.asset | 5 + .../AssetGroups/Prefabs.asset | 31 -- .../AssetGroups/Prefabs.asset.meta | 8 - .../Prefabs_BundledAssetGroupSchema.asset | 45 -- ...Prefabs_BundledAssetGroupSchema.asset.meta | 8 - .../Prefabs_ContentUpdateGroupSchema.asset | 16 - .../Prefabs_PlayerDataGroupSchema.asset | 17 - .../Prefabs_PlayerDataGroupSchema.asset.meta | 8 - Assets/AddressableAssetsData/link.xml | 431 ++++++++++++++++++ ...teGroupSchema.asset.meta => link.xml.meta} | 5 +- Assets/Scenes/Instantiate.unity | 45 ++ Assets/Scenes/Persistence.unity | 47 +- Assets/Scripts/Game Loop/InitialLoad.cs | 2 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 7 + ProjectSettings/ProjectSettings.asset | 2 +- 16 files changed, 494 insertions(+), 184 deletions(-) delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Prefabs.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Prefabs.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset.meta delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset delete mode 100644 Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset.meta create mode 100644 Assets/AddressableAssetsData/link.xml rename Assets/AddressableAssetsData/{AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset.meta => link.xml.meta} (52%) diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index c3578f5e0..f0bc4a90e 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -72,6 +72,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: ed63c928b4f8ed14f9f8aa674886e952 + m_Address: CutLine + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} m_SchemaSet: diff --git a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset b/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset deleted file mode 100644 index e3f7de6f9..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset +++ /dev/null @@ -1,31 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3} - m_Name: Prefabs - m_EditorClassIdentifier: - m_GroupName: Prefabs - m_Data: - m_SerializedData: [] - m_GUID: 23852c46474a08d41941621c301886a3 - m_SerializeEntries: - - m_GUID: ed63c928b4f8ed14f9f8aa674886e952 - m_Address: CutLine - m_ReadOnly: 0 - m_SerializedLabels: [] - FlaggedDuringContentUpdateRestriction: 0 - m_ReadOnly: 0 - m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2} - m_SchemaSet: - m_Schemas: - - {fileID: 11400000, guid: 2bcd0e1e759f58642bfebbbfb2675973, type: 2} - - {fileID: 11400000, guid: 72228f7d1b854a642aca5fbc9bc7488c, type: 2} - - {fileID: 11400000, guid: e681af37b5cf1164eb54957a45d00347, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset.meta deleted file mode 100644 index d6a245205..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Prefabs.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2534b5778664d10419ffabfb1f40ef7d -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset deleted file mode 100644 index bc11c23f8..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset +++ /dev/null @@ -1,45 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3} - m_Name: Prefabs_BundledAssetGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 2534b5778664d10419ffabfb1f40ef7d, type: 2} - m_InternalBundleIdMode: 1 - m_Compression: 1 - m_IncludeAddressInCatalog: 1 - m_IncludeGUIDInCatalog: 1 - m_IncludeLabelsInCatalog: 1 - m_InternalIdNamingMode: 0 - m_CacheClearBehavior: 0 - m_IncludeInBuild: 1 - m_BundledAssetProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider - m_ForceUniqueProvider: 0 - m_UseAssetBundleCache: 1 - m_UseAssetBundleCrc: 1 - m_UseAssetBundleCrcForCachedBundles: 1 - m_UseUWRForLocalBundles: 0 - m_Timeout: 0 - m_ChunkedTransfer: 0 - m_RedirectLimit: -1 - m_RetryCount: 0 - m_BuildPath: - m_Id: 2ae6a7549097a9b4caefe44b61b1fcc5 - m_LoadPath: - m_Id: 631ec5c677ab8084fb9be9b9ee39c6ef - m_BundleMode: 0 - m_AssetBundleProviderType: - m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider - m_BundleNaming: 0 - m_AssetLoadMode: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset.meta deleted file mode 100644 index a734284a0..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_BundledAssetGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2bcd0e1e759f58642bfebbbfb2675973 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset deleted file mode 100644 index 7440975f4..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3} - m_Name: Prefabs_ContentUpdateGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 2534b5778664d10419ffabfb1f40ef7d, type: 2} - m_StaticContent: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset deleted file mode 100644 index 44d3c45a6..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset +++ /dev/null @@ -1,17 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b1487f5d688e4f94f828f879d599dbdc, type: 3} - m_Name: Prefabs_PlayerDataGroupSchema - m_EditorClassIdentifier: - m_Group: {fileID: 11400000, guid: 2534b5778664d10419ffabfb1f40ef7d, type: 2} - m_IncludeResourcesFolders: 1 - m_IncludeBuildSettingsScenes: 1 diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset.meta b/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset.meta deleted file mode 100644 index 9627da3aa..000000000 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_PlayerDataGroupSchema.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e681af37b5cf1164eb54957a45d00347 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 000000000..1d01db0e5 --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,431 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset.meta b/Assets/AddressableAssetsData/link.xml.meta similarity index 52% rename from Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset.meta rename to Assets/AddressableAssetsData/link.xml.meta index 27e41072c..7332eeb5a 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Prefabs_ContentUpdateGroupSchema.asset.meta +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 72228f7d1b854a642aca5fbc9bc7488c -NativeFormatImporter: +guid: 9ce17989a00cc2d47b030c049ee88d0a +TextScriptImporter: externalObjects: {} - mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scenes/Instantiate.unity b/Assets/Scenes/Instantiate.unity index 1b855e7da..b4655ad88 100644 --- a/Assets/Scenes/Instantiate.unity +++ b/Assets/Scenes/Instantiate.unity @@ -123,6 +123,50 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &382250819 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 382250820} + - component: {fileID: 382250821} + m_Layer: 0 + m_Name: LogKit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &382250820 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382250819} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.7888997, y: -0.41116002, z: -0.009318121} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &382250821 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 382250819} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 647335bd723dab94ea97b993d03af61e, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1008334127 GameObject: m_ObjectHideFlags: 0 @@ -177,3 +221,4 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1008334128} + - {fileID: 382250820} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 81124b602..684614f89 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -9882,7 +9882,7 @@ MonoBehaviour: - {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} - {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} - {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} - runMode: 1 + runMode: 0 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: bd44f6c25aa17a4408e172d16b903176, type: 2} saveFileName: @@ -12812,7 +12812,6 @@ Transform: - {fileID: 1317294298} - {fileID: 1620453322} - {fileID: 369430730} - - {fileID: 1068968715} - {fileID: 1756469120} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13144,50 +13143,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1068968714 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1068968715} - - component: {fileID: 1068968716} - m_Layer: 0 - m_Name: Log Kit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1068968715 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1068968714} - serializedVersion: 2 - 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: 1009826577} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1068968716 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1068968714} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 647335bd723dab94ea97b993d03af61e, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1076102355 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Game Loop/InitialLoad.cs b/Assets/Scripts/Game Loop/InitialLoad.cs index 80b111108..37bd93542 100644 --- a/Assets/Scripts/Game Loop/InitialLoad.cs +++ b/Assets/Scripts/Game Loop/InitialLoad.cs @@ -7,7 +7,7 @@ namespace AibisDream { public AssetReference persistentScene; - private void Awake() + private void Start() { Addressables.LoadSceneAsync(persistentScene); } diff --git a/Packages/manifest.json b/Packages/manifest.json index ecb37f59b..3d1cb0791 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,6 +8,7 @@ "com.unity.ide.rider": "3.0.24", "com.unity.ide.visualstudio": "2.0.22", "com.unity.localization": "1.4.5", + "com.unity.profiling.core": "1.0.2", "com.unity.render-pipelines.universal": "14.0.8", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 41813f1e4..fa20cf88d 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -216,6 +216,13 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.profiling.core": { + "version": "1.0.2", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, "com.unity.render-pipelines.core": { "version": "14.0.8", "depth": 1, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 64541c556..bac74d3fc 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.2.2.7-20250512-182256 + bundleVersion: 0.2.2.13-20250514-223749 preloadedAssets: - {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2} metroInputSource: 0