fix after merge

2026-04-13 15:16:28 +07:00
parent 0a909af027
commit a9c3be19f1
5 changed files with 1385 additions and 1377 deletions
@@ -15,7 +15,7 @@ MonoBehaviour:
  m_DefaultGroup: 712e3991f28e549e7a56ee582a977810
  m_currentHash:
    serializedVersion: 2
-    Hash: 7485ec100318cf3e6317baa9f1a495cc
+    Hash: db533ac65b6617d021d553f17f8c3749
  m_OptimizeCatalogSize: 0
  m_BuildRemoteCatalog: 0
  m_CatalogRequestsTimeout: 0
@@ -20221,6 +20221,13 @@ MonoBehaviour:
    - equipment
    - models
    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: c451031ead54941afa5d10ce108ed6a1
+    m_Address: "models/npcs/\u602A\u7269/2013/\u82B1\u8C79/\u82B1\u8C79.ecm"
+    m_ReadOnly: 0
+    m_SerializedLabels:
+    - models
+    - npc
+    FlaggedDuringContentUpdateRestriction: 0
  - m_GUID: c45255d37f023481f9fc259525a06467
    m_Address: "models/weapons/\u4EBA\u7269/\u65F6\u88C5\u6B66\u5668/\u901A\u7528/2016\u718A\u732B\u5F29/2016\u718A\u732B\u5F29.ecm"
    m_ReadOnly: 0
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8a414fa4bf2b667449d449b25e39552f
+guid: c451031ead54941afa5d10ce108ed6a1
 PrefabImporter:
  externalObjects: {}
  userData: 
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8acb69bc58b3b383d9e8795f8fb9e18be2da3256801fc1a1e5fbee9096e2d40
-size 298567
+oid sha256:b013fb5e1a03c91240682019bd88c08a2e17ad520bb308d2ecec16cc03643250
+size 302199