1

2023-11-15 23:54:54 +08:00
parent ee3ecec6cb
commit 3c837a4a33
356 changed files with 73756 additions and 26493 deletions
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 468a46d0ae32c3544b7d98094e6448a9, type: 3}
  m_Name: AddressableAssetSettings
  m_EditorClassIdentifier: 
-  m_DefaultGroup: 54d7064a121281f4a8ba06d3199a5476
+  m_DefaultGroup: 16ca9e08e83789443b3a60954f2a42cd
  m_currentHash:
    serializedVersion: 2
    Hash: 00000000000000000000000000000000
@@ -25,7 +25,7 @@ MonoBehaviour:
  m_UniqueBundleIds: 0
  m_NonRecursiveBuilding: 1
  m_CCDEnabled: 0
-  m_maxConcurrentWebRequests: 500
+  m_maxConcurrentWebRequests: 3
  m_ContiguousBundles: 1
  m_StripUnityVersionFromBundleBuild: 0
  m_DisableVisibleSubAssetRepresentations: 0
@@ -35,14 +35,14 @@ MonoBehaviour:
  m_CheckForContentUpdateRestrictionsOption: 0
  m_MonoScriptBundleCustomNaming: 
  m_RemoteCatalogBuildPath:
-    m_Id: 
+    m_Id: 95d6b1c678db41745adaaa46dfd3c03c
  m_RemoteCatalogLoadPath:
-    m_Id: 
+    m_Id: 9bd34dadccc509c41b085e6fbde5dec5
  m_ContentStateBuildPathProfileVariableName: <default settings path>
  m_CustomContentStateBuildPath: 
  m_ContentStateBuildPath: 
-  m_BuildAddressablesWithPlayerBuild: 1
-  m_overridePlayerVersion: 
+  m_BuildAddressablesWithPlayerBuild: 0
+  m_overridePlayerVersion: '[UnityEditor.PlayerSettings.bundleVersion]'
  m_GroupAssets:
  - {fileID: 11400000, guid: 87d769cae72decb49ae8b587b63e6708, type: 2}
  - {fileID: 11400000, guid: 5e362fe4ed388fe4bb40ed971e432360, type: 2}
@@ -54,33 +54,33 @@ MonoBehaviour:
  m_ProfileSettings:
    m_Profiles:
    - m_InheritedParent: 
-      m_Id: d8be2aa71966abb408480268f9a2d618
+      m_Id: 1323c975916732f4ab588d3e45aa5c6b
      m_ProfileName: Default
      m_Values:
-      - m_Id: dc9af59d4c6f2e54dbd1cd8aea62348e
+      - m_Id: ae494299d072d614882e796fcd83d55a
        m_Value: '[UnityEditor.EditorUserBuildSettings.activeBuildTarget]'
-      - m_Id: e7ff03ec0d06d6c4cb1a7efd5c2d0588
+      - m_Id: 8d440f7eebf982c47b8606e1b6d940d0
        m_Value: '[UnityEngine.AddressableAssets.Addressables.BuildPath]/[BuildTarget]'
-      - m_Id: 45f44f3627373e546a3ac25410bae719
+      - m_Id: 2314eb250a08c674e96b14db966b4213
        m_Value: '{UnityEngine.AddressableAssets.Addressables.RuntimePath}/[BuildTarget]'
-      - m_Id: b1c313bac17f1e0498a997be974185f6
+      - m_Id: 95d6b1c678db41745adaaa46dfd3c03c
        m_Value: ServerData/[BuildTarget]
-      - m_Id: eddadb06422cc9741aebe554629af87f
+      - m_Id: 9bd34dadccc509c41b085e6fbde5dec5
        m_Value: http://[PrivateIpAddress]:[HostingServicePort]
    m_ProfileEntryNames:
-    - m_Id: dc9af59d4c6f2e54dbd1cd8aea62348e
+    - m_Id: ae494299d072d614882e796fcd83d55a
      m_Name: BuildTarget
      m_InlineUsage: 0
-    - m_Id: e7ff03ec0d06d6c4cb1a7efd5c2d0588
+    - m_Id: 8d440f7eebf982c47b8606e1b6d940d0
      m_Name: Local.BuildPath
      m_InlineUsage: 0
-    - m_Id: 45f44f3627373e546a3ac25410bae719
+    - m_Id: 2314eb250a08c674e96b14db966b4213
      m_Name: Local.LoadPath
      m_InlineUsage: 0
-    - m_Id: b1c313bac17f1e0498a997be974185f6
+    - m_Id: 95d6b1c678db41745adaaa46dfd3c03c
      m_Name: Remote.BuildPath
      m_InlineUsage: 0
-    - m_Id: eddadb06422cc9741aebe554629af87f
+    - m_Id: 9bd34dadccc509c41b085e6fbde5dec5
      m_Name: Remote.LoadPath
      m_InlineUsage: 0
    m_ProfileVersion: 1
@@ -101,7 +101,7 @@ MonoBehaviour:
  - {fileID: 11400000, guid: cfefc1f01d7f90c46ac50629cb702842, type: 2}
  - {fileID: 11400000, guid: 486ef9fffbe36494f8dcbf2c4e1cf0d8, type: 2}
  - {fileID: 11400000, guid: 2f8d3e29fa9112f478758db93c0907c2, type: 2}
-  m_ActiveProfileId: d8be2aa71966abb408480268f9a2d618
+  m_ActiveProfileId: 1323c975916732f4ab588d3e45aa5c6b
  m_HostingServicesManager:
    m_HostingServiceInfos: []
    m_Settings: {fileID: 11400000}
--- a/Assets/AddressableAssetsData/AssetGroupTemplates/Packed
+++ b/Assets/AddressableAssetsData/AssetGroupTemplates/Packed
@@ -1,6 +1,23 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3389063044265834269
+--- !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: 5072403568555974337}
+  - {fileID: 128558052286161285}
+  m_Description: Pack assets into asset bundles.
+  m_Settings: {fileID: 11400000, guid: 819d03717e2ae4f4a8216ff1ba94ff77, type: 2}
+--- !u!114 &128558052286161285
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@@ -14,7 +31,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Group: {fileID: 0}
  m_StaticContent: 0
--- !u!114 &-1264593036710535254
+--- !u!114 &5072403568555974337
 MonoBehaviour:
  m_ObjectHideFlags: 1
  m_CorrespondingSourceObject: {fileID: 0}
@@ -57,20 +74,3 @@ 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: -1264593036710535254}
-  - {fileID: -3389063044265834269}
-  m_Description: Pack assets into asset bundles.
-  m_Settings: {fileID: 0}
--- a/Assets/AddressableAssetsData/AssetGroups/Built
+++ b/Assets/AddressableAssetsData/AssetGroups/Built
@@ -15,16 +15,18 @@ MonoBehaviour:
  m_GroupName: Built In Data
  m_Data:
    m_SerializedData: []
-  m_GUID: 340f72e900270fa40a389ea98f9b6e78
+  m_GUID: fdffb8d004a80734dbd167690f1c0220
  m_SerializeEntries:
  - m_GUID: Resources
    m_Address: Resources
    m_ReadOnly: 1
    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: EditorSceneList
    m_Address: EditorSceneList
    m_ReadOnly: 1
    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
  m_ReadOnly: 1
  m_Settings: {fileID: 11400000, guid: 819d03717e2ae4f4a8216ff1ba94ff77, type: 2}
  m_SchemaSet:
--- a/Assets/AddressableAssetsData/AssetGroups/Default
+++ b/Assets/AddressableAssetsData/AssetGroups/Default
@@ -15,154 +15,14 @@ MonoBehaviour:
  m_GroupName: Default Local Group
  m_Data:
    m_SerializedData: []
-  m_GUID: 54d7064a121281f4a8ba06d3199a5476
+  m_GUID: 16ca9e08e83789443b3a60954f2a42cd
  m_SerializeEntries:
-  - m_GUID: f18510934c4581d47819abfbf1bd3647
-    m_Address: Entity
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: e5d265393747af741b4f5d719598831a
-    m_Address: IEntity
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 4cf1920e287c0234f9fa77937708ffe2
-    m_Address: Assets/Weapon_Glock
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5557f2edf7d8c4b43934c79878628d22
-    m_Address: Assets/Weapon_M4A1
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5ed1296c4cee5b542ae25542f7f39078
-    m_Address: Assets/Asset_AmmoBox
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: be94e0afa329e8540acffa49aea3087b
-    m_Address: Assets/Clip_NATO
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: 374b2f92905c4f147abf889c9aeb5aab
    m_Address: Services/Framework
    m_ReadOnly: 0
    m_SerializedLabels:
    - Services
    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 1451bf08b6fa9b74c943ab026ed03d92
-    m_Address: Assets/BITKit/Unity/Configs/AppSettings.asset
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: db3a3ef65dfcc6a48978a28e11bfc91e
-    m_Address: Maps/InitialScene
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 0aa8ba632b2bb3b4c992bae5b4a63d6c
-    m_Address: Assets/Dev_Backpack
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 2f9bfcf37bf33a244ab1bb48a37f304a
-    m_Address: Assets/Dev_BulletVest
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 8a2e296f2c4fc694cbc3aaa9ab680cf2
-    m_Address: Assets/Apple
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: e4cc5e8ee168e3a4d90c60f342327839
-    m_Address: Assets/Artists/Arts/Icons/akar-icons_file.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 9c4ca61090aabc441a24ecea89f99661
-    m_Address: Assets/Umbrella
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 92fb6c284112919459fbf4b136608625
-    m_Address: Assets/SelfReviveKit
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: d100e877e0497d94b96f507137a25704
-    m_Address: Assets/HealthPack.asset
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ddc01854d2b3d9348a9803ad08ae5396
-    m_Address: Assets/Improvised_DEV_Item.asset
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 3bf9ee656b609f94faffb9d52a5334c0
-    m_Address: Assets/Improvised_AmmoBox
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 2dee481995db18f4f833cba844c60c01
-    m_Address: Maps/DMZ
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f061a2b905ec27b4ab419e07bb529c7f
-    m_Address: Assets/Watermelon
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 9bba7152a5d65c049b17a8461ad4e844
-    m_Address: Assets/TacticalKnife
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 220746f56523829498b8b83d62365cc7
-    m_Address: Assets/BodyPlate
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: beaccfe60f8582e4895457499e18b12c
-    m_Address: Assets/Grenade
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 2830d77b981a3a3489bda2a3c4fba460
-    m_Address: Assets/Soda
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5e50b5a1c5542da46b92f4cf7bbd5043
-    m_Address: Assets/Throwing Knife
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 1f69b8202d0d9fc4aa50a06f24e46266
-    m_Address: Assets/RiotShield
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 5c044445ab4b827488db67ee5b7aedc5
-    m_Address: Assets/Weapon_AWP
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: de7344e90b711ec45a4764294a1f6c80
-    m_Address: Cosmetics/Steve
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 43354319a89aa5e42afc30b631405f76
-    m_Address: Cosmetics/6C
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
  m_ReadOnly: 0
  m_Settings: {fileID: 11400000, guid: 819d03717e2ae4f4a8216ff1ba94ff77, type: 2}
  m_SchemaSet:
--- a/Assets/AddressableAssetsData/AssetGroups/Schemas/Default
+++ b/Assets/AddressableAssetsData/AssetGroups/Schemas/Default
@@ -34,9 +34,9 @@ MonoBehaviour:
  m_RedirectLimit: -1
  m_RetryCount: 0
  m_BuildPath:
-    m_Id: e7ff03ec0d06d6c4cb1a7efd5c2d0588
+    m_Id: 8d440f7eebf982c47b8606e1b6d940d0
  m_LoadPath:
-    m_Id: 45f44f3627373e546a3ac25410bae719
+    m_Id: 2314eb250a08c674e96b14db966b4213
  m_BundleMode: 0
  m_AssetBundleProviderType:
    m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null