diff --git a/Assets/DC/地形/定西市安定区万达广场 (新).prefab b/Assets/DC/地形/定西市安定区万达广场 (新).prefab
new file mode 100644
index 00000000..5ad4d169
--- /dev/null
+++ b/Assets/DC/地形/定西市安定区万达广场 (新).prefab
@@ -0,0 +1,67 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &7006527841038631881
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -3901992563441801604, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
+ - target: {fileID: -3119236414387510727, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
+ - target: {fileID: 919132149155446097, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ propertyPath: m_Name
+ value: "\u5B9A\u897F\u5E02\u5B89\u5B9A\u533A\u4E07\u8FBE\u5E7F\u573A (1)"
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
diff --git a/Assets/DC/地形/定西市安定区万达广场 (新).prefab.meta b/Assets/DC/地形/定西市安定区万达广场 (新).prefab.meta
new file mode 100644
index 00000000..c857aeb9
--- /dev/null
+++ b/Assets/DC/地形/定西市安定区万达广场 (新).prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: be5cd1f0d4f38884daaac5a9ceea805d
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/DC/地形/定西市安定区万达广场.fbx b/Assets/DC/地形/定西市安定区万达广场.fbx
index 46b77f0b..0a2c8ba1 100644
Binary files a/Assets/DC/地形/定西市安定区万达广场.fbx and b/Assets/DC/地形/定西市安定区万达广场.fbx differ
diff --git a/Assets/DC/地形/定西市安定区万达广场.prefab b/Assets/DC/地形/定西市安定区万达广场.prefab
index 5e036762..63d8baba 100644
--- a/Assets/DC/地形/定西市安定区万达广场.prefab
+++ b/Assets/DC/地形/定西市安定区万达广场.prefab
@@ -1,67 +1,201 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1001 &1566118010466913162
-PrefabInstance:
+--- !u!1 &1835940161686730459
+GameObject:
m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1310900937652808801}
+ m_Layer: 0
+ m_Name: "\u5B9A\u897F\u5E02\u5B89\u5B9A\u533A\u4E07\u8FBE\u5E7F\u573A"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1310900937652808801
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1835940161686730459}
serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalPosition.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -8679921383154817045, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: -3901992563441801604, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
- - target: {fileID: 919132149155446097, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_Name
- value: "\u5B9A\u897F\u5E02\u5B89\u5B9A\u533A\u4E07\u8FBE\u5E7F\u573A"
- objectReference: {fileID: 0}
- - target: {fileID: 4495414801083549842, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+ 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:
+ - {fileID: 715299686389513473}
+ - {fileID: 720686120153289658}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2545490763832357782
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 715299686389513473}
+ - component: {fileID: 8033752919574444632}
+ - component: {fileID: 6657074958791683574}
+ m_Layer: 0
+ m_Name: pPlane1
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &715299686389513473
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2545490763832357782}
+ 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: 1310900937652808801}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8033752919574444632
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2545490763832357782}
+ m_Mesh: {fileID: 7629811779324647873, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+--- !u!23 &6657074958791683574
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2545490763832357782}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 2bb3eed0404231447a5670edef51ff1c, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &2992554294815235206
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 720686120153289658}
+ - component: {fileID: 8818330717668759214}
+ - component: {fileID: 319935305727549258}
+ m_Layer: 0
+ m_Name: pPlane3
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &720686120153289658
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2992554294815235206}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: -0, y: 3, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1310900937652808801}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &8818330717668759214
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2992554294815235206}
+ m_Mesh: {fileID: 3680687292192122401, guid: 2dbe514b5bae671408e0e54be60abea8, type: 3}
+--- !u!23 &319935305727549258
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2992554294815235206}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: fb8c6fc9a9a57a04aa81ead6f0796e95, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
diff --git a/Assets/_Zombie/Scenes/Chongqing_Yuzhong_Hongyadong_Xiakexing.unity b/Assets/_Zombie/Scenes/Chongqing_Yuzhong_Hongyadong_Xiakexing.unity
index 615df80b..cd577709 100644
--- a/Assets/_Zombie/Scenes/Chongqing_Yuzhong_Hongyadong_Xiakexing.unity
+++ b/Assets/_Zombie/Scenes/Chongqing_Yuzhong_Hongyadong_Xiakexing.unity
@@ -4944,79 +4944,6 @@ MonoBehaviour:
soundPlayedCustomEvent:
willCleanUpDelegatesAfterStop: 1
frames: 586
---- !u!1001 &588361532
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 2576797403649593226, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_Name
- value: "\u91CD\u5E86\u5C0F\u5403\u8857"
- objectReference: {fileID: 0}
- - target: {fileID: 2576797403649593226, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalPosition.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalPosition.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 6527413236036070551, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be,
- type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: ff4d9d6bd3dd3b8499036a8b8cdab8be, type: 3}
--- !u!1 &596881789
GameObject:
m_ObjectHideFlags: 0
@@ -6582,7 +6509,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
- lastTimeMaxDistanceCalced: 638996894520766679
+ lastTimeMaxDistanceCalced: 639083928906530551
--- !u!1 &679496949
GameObject:
m_ObjectHideFlags: 0
@@ -13256,6 +13183,9 @@ MonoBehaviour:
BGMState: {fileID: 541392504}
Version: 1.0.0
place: 42
+ curGameTime: 0
+ gameId: 0
+ vistAllTime: 900
enemyStartPos:
- {fileID: 1304609849}
- {fileID: 384658304}
@@ -17504,6 +17434,50 @@ Transform:
- {fileID: 1710131522}
m_Father: {fileID: 370075175}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+--- !u!1 &1904276041
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1904276043}
+ - component: {fileID: 1904276042}
+ m_Layer: 0
+ m_Name: HttpServer
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1904276042
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1904276041}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8a0de683bcf8bae408b2ed43e059e04d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &1904276043
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1904276041}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -4.1133337, y: -2.4171302, z: 4.7665505}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1921789634
GameObject:
m_ObjectHideFlags: 0
@@ -19602,4 +19576,4 @@ SceneRoots:
- {fileID: 1611275467}
- {fileID: 1055672620}
- {fileID: 777046512}
- - {fileID: 588361532}
+ - {fileID: 1904276043}
diff --git a/Assets/_Zombie/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity b/Assets/_Zombie/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
index cfbe9cea..bd2cf4fc 100644
--- a/Assets/_Zombie/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
+++ b/Assets/_Zombie/Scenes/Gansu_Dingxi_Anding_WandaGuangchang.unity
@@ -382,7 +382,7 @@ PrefabInstance:
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: -0.0000004779538
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
@@ -392,42 +392,42 @@ PrefabInstance:
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalPosition.z
- value: 0
+ value: 0.0000008590101
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalRotation.w
- value: 0.70709383
+ value: 0.706741
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalRotation.x
- value: -0.0042762305
+ value: 0.022740899
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalRotation.y
- value: -0.0042762305
+ value: -0.03128713
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalRotation.z
- value: -0.70709383
+ value: -0.7064143
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
- value: -0.693
+ value: -0.691
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 0
+ value: -4.379
objectReference: {fileID: 0}
- target: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
- value: -90
+ value: -89.947
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
@@ -3687,7 +3687,7 @@ Transform:
m_GameObject: {fileID: 450657584}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -9.25, y: 0, z: 1.38}
+ m_LocalPosition: {x: -9.93, y: 0, z: 3.46}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -4060,14 +4060,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 466215207}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: -0.63, y: 0, z: -5.43}
+ m_LocalRotation: {x: -0, y: 0.80521667, z: -0, w: 0.5929806}
+ m_LocalPosition: {x: -0.75262034, y: 0, z: -5.4478188}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 710314433}
m_Father: {fileID: 370075175}
- m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 107.262, z: 0}
--- !u!1 &495846439
GameObject:
m_ObjectHideFlags: 0
@@ -6718,7 +6718,7 @@ MonoBehaviour:
IncludeChildColliders: 0
RuntimeFollower: {fileID: 0}
colliderMaxDistance: 100
- lastTimeMaxDistanceCalced: 639081507281680672
+ lastTimeMaxDistanceCalced: 639090099493943176
--- !u!1 &679496949
GameObject:
m_ObjectHideFlags: 0
@@ -7676,14 +7676,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 793457652}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: 7.94, y: 0, z: -4.69}
+ m_LocalRotation: {x: -0, y: 0.7833179, z: -0, w: 0.6216213}
+ m_LocalPosition: {x: 7.81, y: 0, z: -6.35}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 704269623}
m_Father: {fileID: 370075175}
- m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 103.131, z: 0}
--- !u!1 &793536193
GameObject:
m_ObjectHideFlags: 0
@@ -8611,6 +8611,84 @@ MonoBehaviour:
soundPlayedCustomEvent:
willCleanUpDelegatesAfterStop: 1
frames: 178
+--- !u!1001 &904391889
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 929060893691511981, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.01
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7401268576394634274, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7925568034942697112, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_Name
+ value: "\u5B9A\u897F\u5E02\u5B89\u5B9A\u533A\u4E07\u8FBE\u5E7F\u573A (\u65B0)"
+ objectReference: {fileID: 0}
+ - target: {fileID: 7925568034942697112, guid: be5cd1f0d4f38884daaac5a9ceea805d,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: be5cd1f0d4f38884daaac5a9ceea805d, type: 3}
--- !u!1 &922782298
GameObject:
m_ObjectHideFlags: 0
@@ -8945,7 +9023,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
version: 1073741824
data:
- dataString: UEsDBBQAAAgIAABAIeypcfXKwgIAAP8FAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVNtu4jAQ/RXk520Vrgv7tguU7kNbVLrqw9IH154QC2NHvhRoxb937DgkpRJSwpkzM2du+SBC2RKY02ZhBL/THMivDgnv5EenMd7CgW60Wol3qDnPgrsikGjkPFInNOLd4Gb1DpwR7LfayEDOEPRK5Nrs5nwDU22dRTin0gKajHbBWyH00SGH5HBMz/fw7JzwjYFyYBrW1eR60h8NxoMLdu8662fZeBSdvGKS7krgQXzjO6hTDCJLYVWJECpgWkphkyTijmUseUpL67EgJHBBscQoJrse9hApQGwKF///HLVDPOS5BZfkGXqcCYP9qmKTP7pq4o7abSXujUofsg17VdFV3Ltv9lElPDd6d1un7mYhhysE2z7SI6PWtbrchmeN/G7s0Z7KLX2V8FyAutcLo73iaHTGB1dvoTdrhTrXNi2AbRtepbUGa7Yvvw+22wz2FMs/rByU50KyBvtnwa6kjhNIaYIlIZPABIPT+4vlxC2yyR/RIBH9n+imvW7JcCOMdWhKahIauEscEHBQDFLbrwJBBXGv2psQi8yj0tAL76baKIhwEliCotIdlxjRXW7Aha2l68JyQ8PlJXXJVh/UhUuEG36WXZiWen+etcENtnGt67f/L2EEttD7O7DFg3dSqFa3g+EeGzzVSlWL225m7bbyJqes5ebg4LyBGXU0ZkM5uF+87Yq9jB7KSxlWORYQFWEB4fcS+ltQzCsjTO61iuf35Rnlb7zgXw+EdMf90ZiOhlmXZyyjkyvGcz7OWN4fQt5nr0MSL0gobDeVy6pfaUq4XaqpReG11N/FzsLQMt4sN3S/EO873Zq8ULleMQOgHqoI52LBYBL8wvA5F1jmCpwTKu4l+VgTqdkW+PocaB0bOz84Q9dNlDUpxZt2AVmTafwarkmAzweJq/smYB+SfwkGEkcH/ElI2NEymLITOX0CUEsDBBQAAAgIAABAIezOMuSTbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1DPTUVBKL0osyCgGChiCOKWZKSB2tJKhhbGZRaKZqYFhikGyQaKlbnJKWoqFQXKasWlqmnFykqlSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEAh7Klx9crCAgAA/wUAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEAh7M4y5JNsAAAAdwAAAAkAJAAAAAAAAAAAAAAADwMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADGAwAAAAA=
+ dataString: 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
file_cachedStartup: {fileID: 0}
cacheStartup: 0
showNavGraphs: 1
@@ -10524,7 +10602,7 @@ Transform:
m_GameObject: {fileID: 1128989867}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -3.85, y: 0, z: 2.03}
+ m_LocalPosition: {x: -3.93, y: 0, z: 2.52}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -10555,7 +10633,7 @@ Transform:
m_GameObject: {fileID: 1134898387}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 1.34, y: 0, z: 2.07}
+ m_LocalPosition: {x: -1.51, y: 0, z: 2.21}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -11858,14 +11936,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1210144712}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: -7.59, y: 0, z: -4.42}
+ m_LocalRotation: {x: -0, y: 0.78731644, z: -0, w: 0.6165492}
+ m_LocalPosition: {x: -7.35, y: 0, z: -3.62}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 460481084}
m_Father: {fileID: 370075175}
- m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 103.871, z: 0}
--- !u!1 &1222892242
GameObject:
m_ObjectHideFlags: 0
@@ -12051,7 +12129,7 @@ PrefabInstance:
- target: {fileID: 337092405917022302, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: -30.16
+ value: -39.09
objectReference: {fileID: 0}
- target: {fileID: 337092405917022302, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12083,11 +12161,31 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
+ - target: {fileID: 354597054662814706, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -34.316
+ objectReference: {fileID: 0}
+ - target: {fileID: 354597054662814706, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 20.408
+ objectReference: {fileID: 0}
- target: {fileID: 423588221690774864, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 450017125828305970, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -29.85
+ objectReference: {fileID: 0}
+ - target: {fileID: 450017125828305970, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 21.865
+ objectReference: {fileID: 0}
- target: {fileID: 487001906069696619, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
@@ -12201,12 +12299,12 @@ PrefabInstance:
- target: {fileID: 1495464198880509391, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: -6.92
+ value: -9.07
objectReference: {fileID: 0}
- target: {fileID: 1495464198880509391, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.z
- value: 18.29
+ value: 20.54
objectReference: {fileID: 0}
- target: {fileID: 1602720775977923181, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12246,7 +12344,7 @@ PrefabInstance:
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: 10.03
+ value: 7.246641
objectReference: {fileID: 0}
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12256,27 +12354,27 @@ PrefabInstance:
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.z
- value: -17.6
+ value: -19.64413
objectReference: {fileID: 0}
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalRotation.w
- value: 1
+ value: 0.9978479
objectReference: {fileID: 0}
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: 0.065571144
objectReference: {fileID: 0}
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12286,7 +12384,7 @@ PrefabInstance:
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 0
+ value: 7.519
objectReference: {fileID: 0}
- target: {fileID: 2036777031126321044, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12313,6 +12411,16 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 2254657919647366964, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -30.51
+ objectReference: {fileID: 0}
+ - target: {fileID: 2254657919647366964, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 21.545
+ objectReference: {fileID: 0}
- target: {fileID: 2266438694863162789, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_Layer
@@ -12431,7 +12539,7 @@ PrefabInstance:
- target: {fileID: 3198251145815620842, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.z
- value: 18.16
+ value: 22.17
objectReference: {fileID: 0}
- target: {fileID: 3256945483913150650, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12518,6 +12626,16 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
+ - target: {fileID: 4052760414420689671, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4052760414420689671, guid: e1c302c2f94442848bcac81194dc0f43,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 4087838653851242279, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_Layer
@@ -12706,12 +12824,12 @@ PrefabInstance:
- target: {fileID: 6086245717652688947, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: -13.64
+ value: -13.821
objectReference: {fileID: 0}
- target: {fileID: 6086245717652688947, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.z
- value: 20.73
+ value: 21.741
objectReference: {fileID: 0}
- target: {fileID: 6163348865376731306, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12741,12 +12859,12 @@ PrefabInstance:
- target: {fileID: 6284906056885939019, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: -22.6
+ value: -4.7
objectReference: {fileID: 0}
- target: {fileID: 6284906056885939019, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.y
- value: 68.5
+ value: 68.4
objectReference: {fileID: 0}
- target: {fileID: 6284906056885939019, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12821,27 +12939,27 @@ PrefabInstance:
- target: {fileID: 6734581352989784515, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: -1.28
+ value: -1.58
objectReference: {fileID: 0}
- target: {fileID: 6734581352989784515, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.z
- value: 20.61
+ value: 20.31
objectReference: {fileID: 0}
- target: {fileID: 6734581352989784515, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalRotation.w
- value: -0.24439232
+ value: -0.09128316
objectReference: {fileID: 0}
- target: {fileID: 6734581352989784515, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalRotation.y
- value: 0.96967643
+ value: 0.99582505
objectReference: {fileID: 0}
- target: {fileID: 6734581352989784515, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
- value: 208.292
+ value: 190.475
objectReference: {fileID: 0}
- target: {fileID: 6741413214511114055, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12931,12 +13049,12 @@ PrefabInstance:
- target: {fileID: 7473390387503083045, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: 4.8
+ value: 14.3
objectReference: {fileID: 0}
- target: {fileID: 7473390387503083045, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.y
- value: 92.9
+ value: 93.2
objectReference: {fileID: 0}
- target: {fileID: 7516034460947196664, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12966,12 +13084,12 @@ PrefabInstance:
- target: {fileID: 7810232427760736105, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: -38.815166
+ value: -38.37
objectReference: {fileID: 0}
- target: {fileID: 7810232427760736105, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.z
- value: 19.278236
+ value: 21.01
objectReference: {fileID: 0}
- target: {fileID: 7810232427760736105, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -12996,12 +13114,12 @@ PrefabInstance:
- target: {fileID: 7950538202718204913, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.x
- value: -36.32
+ value: -35.57
objectReference: {fileID: 0}
- target: {fileID: 7950538202718204913, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
propertyPath: m_LocalPosition.z
- value: 20.31
+ value: 22.1
objectReference: {fileID: 0}
- target: {fileID: 7976964555632773962, guid: e1c302c2f94442848bcac81194dc0f43,
type: 3}
@@ -13148,7 +13266,8 @@ PrefabInstance:
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- m_RemovedComponents: []
+ m_RemovedComponents:
+ - {fileID: 179024769525352348, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
m_RemovedGameObjects:
- {fileID: 7983779572279342024, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
- {fileID: 705981873394982570, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
@@ -13168,6 +13287,11 @@ PrefabInstance:
- {fileID: 3520584915171234221, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
- {fileID: 9123277711092103466, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
- {fileID: 5093517047980772641, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
+ - {fileID: 9191219168689864927, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
+ - {fileID: 4129522528534158947, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
+ - {fileID: 6010780459983853871, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
+ - {fileID: 5184021543641115311, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
+ - {fileID: 3144026280375204502, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e1c302c2f94442848bcac81194dc0f43, type: 3}
@@ -14139,7 +14263,7 @@ Transform:
m_GameObject: {fileID: 1304609848}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: -22.47, y: 0, z: -4.47}
+ m_LocalPosition: {x: -21.17, y: 0, z: -0.15}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -14201,14 +14325,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1374431524}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
- m_LocalPosition: {x: -15.62, y: 0, z: -4.54}
+ m_LocalRotation: {x: -0, y: 0.7936473, z: -0, w: 0.6083782}
+ m_LocalPosition: {x: -14.98, y: 0, z: -2.18}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 43105430}
m_Father: {fileID: 370075175}
- m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 105.055, z: 0}
--- !u!1 &1386186097
GameObject:
m_ObjectHideFlags: 0
@@ -20344,3 +20468,4 @@ SceneRoots:
- {fileID: 1232655070}
- {fileID: 40556714}
- {fileID: 204483282}
+ - {fileID: 904391889}
diff --git a/Assets/_Zombie/Scripts/GameManager.cs b/Assets/_Zombie/Scripts/GameManager.cs
index ef20f229..31e36c82 100644
--- a/Assets/_Zombie/Scripts/GameManager.cs
+++ b/Assets/_Zombie/Scripts/GameManager.cs
@@ -1181,7 +1181,28 @@ public class GameManager : NetworkBehaviour
[Server]
public void AddData(int playerIndex)
{
- SettleInfos.Add(playerIndex.ToString(), new SettleInfo());
+ string key = playerIndex.ToString();
+ if (!SettleInfos.ContainsKey(key))
+ {
+ SettleInfos.Add(key, new SettleInfo());
+ }
+ }
+
+ ///
+ /// 移除玩家数据（当玩家断开连接时调用）
+ ///
+ [Server]
+ public void RemovePlayerData(int playerIndex)
+ {
+ string key = playerIndex.ToString();
+ if (SettleInfos.ContainsKey(key))
+ {
+ SettleInfos.Remove(key);
+ }
+ if (players.ContainsKey(playerIndex))
+ {
+ players.Remove(playerIndex);
+ }
}
public string SerializeSettleInfos()
diff --git a/Assets/_Zombie/Scripts/Net/MRNetworkManager.cs b/Assets/_Zombie/Scripts/Net/MRNetworkManager.cs
index ca5d58dd..bace4051 100644
--- a/Assets/_Zombie/Scripts/Net/MRNetworkManager.cs
+++ b/Assets/_Zombie/Scripts/Net/MRNetworkManager.cs
@@ -140,4 +140,36 @@ public class MRNetworkManager : NetworkRoomManager
return -1;
}
}
+
+ ///
+ /// 当玩家断开连接时调用（仅在服务器端）
+ ///
+ public override void OnServerDisconnect(NetworkConnectionToClient conn)
+ {
+ // 获取断开连接的玩家索引
+ if (conn.identity != null)
+ {
+ Player player = conn.identity.GetComponent();
+ if (player != null)
+ {
+ Debug.Log($"玩家 {player.index} 断开连接，清理数据");
+ // 移除玩家数据
+ if (GameManager.Ins != null)
+ {
+ GameManager.Ins.RemovePlayerData(player.index);
+ }
+ }
+ }
+
+ base.OnServerDisconnect(conn);
+ }
+
+ ///
+ /// 当客户端断开连接时调用（仅在客户端）
+ ///
+ public override void OnClientDisconnect()
+ {
+ Debug.Log("从机断开连接");
+ base.OnClientDisconnect();
+ }
}
diff --git a/Assets/_Zombie/Scripts/Player.cs b/Assets/_Zombie/Scripts/Player.cs
index 60d49da4..959da8fb 100644
--- a/Assets/_Zombie/Scripts/Player.cs
+++ b/Assets/_Zombie/Scripts/Player.cs
@@ -105,7 +105,11 @@ public class Player : NetworkRoomPlayer,IDamagable
Collider.enabled = true;
}
currentHp = maxHp;
- GameManager.Ins.players.Add(index,this);
+ // 添加空引用保护和重复添加检查
+ if (GameManager.Ins != null && !GameManager.Ins.players.ContainsKey(index))
+ {
+ GameManager.Ins.players.Add(index, this);
+ }
IsAlive = true;
}
@@ -160,6 +164,14 @@ public class Player : NetworkRoomPlayer,IDamagable
public void Update()
{
+ // 添加空引用保护，防止从机因GameLocal未初始化而掉线
+ if (GameLocal.Ins == null || GameLocal.Ins.MRCamera == null ||
+ GameLocal.Ins.Aim == null || GameLocal.Ins.MRLeftControl == null ||
+ GameLocal.Ins.MRRightControl == null)
+ {
+ return;
+ }
+
Transform mainCamera = GameLocal.Ins.MRCamera.transform;
Transform aim = GameLocal.Ins.Aim.transform;
Transform leftControl = GameLocal.Ins.MRLeftControl;