1

2024-03-24 02:05:16 +08:00
parent bfc869d19e
commit 65d90d1bfa
48 changed files with 7433 additions and 7600 deletions
--- a/Assets/Artists/Scenes/Game/Prototype.unity
+++ b/Assets/Artists/Scenes/Game/Prototype.unity
@@ -6397,21 +6397,6 @@ Transform:
    type: 3}
  m_PrefabInstance: {fileID: 816584949}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &86906727
-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: 38a40404d9721ed4f984030fbce11d53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _snapMode: 0
-  _snapHalfSpace: 0
-  _projectionSettings: {fileID: 0}
 --- !u!1 &89002650 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 2163650356735849181, guid: 22c543a201d947146a7c654abeb26d98,
@@ -8449,7 +8434,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c8725edae6a1fd4408036dedaf0199f0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _projectionSettings: {fileID: 2111166064}
+  _projectionSettings: {fileID: 965462862}
  _dragAndDropGuide: {fileID: 0}
 --- !u!114 &115302397
 MonoBehaviour:
@@ -94445,7 +94430,7 @@ MonoBehaviour:
  _extensionPlane:
    _refOBBFace: 4
  _heightPatternDirection: 0
-  _modularSnapSession: {fileID: 86906727}
+  _modularSnapSession: {fileID: 238175696}
  _mirrorGizmo: {fileID: 1959357466}
 --- !u!1001 &153410394
 PrefabInstance:
@@ -100346,7 +100331,7 @@ MonoBehaviour:
  _spawnGuide: {fileID: 884730363}
  _extensionPlane:
    _refOBBFace: 4
-  _modularSnapSession: {fileID: 2001411255}
+  _modularSnapSession: {fileID: 853752117}
  _mirrorGizmo: {fileID: 839743558}
 --- !u!1001 &220243287
 PrefabInstance:
@@ -102741,6 +102726,21 @@ LODGroup:
    type: 3}
  m_PrefabInstance: {fileID: 237345578}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &238175696
+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: 38a40404d9721ed4f984030fbce11d53, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _snapMode: 0
+  _snapHalfSpace: 0
+  _projectionSettings: {fileID: 0}
 --- !u!1001 &239176628
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -183109,6 +183109,21 @@ LODGroup:
    type: 3}
  m_PrefabInstance: {fileID: 852708179}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &853752117
+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: 38a40404d9721ed4f984030fbce11d53, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _snapMode: 0
+  _snapHalfSpace: 0
+  _projectionSettings: {fileID: 0}
 --- !u!1001 &853780785
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -193755,6 +193770,26 @@ MeshFilter:
    type: 3}
  m_PrefabInstance: {fileID: 680140436}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &965462862
+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: 49490255aaf1a2641a4c5771511bd253, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _halfSpace: 1
+  _alignAxis: 0
+  _alignmentAxis: 1
+  _invertAlignmentAxis: 0
+  _projectAsUnit: 0
+  _embedInSurface: 1
+  _inFrontOffset: 0
+  _behindOffset: 0
 --- !u!1 &968144798 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 7973207174316545101, guid: 22c543a201d947146a7c654abeb26d98,
@@ -292275,21 +292310,6 @@ LODGroup:
    type: 3}
  m_PrefabInstance: {fileID: 1999326423}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &2001411255
-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: 38a40404d9721ed4f984030fbce11d53, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _snapMode: 0
-  _snapHalfSpace: 0
-  _projectionSettings: {fileID: 0}
 --- !u!1001 &2002551435
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -299349,26 +299369,6 @@ LODGroup:
    type: 3}
  m_PrefabInstance: {fileID: 2109597378}
  m_PrefabAsset: {fileID: 0}
--- !u!114 &2111166064
-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: 49490255aaf1a2641a4c5771511bd253, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _halfSpace: 1
-  _alignAxis: 0
-  _alignmentAxis: 1
-  _invertAlignmentAxis: 0
-  _projectAsUnit: 0
-  _embedInSurface: 1
-  _inFrontOffset: 0
-  _behindOffset: 0
 --- !u!114 &2113999988
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -302324,6 +302324,74 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 1c5b3b0f90030a348ad16d547555b6ed, type: 3}
+--- !u!1001 &4542829118475832762
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 935480025961191622, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_Name
+      value: C_Weapon_AG14W
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 4.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 1.25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5657658533248845528, guid: 5829de0aeadce7c4aaa9b8a4012f094f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5829de0aeadce7c4aaa9b8a4012f094f, type: 3}
 --- !u!1001 &5538350357718593118
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -303311,6 +303379,74 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5ac752afecd5c904a8deb1315e9e26b2, type: 3}
+--- !u!1001 &6366318134496113624
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.413417
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.053
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.896
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071069
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.7071067
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131865, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 163869565348131870, guid: 712f339c015b6714a9844d44aa58781d,
+        type: 3}
+      propertyPath: m_Name
+      value: W_Weapon_AG14W
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 712f339c015b6714a9844d44aa58781d, type: 3}
 --- !u!1001 &6776764175486762314
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -303786,6 +303922,31 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
+    - target: {fileID: -3864885991800363134, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -3864885991800363134, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7072289
+      objectReference: {fileID: 0}
+    - target: {fileID: -3864885991800363134, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7069847
+      objectReference: {fileID: 0}
+    - target: {fileID: -3864885991800363134, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -3864885991800363134, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1142242948647852272, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
        type: 3}
      propertyPath: m_LocalPosition.x
@@ -303836,25 +303997,55 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1785634203010394709, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.00000023841858
+      objectReference: {fileID: 0}
+    - target: {fileID: 1785634203010394709, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1785634203010394709, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 1785634203010394709, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 1785634203010394709, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.000000066204116
+      objectReference: {fileID: 0}
+    - target: {fileID: 1785634203010394709, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.000000066204116
+      objectReference: {fileID: 0}
    - target: {fileID: 3524257117718532098, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
        type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.707103
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3524257117718532098, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
        type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.00012572094
+      value: 0.000005335786
      objectReference: {fileID: 0}
    - target: {fileID: 3524257117718532098, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
        type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.00012585468
+      value: 0.00017283502
      objectReference: {fileID: 0}
    - target: {fileID: 3524257117718532098, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
        type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.7071105
+      value: -0.000005431274
      objectReference: {fileID: 0}
    - target: {fileID: 5595014166952478446, guid: 42735f645f8b39c4bb33ab4fc9b18e87,
        type: 3}
@@ -304124,8 +304315,10 @@ SceneRoots:
  - {fileID: 3226676016535163900}
  - {fileID: 5538350357718593118}
  - {fileID: 7592126978812975020}
-  - {fileID: 8421290716756459972}
  - {fileID: 1625301457}
  - {fileID: 350969201}
  - {fileID: 962310945}
  - {fileID: 2006923403}
+  - {fileID: 8421290716756459972}
+  - {fileID: 4542829118475832762}
+  - {fileID: 6366318134496113624}