1

2023-10-29 15:27:13 +08:00
parent c5f638d9d2
commit c7b6ddbf70
73 changed files with 2158 additions and 494 deletions
--- a/Assets/Artists/Scenes/DMZ.unity
+++ b/Assets/Artists/Scenes/DMZ.unity
@@ -1147,22 +1147,22 @@ PrefabInstance:
    - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e,
        type: 3}
      propertyPath: m_LocalPosition.x
-      value: 22.661001
+      value: 53.821
      objectReference: {fileID: 0}
    - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e,
        type: 3}
      propertyPath: m_LocalPosition.y
-      value: 2.1051528
+      value: 1.4299991
      objectReference: {fileID: 0}
    - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e,
        type: 3}
      propertyPath: m_LocalPosition.z
-      value: 21.766075
+      value: -62.513924
      objectReference: {fileID: 0}
    - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.7071068
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e,
        type: 3}
@@ -1172,7 +1172,7 @@ PrefabInstance:
    - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.7071068
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 3772777254845134042, guid: f25aeccf4aba96b43a20d93ee9fa4e6e,
        type: 3}
@@ -13822,7 +13822,7 @@ MeshFilter:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 310741521}
-  m_Mesh: {fileID: 499886243}
+  m_Mesh: {fileID: 1893400711}
 --- !u!23 &310741524
 MeshRenderer:
  m_ObjectHideFlags: 0
@@ -14049,8 +14049,8 @@ MonoBehaviour:
    m_AreaError: 15
  m_PreserveMeshAssetOnDestroy: 0
  assetGuid: 
-  m_Mesh: {fileID: 499886243}
-  m_VersionIndex: 599
+  m_Mesh: {fileID: 1893400711}
+  m_VersionIndex: 605
  m_IsSelectable: 1
  m_SelectedFaces: 
  m_SelectedEdges: []
@@ -24308,171 +24308,6 @@ MonoBehaviour:
  mr: {fileID: 497884692}
  mf: {fileID: 497884693}
  garbageCollectMesh: {fileID: 497884694}
--- !u!43 &499886243
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: pb_Mesh36434
-  serializedVersion: 11
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 24
-    topology: 0
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 9
-    localAABB:
-      m_Center: {x: -97.7142, y: 1.6801468e-15, z: 75.66708}
-      m_Extent: {x: 128, y: 0, z: 128}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 1
-  m_KeepIndices: 1
-  m_IndexFormat: 0
-  m_IndexBuffer: 000001000200010003000200010004000300040005000300020003000600030007000600030005000700050008000700
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 9
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 12
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 24
-      format: 0
-      dimension: 4
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 40
-      format: 0
-      dimension: 2
-    - stream: 0
-      offset: 48
-      format: 0
-      dimension: 2
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 504
-    _typelessdata: d6b661c37a22f226e85451c2000000000000803f000000000000803f0000000000000000000080bfd6b661c3e85451c217d7a33c0bd7a33cd6b661c37a22f2268c559742000000000000803f000000000000803f0000000000000000000080bfd6b661c38c5597426f32003f0bd7a33cac6dc3c27a22f226e85451c2000000000000803f000000000000803f0000000000000000000080bfac6dc3c2e85451c211d7a33c6232003fac6dc3c27a22f2268c559742000000000000803f000000000000803f0000000000000000000080bfac6dc3c28c5597426d32003f6332003fd6b661c37a22f226c6aa4b43000000000000803f000000000000803f0000000000000000000080bfd6b661c3c6aa4b431b467b3f0bd7a33cac6dc3c27a22f226c6aa4b43000000000000803f000000000000803f0000000000000000000080bfac6dc3c2c6aa4b431b467b3f6532003f5049f2417a22f226e85451c2000000000000803f000000000000803f0000000000000000000080bf5049f241e85451c20bd7a33c07467b3f5049f2417a22f2268c559742000000000000803f000000000000803f0000000000000000000080bf5049f2418c5597426b32003f07467b3f5049f2417a22f226c6aa4b43000000000000803f000000000000803f0000000000000000000080bf5049f241c6aa4b431b467b3f07467b3f
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: -97.7142, y: 1.6801468e-15, z: 75.66708}
-    m_Extent: {x: 128, y: 0, z: 128}
-  m_MeshUsageFlags: 0
-  m_CookingOptions: 30
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 70883.87
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!4 &505303611 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: -3983025326440498736, guid: b805b0f643b3776478b9ea3e6701ebb8,
@@ -38878,6 +38713,11 @@ PrefabInstance:
      propertyPath: m_LocalPosition.y
      value: 0.30000016
      objectReference: {fileID: 0}
+    - target: {fileID: 7328560627112153540, guid: f18510934c4581d47819abfbf1bd3647,
+        type: 3}
+      propertyPath: overrideIndex.allow
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -90414,6 +90254,171 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 1881821744}
  m_PrefabAsset: {fileID: 0}
+--- !u!43 &1893400711
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: pb_Mesh36450
+  serializedVersion: 11
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 24
+    topology: 0
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 9
+    localAABB:
+      m_Center: {x: -97.7142, y: 1.6801468e-15, z: 75.66708}
+      m_Extent: {x: 128, y: 0, z: 128}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 1
+  m_KeepIndices: 1
+  m_IndexFormat: 0
+  m_IndexBuffer: 000001000200010003000200010004000300040005000300020003000600030007000600030005000700050008000700
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 9
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 12
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 24
+      format: 0
+      dimension: 4
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 40
+      format: 0
+      dimension: 2
+    - stream: 0
+      offset: 48
+      format: 0
+      dimension: 2
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 504
+    _typelessdata: d6b661c37a22f226e85451c2000000000000803f000000000000803f0000000000000000000080bfd6b661c3e85451c217d7a33c0bd7a33cd6b661c37a22f2268c559742000000000000803f000000000000803f0000000000000000000080bfd6b661c38c5597426f32003f0bd7a33cac6dc3c27a22f226e85451c2000000000000803f000000000000803f0000000000000000000080bfac6dc3c2e85451c211d7a33c6232003fac6dc3c27a22f2268c559742000000000000803f000000000000803f0000000000000000000080bfac6dc3c28c5597426d32003f6332003fd6b661c37a22f226c6aa4b43000000000000803f000000000000803f0000000000000000000080bfd6b661c3c6aa4b431b467b3f0bd7a33cac6dc3c27a22f226c6aa4b43000000000000803f000000000000803f0000000000000000000080bfac6dc3c2c6aa4b431b467b3f6532003f5049f2417a22f226e85451c2000000000000803f000000000000803f0000000000000000000080bf5049f241e85451c20bd7a33c07467b3f5049f2417a22f2268c559742000000000000803f000000000000803f0000000000000000000080bf5049f2418c5597426b32003f07467b3f5049f2417a22f226c6aa4b43000000000000803f000000000000803f0000000000000000000080bf5049f241c6aa4b431b467b3f07467b3f
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: -97.7142, y: 1.6801468e-15, z: 75.66708}
+    m_Extent: {x: 128, y: 0, z: 128}
+  m_MeshUsageFlags: 0
+  m_CookingOptions: 30
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 70883.87
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!1001 &1893649403
 PrefabInstance:
  m_ObjectHideFlags: 0