Merge pull request 'feature/task-trace-ui' (#262) from feature/task-trace-ui into develop

Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/262
2026-03-20 03:19:00 +00:00
parent b0e3aa4b43 265dea6ff3
commit a91faac68f
7 changed files with 5992 additions and 83474 deletions
@@ -15,7 +15,7 @@ MonoBehaviour:
  m_DefaultGroup: 712e3991f28e549e7a56ee582a977810
  m_currentHash:
    serializedVersion: 2
-    Hash: 00000000000000000000000000000000
+    Hash: 8a2c01519b01b5b19d2c777e7e8cb407
  m_OptimizeCatalogSize: 0
  m_BuildRemoteCatalog: 0
  m_CatalogRequestsTimeout: 0
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/PerfectWorld/Editor.meta
-guid: 7b6ba20c81b136a4aac2dfea2b936886
-========
 guid: f0e041e8264a83545bf6e555757c9851
->>>>>>>> develop:Assets/PerfectWorld/Config.meta
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/PerfectWorld/Editor.meta
 guid: 75a0cc0fd8902794a883916febf9855b
-========
-guid: f0e041e8264a83545bf6e555757c9851
->>>>>>>> develop:Assets/PerfectWorld/Config.meta
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f27b014693fc74870b27e70d3a84df5896f540f9b0fcea076293e140e59bf0d
-size 326146
+oid sha256:58ea56ea9bd1248baed7bc2d59e55ad2d45640e3d603d47b640846610df16ae9
+size 319524
@@ -60,17 +60,7 @@ MonoBehaviour:
      - rid: 4799699690948919300
      - rid: 4799699690948919301
    m_RuntimeSettings:
-      m_List:
-      - rid: 6852985685364965378
-      - rid: 6852985685364965379
-      - rid: 6852985685364965380
-      - rid: 6852985685364965381
-      - rid: 6852985685364965384
-      - rid: 6852985685364965385
-      - rid: 6852985685364965392
-      - rid: 6852985685364965394
-      - rid: 8712630790384254976
-      - rid: 4799699690948919301
+      m_List: []
  m_AssetVersion: 8
  m_ObsoleteDefaultVolumeProfile: {fileID: 0}
  m_RenderingLayerNames: