兼容yooassets打包

.gitignore

@@ -91,3 +91,4 @@ ProjectNLD/ServerData/
 /ProjectNLD/Assets/Editor/SkillEditor/Temp.meta
 /ProjectNLD/.cache.meta
 ProjectNLD/Packages/packages-lock.json
+ProjectNLD/Bundles

ProjectNLD/Assets/AssetBundleCollectorSetting.asset

@@ -29,32 +29,16 @@ MonoBehaviour:
       AssetTags: 
       ActiveRuleName: EnableGroup
       Collectors:
-      - CollectPath: Assets/Config/Skills/LogicAssets
-        CollectorGUID: f60185331602b97459ef8fe8cd079c29
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
       - CollectPath: Assets/_Test/Prefab
         CollectorGUID: c9ef3e8404ba50a48b29e92ee09d5adc
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectPrefab
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/Level/Prefabs
+      - CollectPath: Assets/Code/Shaders/Others
-        CollectorGUID: 5c0de98d7bbc68e4e9ea44e83704ebfb
+        CollectorGUID: 1358feeac4fbf47cc9f498133fa41cb0
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Code/Shaders
-        CollectorGUID: 5e0174bcfd1e74824a2f013d3883ddb3
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
@@ -85,14 +69,6 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/Audio/Music
-        CollectorGUID: ae16d689a4bed45699e4a0e9adbeaa6c
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
       - CollectPath: Assets/Art/Story
         CollectorGUID: 234645d518fef62469217e687c427c0f
         CollectorType: 0
@@ -101,8 +77,8 @@ MonoBehaviour:
         FilterRuleName: CollectScene
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/Art/Character/Models/Emoji
+      - CollectPath: Assets/Art/Character/Models/Emoji/G_emoji.FBX
-        CollectorGUID: a0e952f5df4f0bc48b7c7adce81933a5
+        CollectorGUID: 4ca7c7d64cdf7bb40b387d55552d3b55
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
@@ -125,8 +101,16 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
-      - CollectPath: Assets/Art/Character
+      - CollectPath: Assets/Code/Shaders/Scene
-        CollectorGUID: 3ad3b03f874313145b62c1fb4f01ca85
+        CollectorGUID: 69c9752657872e148a1197571561940e
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
+      - CollectPath: Assets/Code/Shaders/UI
+        CollectorGUID: a7a1d6ebb9857488780766500948fc13
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
@@ -418,7 +402,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectScene
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Scenes/TeamEdit
@@ -426,7 +410,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectScene
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Scenes/UI_InterfacePreview
@@ -434,7 +418,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectScene
         AssetTags: 
         UserData: 
       - CollectPath: Assets/Scenes/CampScene.unity
@@ -450,23 +434,7 @@ MonoBehaviour:
         CollectorType: 0
         AddressRuleName: AddressByFileName
         PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
+        FilterRuleName: CollectScene
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Scenes/ObjectPostProcessData.asset
-        CollectorGUID: d4ab67b80d948f842a6f2561f4857870
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-        UserData: 
-      - CollectPath: Assets/Scenes/UI/UI_LevelSelect.unity
-        CollectorGUID: 41ead528103b07b4e903b107a8d25bcc
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
     - GroupName: SplitCharacter
@@ -507,7 +475,7 @@ MonoBehaviour:
         CollectorGUID: c066e71b78bdd624baa4fa0a3455de4d
         CollectorType: 0
         AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
+        PackRuleName: PackSeparately
         FilterRuleName: CollectScene
         AssetTags: 
         UserData: 

ProjectNLD/Assets/Code/Scripts/Gameplay/GamePlay.asmdef

@@ -27,7 +27,8 @@
         "GUID:e8754b6153389406c963cd52996cc80f",
         "GUID:800597811bcc5d848b15e12807d6de45",
         "GUID:bcac77c69988a534c80a8944582b8784",
-        "GUID:f0b582ec4932c478892e6a09e09a6453"
+        "GUID:f0b582ec4932c478892e6a09e09a6453",
+        "GUID:a57549a73a7740d48803470f3282422f"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

ProjectNLD/Assets/Code/Scripts/Gameplay/Level/LevelEditor.cs

@@ -2,6 +2,7 @@ using System.Diagnostics;
 using System.IO;
 using Framework;
 using Gameplay.Level;
+using PhxhSDK.AOT;
 using PhxhSDK.Phxh;
 using Sirenix.OdinInspector;
 #if UNITY_EDITOR
@@ -91,6 +92,8 @@ public class LevelEditor : MonoBehaviour
 
     private void OnDestroy()
     {
+        if (YooAssetBuildStatus.isInBuild)
+            return;
         SaveLevelData();
     }
     

ProjectNLD/Assets/Code/Scripts/Gameplay/Map/MapManager.cs

@@ -6,6 +6,7 @@ using Framework;
 using Gameplay;
 using LC.Newtonsoft.Json;
 using PhxhSDK;
+using PhxhSDK.AOT;
 using PhxhSDK.Phxh;
 using TGS;
 #if UNITY_EDITOR
@@ -185,6 +186,8 @@ public class MapManager : MonoBehaviour
 
     private void OnDestroy()
     {
+        if (YooAssetBuildStatus.isInBuild)
+            return;
         if (!Application.isPlaying)
             SaveMapData();
     }

ProjectNLD/Assets/Level/Prefabs/OutlineManager.prefab

@@ -24,13 +24,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7634362330663976980}
+  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: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &8717321545212238032
 MonoBehaviour:

ProjectNLD/Assets/PhxhSDK

@@ -1 +1 @@
-Subproject commit e3e4863dcf2694f5e82f509fcaa107c0ebb2ef06
+Subproject commit be8bdf601ac879f043565447a322acbaf59e0a12

ProjectNLD/Assets/Scenes/ObjectPostProcessData.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 45036debb58c5d1489e2ea8d2543d44f, type: 3}
-  m_Name: ObjectPostProcessData
+  m_Name: Assets/Scenes/ObjectPostProcessData.asset
   m_EditorClassIdentifier: 
   serializationData:
     SerializedFormat: 2