Merge remote-tracking branch 'origin/main' into Ljh

Assets/_MrCs/Scenes/Liaoning_Panjin_Shuangtaizi_Shuangtaicheng.unity

@@ -9607,7 +9607,7 @@ PrefabInstance:
     - target: {fileID: 6179943918506069767, guid: 0a8f00e7112ed4c478bec0c40dbd9b4a,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6811768021281117629, guid: 0a8f00e7112ed4c478bec0c40dbd9b4a,
         type: 3}
@@ -17135,7 +17135,6 @@ MonoBehaviour:
   BGMState: {fileID: 1031207150}
   Version: 1.0.1
   place: 55
-  vistAllTime: 900
   curGameTime: 0
   gameId: 0
   Scene: {fileID: 0}
@@ -20946,28 +20945,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &96132325826758958
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6060724636583260668}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -832183566074202811, guid: 9ea78f4667fe4e649aadb6c969b21310, type: 3}
 --- !u!1 &96140669787439671
 GameObject:
   m_ObjectHideFlags: 0
@@ -26138,14 +26115,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!33 &855388511963128345
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3681952350854248888}
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
 --- !u!4 &893534624068461686
 Transform:
   m_ObjectHideFlags: 0
@@ -26254,21 +26223,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!4 &1028842066195644301
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6318154297420252934}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.5053285, y: 0.4946143, z: 0.49461412, w: 0.50532836}
-  m_LocalPosition: {x: 36.2, y: 52.3, z: -1.7}
-  m_LocalScale: {x: 25.4, y: 25.40001, z: 25.400011}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3755332996603855603}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 88.772}
 --- !u!64 &1045365405892202654
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -26329,21 +26283,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4671750538043602442}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &1153858232336301833
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4515786828424643092}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 56.5, y: 47.7, z: 23.2}
-  m_LocalScale: {x: -10.678001, y: -10.677998, z: -3.8974712}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3755332996603855603}
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!4 &1158974140606642255
 Transform:
   m_ObjectHideFlags: 0
@@ -26404,14 +26343,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8437755299970277162}
   m_LocalEulerAnglesHint: {x: -12.97, y: 23.772001, z: -5.6460004}
---- !u!33 &1270564462296817614
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6060724636583260668}
-  m_Mesh: {fileID: -832183566074202811, guid: 9ea78f4667fe4e649aadb6c969b21310, type: 3}
 --- !u!64 &1294642977003710188
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -26846,28 +26777,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &2011633536393199405
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6318154297420252934}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
 --- !u!1 &2024649882672610184
 GameObject:
   m_ObjectHideFlags: 0
@@ -27687,14 +27596,6 @@ Transform:
   - {fileID: 893534624068461686}
   m_Father: {fileID: 5959066850252600066}
   m_LocalEulerAnglesHint: {x: 0, y: 90.241, z: 0}
---- !u!33 &2965871873616363616
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4515786828424643092}
-  m_Mesh: {fileID: -832183566074202811, guid: 9ea78f4667fe4e649aadb6c969b21310, type: 3}
 --- !u!1 &2970714643889415266
 GameObject:
   m_ObjectHideFlags: 0
@@ -27810,48 +27711,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8437755299970277162}
   m_LocalEulerAnglesHint: {x: -31.816002, y: -30.674002, z: -7.189}
---- !u!23 &3230212400655911458
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6318154297420252934}
-  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: 15878c114a5793a44b88c10812983ff2, 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!23 &3252764304901827797
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -28148,40 +28007,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3629318986555573418}
   m_Mesh: {fileID: -703523355353934045, guid: 607c0b8aa037e2d438469eed1d8d7325, type: 3}
---- !u!1 &3681952350854248888
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4628094489368792533}
-  - component: {fileID: 855388511963128345}
-  - component: {fileID: 7270509880478251113}
-  - component: {fileID: 8318652324407414040}
-  m_Layer: 3
-  m_Name: model__20
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3682706934776468715
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6060724636583260668}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.67411745, y: -0.21346116, z: 0.21346116, w: 0.67411745}
-  m_LocalPosition: {x: 95.8, y: 47.7, z: 11.9}
-  m_LocalScale: {x: -10.678001, y: -10.677998, z: -3.8974712}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3755332996603855603}
-  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 35.141}
 --- !u!64 &3705889857931421676
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -28242,18 +28067,12 @@ Transform:
   - {fileID: 6389986004492639460}
   - {fileID: 1852661463176866111}
   - {fileID: 9192748609770476370}
-  - {fileID: 6730210293136360271}
   - {fileID: 5739086473389740122}
   - {fileID: 5027718868878025357}
   - {fileID: 4054425861649682412}
   - {fileID: 3081314490999023864}
   - {fileID: 1844203434080579722}
   - {fileID: 5054187010195587157}
-  - {fileID: 1153858232336301833}
-  - {fileID: 3682706934776468715}
-  - {fileID: 1028842066195644301}
-  - {fileID: 5694560090537871763}
-  - {fileID: 4628094489368792533}
   m_Father: {fileID: 2342843668766541538}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &3853732143544392688
@@ -28298,48 +28117,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!23 &3911342076570008541
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4079290018435569777}
-  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: 15878c114a5793a44b88c10812983ff2, 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!23 &3964677363510941759
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -28430,25 +28207,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8437755299970277162}
   m_LocalEulerAnglesHint: {x: 0, y: -48.768, z: 0}
---- !u!1 &4079290018435569777
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5694560090537871763}
-  - component: {fileID: 5661924322806169261}
-  - component: {fileID: 3911342076570008541}
-  - component: {fileID: 5565715162214121437}
-  m_Layer: 3
-  m_Name: model__20 (2)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &4081451438011388423
 GameObject:
   m_ObjectHideFlags: 0
@@ -28818,25 +28576,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &4515786828424643092
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1153858232336301833}
-  - component: {fileID: 2965871873616363616}
-  - component: {fileID: 8699227805161680322}
-  - component: {fileID: 7109568610857194684}
-  m_Layer: 3
-  m_Name: "\u5899 (2)"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!1 &4518982210741802408
 GameObject:
   m_ObjectHideFlags: 0
@@ -28856,21 +28595,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4628094489368792533
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3681952350854248888}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.68882257, y: -0.15976009, z: -0.15976004, w: 0.6888229}
-  m_LocalPosition: {x: 58, y: 54.5, z: 64.8}
-  m_LocalScale: {x: 25.4, y: 25.400003, z: 25.400007}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3755332996603855603}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: -26.116}
 --- !u!136 &4665993809462024923
 CapsuleCollider:
   m_ObjectHideFlags: 0
@@ -28926,14 +28650,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!33 &4733822066730622922
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7898775890578757029}
-  m_Mesh: {fileID: 4300018, guid: 957a51aafea4c2749b469439af31f0c6, type: 3}
 --- !u!33 &4744378451156155976
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -33846,49 +33562,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3755332996603855603}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &5070565086265950154
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6060724636583260668}
-  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: 2e64a9cca6961a145b553c3ce27aa548, type: 2}
-  - {fileID: 2100000, guid: 35bbf669ae5151f4aa0b7c9b9e969062, 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!33 &5074705023603059457
 MeshFilter:
   m_ObjectHideFlags: 0
@@ -34175,28 +33848,6 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6168474492370217874}
   m_Mesh: {fileID: -436691459323431103, guid: d83d5be9a98d7f9448ec30e94ab8b023, type: 3}
---- !u!64 &5536923628874444889
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7898775890578757029}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 4300018, guid: 957a51aafea4c2749b469439af31f0c6, type: 3}
 --- !u!1 &5542012378953279497
 GameObject:
   m_ObjectHideFlags: 0
@@ -34216,28 +33867,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!64 &5565715162214121437
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4079290018435569777}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
 --- !u!4 &5582658462067907971
 Transform:
   m_ObjectHideFlags: 0
@@ -34333,14 +33962,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &5661924322806169261
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4079290018435569777}
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
 --- !u!4 &5667341541575101123
 Transform:
   m_ObjectHideFlags: 0
@@ -34399,21 +34020,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!4 &5694560090537871763
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4079290018435569777}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.5423612, y: 0.45370075, z: 0.453701, w: -0.542361}
-  m_LocalPosition: {x: -29.7, y: 53.3, z: 3.1}
-  m_LocalScale: {x: 25.4, y: 25.400011, z: 25.400011}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3755332996603855603}
-  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 280.173}
 --- !u!4 &5711678172336084190
 Transform:
   m_ObjectHideFlags: 0
@@ -34648,25 +34254,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &6060724636583260668
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 3682706934776468715}
-  - component: {fileID: 1270564462296817614}
-  - component: {fileID: 5070565086265950154}
-  - component: {fileID: 96132325826758958}
-  m_Layer: 3
-  m_Name: "\u5899 (3)"
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!65 &6105832762681276260
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -39670,25 +39257,6 @@ ParticleSystem:
         m_PostInfinity: 2
         m_RotationOrder: 4
     vectorLabel1_3: W
---- !u!1 &6318154297420252934
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1028842066195644301}
-  - component: {fileID: 8661802952962408673}
-  - component: {fileID: 3230212400655911458}
-  - component: {fileID: 2011633536393199405}
-  m_Layer: 3
-  m_Name: model__20 (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!4 &6344189348055894459
 Transform:
   m_ObjectHideFlags: 0
@@ -39953,21 +39521,6 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: -2476605627967570698, guid: 1514c6f14968ed34aaff3cf40c43f407, type: 3}
---- !u!4 &6730210293136360271
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7898775890578757029}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0.7048998, z: -0, w: 0.70930696}
-  m_LocalPosition: {x: 10.4, y: 40.4, z: 3.9}
-  m_LocalScale: {x: 0.67, y: 0.67, z: 0.67}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 3755332996603855603}
-  m_LocalEulerAnglesHint: {x: 0, y: -89.643, z: 0}
 --- !u!1 &6739970816225584522
 GameObject:
   m_ObjectHideFlags: 0
@@ -40191,28 +39744,6 @@ Transform:
   - {fileID: 8437755299970277162}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
---- !u!64 &7109568610857194684
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4515786828424643092}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -832183566074202811, guid: 9ea78f4667fe4e649aadb6c969b21310, type: 3}
 --- !u!1 &7120000519494740696
 GameObject:
   m_ObjectHideFlags: 0
@@ -40342,48 +39873,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8437755299970277162}
   m_LocalEulerAnglesHint: {x: 0, y: -40.006, z: 0}
---- !u!23 &7270509880478251113
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3681952350854248888}
-  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: 15878c114a5793a44b88c10812983ff2, 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!199 &7286964370793663078
 ParticleSystemRenderer:
   serializedVersion: 6
@@ -40889,25 +40378,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!1 &7898775890578757029
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6730210293136360271}
-  - component: {fileID: 4733822066730622922}
-  - component: {fileID: 8245845594098036010}
-  - component: {fileID: 5536923628874444889}
-  m_Layer: 3
-  m_Name: Medium_building_5
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
 --- !u!136 &7905747335432200032
 CapsuleCollider:
   m_ObjectHideFlags: 0
@@ -41139,48 +40609,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2957030472436780347}
   m_LocalEulerAnglesHint: {x: 0, y: -4.842, z: 0}
---- !u!23 &8245845594098036010
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7898775890578757029}
-  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: 2beb0358094b63e459829056a80e37ef, 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: 0
-  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!23 &8247433541792581678
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -41276,28 +40704,6 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!64 &8318652324407414040
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3681952350854248888}
-  m_Material: {fileID: 0}
-  m_IncludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_ExcludeLayers:
-    serializedVersion: 2
-    m_Bits: 0
-  m_LayerOverridePriority: 0
-  m_IsTrigger: 0
-  m_ProvidesContacts: 0
-  m_Enabled: 1
-  serializedVersion: 5
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
 --- !u!1 &8320047896769444019
 GameObject:
   m_ObjectHideFlags: 0
@@ -41541,14 +40947,6 @@ MeshCollider:
   m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: 6477282652119582922, guid: cc23e63d8d2c07d40be171a4aef0948b, type: 3}
---- !u!33 &8661802952962408673
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6318154297420252934}
-  m_Mesh: {fileID: 7160634504894769224, guid: 18934c948f06e9c45a4eab65974bbc88, type: 3}
 --- !u!23 &8694886131447946558
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -41591,49 +40989,6 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!23 &8699227805161680322
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4515786828424643092}
-  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: 2e64a9cca6961a145b553c3ce27aa548, type: 2}
-  - {fileID: 2100000, guid: 35bbf669ae5151f4aa0b7c9b9e969062, 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!33 &8701442930429247004
 MeshFilter:
   m_ObjectHideFlags: 0

Assets/_MrCs/Scripts/Manager/GameManager.cs

@@ -126,6 +126,10 @@ public class GameManager : NetworkBehaviour
     [SyncVar]
     public int BlueRoundScore = 0;
 
+    [NonSerialized]
+    [SyncVar]
+    public int JoinPlayerCount;
+
     [Header("指引系统")]
     public GameObject GuideArrowPre; // 指引箭头预制体
     private GameObject guideArrowInstanceRed; // 指向红门的指引箭头实例
@@ -173,12 +177,12 @@ public class GameManager : NetworkBehaviour
 
         if (isServer)
         {
-            CreateDoor(GameLocal.Ins.redDoorPos, GameLocal.Ins.blueDoorPos, GameLocal.Ins.startGameItemPos);
-
-            CoroutineTaskManager.Instance.WaitSecondTodo(() =>
-            {
-                StartGuide();
-            }, 2f);
+            // CreateDoor(GameLocal.Ins.redDoorPos, GameLocal.Ins.blueDoorPos, GameLocal.Ins.startGameItemPos);
+            //
+            // CoroutineTaskManager.Instance.WaitSecondTodo(() =>
+            // {
+            //     StartGuide();
+            // }, 2f);
             roundAllTime =GameLocal.Ins.vistAllTime / 3;
         }
     }
@@ -414,25 +418,14 @@ public class GameManager : NetworkBehaviour
             GivePistol(p.index);
         }
     }
-
+    
     [Server]
-    public void CheckGameStart()
+    public void CheckGameStart(int playerIndex)
     {
-        int curTeamIndex = 0;
-        bool isStartGame = false;
-        foreach (var player in allPlayers)
-        {
-            if (player.teamType != TeamType.None)
-                curTeamIndex++;
-        }
-
-        isStartGame = curTeamIndex >= GameLocal.Ins.addPlayerIndex;
+        var isStartGame = playerIndex == GameLocal.Ins.addPlayerIndex;
         if (isStartGame)
         {
-            if (gameState == GameState.Playing)
-                return;
-            AutoAssignTeams();
-            gameState = GameState.Playing;
+            
             BlueRoundScore = 0;
             RedRoundScore = 0;
 
@@ -446,6 +439,10 @@ public class GameManager : NetworkBehaviour
             MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
             {
                 GameStart();
+                if (gameState == GameState.Playing)
+                    return;
+                AutoAssignTeams();
+                gameState = GameState.Playing;
             }, 3f, this);
 
         }
@@ -732,9 +729,7 @@ public class GameManager : NetworkBehaviour
         // 更新指引箭头位置
         UpdateGuideArrowPosition();
     }
-
     
-
     [Server]
     public void StartRound()
     {

Assets/_MrCs/Scripts/Net/MRNetworkManager.cs

@@ -60,12 +60,17 @@ public class MRNetworkManager : NetworkRoomManager
         if (newRoomGameObject == null)
             newRoomGameObject = Instantiate(roomPlayerPrefab.gameObject, Vector3.zero, Quaternion.identity);
         NetworkServer.AddPlayerForConnection(conn, newRoomGameObject);
-
+        
         // if (clientIndex == 2)
         // {
         //     Debug.Log("两个玩家进入房间，游戏开始");
         //     
         // }
+        MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
+        {
+            
+        }, 2f, this);
+        GameManager.Ins.CheckGameStart(clientIndex);
     }
 
     public override void OnStartServer()

Assets/_MrCs/Scripts/Player/Player.cs

@@ -247,9 +247,8 @@ public class Player : NetworkRoomPlayer,IDamagable
             Debug.Log("触碰开始");
             teamType = TeamType.Red;
             GameManager.Ins.GivePistol(index);
-            GameManager.Ins.CheckGameStart();
+            //GameManager.Ins.CheckGameStart();
             GameManager.Ins.CleanupGuideArrow();
-          
         }
         
         if (other.tag == "BlueDoor")
@@ -257,7 +256,7 @@ public class Player : NetworkRoomPlayer,IDamagable
             Debug.Log("触碰开始");
             teamType = TeamType.Blue;
             GameManager.Ins.GivePistol(index);
-            GameManager.Ins.CheckGameStart();
+            //GameManager.Ins.CheckGameStart();
             GameManager.Ins.CleanupGuideArrow();
 
         }