Browse Source

修改bug

DESKTOP-FB72PO8\Administrator 4 days ago
parent
commit
b3bbbcdc29

+ 1 - 1
Assets/Art/Environment/cj03.prefab

@@ -152,7 +152,7 @@ Transform:
   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_LocalScale: {x: 1.7513, y: 1.7513, z: 1.7513}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2446320557680373064}

+ 12 - 0
Assets/Art/Environment/fukong dao2.prefab

@@ -8,6 +8,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
       propertyPath: m_LocalPosition.x
       value: 3.6000004

+ 3 - 3
Assets/Art/Environment/fukong dao3.prefab

@@ -10,15 +10,15 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalScale.x
-      value: 1.9810997
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalScale.y
-      value: 1.9810997
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalScale.z
-      value: 1.9811
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: deaf9329040a1614a8e54df31a46a5de, type: 3}
       propertyPath: m_LocalPosition.x

+ 12 - 0
Assets/Art/Environment/fukong dao4.prefab

@@ -8,6 +8,18 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 3
+      objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 63677335207fa85458d422635ffac560, type: 3}
       propertyPath: m_LocalPosition.x
       value: -18.58

+ 157 - 1
Assets/Res/CombatScenes/CombatRoot.prefab

@@ -34,6 +34,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 7320235550895006129}
   - {fileID: 4445399462343019278}
   m_Father: {fileID: 5999369449934832163}
   m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0}
@@ -46,7 +47,7 @@ Camera:
   m_GameObject: {fileID: 65994213146227239}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
+  m_ClearFlags: 4
   m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
@@ -238,6 +239,161 @@ Transform:
   - {fileID: 6818137407374040233}
   m_Father: {fileID: 5344611500333309412}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8735217549368148119
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7320235550895006129}
+  - component: {fileID: 3969240094559576283}
+  - component: {fileID: 6389208801088549056}
+  - component: {fileID: 231374772603165284}
+  - component: {fileID: 8228194044419918282}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7320235550895006129
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  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: 6818137407374040233}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!20 &3969240094559576283
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: -2
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 128
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_enableGDRP: 1
+  m_backfaceCulling: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!81 &6389208801088549056
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+--- !u!114 &231374772603165284
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 0
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_Version: 2
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+--- !u!114 &8228194044419918282
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8735217549368148119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 926bf6ad5fa4e0b4a96dded275d10878, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetCamera: {fileID: 5136129069556543016}
+  myCamera: {fileID: 3969240094559576283}
 --- !u!1 &9046924969066059369
 GameObject:
   m_ObjectHideFlags: 0

+ 165 - 0
Assets/Res/CombatScenes/LevelBattle01.prefab

@@ -0,0 +1,165 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &2632760491527924325
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5927203370302625784}
+  - component: {fileID: 2956897150922469964}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: LevelBattle01
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5927203370302625784
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2632760491527924325}
+  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:
+  - {fileID: 8368877462968469787}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2956897150922469964
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2632760491527924325}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 43f1d0747d2d4b1ab0a3a298f9db7f35, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  skyObejct: {fileID: 4787834087060179975}
+  shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
+  fogColor: {r: 0.26950002, g: 0.3349501, b: 0.55, a: 1}
+  fogStartDistance: 10
+  fogEndDistance: 50
+  allObject:
+  - {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+  - {fileID: 3905164629616407330, guid: 0685c296e9c07cd498a8a553f623bebe, type: 3}
+  - {fileID: 3703108956536512397, guid: cdcc1e72df788f34092ee9d092668bbf, type: 3}
+  radius: 30
+--- !u!1001 &1744782095462081170
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 5927203370302625784}
+    m_Modifications:
+    - target: {fileID: 1471893119496921437, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.17513
+      objectReference: {fileID: 0}
+    - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.17513
+      objectReference: {fileID: 0}
+    - target: {fileID: 2585829135472063271, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.17513
+      objectReference: {fileID: 0}
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.4596
+      objectReference: {fileID: 0}
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.7298
+      objectReference: {fileID: 0}
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.4596
+      objectReference: {fileID: 0}
+    - target: {fileID: 3298137866772214669, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -50.33
+      objectReference: {fileID: 0}
+    - target: {fileID: 4154994230707482304, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 4425146815379131757, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Layer
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_Name
+      value: cj02 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+--- !u!1 &4787834087060179975 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6505304175637704341, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+  m_PrefabInstance: {fileID: 1744782095462081170}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &8368877462968469787 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 7787444640473983881, guid: e8b2b3d35210a5b4c81200f0b713c888, type: 3}
+  m_PrefabInstance: {fileID: 1744782095462081170}
+  m_PrefabAsset: {fileID: 0}

+ 7 - 0
Assets/Res/CombatScenes/LevelBattle01.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WyxMvHmrB3sUTC24BUBjH6vjk1P7tjN9pIIBWcxLvFFoMOTvPCkseuTKOIe9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/Res/CombatScenes/LevelBattle02.prefab

@@ -48,6 +48,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   skyObejct: {fileID: 1381729068282112590}
   shengShiMaterial: {fileID: 2100000, guid: 5d9d871e58f5c1b4890049c6625f29c8, type: 2}
+  fogColor: {r: 0.1794, g: 0.43469998, b: 0.69, a: 1}
+  fogStartDistance: 80
+  fogEndDistance: 150
   allObject:
   - {fileID: 1030273147237074171, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
   - {fileID: 2484470836380151271, guid: 9360da4f31d5e9944b9df8e981c56425, type: 3}

+ 568 - 1
Assets/Scenes/testCombat.scene

@@ -2779,6 +2779,67 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+--- !u!1001 &336480152
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_Name
+      value: fukong dao2 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3.6000004
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 77.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 13.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.2571829
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.2571829
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.65867823
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.65867823
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: -90
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4074262922870550317, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 137.343
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
 --- !u!1001 &356856622
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3602,6 +3663,67 @@ Sprite:
     - {x: 0.445, y: 0.69}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &461337753
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1030273147237074171, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_Name
+      value: Mountain01
+      objectReference: {fileID: 0}
+    - target: {fileID: 1030273147237074171, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 31.125736
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 77.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -6.5556927
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.9295182
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.36877635
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -43.28
+      objectReference: {fileID: 0}
+    - target: {fileID: 6482697273022078456, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 3bfe2e5967c40b84494422ade8cb3c29, type: 3}
 --- !u!1001 &461893080
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5274,6 +5396,67 @@ Sprite:
     - {x: 0.64, y: 0.64}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &722841957
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle02 (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
 --- !u!224 &732466266 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4480049515833029494, guid: 66b73c8573489f64690b14e403d1b518, type: 3}
@@ -7147,6 +7330,67 @@ Transform:
   - {fileID: 1927815586}
   m_Father: {fileID: 8535240}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!1001 &1197336699
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.000000061817246
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.000000061817246
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_Name
+      value: fukong dao2
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: ebe13b67332437f478e3ba635a061233, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: ebe13b67332437f478e3ba635a061233, type: 3}
 --- !u!1001 &1221725229
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9143,6 +9387,67 @@ Sprite:
     - {x: -0.03, y: -0.65999997}
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!1001 &1444228855
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle02 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3828224646518961520, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8260501188212286327, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
 --- !u!213 &1450419931
 Sprite:
   m_ObjectHideFlags: 0
@@ -9481,6 +9786,71 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1365871677352826847, guid: d960809b72afef9438f8c29c8949a1ff, type: 3}
   m_PrefabInstance: {fileID: 4260062870105671322}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1502207846
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4177647096219069143, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5360880237618302960, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_Name
+      value: cj01
+      objectReference: {fileID: 0}
+    - target: {fileID: 8929588464290711568, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 600addf310c15f74da80c081c179e5c2, type: 3}
 --- !u!213 &1507424885
 Sprite:
   m_ObjectHideFlags: 0
@@ -9821,7 +10191,8 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 3013239545119153088, guid: 2ccf23cfa2024034ab7bb91f48db8535, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
@@ -13414,6 +13785,128 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1001 &5398007561899227885
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2632760491527924325, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_Name
+      value: LevelBattle01
+      objectReference: {fileID: 0}
+    - target: {fileID: 2632760491527924325, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5927203370302625784, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: dfc9c6d000d7eff4fb00d1ab747832f3, type: 3}
+--- !u!1001 &6425123862439900028
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4286731389157393447, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_Name
+      value: CombatRoot (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4286731389157393447, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 24.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 25.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5344611500333309412, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: fb39a21bdd72eae46936ffaebc380841, type: 3}
 --- !u!1001 &6588466611375917160
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13601,6 +14094,71 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+--- !u!1001 &7833750896296525313
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2054979651704895426, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2093453953714045176, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_Mesh
+      value: 
+      objectReference: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+    - target: {fileID: 2579613789551132574, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_Name
+      value: cj03 (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 2579613789551132574, guid: e925951f87f5df24392c535f597b31aa, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e925951f87f5df24392c535f597b31aa, type: 3}
 --- !u!1001 &7971796013686853673
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -13701,3 +14259,12 @@ SceneRoots:
   - {fileID: 1522735223}
   - {fileID: 221259014}
   - {fileID: 1221725229}
+  - {fileID: 1197336699}
+  - {fileID: 461337753}
+  - {fileID: 336480152}
+  - {fileID: 1502207846}
+  - {fileID: 7833750896296525313}
+  - {fileID: 5398007561899227885}
+  - {fileID: 6425123862439900028}
+  - {fileID: 1444228855}
+  - {fileID: 722841957}

+ 1 - 0
Assets/Scripts/Core/CameraEffect/StressReceiver.cs

@@ -3,6 +3,7 @@ using UnityEngine;
 
 public class StressReceiver : MonoBehaviour
 {
+  
     public float trauma;
     private float _trauma;
     private Vector3 _lastPosition;

+ 15 - 0
Assets/Scripts/Core/Utility/CapyCamera.cs

@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CapyCamera : MonoBehaviour
+{
+    public Camera targetCamera;
+    public Camera myCamera;
+  
+    // Update is called once per frame
+    void Update()
+    {
+        myCamera.fieldOfView= targetCamera.fieldOfView;
+    }
+}

+ 11 - 0
Assets/Scripts/Core/Utility/CapyCamera.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: BngZ53yrAi8lo+6h+O0JTfaKHo2JcySLldrUJzF1PtDUcG6tq4xmOcohBp6M
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/CombatSenceController.cs

@@ -36,7 +36,7 @@ namespace GameLogic.Combat.CombatTool
         // private float _shengShiAddTime;
         private bool _isUpdateShengShi;
 
-        private SceneMonoConfig SceneMonoConfig;
+        private SceneMonoConfigBasic SceneMonoConfig;
 
         // private RandomAllMap RandomAllMap;
 
@@ -49,11 +49,11 @@ namespace GameLogic.Combat.CombatTool
             moveRoot = gameObject.transform;
             CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
 
-            var task_a = AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>("LevelBattle02.prefab",
+            var task_a = AssetBundleLoadManager.Instance.LoadAssetAsyncTask<GameObject>("LevelBattle01.prefab",
                 delegate(AssetHandle assetHandle)
                 {
                     GameObject gameObject = assetHandle.AssetObject<GameObject>();
-                    SceneMonoConfig = gameObject.GetComponent<SceneMonoConfig>();
+                    SceneMonoConfig = gameObject.GetComponent<SceneMonoConfigBasic>();
                     SceneMonoConfig.shengShiMaterial.SetFloat(Ran,0.1f); 
                 });
             cTaskAwaitBuffer.AddTask(task_a);

+ 152 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneCJ2MonoConfig.cs

@@ -1,10 +1,161 @@
+using System.Collections.Generic;
+using Fort23.UTool;
+using UnityEngine;
+using Utility;
+
 namespace GameLogic.Combat.CombatTool.SceneTool
 {
     public class SceneCJ2MonoConfig : SceneMonoConfigBasic
     {
+        public Color fogColor;
+        public float fogStartDistance;
+        public float fogEndDistance;
+        public GameObject[] allObject;
+        public float radius;
+        private Map<int, GameObjectPool> _allGameObjectPools = new Map<int, GameObjectPool>();
+        private Map<int, GameObjectPool> _downAllGameObjectPools = new Map<int, GameObjectPool>();
+
+        protected override void ProInit()
+        {
+            RenderSettings.fogColor= fogColor;
+            RenderSettings.fogStartDistance = fogStartDistance;
+            RenderSettings.fogEndDistance = fogEndDistance;
+        }
+
         protected override void ProUpdate()
         {
-            
+        
+
+            Vector3 pos = moveRoot.position;
+            List<int> removeKey = new List<int>();
+            for (_allGameObjectPools.Begin(); _allGameObjectPools.Next();)
+            {
+                if (_allGameObjectPools.Value == null)
+                {
+                    continue;
+                }
+
+                Vector3 objetcPos = _allGameObjectPools.Value.own.transform.position;
+                if (Vector3.Distance(pos, objetcPos) > 600)
+                {
+                    removeKey.Add(_allGameObjectPools.Key);
+                    GObjectPool.Instance.Recycle(_allGameObjectPools.Value);
+                    // _allGameObjectPools.Value.SetActive(false);
+                }
+            }
+
+            for (int i = 0; i < removeKey.Count; i++)
+            {
+                _allGameObjectPools.Remove(removeKey[i]);
+            }
+
+            removeKey.Clear();
+
+            for (_downAllGameObjectPools.Begin(); _downAllGameObjectPools.Next();)
+            {
+                if (_downAllGameObjectPools.Value == null)
+                {
+                    continue;
+                }
+
+                Vector3 objetcPos = _downAllGameObjectPools.Value.own.transform.position;
+                if (Vector3.Distance(pos, objetcPos) > 600)
+                {
+                    removeKey.Add(_downAllGameObjectPools.Key);
+                    GObjectPool.Instance.Recycle(_downAllGameObjectPools.Value);
+                    // _allGameObjectPools.Value.SetActive(false);
+                }
+            }
+
+            for (int i = 0; i < removeKey.Count; i++)
+            {
+                _downAllGameObjectPools.Remove(removeKey[i]);
+            }
+
+            // float radius = radius;
+            int x = (int)(pos.x / radius);
+            int z = (int)(pos.z / radius);
+            float xStartInit = x;
+            float zStartInit = z;
+            for (int i = -4; i <= 20; i++)
+            {
+                for (int j = -4; j <= 20; j++)
+                {
+                    float currX = (xStartInit + i) * radius;
+                    float currZ = (zStartInit + j) * radius;
+                    int key = (int)(currX * 1000 + currZ);
+                    InitUp(key, currX, currZ);
+                    InitDown(key, currX, currZ, i, j);
+                }
+            }
+        }
+
+        private void InitUp(int key, float currX, float currZ)
+        {
+            if (_allGameObjectPools.ContainsKey(key))
+            {
+                return;
+            }
+
+            GameObjectPool gameObjectPool = GetObejct(80);
+            if (gameObjectPool != null)
+            {
+                float y = Random.Range(45.0f, 65.0f);
+                float x = Random.Range(-3.0f, 3.0f);
+                float z = Random.Range(-2.0f, 2.0f);
+                gameObjectPool.own.transform.position = new Vector3(currX + x, y, currZ + z);
+                float ry = Random.Range(0, 360);
+                Vector3 eulerAngles = gameObjectPool.own.transform.eulerAngles;
+                gameObjectPool.own.transform.eulerAngles = new Vector3(eulerAngles.x, ry, eulerAngles.z);
+            }
+
+            _allGameObjectPools.Add(key, gameObjectPool);
+        }
+
+        private void InitDown(int key, float currX, float currZ, int xintdex, int yindex)
+        {
+            if (_downAllGameObjectPools.ContainsKey(key))
+            {
+                return;
+            }
+
+            int odds = 50;
+          
+            GameObjectPool gameObjectPool = GetObejct(odds);
+            if (gameObjectPool != null)
+            {
+                float y = Random.Range(-1.0f, 5.0f);
+                if(Mathf.Abs(Mathf.Abs(xintdex)-1)<=1)
+                {
+                     y = Random.Range(-1.0f, 1.0f);
+                }
+               
+                float x = Random.Range(-3.0f, 3.0f);
+                float z = Random.Range(-2.0f, 2.0f);
+                gameObjectPool.own.transform.position = new Vector3(currX + x, y, currZ + z);
+                float ry = Random.Range(0, 360);
+
+                Vector3 eulerAngles = gameObjectPool.own.transform.eulerAngles;
+                gameObjectPool.own.transform.eulerAngles = new Vector3(eulerAngles.x, ry, eulerAngles.z);
+            }
+
+            _downAllGameObjectPools.Add(key, gameObjectPool);
+        }
+
+        private GameObjectPool GetObejct(int currOdds)
+        {
+            int odds = Random.Range(0, 100);
+            if (odds < currOdds)
+            {
+                return null;
+            }
+
+            int index = Random.Range(0, allObject.Length);
+            GameObject gameObject = allObject[index];
+            // GameObject go = GameObject.Instantiate(gameObject);
+            GameObjectPool gameObjectPool =
+                GObjectPool.Instance.FetchAsyncForGameObject<GameObjectPool>(gameObject, gameObject.name);
+            return gameObjectPool;
         }
     }
 }

+ 6 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/SceneTool/SceneMonoConfig.cs

@@ -8,6 +8,9 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 {
     public class SceneMonoConfig : SceneMonoConfigBasic
     {
+        public Color fogColor;
+        public float fogStartDistance;
+        public float fogEndDistance;
         public GameObject[] allObject;
         public float radius;
         public string dec;
@@ -20,7 +23,9 @@ namespace GameLogic.Combat.CombatTool.SceneTool
 
         protected override void ProInit()
         {
-          
+            RenderSettings.fogColor= fogColor;
+            RenderSettings.fogStartDistance = fogStartDistance;
+            RenderSettings.fogEndDistance = fogEndDistance;
             this.sceneMonoConfig = this;
         }