tron_wz/BallCrushBest_GP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1、替换资源。2、修复bug

Browse Source
This commit is contained in:
barry
2026-05-07 16:34:30 +08:00
parent 28d582c373
commit 1599bf4bbb
53 changed files with 18601 additions and 18653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/AddressableAssetsData/AddressableAssetSettings.asset
+15 -58
View File
@@ -12,10 +12,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
m_Name: AddressableAssetSettings
m_EditorClassIdentifier:
m_DefaultGroup: 9cae04e535f0d3c45bfbaa55643de377
m_DefaultGroup: 5d6000c899c044540be84ae744f6c9c7
m_currentHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
Hash: 5382035780acf120c13630537c6e1994
m_OptimizeCatalogSize: 0
m_BuildRemoteCatalog: 0
m_BundleLocalCatalog: 0
@@ -44,51 +44,8 @@ MonoBehaviour:
m_BuildAddressablesWithPlayerBuild: 0
m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
m_GroupAssets:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: 902fafad9bba93345b7a8d95737094ff, type: 2}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: 0835c4975fed7d14795ec925b54bca80, type: 2}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: 902fafad9bba93345b7a8d95737094ff, type: 2}
m_BuildSettings:
m_CompileScriptsInVirtualMode: 0
m_CleanupStreamingAssetsAfterBuilds: 1
@@ -97,33 +54,33 @@ MonoBehaviour:
m_ProfileSettings:
m_Profiles:
- m_InheritedParent:
m_Id: 152775f6d0a74074e85a5281bfe5db55
m_Id: 7a079d7710185274ab7d13e489a4a889
m_ProfileName: Default
m_Values:
- m_Id: 1f696628cbefed347a16810a51d835b5
- m_Id: 2379324a9dbfdff4ab129b76b7fc802e
m_Value: ServerData/[BuildTarget]
- m_Id: b8087c341d8647943b27e5a4ff472c46
- m_Id: 455d07245fff52c4eb67008a9d040ac1
m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
- m_Id: c977b754259745946ab13aa5f4466479
- m_Id: 540fd149213db6d4292c8b820771c2fe
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Id: d9da4990edc9217429404d9e3caa97bc
- m_Id: 8492a38222767584fb12bed427f75488
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_Id: f509d39e2c54ef142810271523f3027a
- m_Id: 8fa9176799834c142a6be75b8fe369b5
m_Value: http://[PrivateIpAddress]:[HostingServicePort]
m_ProfileEntryNames:
- m_Id: 1f696628cbefed347a16810a51d835b5
- m_Id: 2379324a9dbfdff4ab129b76b7fc802e
m_Name: Remote.BuildPath
m_InlineUsage: 0
- m_Id: b8087c341d8647943b27e5a4ff472c46
- m_Id: 455d07245fff52c4eb67008a9d040ac1
m_Name: BuildTarget
m_InlineUsage: 0
- m_Id: c977b754259745946ab13aa5f4466479
- m_Id: 540fd149213db6d4292c8b820771c2fe
m_Name: Local.BuildPath
m_InlineUsage: 0
- m_Id: d9da4990edc9217429404d9e3caa97bc
- m_Id: 8492a38222767584fb12bed427f75488
m_Name: Local.LoadPath
m_InlineUsage: 0
- m_Id: f509d39e2c54ef142810271523f3027a
- m_Id: 8fa9176799834c142a6be75b8fe369b5
m_Name: Remote.LoadPath
m_InlineUsage: 0
m_ProfileVersion: 1
@@ -144,7 +101,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: c1b22d2e9c442004aa8ce9415342d39b, type: 2}
- {fileID: 11400000, guid: 09b58a3e361fb894bb05487b13037296, type: 2}
- {fileID: 11400000, guid: 451c87b652b66324b93ed04ca22c9f79, type: 2}
m_ActiveProfileId: 152775f6d0a74074e85a5281bfe5db55
m_ActiveProfileId: 7a079d7710185274ab7d13e489a4a889
m_HostingServicesManager:
m_HostingServiceInfos: []
m_Settings: {fileID: 11400000}
Assets/AddressableAssetsData/Android/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset
+32 -32
View File
@@ -1,37 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2156928426558884668
MonoBehaviour:
m_ObjectHideFlags: 1
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: ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 0}
m_StaticContent: 0
--- !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: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3}
m_Name: Packed Assets
m_EditorClassIdentifier:
m_SchemaObjects:
- {fileID: 871980969697864702}
- {fileID: -2156928426558884668}
m_Description: Pack assets into asset bundles.
m_Settings: {fileID: 11400000, guid: e60983ba8459aa349988c3ecb65abf31, type: 2}
--- !u!114 &871980969697864702
--- !u!114 &-5544940560689893398
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
@@ -74,3 +43,34 @@ MonoBehaviour:
m_ClassName:
m_BundleNaming: 0
m_AssetLoadMode: 0
--- !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: 1a3c5d64ac83548c09dd1678b9f6f1cd, type: 3}
m_Name: Packed Assets
m_EditorClassIdentifier:
m_SchemaObjects:
- {fileID: -5544940560689893398}
- {fileID: 2340393958889064399}
m_Description: Pack assets into asset bundles.
m_Settings: {fileID: 11400000, guid: e60983ba8459aa349988c3ecb65abf31, type: 2}
--- !u!114 &2340393958889064399
MonoBehaviour:
m_ObjectHideFlags: 1
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: ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 0}
m_StaticContent: 0
Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
+14 -3
View File
@@ -15,9 +15,20 @@ MonoBehaviour:
m_GroupName: Built In Data
m_Data:
m_SerializedData: []
m_GUID: e4d511c746a226749ae011a285d1c84b
m_SerializeEntries: []
m_GUID: 4ff006ef0268d824aa1b04ef0cad7eb3
m_SerializeEntries:
- m_GUID: EditorSceneList
m_Address: EditorSceneList
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: Resources
m_Address: Resources
m_ReadOnly: 1
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: e60983ba8459aa349988c3ecb65abf31, type: 2}
m_SchemaSet:
m_Schemas: []
m_Schemas:
- {fileID: 11400000, guid: 20981212fe0549c4f8f7200e0ce3f519, type: 2}
Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
+1 -1
View File
@@ -15,7 +15,7 @@ MonoBehaviour:
m_GroupName: Default Local Group
m_Data:
m_SerializedData: []
m_GUID: 13bbda2ba8616344099596719f5e08b7
m_GUID: 5d6000c899c044540be84ae744f6c9c7
m_SerializeEntries:
- m_GUID: 2286bdb9423d4da48ba3b1bd8765173f
m_Address: Assets/Configs
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_BundledAssetGroupSchema.asset
+3 -3
View File
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e5d17a21594effb4e9591490b009e7aa, type: 3}
m_Name: Default Local Group_BundledAssetGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 0}
m_Group: {fileID: 11400000, guid: 902fafad9bba93345b7a8d95737094ff, type: 2}
m_InternalBundleIdMode: 1
m_Compression: 1
m_IncludeAddressInCatalog: 1
@@ -34,9 +34,9 @@ MonoBehaviour:
m_RedirectLimit: -1
m_RetryCount: 0
m_BuildPath:
m_Id: c977b754259745946ab13aa5f4466479
m_Id: 540fd149213db6d4292c8b820771c2fe
m_LoadPath:
m_Id: d9da4990edc9217429404d9e3caa97bc
m_Id: 8492a38222767584fb12bed427f75488
m_BundleMode: 0
m_AssetBundleProviderType:
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
Assets/AddressableAssetsData/AssetGroups/Schemas/Default Local Group_ContentUpdateGroupSchema.asset
+1 -1
View File
@@ -12,5 +12,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5834b5087d578d24c926ce20cd31e6d6, type: 3}
m_Name: Default Local Group_ContentUpdateGroupSchema
m_EditorClassIdentifier:
m_Group: {fileID: 0}
m_Group: {fileID: 11400000, guid: 902fafad9bba93345b7a8d95737094ff, type: 2}
m_StaticContent: 0
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
-34
View File
@@ -1,34 +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: 7e3976da977cb49238499ea3b4c237ae, type: 3}
m_Name: ProfileDataSourceSettings
m_EditorClassIdentifier:
profileGroupTypes:
- m_GroupTypePrefix: Built-In
m_Variables:
- m_Suffix: BuildPath
m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
- m_Suffix: LoadPath
m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
- m_GroupTypePrefix: Editor Hosted
m_Variables:
- m_Suffix: BuildPath
m_Value: ServerData/[BuildTarget]
- m_Suffix: LoadPath
m_Value: http://[PrivateIpAddress]:[HostingServicePort]
environments: []
currentEnvironment:
id:
projectId:
projectGenesisId:
name:
isDefault: 0
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 59f7c3bb2d35146c88dfedf2004a8ae7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/iOS.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 5bfa34159f4e04a2ea6d4dfe3e8b6d20
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/AddressableAssetsData/iOS/addressables_content_state.bin
BIN
View File
Binary file not shown.
Assets/AddressableAssetsData/link.xml
+15
View File
@@ -0,0 +1,15 @@
<linker>
<assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
</assembly>
<assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
<type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
</assembly>
<assembly fullname="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<type fullname="UnityEngine.TextAsset" preserve="all" />
</assembly>
</linker>
Assets/AddressableAssetsData/iOS/addressables_content_state.bin.meta → Assets/AddressableAssetsData/link.xml.meta
+2 -2
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 4f19e96eadc3e43dbb13df5c92fa4385
DefaultImporter:
guid: b10c0e7d9a6ff7744bddfca54513995e
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName: